belote-cli 2.5.2__tar.gz → 2.5.5__tar.gz

{belote_cli-2.5.2 → belote_cli-2.5.5}/CHANGELOG.md

@@ -5,6 +5,27 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.5.5] - 2026-05-03
+
+### Fixed
+- **BelAtro Run Loop**: Fixed multiple critical crashes, including a `TypeError` in `drive_round` due to signature mismatch and an `IndexError` when tricks were accessed prematurely.
+- **Event Bus Integrity**: Fixed `TrickWonEvent` instantiation error by providing missing `trick_number` and `trump` context.
+- **Run State Consistency**: Added missing `consumable_slots` to `BelAtroRun` to prevent crashes when applying certain Vouchers (e.g., Le Couteau).
+- **Cache Clear Bug**: Fixed an `AttributeError` when clearing the legal cards cache by ensuring the implementation function is properly decorated with `@lru_cache`.
+- **Input & HUD**: Fixed the `[I]` key mapping for the score overlay HUD and synchronized the Windows `KeyReader` to support all game-specific keys.
+
+## [2.5.4] - 2026-05-03
+
+### Fixed
+- **Missing read_timeout**: Fixed an `AttributeError` in the main menu by implementing the `read_timeout` method in the `KeyReader` class.
+- **IndentationError in trick_timing.py**: Fixed a critical syntax error in the BelAtro items module.
+- **LePremierSang Logic**: Fixed `LePremierSang` joker to correctly apply +2 Mult (additive) and track its active state.
+
+## [2.5.3] - 2026-05-03
+
+### Fixed
+- **IndentationError in game.py**: Fixed a critical syntax error that prevented the game from starting.
+
 ## [2.5.2] - 2026-05-02
 
 ### Fixed

{belote_cli-2.5.2 → belote_cli-2.5.5}/DEVELOPMENT.md

@@ -37,6 +37,7 @@ Or via python:
 ```bash
 python -m belote.main
 python -m belote.belatro.main
+PYTHONPATH=src python3 -m belote.main
 ```
 
 ## Testing

