grasp_agents 0.4.4__tar.gz → 0.4.7__tar.gz

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

@@ -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 → grasp_agents-0.4.7}/pyproject.toml

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

{grasp_agents-0.4.4 → grasp_agents-0.4.7}/src/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-0.4.4 → grasp_agents-0.4.7}/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: