grasp_agents 0.3.3__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/llm.py

@@ -39,7 +39,7 @@ class LLM(ABC, Generic[SettingsT_co, ConvertT_co]):
         model_id: str | None = None,
         llm_settings: SettingsT_co | None = None,
         tools: list[BaseTool[BaseModel, Any, Any]] | None = None,
-        response_format: type | Mapping[str, type] | None = None,
+        response_format: Any | Mapping[str, Any] | None = None,
         **kwargs: Any,
     ) -> None:
         super().__init__()
@@ -51,15 +51,19 @@ class LLM(ABC, Generic[SettingsT_co, ConvertT_co]):
         self._llm_settings: SettingsT_co = llm_settings or cast("SettingsT_co", {})
 
         self._response_format = response_format
-        self._response_format_adapter: TypeAdapter[Any] | Mapping[str, TypeAdapter[Any]]
-        if isinstance(response_format, type):
-            self._response_format_adapter = TypeAdapter(response_format)
-        elif isinstance(response_format, Mapping):
-            self._response_format_adapter = {
-                k: TypeAdapter(v) for k, v in response_format.items()
-            }
-        else:
-            self._response_format_adapter = TypeAdapter(Any)
+        self._response_format_adapter: (
+            TypeAdapter[Any] | Mapping[str, TypeAdapter[Any]]
+        ) = self._get_response_format_adapter(response_format=response_format)
+
+    @staticmethod
+    def _get_response_format_adapter(
+        response_format: Any | Mapping[str, Any] | None = None,
+    ) -> TypeAdapter[Any] | Mapping[str, TypeAdapter[Any]]:
+        if response_format is None:
+            return TypeAdapter(Any)
+        if isinstance(response_format, Mapping):
+            return {k: TypeAdapter(v) for k, v in response_format.items()}  # type: ignore[return-value]
+        return TypeAdapter(response_format)
 
     @property
     def model_id(self) -> str:
@@ -74,23 +78,24 @@ class LLM(ABC, Generic[SettingsT_co, ConvertT_co]):
         return self._llm_settings
 
     @property
-    def tools(self) -> dict[str, BaseTool[BaseModel, Any, Any]] | None:
-        return self._tools
+    def response_format(self) -> Any | Mapping[str, Any] | None:
+        return self._response_format
+
+    @response_format.setter
+    def response_format(self, response_format: Any | Mapping[str, Any] | None) -> None:
+        self._response_format = response_format
+        self._response_format_adapter = self._get_response_format_adapter(
+            response_format
+        )
 
     @property
-    def response_format(self) -> type | Mapping[str, type] | None:
-        return self._response_format
+    def tools(self) -> dict[str, BaseTool[BaseModel, Any, Any]] | None:
+        return self._tools
 
     @tools.setter
     def tools(self, tools: list[BaseTool[BaseModel, Any, Any]] | None) -> None:
         self._tools = {t.name: t for t in tools} if tools else None
 
