Fix/pydantic

examples/marketplace_classifier/requirements.txt

@@ -1,5 +1,5 @@
 tanuki.py
 openai~=0.28.1
-pydantic==2.4.2
+pydantic>1.0.0
 requests~=2.31.0
 python-dotenv~=1.0.0

pyproject.toml

@@ -17,7 +17,7 @@ openai = "0.28.1"
 numpy = "1.24.4"
 python-dotenv= "1.0.0"
 bitarray = "2.8.2"
-pydantic = "2.4.2"
+pydantic = "^1.0.0"
 # Add your project dependencies here, for example:
 # requests = "^2.25.1"
 

requirements.txt

@@ -3,5 +3,5 @@ openai==1.3.5
 numpy~=1.26.1
 python-dotenv==1.0.0
 bitarray==2.8.2
-pydantic==2.4.2
+pydantic
 requests~=2.31.0

setup.cfg

@@ -24,7 +24,7 @@ install_requires =
     numpy~=1.24.4
     python-dotenv==1.0.0
     bitarray==2.8.2
-    pydantic==2.4.2
+    pydantic>1.0.0
 
 
 [options.packages.find]

setup.py

@@ -21,7 +21,7 @@
         "numpy~=1.26.1",
         "python-dotenv==1.0.0",
         "bitarray==2.8.2",
-        "pydantic==2.4.2",
+        "pydantic>1.0.0",
         "requests~=2.31.0"
     ],
     extras_require={

src/tanuki.py.egg-info/PKG-INFO

@@ -17,7 +17,7 @@ Requires-Dist: openai==0.28.1
 Requires-Dist: numpy~=1.24.4
 Requires-Dist: python-dotenv==1.0.0
 Requires-Dist: bitarray==2.8.2
-Requires-Dist: pydantic==2.4.2
+Requires-Dist: pydantic>1.0.0
 
 # 🙈 Tanuki
 

src/tanuki.py.egg-info/requires.txt

@@ -4,4 +4,4 @@ openai==0.28.1
 numpy~=1.24.4
 python-dotenv==1.0.0
 bitarray==2.8.2
-pydantic==2.4.2
+pydantic>1.0.0

src/tanuki/language_models/llm_configs/abc_base_config.py

@@ -1,5 +1,5 @@
 import abc 
-from pydantic import BaseModel, ConfigDict
+from pydantic import BaseModel#, ConfigDict
 from typing import Optional
 
 class BaseModelConfig(abc.ABC, BaseModel):
@@ -16,9 +16,9 @@ class BaseModelConfig(abc.ABC, BaseModel):
     instructions : Optional[str] -- the instructions for the model
     parsing_helper_tokens : Optional[dict] -- the parsing helper tokens for the model
     """
-    model_config = ConfigDict(
-            protected_namespaces=()
-        )
+    #model_config = ConfigDict(
+    #        protected_namespaces=()
+    #    )
     model_name: str
     provider: str
     context_length: int

src/tanuki/models/function_config.py

@@ -54,8 +54,12 @@ def to_dict(self):
         Returns:
             The dict
         """
-        return self.model_dump()
-
+        try:
+            config_dictionary = self.model_dump()
+        except AttributeError as e:
+            config_dictionary = self.dict()
+
+        return config_dictionary
     def update_with_finetuned_response(self, response):
         """
         Update the function config with the finetuned response

src/tanuki/validator.py

@@ -413,7 +413,12 @@ def instantiate(self, data: Any, target_type: Type) -> Any:
                     for attr, attr_type in target_type.__annotations__.items():
                         if attr in data:
                             data[attr] = self.instantiate(data[attr], attr_type)
-                    return target_type.model_validate(data)
+                    try:
+                        return target_type.model_validate(data)
+                    except AttributeError as e:
+                        # backwards compatibility with pydantic < 2
+                        return target_type.parse_obj(data)
+
 
                 # For general classes, attempt instantiation
                 try: