grasp_agents 0.5.13__tar.gz → 0.5.15__tar.gz

{grasp_agents-0.5.13 → grasp_agents-0.5.15}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: grasp_agents
-Version: 0.5.13
+Version: 0.5.15
 Summary: Grasp Agents Library
 License-File: LICENSE.md
 Requires-Python: <4,>=3.11.4
 Requires-Dist: dotenv>=0.9.9
 Requires-Dist: httpx<1,>=0.27.0
-Requires-Dist: litellm>=1.74.4
+Requires-Dist: litellm>=1.76.3
 Requires-Dist: openai<2,>=1.68.2
 Requires-Dist: pydantic>=2
 Requires-Dist: pyyaml>=6.0.2

{grasp_agents-0.5.13 → grasp_agents-0.5.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "grasp_agents"
-version = "0.5.13"
+version = "0.5.15"
 description = "Grasp Agents Library"
 readme = "README.md"
 requires-python = ">=3.11.4,<4"
@@ -13,7 +13,7 @@ dependencies = [
     "dotenv>=0.9.9",
     "pyyaml>=6.0.2",
     "pydantic>=2",
-    "litellm>=1.74.4",
+    "litellm>=1.76.3",
 ]
 
 [dependency-groups]

{grasp_agents-0.5.13 → grasp_agents-0.5.15}/src/grasp_agents/cloud_llm.py

@@ -64,6 +64,7 @@ class CloudLLM(LLM[SettingsT_co, ConvertT_co], Generic[SettingsT_co, ConvertT_co
     api_provider: APIProvider | None = None
     llm_settings: SettingsT_co | None = None
     rate_limiter: LLMRateLimiter | None = None
+    client_timeout: float = 60.0
     max_client_retries: int = 2  # HTTP client retries for network errors
     max_response_retries: int = (
         0  # LLM response retries: try to regenerate to pass validation
@@ -71,7 +72,7 @@ class CloudLLM(LLM[SettingsT_co, ConvertT_co], Generic[SettingsT_co, ConvertT_co
     apply_response_schema_via_provider: bool = False
     apply_tool_call_schema_via_provider: bool = False
     async_http_client: httpx.AsyncClient | None = None
-    async_http_client_params: dict[str, Any] | AsyncHTTPClientParams | None = None
+    async_http_client_params: AsyncHTTPClientParams | None = None
 
     def __post_init__(self) -> None:
         if self.rate_limiter is not None:

{grasp_agents-0.5.13 → grasp_agents-0.5.15}/src/grasp_agents/http_client.py

@@ -1,5 +1,3 @@
-from typing import Any
-
 import httpx
 from pydantic import BaseModel, NonNegativeFloat, PositiveInt
 
@@ -9,13 +7,26 @@ class AsyncHTTPClientParams(BaseModel):
     max_connections: PositiveInt = 2000
     max_keepalive_connections: PositiveInt = 500
     keepalive_expiry: float | None = 5
+    # proxy: str | None = None
+    # follow_redirects: bool = False
+    # trust_env: bool = True
+    # auth: AuthTypes | None = (None,)
+    # params: QueryParamTypes | None = (None,)
+    # headers: HeaderTypes | None = (None,)
+    # cookies: CookieTypes | None = (None,)
 
 
 def create_simple_async_httpx_client(
-    client_params: AsyncHTTPClientParams | dict[str, Any],
+    client_params: AsyncHTTPClientParams,
 ) -> httpx.AsyncClient:
-    if isinstance(client_params, dict):
-        client_params = AsyncHTTPClientParams(**client_params)
+    extra_params = client_params.model_dump(
+        exclude={
+            "timeout",
+            "max_connections",
+            "max_keepalive_connections",
+            "keepalive_expiry",
+        }
+    )
     return httpx.AsyncClient(
         timeout=httpx.Timeout(client_params.timeout),
         limits=httpx.Limits(
@@ -23,4 +34,5 @@ def create_simple_async_httpx_client(
             max_keepalive_connections=client_params.max_keepalive_connections,
             keepalive_expiry=client_params.keepalive_expiry,
         ),
+        **extra_params,
     )

{grasp_agents-0.5.13 → grasp_agents-0.5.15}/src/grasp_agents/litellm/lite_llm.py

@@ -45,7 +45,6 @@ class LiteLLMSettings(OpenAILLMSettings, total=False):
 class LiteLLM(CloudLLM[LiteLLMSettings, LiteLLMConverters]):
     converters: LiteLLMConverters = field(default_factory=LiteLLMConverters)
 
-    timeout: float | None = None
     # Drop unsupported LLM settings
     drop_params: bool = True
     additional_drop_params: list[str] | None = None
@@ -63,7 +62,7 @@ class LiteLLM(CloudLLM[LiteLLMSettings, LiteLLMConverters]):
         self._lite_llm_completion_params.update(
             {
                 "max_retries": self.max_client_retries,
-                "timeout": self.timeout,
+                "timeout": self.client_timeout,
                 "drop_params": self.drop_params,
                 "additional_drop_params": self.additional_drop_params,
                 "allowed_openai_params": self.allowed_openai_params,
@@ -195,14 +194,15 @@ class LiteLLM(CloudLLM[LiteLLMSettings, LiteLLMConverters]):
 
         async for completion_chunk in stream:
             # Fix tool call indices to be unique within each choice
-            for n, choice in enumerate(completion_chunk.choices):
-                for tc in choice.delta.tool_calls or []:
-                    # Tool call ID is not None only when it is a new tool call
-                    if tc.id and tc.index in tc_indices[n]:
-                        tc.index = max(tc_indices[n]) + 1
-                    tc_indices[n].add(tc.index)
-
-            yield completion_chunk
+            if completion_chunk is not None:
+                for n, choice in enumerate(completion_chunk.choices):
+                    for tc in choice.delta.tool_calls or []:
+                        # Tool call ID is not None only when it is a new tool call
+                        if tc.id and tc.index in tc_indices[n]:
+                            tc.index = max(tc_indices[n]) + 1
+                        tc_indices[n].add(tc.index)
+
+                yield completion_chunk
 
     def combine_completion_chunks(
         self,

{grasp_agents-0.5.13 → grasp_agents-0.5.15}/src/grasp_agents/openai/openai_llm.py

@@ -150,6 +150,7 @@ class OpenAILLM(CloudLLM[OpenAILLMSettings, OpenAIConverters]):
             base_url=_api_provider.get("base_url"),
             api_key=_api_provider.get("api_key"),
             max_retries=self.max_client_retries,
+            timeout=self.client_timeout,
             **_async_openai_client_params,
         )
 

{grasp_agents-0.5.13 → grasp_agents-0.5.15}/src/grasp_agents/processors/base_processor.py

@@ -47,6 +47,7 @@ def with_retry(func: F) -> F:
     async def wrapper(
         self: "BaseProcessor[Any, Any, Any, Any]", *args: Any, **kwargs: Any
     ) -> Packet[Any]:
+        none_packet = Packet(payloads=[None], sender=self.name)
         call_id = kwargs.get("call_id", "unknown")
         for n_attempt in range(self.max_retries + 1):
             try:
@@ -61,12 +62,12 @@ def with_retry(func: F) -> F:
                     else:
                         logger.warning(f"{err_message} after retrying:\n{err}")
                     # raise ProcRunError(proc_name=self.name, call_id=call_id) from err
-                    return None  # type: ignore[return]
+                    return none_packet
 
                 logger.warning(f"{err_message} (retry attempt {n_attempt + 1}):\n{err}")
         # This part should not be reachable due to the raise in the loop
         # raise ProcRunError(proc_name=self.name, call_id=call_id)
-        return None  # type: ignore[return]
+        return none_packet
 
     return cast("F", wrapper)
 

{grasp_agents-0.5.13 → grasp_agents-0.5.15}/src/grasp_agents/utils.py

@@ -6,7 +6,7 @@ from collections.abc import AsyncIterator, Coroutine, Mapping
 from datetime import UTC, datetime
 from logging import getLogger
 from pathlib import Path
-from typing import Annotated, Any, TypeVar, get_args, get_origin
+from typing import Annotated, Any, NoReturn, TypeVar, get_args, get_origin
 
 from pydantic import TypeAdapter
 from pydantic import ValidationError as PydanticValidationError
@@ -71,12 +71,15 @@ def is_str_type(t: Any) -> bool:
     )
 
 
+T = TypeVar("T")
+
+
 def validate_obj_from_json_or_py_string(
     s: str,
-    schema: Any,
+    schema: type[T],
     from_substring: bool = False,
     strip_language_markdown: bool = True,
-) -> Any:
+) -> T:
     try:
         if is_str_type(schema):
             parsed = s
@@ -94,19 +97,36 @@ def validate_obj_from_json_or_py_string(
 
 def validate_tagged_objs_from_json_or_py_string(
     s: str,
-    schema_by_xml_tag: Mapping[str, Any],
+    schema_by_xml_tag: Mapping[str, type[T]],
     from_substring: bool = False,
     strip_language_markdown: bool = True,
-) -> Mapping[str, Any]:
-    validated_obj_per_tag: dict[str, Any] = {}
-    _schema: Any = None
+) -> Mapping[str, T]:
+    validated_obj_per_tag: dict[str, T] = {}
+    _schema: type[T] | None = None
     _tag: str | None = None
 
-    try:
-        for _tag, _schema in schema_by_xml_tag.items():
-            match = re.search(rf"<{_tag}>\s*(.*?)\s*</{_tag}>", s, re.DOTALL)
-            if not match:
-                continue
+    def _raise(
+        tag: str,
+        schema: Any,
+        *,
+        not_found: bool = False,
+        base_exc: Exception | None = None,
+    ) -> NoReturn:
+        if not_found:
+            msg = f"Tag <{tag}> not found in string:\n{s}"
+        else:
+            msg = (
+                f"Failed to validate substring within tag <{tag}> against JSON schema:"
+                f"\n{s}\nExpected type: {schema}"
+            )
+        raise JSONSchemaValidationError(s, schema, message=msg) from base_exc
+
+    for _tag, _schema in schema_by_xml_tag.items():
+        match = re.search(rf"<{_tag}>\s*(.*?)\s*</{_tag}>", s, re.DOTALL)
+        if match is None:
+            continue
+            # _raise(_tag, _schema, not_found=True, base_exc=None)
+        try:
             tagged_substring = match.group(1).strip()
             validated_obj_per_tag[_tag] = validate_obj_from_json_or_py_string(
                 tagged_substring,  # type: ignore[assignment]
@@ -114,12 +134,8 @@ def validate_tagged_objs_from_json_or_py_string(
                 from_substring=from_substring,
                 strip_language_markdown=strip_language_markdown,
             )
-    except JSONSchemaValidationError as exc:
-        err_message = (
-            f"Failed to validate substring within tag <{_tag}> against JSON schema:"
-            f"\n{s}\nExpected type: {_schema}"
-        )
-        raise JSONSchemaValidationError(s, _schema, message=err_message) from exc
+        except JSONSchemaValidationError as exc:
+            _raise(_tag, _schema, base_exc=exc)
 
     return validated_obj_per_tag