python-codex 0.1.1__tar.gz → 0.1.2__tar.gz

python_codex-0.1.2/.github/workflows/test.yml

@@ -0,0 +1,65 @@
+name: test
+
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - main
+
+jobs:
+  pytest-py310:
+    name: pytest (Python 3.10)
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+
+      - name: Set up uv
+        uses: astral-sh/setup-uv@v5
+
+      - name: Sync dependencies
+        run: uv sync --dev
+
+      - name: Run pytest
+        run: uv run pytest
+
+  pytest-py36:
+    name: pytest (Python 3.6)
+    runs-on: ubuntu-22.04
+    container:
+      image: python:3.6.15-slim-bullseye
+    steps:
+      - name: Install system dependencies
+        run: |
+          apt-get update
+          apt-get install -y --no-install-recommends git
+
+      - name: Check out repository
+        uses: actions/checkout@v4
+
+      - name: Mark workspace as safe for git
+        run: git config --global --add safe.directory "$PWD"
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+
+      - name: Set up uv
+        uses: astral-sh/setup-uv@v5
+
+      - name: Show runtime versions
+        run: python --version
+      - run: node --version
+
+      - name: Sync dependencies
+        run: uv sync --dev
+
+      - name: Run pytest
+        run: uv run pytest

{python_codex-0.1.1 → python_codex-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-codex
-Version: 0.1.1
+Version: 0.1.2
 Summary: A minimal Python extraction of Codex's main agent loop
 License-File: LICENSE
 Requires-Python: >=3.10

{python_codex-0.1.1 → python_codex-0.1.2}/pycodex/cli.py

@@ -21,7 +21,6 @@ from .protocol import AgentEvent
 from .runtime import AgentRuntime
 from .runtime_services import RuntimeEnvironment, create_runtime_environment
 from .utils import CliSessionView, load_codex_dotenv
-from responses_server import launch_chat_completion_compat_server
 
 EXIT_COMMANDS = {"/exit", "/quit"}
 HISTORY_COMMAND = "/history"
@@ -33,6 +32,14 @@ LOCAL_RESPONSES_SERVER_API_KEY_ENV = "PYCODEX_LOCAL_RESPONSES_SERVER_KEY"
 CLI_ORIGINATOR = "codex-tui"
 
 
+def launch_chat_completion_compat_server(*args, **kwargs):
+    from responses_server import (
+        launch_chat_completion_compat_server as launch_compat_server,
+    )
+
+    return launch_compat_server(*args, **kwargs)
+
+
 def configure_loguru() -> None:
     try:
         from loguru import logger

{python_codex-0.1.1 → python_codex-0.1.2}/pycodex/runtime_services.py

@@ -346,6 +346,9 @@ class SubAgentManager:
             managed.state = "completed"
         finally:
             managed.pending_submission_ids.discard(submission_id)
+            if managed.pending_submission_ids and managed.error_message is None:
+                managed.completed_message = None
+                managed.state = "running"
             async with self._condition:
                 self._condition.notify_all()
 

{python_codex-0.1.1 → python_codex-0.1.2}/pycodex/tools/exec_tool.py

@@ -17,7 +17,7 @@ from ..protocol import JSONValue
 from .base_tool import BaseTool, ToolContext
 from .code_mode_manager import CodeModeManager
 
-EXEC_FREEFORM_GRAMMAR = """start: pragma_source | plain_source
+EXEC_FREEFORM_GRAMMAR = r"""start: pragma_source | plain_source
 pragma_source: PRAGMA_LINE NEWLINE SOURCE
 plain_source: SOURCE
 

{python_codex-0.1.1 → python_codex-0.1.2}/pycodex/tools/unified_exec_manager.py

@@ -184,6 +184,9 @@ class _HeadTailBuffer:
         self.tail.clear()
         return combined
 
+    def has_data(self) -> bool:
+        return bool(self.head or self.tail)
+
 
 @dataclass(slots=True)
 class UnifiedExecSession:
@@ -194,6 +197,7 @@ class UnifiedExecSession:
     tty: bool
     unread_output: _HeadTailBuffer = field(default_factory=_HeadTailBuffer)
     reader_task: asyncio.Task | None = None
+    output_event: asyncio.Event = field(default_factory=asyncio.Event)
 
 
 class UnifiedExecManager:
@@ -294,11 +298,22 @@ class UnifiedExecManager:
         if session is None:
             return f"Error: session_id {session_id} is not running."
 
-        start_wait = asyncio.get_running_loop().time()
+        loop = asyncio.get_running_loop()
+        start_wait = loop.time()
         try:
             await asyncio.wait_for(session.process.wait(), timeout=yield_time_ms / 1000.0)
         except asyncio.TimeoutError:
-            pass
+            remaining_seconds = (yield_time_ms / 1000.0) - (loop.time() - start_wait)
+            if (
+                session.process.returncode is None
+                and not session.unread_output.has_data()
+                and remaining_seconds > 0
+            ):
+                session.output_event.clear()
+                try:
+                    await asyncio.wait_for(session.output_event.wait(), timeout=remaining_seconds)
+                except asyncio.TimeoutError:
+                    pass
 
         if session.reader_task is not None and session.process.returncode is not None:
             await session.reader_task
@@ -345,6 +360,8 @@ class UnifiedExecManager:
             if not chunk:
                 break
             session.unread_output.push_chunk(chunk)
+            session.output_event.set()
+        session.output_event.set()
 
     def _resolve_workdir(self, workdir: str | None) -> Path:
         if not workdir:

{python_codex-0.1.1 → python_codex-0.1.2}/pycodex/utils/get_env.py

@@ -83,10 +83,15 @@ def get_package_version() -> str:
     detected = _detect_upstream_codex_version()
     if detected is not None:
         return detected
-    try:
-        return importlib.metadata.version("pycodex")
-    except importlib.metadata.PackageNotFoundError:
-        return "0.1.0"
+    for distribution_name in ("python-codex", "pycodex"):
+        try:
+            return importlib.metadata.version(distribution_name)
+        except importlib.metadata.PackageNotFoundError:
+            continue
+    local_version = _read_local_package_version()
+    if local_version is not None:
+        return local_version
+    return "0.1.0"
 
 
 def get_os_info() -> tuple[str, str]:
@@ -178,6 +183,20 @@ def _normalize_os_version(version: str) -> str:
     return version
 
 
+def _read_local_package_version() -> str | None:
+    pyproject_path = Path(__file__).resolve().parents[2] / "pyproject.toml"
+    if not pyproject_path.is_file():
+        return None
+    match = re.search(
+        r'^\s*version\s*=\s*"([^"]+)"\s*$',
+        pyproject_path.read_text(encoding="utf-8"),
+        flags=re.MULTILINE,
+    )
+    if match is None:
+        return None
+    return match.group(1).strip() or None
+
+
 def _tmux_display_message(fmt: str) -> str | None:
     try:
         output = subprocess.run(

{python_codex-0.1.1 → python_codex-0.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "python-codex"
-version = "0.1.1"
+version = "0.1.2"
 description = "A minimal Python extraction of Codex's main agent loop"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -34,7 +34,7 @@ package = true
 default-groups = []
 
 [tool.hatch.build.targets.wheel]
-packages = ["pycodex"]
+packages = ["pycodex", "responses_server"]
 
 [tool.pytest.ini_options]
 pythonpath = ["."]

{python_codex-0.1.1 → python_codex-0.1.2}/tests/test_agent.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import asyncio
-import time
 
 import pytest
 
@@ -44,6 +43,25 @@ class SlowTool(BaseTool):
         return "done"
 
 
+class CoordinatedParallelTool(BaseTool):
+    description = "Tool that proves both calls entered before either finished."
+    input_schema = {"type": "object"}
+    supports_parallel = True
+
+    def __init__(self, name: str, entered: list[str], both_started: asyncio.Event) -> None:
+        self.name = name
+        self._entered = entered
+        self._both_started = both_started
+
+    async def run(self, context, args):
+        del context, args
+        self._entered.append(self.name)
+        if len(self._entered) == 2:
+            self._both_started.set()
+        await asyncio.wait_for(self._both_started.wait(), timeout=0.2)
+        return "done"
+
+
 class WaitAgentNotificationTool(BaseTool):
     name = "wait_agent"
     description = "Returns a completed sub-agent status."
@@ -109,17 +127,16 @@ async def test_parallel_tools_share_one_model_round() -> None:
     )
 
     tools = ToolRegistry()
-    tools.register(SlowTool("slow_a"))
-    tools.register(SlowTool("slow_b"))
+    entered: list[str] = []
+    both_started = asyncio.Event()
+    tools.register(CoordinatedParallelTool("slow_a", entered, both_started))
+    tools.register(CoordinatedParallelTool("slow_b", entered, both_started))
 
     agent = AgentLoop(model, tools)
-
-    started = time.perf_counter()
     result = await agent.run_turn(["并行跑两个工具"])
-    elapsed = time.perf_counter() - started
 
     assert result.output_text == "两个工具都执行完了"
-    assert elapsed < 0.11
+    assert entered == ["slow_a", "slow_b"] or entered == ["slow_b", "slow_a"]
 
 
 @pytest.mark.asyncio

{python_codex-0.1.1 → python_codex-0.1.2}/tests/test_builtin_tools.py

@@ -259,7 +259,9 @@ async def test_exec_command_tool_returns_session_for_long_running_process(tmp_pa
 
     assert closed.is_error is False
     assert "Process exited with code 0" in closed.output
-    assert "startend" in closed.output
+    combined_output = result.output + closed.output
+    assert "start" in combined_output
+    assert "end" in combined_output
 
 
 @pytest.mark.asyncio
@@ -374,9 +376,27 @@ async def test_write_stdin_tool_defaults_to_upstream_truncation_budget(tmp_path)
         ToolContext(turn_id="turn_9_write_finish", history=()),
     )
 
+    body = poll.output.split("Output:\n", 1)[1]
+    for _ in range(5):
+        if "tokens truncated" in body:
+            break
+        if "Process exited with code 0" in poll.output:
+            break
+        poll = await registry.execute(
+            ToolCall(
+                call_id="call_9_write_finish_poll",
+                name="write_stdin",
+                arguments={
+                    "session_id": session_id,
+                    "yield_time_ms": 200,
+                },
+            ),
+            ToolContext(turn_id="turn_9_write_finish_poll", history=()),
+        )
+        body = poll.output.split("Output:\n", 1)[1]
+
     assert poll.is_error is False
     assert "Original token count: " in poll.output
-    body = poll.output.split("Output:\n", 1)[1]
     assert body.startswith("Total output lines: 1\n\nHEAD")
     assert "tokens truncated" in body
     assert body.endswith("TAIL")
@@ -899,6 +919,18 @@ async def test_spawn_agent_send_input_wait_and_close_round_trip() -> None:
         ),
         ToolContext(turn_id="turn_wait", history=()),
     )
