dojozero-client 0.2.1__tar.gz → 0.3.0__tar.gz

{dojozero_client-0.2.1 → dojozero_client-0.3.0}/.gitignore

@@ -158,7 +158,8 @@ uv.lock
 Thumbs.db
 
 # Sample scenario artifacts
-dojozero-store
+dojozero-store/
+store/
 
 # Data
 /outputs/
@@ -174,4 +175,8 @@ package-lock.json
 logs/
 
 # node modules
-node_modules/
+node_modules/
+
+
+agents/llms/*.yaml
+!agents/llms/default.yaml

{dojozero_client-0.2.1 → dojozero_client-0.3.0}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: dojozero-client
-Version: 0.2.1
-Summary: Python SDK for external agents participating in DojoZero trials. Works with OpenClaw and CoPaw.
+Version: 0.3.0
+Summary: Python SDK for external agents participating in DojoZero trials. Works with OpenClaw and QwenPaw.
 Project-URL: Homepage, https://github.com/agentscope-ai/DojoZero
 Project-URL: Repository, https://github.com/agentscope-ai/DojoZero
 Project-URL: Issues, https://github.com/agentscope-ai/DojoZero/issues
@@ -149,7 +149,7 @@ asyncio.run(main())
 
 ## Documentation
 
-For the full API reference, daemon mode, multiple agent profiles, and Agent Skill integration (OpenClaw / CoPaw / AgentScope), see the [full documentation](https://github.com/agentscope-ai/DojoZero/tree/main/docs).
+For the full API reference, daemon mode, multiple agent profiles, and Agent Skill integration (OpenClaw / QwenPaw / AgentScope), see the [full documentation](https://github.com/agentscope-ai/DojoZero/tree/main/docs).
 
 ## License
 

{dojozero_client-0.2.1 → dojozero_client-0.3.0}/README.md

@@ -127,7 +127,7 @@ asyncio.run(main())
 
 ## Documentation
 
-For the full API reference, daemon mode, multiple agent profiles, and Agent Skill integration (OpenClaw / CoPaw / AgentScope), see the [full documentation](https://github.com/agentscope-ai/DojoZero/tree/main/docs).
+For the full API reference, daemon mode, multiple agent profiles, and Agent Skill integration (OpenClaw / QwenPaw / AgentScope), see the [full documentation](https://github.com/agentscope-ai/DojoZero/tree/main/docs).
 
 ## License
 

{dojozero_client-0.2.1 → dojozero_client-0.3.0}/pyproject.toml

@@ -4,8 +4,8 @@ build-backend = "hatchling.build"
 
 [project]
 name = "dojozero-client"
-version = "0.2.1"
-description = "Python SDK for external agents participating in DojoZero trials. Works with OpenClaw and CoPaw."
+version = "0.3.0"
+description = "Python SDK for external agents participating in DojoZero trials. Works with OpenClaw and QwenPaw."
 readme = "README.md"
 requires-python = ">=3.11"
 license = {text = "MIT"}

{dojozero_client-0.2.1 → dojozero_client-0.3.0}/src/dojozero_client/__init__.py

@@ -27,6 +27,7 @@ from dojozero_client._client import (
     GatewayInfo,
     Holding,
     Odds,
+    PollResult,
     TrialConnection,
     TrialEndedEvent,
     TrialMetadata,
@@ -60,7 +61,7 @@ from dojozero_client._exceptions import (
 )
 from dojozero_client._transport import GatewayTransport, SSEEvent
 
-__version__ = "0.1.0"
+__version__ = "0.3.0"
 
 __all__ = [
     # Main client
@@ -74,6 +75,7 @@ __all__ = [
     "GatewayInfo",
     "Holding",
     "Odds",
+    "PollResult",
     "TrialEndedEvent",
     "TrialMetadata",
     "TrialResults",

{dojozero_client-0.2.1 → dojozero_client-0.3.0}/src/dojozero_client/_client.py

@@ -262,6 +262,19 @@ class TrialResults:
         )
 
 
+@dataclass
+class PollResult:
+    """Result of a poll_events call."""
+
+    events: list[EventEnvelope]
+    trial_ended: dict[str, Any] | None = None
+
+    @property
+    def is_trial_ended(self) -> bool:
+        """Check if trial has ended."""
+        return self.trial_ended is not None
+
+
 class TrialConnection:
     """Connection to a specific trial.
 
@@ -450,24 +463,20 @@ class TrialConnection:
     async def poll_events(
         self,
         since: int | None = None,
-        limit: int = 50,
-        event_types: list[str] | None = None,
-    ) -> list[EventEnvelope]:
+        limit: int = 100,
+    ) -> "PollResult":
         """Poll for recent events.
 
         Args:
             since: Get events after this sequence number
-            limit: Maximum events to return
-            event_types: Optional event type filter
+            limit: Maximum events to return (max 100)
 
         Returns:
-            List of EventEnvelope objects
+            PollResult with events and trial_ended info
         """
         params: dict[str, Any] = {"limit": limit}
         if since is not None:
             params["since"] = since
-        if event_types:
-            params["event_types"] = ",".join(event_types)
 
         response = await self._transport.request(
             "GET",
@@ -482,7 +491,10 @@ class TrialConnection:
         if current_seq > self._last_sequence:
             self._last_sequence = current_seq
 
-        return events
+        # Check for trial ended
+        trial_ended = response.get("trialEnded")
+
+        return PollResult(events=events, trial_ended=trial_ended)
 
     async def get_current_odds(self) -> Odds:
         """Get current betting odds.
@@ -880,6 +892,7 @@ __all__ = [
     "EventEnvelope",
     "GatewayInfo",
     "Odds",
+    "PollResult",
     "TrialConnection",
     "TrialEndedEvent",
     "TrialMetadata",

{dojozero_client-0.2.1 → dojozero_client-0.3.0}/src/dojozero_client/_config.py

@@ -42,7 +42,7 @@ TRIALS_DIR = CONFIG_DIR / "trials"
 # Default config template with comments
 DEFAULT_CONFIG_TEMPLATE = """\
 # DojoZero Client Configuration
-# See: https://github.com/anthropics/dojozero
+# See: https://github.com/agentscope-ai/dojozero
 
 # Dashboard server URL
 # For local development: http://localhost:8000
@@ -130,7 +130,7 @@ def save_config(
     # Write with comments
     content = f"""\
 # DojoZero Client Configuration
-# See: https://github.com/anthropics/dojozero
+# See: https://github.com/agentscope-ai/dojozero
 
 # Dashboard server URL
 dashboard_url: {dashboard_url}

{dojozero_client-0.2.1 → dojozero_client-0.3.0}/src/dojozero_client/_daemon.py

@@ -18,7 +18,7 @@ from datetime import datetime, timezone
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
-from dojozero_client._client import AgentResult, DojoClient, EventEnvelope
+from dojozero_client._client import AgentResult, DojoClient, EventEnvelope, PollResult
 from dojozero_client._config import (
     CONFIG_DIR,
     PID_FILE,
@@ -550,37 +550,64 @@ class TrialHandler:
         return events
 
     async def _event_loop(self) -> None:
-        """Main event processing loop."""
+        """Main event processing loop using polling."""
         if not self._trial:
             return
 
-        try:
-            async for event in self._trial.events(
-                event_types=self.filters,
-                raise_on_trial_end=False,
-            ):
-                if not self._running:
-                    break
-                await self._handle_event(event)
+        poll_interval = float(os.environ.get("DOJOZERO_POLL_INTERVAL", "5.0"))
 
-            # Check if trial ended naturally
-            if self._trial.trial_ended is not None:
-                ended = self._trial.trial_ended
-                logger.info(
-                    "Trial %s ended (reason=%s, agents=%d)",
-                    self.trial_id,
-                    ended.reason,
-                    len(ended.final_results),
-                )
-                self._state.status = ended.reason
-                if ended.final_results:
-                    _write_results(
-                        self.state_dir / "results.json",
+        try:
+            while self._running:
+                try:
+                    result: PollResult = await self._trial.poll_events(
+                        since=self._state.last_event_sequence,
+                    )
+                except Exception as e:
+                    # 404 or connection error means gateway is gone
+                    logger.info(
+                        "Trial %s: Poll failed (%s), treating as trial ended",
                         self.trial_id,
-                        ended.reason,
-                        ended.final_results,
+                        e,
                     )
-                self._save_state()
+                    await self._handle_trial_ended("completed", [])
+                    return
+
+                for event in result.events:
+                    if not self._running:
+                        return
+                    await self._handle_event(event)
+
+                if result.is_trial_ended:
+                    reason = (
+                        result.trial_ended.get("reason", "completed")
+                        if result.trial_ended
+                        else "completed"
+                    )
+                    logger.info("Trial %s ended (reason=%s)", self.trial_id, reason)
+                    # Fetch final results from server
+                    try:
+                        results_resp = await self._trial.get_results()
+                        final_results = [
+                            AgentResult(
+                                agent_id=r.agent_id,
+                                final_balance=r.final_balance,
+                                net_profit=r.net_profit,
+                                total_bets=r.total_bets,
+                                win_rate=r.win_rate,
+                                roi=r.roi,
+                            )
+                            for r in results_resp.results
+                        ]
+                    except Exception:
+                        final_results = []
+                    await self._handle_trial_ended(reason, final_results)
+                    return
+
+                # If we got a full page, there may be more — poll again
+                # immediately to catch up. Otherwise wait before next poll.
+                if len(result.events) < 100:
+                    await asyncio.sleep(poll_interval)
+
         except asyncio.CancelledError:
             pass
         except Exception as e:
@@ -588,6 +615,25 @@ class TrialHandler:
             self._state.status = "error"
             self._save_state()
 
+    async def _handle_trial_ended(
+        self, reason: str, final_results: list[AgentResult]
+    ) -> None:
+        """Handle trial ended — write results and update state."""
+        self._state.status = reason
+        if final_results:
+            _write_results(
+                self.state_dir / "results.json",
+                self.trial_id,
+                reason,
+                final_results,
+            )
+            # Update balance from our own settled result
+            for r in final_results:
+                if r.agent_id == self.agent_id:
+                    self._state.balance = r.final_balance
+                    break
+        self._save_state()
+
     async def _handle_event(self, event: EventEnvelope) -> None:
         """Process an incoming event."""
         # Skip events already seen (replayed on reconnect)

{dojozero_client-0.2.1 → dojozero_client-0.3.0}/tests/test_client.py

@@ -210,11 +210,11 @@ class TestReconnection:
         """Test extracting agent_id from error message."""
         import re
 
-        # Test format: "Agent copaw-agent already connected"
-        error_msg = "Agent copaw-agent already connected"
+        # Test format: "Agent qwenpaw-agent already connected"
+        error_msg = "Agent qwenpaw-agent already connected"
         match = re.search(r"Agent (\S+) already", error_msg)
         assert match is not None
-        assert match.group(1) == "copaw-agent"
+        assert match.group(1) == "qwenpaw-agent"
 
     def test_extract_agent_id_from_json_error(self):
         """Test extracting agent_id from JSON error."""

{dojozero_client-0.2.1 → dojozero_client-0.3.0}/tests/test_daemon.py

@@ -9,7 +9,12 @@ from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
 
-from dojozero_client._client import AgentResult, EventEnvelope, TrialEndedEvent
+from dojozero_client._client import (
+    AgentResult,
+    EventEnvelope,
+    PollResult,
+    TrialResults,
+)
 from dojozero_client._daemon import (
     DaemonState,
     TrialHandler,
@@ -273,24 +278,8 @@ def _make_agent_result(**overrides: object) -> AgentResult:
     return AgentResult(**defaults)  # type: ignore[arg-type]
 
 
-def _make_trial_ended(
-    reason: str = "completed",
-    results: list[AgentResult] | None = None,
-) -> TrialEndedEvent:
-    """Create a TrialEndedEvent with sensible defaults."""
-    if results is None:
-        results = [_make_agent_result()]
-    return TrialEndedEvent(
-        trial_id="test-trial",
-        reason=reason,
-        timestamp=datetime.now(timezone.utc),
-        final_results=results,
-        message=f"Trial has {reason}",
-    )
-
-
 class TestTrialHandlerTrialEnd:
-    """Tests for TrialHandler handling trial_ended events."""
+    """Tests for TrialHandler handling trial_ended via polling."""
 
     @pytest.mark.asyncio
     async def test_event_loop_handles_completed_trial(self):
@@ -306,21 +295,40 @@ class TestTrialHandlerTrialEnd:
                 handler._state.status = "connected"
                 handler.state_dir.mkdir(parents=True, exist_ok=True)
 
-                # Mock trial that yields one event then ends
                 mock_trial = AsyncMock()
-                ended = _make_trial_ended("completed")
+                call_count = 0
+
+                async def mock_poll(**kwargs):
+                    nonlocal call_count
+                    call_count += 1
+                    if call_count == 1:
+                        # First poll: return an event
+                        return PollResult(
+                            events=[
+                                EventEnvelope(
+                                    trial_id="test-trial",
+                                    sequence=1,
+                                    timestamp=datetime.now(timezone.utc),
+                                    payload={"event_type": "event.odds_update"},
+                                )
+                            ],
+                        )
+                    # Second poll: trial ended
+                    return PollResult(
+                        events=[],
+                        trial_ended={"reason": "completed", "message": ""},
+                    )
 
-                async def mock_events(**kwargs):
-                    event = EventEnvelope(
+                agent_result = _make_agent_result()
+                mock_trial.poll_events = mock_poll
+                mock_trial.get_results = AsyncMock(
+                    return_value=TrialResults(
                         trial_id="test-trial",
-                        sequence=1,
-                        timestamp=datetime.now(timezone.utc),
-                        payload={"event_type": "event.odds_update"},
+                        status="completed",
+                        results=[agent_result],
+                        ended_at=datetime.now(timezone.utc),
                     )
-                    yield event
-
-                mock_trial.events = mock_events
-                mock_trial.trial_ended = ended
+                )
                 handler._trial = mock_trial
                 handler._running = True
 
@@ -353,14 +361,20 @@ class TestTrialHandlerTrialEnd:
                 handler.state_dir.mkdir(parents=True, exist_ok=True)
 
                 mock_trial = AsyncMock()
-                ended = _make_trial_ended("cancelled")
-
-                async def mock_events(**kwargs):
-                    return
-                    yield  # make it an async generator
-
-                mock_trial.events = mock_events
-                mock_trial.trial_ended = ended
+                mock_trial.poll_events = AsyncMock(
+                    return_value=PollResult(
+                        events=[],
+                        trial_ended={"reason": "cancelled", "message": ""},
+                    )
+                )
+                mock_trial.get_results = AsyncMock(
+                    return_value=TrialResults(
+                        trial_id="test-trial",
+                        status="cancelled",
+                        results=[],
+                        ended_at=None,
+                    )
+                )
                 handler._trial = mock_trial
                 handler._running = True
 
@@ -383,14 +397,20 @@ class TestTrialHandlerTrialEnd:
                 handler.state_dir.mkdir(parents=True, exist_ok=True)
 
                 mock_trial = AsyncMock()
-                ended = _make_trial_ended("failed", results=[])
-
-                async def mock_events(**kwargs):
-                    return
-                    yield
-
-                mock_trial.events = mock_events
-                mock_trial.trial_ended = ended
+                mock_trial.poll_events = AsyncMock(
+                    return_value=PollResult(
+                        events=[],
+                        trial_ended={"reason": "failed", "message": ""},
+                    )
+                )
+                mock_trial.get_results = AsyncMock(
+                    return_value=TrialResults(
+                        trial_id="test-trial",
+                        status="failed",
+                        results=[],
+                        ended_at=None,
+                    )
+                )
                 handler._trial = mock_trial
                 handler._running = True
 
@@ -401,8 +421,8 @@ class TestTrialHandlerTrialEnd:
                 assert not (handler.state_dir / "results.json").exists()
 
     @pytest.mark.asyncio
-    async def test_event_loop_no_trial_ended(self):
-        """Test event loop does not change status when stream ends without trial_ended."""
+    async def test_event_loop_gateway_404_treats_as_ended(self):
+        """Test poll failure (e.g. gateway 404) is treated as trial ended."""
         with tempfile.TemporaryDirectory() as tmpdir:
             with patch("dojozero_client._daemon.TRIALS_DIR", Path(tmpdir)):
                 client = MagicMock()
@@ -415,25 +435,19 @@ class TestTrialHandlerTrialEnd:
                 handler.state_dir.mkdir(parents=True, exist_ok=True)
 
                 mock_trial = AsyncMock()
-
-                async def mock_events(**kwargs):
-                    return
-                    yield
-
-                mock_trial.events = mock_events
-                mock_trial.trial_ended = None  # No trial_ended event
+                mock_trial.poll_events = AsyncMock(
+                    side_effect=Exception("404 Not Found")
+                )
                 handler._trial = mock_trial
                 handler._running = True
 
                 await handler._event_loop()
 
-                # Status should not be changed by event loop
-                assert handler._state.status == "connected"
-                assert not (handler.state_dir / "results.json").exists()
+                assert handler._state.status == "completed"
 
     @pytest.mark.asyncio
     async def test_event_loop_real_error_sets_error_status(self):
-        """Test real exceptions still set status=error."""
+        """Test unhandled exceptions in event processing set status=error."""
         with tempfile.TemporaryDirectory() as tmpdir:
             with patch("dojozero_client._daemon.TRIALS_DIR", Path(tmpdir)):
                 client = MagicMock()
@@ -446,16 +460,26 @@ class TestTrialHandlerTrialEnd:
                 handler.state_dir.mkdir(parents=True, exist_ok=True)
 
                 mock_trial = AsyncMock()
-
-                async def mock_events(**kwargs):
-                    raise ConnectionError("Network failed")
-                    yield  # make it an async generator
-
-                mock_trial.events = mock_events
-                mock_trial.trial_ended = None
+                mock_trial.poll_events = AsyncMock(
+                    return_value=PollResult(
+                        events=[
+                            EventEnvelope(
+                                trial_id="test-trial",
+                                sequence=1,
+                                timestamp=datetime.now(timezone.utc),
+                                payload={"event_type": "event.test"},
+                            )
+                        ],
+                    )
+                )
                 handler._trial = mock_trial
                 handler._running = True
 
+                # Make _handle_event raise to trigger error path
+                handler._handle_event = AsyncMock(
+                    side_effect=RuntimeError("Unexpected crash")
+                )
+
                 await handler._event_loop()
 
                 assert handler._state.status == "error"
@@ -483,16 +507,22 @@ class TestTrialHandlerTrialEnd:
                         roi=-0.2,
                     ),
                 ]
-                ended = _make_trial_ended("completed", results=results)
 
                 mock_trial = AsyncMock()
-
-                async def mock_events(**kwargs):
-                    return
-                    yield
-
-                mock_trial.events = mock_events
-                mock_trial.trial_ended = ended
+                mock_trial.poll_events = AsyncMock(
+                    return_value=PollResult(
+                        events=[],
+                        trial_ended={"reason": "completed", "message": ""},
+                    )
+                )
+                mock_trial.get_results = AsyncMock(
+                    return_value=TrialResults(
+                        trial_id="test-trial",
+                        status="completed",
+                        results=results,
+                        ended_at=datetime.now(timezone.utc),
+                    )
+                )
                 handler._trial = mock_trial
                 handler._running = True