grasp_agents 0.5.8__py3-none-any.whl → 0.5.9__py3-none-any.whl

grasp_agents/litellm/lite_llm.py

@@ -1,5 +1,7 @@
 import logging
+from collections import defaultdict
 from collections.abc import AsyncIterator, Mapping
+from copy import deepcopy
 from typing import Any, cast
 
 import litellm
@@ -90,10 +92,19 @@ class LiteLLM(CloudLLM[LiteLLMSettings, LiteLLMConverters]):
                 "was specified. Please provide a valid API provider or use a different "
                 "model."
             )
+
+        if llm_settings is not None:
+            stream_options = llm_settings.get("stream_options") or {}
+            stream_options["include_usage"] = True
+            _llm_settings = deepcopy(llm_settings)
+            _llm_settings["stream_options"] = stream_options
+        else:
+            _llm_settings = LiteLLMSettings(stream_options={"include_usage": True})
+
         super().__init__(
             model_name=model_name,
             model_id=model_id,
-            llm_settings=llm_settings,
+            llm_settings=_llm_settings,
             converters=LiteLLMConverters(),
             tools=tools,
             response_schema=response_schema,
@@ -192,7 +203,17 @@ class LiteLLM(CloudLLM[LiteLLMSettings, LiteLLMConverters]):
         )
         stream = cast("CustomStreamWrapper", stream)
 
