oauth-codex 2.2.0__tar.gz → 2.3.0__tar.gz

{oauth_codex-2.2.0 → oauth_codex-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oauth-codex
-Version: 2.2.0
+Version: 2.3.0
 Summary: Codex OAuth-based Python SDK with a single Client and generate-first API
 Author: Codex
 Requires-Python: >=3.11
@@ -37,7 +37,7 @@ pip install oauth-codex
 from oauth_codex import Client
 
 client = Client()
-text = client.generate("hello")
+text = client.generate([{"role": "user", "content": "hello"}])
 print(text)
 ```
 
@@ -45,8 +45,16 @@ print(text)
 
 ```python
 text = client.generate(
-    "Describe this image",
-    images=["https://example.com/cat.png", "./local-photo.jpg"],
+    [
+        {
+            "role": "user",
+            "content": [
+                {"type": "input_text", "text": "Describe this image"},
+                {"type": "input_image", "image_url": "https://example.com/cat.png"},
+                {"type": "input_image", "image_url": "data:image/jpeg;base64,..."},
+            ],
+        }
+    ],
 )
 print(text)
 ```
@@ -58,7 +66,7 @@ def add(a: int, b: int) -> dict:
     return {"sum": a + b}
 
 text = client.generate(
-    "Calculate 2+3",
+    [{"role": "user", "content": "Calculate 2+3"}],
     tools=[add],
 )
 print(text)
@@ -78,7 +86,7 @@ def tool(input: ToolInput) -> str:
     return f"Tool received query: {input.query}"
 
 
-text = client.generate("Use the tool", tools=[tool])
+text = client.generate([{"role": "user", "content": "Use the tool"}], tools=[tool])
 print(text)
 ```
 
@@ -100,7 +108,7 @@ class Summary(BaseModel):
 
 client = Client()
 out = client.generate(
-    "Return JSON with title and score",
+    [{"role": "user", "content": "Return JSON with title and score"}],
     output_schema=Summary,
 )
 print(out)  # {"title": "...", "score": 1}
@@ -110,7 +118,7 @@ You can also pass a raw JSON schema object.
 
 ```python
 out = client.generate(
-    "Return {\"ok\": true}",
+    [{"role": "user", "content": "Return {\"ok\": true}"}],
     output_schema={
         "type": "object",
         "properties": {"ok": {"type": "boolean"}},
@@ -131,7 +139,7 @@ from oauth_codex import Client
 
 async def main() -> None:
     client = Client()
-    text = await client.agenerate("hello async")
+    text = await client.agenerate([{"role": "user", "content": "hello async"}])
     print(text)
 
 

{oauth_codex-2.2.0 → oauth_codex-2.3.0}/README.md

@@ -23,7 +23,7 @@ pip install oauth-codex
 from oauth_codex import Client
 
 client = Client()
-text = client.generate("hello")
+text = client.generate([{"role": "user", "content": "hello"}])
 print(text)
 ```
 
@@ -31,8 +31,16 @@ print(text)
 
 ```python
 text = client.generate(
-    "Describe this image",
-    images=["https://example.com/cat.png", "./local-photo.jpg"],
+    [
+        {
+            "role": "user",
+            "content": [
+                {"type": "input_text", "text": "Describe this image"},
+                {"type": "input_image", "image_url": "https://example.com/cat.png"},
+                {"type": "input_image", "image_url": "data:image/jpeg;base64,..."},
+            ],
+        }
+    ],
 )
 print(text)
 ```
@@ -44,7 +52,7 @@ def add(a: int, b: int) -> dict:
     return {"sum": a + b}
 
 text = client.generate(
-    "Calculate 2+3",
+    [{"role": "user", "content": "Calculate 2+3"}],
     tools=[add],
 )
 print(text)
@@ -64,7 +72,7 @@ def tool(input: ToolInput) -> str:
     return f"Tool received query: {input.query}"
 
 
-text = client.generate("Use the tool", tools=[tool])
+text = client.generate([{"role": "user", "content": "Use the tool"}], tools=[tool])
 print(text)
 ```
 
@@ -86,7 +94,7 @@ class Summary(BaseModel):
 
 client = Client()
 out = client.generate(
-    "Return JSON with title and score",
+    [{"role": "user", "content": "Return JSON with title and score"}],
     output_schema=Summary,
 )
 print(out)  # {"title": "...", "score": 1}
@@ -96,7 +104,7 @@ You can also pass a raw JSON schema object.
 
 ```python
 out = client.generate(
-    "Return {\"ok\": true}",
+    [{"role": "user", "content": "Return {\"ok\": true}"}],
     output_schema={
         "type": "object",
         "properties": {"ok": {"type": "boolean"}},
@@ -117,7 +125,7 @@ from oauth_codex import Client
 
 async def main() -> None:
     client = Client()
-    text = await client.agenerate("hello async")
+    text = await client.agenerate([{"role": "user", "content": "hello async"}])
     print(text)
 
 

{oauth_codex-2.2.0 → oauth_codex-2.3.0}/pyproject.toml

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

{oauth_codex-2.2.0 → oauth_codex-2.3.0}/src/oauth_codex/__init__.py

@@ -34,6 +34,7 @@ from ._exceptions import (
     UnprocessableEntityError,
 )
 from ._version import __title__, __version__
+from .core_types import listMessage
 
 __all__ = [
     "types",
@@ -41,6 +42,7 @@ __all__ = [
     "__version__",
     "Client",
     "OAuthCodexClient",
+    "listMessage",
     "OAuthCodexError",
     "OpenAIError",
     "APIError",

{oauth_codex-2.2.0 → oauth_codex-2.3.0}/src/oauth_codex/_client.py

@@ -1,11 +1,8 @@
 from __future__ import annotations
 
-import base64
 import asyncio
 import inspect
 import json
-import mimetypes
-from pathlib import Path
 from typing import Any, AsyncIterator, Callable, Iterator, get_type_hints
 
 from pydantic import BaseModel
@@ -15,11 +12,10 @@ from ._engine import OAuthCodexClient as _EngineClient
 from .auth.config import OAuthConfig
 from .core_types import (
     GenerateResult,
-    ImageInput,
-    Message,
     ReasoningEffort,
     ToolCall,
     ToolResult,
+    listMessage,
 )
 from .store import FallbackTokenStore
 from .tooling import build_strict_response_format, callable_to_tool_schema, normalize_tool_output
@@ -88,9 +84,8 @@ class OAuthCodexClient(SyncAPIClient):
 
     def generate(
         self,
-        prompt: str | None = None,
+        messages: listMessage | None = None,
         *,
-        images: ImageInput | list[ImageInput] | None = None,
         tools: list[Callable[..., Any]] | None = None,
         model: str | None = None,
         reasoning_effort: ReasoningEffort = "medium",
@@ -100,7 +95,7 @@ class OAuthCodexClient(SyncAPIClient):
         output_schema: StructuredOutputSchema | None = None,
         strict_output: bool | None = None,
     ) -> str | dict[str, Any]:
-        messages = self._build_messages(prompt=prompt, images=images)
+        messages = self._normalize_initial_messages(messages)
         normalized_tools, tools_by_name = self._normalize_tools(tools)
         response_format, effective_strict_output = self._resolve_structured_output_options(
             output_schema=output_schema,
@@ -149,9 +144,8 @@ class OAuthCodexClient(SyncAPIClient):
 
     async def agenerate(
         self,
-        prompt: str | None = None,
+        messages: listMessage | None = None,
         *,
-        images: ImageInput | list[ImageInput] | None = None,
         tools: list[Callable[..., Any]] | None = None,
         model: str | None = None,
         reasoning_effort: ReasoningEffort = "medium",
@@ -161,7 +155,7 @@ class OAuthCodexClient(SyncAPIClient):
         output_schema: StructuredOutputSchema | None = None,
         strict_output: bool | None = None,
     ) -> str | dict[str, Any]:
-        messages = self._build_messages(prompt=prompt, images=images)
+        messages = self._normalize_initial_messages(messages)
         normalized_tools, tools_by_name = self._normalize_tools(tools)
         response_format, effective_strict_output = self._resolve_structured_output_options(
             output_schema=output_schema,
@@ -210,9 +204,8 @@ class OAuthCodexClient(SyncAPIClient):
 
     def stream(
         self,
-        prompt: str | None = None,
+        messages: listMessage | None = None,
         *,
-        images: ImageInput | list[ImageInput] | None = None,
         tools: list[Callable[..., Any]] | None = None,
         model: str | None = None,
         reasoning_effort: ReasoningEffort = "medium",
@@ -222,7 +215,7 @@ class OAuthCodexClient(SyncAPIClient):
         output_schema: StructuredOutputSchema | None = None,
         strict_output: bool | None = None,
     ) -> Iterator[str]:
-        messages = self._build_messages(prompt=prompt, images=images)
+        messages = self._normalize_initial_messages(messages)
         normalized_tools, tools_by_name = self._normalize_tools(tools)
         response_format, effective_strict_output = self._resolve_structured_output_options(
             output_schema=output_schema,
@@ -271,9 +264,8 @@ class OAuthCodexClient(SyncAPIClient):
 
     async def astream(
         self,
-        prompt: str | None = None,
+        messages: listMessage | None = None,
         *,
-        images: ImageInput | list[ImageInput] | None = None,
         tools: list[Callable[..., Any]] | None = None,
         model: str | None = None,
         reasoning_effort: ReasoningEffort = "medium",
@@ -283,7 +275,7 @@ class OAuthCodexClient(SyncAPIClient):
         output_schema: StructuredOutputSchema | None = None,
         strict_output: bool | None = None,
     ) -> AsyncIterator[str]:
-        messages = self._build_messages(prompt=prompt, images=images)
+        messages = self._normalize_initial_messages(messages)
         normalized_tools, tools_by_name = self._normalize_tools(tools)
         response_format, effective_strict_output = self._resolve_structured_output_options(
             output_schema=output_schema,
@@ -375,10 +367,10 @@ class OAuthCodexClient(SyncAPIClient):
     def _messages_for_round(
         self,
         *,
-        messages: list[Message],
+        messages: listMessage,
         previous_response_id: str | None,
         tool_results: list[ToolResult] | None,
-    ) -> list[Message]:
+    ) -> listMessage:
         if self._is_tool_continuation_round(
             previous_response_id=previous_response_id,
             tool_results=tool_results,
@@ -386,64 +378,14 @@ class OAuthCodexClient(SyncAPIClient):
             return []
         return messages
 
-    def _build_messages(
-        self,
-        *,
-        prompt: str | None,
-        images: ImageInput | list[ImageInput] | None,
-    ) -> list[Message]:
-        image_urls = self._normalize_images(images)
-
-        if prompt is not None and not isinstance(prompt, str):
-            raise TypeError("prompt must be a string")
-        if prompt is None and not image_urls:
-            raise ValueError("Either prompt or images must be provided")
-
-        content: list[dict[str, Any]] = []
-        if prompt:
-            content.append({"type": "input_text", "text": prompt})
-        for image_url in image_urls:
-            content.append({"type": "input_image", "image_url": image_url})
-
-        if not content:
-            raise ValueError("Either prompt or images must be provided")
-        if len(content) == 1 and content[0]["type"] == "input_text":
-            return [{"role": "user", "content": content[0]["text"]}]
-        return [{"role": "user", "content": content}]
-
-    def _normalize_images(self, images: ImageInput | list[ImageInput] | None) -> list[str]:
-        if images is None:
-            return []
-
-        raw_items: list[ImageInput]
-        if isinstance(images, (str, Path)):
-            raw_items = [images]
-        elif isinstance(images, list):
-            raw_items = images
-        else:
-            raise TypeError("images must be a string/Path or list of string/Path")
-
-        normalized: list[str] = []
-        for item in raw_items:
-            normalized.append(self._coerce_image_to_url(item))
-        return normalized
-
-    def _coerce_image_to_url(self, image: ImageInput) -> str:
-        if isinstance(image, Path):
-            return self._path_to_data_url(image)
-
-        value = image.strip()
-        if value.startswith(("http://", "https://", "data:")):
-            return value
-        return self._path_to_data_url(Path(value).expanduser())
-
-    def _path_to_data_url(self, path: Path) -> str:
-        if not path.is_file():
-            raise FileNotFoundError(f"image file not found: {path}")
-
-        mime_type = mimetypes.guess_type(path.name)[0] or "application/octet-stream"
-        encoded = base64.b64encode(path.read_bytes()).decode("ascii")
-        return f"data:{mime_type};base64,{encoded}"
+    def _normalize_initial_messages(self, messages: listMessage | None) -> listMessage:
+        if messages is None:
+            raise ValueError("`messages` must be a non-empty list")
+        if not isinstance(messages, list):
+            raise TypeError("`messages` must be a non-empty list")
+        if not messages:
+            raise ValueError("`messages` must be a non-empty list")
+        return messages
 
     def _normalize_tools(
         self,

{oauth_codex-2.2.0 → oauth_codex-2.3.0}/src/oauth_codex/_version.py

@@ -1,2 +1,2 @@
 __title__ = "oauth-codex"
-__version__ = "2.2.0"
+__version__ = "2.3.0"

{oauth_codex-2.2.0 → oauth_codex-2.3.0}/src/oauth_codex/core_types.py

@@ -5,6 +5,7 @@ from pathlib import Path
 from typing import Any, Callable, Literal, Protocol, TypeAlias
 
 Message: TypeAlias = dict[str, Any]
+listMessage: TypeAlias = list[Message]
 ValidationMode: TypeAlias = Literal["warn", "error", "ignore"]
 StoreBehavior: TypeAlias = Literal["auto_disable", "error", "passthrough"]
 TruncationMode: TypeAlias = Literal["auto", "disabled"]

{oauth_codex-2.2.0 → oauth_codex-2.3.0}/src/oauth_codex.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oauth-codex
-Version: 2.2.0
+Version: 2.3.0
 Summary: Codex OAuth-based Python SDK with a single Client and generate-first API
 Author: Codex
 Requires-Python: >=3.11
@@ -37,7 +37,7 @@ pip install oauth-codex
 from oauth_codex import Client
 
 client = Client()
-text = client.generate("hello")
+text = client.generate([{"role": "user", "content": "hello"}])
 print(text)
 ```
 
@@ -45,8 +45,16 @@ print(text)
 
 ```python
 text = client.generate(
-    "Describe this image",
-    images=["https://example.com/cat.png", "./local-photo.jpg"],
+    [
+        {
+            "role": "user",
+            "content": [
+                {"type": "input_text", "text": "Describe this image"},
+                {"type": "input_image", "image_url": "https://example.com/cat.png"},
+                {"type": "input_image", "image_url": "data:image/jpeg;base64,..."},
+            ],
+        }
+    ],
 )
 print(text)
 ```
@@ -58,7 +66,7 @@ def add(a: int, b: int) -> dict:
     return {"sum": a + b}
 
 text = client.generate(
-    "Calculate 2+3",
+    [{"role": "user", "content": "Calculate 2+3"}],
     tools=[add],
 )
 print(text)
@@ -78,7 +86,7 @@ def tool(input: ToolInput) -> str:
     return f"Tool received query: {input.query}"
 
 
-text = client.generate("Use the tool", tools=[tool])
+text = client.generate([{"role": "user", "content": "Use the tool"}], tools=[tool])
 print(text)
 ```
 
@@ -100,7 +108,7 @@ class Summary(BaseModel):
 
 client = Client()
 out = client.generate(
-    "Return JSON with title and score",
+    [{"role": "user", "content": "Return JSON with title and score"}],
     output_schema=Summary,
 )
 print(out)  # {"title": "...", "score": 1}
@@ -110,7 +118,7 @@ You can also pass a raw JSON schema object.
 
 ```python
 out = client.generate(
-    "Return {\"ok\": true}",
+    [{"role": "user", "content": "Return {\"ok\": true}"}],
     output_schema={
         "type": "object",
         "properties": {"ok": {"type": "boolean"}},
@@ -131,7 +139,7 @@ from oauth_codex import Client
 
 async def main() -> None:
     client = Client()
-    text = await client.agenerate("hello async")
+    text = await client.agenerate([{"role": "user", "content": "hello async"}])
     print(text)
 
 

{oauth_codex-2.2.0 → oauth_codex-2.3.0}/tests/test_generate_async.py

@@ -25,6 +25,51 @@ def _client() -> Client:
     )
 
 
+@pytest.mark.asyncio
+async def test_agenerate_rejects_non_list_messages() -> None:
+    client = _client()
+
+    with pytest.raises(TypeError, match="non-empty list"):
+        await client.agenerate("hello")  # type: ignore[arg-type]
+
+
+@pytest.mark.asyncio
+async def test_agenerate_rejects_empty_messages() -> None:
+    client = _client()
+
+    with pytest.raises(ValueError, match="non-empty list"):
+        await client.agenerate([])
+
+
+@pytest.mark.asyncio
+async def test_agenerate_preserves_mixed_content_message_order(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    client = _client()
+    captured: dict[str, object] = {}
+
+    async def fake_agenerate(**kwargs):
+        captured.update(kwargs)
+        return GenerateResult(text="ok", tool_calls=[], finish_reason="stop")
+
+    monkeypatch.setattr(client._engine, "agenerate", fake_agenerate)
+
+    mixed_messages = [
+        {
+            "role": "user",
+            "content": [
+                {"type": "input_text", "text": "describe"},
+                {"type": "input_image", "image_url": "https://example.com/cat.png"},
+                {"type": "input_text", "text": "focus on the cat"},
+            ],
+        }
+    ]
+    out = await client.agenerate(messages=mixed_messages)
+
+    assert out == "ok"
+    assert captured["messages"] == mixed_messages
+
+
 @pytest.mark.asyncio
 async def test_agenerate_auto_function_calling(monkeypatch: pytest.MonkeyPatch) -> None:
     client = _client()
@@ -46,7 +91,7 @@ async def test_agenerate_auto_function_calling(monkeypatch: pytest.MonkeyPatch)
     async def add_async(a: int, b: int) -> dict[str, int]:
         return {"sum": a + b}
 
-    out = await client.agenerate("5+7", tools=[add_async])
+    out = await client.agenerate([{"role": "user", "content": "5+7"}], tools=[add_async])
 
     assert out == "12"
     assert calls[1]["previous_response_id"] == "resp_1"
@@ -86,7 +131,7 @@ async def test_astream_supports_tool_calls(monkeypatch: pytest.MonkeyPatch) -> N
         return {"product": a * b}
 
     out: list[str] = []
-    async for delta in client.astream("calc", tools=[mul]):
+    async for delta in client.astream([{"role": "user", "content": "calc"}], tools=[mul]):
         out.append(delta)
 
     assert out == ["X", "Y"]
@@ -117,7 +162,7 @@ async def test_agenerate_supports_single_pydantic_tool_input(monkeypatch: pytest
     def tool(input: ToolInput) -> str:
         return f"Tool received query: {input.query}"
 
-    out = await client.agenerate("run", tools=[tool])
+    out = await client.agenerate([{"role": "user", "content": "run"}], tools=[tool])
 
     assert out == "done"
     tool_results = calls[1]["tool_results"]
@@ -142,7 +187,10 @@ async def test_agenerate_supports_structured_output_with_pydantic_schema(
 
     monkeypatch.setattr(client._engine, "agenerate", fake_agenerate)
 
-    out = await client.agenerate("return json", output_schema=StructuredOutput)
+    out = await client.agenerate(
+        [{"role": "user", "content": "return json"}],
+        output_schema=StructuredOutput,
+    )
 
     assert out == {"answer": "ok", "count": 1}
     response_format = captured["response_format"]
@@ -171,7 +219,7 @@ async def test_agenerate_structured_output_rejects_invalid_json(
 
     with pytest.raises(ValueError, match="valid JSON"):
         await client.agenerate(
-            "return json",
+            [{"role": "user", "content": "return json"}],
             output_schema={"type": "object", "properties": {"ok": {"type": "boolean"}}},
         )
 
@@ -193,7 +241,10 @@ async def test_agenerate_structured_output_enforces_pydantic_strict_validation(
     monkeypatch.setattr(client._engine, "agenerate", fake_agenerate)
 
     with pytest.raises(ValidationError):
-        await client.agenerate("return json", output_schema=StructuredOutput)
+        await client.agenerate(
+            [{"role": "user", "content": "return json"}],
+            output_schema=StructuredOutput,
+        )
 
 
 @pytest.mark.asyncio
@@ -217,7 +268,7 @@ async def test_astream_accepts_output_schema_and_keeps_text_stream(
 
     out: list[str] = []
     async for delta in client.astream(
-        "return json",
+        messages=[{"role": "user", "content": "return json"}],
         output_schema={"type": "object", "properties": {"ok": {"type": "boolean"}}},
     ):
         out.append(delta)

{oauth_codex-2.2.0 → oauth_codex-2.3.0}/tests/test_generate_sync.py

@@ -39,32 +39,64 @@ def test_generate_uses_default_model_and_reasoning_effort(monkeypatch: pytest.Mo
 
     monkeypatch.setattr(client._engine, "generate", fake_generate)
 
-    out = client.generate("hello")
+    out = client.generate([{"role": "user", "content": "hello"}])
 
     assert out == "ok"
     assert captured["model"] == "gpt-5.3-codex"
     assert captured["reasoning"] == {"effort": "medium"}
 
 
-def test_generate_accepts_url_and_local_image_inputs(
-    monkeypatch: pytest.MonkeyPatch, tmp_path
+def test_generate_rejects_non_list_messages() -> None:
+    client = _client()
+
+    with pytest.raises(TypeError, match="non-empty list"):
+        client.generate("hello")  # type: ignore[arg-type]
+
+
+def test_generate_rejects_empty_messages() -> None:
+    client = _client()
+
+    with pytest.raises(ValueError, match="non-empty list"):
+        client.generate([])
+
+
+def test_generate_rejects_removed_prompt_and_images_kwargs() -> None:
+    client = _client()
+
+    with pytest.raises(TypeError, match="prompt"):
+        client.generate(prompt="hello")  # type: ignore[call-arg]
+
+    with pytest.raises(TypeError, match="images"):
+        client.generate(  # type: ignore[call-arg]
+            [{"role": "user", "content": "hello"}],
+            images=["https://example.com/cat.png"],
+        )
+
+
+def test_generate_preserves_mixed_content_message_order(
+    monkeypatch: pytest.MonkeyPatch,
 ) -> None:
     client = _client()
     captured: dict[str, object] = {}
 
-    image_path = tmp_path / "photo.png"
-    image_path.write_bytes(b"PNGDATA")
-
     def fake_generate(**kwargs):
         captured.update(kwargs)
         return GenerateResult(text="ok", tool_calls=[], finish_reason="stop")
 
     monkeypatch.setattr(client._engine, "generate", fake_generate)
 
-    out = client.generate(
-        "describe",
-        images=["https://example.com/cat.png", image_path],
-    )
+    mixed_messages = [
+        {
+            "role": "user",
+            "content": [
+                {"type": "input_text", "text": "describe"},
+                {"type": "input_image", "image_url": "https://example.com/cat.png"},
+                {"type": "input_text", "text": "focus on the cat"},
+                {"type": "input_image", "image_url": "data:image/png;base64,AAAA"},
+            ],
+        }
+    ]
+    out = client.generate(messages=mixed_messages)
 
     assert out == "ok"
     messages = captured["messages"]
@@ -72,8 +104,9 @@ def test_generate_accepts_url_and_local_image_inputs(
     content = messages[0]["content"]
     assert content[0]["type"] == "input_text"
     assert content[1] == {"type": "input_image", "image_url": "https://example.com/cat.png"}
-    assert content[2]["type"] == "input_image"
-    assert content[2]["image_url"].startswith("data:image/png;base64,")
+    assert content[2] == {"type": "input_text", "text": "focus on the cat"}
+    assert content[3] == {"type": "input_image", "image_url": "data:image/png;base64,AAAA"}
+    assert messages == mixed_messages
 
 
 def test_generate_auto_function_calling(monkeypatch: pytest.MonkeyPatch) -> None:
@@ -96,7 +129,7 @@ def test_generate_auto_function_calling(monkeypatch: pytest.MonkeyPatch) -> None
     def add(a: int, b: int) -> dict[str, int]:
         return {"sum": a + b}
 
-    out = client.generate("2+3", tools=[add])
+    out = client.generate([{"role": "user", "content": "2+3"}], tools=[add])
 
     assert out == "5"
     assert calls[1]["previous_response_id"] == "resp_1"
@@ -129,7 +162,7 @@ def test_generate_replays_messages_when_tool_round_has_no_response_id(
     def add(a: int, b: int) -> dict[str, int]:
         return {"sum": a + b}
 
-    out = client.generate("1+2", tools=[add])
+    out = client.generate([{"role": "user", "content": "1+2"}], tools=[add])
 
     assert out == "3"
     assert calls[1]["previous_response_id"] is None
@@ -157,7 +190,7 @@ def test_generate_tool_failure_is_forwarded_to_model(monkeypatch: pytest.MonkeyP
         _ = x
         raise ValueError("boom")
 
-    out = client.generate("run", tools=[bad_tool])
+    out = client.generate([{"role": "user", "content": "run"}], tools=[bad_tool])
 
     assert out == "handled"
     tool_results = calls[1]["tool_results"]
@@ -184,7 +217,7 @@ def test_generate_wraps_string_tool_output_as_dict(monkeypatch: pytest.MonkeyPat
     def echo(query: str) -> str:
         return query
 
-    out = client.generate("run once", tools=[echo])
+    out = client.generate([{"role": "user", "content": "run once"}], tools=[echo])
 
     assert out == "done"
     tool_results = calls[1]["tool_results"]
@@ -213,7 +246,7 @@ def test_generate_supports_single_pydantic_tool_input_with_flat_payload(
     def tool(input: ToolInputWithDescription) -> str:
         return f"Tool received query: {input.query}"
 
-    out = client.generate("run", tools=[tool])
+    out = client.generate([{"role": "user", "content": "run"}], tools=[tool])
 
     assert out == "done"
     first_round_tools = calls[0]["tools"]
@@ -253,7 +286,7 @@ def test_generate_supports_single_pydantic_tool_input_with_nested_payload(
     def tool(input: ToolInput) -> str:
         return f"Tool received query: {input.query}"
 
-    out = client.generate("run", tools=[tool])
+    out = client.generate([{"role": "user", "content": "run"}], tools=[tool])
 
     assert out == "done"
     tool_results = calls[1]["tool_results"]
@@ -279,7 +312,7 @@ def test_generate_raises_when_tool_round_limit_exceeded(monkeypatch: pytest.Monk
         return {"ok": True}
 
     with pytest.raises(RuntimeError, match="exceeded"):
-        client.generate("loop", tools=[loop])
+        client.generate([{"role": "user", "content": "loop"}], tools=[loop])
 
 
 def test_generate_supports_structured_output_with_pydantic_schema(
@@ -299,7 +332,10 @@ def test_generate_supports_structured_output_with_pydantic_schema(
 
     monkeypatch.setattr(client._engine, "generate", fake_generate)
 
-    out = client.generate("return json", output_schema=StructuredOutput)
+    out = client.generate(
+        [{"role": "user", "content": "return json"}],
+        output_schema=StructuredOutput,
+    )
 
     assert out == {"answer": "ok", "count": 1}
     response_format = captured["response_format"]
@@ -329,7 +365,7 @@ def test_generate_supports_structured_output_with_raw_schema_dict(
     monkeypatch.setattr(client._engine, "generate", fake_generate)
 
     out = client.generate(
-        "return json",
+        [{"role": "user", "content": "return json"}],
         output_schema={
             "type": "object",
             "properties": {"ok": {"type": "boolean"}},
@@ -360,7 +396,7 @@ def test_generate_structured_output_rejects_invalid_json(monkeypatch: pytest.Mon
 
     with pytest.raises(ValueError, match="valid JSON"):
         client.generate(
-            "return json",
+            [{"role": "user", "content": "return json"}],
             output_schema={"type": "object", "properties": {"ok": {"type": "boolean"}}},
         )
 
@@ -381,7 +417,10 @@ def test_generate_structured_output_enforces_pydantic_strict_validation(
     monkeypatch.setattr(client._engine, "generate", fake_generate)
 
     with pytest.raises(ValidationError):
-        client.generate("return json", output_schema=StructuredOutput)
+        client.generate(
+            [{"role": "user", "content": "return json"}],
+            output_schema=StructuredOutput,
+        )
 
 
 def test_stream_supports_tool_calls(monkeypatch: pytest.MonkeyPatch) -> None:
@@ -408,7 +447,7 @@ def test_stream_supports_tool_calls(monkeypatch: pytest.MonkeyPatch) -> None:
     def add(a: int, b: int) -> dict[str, int]:
         return {"sum": a + b}
 
-    out = list(client.stream("calc", tools=[add]))
+    out = list(client.stream([{"role": "user", "content": "calc"}], tools=[add]))
 
     assert out == ["A", "B"]
     assert calls[1]["previous_response_id"] == "resp_1"
@@ -433,7 +472,7 @@ def test_stream_accepts_output_schema_and_keeps_text_stream(
 
     out = list(
         client.stream(
-            "return json",
+            messages=[{"role": "user", "content": "return json"}],
             output_schema={"type": "object", "properties": {"ok": {"type": "boolean"}}},
         )
     )

{oauth_codex-2.2.0 → oauth_codex-2.3.0}/tests/test_public_surface.py

@@ -3,11 +3,13 @@ from __future__ import annotations
 import pytest
 
 import oauth_codex
+from oauth_codex.core_types import listMessage
 
 
 def test_single_client_public_surface() -> None:
     assert oauth_codex.Client is oauth_codex.OAuthCodexClient
     assert oauth_codex.Client is not None
+    assert oauth_codex.listMessage is listMessage
 
 
 def test_removed_async_and_module_level_exports() -> None: