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

grasp_agents/cloud_llm.py

@@ -42,26 +42,28 @@ class APIProvider(TypedDict):
     struct_outputs_support: NotRequired[tuple[str, ...]]
 
 
-API_PROVIDERS: dict[APIProviderName, APIProvider] = {
-    "openai": APIProvider(
-        name="openai",
-        base_url="https://api.openai.com/v1",
-        api_key=os.getenv("OPENAI_API_KEY"),
-        struct_outputs_support=("*",),
-    ),
-    "openrouter": APIProvider(
-        name="openrouter",
-        base_url="https://openrouter.ai/api/v1",
-        api_key=os.getenv("OPENROUTER_API_KEY"),
-        struct_outputs_support=(),
-    ),
-    "google_ai_studio": APIProvider(
-        name="google_ai_studio",
-        base_url="https://generativelanguage.googleapis.com/v1beta/openai/",
-        api_key=os.getenv("GOOGLE_AI_STUDIO_API_KEY"),
-        struct_outputs_support=("*",),
-    ),
-}
+def get_api_providers() -> dict[APIProviderName, APIProvider]:
+    """Returns a dictionary of available API providers."""
+    return {
+        "openai": APIProvider(
+            name="openai",
+            base_url="https://api.openai.com/v1",
+            api_key=os.getenv("OPENAI_API_KEY"),
+            struct_outputs_support=("*",),
+        ),
+        "openrouter": APIProvider(
+            name="openrouter",
+            base_url="https://openrouter.ai/api/v1",
+            api_key=os.getenv("OPENROUTER_API_KEY"),
+            struct_outputs_support=(),
+        ),
+        "google_ai_studio": APIProvider(
+            name="google_ai_studio",
+            base_url="https://generativelanguage.googleapis.com/v1beta/openai/",
+            api_key=os.getenv("GOOGLE_AI_STUDIO_API_KEY"),
+            struct_outputs_support=("*",),
+        ),
+    }
 
 
 def retry_error_callback(retry_state: RetryCallState) -> Completion:
@@ -142,12 +144,16 @@ class CloudLLM(LLM[SettingsT_co, ConvertT_co], Generic[SettingsT_co, ConvertT_co
         if len(model_name_parts) == 2:
             api_provider_name, api_model_name = model_name_parts
             self._api_model_name: str = api_model_name
-            if api_provider_name not in API_PROVIDERS:
+
+            api_providers = get_api_providers()
+
+            if api_provider_name not in api_providers:
                 raise ValueError(
                     f"API provider '{api_provider_name}' is not supported. "
-                    f"Supported providers are: {', '.join(API_PROVIDERS.keys())}"
+                    f"Supported providers are: {', '.join(api_providers.keys())}"
                 )
-            _api_provider = API_PROVIDERS[api_provider_name]
+
+            _api_provider = api_providers[api_provider_name]
         elif api_provider is not None:
             self._api_model_name: str = model_name
             _api_provider = api_provider

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.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: grasp_agents
-Version: 0.4.4
+Version: 0.4.7
 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.7.dist-info}/RECORD

@@ -1,5 +1,5 @@
 grasp_agents/__init__.py,sha256=CIsyUasb9HBC3M4olg6ATAwKXtVNmmtpyGJrt7hpZW4,947
-grasp_agents/cloud_llm.py,sha256=Pnvey9HaRCudbOCx8vtbRYVsiG-Fn-vIssyUafUSq-0,13641
+grasp_agents/cloud_llm.py,sha256=DKzXkjBhmLHLTL7TLZJrdtXxp57NA77oXP9vxisu0So,13849
 grasp_agents/comm_processor.py,sha256=2xDZwv80velCyhK04xlQzlaAqj7sdnOfyYOHSaVC54g,7013
 grasp_agents/costs_dict.yaml,sha256=2MFNWtkv5W5WSCcv1Cj13B1iQLVv5Ot9pS_KW2Gu2DA,2510
 grasp_agents/errors.py,sha256=u-P8NZ3S7THQP5Bjv9SFC_JbHd3CKhX3dTWUObEBzmo,461
@@ -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.7.dist-info/METADATA,sha256=7tqiDpnb24hs8RWTTl81rw1ls3I8drnPVkFekRi4Le0,6868
+grasp_agents-0.4.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+grasp_agents-0.4.7.dist-info/licenses/LICENSE.md,sha256=-nNNdWqGB8gJ2O-peFQ2Irshv5tW5pHKyTcYkwvH7CE,1201
+grasp_agents-0.4.7.dist-info/RECORD,,