codexapi 0.6.7__tar.gz → 0.6.8__tar.gz

{codexapi-0.6.7/src/codexapi.egg-info → codexapi-0.6.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codexapi
-Version: 0.6.7
+Version: 0.6.8
 Summary: Minimal Python API for running the Codex CLI.
 License: MIT
 Keywords: codex,agent,cli,openai

{codexapi-0.6.7 → codexapi-0.6.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "codexapi"
-version = "0.6.7"
+version = "0.6.8"
 description = "Minimal Python API for running the Codex CLI."
 readme = "README.md"
 requires-python = ">=3.8"

{codexapi-0.6.7 → codexapi-0.6.8}/src/codexapi/__init__.py

@@ -27,4 +27,4 @@ __all__ = [
     "task_result",
     "watch",
 ]
-__version__ = "0.6.7"
+__version__ = "0.6.8"

{codexapi-0.6.7 → codexapi-0.6.8}/src/codexapi/task.py

@@ -486,6 +486,27 @@ class Task:
         """Ask the agent to summarize remaining issues after retries."""
         return _failure_prompt(error)
 
+    def _estimate_progress(self, agent_output, check_output):
+        """Run a progress estimate and return parsed data or an error string."""
+        try:
+            return (
+                estimate(
+                    self.prompt,
+                    agent_output or "",
+                    check_output or "",
+                    self.cwd,
+                    self._yolo,
+                    self._flags,
+                    self._progress_total,
+                ),
+                None,
+            )
+        except Exception as exc:
+            error = _single_line(str(exc))
+            if not error:
+                error = exc.__class__.__name__
+            return None, error
+
     def __call__(self, debug=False, progress=False):
         """Run the task with checker-driven retries.
             If debug is True, log debug messages.
@@ -499,29 +520,24 @@ class Task:
 
             progress_updates = progress or self._progress_updates
             self._progress_enabled = progress
+            start_time = time.monotonic()
+            self._progress_start = start_time
             if progress_updates:
-                remaining, _summary = estimate(
-                    self.prompt,
-                    "",
-                    "",
-                    self.cwd,
-                    self._yolo,
-                    self._flags,
-                    None,
-                )
-                self._progress_total = remaining
-                start_time = time.monotonic()
-                self._progress_start = start_time
-                self.on_progress(
-                    0,
-                    self.max_iterations,
-                    self._progress_total,
-                    remaining,
-                    None,
-                )
-            else:
-                start_time = time.monotonic()
-                self._progress_start = start_time
+                estimate_result, estimate_error = self._estimate_progress("", "")
+                if estimate_result is not None:
+                    remaining, _summary = estimate_result
+                    self._progress_total = remaining
+                    self.on_progress(
+                        0,
+                        self.max_iterations,
+                        self._progress_total,
+                        remaining,
+                        None,
+                    )
+                elif debug:
+                    _logger.debug(
+                        "Skipping initial progress update: %s", estimate_error
+                    )
 
             # Start with the initial prompt
             output = self.agent(self.prompt)
@@ -541,37 +557,52 @@ class Task:
                     check_output = self.last_check_output
                     if self.check_skipped:
                         check_output = "Verification skipped."
-                    remaining, summary = estimate(
-                        self.prompt,
+                    progress_data = None
+                    estimate_result, estimate_error = self._estimate_progress(
                         self.last_output or "",
                         check_output or "",
-                        self.cwd,
-                        self._yolo,
-                        self._flags,
-                        self._progress_total,
-                    )
-                    total_estimate = self._progress_total
-                    if total_estimate is None or remaining > total_estimate:
-                        total_estimate = remaining
-                    self._progress_total = total_estimate
-                    elapsed = _format_elapsed(time.monotonic() - start_time)
-                    status_prefix = (
-                        f"[{_format_turns(iteration, self.max_iterations)} @ {elapsed}]"
-                    )
-                    is_final = not error or (
-                        self.max_iterations and iteration >= self.max_iterations
-                    )
-                    if is_final:
-                        marker = "✅" if not error else "❌"
-                        summary = f"{marker} {summary}".strip()
-                    status_line = f"{status_prefix}: {summary}".rstrip()
-                    self.on_progress(
-                        iteration,
-                        self.max_iterations,
-                        total_estimate,
-                        remaining,
-                        status_line,
                     )
+                    if estimate_result is not None:
+                        remaining, summary = estimate_result
+                        total_estimate = self._progress_total
+                        if total_estimate is None or remaining > total_estimate:
+                            total_estimate = remaining
+                        self._progress_total = total_estimate
+                        progress_data = (total_estimate, remaining, summary)
+                    else:
+                        total_estimate = self._progress_total
+                        if total_estimate is None:
+                            if debug:
+                                _logger.debug(
+                                    "Skipping progress update: %s", estimate_error
+                                )
+                        else:
+                            summary = f"Progress estimate unavailable: {estimate_error}"
+                            progress_data = (
+                                total_estimate,
+                                total_estimate,
+                                summary,
+                            )
+                    if progress_data is not None:
+                        total_estimate, remaining, summary = progress_data
+                        elapsed = _format_elapsed(time.monotonic() - start_time)
+                        status_prefix = (
+                            f"[{_format_turns(iteration, self.max_iterations)} @ {elapsed}]"
+                        )
+                        is_final = not error or (
+                            self.max_iterations and iteration >= self.max_iterations
+                        )
+                        if is_final:
+                            marker = "✅" if not error else "❌"
+                            summary = f"{marker} {summary}".strip()
+                        status_line = f"{status_prefix}: {summary}".rstrip()
+                        self.on_progress(
+                            iteration,
+                            self.max_iterations,
+                            total_estimate,
+                            remaining,
+                            status_line,
+                        )
                 if not error:
                     summary = self.agent(self.success_prompt())
                     if debug:

{codexapi-0.6.7 → codexapi-0.6.8/src/codexapi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codexapi
-Version: 0.6.7
+Version: 0.6.8
 Summary: Minimal Python API for running the Codex CLI.
 License: MIT
 Keywords: codex,agent,cli,openai

{codexapi-0.6.7 → codexapi-0.6.8}/src/codexapi.egg-info/SOURCES.txt

@@ -20,4 +20,5 @@ src/codexapi.egg-info/SOURCES.txt
 src/codexapi.egg-info/dependency_links.txt
 src/codexapi.egg-info/entry_points.txt
 src/codexapi.egg-info/requires.txt
-src/codexapi.egg-info/top_level.txt
+src/codexapi.egg-info/top_level.txt
+tests/test_task_progress.py

codexapi-0.6.8/tests/test_task_progress.py

@@ -0,0 +1,74 @@
+import sys
+import unittest
+from pathlib import Path
+from unittest.mock import patch
+
+sys.path.insert(0, str(Path(__file__).resolve().parents[1] / "src"))
+
+from codexapi.task import Task
+
+
+class _FakeAgent:
+    def __init__(self):
+        self.thread_id = "thread-123"
+
+    def __call__(self, prompt):
+        return "ok"
+
+
+class _FakePushover:
+    def ensure_ready(self, announce=True):
+        return False
+
+    def send(self, title, message):
+        return False
+
+
+class _ImmediateSuccessTask(Task):
+    def __init__(self):
+        super().__init__("do the thing", max_iterations=3)
+        self.agent = _FakeAgent()
+        self._pushover = _FakePushover()
+        self.set_up_called = False
+        self.tear_down_called = False
+
+    def set_up(self):
+        self.set_up_called = True
+
+    def tear_down(self):
+        self.tear_down_called = True
+
+    def check(self, output=None):
+        self.last_check_output = '{"success": true, "reason": "ok"}'
+        self.check_skipped = False
+        return None
+
+    def notify_pushover(self, result):
+        return None
+
+
+class TaskProgressEstimateFailureTests(unittest.TestCase):
+    def test_progress_does_not_crash_when_initial_estimate_fails(self):
+        task = _ImmediateSuccessTask()
+        with patch("codexapi.task.estimate", side_effect=RuntimeError("bad json")):
+            result = task(progress=True)
+        self.assertTrue(result.success)
+        self.assertEqual(result.iterations, 1)
+        self.assertTrue(task.set_up_called)
+        self.assertTrue(task.tear_down_called)
+
+    def test_progress_does_not_crash_when_later_estimate_fails(self):
+        task = _ImmediateSuccessTask()
+        with patch(
+            "codexapi.task.estimate",
+            side_effect=[(5, "initial"), RuntimeError("bad json")],
+        ):
+            result = task(progress=True)
+        self.assertTrue(result.success)
+        self.assertEqual(result.iterations, 1)
+        self.assertTrue(task.set_up_called)
+        self.assertTrue(task.tear_down_called)
+
+
+if __name__ == "__main__":
+    unittest.main()