-    @response_format.setter
-    def response_format(
-        self, response_format: type | Mapping[str, type] | None
-    ) -> None:
-        self._response_format = response_format
-
     def __repr__(self) -> str:
         return (
             f"{type(self).__name__}(model_id={self.model_id}; "
@@ -101,9 +106,7 @@ class LLM(ABC, Generic[SettingsT_co, ConvertT_co]):
         for message in completion.messages:
             if not message.tool_calls:
                 validate_obj_from_json_or_py_string(
-                    message.content or "",
-                    adapter=self._response_format_adapter,
-                    from_substring=True,
+                    message.content or "", adapter=self._response_format_adapter
                 )
 
     def _validate_tool_calls(self, completion: Completion) -> None:

grasp_agents/llm_agent.py

@@ -63,9 +63,9 @@ class LLMAgent(
         sys_prompt: LLMPrompt | None = None,
         sys_prompt_path: str | Path | None = None,
         # System args (static args provided via RunContext)
-        sys_args_schema: type[LLMPromptArgs] = LLMPromptArgs,
+        sys_args_schema: type[LLMPromptArgs] | None = None,
         # User args (static args provided via RunContext)
-        usr_args_schema: type[LLMPromptArgs] = LLMPromptArgs,
+        usr_args_schema: type[LLMPromptArgs] | None = None,
         # Agent loop settings
         max_turns: int = 100,
         react_mode: bool = False,
@@ -82,14 +82,13 @@ class LLMAgent(
 
         self._memory: LLMAgentMemory = LLMAgentMemory()
         self._reset_memory_on_run = reset_memory_on_run
-        self._set_memory_impl: SetMemoryHandler | None = None
 
         # LLM policy executor
 
-        self._using_default_llm_response_format: bool = False
+        self._used_default_llm_response_format: bool = False
         if llm.response_format is None and tools is None:
             llm.response_format = self.out_type
-            self._using_default_llm_response_format = True
+            self._used_default_llm_response_format = True
 
         self._policy_executor: LLMPolicyExecutor[OutT_co, CtxT] = LLMPolicyExecutor[
             self.out_type, CtxT
@@ -118,6 +117,10 @@ class LLMAgent(
 
         self.no_tqdm = getattr(llm, "no_tqdm", False)
 
+        self._set_memory_impl: SetMemoryHandler | None = None
+        self._parse_output_impl: (
+            ParseOutputHandler[InT_contra, OutT_co, CtxT] | None
+        ) = None
         self._register_overridden_handlers()
 
     @property
@@ -148,32 +151,6 @@ class LLMAgent(
     def in_prompt(self) -> LLMPrompt | None:
         return self._prompt_builder.in_prompt_template
 
-    def _parse_output(
-        self,
-        conversation: Messages,
-        *,
-        in_args: InT_contra | None = None,
-        batch_idx: int = 0,
-        ctx: RunContext[CtxT] | None = None,
-    ) -> OutT_co:
-        if self._parse_output_impl:
-            if self._using_default_llm_response_format:
-                # When using custom output parsing, the required LLM response format
-                # can differ from the final agent output type ->
-                # set it back to None unless it was specified explicitly at init.
-                self._policy_executor.llm.response_format = None
-                # self._using_default_llm_response_format = False
-
-            return self._parse_output_impl(
-                conversation=conversation, in_args=in_args, batch_idx=batch_idx, ctx=ctx
-            )
-
-        return validate_obj_from_json_or_py_string(
-            str(conversation[-1].content or ""),
-            adapter=self._out_type_adapter,
-            from_substring=True,
-        )
-
     def _memorize_inputs(
         self,
         chat_inputs: LLMPrompt | Sequence[str | ImageData] | None = None,
@@ -251,6 +228,25 @@ class LLMAgent(
 
         return outputs
 
+    def _parse_output(
+        self,
+        conversation: Messages,
+        *,
+        in_args: InT_contra | None = None,
+        batch_idx: int = 0,
+        ctx: RunContext[CtxT] | None = None,
+    ) -> OutT_co:
+        if self._parse_output_impl:
+            return self._parse_output_impl(
+                conversation=conversation, in_args=in_args, batch_idx=batch_idx, ctx=ctx
+            )
+
+        return validate_obj_from_json_or_py_string(
+            str(conversation[-1].content or ""),
+            adapter=self._out_type_adapter,
+            from_substring=True,
+        )
+
     async def _process(
         self,
         chat_inputs: LLMPrompt | Sequence[str | ImageData] | None = None,
@@ -330,6 +326,8 @@ class LLMAgent(
     def parse_output(
         self, func: ParseOutputHandler[InT_contra, OutT_co, CtxT]
     ) -> ParseOutputHandler[InT_contra, OutT_co, CtxT]:
+        if self._used_default_llm_response_format:
+            self._policy_executor.llm.response_format = None
         self._parse_output_impl = func
 
         return func
@@ -376,9 +374,11 @@ class LLMAgent(
         ):
             self._policy_executor.exit_tool_call_loop_impl = self._exit_tool_call_loop
 
-        self._parse_output_impl: (
-            ParseOutputHandler[InT_contra, OutT_co, CtxT] | None
-        ) = None
+        if (
+            cur_cls._parse_output is not base_cls._parse_output  # noqa: SLF001
+            and self._used_default_llm_response_format
+        ):
+            self._policy_executor.llm.response_format = None
 
     def _make_system_prompt(
         self, sys_args: LLMPromptArgs | None, *, ctx: RunContext[CtxT] | None = None

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/printer.py

@@ -135,7 +135,7 @@ class Printer:
                 elif self.color_by == "role":
                     tool_color = self.get_role_color(role=Role.TOOL)
                 logger.debug(
-                    f"\n[TOOL_CALL]<{agent_name}>\n{tool_call.tool_name} "
+                    f"\n<{agent_name}>[TOOL_CALL]\n{tool_call.tool_name} "
                     f"| {tool_call.id}\n{tool_call.tool_arguments}",
                     extra={"color": tool_color},  # type: ignore
                 )

grasp_agents/prompt_builder.py

@@ -79,9 +79,7 @@ class PromptBuilder(AutoInstanceAttributesMixin, Generic[InT_contra, CtxT]):
         if self.make_system_prompt_impl:
             return self.make_system_prompt_impl(sys_args=val_sys_args, ctx=ctx)
 
-        sys_args_dict = (
-            val_sys_args.model_dump(exclude_unset=True) if val_sys_args else {}
-        )
+        sys_args_dict = val_sys_args.model_dump() if val_sys_args else {}
 
         return self.sys_prompt_template.format(**sys_args_dict)
 
@@ -208,10 +206,7 @@ class PromptBuilder(AutoInstanceAttributesMixin, Generic[InT_contra, CtxT]):
         return formatted_args, contains_image_data
 
     def _combine_args(
-        self,
-        *,
-        in_args: InT_contra | None,
-        usr_args: LLMPromptArgs | None,
+        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)

grasp_agents/run_context.py

@@ -13,8 +13,8 @@ from .usage_tracker import UsageTracker
 
 
 class RunArgs(BaseModel):
-    sys: LLMPromptArgs = Field(default_factory=LLMPromptArgs)
-    usr: LLMPromptArgs = Field(default_factory=LLMPromptArgs)
+    sys: LLMPromptArgs | None = None
+    usr: LLMPromptArgs | None = None
 
     model_config = ConfigDict(extra="forbid")
 

grasp_agents/utils.py

@@ -6,7 +6,7 @@ from collections.abc import Coroutine, Mapping
 from datetime import UTC, datetime
 from logging import getLogger
 from pathlib import Path
-from typing import Any, TypeVar, overload
+from typing import Any, TypeVar, get_args, overload
 
 from pydantic import TypeAdapter, ValidationError
 from tqdm.autonotebook import tqdm
@@ -88,21 +88,24 @@ def validate_obj_from_json_or_py_string(
     else:
         _selected_adapter = adapter
 
-    if _selected_adapter._type is str:  # type: ignore[arg-type]
-        return s
+    _type = _selected_adapter._type  # type: ignore[attr-defined]
+    type_args = get_args(_type)
+    is_str_type = (_type is str) or (len(type_args) == 1 and type_args[0] is str)
 
     try:
-        if from_substring:
-            parsed = parse_json_or_py_substring(s, return_none_on_failure=True)
+        if not is_str_type:
+            if from_substring:
+                parsed = parse_json_or_py_substring(s, return_none_on_failure=True)
+            else:
+                parsed = parse_json_or_py_string(s, return_none_on_failure=True)
+            if parsed is None:
+                parsed = s
         else:
-            parsed = parse_json_or_py_string(s, return_none_on_failure=True)
-        if parsed is None:
             parsed = s
         return _selected_adapter.validate_python(parsed)
     except (json.JSONDecodeError, ValidationError) as exc:
         raise ValueError(
-            f"Invalid JSON or Python string:\n{s}\n"
-            f"Expected type: {_selected_adapter._type}",  # type: ignore[arg-type]
+            f"Invalid JSON or Python string:\n{s}\nExpected type: {_type}"
         ) from exc
 
 

{grasp_agents-0.3.3.dist-info → grasp_agents-0.3.6.dist-info}/METADATA

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

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

@@ -1,31 +1,31 @@
 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
 grasp_agents/grasp_logging.py,sha256=H1GYhXdQvVkmauFDZ-KDwvVmPQHZUUm9sRqX_ObK2xI,1111
 grasp_agents/http_client.py,sha256=KZva2MjJjuI5ohUeU8RdTAImUnQYaqBrV2jDH8smbJw,738
-grasp_agents/llm.py,sha256=5Yn4jkBPSbGVMf1sEuYXX6YrJlYZiH7oqKLY0yQIn-U,5192
-grasp_agents/llm_agent.py,sha256=a9TCUpQJwpC5Y0dnTqh5bhRLNsQt8pQOjp9d_7QGRVY,14791
+grasp_agents/llm.py,sha256=vVjELab9l0mK9bjO-IJebmmXUyUiws2fNjbXVQQNRvs,5392
+grasp_agents/llm_agent.py,sha256=_Fb3PAfw5okbsybz-BsUkd4kN8K9D5Sjw3HCbDHJFGk,14697
 grasp_agents/llm_agent_memory.py,sha256=kD_UIF8xVgbSgW6xN87TzkdQcbTWLB-C5ZQu1_2HLx8,1770
 grasp_agents/llm_policy_executor.py,sha256=PVNuAejt3S-aSGsT7HvgYHyX_cZQSvrt1aUGPdkXtE4,17847
 grasp_agents/memory.py,sha256=gPkVIIF6dI_xXzarIAw9kSEnSJcfW_teUsWA2JAih94,671
 grasp_agents/message_history.py,sha256=-ZNy3C1z0yQeahjqR0oIoWDMySJ7vPS19jdutibW7OE,5408
 grasp_agents/packet.py,sha256=PZ1EpclniAoLk7z4ieZbWzgYH3JSRgnlTe_WfbJYG_4,707
 grasp_agents/packet_pool.py,sha256=9umHbi5FwuUYYhhodSR-Z-fRR6OYiZyYEzq5d4nZFK4,3036
-grasp_agents/printer.py,sha256=eVpSZMVk4ZLkV78Sgfg1euzkaS3XBCb30yJcwLMqI0w,5464
+grasp_agents/printer.py,sha256=M-gkLrZMg0ll9T1MRmKOQbp65niFB5ZiZbm-tUT_EYw,5464
 grasp_agents/processor.py,sha256=Atd_iTQNd3Nudb4mHqt3a5AQ31QUgpbrt1Fhn1sgpSk,6708
-grasp_agents/prompt_builder.py,sha256=CGs7ADlGGmRyDqgFte36cYXKsB3C7SjzqSbkRaWlLN8,8481
-grasp_agents/run_context.py,sha256=0y1JDbz3hJbGiqd3EjUYagkMbEK8YlCzdErp3R2MCr0,1647
+grasp_agents/prompt_builder.py,sha256=1o7eMO4FxqRrrXFCj7aQKIajty6jZbBVaUZv7qOMIoY,8414
+grasp_agents/run_context.py,sha256=9CidWWCKJ8umlhkRGtg_P3JQsRpH0K3_vhUjgVon4Wk,1597
 grasp_agents/usage_tracker.py,sha256=SPwv6RpdoHRuMIKE2hCAWAvDbtR3uXuhr2jpHQuKWhI,3438
-grasp_agents/utils.py,sha256=GyJNHkMHnQM3WOUGWD05GpY-iWSd9TtZxfUnFUw9Im0,4605
+grasp_agents/utils.py,sha256=WNA5b0IkAsth0XKHEjgTY3PIHdw5L3vEsYPkyDGw8Mw,4741
 grasp_agents/openai/__init__.py,sha256=wpTeew6EjhM6esHCKrEKUpwq0kygMN2QQDxYtmbRG8Y,4201
 grasp_agents/openai/completion_chunk_converters.py,sha256=i-1SvIWhRKtL0K8p5pb3jjACSnyHuJHTCoZovEERpxs,2628
 grasp_agents/openai/completion_converters.py,sha256=vzPEkUOX4l2hobKxZjEk_dyWfzeYesO0DlvWvNVb-Sg,2656
 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.3.dist-info/METADATA,sha256=bV-dofgYSNMv1JHo7kxOZKD6DFDKAb4pHL5yeApC2aA,6806
-grasp_agents-0.3.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-grasp_agents-0.3.3.dist-info/licenses/LICENSE.md,sha256=-nNNdWqGB8gJ2O-peFQ2Irshv5tW5pHKyTcYkwvH7CE,1201
-grasp_agents-0.3.3.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,,