grasp_agents 0.3.5__py3-none-any.whl → 0.3.6__py3-none-any.whl

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

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

{grasp_agents-0.3.5.dist-info → grasp_agents-0.3.6.dist-info}/RECORD

@@ -1,5 +1,5 @@
 grasp_agents/__init__.py,sha256=CIsyUasb9HBC3M4olg6ATAwKXtVNmmtpyGJrt7hpZW4,947
-grasp_agents/cloud_llm.py,sha256=Psta1FH0YpBUxLnQJ55KUS5o7-eMR-uxrAP_AEUbupk,13427
+grasp_agents/cloud_llm.py,sha256=S3yl-bKhAyThs5drHS_hmkmWa_mTlaC-guTX84v6KXM,13798
 grasp_agents/comm_processor.py,sha256=YzvvHgrSrgn1oXEpkGXNrAtogFyq6gpS0UrVMBO7LBY,6722
 grasp_agents/costs_dict.yaml,sha256=2MFNWtkv5W5WSCcv1Cj13B1iQLVv5Ot9pS_KW2Gu2DA,2510
 grasp_agents/generics_utils.py,sha256=5Pw3I9dlnKC2VGqYKC4ZZUO3Z_vTNT-NPFovNfPkl6I,6542
@@ -25,7 +25,7 @@ grasp_agents/openai/completion_converters.py,sha256=vzPEkUOX4l2hobKxZjEk_dyWfzeY
 grasp_agents/openai/content_converters.py,sha256=r1D5uci5x7sbDyl0XN27y-l_jVigCauJruvSdZSnZcc,2510
 grasp_agents/openai/converters.py,sha256=ncscVyPnPMMbyxAfFX3U73lnr_BZU-I89HA5Ld8BuxI,4691
 grasp_agents/openai/message_converters.py,sha256=_fG4vI42rBzoajuC5iYgnUBalg8cQ1ckSt8xFBOuWVY,4111
-grasp_agents/openai/openai_llm.py,sha256=sd1nE5eLUMA8NBqUkSwo_BTfyEBmp9j7Gpuf_s0abw4,7961
+grasp_agents/openai/openai_llm.py,sha256=Hm2S2yyrR3cRvH20YHRegoTEYaetbx_USxI8CXIhfro,8091
 grasp_agents/openai/tool_converters.py,sha256=d_7edJbnUhfSs2-F4J20D71UjVJWIslsXwMyac7-v2Q,1246
 grasp_agents/rate_limiting/__init__.py,sha256=KRgtF_E7R3YfA2cpYcFcZ7wycV0pWVJ0xRQC7YhiIEQ,158
 grasp_agents/rate_limiting/rate_limiter_chunked.py,sha256=BPgkUXvhmZhTpZs2T6uujNFuxH_kYHiISuf6_-eNhUc,5544
@@ -45,7 +45,7 @@ grasp_agents/workflow/looped_workflow.py,sha256=QqXclXYxsW6C8Rxkf3dRaMHi-DfCvCbj
 grasp_agents/workflow/parallel_processor.py,sha256=Xyzs2UR_mRe2GFgzzadHOhqgMu3rFjd3GUjvmZimt_k,3505
 grasp_agents/workflow/sequential_workflow.py,sha256=Pl7jl9ZVDu-rC5UMfympEaQN8iG3kZurVF5eIPG62XA,2130
 grasp_agents/workflow/workflow_processor.py,sha256=2-iaDIlgNXgj-ClGbiE3fYfSv-N_qRC49Gf_dF6M_40,2640
-grasp_agents-0.3.5.dist-info/METADATA,sha256=O_mAQKcTBjZB5H9UoINxgkbnQyUUJE8TBEDSmFaEBVc,6806
-grasp_agents-0.3.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-grasp_agents-0.3.5.dist-info/licenses/LICENSE.md,sha256=-nNNdWqGB8gJ2O-peFQ2Irshv5tW5pHKyTcYkwvH7CE,1201
-grasp_agents-0.3.5.dist-info/RECORD,,
+grasp_agents-0.3.6.dist-info/METADATA,sha256=kwdiPSqyVZ1B3kjjQFbyDDzdm0eokb6k0krwHqZWQ0s,6806
+grasp_agents-0.3.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+grasp_agents-0.3.6.dist-info/licenses/LICENSE.md,sha256=-nNNdWqGB8gJ2O-peFQ2Irshv5tW5pHKyTcYkwvH7CE,1201
+grasp_agents-0.3.6.dist-info/RECORD,,