Improve OmegaConf patch: add robust patching with verification, patch both before and after fairseq-signals installation, and ensure module persistence

Dockerfile

@@ -42,6 +42,9 @@ RUN git clone https://github.com/Jwoo5/fairseq-signals.git && \
     cd fairseq-signals && \
     pip install --editable ./
 
+# Apply the patch again after fairseq-signals installation to ensure it persists
+RUN python /app/omegaconf_patch.py
+
 # Copy application files
 COPY . .
 

omegaconf_patch.py

@@ -5,7 +5,7 @@ This patch adds the missing is_primitive_type function to newer omegaconf versio
 """
 
 import omegaconf
-import types
+import sys
 
 def patch_omegaconf():
     """Patch omegaconf to add missing is_primitive_type function."""
@@ -22,10 +22,30 @@ def patch_omegaconf():
         
         # Add the function to omegaconf._utils
         setattr(omegaconf._utils, 'is_primitive_type', is_primitive_type)
+        
+        # Also patch the module in sys.modules to ensure it persists
+        if 'omegaconf._utils' in sys.modules:
+            utils_module = sys.modules['omegaconf._utils']
+            setattr(utils_module, 'is_primitive_type', is_primitive_type)
+        
         print("Successfully patched OmegaConf with is_primitive_type function")
         
+        # Verify the patch worked
+        if hasattr(omegaconf._utils, 'is_primitive_type'):
+            print("Patch verification successful: is_primitive_type is now available")
+        else:
+            print("WARNING: Patch verification failed!")
+            
     except Exception as e:
         print(f"Warning: Could not patch OmegaConf: {e}")
+        # Try alternative patching method
+        try:
+            print("Trying alternative patching method...")
+            import omegaconf._utils as utils
+            setattr(utils, 'is_primitive_type', lambda obj: obj is None or isinstance(obj, (bool, int, float, str)))
+            print("Alternative patching successful")
+        except Exception as e2:
+            print(f"Alternative patching also failed: {e2}")
 
 if __name__ == "__main__":
     patch_omegaconf()