grasp_agents 0.4.4__py3-none-any.whl → 0.4.6__py3-none-any.whl

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:

{grasp_agents-0.4.4.dist-info → grasp_agents-0.4.6.dist-info}/METADATA

@@ -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.dist-info → grasp_agents-0.4.6.dist-info}/RECORD

@@ -18,7 +18,7 @@ grasp_agents/processor.py,sha256=WZ7ps3b3knBaGrMAjEaIBUlOV1L_Dh4H6BUOf4CGWF8,112
 grasp_agents/prompt_builder.py,sha256=wDcB1UaOH8vdxw1tmWZwVZS_bCdWU0VKQvHLpI8SnCk,7970
 grasp_agents/run_context.py,sha256=pUi2a9WeHUg67cUTQ5T13mmJ3vzQfv-855fWLPeYRmo,1438
 grasp_agents/usage_tracker.py,sha256=3gmgPcB7qHAl5W5Ffnmu_8GOcKBSv3xM1NLy-HMuSlo,3691
-grasp_agents/utils.py,sha256=5WpMEZB42QmXGUwMJjtr3aJOMUZlQust3UtMGXs8Uq0,5501
+grasp_agents/utils.py,sha256=fSi4nOwRezg4umzHVO23-mhuyjMAvJQLAfsmGjxxrKc,5928
 grasp_agents/openai/__init__.py,sha256=wpTeew6EjhM6esHCKrEKUpwq0kygMN2QQDxYtmbRG8Y,4201
 grasp_agents/openai/completion_chunk_converters.py,sha256=TFOA7MJniiSV6_lPZsPSg06GlfdWguTrYS2Hd45BjcU,2674
 grasp_agents/openai/completion_converters.py,sha256=vzPEkUOX4l2hobKxZjEk_dyWfzeYesO0DlvWvNVb-Sg,2656
@@ -44,7 +44,7 @@ grasp_agents/workflow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 grasp_agents/workflow/looped_workflow.py,sha256=eQkjCo6j3W5Xc7mw3AGmXpUhTkK2BmhrvCuht2UkZuI,4537
 grasp_agents/workflow/sequential_workflow.py,sha256=UCHZXvTy47S0UG0WwuKp2G7Az6dAcE5tIFPaOXhxcWM,2347
 grasp_agents/workflow/workflow_processor.py,sha256=lGW-Cy1QraU1AaCPVRs9-EtU5Z_3O3EAnuyIPzD6KQ8,3134
-grasp_agents-0.4.4.dist-info/METADATA,sha256=t3yTj29JJi4h2CHsIWTyZVTuyLu_PKlSRlGWJ0QtuyM,6868
-grasp_agents-0.4.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-grasp_agents-0.4.4.dist-info/licenses/LICENSE.md,sha256=-nNNdWqGB8gJ2O-peFQ2Irshv5tW5pHKyTcYkwvH7CE,1201
-grasp_agents-0.4.4.dist-info/RECORD,,
+grasp_agents-0.4.6.dist-info/METADATA,sha256=EDbimHKbXtf77__Yx5MXeebiKOA_0Y6cTT-8RNrytK0,6868
+grasp_agents-0.4.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+grasp_agents-0.4.6.dist-info/licenses/LICENSE.md,sha256=-nNNdWqGB8gJ2O-peFQ2Irshv5tW5pHKyTcYkwvH7CE,1201
+grasp_agents-0.4.6.dist-info/RECORD,,