agentforge-openai 0.2.3__tar.gz → 0.2.4__tar.gz

{agentforge_openai-0.2.3 → agentforge_openai-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentforge-openai
-Version: 0.2.3
+Version: 0.2.4
 Summary: OpenAI LLM + embeddings provider for AgentForge — gpt-4o / o-series + text-embedding-3-*
 Project-URL: Homepage, https://github.com/Scaffoldic/agentforge-py
 Project-URL: Repository, https://github.com/Scaffoldic/agentforge-py
@@ -19,7 +19,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
 Requires-Python: >=3.13
-Requires-Dist: agentforge-core~=0.2.3
+Requires-Dist: agentforge-core~=0.2.4
 Provides-Extra: openai
 Requires-Dist: openai>=1.50; extra == 'openai'
 Description-Content-Type: text/markdown

{agentforge_openai-0.2.3 → agentforge_openai-0.2.4}/pyproject.toml

@@ -8,7 +8,7 @@
 
 [project]
 name = "agentforge-openai"
-version = "0.2.3"
+version = "0.2.4"
 description = "OpenAI LLM + embeddings provider for AgentForge — gpt-4o / o-series + text-embedding-3-*"
 readme = "README.md"
 requires-python = ">=3.13"
@@ -29,7 +29,7 @@ classifiers = [
 ]
 
 dependencies = [
-    "agentforge-core ~= 0.2.3",
+    "agentforge-core ~= 0.2.4",
 ]
 
 [project.optional-dependencies]

{agentforge_openai-0.2.3 → agentforge_openai-0.2.4}/src/agentforge_openai/client.py

@@ -14,10 +14,12 @@ Finish reasons normalised:
 
 from __future__ import annotations
 
+import json
 from collections.abc import AsyncIterator
 from typing import TYPE_CHECKING, Any
 
 from agentforge_core.contracts.llm import LLMClient
+from agentforge_core.contracts.tool import validate_tool_name
 from agentforge_core.production.exceptions import ModuleError
 from agentforge_core.resolver import register_provider
 from agentforge_core.values.messages import (
@@ -298,12 +300,32 @@ def _message_to_openai(message: Message) -> dict[str, Any]:
     if message.role == "system":
         # Should be hoisted by the caller; defensive passthrough.
         return {"role": "system", "content": message.content}
+    if message.role == "assistant" and message.tool_calls:
+        # Round-trip tool_calls so the subsequent role="tool" message
+        # pairs cleanly via tool_call_id (bug-009).
+        return {
+            "role": "assistant",
+            "content": message.content or None,
+            "tool_calls": [
+                {
+                    "id": tc.id,
+                    "type": "function",
+                    "function": {
+                        "name": tc.name,
+                        "arguments": json.dumps(dict(tc.arguments)),
+                    },
+                }
+                for tc in message.tool_calls
+            ],
+        }
     return {"role": message.role, "content": message.content}
 
 
 def _tools_to_openai(tools: list[ToolSpec] | None) -> list[dict[str, Any]] | None:
     if not tools:
         return None
+    for t in tools:
+        validate_tool_name(t.name)
     return [
         {
             "type": "function",

{agentforge_openai-0.2.3 → agentforge_openai-0.2.4}/tests/unit/test_openai_client.py

@@ -2,8 +2,11 @@
 
 from __future__ import annotations
 
+import json
+
 import pytest
-from agentforge_core.values.messages import Message, ToolSpec
+from agentforge_core.production.exceptions import ToolNameInvalidError
+from agentforge_core.values.messages import Message, ToolCall, ToolSpec
 from agentforge_openai import OpenAIClient
 from agentforge_openai._inmem_runner import FakeOpenAIRunner
 from agentforge_openai._pricing import chat_cost_usd
@@ -227,6 +230,46 @@ async def test_tool_role_messages_pass_with_tool_call_id(
     assert sent["content"] == "42"
 
 
+@pytest.mark.asyncio
+async def test_assistant_turn_with_tool_calls_emits_openai_tool_calls(
+    client: OpenAIClient,
+    fake_runner: FakeOpenAIRunner,
+) -> None:
+    """bug-009: an assistant Message carrying framework tool_calls must
+    serialise to OpenAI's `tool_calls` array with JSON-encoded arguments,
+    so the subsequent role="tool" message pairs cleanly via tool_call_id."""
+    fake_runner.set_chat_response(
+        {
+            "model": "gpt-4o-mini",
+            "choices": [
+                {
+                    "index": 0,
+                    "message": {"role": "assistant", "content": ""},
+                    "finish_reason": "stop",
+                },
+            ],
+            "usage": {"prompt_tokens": 0, "completion_tokens": 0, "total_tokens": 0},
+        },
+    )
+    await client.call(
+        system="",
+        messages=[
+            Message(
+                role="assistant",
+                content="calling",
+                tool_calls=(ToolCall(id="call_1", name="search", arguments={"q": "x"}),),
+            ),
+            Message(role="tool", content="result", tool_call_id="call_1"),
+        ],
+    )
+    sent = fake_runner.chat_calls[0].messages[0]
+    assert sent["role"] == "assistant"
+    assert sent["tool_calls"][0]["id"] == "call_1"
+    assert sent["tool_calls"][0]["type"] == "function"
+    assert sent["tool_calls"][0]["function"]["name"] == "search"
+    assert json.loads(sent["tool_calls"][0]["function"]["arguments"]) == {"q": "x"}
+
+
 @pytest.mark.asyncio
 async def test_call_finish_reason_length_maps_to_max_tokens(
     client: OpenAIClient,
@@ -325,6 +368,21 @@ async def test_call_passes_tool_specs(
     assert tools_arg[0]["function"]["parameters"] == schema
 
 
+@pytest.mark.asyncio
+async def test_call_rejects_illegal_tool_name_locally(
+    client: OpenAIClient,
+    fake_runner: FakeOpenAIRunner,
+) -> None:
+    """bug-017: an illegal tool name fails locally before any request."""
+    with pytest.raises(ToolNameInvalidError, match="kb_search"):
+        await client.call(
+            system="",
+            messages=[_user("hi")],
+            tools=[ToolSpec(name="kb.search", description="d", schema={"type": "object"})],
+        )
+    assert fake_runner.chat_calls == []
+
+
 # ----------------------------------------------------------------------
 # Streaming
 # ----------------------------------------------------------------------