refactor: move Codex agent into its own subpackage

benchmarks/codex/agent/agent.py

@@ -5,7 +5,7 @@ from pathlib import Path
 from tempfile import TemporaryDirectory
 from typing import Optional
 
-from benchmarks.codex.client import CodexClient, Manifest
+from benchmarks.codex.agent.codex_client import CodexClient, Manifest
 from benchmarks.codex.logging import CodexDownloadMetric
 from benchmarks.core.utils.random import random_data
 from benchmarks.core.utils.streams import BaseStreamReader

benchmarks/codex/agent/tests/fixtures.py

@@ -3,7 +3,7 @@ import os
 import pytest
 from urllib3.util import parse_url
 
-from benchmarks.codex.client import CodexClientImpl
+from benchmarks.codex.agent.codex_client import CodexClientImpl
 
 
 @pytest.fixture

benchmarks/codex/agent/tests/test_codex_agent.py

@@ -5,8 +5,8 @@ from unittest.mock import patch
 
 import pytest
 
-from benchmarks.codex.agent import CodexAgent
-from benchmarks.codex.client import CodexClient, Cid, Manifest
+from benchmarks.codex.agent.agent import CodexAgent
+from benchmarks.codex.agent.codex_client import CodexClient, Cid, Manifest
 from benchmarks.codex.logging import CodexDownloadMetric
 from benchmarks.core.concurrency import await_predicate_async
 from benchmarks.core.utils.streams import BaseStreamReader
@@ -126,7 +126,7 @@ async def test_should_raise_exception_on_progress_query_if_download_fails():
 async def test_should_log_download_progress_as_metric(mock_logger):
     logger, output = mock_logger
 
-    with patch("benchmarks.codex.agent.logger", logger):
+    with patch("benchmarks.codex.agent.agent.logger", logger):
         client = FakeCodexClient()
         codex_agent = CodexAgent(client)
 

benchmarks/conftest.py

@@ -3,4 +3,4 @@
 from benchmarks.deluge.tests.fixtures import *
 from benchmarks.core.tests.fixtures import *
 from benchmarks.logging.sources.tests.fixtures import *
-from benchmarks.codex.tests.fixtures import *
+from benchmarks.codex.agent.tests.fixtures import *