code-battles 1.6.4 → 1.7.1

package/dist/cjs/styles.css

@@ -2,4 +2,5 @@
 pre[class*="language-"].line-numbers{position:relative;padding-left:3.8em;counter-reset:linenumber;}pre[class*="language-"].line-numbers>code{position:relative;white-space:inherit;}.line-numbers .line-numbers-rows{position:absolute;pointer-events:none;top:0;font-size:100%;left:-3.8em;width:3em;letter-spacing:-1px;border-right:1px solid #999;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;}.line-numbers-rows>span{display:block;counter-increment:linenumber;}.line-numbers-rows>span:before{content:counter(linenumber);color:#999;display:block;padding-right:0.8em;text-align:right;}
 code[class*="language-"],pre[class*="language-"]{color:black;background:none;text-shadow:0 1px white;font-family:Consolas,Monaco,'Andale Mono','Ubuntu Mono',monospace;font-size:1em;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;word-wrap:normal;line-height:1.5;-moz-tab-size:4;-o-tab-size:4;tab-size:4;-webkit-hyphens:none;-moz-hyphens:none;-ms-hyphens:none;hyphens:none;}pre[class*="language-"]::-moz-selection,pre[class*="language-"] ::-moz-selection,code[class*="language-"]::-moz-selection,code[class*="language-"] ::-moz-selection{text-shadow:none;background:#b3d4fc;}pre[class*="language-"]::selection,pre[class*="language-"] ::selection,code[class*="language-"]::selection,code[class*="language-"] ::selection{text-shadow:none;background:#b3d4fc;}@media print{code[class*="language-"],pre[class*="language-"]{text-shadow:none;}}pre[class*="language-"]{padding:1em;margin:.5em 0;overflow:auto;}:not(pre)>code[class*="language-"],pre[class*="language-"]{background:#f5f2f0;}:not(pre)>code[class*="language-"]{padding:.1em;border-radius:.3em;white-space:normal;}.token.comment,.token.prolog,.token.doctype,.token.cdata{color:slategray;}.token.punctuation{color:#999;}.token.namespace{opacity:.7;}.token.property,.token.tag,.token.boolean,.token.number,.token.constant,.token.symbol,.token.deleted{color:#905;}.token.selector,.token.attr-name,.token.string,.token.char,.token.builtin,.token.inserted{color:#690;}.token.operator,.token.entity,.token.url,.language-css .token.string,.style .token.string{color:#9a6e3a;background:hsla(0,0%,100%,.5);}.token.atrule,.token.attr-value,.token.keyword{color:#07a;}.token.function,.token.class-name{color:#DD4A68;}.token.regex,.token.important,.token.variable{color:#e90;}.token.important,.token.bold{font-weight:bold;}.token.italic{font-style:italic;}.token.entity{cursor:help;}
 py-config,py-script,py-splashscreen,.py-error{display:none;}h1,h2,h3,h4,h5,h6,p{margin:0;}
-.token.operator{background:inherit !important;}pre[class*="language-"],code[class*="language-"]{color:#d4d4d4;font-size:13px;text-shadow:none;font-family:Menlo,Monaco,Consolas,"Andale Mono","Ubuntu Mono","Courier New",monospace;direction:ltr;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;line-height:1.5;-moz-tab-size:4;-o-tab-size:4;tab-size:4;-webkit-hyphens:none;-moz-hyphens:none;-ms-hyphens:none;hyphens:none;}pre[class*="language-"]::selection,code[class*="language-"]::selection,pre[class*="language-"] *::selection,code[class*="language-"] *::selection{text-shadow:none;background:#264f78;}@media print{pre[class*="language-"],code[class*="language-"]{text-shadow:none;}}pre[class*="language-"]{padding:1em;margin:0.5em 0;overflow:auto;background:#1e1e1e;}:not(pre)>code[class*="language-"]{padding:0.1em 0.3em;border-radius:0.3em;color:#db4c69;background:#1e1e1e;}.namespace{opacity:0.7;}.token.doctype .token.doctype-tag{color:#569cd6;}.token.doctype .token.name{color:#9cdcfe;}.token.comment,.token.prolog{color:#6a9955;}.token.punctuation,.language-html .language-css .token.punctuation,.language-html .language-javascript .token.punctuation{color:#d4d4d4;}.token.property,.token.tag,.token.boolean,.token.number,.token.constant,.token.symbol,.token.inserted,.token.unit{color:#b5cea8;}.token.selector,.token.attr-name,.token.string,.token.char,.token.builtin,.token.deleted{color:#ce9178;}.language-css .token.string.url{text-decoration:underline;}.token.operator,.token.entity{color:#d4d4d4;}.token.operator.arrow{color:#569cd6;}.token.atrule{color:#ce9178;}.token.atrule .token.rule{color:#c586c0;}.token.atrule .token.url{color:#9cdcfe;}.token.atrule .token.url .token.function{color:#dcdcaa;}.token.atrule .token.url .token.punctuation{color:#d4d4d4;}.token.keyword{color:#569cd6;}.token.keyword.module,.token.keyword.control-flow{color:#c586c0;}.token.function,.token.function .token.maybe-class-name{color:#dcdcaa;}.token.regex{color:#d16969;}.token.important{color:#569cd6;}.token.italic{font-style:italic;}.token.constant{color:#9cdcfe;}.token.class-name,.token.maybe-class-name{color:#4ec9b0;}.token.console{color:#9cdcfe;}.token.parameter{color:#9cdcfe;}.token.interpolation{color:#9cdcfe;}.token.punctuation.interpolation-punctuation{color:#569cd6;}.token.boolean{color:#569cd6;}.token.property,.token.variable,.token.imports .token.maybe-class-name,.token.exports .token.maybe-class-name{color:#9cdcfe;}.token.selector{color:#d7ba7d;}.token.escape{color:#d7ba7d;}.token.tag{color:#569cd6;}.token.tag .token.punctuation{color:#808080;}.token.cdata{color:#808080;}.token.attr-name{color:#9cdcfe;}.token.attr-value,.token.attr-value .token.punctuation{color:#ce9178;}.token.attr-value .token.punctuation.attr-equals{color:#d4d4d4;}.token.entity{color:#569cd6;}.token.namespace{color:#4ec9b0;}pre[class*="language-javascript"],code[class*="language-javascript"],pre[class*="language-jsx"],code[class*="language-jsx"],pre[class*="language-typescript"],code[class*="language-typescript"],pre[class*="language-tsx"],code[class*="language-tsx"]{color:#9cdcfe;}pre[class*="language-css"],code[class*="language-css"]{color:#ce9178;}pre[class*="language-html"],code[class*="language-html"]{color:#d4d4d4;}.language-regex .token.anchor{color:#dcdcaa;}.language-html .token.punctuation{color:#808080;}pre[class*="language-"]>code[class*="language-"]{position:relative;z-index:1;}.line-highlight.line-highlight{background:#f7ebc6;box-shadow:inset 5px 0 0 #f7d87c;z-index:0;}
+.token.operator{background:inherit !important;}pre[class*="language-"],code[class*="language-"]{color:#d4d4d4;font-size:13px;text-shadow:none;font-family:Menlo,Monaco,Consolas,"Andale Mono","Ubuntu Mono","Courier New",monospace;direction:ltr;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;line-height:1.5;-moz-tab-size:4;-o-tab-size:4;tab-size:4;-webkit-hyphens:none;-moz-hyphens:none;-ms-hyphens:none;hyphens:none;}pre[class*="language-"]::selection,code[class*="language-"]::selection,pre[class*="language-"] *::selection,code[class*="language-"] *::selection{text-shadow:none;background:#264f78;}@media print{pre[class*="language-"],code[class*="language-"]{text-shadow:none;}}pre[class*="language-"]{padding:1em;margin:0.5em 0;overflow:auto;background:#1e1e1e;}:not(pre)>code[class*="language-"]{padding:0.1em 0.3em;border-radius:0.3em;color:#db4c69;background:#1e1e1e;}.namespace{opacity:0.7;}.token.doctype .token.doctype-tag{color:#569cd6;}.token.doctype .token.name{color:#9cdcfe;}.token.comment,.token.prolog{color:#6a9955;}.token.punctuation,.language-html .language-css .token.punctuation,.language-html .language-javascript .token.punctuation{color:#d4d4d4;}.token.property,.token.tag,.token.boolean,.token.number,.token.constant,.token.symbol,.token.inserted,.token.unit{color:#b5cea8;}.token.selector,.token.attr-name,.token.string,.token.char,.token.builtin,.token.deleted{color:#ce9178;}.language-css .token.string.url{text-decoration:underline;}.token.operator,.token.entity{color:#d4d4d4;}.token.operator.arrow{color:#569cd6;}.token.atrule{color:#ce9178;}.token.atrule .token.rule{color:#c586c0;}.token.atrule .token.url{color:#9cdcfe;}.token.atrule .token.url .token.function{color:#dcdcaa;}.token.atrule .token.url .token.punctuation{color:#d4d4d4;}.token.keyword{color:#569cd6;}.token.keyword.module,.token.keyword.control-flow{color:#c586c0;}.token.function,.token.function .token.maybe-class-name{color:#dcdcaa;}.token.regex{color:#d16969;}.token.important{color:#569cd6;}.token.italic{font-style:italic;}.token.constant{color:#9cdcfe;}.token.class-name,.token.maybe-class-name{color:#4ec9b0;}.token.console{color:#9cdcfe;}.token.parameter{color:#9cdcfe;}.token.interpolation{color:#9cdcfe;}.token.punctuation.interpolation-punctuation{color:#569cd6;}.token.boolean{color:#569cd6;}.token.property,.token.variable,.token.imports .token.maybe-class-name,.token.exports .token.maybe-class-name{color:#9cdcfe;}.token.selector{color:#d7ba7d;}.token.escape{color:#d7ba7d;}.token.tag{color:#569cd6;}.token.tag .token.punctuation{color:#808080;}.token.cdata{color:#808080;}.token.attr-name{color:#9cdcfe;}.token.attr-value,.token.attr-value .token.punctuation{color:#ce9178;}.token.attr-value .token.punctuation.attr-equals{color:#d4d4d4;}.token.entity{color:#569cd6;}.token.namespace{color:#4ec9b0;}pre[class*="language-javascript"],code[class*="language-javascript"],pre[class*="language-jsx"],code[class*="language-jsx"],pre[class*="language-typescript"],code[class*="language-typescript"],pre[class*="language-tsx"],code[class*="language-tsx"]{color:#9cdcfe;}pre[class*="language-css"],code[class*="language-css"]{color:#ce9178;}pre[class*="language-html"],code[class*="language-html"]{color:#d4d4d4;}.language-regex .token.anchor{color:#dcdcaa;}.language-html .token.punctuation{color:#808080;}pre[class*="language-"]>code[class*="language-"]{position:relative;z-index:1;}.line-highlight.line-highlight{background:#f7ebc6;box-shadow:inset 5px 0 0 #f7d87c;z-index:0;}
+.control{width:100%;padding:10px;cursor:pointer;}.control:hover{background-color:light-dark(var(--mantine-color-gray-0),var(--mantine-color-dark-6));}

package/dist/cjs/types/components/DataTable.d.ts

@@ -0,0 +1,21 @@
+import React from "react";
+import "./DataTable.css";
+export interface DataTableData {
+    head: string[];
+    body: string[][];
+}
+declare const DataTable: ({ tableName, data, renderValue, renderHead, disableSort, hideIfEmpty, selectable, selectedRows, setSelectedRows, defaultSort, defaultReversed, stickyFirstColumn, }: {
+    tableName: string;
+    data: DataTableData;
+    renderValue?: (rowIndex: number, columnName: string, value: string) => React.ReactNode;
+    renderHead?: (columnName: string, columnIndex: number) => React.ReactNode;
+    disableSort?: boolean;
+    hideIfEmpty?: boolean;
+    selectable?: boolean;
+    selectedRows?: number[];
+    setSelectedRows?: React.Dispatch<React.SetStateAction<number[]>>;
+    defaultSort?: number;
+    defaultReversed?: boolean;
+    stickyFirstColumn?: boolean;
+}) => React.JSX.Element;
+export default DataTable;

package/dist/cjs/types/components/ResultStaticsTable.d.ts

@@ -0,0 +1,3 @@
+import React from "react";
+declare const ResultStatisticsTable: () => React.JSX.Element;
+export default ResultStatisticsTable;

package/dist/cjs/types/configuration.d.ts

@@ -3,13 +3,12 @@ import type { Auth } from "firebase/auth";
 import type { Firestore } from "firebase/firestore";
 interface CodeBattlesRequiredConfiguration {
     firebase: any;
-    maps: string[];
+    parameters: Record<string, string[]>;
 }
 interface CodeBattlesDatesConfiguration {
     locale?: string;
     firstDayOfWeek?: DayOfWeek;
     weekendDays?: DayOfWeek[];
-    timezone?: string;
 }
 interface CodeBattlesOptionalConfiguration {
     primaryColor: string;
@@ -19,6 +18,7 @@ interface CodeBattlesOptionalConfiguration {
     authentication: Auth;
     runningCountOptions?: number[];
     dates?: CodeBattlesDatesConfiguration;
+    parameterIcons?: Record<string, string>;
 }
 export interface CodeBattlesConfiguration extends CodeBattlesRequiredConfiguration, Partial<CodeBattlesOptionalConfiguration> {
 }

package/dist/cjs/types/utilities.d.ts

@@ -1,6 +1,6 @@
 export interface RoundInfo {
     players: string[];
-    map: string;
+    parameters: Record<string, string>;
 }
 export declare const getLocalStorage: (key: string, defaultValue?: {}) => any;
 export declare const setLocalStorage: (key: string, value?: {}) => void;
@@ -10,6 +10,6 @@ export declare const getRank: (tournamentInfo: any, team: string, pointModifier:
 export declare const updatePointModifier: () => void;
 export declare const toPlacing: (n: number) => string;
 export declare const zeroPad: (s: string, l: number) => string;
-export declare const runNoUI: (map: string, apis: Record<string, any>, playerBots: string[], seed: string, verbose: boolean) => void;
+export declare const runNoUI: (parameters: Record<string, string>, apis: Record<string, any>, playerBots: string[], seed: string, verbose: boolean) => void;
 export declare const tryUntilSuccess: (f: () => void, timeout?: number) => void;
 export declare const downloadFile: (filename: string, mimeType: string, contents: string) => void;

package/dist/code_battles/__init__.py

@@ -1,7 +1,7 @@
 import sys
 
-from code_battles.utilities import GameCanvas, Alignment, is_web, is_worker
 from code_battles.battles import CodeBattles
+from code_battles.utilities import Alignment, GameCanvas, is_web, is_worker
 
 
 def run_game(battles: CodeBattles):

package/dist/code_battles/battles.py

@@ -1,29 +1,29 @@
 import asyncio
 import base64
-from dataclasses import dataclass
 import datetime
+import gzip
 import json
 import math
-import time
-from random import Random
 import sys
+import time
 import traceback
-import gzip
+import typing
+from dataclasses import dataclass
+from random import Random
+from typing import Any, Dict, Generic, List, Optional, Set, Tuple, TypeVar, Union
 from urllib.parse import quote
 
-from typing import Any, Dict, Generic, List, Optional, Set, Tuple, TypeVar
-import typing
 from code_battles.utilities import (
     GameCanvas,
     console_log,
     download_image,
+    is_web,
     is_worker,
     navigate,
     set_results,
     show_alert,
     show_download,
     web_only,
-    is_web,
 )
 
 try:
@@ -39,7 +39,7 @@ PlayerRequestsType = TypeVar("PlayerRequestsType")
 
 @dataclass
 class Simulation:
-    map: str
+    parameters: Dict[str, str]
     player_names: str
     game: str
     version: str
@@ -53,7 +53,7 @@ class Simulation:
             gzip.compress(
                 json.dumps(
                     {
-                        "map": self.map,
+                        "parameters": self.parameters,
                         "playerNames": self.player_names,
                         "game": self.game,
                         "version": self.version,
@@ -73,7 +73,9 @@ class Simulation:
     def load(file: str):
         contents: Dict[str, Any] = json.loads(gzip.decompress(base64.b64decode(file)))
         return Simulation(
-            contents["map"],
+            contents["parameters"]
+            if "parameters" in contents
+            else {"map": contents["map"]},
             contents["playerNames"],
             contents["game"],
             contents["version"],
@@ -105,6 +107,8 @@ class CodeBattles(
 
     player_names: List[str]
     """The name of the players. This is populated before any of the overridable methods run."""
+    parameters: Dict[str, str]
+    """The parameters of the simulation. This is populated before any of the overridable methods run."""
     map: str
     """The name of the map. This is populated before any of the overridable methods run."""
     map_image: "js.Image"
@@ -231,6 +235,15 @@ class CodeBattles(
 
         pass
 
+    def get_statistics(self) -> Dict[str, Union[int, float]]:
+        """
+        Optional method to return statistics, called after the game ends.
+
+        When running multiple no UI simulations, you can use this to view the simulations in a table.
+        """
+
+        return {}
+
     def configure_extra_width(self) -> int:
         """Optionally add extra height to the right of the boards. 0 by default."""
 
@@ -358,12 +371,13 @@ class CodeBattles(
         await ff.load()
         document.fonts.add(ff)
 
-    def run_bot_method(self, player_index: int, method_name: str):
+    def run_bot_method(self, player_index: int, method_name: str) -> float:
         """
-        Runs the specifid method of the given player.
+        Runs the specified method of the given player and returns the time it took (in seconds).
 
         Upon exception, shows an alert (does not terminate the bot).
         """
+        start = time.time()
 
         assert player_index in self.active_players
 
@@ -392,6 +406,9 @@ class CodeBattles(
                 "fa-solid fa-exclamation",
             )
 
+        end = time.time()
+        return end - start
+
     def eliminate_player(self, player_index: int, reason=""):
         """Eliminate the specified player for the specified reason from the simulation."""
 
@@ -468,7 +485,7 @@ class CodeBattles(
 
         If ``force`` is set, will play the sound even if the simulation is not :attr:`verbose`.
         """
-        from js import window, Audio
+        from js import Audio, window
 
         if not force and not self.verbose:
             return
@@ -521,7 +538,7 @@ class CodeBattles(
 
     @web_only
     def _initialize(self):
-        from js import window, document
+        from js import document, window
         from pyscript.ffi import create_proxy
 
         window.addEventListener("resize", create_proxy(lambda _: self._resize_canvas()))
@@ -565,7 +582,7 @@ class CodeBattles(
 
     def _run_webworker_simulation(
         self,
-        map: str,
+        parameters: Dict[str, str],
         player_names_str: str,
         player_codes_str: str,
         seed: Optional[int] = None,
@@ -573,10 +590,12 @@ class CodeBattles(
         from pyscript import sync
 
         # JS to Python
+        parameters = json.loads(parameters)
         player_names = json.loads(player_names_str)
         player_codes = json.loads(player_codes_str)
 
-        self.map = map
+        self.parameters = parameters
+        self.map = parameters.get("map")
         self.player_names = player_names
         self.background = True
         self.console_visible = False
@@ -589,7 +608,10 @@ class CodeBattles(
             decisions = self._make_decisions()
             logs = self._logs
             alerts = self._alerts
+            log = self.log
+            self.log = lambda *args, **kwargs: None
             self.apply_decisions(decisions)
+            self.log = log
 
             sync.update_step(
                 base64.b64encode(decisions).decode(),
@@ -620,7 +642,8 @@ class CodeBattles(
                 contents = f.read()
             simulation = Simulation.load(contents)
             seed = simulation.seed
-            self.map = simulation.map
+            self.parameters = simulation.parameters
+            self.map = simulation.parameters.get("map")
             self.player_names = simulation.player_names
             decisions = simulation.decisions
             player_codes = ["" for _ in simulation.player_names]
@@ -684,12 +707,15 @@ class CodeBattles(
 
         try:
             simulation = Simulation.load(str(contents))
+            parameters = "&".join(
+                [f"{p}={quote(v)}" for p, v in simulation.parameters.items()]
+            )
             navigate(
-                f"/simulation/{simulation.map}/{','.join([quote(player_name) for player_name in simulation.player_names])}?seed={simulation.seed}"
+                f"/simulation/{','.join([quote(player_name) for player_name in simulation.player_names])}?seed={simulation.seed}&{parameters}"
             )
             self.alert(
                 "Loaded simulation file!",
-                f"{', '.join(simulation.player_names)} competed in {simulation.map} at {simulation.timestamp}",
+                f"{', '.join(simulation.player_names)} competed with {simulation.parameters} at {simulation.timestamp}",
                 "blue",
                 "fa-solid fa-file-code",
                 0,
@@ -713,9 +739,10 @@ class CodeBattles(
             while document.getElementById("loader") is None:
                 await asyncio.sleep(0.01)
             self._initialize()
-            self.map = simulation.map
+            self.parameters = simulation.parameters
+            self.map = self.parameters.get("map")
             self.map_image = await download_image(
-                self.configure_map_image_url(simulation.map)
+                self.configure_map_image_url(self.map)
             )
             self.player_names = simulation.player_names
             self.background = False
@@ -744,7 +771,7 @@ class CodeBattles(
     @web_only
     async def _start_simulation_async(
         self,
-        map: str,
+        parameters: Dict[str, str],
         player_codes: List[str],
         player_names: List[str],
         background: bool,
@@ -758,15 +785,19 @@ class CodeBattles(
         # JS to Python
         player_names = [str(x) for x in player_names]
         player_codes = [str(x) for x in player_codes]
+        parameters = parameters.to_py()
 
         try:
             render_status = document.getElementById("render-status")
             if render_status is not None:
                 render_status.textContent = "Rendering: Initializing..."
 
-            self.map = map
+            self.parameters = parameters
+            self.map = parameters.get("map")
             self.player_names = player_names
-            self.map_image = await download_image(self.configure_map_image_url(map))
+            self.map_image = await download_image(
+                self.configure_map_image_url(self.map)
+            )
             self.background = background
             self.console_visible = console_visible
             self.verbose = verbose
@@ -794,7 +825,10 @@ class CodeBattles(
             self._worker = await workers["worker"]
             self._worker.update_step = self._update_step
             self._worker._run_webworker_simulation(
-                map, json.dumps(player_names), json.dumps(player_codes), self._seed
+                json.dumps(parameters),
+                json.dumps(player_names),
+                json.dumps(player_codes),
+                self._seed,
             )
 
             if self.background:
@@ -824,7 +858,7 @@ class CodeBattles(
 
     def _get_simulation(self):
         return Simulation(
-            self.map,
+            self.parameters,
             self.player_names,
             self.__class__.__name__,
             self.configure_version(),
@@ -842,7 +876,7 @@ class CodeBattles(
         is_over_str: str,
         should_pause_str: str,
     ):
-        from js import window, document
+        from js import document, window
 
         now = time.time()
         decisions = base64.b64decode(str(decisions_str))
@@ -1020,7 +1054,12 @@ class CodeBattles(
             if len(self.active_players) == 1:
                 self._eliminated.append(self.active_players[0])
             set_results(
-                self.player_names, self._eliminated[::-1], self.map, self.verbose
+                self.player_names,
+                self._seed,
+                self._eliminated[::-1],
+                self.get_statistics(),
+                self.parameters,
+                self.verbose,
             )
             if not self.background:
                 self.render()
@@ -1111,3 +1150,5 @@ class CodeBattles(
                         0,
                     )
                 )
+            else:
+                await asyncio.sleep(0.0005)

package/dist/code_battles/utilities.py

@@ -3,9 +3,9 @@
 import asyncio
 import math
 import sys
-from typing import Callable, List, Union
 from enum import Enum
 from functools import wraps
+from typing import Callable, Dict, List, Union
 
 try:
     import js
@@ -73,12 +73,21 @@ def show_alert(
 
 
 @web_only
-def set_results(player_names: List[str], places: List[int], map: str, verbose: bool):
+def set_results(
+    player_names: List[str],
+    seed: int,
+    places: List[int],
+    statistics: Dict[str, Union[float, int]],
+    parameters: Dict[str, str],
+    verbose: bool,
+):
     from js import window
 
     if hasattr(window, "setResults"):
         try:
-            window.setResults(player_names, places, map, verbose)
+            window.setResults(
+                player_names, str(seed), places, statistics, parameters, verbose
+            )
         except Exception as e:
             print(e)