oauth-codex 2.0.1__tar.gz → 2.0.2__tar.gz

{oauth_codex-2.0.1 → oauth_codex-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oauth-codex
-Version: 2.0.1
+Version: 2.0.2
 Summary: Codex OAuth-based Python SDK with a single Client and generate-first API
 Author: Codex
 Requires-Python: >=3.11

{oauth_codex-2.0.1 → oauth_codex-2.0.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "oauth-codex"
-version = "2.0.1"
+version = "2.0.2"
 description = "Codex OAuth-based Python SDK with a single Client and generate-first API"
 readme = "README.md"
 requires-python = ">=3.11"

{oauth_codex-2.0.1 → oauth_codex-2.0.2}/src/oauth_codex/_client.py

@@ -20,7 +20,7 @@ from .core_types import (
     ToolResult,
 )
 from .store import FallbackTokenStore
-from .tooling import callable_to_tool_schema
+from .tooling import callable_to_tool_schema, normalize_tool_output
 
 DEFAULT_MODEL = "gpt-5.3-codex"
 DEFAULT_MAX_TOOL_ROUNDS = 8
@@ -364,7 +364,7 @@ class OAuthCodexClient(SyncAPIClient):
     ) -> list[ToolResult]:
         results: list[ToolResult] = []
         for call in tool_calls:
-            output: str | dict[str, Any]
+            output: dict[str, Any]
             tool = tools_by_name.get(call.name)
             if tool is None:
                 output = {"error": f"tool not found: {call.name}"}
@@ -387,7 +387,7 @@ class OAuthCodexClient(SyncAPIClient):
     ) -> list[ToolResult]:
         results: list[ToolResult] = []
         for call in tool_calls:
-            output: str | dict[str, Any]
+            output: dict[str, Any]
             tool = tools_by_name.get(call.name)
             if tool is None:
                 output = {"error": f"tool not found: {call.name}"}
@@ -411,15 +411,8 @@ class OAuthCodexClient(SyncAPIClient):
             raise TypeError("tool arguments must be a JSON object")
         return parsed
 
-    def _normalize_tool_output(self, output: Any) -> str | dict[str, Any]:
-        if isinstance(output, dict):
-            return output
-        if isinstance(output, str):
-            return output
-        try:
-            return json.dumps(output, ensure_ascii=True)
-        except TypeError:
-            return str(output)
+    def _normalize_tool_output(self, output: Any) -> dict[str, Any]:
+        return normalize_tool_output(output)
 
 
 Client = OAuthCodexClient

{oauth_codex-2.0.1 → oauth_codex-2.0.2}/src/oauth_codex/_engine.py

@@ -40,7 +40,12 @@ from .errors import (
     TokenRefreshError,
 )
 from .store import FallbackTokenStore