+    if waited.output == {
+        "status": {agent_id: {"completed": "done one"}},
+        "timed_out": False,
+    }:
+        waited = await registry.execute(
+            ToolCall(
+                call_id="call_wait_again",
+                name="wait_agent",
+                arguments={"ids": [agent_id], "timeout_ms": 1000},
+            ),
+            ToolContext(turn_id="turn_wait_again", history=()),
+        )
 
     assert waited.output == {
         "status": {agent_id: {"completed": "done two"}},

{python_codex-0.1.1 → python_codex-0.1.2}/tests/test_cli.py

@@ -344,9 +344,23 @@ def test_build_runtime_overrides_provider_for_managed_vllm_mode(
 @pytest.mark.asyncio
 async def test_run_cli_launches_managed_responses_server_for_vllm_endpoint(
     monkeypatch,
+    tmp_path,
 ) -> None:
     started = {}
     registered = {}
+    config_path = tmp_path / "config.toml"
+    config_path.write_text(
+        "\n".join(
+            [
+                'model = "demo-model"',
+                'model_provider = "demo"',
+                '[model_providers.demo]',
+                'base_url = "https://example.com/v1"',
+                'env_key = "DUMMY_KEY"',
+            ]
+        )
+    )
+    monkeypatch.setenv("DUMMY_KEY", "test-key")
 
     class _FakeManagedServer:
         base_url = "http://127.0.0.1:18001/v1"
@@ -415,6 +429,8 @@ async def test_run_cli_launches_managed_responses_server_for_vllm_endpoint(
 
     args = build_parser().parse_args(
         [
+            "--config",
+            str(config_path),
             "--vllm-endpoint",
             "http://127.0.0.1:18000",
             "Reply with exactly OK.",
@@ -2588,7 +2604,22 @@ async def test_prompt_request_permissions_supports_session_scope() -> None:
 async def test_run_cli_returns_non_zero_on_single_turn_error(
     monkeypatch: pytest.MonkeyPatch,
     capsys: pytest.CaptureFixture[str],
+    tmp_path: Path,
 ) -> None:
+    config_path = tmp_path / "config.toml"
+    config_path.write_text(
+        "\n".join(
+            [
+                'model = "demo-model"',
+                'model_provider = "demo"',
+                '[model_providers.demo]',
+                'base_url = "https://example.com/v1"',
+                'env_key = "DUMMY_KEY"',
+            ]
+        )
+    )
+    monkeypatch.setenv("DUMMY_KEY", "test-key")
+
     class _FakeRuntime:
         def __init__(self):
             self._stopped = asyncio.Event()
@@ -2609,7 +2640,7 @@ async def test_run_cli_returns_non_zero_on_single_turn_error(
     monkeypatch.setattr("pycodex.cli.build_runtime", lambda *args, **kwargs: _FakeRuntime())
     monkeypatch.setattr("sys.stdin.read", lambda: "")
 
-    args = build_parser().parse_args(["hello"])
+    args = build_parser().parse_args(["--config", str(config_path), "hello"])
     code = await run_cli(args)
 
     assert code == 1

{python_codex-0.1.1 → python_codex-0.1.2}/tests/test_model.py

@@ -8,6 +8,7 @@ from pathlib import Path
 
 import pytest
 
+import pycodex.utils.get_env as get_env
 from pycodex import (
     AssistantMessage,
     ContextMessage,
@@ -541,6 +542,29 @@ def test_responses_model_client_builds_tui_user_agent(monkeypatch) -> None:
     assert re.match(r'^codex-tui/.+ \(.+; .+\) .+ \(codex-tui; .+\)$', headers['user-agent'])
 
 
+def test_get_package_version_reads_distribution_name(monkeypatch) -> None:
+    def fake_version(name: str) -> str:
+        if name == 'python-codex':
+            return '0.1.2'
+        raise get_env.importlib.metadata.PackageNotFoundError
+
+    monkeypatch.setattr(get_env, '_detect_upstream_codex_version', lambda: None)
+    monkeypatch.setattr(get_env.importlib.metadata, 'version', fake_version)
+
+    assert get_env.get_package_version() == '0.1.2'
+
+
+def test_get_package_version_falls_back_to_local_pyproject(monkeypatch) -> None:
+    def fake_missing_version(_name: str) -> str:
+        raise get_env.importlib.metadata.PackageNotFoundError
+
+    monkeypatch.setattr(get_env, '_detect_upstream_codex_version', lambda: None)
+    monkeypatch.setattr(get_env.importlib.metadata, 'version', fake_missing_version)
+    monkeypatch.setattr(get_env, '_read_local_package_version', lambda: '0.1.2')
+
+    assert get_env.get_package_version() == '0.1.2'
+
+
 def test_responses_model_client_serializes_prompt_turn_metadata(monkeypatch) -> None:
     provider = ResponsesProviderConfig(
         model='demo-model',