+        tc_indices: dict[int, set[int]] = defaultdict(set)
+
         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
 
     def combine_completion_chunks(

grasp_agents/llm.py

@@ -25,7 +25,7 @@ from .typing.events import (
     AnnotationsEndEvent,
     AnnotationsStartEvent,
     CompletionChunkEvent,
-    CompletionEndEvent,
+    # CompletionEndEvent,
     CompletionEvent,
     CompletionStartEvent,
     LLMStateChangeEvent,
@@ -196,7 +196,9 @@ class LLM(ABC, Generic[SettingsT_co, ConvertT_co]):
         annotations_op_evt: AnnotationsChunkEvent | None = None
         tool_calls_op_evt: ToolCallChunkEvent | None = None
 
-        def _close_open_events() -> list[LLMStateChangeEvent[Any]]:
+        def _close_open_events(
+            _event: CompletionChunkEvent[CompletionChunk] | None = None,
+        ) -> list[LLMStateChangeEvent[Any]]:
             nonlocal \
                 chunk_op_evt, \
                 thinking_op_evt, \
@@ -206,26 +208,21 @@ class LLM(ABC, Generic[SettingsT_co, ConvertT_co]):
 
             events: list[LLMStateChangeEvent[Any]] = []
 
-            if tool_calls_op_evt:
+            if not isinstance(_event, ThinkingChunkEvent) and thinking_op_evt:
+                events.append(ThinkingEndEvent.from_chunk_event(thinking_op_evt))
+                thinking_op_evt = None
+
+            if not isinstance(_event, ToolCallChunkEvent) and tool_calls_op_evt:
                 events.append(ToolCallEndEvent.from_chunk_event(tool_calls_op_evt))
+                tool_calls_op_evt = None
 
-            if response_op_evt:
+            if not isinstance(_event, ResponseChunkEvent) and response_op_evt:
                 events.append(ResponseEndEvent.from_chunk_event(response_op_evt))
+                response_op_evt = None
 
-            if thinking_op_evt:
-                events.append(ThinkingEndEvent.from_chunk_event(thinking_op_evt))
-
-            if annotations_op_evt:
+            if not isinstance(_event, AnnotationsChunkEvent) and annotations_op_evt:
                 events.append(AnnotationsEndEvent.from_chunk_event(annotations_op_evt))
-
-            if chunk_op_evt:
-                events.append(CompletionEndEvent.from_chunk_event(chunk_op_evt))
-
-            chunk_op_evt = None
-            thinking_op_evt = None
-            tool_calls_op_evt = None
-            response_op_evt = None
-            annotations_op_evt = None
+                annotations_op_evt = None
 
             return events
 
@@ -252,14 +249,14 @@ class LLM(ABC, Generic[SettingsT_co, ConvertT_co]):
                 sub_events = event.split_into_specialized()
 
                 for sub_event in sub_events:
+                    for close_event in _close_open_events(sub_event):
+                        yield close_event
+
                     if isinstance(sub_event, ThinkingChunkEvent):
                         if not thinking_op_evt:
                             thinking_op_evt = sub_event
                             yield ThinkingStartEvent.from_chunk_event(sub_event)
                         yield sub_event
-                    elif thinking_op_evt:
-                        yield ThinkingEndEvent.from_chunk_event(thinking_op_evt)
-                        thinking_op_evt = None
 
                     if isinstance(sub_event, ToolCallChunkEvent):
                         tc = sub_event.data.tool_call
@@ -273,27 +270,18 @@ class LLM(ABC, Generic[SettingsT_co, ConvertT_co]):
                             tool_calls_op_evt = sub_event
                             yield ToolCallStartEvent.from_chunk_event(sub_event)
                         yield sub_event
-                    elif tool_calls_op_evt:
-                        yield ToolCallEndEvent.from_chunk_event(tool_calls_op_evt)
-                        tool_calls_op_evt = None
 
                     if isinstance(sub_event, ResponseChunkEvent):
                         if not response_op_evt:
                             response_op_evt = sub_event
                             yield ResponseStartEvent.from_chunk_event(sub_event)
                         yield sub_event
-                    elif response_op_evt:
-                        yield ResponseEndEvent.from_chunk_event(response_op_evt)
-                        response_op_evt = None
 
                     if isinstance(sub_event, AnnotationsChunkEvent):
                         if not annotations_op_evt:
                             annotations_op_evt = sub_event
                             yield AnnotationsStartEvent.from_chunk_event(sub_event)
                         yield sub_event
-                    elif annotations_op_evt:
-                        yield AnnotationsEndEvent.from_chunk_event(annotations_op_evt)
-                        annotations_op_evt = None
 
                 prev_completion_id = chunk.id
 

grasp_agents/openai/openai_llm.py

@@ -127,8 +127,8 @@ class OpenAILLM(CloudLLM[OpenAILLMSettings, OpenAIConverters]):
             provider_name, provider_model_name = model_name_parts
             if provider_name not in compat_providers_map:
                 raise ValueError(
-                    f"OpenAI compatible API provider '{provider_name}' "
-                    "is not supported. Supported providers are: "
+                    f"API provider '{provider_name}' is not a supported OpenAI "
+                    f"compatible provider. Supported providers are: "
                     f"{', '.join(compat_providers_map.keys())}"
                 )
             api_provider = compat_providers_map[provider_name]
@@ -138,10 +138,18 @@ class OpenAILLM(CloudLLM[OpenAILLMSettings, OpenAIConverters]):
                 "you must provide an 'api_provider' argument."
             )
 
+        if llm_settings is not None:
+            stream_options = llm_settings.get("stream_options") or {}
+            stream_options["include_usage"] = True
+            _llm_settings = deepcopy(llm_settings)
+            _llm_settings["stream_options"] = stream_options
+        else:
+            _llm_settings = OpenAILLMSettings(stream_options={"include_usage": True})
+
         super().__init__(
             model_name=provider_model_name,
             model_id=model_id,
-            llm_settings=llm_settings,
+            llm_settings=_llm_settings,
             converters=OpenAIConverters(),
             tools=tools,
             response_schema=response_schema,

{grasp_agents-0.5.8.dist-info → grasp_agents-0.5.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: grasp_agents
-Version: 0.5.8
+Version: 0.5.9
 Summary: Grasp Agents Library
 License-File: LICENSE.md
 Requires-Python: <4,>=3.11.4
@@ -37,31 +37,30 @@ Description-Content-Type: text/markdown
 
 ## Features
 
-- Clean formulation of agents as generic entities over:
-  - I/O schemas
-  - Memory
-  - Shared context
+- Clean formulation of agents as generic entities over I/O schemas and shared context.
 - Transparent implementation of common agentic patterns:
-  - Single-agent loops with an optional "ReAct mode" to enforce reasoning between the tool calls
+  - Single-agent loops
   - Workflows (static communication topology), including loops
   - Agents-as-tools for task delegation
   - Freeform A2A communication via the in-process actor model
-- Parallel processing with flexible retries and rate limiting
-- Simple logging and usage/cost tracking
+- Built-in parallel processing with flexible retries and rate limiting.
+- Support for all popular API providers via LiteLLM.
+- Granular event streaming with separate events for standard outputs, thinking, and tool calls.
+- Callbacks via decorators or subclassing for straightforward customisation of agentic loops and context management.
 
 ## Project Structure
 
-- `processor.py`, `comm_processor.py`, `llm_agent.py`: Core processor and agent class implementations.
-- `packet.py`, `packet_pool.py`: Communication management.
+- `processors/`, `llm_agent.py`: Core processor and agent class implementations.
+- `packet.py`, `packet_pool.py`, `runner.py`: Communication management.
 - `llm_policy_executor.py`: LLM actions and tool call loops.
 - `prompt_builder.py`: Tools for constructing prompts.
 - `workflow/`: Modules for defining and managing static agent workflows.
 - `llm.py`, `cloud_llm.py`: LLM integration and base LLM functionalities.
 - `openai/`: Modules specific to OpenAI API integration.
-- `memory.py`, `llm_agent_memory.py`: Memory management.
+- `litellm/`: Modules specific to LiteLLM integration.
+- `memory.py`, `llm_agent_memory.py`: Basic agent memory management.
 - `run_context.py`: Shared context management for agent runs.
 - `usage_tracker.py`: Tracking of API usage and costs.
-- `costs_dict.yaml`: Dictionary for cost tracking (update if needed).
 - `rate_limiting/`: Basic rate limiting tools.
 
 ## Quickstart & Installation Variants (UV Package manager)
@@ -190,7 +189,7 @@ teacher = LLMAgent[None, Problem, None](
 )
 
 async def main():
-    ctx = RunContext[None](print_messages=True)
+    ctx = RunContext[None](log_messages=True)
     out = await teacher.run("start", ctx=ctx)
     print(out.payloads[0])
     print(ctx.usage_tracker.total_usage)

{grasp_agents-0.5.8.dist-info → grasp_agents-0.5.9.dist-info}/RECORD

@@ -5,7 +5,7 @@ grasp_agents/errors.py,sha256=K-22TCM1Klhsej47Rg5eTqnGiGPaXgKOpdOZZ7cPipw,4633
 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=Es8NXGDkp4Nem7g24-jW0KFGA9Hp_o2Cv3cOvjup-iU,859
-grasp_agents/llm.py,sha256=w3vVIYUfhr_t45sZa0Nl373Htm05r9NUS02SvCKXbVA,12151
+grasp_agents/llm.py,sha256=HjZss_1xiwFN8MCaw341c75rmv6dYIYMv6cx6EuT3fM,11713
 grasp_agents/llm_agent.py,sha256=hX3T2Y5qiTt5CrsahNo5t08HFCyBWEiurzYnFykJN9Y,13513
 grasp_agents/llm_agent_memory.py,sha256=gQwH3g4Ib3ciW2jrBiW13ttwax_pcPobH5RhXRmbc0E,1842
 grasp_agents/llm_policy_executor.py,sha256=bP-O1itfaG-dr2PC9_zLCNMI862cPRqW7vsj9tRCz-I,17062
@@ -22,7 +22,7 @@ grasp_agents/litellm/__init__.py,sha256=wD8RZBYokFDfbS9Cs7nO_zKb3w7RIVwEGj7g2D5C
 grasp_agents/litellm/completion_chunk_converters.py,sha256=J5PPxzoTBqkvKQnCoBxQxJo7Q8Xfl9cbv2GRZox8Cjo,2689
 grasp_agents/litellm/completion_converters.py,sha256=JQ7XvQwwc-biFqVMcRO61SL5VGs_SkUvAhUz1QD7EmU,2516
 grasp_agents/litellm/converters.py,sha256=3u648xjrphr9zPp12PO8fU13G4nI6_e9714Xcvh6SHc,4721
-grasp_agents/litellm/lite_llm.py,sha256=tJngUfZb2t59Rv9glQPCGNILlLKvy_6wNrQQFS8OZrY,8096
+grasp_agents/litellm/lite_llm.py,sha256=wZpVEuwtLsX1_UDJqoY1FweJIkIHJAzf1KOn-IFfDfI,9026
 grasp_agents/litellm/message_converters.py,sha256=PsGLIJEcAeEoluHIh-utEufJ_9WeMYzXkwnR-8jyULQ,2037
 grasp_agents/openai/__init__.py,sha256=xaRnblUskiLvypIhMe4NRp9dxCG-gNR7dPiugUbPbhE,4717
 grasp_agents/openai/completion_chunk_converters.py,sha256=3MnMskdlp7ycsggc1ok1XpCHaP4Us2rLYaxImPLw1eI,2573
@@ -30,7 +30,7 @@ grasp_agents/openai/completion_converters.py,sha256=UlDeQSl0AEFUS-QI5e8rrjfmXZoj
 grasp_agents/openai/content_converters.py,sha256=sMsZhoatuL_8t0IdVaGWIVZLB4nyi1ajD61GewQmeY4,2503
 grasp_agents/openai/converters.py,sha256=CXHF2GehEHLEzjL45HywZ_1qaB3N29-lbac5oBDnLGA,4634
 grasp_agents/openai/message_converters.py,sha256=fhSN81uK51EGbLyM2-f0MvPX_UBrMy7SF3JQPo-dkXg,4686
-grasp_agents/openai/openai_llm.py,sha256=uJbbCytqpv8OCncKdzpiUdkVh3mJWgo95Y9Xetk_Ptg,10556
+grasp_agents/openai/openai_llm.py,sha256=3EvfRFT_qGzLr7vy3AVby3uOwzxX15eY86ygJ7ouNn4,10940
 grasp_agents/openai/tool_converters.py,sha256=IotZvpe3xMQcBfcjUTfAsn4LtZljj3zkU9bfpcoiqPw,1177
 grasp_agents/processors/base_processor.py,sha256=j2_QY6HUjckdxfsf7yAF0xRDp_V-DNDb7hIRMRKUyWw,10685
 grasp_agents/processors/parallel_processor.py,sha256=4NH2gfGgUheZWQGKn3NEMp0uQ0kOeJRZ3Ja0a7qmqpg,7863
@@ -52,7 +52,7 @@ grasp_agents/workflow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 grasp_agents/workflow/looped_workflow.py,sha256=WHp9O3Za2sBVfY_BLOdvPvtY20XsjZQaWSO2-oAFvOY,6806
 grasp_agents/workflow/sequential_workflow.py,sha256=e3BIWzy_2novmEWNwIteyMbrzvl1-evHrTBE3r3SpU8,3648
 grasp_agents/workflow/workflow_processor.py,sha256=yrxqAGfznmdkbP5zScKKJguxATfU4ObmA6BDR7YCBNU,3549
-grasp_agents-0.5.8.dist-info/METADATA,sha256=0LFzAa3UIg87-9jv2oCAbh-bPSnt0fELxIDWHmgbJzg,6865
-grasp_agents-0.5.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-grasp_agents-0.5.8.dist-info/licenses/LICENSE.md,sha256=-nNNdWqGB8gJ2O-peFQ2Irshv5tW5pHKyTcYkwvH7CE,1201
-grasp_agents-0.5.8.dist-info/RECORD,,
+grasp_agents-0.5.9.dist-info/METADATA,sha256=RrgcN5SiOYUc6LNz5hvyn0pGpgIj-yVdPbL96kRzcjg,6997
+grasp_agents-0.5.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+grasp_agents-0.5.9.dist-info/licenses/LICENSE.md,sha256=-nNNdWqGB8gJ2O-peFQ2Irshv5tW5pHKyTcYkwvH7CE,1201
+grasp_agents-0.5.9.dist-info/RECORD,,