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

{i151_engine-0.2.2 → i151_engine-0.2.4}/ARCHITECTURE.md

@@ -606,7 +606,7 @@ def decide(view: PlayerView, legal_actions: list[Action], time_left_ms: int) ->
 | Taille ZIP | 50 Mo |
 | Fichier modèle unique | 30 Mo |
 | Temps `setup()` | 30 s |
-| Temps `decide()` | `decision_timeout_ms` (2 s par défaut) |
+| Temps `decide()` | `decision_timeout_ms` (1000 ms par défaut) |
 | RAM processus | 512 Mo |
 
 Le runner charge le bot une fois par match (`setup` → boucle `decide` → `teardown`).
@@ -787,7 +787,7 @@ Les parties générées localement n'alimentent pas le classement ; seules les s
 class MatchConfig:
     seed: int
     target_score: int = 151
-    decision_timeout_ms: int = 2000
+    decision_timeout_ms: int = 1000
     match_timeout_ms: int = 600_000
     max_steps_per_round: int = 500   # garde-fou anti-boucle
 

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

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

{i151_engine-0.2.2 → i151_engine-0.2.4}/i151_engine/core/scoring.py

@@ -108,7 +108,8 @@ def apply_round_scoring(match: MatchState, winner_id: str) -> MatchState:
             is_excluded=player.is_excluded or new_score >= match.target_score,
             has_drawn_this_turn=False,
             is_chaining=False,
-            consecutive_round_wins=player.consecutive_round_wins,
+            # Aligné Flutter/TS : série cassée dès qu'un autre gagne la manche.
+            consecutive_round_wins=0,
         )
 
     winner, last_winner_id = _track_consecutive_wins(
@@ -130,6 +131,7 @@ def apply_round_scoring(match: MatchState, winner_id: str) -> MatchState:
             winner_id=winner_id_final,
             current_round=None,
             seed=match.seed,
+            cards_per_player=match.cards_per_player,
         )
 
     dealer_index, _ = _next_dealer_and_starter(players_list, match.dealer_index)
@@ -143,6 +145,7 @@ def apply_round_scoring(match: MatchState, winner_id: str) -> MatchState:
         winner_id=None,
         current_round=None,
         seed=match.seed,
+        cards_per_player=match.cards_per_player,
     )
 
 

{i151_engine-0.2.2 → i151_engine-0.2.4}/i151_engine/game/recorder.py

@@ -66,7 +66,7 @@ class ReplayLog:
 
 
 class MatchRecorder:
