adapt to from_json from jiter

rgbkrk · Sep 25, 2024 · 88ab874 · 88ab874
1 parent 042dec5
commit 88ab874
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 109 deletions.
diff --git a/chatlab/views/tools.py b/chatlab/views/tools.py
@@ -15,7 +15,7 @@
 from IPython.display import display
 from IPython.core.getipython import get_ipython
 
-from instructor.dsl.partialjson import JSONParser
+from jiter import from_json 
 
 
 class ToolArguments(AutoUpdate):
@@ -74,11 +74,11 @@ def update(self) -> None:
 
     def render(self):
         if self.custom_render is not None:
-            # We use the same definition as was in the original function
             try:
-                parser = JSONParser()
-                possible_args = parser.parse(self.arguments)
-
+                possible_args = from_json(self.arguments.encode("utf-8"), partial_mode="trailing-strings")
+            except Exception:
+                return None
+            try:
                 Model = extract_model_from_function(self.name, self.custom_render)
                 # model = Model.model_validate(possible_args)
                 model = Model(**possible_args)
@@ -188,8 +188,11 @@ def render(self):
         if self.custom_render is not None:
             # We use the same definition as was in the original function
             try:
-                parser = JSONParser()
-                possible_args = parser.parse(self.arguments)
+                possible_args = from_json(self.arguments.encode("utf-8"), partial_mode="trailing-strings")
+            except Exception:
+                return None
+
+            try:
 
                 Model = extract_model_from_function(self.name, self.custom_render)
                 # model = Model.model_validate(possible_args)