island-battles-python 0.1.0__tar.gz → 0.2.0__tar.gz

{island_battles_python-0.1.0 → island_battles_python-0.2.0}/PKG-INFO

@@ -1,7 +1,8 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: island-battles-python
-Version: 0.1.0
+Version: 0.2.0
 Summary: Async player client for Island Battles generation turns
+License-Expression: MIT
 Requires-Dist: centrifuge-python==0.6.0
 Requires-Dist: httpx>=0.27,<1
 Requires-Dist: pydantic>=2.12,<3

{island_battles_python-0.1.0 → island_battles_python-0.2.0}/island_battles_client/_generated.py

@@ -434,6 +434,10 @@ class GenerationState(GameModel):
     generation: Generation
     generation_id: Annotated[StrictInt, Field(ge=1)]
     lobby_id: UUID
+    lobby_round: Annotated[StrictInt, Field(ge=1)]
+    """
+    The lobby round that the game plays. A lobby plays one game per round, and the /game/from-lobby/{lobby_id} routes serve its newest game: compare this with the lobby snapshot's lobby.round to tell whether the game is the one the lobby started last.
+    """
     log_lines_stored: Annotated[StrictInt, Field(ge=0)]
     """
     How many game log lines you have stored for this generation, out of the 100 a player may store per generation. 0 when there are none. A client that restarts during a turn continues counting from it.
@@ -585,9 +589,9 @@ class MapTemplate(GameModel):
     """
     Height of the plane, which is centred on the origin.
     """
-    player_amount: Annotated[StrictInt, Field(ge=1)]
+    player_amount: Annotated[StrictInt, Field(ge=2, le=16)]
     """
-    Players the map is made for. Castle team colours run from 1 to player_amount.
+    Teams the map is made for, from 2 to 16, one player each. Castle team colours run from 1 to player_amount, and every one of them owns at least one castle.
     """
 
 
@@ -640,6 +644,7 @@ class Problem(GameModel):
         "invalid_game_settings",
         "invalid_seat_settings",
         "game_requirement",
+        "game_running",
         "watcher_kicked",
         "watchers_full",
         "unavailable",
@@ -856,6 +861,10 @@ class WatchState(GameModel):
     generation: Generation
     generation_id: Annotated[StrictInt, Field(ge=1)]
     lobby_id: UUID
+    lobby_round: Annotated[StrictInt, Field(ge=1)]
+    """
+    The lobby round that the game plays. A lobby plays one game per round, and the /game/from-lobby/{lobby_id} routes serve its newest game: compare this with the lobby snapshot's lobby.round to tell whether the game is the one the lobby started last.
+    """
     outcome: GameOutcome | None = None
     """
     How the game ended. Absent while the game runs.

{island_battles_python-0.1.0 → island_battles_python-0.2.0}/island_battles_client/cli.py

@@ -28,7 +28,7 @@ from typing import Any
 from pydantic import ValidationError
 
 from ._generated import BotTurn, GameOutcome, Generation
-from .bot import MEMORY_LIMIT_BYTES, Play, call_play, run_turn
+from .bot import MEMORY_LIMIT_BYTES, Play, run_turn
 from .client import IslandBattlesClient
 from .errors import BotMemoryTooLargeError, GameError, InvalidBotResultError
 from .fixture import fixture_turn, fixture_turn_data
@@ -48,7 +48,9 @@ DEFAULT_ORIGINS = (
     "http://tauri.localhost",
 )
 CHECK_SECONDS = 2.0
-# The lobby's shortest turn timeout is 10 s; answer before the game moves on.
+# The lobby's default turn timeout is 30 s and its shortest is 5 s. Answer before
+# the lobby's timeout: 8 s suits the default, and a shorter one needs a smaller
+# --turn-timeout.
 DEFAULT_TURN_TIMEOUT = 8.0
 # A BotTurn of a busy 6-team generation with 64 KiB of memory is a few hundred
 # KiB; 2 MiB leaves headroom.
@@ -416,9 +418,15 @@ def check(args: argparse.Namespace) -> int:
         play = load_play(args.bot)
     except Exception:  # noqa: BLE001
         return fail(f"could not load {args.bot}:\n{traceback.format_exc()}")
+    # The same log scope that serve gives a turn, so the lines counted are the
+    # ones the game log would store: logged lines and the result's logs.
+    client_logging = ClientLogging(object(), logging.INFO, False, None)
+    client_logging.attach()
     started = time.monotonic()
     try:
-        result = run_with_timeout(lambda: call_play(play, turn), CHECK_SECONDS)
+        result = run_with_timeout(
+            lambda: run_turn(play, turn, client_logging), CHECK_SECONDS
+        )
     except TimeoutError:
         # The bot's thread can't be stopped, and a daemon thread would still
         # be joined by a normal exit path in some cases; leave at once.
@@ -433,6 +441,8 @@ def check(args: argparse.Namespace) -> int:
         return fail(f"the bot returned an invalid result: {error.detail}")
     except Exception:  # noqa: BLE001
         return fail(f"the bot raised an exception:\n{traceback.format_exc()}")
+    finally:
+        client_logging.detach()
     elapsed = time.monotonic() - started
     memory_size = len(
         json.dumps(result.memory, separators=(",", ":"), ensure_ascii=False).encode(
@@ -502,7 +512,9 @@ def build_parser() -> argparse.ArgumentParser:
         default=DEFAULT_TURN_TIMEOUT,
         metavar="SECONDS",
         help="answer 504 when a turn takes longer than this (default "
-        f"{DEFAULT_TURN_TIMEOUT:g}, under the lobby's shortest turn timeout of 10)",
+        f"{DEFAULT_TURN_TIMEOUT:g}). A lobby's turn timeout is 30 s by default, "
+        "and its host can set it from 5 to 600 s or to none; this must be below "
+        "the lobby's, so for a lobby with a shorter timeout pass a smaller value",
     )
     serving.set_defaults(handler=serve)
 

{island_battles_python-0.1.0 → island_battles_python-0.2.0}/pyproject.toml

@@ -1,7 +1,8 @@
 [project]
 name = "island-battles-python"
-version = "0.1.0"
+version = "0.2.0"
 description = "Async player client for Island Battles generation turns"
+license = "MIT"
 requires-python = ">=3.14"
 dependencies = [
     "centrifuge-python==0.6.0",

{island_battles_python-0.1.0 → island_battles_python-0.2.0}/pyproject.toml.orig

@@ -1,7 +1,8 @@
 [project]
 name = "island-battles-python"
-version = "0.1.0"
+version = "0.2.0"
 description = "Async player client for Island Battles generation turns"
+license = "MIT"
 requires-python = ">=3.14"
 dependencies = [
     "centrifuge-python==0.6.0",