-    """Records public match state for web replay."""
+    """Enregistre l'état pour le replay web (après match, vue spectateur)."""
 
     def __init__(
         self,

{i151_engine-0.2.2 → i151_engine-0.2.4}/i151_engine/game/round.py

@@ -15,8 +15,11 @@ def create_match(
     seed: int,
     target_score: int = 151,
     cards_per_player: int = 8,
+    initial_dealer_index: int = 0,
 ) -> MatchState:
     validate_cards_per_player(cards_per_player, player_count=len(player_names))
+    n = len(player_names)
+    dealer = int(initial_dealer_index) % n
     players = tuple(
         PlayerState(player_id=f"p{i}", name=name, hand=())
         for i, name in enumerate(player_names)
@@ -25,7 +28,7 @@ def create_match(
         status=MatchStatus.IN_PROGRESS,
         players=players,
         round_number=1,
-        dealer_index=0,
+        dealer_index=dealer,
         target_score=target_score,
         last_winner_id=None,
         winner_id=None,

i151_engine-0.2.4/i151_engine/runner/challenge_guards.py

@@ -0,0 +1,28 @@
+"""Gardes compétition : aucun oracle / ground-truth pendant un match arène.
+
+Le chemin d'entraînement MCTS (``collect_context``) peut exposer l'état moteur
+complet via un ``ContextVar`` ancré dans ``sys.modules``. Les matchs officiels
+n'utilisent jamais ce chemin, mais on efface tout de même le contexte avant
+chaque ``decide`` pour qu'une soumission ne puisse pas lire un état résiduel.
+"""
+
+from __future__ import annotations
+
+import sys
+
+# Doit rester aligné avec ``mcts_bot/collect_context.py`` (_STORE_NAME).
+_GT_STORE_NAME = "_i151_mcts_collect_gt_store"
+
+
+def clear_training_oracle_context() -> None:
+    """Efface tout ContextVar ground-truth éventuellement présent."""
+    store = sys.modules.get(_GT_STORE_NAME)
+    if store is None:
+        return
+    var = getattr(store, "var", None)
+    if var is None:
+        return
+    try:
+        var.set(None)
+    except Exception:
+        pass

{i151_engine-0.2.2 → i151_engine-0.2.4}/i151_engine/runner/config.py

@@ -9,7 +9,9 @@ class MatchConfig:
     seed: int
     target_score: int = 151
     cards_per_player: int = 8
-    decision_timeout_ms: int = 2000
+    decision_timeout_ms: int = 1000
     match_timeout_ms: int = 600_000
     max_steps_per_round: int = 500
     max_rounds: int = 200
+    # 0 (défaut) → p1 commence la 1ʳᵉ manche ; 1 → p0 commence.
+    initial_dealer_index: int = 0

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

@@ -16,6 +16,7 @@ from i151_engine.game.round import create_match, start_round
 from i151_engine.models.enums import MatchStatus, RoundPhase
 from i151_engine.opponents.registry import OpponentRegistry, default_registry
 from i151_engine.opponents.types import OpponentSpec
+from i151_engine.runner.challenge_guards import clear_training_oracle_context
 from i151_engine.runner.config import MatchConfig
 from i151_engine.view.builder import build_player_view
 
@@ -154,6 +155,7 @@ def _run_match(
         seed=config.seed,
         target_score=config.target_score,
         cards_per_player=config.cards_per_player,
+        initial_dealer_index=getattr(config, "initial_dealer_index", 0),
     )
     recorder.start_round(match.round_number)
     steps = 0
@@ -199,6 +201,8 @@ def _run_match(
 
         remaining_ms = config.decision_timeout_ms
         try:
+            # Compétition : jamais d'état moteur complet pour le bot.
+            clear_training_oracle_context()
             action = _decide_with_timeout(bot, view, legal, remaining_ms)
         except TimeoutError:
             return _forfeit_result(match, opponent_id, pid, steps, "timeout", recorder)

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

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

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

@@ -31,12 +31,15 @@ i151_engine/opponents/catalog.py
 i151_engine/opponents/registry.py
 i151_engine/opponents/schedules.py
 i151_engine/opponents/types.py
+i151_engine/runner/challenge_guards.py
 i151_engine/runner/config.py
 i151_engine/runner/match_runner.py
 i151_engine/view/builder.py
 i151_engine/view/player_view.py
 tests/test_card.py
+tests/test_challenge_guards.py
 tests/test_deck.py
+tests/test_first_player.py
 tests/test_forfeit_scoring.py
 tests/test_match_runner.py
 tests/test_match_timeout.py

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

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

i151_engine-0.2.4/tests/test_challenge_guards.py

@@ -0,0 +1,77 @@
+"""Gardes compétition : oracle ground-truth effacé avant decide."""
+
+from __future__ import annotations
+
+import sys
+import types
+from contextvars import ContextVar
+
+from i151_engine.models.action import Action
+from i151_engine.runner.challenge_guards import _GT_STORE_NAME, clear_training_oracle_context
+from i151_engine.runner.config import MatchConfig
+from i151_engine.runner.match_runner import play_bots_match
+from i151_engine.view.player_view import PlayerView
+
+
+class _OracleProbeBot:
+    """Laisse un résidu GT après chaque decide ; le suivant doit le trouver effacé."""
+
+    def __init__(self) -> None:
+        self.saw_oracle = False
+        self.calls = 0
+
+    def setup(self, submission_dir) -> None:  # noqa: ANN001
+        return None
+
+    def decide(
+        self,
+        view: PlayerView,
+        legal_actions: list[Action],
+        time_left_ms: int,
+    ) -> Action:
+        self.calls += 1
+        store = sys.modules.get(_GT_STORE_NAME)
+        var = getattr(store, "var", None) if store is not None else None
+        if var is not None and var.get() is not None:
+            self.saw_oracle = True
+        # Résidu volontaire : le runner doit l'effacer avant le prochain decide.
+        if var is not None:
+            var.set({"leak": self.calls})
+        return legal_actions[0]
+
+    def teardown(self) -> None:
+        return None
+
+
+def test_clear_training_oracle_context_resets_store():
+    var: ContextVar[object | None] = ContextVar("test_gt", default=None)
+    sys.modules[_GT_STORE_NAME] = types.SimpleNamespace(var=var)
+    try:
+        var.set(object())
+        assert var.get() is not None
+        clear_training_oracle_context()
+        assert var.get() is None
+    finally:
+        del sys.modules[_GT_STORE_NAME]
+
+
+def test_play_bots_match_clears_oracle_before_decide():
+    var: ContextVar[object | None] = ContextVar("test_gt_match", default=None)
+    sys.modules[_GT_STORE_NAME] = types.SimpleNamespace(var=var)
+    try:
+        var.set({"pre_match_leak": True})
+        probe = _OracleProbeBot()
+        opponent = _OracleProbeBot()
+        result = play_bots_match(
+            probe,
+            opponent,
+            MatchConfig(seed=7, target_score=1, max_rounds=3, max_steps_per_round=40),
+            challenger_name="probe",
+            opponent_name="opp",
+        )
+        assert result.steps_played > 0
+        assert probe.calls + opponent.calls >= 2
+        assert not probe.saw_oracle
+        assert not opponent.saw_oracle
+    finally:
+        del sys.modules[_GT_STORE_NAME]

i151_engine-0.2.4/tests/test_first_player.py

@@ -0,0 +1,40 @@
+"""Tests first_player_stats + initial_dealer_index."""
+
+from __future__ import annotations
+
+from i151_engine.game.round import create_match
+from i151_engine.bots.random_bot import RandomBot
+from i151_engine.runner.config import MatchConfig
+from i151_engine.runner.match_runner import play_bots_match
+
+
+def test_create_match_dealer_1_makes_p0_start():
+    match = create_match(("A", "B"), seed=7, initial_dealer_index=1)
+    assert match.dealer_index == 1
+    assert match.current_round is not None
+    assert match.current_round.current_player.player_id == "p0"
+
+
+def test_create_match_dealer_0_makes_p1_start():
+    match = create_match(("A", "B"), seed=7, initial_dealer_index=0)
+    assert match.dealer_index == 0
+    assert match.current_round is not None
+    assert match.current_round.current_player.player_id == "p1"
+
+
+def test_match_config_initial_dealer_index():
+    a = play_bots_match(
+        RandomBot(),
+        RandomBot(),
+        MatchConfig(seed=11, target_score=1, initial_dealer_index=1),
+        challenger_name="c",
+        opponent_name="o",
+    )
+    b = play_bots_match(
+        RandomBot(),
+        RandomBot(),
+        MatchConfig(seed=11, target_score=1, initial_dealer_index=0),
+        challenger_name="c",
+        opponent_name="o",
+    )
+    assert a.steps_played > 0 and b.steps_played > 0

{i151_engine-0.2.2 → i151_engine-0.2.4}/tests/test_scoring.py

@@ -81,3 +81,56 @@ def test_consecutive_win_bonus_deducts_ten_from_winner():
     result = apply_round_scoring(match, "p0")
     assert result.player_by_id("p0").total_score == 40
     assert result.player_by_id("p0").consecutive_round_wins == 0
+
+
+def test_losing_resets_consecutive_round_wins():
+    """Régression : sans reset, la vue exposait une série fantôme au perdant."""
+    end_p0 = PlayerState(player_id="p0", name="NewWinner", hand=())
+    end_p1 = PlayerState(player_id="p1", name="PrevStreak", hand=(Card(Rank.SEVEN, Suit.CLUBS),))
+
+    round_state = _ended_round(players=(end_p0, end_p1), winner_id="p0")
+    match = MatchState(
+        status=MatchStatus.IN_PROGRESS,
+        players=(
+            PlayerState("p0", "NewWinner", hand=(), total_score=10, consecutive_round_wins=0),
+            PlayerState("p1", "PrevStreak", hand=(), total_score=20, consecutive_round_wins=2),
+        ),
+        round_number=3,
+        dealer_index=0,
+        target_score=151,
+        last_winner_id="p1",
+        winner_id=None,
+        current_round=round_state,
+        seed=1,
+    )
+
+    result = apply_round_scoring(match, "p0")
+    assert result.player_by_id("p0").consecutive_round_wins == 1
+    assert result.player_by_id("p1").consecutive_round_wins == 0
+    assert result.last_winner_id == "p0"
+
+
+def test_apply_round_scoring_preserves_cards_per_player():
+    """Régression : sans ce champ, la manche 2 repasse à 8 cartes (banque=16)."""
+    end_p0 = PlayerState(player_id="p0", name="A", hand=())
+    end_p1 = PlayerState(player_id="p1", name="B", hand=(Card(Rank.SEVEN, Suit.CLUBS),))
+    round_state = _ended_round(players=(end_p0, end_p1), winner_id="p0")
+    match = MatchState(
+        status=MatchStatus.IN_PROGRESS,
+        players=(
+            PlayerState("p0", "A", hand=()),
+            PlayerState("p1", "B", hand=()),
+        ),
+        round_number=1,
+        dealer_index=0,
+        target_score=151,
+        last_winner_id=None,
+        winner_id=None,
+        current_round=round_state,
+        seed=1,
+        cards_per_player=16,
+    )
+    result = apply_round_scoring(match, "p0")
+    assert result.status == MatchStatus.IN_PROGRESS
+    assert result.cards_per_player == 16
+    assert result.round_number == 2