grasp_agents 0.3.5__tar.gz → 0.3.7__tar.gz

{grasp_agents-0.3.5 → grasp_agents-0.3.7}/PKG-INFO

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

{grasp_agents-0.3.5 → grasp_agents-0.3.7}/pyproject.toml

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

{grasp_agents-0.3.5 → grasp_agents-0.3.7}/src/grasp_agents/cloud_llm.py

@@ -127,21 +127,32 @@ class CloudLLM(LLM[SettingsT_co, ConvertT_co], Generic[SettingsT_co, ConvertT_co
         )
 
         self._model_name = model_name
+        model_name_parts = model_name.split(":", 1)
+
+        if len(model_name_parts) == 2 and model_name_parts[0] in PROVIDERS:
+            api_provider, api_model_name = model_name_parts
+            if api_provider not in PROVIDERS:
+                raise ValueError(
+                    f"API provider '{api_provider}' is not supported. "
+                    f"Supported providers are: {', '.join(PROVIDERS.keys())}"
+                )
 
-        api_provider = model_name.split(":", 1)[0]
-        api_model_name = model_name.split(":", 1)[-1]
-        if api_provider not in PROVIDERS:
-            raise ValueError(
-                f"API provider '{api_provider}' is not supported. "
-                f"Supported providers are: {', '.join(PROVIDERS.keys())}"
+            self._api_provider: APIProvider | None = api_provider
+            self._api_model_name: str = api_model_name
+            self._base_url: str | None = PROVIDERS[api_provider]["base_url"]
+            self._api_key: str | None = PROVIDERS[api_provider]["api_key"]
+            self._struct_outputs_support: bool = any(
+                fnmatch.fnmatch(self._model_name, pat)
+                for pat in PROVIDERS[api_provider]["struct_outputs_support"]
             )
-        self._api_provider: APIProvider = api_provider
-        self._api_model_name: str = api_model_name
 
-        self._struct_outputs_support: bool = any(
-            fnmatch.fnmatch(self._model_name, pat)
-            for pat in PROVIDERS[api_provider]["struct_outputs_support"]
-        )
+        else:
+            self._api_provider = None
+            self._api_model_name = model_name
+            self._base_url = None
+            self._api_key = None
+            self._struct_outputs_support = False
+
         if (
             self._llm_settings.get("use_struct_outputs")
             and not self._struct_outputs_support
@@ -161,9 +172,6 @@ class CloudLLM(LLM[SettingsT_co, ConvertT_co], Generic[SettingsT_co, ConvertT_co
             )
         )
         self.no_tqdm = no_tqdm
-
-        self._base_url: str = PROVIDERS[api_provider]["base_url"]
-        self._api_key: str | None = PROVIDERS[api_provider]["api_key"]
         self._client: Any
 
         self._async_http_client: httpx.AsyncClient | None = None
@@ -178,7 +186,7 @@ class CloudLLM(LLM[SettingsT_co, ConvertT_co], Generic[SettingsT_co, ConvertT_co
         self.num_generation_retries = num_generation_retries
 
     @property
-    def api_provider(self) -> APIProvider:
+    def api_provider(self) -> APIProvider | None:
         return self._api_provider
 
     @property

{grasp_agents-0.3.5 → grasp_agents-0.3.7}/src/grasp_agents/openai/openai_llm.py

@@ -80,6 +80,7 @@ class OpenAILLM(CloudLLM[OpenAILLMSettings, OpenAIConverters]):
             dict[str, Any] | AsyncHTTPClientParams | None
         ) = None,
         async_openai_client_params: dict[str, Any] | None = None,
+        client: AsyncOpenAI | None = None,
         # Rate limiting
         rate_limiter: (RateLimiterC[Messages, AssistantMessage] | None) = None,
         rate_limiter_rpm: float | None = None,
@@ -117,11 +118,14 @@ class OpenAILLM(CloudLLM[OpenAILLMSettings, OpenAIConverters]):
             _async_openai_client_params["http_client"] = self._async_http_client
 
         # TODO: context manager for async client
-        self._client: AsyncOpenAI = AsyncOpenAI(
-            base_url=self._base_url,
-            api_key=self._api_key,
-            **_async_openai_client_params,
-        )
+        if client:
+            self._client = client
+        else:
+            self._client: AsyncOpenAI = AsyncOpenAI(
+                base_url=self._base_url,
+                api_key=self._api_key,
+                **_async_openai_client_params,
+            )
 
     async def _get_completion(
         self,

{grasp_agents-0.3.5 → grasp_agents-0.3.7}/src/grasp_agents/prompt_builder.py

@@ -165,7 +165,7 @@ class PromptBuilder(AutoInstanceAttributesMixin, Generic[InT_contra, CtxT]):
         if in_args is not None:
             val_in_args = self._in_args_type_adapter.validate_python(in_args)
             if isinstance(val_in_args, BaseModel):
-                _, has_image = self._format_pydantic_prompt_args(val_in_args)
+                has_image = self._has_image_data(val_in_args)
                 if has_image and self.in_prompt_template is None:
                     raise TypeError(
                         "BaseModel input arguments contain ImageData, but input prompt "
@@ -179,22 +179,27 @@ class PromptBuilder(AutoInstanceAttributesMixin, Generic[InT_contra, CtxT]):
 
         return val_in_args, val_usr_args
 
+    @staticmethod
+    def _has_image_data(inp: BaseModel) -> bool:
+        contains_image_data = False
+        for field in type(inp).model_fields:
+            if isinstance(getattr(inp, field), ImageData):
+                contains_image_data = True
+
+        return contains_image_data
+
     @staticmethod
     def _format_pydantic_prompt_args(
         inp: BaseModel,
-    ) -> tuple[dict[str, PromptArgumentType], bool]:
+    ) -> dict[str, PromptArgumentType]:
         formatted_args: dict[str, PromptArgumentType] = {}
-        contains_image_data = False
         for field in type(inp).model_fields:
             if field == "selected_recipients":
                 continue
 
             val = getattr(inp, field)
-            if isinstance(val, (int, str, bool)):
-                formatted_args[field] = val
-            elif isinstance(val, ImageData):
+            if isinstance(val, (int, str, bool, ImageData)):
                 formatted_args[field] = val
-                contains_image_data = True
             elif isinstance(val, BaseModel):
                 formatted_args[field] = val.model_dump_json(indent=2, warnings="error")
             else:
@@ -203,20 +208,18 @@ class PromptBuilder(AutoInstanceAttributesMixin, Generic[InT_contra, CtxT]):
                     "int, str, bool, BaseModel, or ImageData."
                 )
 
-        return formatted_args, contains_image_data
+        return formatted_args
 
     def _combine_args(
         self, *, in_args: InT_contra | None, usr_args: LLMPromptArgs | None
     ) -> Mapping[str, PromptArgumentType] | str:
-        fmt_usr_args, _ = (
-            self._format_pydantic_prompt_args(usr_args) if usr_args else ({}, False)
-        )
+        fmt_usr_args = self._format_pydantic_prompt_args(usr_args) if usr_args else {}
 
         if in_args is None:
             return fmt_usr_args
 
         if isinstance(in_args, BaseModel):
-            fmt_in_args, _ = self._format_pydantic_prompt_args(in_args)
+            fmt_in_args = self._format_pydantic_prompt_args(in_args)
             return fmt_in_args | fmt_usr_args
 
         combined_args_str = self._in_args_type_adapter.dump_json(