langroid 0.16.4__py3-none-any.whl → 0.16.5__py3-none-any.whl

langroid/parsing/parse_json.py

@@ -60,13 +60,11 @@ def parse_imperfect_json(json_string: str) -> Union[Dict[str, Any], List[Any]]:
     except (ValueError, SyntaxError):
         pass
 
-    # If ast.literal_eval fails or returns non-dict/list, try json.loads
-    try:
-        json_string = repair_json(json_string)
-        result = json.loads(json_string)
-        if isinstance(result, (dict, list)):
-            return result
-    except json.JSONDecodeError:
+    # If ast.literal_eval fails or returns non-dict/list, try repair_json
+    json_repaired_obj = repair_json(json_string, return_objects=True)
+    if isinstance(json_repaired_obj, (dict, list)):
+        return json_repaired_obj
+    else:
         try:
             # fallback on yaml
             yaml_result = yaml.safe_load(json_string)
@@ -86,9 +84,14 @@ def try_repair_json_yaml(s: str) -> str | None:
     NOTE - replacing \n with space will result in format loss,
     which may matter in generated code (e.g. python, toml, etc)
     """
-    s_repaired = repair_json(s)
-    if s_repaired != "":
-        return s_repaired  # type: ignore
+    s_repaired_obj = repair_json(s, return_objects=True)
+    if isinstance(s_repaired_obj, list):
+        if len(s_repaired_obj) > 0:
+            s_repaired_obj = s_repaired_obj[0]
+        else:
+            s_repaired_obj = None
+    if s_repaired_obj is not None:
+        return json.dumps(s_repaired_obj)  # type: ignore
     else:
         try:
             yaml_result = yaml.safe_load(s)

{langroid-0.16.4.dist-info → langroid-0.16.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langroid
-Version: 0.16.4
+Version: 0.16.5
 Summary: Harness LLMs with Multi-Agent Programming
 License: MIT
 Author: Prasad Chalasani
@@ -55,7 +55,7 @@ Requires-Dist: grpcio (>=1.62.1,<2.0.0)
 Requires-Dist: halo (>=0.0.31,<0.0.32)
 Requires-Dist: huggingface-hub (>=0.21.2,<0.22.0) ; extra == "hf-transformers" or extra == "all" or extra == "transformers"
 Requires-Dist: jinja2 (>=3.1.2,<4.0.0)
-Requires-Dist: json-repair (>=0.27.0,<0.28.0)
+Requires-Dist: json-repair (>=0.29.0,<0.30.0)
 Requires-Dist: lancedb (>=0.8.2,<0.9.0) ; extra == "vecdbs" or extra == "lancedb"
 Requires-Dist: litellm (>=1.30.1,<2.0.0) ; extra == "all" or extra == "litellm"
 Requires-Dist: lxml (>=4.9.3,<5.0.0)

{langroid-0.16.4.dist-info → langroid-0.16.5.dist-info}/RECORD

@@ -87,7 +87,7 @@ langroid/parsing/config.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/parsing/document_parser.py,sha256=WGnA5ADwMHliGJt6WW9rc4RiFXQcKU33b5zdPiGrtEY,24265
 langroid/parsing/image_text.py,sha256=sbLIQ5nHe2UnYUksBaQsmZGaX-X0qgEpPd7CEzi_z5M,910
 langroid/parsing/para_sentence_split.py,sha256=AJBzZojP3zpB-_IMiiHismhqcvkrVBQ3ZINoQyx_bE4,2000
-langroid/parsing/parse_json.py,sha256=8jqBLSZ0TWPI8d4h2FZv4898dqV5N-hFtxgYXlocm-w,4568
+langroid/parsing/parse_json.py,sha256=aADo38bAHQhC8on4aWZZzVzSDy-dK35vRLZsFI2ewh8,4756
 langroid/parsing/parser.py,sha256=AgtmlVUvrkSG1l7-YZPX8rlldgXjh_HqXAMqpXkBxUo,11746
 langroid/parsing/repo_loader.py,sha256=3GjvPJS6Vf5L6gV2zOU8s-Tf1oq_fZm-IB_RL_7CTsY,29373
 langroid/parsing/routing.py,sha256=-FcnlqldzL4ZoxuDwXjQPNHgBe9F9-F4R6q7b_z9CvI,1232
@@ -138,8 +138,8 @@ langroid/vector_store/meilisearch.py,sha256=6frB7GFWeWmeKzRfLZIvzRjllniZ1cYj3Hmh
 langroid/vector_store/momento.py,sha256=qR-zBF1RKVHQZPZQYW_7g-XpTwr46p8HJuYPCkfJbM4,10534
 langroid/vector_store/qdrant_cloud.py,sha256=3im4Mip0QXLkR6wiqVsjV1QvhSElfxdFSuDKddBDQ-4,188
 langroid/vector_store/qdrantdb.py,sha256=v88lqFkepADvlN6lByUj9I4NEKa9X9lWH16uTPPbYrE,17457
-pyproject.toml,sha256=pWAWRj717icmsn0pbIcuLGcBCijdiCmR7Tyys3QqMV0,7157
-langroid-0.16.4.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
-langroid-0.16.4.dist-info/METADATA,sha256=MGx_fZMWdPlv08_QKRecIwH2Q9Oc0aIOd4pyUojkjcU,56165
-langroid-0.16.4.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-langroid-0.16.4.dist-info/RECORD,,
+pyproject.toml,sha256=CziUU2MWpGqVP_a5LNAgkBacE8VmtsfTPZeoKlR31es,7157
+langroid-0.16.5.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.16.5.dist-info/METADATA,sha256=D61Of4YYZzlKZfw9qAM_3J8sOKV1dbhTQXz1XAUGvHg,56165
+langroid-0.16.5.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+langroid-0.16.5.dist-info/RECORD,,

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langroid"
-version = "0.16.4"
+version = "0.16.5"
 description = "Harness LLMs with Multi-Agent Programming"
 authors = ["Prasad Chalasani <pchalasani@gmail.com>"]
 readme = "README.md"
@@ -87,7 +87,7 @@ nest-asyncio = "^1.6.0"
 async-generator = "^1.10"
 
 python-magic = "^0.4.27"
-json-repair = "^0.27.0"
+json-repair = "^0.29.0"
 cerebras-cloud-sdk = "^1.1.0"