grasp_agents 0.4.4__tar.gz → 0.4.6__tar.gz

{grasp_agents-0.4.4 → grasp_agents-0.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: grasp_agents
-Version: 0.4.4
+Version: 0.4.6
 Summary: Grasp Agents Library
 License-File: LICENSE.md
 Requires-Python: <4,>=3.11.4

{grasp_agents-0.4.4 → grasp_agents-0.4.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "grasp_agents"
-version = "0.4.4"
+version = "0.4.6"
 description = "Grasp Agents Library"
 readme = "README.md"
 requires-python = ">=3.11.4,<4"

{grasp_agents-0.4.4 → grasp_agents-0.4.6}/src/grasp_agents/utils.py

@@ -90,10 +90,18 @@ def validate_obj_from_json_or_py_string(
     strip_language_markdown: bool = True,
 ) -> T | str:
     _selected_adapter: TypeAdapter[T] | None = None
+    _selected_tag: str | None = None
+    s_orig = s
+
     if isinstance(adapter, Mapping):
-        for _marker, _adapter in adapter.items():
-            if _marker in s:
-                _selected_adapter = _adapter
+        for _tag, _adapter in adapter.items():
+            match = re.search(rf"<{_tag}>\s*(.*?)\s*</{_tag}>", s, re.DOTALL)
+            if not match:
+                continue
+            s = match.group(1).strip()
+            _selected_adapter = _adapter
+            _selected_tag = _tag
+            break
         if _selected_adapter is None:
             return s
     else:
@@ -126,9 +134,12 @@ def validate_obj_from_json_or_py_string(
             parsed = s
         return _selected_adapter.validate_python(parsed)
     except ValidationError as exc:
-        raise OutputValidationError(
-            f"Invalid JSON or Python string:\n{s}\nExpected type: {_type}"
-        ) from exc
+        err_message = f"Invalid JSON or Python string:\n{s_orig}"
+        if _selected_tag:
+            err_message += f"\nExpected type {_type} within tag <{_selected_tag}>"
+        else:
+            err_message += f"\nExpected type {_type}"
+        raise OutputValidationError(err_message) from exc
 
 
 def extract_xml_list(text: str) -> list[str]:
@@ -170,6 +181,7 @@ async def asyncio_gather_with_pbar(
     no_tqdm: bool = False,
     desc: str | None = None,
 ) -> list[Any]:
+    # TODO: optimize
     pbar = tqdm(total=len(corouts), desc=desc, disable=no_tqdm)
 
     async def run_and_update(coro: Coroutine[Any, Any, Any]) -> Any: