i151-engine 0.2.0__tar.gz → 0.2.2__tar.gz

{i151_engine-0.2.0 → i151_engine-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: i151-engine
-Version: 0.2.0
+Version: 0.2.2
 Summary: Headless game engine for the i151 student AI competition
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{i151_engine-0.2.0 → i151_engine-0.2.2}/i151_engine/bots/protocol.py

@@ -18,3 +18,11 @@ class Bot(Protocol):
     ) -> Action: ...
 
     def teardown(self) -> None: ...
+
+    def observe(self, view: PlayerView) -> None:
+        """Optionnel : appelé après chaque action (y compris adverses / enchaînements).
+
+        Permet au tracker de suivre le talon carte par carte sans exposer
+        l'historique complet dans ``PlayerView``.
+        """
+        ...

{i151_engine-0.2.0 → i151_engine-0.2.2}/i151_engine/core/legal_actions.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from i151_engine.models.action import Action, ActionType
+from i151_engine.models.action import Action
 from i151_engine.models.card import Card, Rank, Suit
 from i151_engine.models.player import PlayerState
 from i151_engine.game.round_state import RoundState

{i151_engine-0.2.0 → i151_engine-0.2.2}/i151_engine/runner/match_runner.py

@@ -66,9 +66,17 @@ def play_bots_match(
     opponent_id: str = "student:opponent",
     challenger_dir: Path | None = None,
     opponent_dir: Path | None = None,
+    manage_lifecycle: bool = True,
 ) -> MatchResult:
-    challenger.setup(challenger_dir or Path("."))
-    opponent.setup(opponent_dir or Path("."))
+    """Joue un match entre deux bots.
+
+    Si ``manage_lifecycle`` est faux, le caller doit avoir déjà appelé
+    ``setup`` et appellera ``teardown`` lui-même (ex. cache adversaire
+    pendant une collecte multi-matchs).
+    """
+    if manage_lifecycle:
+        challenger.setup(challenger_dir or Path("."))
+        opponent.setup(opponent_dir or Path("."))
 
     recorder = MatchRecorder(
         seed=config.seed,
@@ -109,8 +117,9 @@ def play_bots_match(
             recorder=recorder,
         )
     finally:
-        challenger.teardown()
-        opponent.teardown()
+        if manage_lifecycle:
+            challenger.teardown()
+            opponent.teardown()
 
 
 def _run_match(
@@ -213,6 +222,7 @@ def _run_match(
         )
 
         match = replace(match, current_round=new_round)
+        _notify_observers(match, new_round, bots, specs, steps, acting_id=pid)
 
     winner = match.winner_id
     if winner is None and match.status == MatchStatus.IN_PROGRESS:
@@ -268,6 +278,22 @@ def _decide_with_timeout(bot: Bot, view, legal, timeout_ms: int):
         signal.signal(signal.SIGALRM, previous)
 
 
+def _notify_observers(match, round_state, bots: dict, specs, step_index: int, *, acting_id: str) -> None:
+    """Informe les bots non-actifs (tracker) après chaque action atomique."""
+    for pid, bot in bots.items():
+        observe = getattr(bot, "observe", None)
+        if observe is None or pid == acting_id:
+            continue
+        try:
+            view = build_player_view(
+                match, round_state, pid, opponent_specs=specs, step_index=step_index
+            )
+            observe(view)
+        except Exception:
+            # observe est best-effort : ne doit pas forfaiter la partie
+            continue
+
+
 def _forfeit_result(
     match: MatchState,
     opponent_id: str,

{i151_engine-0.2.0 → i151_engine-0.2.2}/i151_engine/view/builder.py

@@ -57,8 +57,10 @@ def build_player_view(
     opponents.sort(key=lambda o: o.seat_index)
     next_pid = _next_player_id(round_state)
 
-    can_draw = is_your_turn and any(a.type == ActionType.DRAW_CARD for a in legal)
-    can_pass = is_your_turn and any(a.type == ActionType.PASS_TURN for a in legal)
+    # legal_actions = joueur courant (pas seulement la perspective « you »).
+    can_draw = any(a.type == ActionType.DRAW_CARD for a in legal)
+    can_pass = any(a.type == ActionType.PASS_TURN for a in legal)
+    current = round_state.current_player
 
     return PlayerView(
         you=YouState(
@@ -92,8 +94,9 @@ def build_player_view(
             can_pass=can_pass,
             draw_count_if_draw=2 if round_state.ace_effect_active else 1,
             step_index=step_index,
-            current_player_id=round_state.current_player.player_id,
+            current_player_id=current.player_id,
             next_player_id=next_pid,
+            is_chaining=current.is_chaining,
         ),
         match=MatchContext(
             round_number=match.round_number,

{i151_engine-0.2.0 → i151_engine-0.2.2}/i151_engine/view/player_view.py

@@ -54,12 +54,22 @@ class TableState:
 @dataclass(frozen=True)
 class TurnState:
     is_your_turn: bool
+    # Actions du *joueur courant* (pas seulement « you »).
+    # can_draw=False après pioche, en chaînage, ou si choose_suit — donc
+    # « a déjà pioché » se lit : can_pass and not is_chaining (pas ≡ not can_draw).
     can_draw: bool
     can_pass: bool
     draw_count_if_draw: int
     step_index: int
     current_player_id: str
     next_player_id: str | None
+    # État public du *joueur courant* (toi ou adversaire).
+    is_chaining: bool
+
+    @property
+    def has_drawn_this_turn(self) -> bool:
+        """True si le joueur courant a déjà pioché ce tour (dérivé de can_pass / chaînage)."""
+        return self.can_pass and not self.is_chaining
 
 
 @dataclass(frozen=True)

{i151_engine-0.2.0 → i151_engine-0.2.2}/i151_engine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: i151-engine
-Version: 0.2.0
+Version: 0.2.2
 Summary: Headless game engine for the i151 student AI competition
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{i151_engine-0.2.0 → i151_engine-0.2.2}/i151_engine.egg-info/SOURCES.txt

@@ -41,6 +41,7 @@ tests/test_forfeit_scoring.py
 tests/test_match_runner.py
 tests/test_match_timeout.py
 tests/test_opponents.py
+tests/test_player_view_turn.py
 tests/test_recorder.py
 tests/test_reducer.py
 tests/test_rules.py

{i151_engine-0.2.0 → i151_engine-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "i151-engine"
-version = "0.2.0"
+version = "0.2.2"
 description = "Headless game engine for the i151 student AI competition"
 readme = "README.md"
 requires-python = ">=3.11"

i151_engine-0.2.2/tests/test_player_view_turn.py

@@ -0,0 +1,68 @@
+"""Tests PlayerView / TurnState : flags du joueur courant."""
+
+from __future__ import annotations
+
+from dataclasses import replace
+
+from i151_engine.game.round import create_match
+from i151_engine.view.builder import build_player_view
+
+
+def test_turn_exposes_current_player_chaining_and_can_draw():
+    match = create_match(("A", "B"), seed=1, target_score=1)
+    round_state = match.current_round
+    assert round_state is not None
+
+    current = round_state.current_player
+    idx = round_state.current_player_index
+    players = list(round_state.players)
+    players[idx] = replace(
+        players[idx],
+        has_drawn_this_turn=True,
+        is_chaining=False,
+    )
+    round_state = replace(round_state, players=tuple(players))
+    match = replace(match, current_round=round_state)
+
+    other = "p1" if current.player_id == "p0" else "p0"
+    view = build_player_view(
+        match,
+        round_state,
+        other,
+        opponent_specs={},
+        step_index=0,
+    )
+    assert view.turn.current_player_id == current.player_id
+    assert view.turn.is_your_turn is False
+    assert view.turn.can_draw is False
+    assert view.turn.can_pass is True
+    assert view.turn.has_drawn_this_turn is True  # propriété dérivée
+    assert view.turn.is_chaining is False
+    assert view.you.has_drawn_this_turn is False
+    assert view.you.is_chaining is False
+
+
+def test_turn_flags_match_you_when_your_turn():
+    match = create_match(("A", "B"), seed=2, target_score=1)
+    round_state = match.current_round
+    assert round_state is not None
+    idx = round_state.current_player_index
+    players = list(round_state.players)
+    players[idx] = replace(players[idx], is_chaining=True)
+    round_state = replace(round_state, players=tuple(players))
+    match = replace(match, current_round=round_state)
+
+    current_id = round_state.current_player.player_id
+    view = build_player_view(
+        match,
+        round_state,
+        current_id,
+        opponent_specs={},
+        step_index=1,
+    )
+    assert view.turn.is_your_turn is True
+    assert view.turn.is_chaining is True
+    assert view.you.is_chaining is True
+    assert view.turn.can_draw is False
+    assert view.turn.can_pass is True
+    assert view.turn.has_drawn_this_turn is False  # chaînage ≠ pioché