Update merge_utils.py

merge_utils.py

@@ -1,14 +1,31 @@
 import pydantic
-pydantic.ConfigDict(arbitrary_types_allowed=True)
+from pydantic import ConfigDict, BaseModel
+
+# --- GLOBAL FIX FOR PYDANTIC V2 / MERGEKIT COMPATIBILITY ---
+# This MUST happen before importing any mergekit modules
+def patch_pydantic():
+    # Force the default configuration for all future models
+    original_init = BaseModel.__init__
+    def patched_init(self, *args, **kwargs):
+        original_init(self, *args, **kwargs)
+    
+    BaseModel.model_config = ConfigDict(arbitrary_types_allowed=True)
+
+patch_pydantic()
+# ---------------------------------------------------------
 
 import yaml
 import os
 import torch
-# Now it is safe to import mergekit
-from mergekit.config import MergeConfiguration
-from mergekit.merge import run_merge
 from pathlib import Path
 
+# Now it is safe to import mergekit
+try:
+    from mergekit.config import MergeConfiguration
+    from mergekit.merge import run_merge
+except ImportError as e:
+    print(f"Error importing mergekit: {e}")
+
 def execute_mergekit(config_dict, out_path, hf_token):
     """Runs a MergeKit operation using a dictionary config."""
     # Convert dict to YAML string for MergeKit's parser