-from .tooling import normalize_tool_inputs, to_responses_tools, tool_results_to_response_items
+from .tooling import (
+    normalize_tool_inputs,
+    normalize_tool_output,
+    to_responses_tools,
+    tool_results_to_response_items,
+)
 from .core_types import (
     GenerateResult,
     InputTokensCountResult,
@@ -1408,14 +1413,20 @@ class OAuthCodexClient:
         normalized: list[ToolResult] = []
         for item in tool_results:
             if isinstance(item, ToolResult):
-                normalized.append(item)
+                normalized.append(
+                    ToolResult(
+                        tool_call_id=item.tool_call_id,
+                        name=item.name,
+                        output=normalize_tool_output(item.output),
+                    )
+                )
                 continue
             if isinstance(item, dict):
                 normalized.append(
                     ToolResult(
                         tool_call_id=str(item["tool_call_id"]),
                         name=str(item["name"]),
-                        output=item["output"],
+                        output=normalize_tool_output(item.get("output")),
                     )
                 )
                 continue

{oauth_codex-2.0.1 → oauth_codex-2.0.2}/src/oauth_codex/_version.py

@@ -1,2 +1,2 @@
 __title__ = "oauth-codex"
-__version__ = "2.0.1"
+__version__ = "2.0.2"

{oauth_codex-2.0.1 → oauth_codex-2.0.2}/src/oauth_codex/core_types.py

@@ -78,7 +78,7 @@ class ToolCall:
 class ToolResult:
     tool_call_id: str
     name: str
-    output: str | dict[str, Any]
+    output: dict[str, Any]
 
 
 @dataclass

{oauth_codex-2.0.1 → oauth_codex-2.0.2}/src/oauth_codex/tooling.py

@@ -157,10 +157,20 @@ def to_responses_tools(
     return normalized
 
 
-def serialize_tool_output(output: str | dict[str, Any]) -> str:
-    if isinstance(output, str):
+def normalize_tool_output(output: Any) -> dict[str, Any]:
+    if isinstance(output, dict):
         return output
-    return json.dumps(output, ensure_ascii=True)
+    if isinstance(output, str):
+        return {"output": output}
+    try:
+        json.dumps(output, ensure_ascii=True)
+        return {"output": output}
+    except TypeError:
+        return {"output": str(output)}
+
+
+def serialize_tool_output(output: Any) -> str:
+    return json.dumps(normalize_tool_output(output), ensure_ascii=True)
 
 
 def tool_results_to_response_items(tool_results: list[ToolResult] | None) -> list[dict[str, Any]]:

{oauth_codex-2.0.1 → oauth_codex-2.0.2}/src/oauth_codex.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oauth-codex
-Version: 2.0.1
+Version: 2.0.2
 Summary: Codex OAuth-based Python SDK with a single Client and generate-first API
 Author: Codex
 Requires-Python: >=3.11

{oauth_codex-2.0.1 → oauth_codex-2.0.2}/tests/test_engine_stream_and_continuity.py

@@ -77,9 +77,7 @@ def test_map_stream_raises_when_call_id_cannot_be_restored() -> None:
 
 def test_tool_results_to_response_items_rejects_empty_tool_call_id() -> None:
     with pytest.raises(SDKRequestError) as exc_info:
-        tool_results_to_response_items(
-            [ToolResult(tool_call_id="  ", name="tool", output="This is a tool response.")]
-        )
+        tool_results_to_response_items([ToolResult(tool_call_id="  ", name="tool", output={"ok": True})])
     assert exc_info.value.provider_code == "invalid_tool_call_id"
 
 

{oauth_codex-2.0.1 → oauth_codex-2.0.2}/tests/test_generate_sync.py

@@ -120,6 +120,33 @@ def test_generate_tool_failure_is_forwarded_to_model(monkeypatch: pytest.MonkeyP
     assert tool_results[0].output == {"error": "boom"}
 
 
+def test_generate_wraps_string_tool_output_as_dict(monkeypatch: pytest.MonkeyPatch) -> None:
+    client = _client()
+    calls: list[dict[str, object]] = []
+
+    def fake_generate(**kwargs):
+        calls.append(kwargs)
+        if len(calls) == 1:
+            return GenerateResult(
+                text="",
+                tool_calls=[ToolCall(id="call_1", name="echo", arguments_json='{"query":"hello"}')],
+                finish_reason="tool_calls",
+                response_id="resp_1",
+            )
+        return GenerateResult(text="done", tool_calls=[], finish_reason="stop", response_id="resp_2")
+
+    monkeypatch.setattr(client._engine, "generate", fake_generate)
+
+    def echo(query: str) -> str:
+        return query
+
+    out = client.generate("run once", tools=[echo])
+
+    assert out == "done"
+    tool_results = calls[1]["tool_results"]
+    assert tool_results[0].output == {"output": "hello"}
+
+
 def test_generate_raises_when_tool_round_limit_exceeded(monkeypatch: pytest.MonkeyPatch) -> None:
     client = _client()
     client.max_tool_rounds = 2