smarta2a 0.4.29__py3-none-any.whl → 0.4.30__py3-none-any.whl

smarta2a/model_providers/openai_provider.py

@@ -228,11 +228,103 @@ class OpenAIProvider(BaseLLMProvider):
         raise RuntimeError("Max tool iteration depth reached in generate().")
 
 
-    async def stream(self, state: StateData, **kwargs) -> AsyncGenerator[str, None]:
+    async def generate_stream(self, state: StateData, **kwargs) -> AsyncGenerator[str, None]:
         """
-        Stream a response, invoking tools as needed.
+        Stream response chunks, invoking tools as needed.
         """
-        pass
+        context_history = state.context_history
+        # Normalize incoming messages to your Message model
+        msgs = [
+            msg if isinstance(msg, Message) else Message(**msg)
+            for msg in context_history
+        ]
+        # Convert to OpenAI schema, including any prior tool results
+        converted_messages = self._convert_messages(msgs)
+        max_iterations = 30
+
+        for _ in range(max_iterations):
+            # Kick off the streaming completion
+            stream = await self.client.chat.completions.create(
+                model=self.model,
+                messages=converted_messages,
+                tools=self._format_openai_tools(),
+                tool_choice="auto",
+                stream=True,
+                **kwargs
+            )
+
+            full_content = ""
+            tool_calls: List[Dict[str, Any]] = []
+
+            # As chunks arrive, yield them and collect any tool_call deltas
+            async for chunk in stream:
+                delta = chunk.choices[0].delta
+
+                # 1) Stream content immediately
+                if hasattr(delta, "content") and delta.content:
+                    yield delta.content
+                    full_content += delta.content
+
+                # 2) Buffer up any function/tool calls for after the stream
+                if hasattr(delta, "tool_calls") and delta.tool_calls:
+                    for d in delta.tool_calls:
+                        idx = d.index
+                        # Ensure list is long enough
+                        while len(tool_calls) <= idx:
+                            tool_calls.append({
+                                "id": "",
+                                "function": {"name": "", "arguments": ""}
+                            })
+                        if d.id:
+                            tool_calls[idx]["id"] = d.id
+                        if d.function.name:
+                            tool_calls[idx]["function"]["name"] = d.function.name
+                        if d.function.arguments:
+                            tool_calls[idx]["function"]["arguments"] += d.function.arguments
+
+            # If the assistant didn't invoke any tools, we're done
+            if not tool_calls:
+                return
+
+            # Otherwise, append the assistant's outgoing call and loop for tool execution
+            converted_messages.append({
+                "role": "assistant",
+                "content": full_content,
+                "tool_calls": [
+                    {
+                        "id": tc["id"],
+                        "type": "function",
+                        "function": {
+                            "name": tc["function"]["name"],
+                            "arguments": tc["function"]["arguments"]
+                        }
+                    }
+                    for tc in tool_calls
+                ]
+            })
+
+            # Execute each tool in turn and append its result
+            for tc in tool_calls:
+                name = tc["function"]["name"]
+                try:
+                    args = json.loads(tc["function"]["arguments"] or "{}")
+                except json.JSONDecodeError:
+                    args = {}
+                try:
+                    tool_res = await self.tools_manager.call_tool(name, args)
+                    result_content = getattr(tool_res, "content", None) or (
+                        tool_res.get("content") if isinstance(tool_res, dict) else str(tool_res)
+                    )
+                except Exception as e:
+                    result_content = f"Error executing {name}: {e}"
+
+                converted_messages.append({
+                    "role": "tool",
+                    "content": result_content,
+                    "tool_call_id": tc["id"]
+                })
+
+        raise RuntimeError("Max tool iteration depth reached in generate_stream().")
 
 
     

{smarta2a-0.4.29.dist-info → smarta2a-0.4.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smarta2a
-Version: 0.4.29
+Version: 0.4.30
 Summary: a Python framework that helps you build servers and AI agents that communicate using the A2A protocol
 Project-URL: Homepage, https://github.com/siddharthsma/smarta2a
 Project-URL: Bug Tracker, https://github.com/siddharthsma/smarta2a/issues

{smarta2a-0.4.29.dist-info → smarta2a-0.4.30.dist-info}/RECORD

@@ -17,7 +17,7 @@ smarta2a/history_update_strategies/history_update_strategy.py,sha256=n2sfIGu8ztK
 smarta2a/history_update_strategies/rolling_window_strategy.py,sha256=7Ch042JWt4TM_r1-sFKlSIxHj8VX1P3ZoqjCvIdeSqA,540
 smarta2a/model_providers/__init__.py,sha256=hJj0w00JjqTiBgJmHmOWwL6MU_hwmro9xTiX3XYf6ts,148
 smarta2a/model_providers/base_llm_provider.py,sha256=iQUqjnypl0f2M929iU0WhHoxAE4ek-NUFJPbEnNQ8-4,412
-smarta2a/model_providers/openai_provider.py,sha256=iL4qgRhQQs1hFT2KblAYoS-4UUQL8z2z5YLGzfaRDfw,8348
+smarta2a/model_providers/openai_provider.py,sha256=0KC11HrTwhOF44oJhDZOOaMUavtKBGamFqXOU4ODIK4,12220
 smarta2a/server/__init__.py,sha256=f2X454Ll4vJc02V4JLJHTN-h8u0TBm4d_FkiO4t686U,53
 smarta2a/server/handler_registry.py,sha256=OVRG5dTvxB7qUNXgsqWxVNxIyRljUShSYxb1gtbi5XM,820
 smarta2a/server/json_rpc_request_processor.py,sha256=qRB3sfj_n9ImkIOCdaUKMsDmKcO7CiMhaZ4VdQS7Mb4,6993
@@ -35,7 +35,7 @@ smarta2a/utils/task_builder.py,sha256=wqSyfVHNTaXuGESu09dhlaDi7D007gcN3-8tH-nPQ4
 smarta2a/utils/task_request_builder.py,sha256=6cOGOqj2Rg43xWM03GRJQzlIZHBptsMCJRp7oD-TDAQ,3362
 smarta2a/utils/tools_manager.py,sha256=oR5cbwzPZ36hQAsWAgb-c6wFv5BthmCPraD7DSv-Bv8,4332
 smarta2a/utils/types.py,sha256=kzA6Vv5xXfu1sJuxhEXrglI9e9S6eZVIljMnsrQVyN0,13650
-smarta2a-0.4.29.dist-info/METADATA,sha256=dTQkVsjbmETIm4CE45NwU0TtdD7-9UCh7QX3UPDb7RI,12783
-smarta2a-0.4.29.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-smarta2a-0.4.29.dist-info/licenses/LICENSE,sha256=lDbqrxVnzDMY5KJ8JS1WhvkWE8TJaw-O-CHDy-ecsJA,2095
-smarta2a-0.4.29.dist-info/RECORD,,
+smarta2a-0.4.30.dist-info/METADATA,sha256=Z9gATeXMfWK1-XkD8h8J3evYcfziIcHAF7MRD8JgQwQ,12783
+smarta2a-0.4.30.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+smarta2a-0.4.30.dist-info/licenses/LICENSE,sha256=lDbqrxVnzDMY5KJ8JS1WhvkWE8TJaw-O-CHDy-ecsJA,2095
+smarta2a-0.4.30.dist-info/RECORD,,