{belote_cli-2.5.2 → belote_cli-2.5.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: belote-cli
-Version: 2.5.2
+Version: 2.5.5
 Summary: A 4-player terminal card game
 Project-URL: Homepage, https://github.com/ElysiumDisc/belote
 Project-URL: Repository, https://github.com/ElysiumDisc/belote

{belote_cli-2.5.2 → belote_cli-2.5.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "belote-cli"
-version = "2.5.2"
+version = "2.5.5"
 description = "A 4-player terminal card game"
 readme = "README.md"
 requires-python = ">=3.10"

{belote_cli-2.5.2 → belote_cli-2.5.5}/src/belote/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "2.4.1"
+__version__ = "2.5.5"
 
 __all__ = ["__version__"]

{belote_cli-2.5.2 → belote_cli-2.5.5}/src/belote/belatro/core/run_state.py

@@ -12,6 +12,7 @@ from ..partner.partner_state import PartnerState
 from .economy import Economy
 
 MAX_JOKER_SLOTS = 5
+DEFAULT_CONSUMABLE_SLOTS = 2
 
 
 @dataclass
@@ -29,6 +30,7 @@ class BelAtroRun:
     jokers: list[Joker] = field(default_factory=list)
     vouchers: list[Voucher] = field(default_factory=list)
     joker_slots: int = MAX_JOKER_SLOTS
+    consumable_slots: int = DEFAULT_CONSUMABLE_SLOTS
 
     # ── Economy ────────────────────────────────────────────
     economy: Economy = field(default_factory=Economy)

{belote_cli-2.5.2 → belote_cli-2.5.5}/src/belote/belatro/engine/round_driver.py

@@ -40,9 +40,18 @@ if TYPE_CHECKING:
 class RoundUICallbacks(ABC):
     """Interface for UI interaction during a round."""
 
+    @abstractmethod
+    def prompt_bid(self, state: GameState) -> Suit | None: ...
+
+    @abstractmethod
+    def prompt_card(self, state: GameState) -> tuple[Card, GameState]: ...
+
     @abstractmethod
     def on_card_played(self, state: GameState, seat: Seat, card: Card) -> None: ...
 
+    @abstractmethod
+    def on_trick_end(self, state: GameState, winner: Seat, points: int) -> None: ...
+
     @abstractmethod
     def on_round_end(self, breakdown: object) -> None: ...
 
@@ -103,12 +112,7 @@ def drive_round(
         bid: Suit | None = None
 
         if bidder == Seat.SOUTH:
-            # We don't have a direct prompt here, we assume the caller
-            # (main.py) handled South's choice or we default to Pass
-            # Actually in drive_round we might need a callback for human input
-            # but BelAtro drive_round is usually automated for testing or
-            # the UI loop handles it. For now, we'll assume South passes if not handled.
-            pass
+            bid = ui_callbacks.prompt_bid(state)
         elif (
             bidder == Seat.NORTH
             and partner is not None
@@ -159,9 +163,7 @@ def drive_round(
         card: Card | None = None
 
         if player == Seat.SOUTH:
-            # Caller must provide card via some mechanism?
-            # In a truly automated drive_round, we might need a callback.
-            break  # Wait for human in main loop
+            card, state = ui_callbacks.prompt_card(state)
         else:
             # AI Play
             card = ai_players[player].decide_card(state)
@@ -172,7 +174,7 @@ def drive_round(
         state = play_card(state, card)
         ui_callbacks.on_card_played(state, player, card)
 
-        if is_last_in_trick:
+        if is_last_in_trick(state):
             last_trick = state.completed_tricks[-1]
 
             winner = trick_winner_seat(
@@ -203,11 +205,14 @@ def drive_round(
                 TrickWonEvent(
                     winner=winner,
                     cards=cards,
-                    card_points=points,
+                    trick_number=len(state.completed_tricks),
                     is_last=is_last,
+                    card_points=points,
+                    trump=state.trump,
                 ),
                 state
             )
+            ui_callbacks.on_trick_end(state, winner, points)
 
     # Round End / Scoring
     if state.phase == Phase.SCORING:
@@ -228,7 +233,6 @@ def drive_round(
     return state
 
 
-@property
 def is_last_in_trick(state: GameState) -> bool:
     """Helper to check if a trick just ended."""
     return len(state.current_trick) == 0 and len(state.completed_tricks) > 0

{belote_cli-2.5.2 → belote_cli-2.5.5}/src/belote/belatro/items/jokers/trick_timing.py

@@ -20,7 +20,8 @@ class LePremierSang(Joker):
 
     def on_trick_won(self, event: TrickWonEvent, state: dict[str, Any]) -> JokerResult | None:
         if event.trick_number == 1 and event.winner == Seat.SOUTH:
-            return JokerResult(times_mult=2.0)
+            state[f"{self.id}_active"] = True
+            return JokerResult(add_mult=2.0)
         return None
 
 
@@ -71,9 +72,4 @@ class LExecuteur(Joker):
         if event.is_last and event.winner == Seat.SOUTH:
             return JokerResult(add_chips=40, times_mult=1.5)
         return None
-s_unlockable = True
 
-    def on_trick_won(self, event: TrickWonEvent, state: dict[str, Any]) -> JokerResult | None:
-        if event.is_last and event.winner == Seat.SOUTH:
-            return JokerResult(add_chips=40, times_mult=1.5)
-        return None

{belote_cli-2.5.2 → belote_cli-2.5.5}/src/belote/belatro/main.py

@@ -196,7 +196,7 @@ class BelAtroGame:
             bus=bus,
             partner=self.run.partner,
             boss=boss,
-            deck_id=self.run.deck_id,
+            target_score=self.run.target_score,
             ui_callbacks=UICallbacks(self.reader),
             acc=acc,
         )

{belote_cli-2.5.2 → belote_cli-2.5.5}/src/belote/game.py

@@ -449,6 +449,7 @@ def clear_legal_cards_cache() -> None:
     _trick_winner_seat_impl.cache_clear()
 
 
+@lru_cache(maxsize=2048)
 def _calculate_legal_cards_impl(
     hand_ids: tuple[int, ...],
     trump: Suit | None,
@@ -873,7 +874,4 @@ def sort_south_hand(state: GameState) -> GameState:
         )
 
     return replace(state, hands=tuple(new_hands), initial_hands=tuple(new_initial))
-[Seat.SOUTH.value], state.trump
-        )
 
-    return replace(state, hands=tuple(new_hands), initial_hands=tuple(new_initial))

{belote_cli-2.5.2 → belote_cli-2.5.5}/src/belote/input.py

@@ -76,7 +76,7 @@ class _UnixKeyReader:
             r, _, _ = select.select([sys.stdin], [], [], 0.01)
             if not r:
                 return KeyEvent(Key.ESC)
-            
+
             next_byte = os.read(self._stdin_fd, 1)
             if next_byte == b"[":
                 # Likely an arrow key
@@ -107,7 +107,7 @@ class _UnixKeyReader:
             elif (byte & 0xF0) == 0xE0: n = 2
             elif (byte & 0xF8) == 0xF0: n = 3
             else: return KeyEvent(Key.ESC)
-            
+
             full_buf = bytes([byte])
             while len(full_buf) < n + 1:
                 chunk = os.read(self._stdin_fd, n + 1 - len(full_buf))
@@ -133,13 +133,19 @@ class _UnixKeyReader:
                 return KeyEvent(Key.MUTE)
             if ch.lower() == "t":
                 return KeyEvent(Key.HIST)
-            if ch.lower() == "v":
+            if ch.lower() == "i" or ch.lower() == "v":
                 return KeyEvent(Key.OVERLAY)
 
             return KeyEvent(Key.CHAR, ch)
         except Exception:
             return KeyEvent(Key.ESC)
 
+    def read_timeout(self, timeout: float) -> KeyEvent | None:
+        """Read a key with a timeout. Returns None if no key is pressed."""
+        r, _, _ = select.select([sys.stdin], [], [], timeout)
+        if r:
+            return self.read()
+        return None
 
 def interruptible_sleep(seconds: float, reader: KeyReader | None = None) -> KeyEvent | None:
     """Sleep for some time, but return immediately if a key is pressed."""
@@ -160,7 +166,8 @@ class KeyReader:
 
     def __enter__(self) -> KeyReader: ...
     def __exit__(self, *args: Any) -> None: ...
-    def read_key(self) -> KeyEvent: ...
+    def read(self) -> KeyEvent: ...
+    def read_timeout(self, timeout: float) -> KeyEvent | None: ...
 
 
 if os.name == "nt":
@@ -172,7 +179,7 @@ if os.name == "nt":
         def __exit__(self, *args: Any) -> None:
             pass
 
-        def read_key(self) -> KeyEvent:
+        def read(self) -> KeyEvent:
             import msvcrt  # type: ignore[import-not-found]
 
             ch = msvcrt.getch()
@@ -195,6 +202,16 @@ if os.name == "nt":
                 return KeyEvent(Key.SPACE)
             if ch.lower() == b"q":
                 return KeyEvent(Key.QUIT)
+            if ch.lower() == b"h":
+                return KeyEvent(Key.HELP)
+            if ch.lower() == b"s":
+                return KeyEvent(Key.SORT)
+            if ch.lower() == b"m":
+                return KeyEvent(Key.MUTE)
+            if ch.lower() == b"t":
+                return KeyEvent(Key.HIST)
+            if ch.lower() in (b"i", b"v"):
+                return KeyEvent(Key.OVERLAY)
 
             try:
                 char = ch.decode("utf-8")
@@ -202,6 +219,16 @@ if os.name == "nt":
             except Exception:
                 return KeyEvent(Key.ESC)
 
+        def read_timeout(self, timeout: float) -> KeyEvent | None:
+            import msvcrt  # type: ignore[import-not-found]
+
+            start = time.time()
+            while time.time() - start < timeout:
+                if msvcrt.kbhit():
+                    return self.read()
+                time.sleep(0.01)
+            return None
+
     KeyReader = _WindowsKeyReader  # type: ignore[misc, assignment]
 else:
     KeyReader = _UnixKeyReader