pokerbots-dev 0.1.2__tar.gz → 0.1.4__tar.gz

{pokerbots_dev-0.1.2 → pokerbots_dev-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pokerbots-dev
-Version: 0.1.2
+Version: 0.1.4
 Summary: pb: command-line client for pokerbots.dev
 Project-URL: Homepage, https://pokerbots.dev
 Project-URL: Source, https://github.com/pokerbots-dev/pokerbots

{pokerbots_dev-0.1.2 → pokerbots_dev-0.1.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pokerbots-dev"
-version = "0.1.2"
+version = "0.1.4"
 description = "pb: command-line client for pokerbots.dev"
 readme = "README.md"
 requires-python = ">=3.10"

{pokerbots_dev-0.1.2 → pokerbots_dev-0.1.4}/src/pokerbots_cli/agent.py

@@ -1,7 +1,8 @@
 import traceback
-from time import perf_counter
+from time import perf_counter, thread_time
 
-LIMIT = 0.020
+LIMIT = 0.020  # CPU seconds per decision
+WALL = 0.100  # backstop so a bot cannot stall the table
 
 
 def fallback(state):
@@ -19,7 +20,10 @@ def normalize(action, state):
 
 
 class Agent:
-    """Runs an untrusted bot: enforces the time limit and returns only legal actions."""
+    """Runs an untrusted bot: enforces the CPU and wall limits and returns only legal actions.
+
+    CPU time comes from bot.cpu() when the bot runs elsewhere (a sandboxed process), else this thread.
+    """
 
     def __init__(self, bot, limit=LIMIT):
         self.bot = bot
@@ -30,14 +34,15 @@ class Agent:
 
     def __call__(self, state):
         self.decisions += 1
-        start = perf_counter()
+        clock = getattr(self.bot, "cpu", thread_time)
+        wall, cpu = perf_counter(), clock()
         try:
             action = self.bot.act(state)
         except Exception:
             return self.fail(state, traceback.format_exc())
-        elapsed = perf_counter() - start
-        self.slowest = max(self.slowest, elapsed)
-        if elapsed > self.limit:
+        wall, cpu = perf_counter() - wall, clock() - cpu
+        self.slowest = max(self.slowest, cpu)
+        if cpu > self.limit or wall > WALL:
             self.late += 1
             return fallback(state)
         return normalize(action, state) or self.fail(state, f"invalid action {action!r}, legal {state['legal']}")

{pokerbots_dev-0.1.2 → pokerbots_dev-0.1.4}/src/pokerbots_cli/api.py

@@ -35,7 +35,7 @@ def call(method, path, body=None, data=None, headers=None):
             message = f"{e.code} {e.reason}"
         raise ApiError(message) from None
     except urllib.error.URLError as e:
-        raise ApiError(str(e.reason)) from None
+        raise ApiError(f"cannot reach {base()}: {e.reason}") from None
 
 
 def admin(method, path, body=None):

{pokerbots_dev-0.1.2 → pokerbots_dev-0.1.4}/src/pokerbots_cli/commands/account.py

@@ -6,7 +6,7 @@ from pathlib import Path
 
 from .. import auth
 from ..api import call
-from ..fmt import money, place, table
+from ..fmt import INK, PAPER, colored, money, place, signed, table, when
 
 MAX_UPLOAD = 1 << 20
 WATCH_SECONDS = 5
@@ -53,7 +53,7 @@ def deploy(args):
 def stop(args):
     mode = "live" if args.live else "paper"
     call("DELETE", f"/deployments/{mode}")
-    print(f"stopped {mode}")
+    print(f"stopped {mode}; games already queued will still play")
 
 
 def report():
@@ -63,12 +63,16 @@ def report():
         d = me["deployments"].get(mode)
         rows.append([mode, f"v{d['version']}  rating {d['rating']:.0f}  games {d['games']}  today {d['today']}" if d else "-"])
     rows += [["balance", money(me["balance"])], ["wallet", me["wallet"] or "-"]]
-    text = table(rows)
+    text = table(rows, labels=True)
     games = call("GET", "/games")
     if games:
-        text += "\n\n" + table([["game", "mode", "place", "hands"]] + [
-            [g["created_at"], g["mode"], place(g["place"]), g["hands"] or "-"] for g in games
-        ])
+        live = any(g["mode"] == "live" for g in games)
+        head = ["game", "mode", "place", "hands", "rating"] + (["won"] if live else [])
+        text += "\n\n" + table([head] + [
+            [when(g["created_at"]), g["mode"], place(g["place"]), g["hands"] or "-", signed(g.get("rating_delta"))]
+            + ([signed(g.get("net"), "money")] if live else [])
+            for g in games
+        ], header=True)
     return text
 
 
@@ -77,13 +81,18 @@ def status(args):
 
 
 def watch(args):
+    paint = f"\x1b[48;2;{INK}m\x1b[38;2;{PAPER}m" if colored() else ""
+    sys.stdout.write("\x1b[?1049h\x1b[?25l" + paint + "\x1b[2J")
     try:
         while True:
-            sys.stdout.write("\x1b[H\x1b[2J" + report() + "\n\nctrl-c to quit\n")
+            lines = ["", *("  " + line for line in report().split("\n")), "", "  " + "ctrl-c to quit"]
+            sys.stdout.write("\x1b[H" + "".join(line + "\x1b[K\n" for line in lines) + "\x1b[J")
             sys.stdout.flush()
             time.sleep(WATCH_SECONDS)
     except KeyboardInterrupt:
         pass
+    finally:
+        sys.stdout.write("\x1b[0m\x1b[?25h\x1b[?1049l")
 
 
 def register(sub):

{pokerbots_dev-0.1.2 → pokerbots_dev-0.1.4}/src/pokerbots_cli/commands/local.py

@@ -58,9 +58,9 @@ def test(args):
         ["2nd", places.count(2)],
         ["avg place", f"{sum(places) / len(places):.1f}"],
         ["decisions", mine.decisions],
-        ["over 20 ms", mine.late],
+        ["late", mine.late],
         ["errors", mine.errors],
-        ["slowest", f"{mine.slowest * 1000:.2f} ms"],
+        ["slowest", f"{mine.slowest * 1000:.2f} ms cpu"],
     ]))
     if mine.error:
         print(f"\nfirst error\n{mine.error}")

{pokerbots_dev-0.1.2 → pokerbots_dev-0.1.4}/src/pokerbots_cli/commands/money.py

@@ -1,3 +1,5 @@
+import sys
+
 from .. import wallet as keys
 from ..api import call
 from ..fmt import money, parse_money, table
@@ -6,25 +8,32 @@ from ..fmt import money, parse_money, table
 def registered_key():
     key = keys.load_or_create()
     address = keys.address(key)
-    if call("GET", "/me")["wallet"] != address:
+    me = call("GET", "/me")
+    if me["wallet"] != address:
         call("PUT", "/wallet", {"address": address})
-    return key, address
+    return key, address, me
 
 
 def wallet(args):
-    _, address = registered_key()
-    print(table([["address", address], ["balance", money(call("GET", "/me")["balance"])]]))
+    _, address, me = registered_key()
+    rows = [["address", address], ["balance", money(me["balance"])]]
+    if me["withdraw_to"] and me["withdraw_to"] != address:
+        rows.append(["withdraws to", me["withdraw_to"]])
+    print(table(rows, labels=True))
 
 
 def deposit(args):
-    key, _ = registered_key()
+    key, _, _ = registered_key()
     prepared = call("POST", "/deposits", {"amount": parse_money(args.amount)})
     reply = call("POST", f"/deposits/{prepared['signature']}", {"transaction": keys.sign(prepared["transaction"], key)})
     print(f"deposit {reply['status']}: {money(reply['amount'])}")
 
 
 def withdraw(args):
-    registered_key()
+    _, address, me = registered_key()
+    if me["withdraw_to"] and me["withdraw_to"] != address:
+        sys.exit(f"withdrawals go to {me['withdraw_to']}, the wallet you last deposited from.\n"
+                 f"to use this wallet instead, deposit from it once: pb deposit 0.10")
     reply = call("POST", "/withdrawals", {"amount": parse_money(args.amount)})
     print(f"withdrawal {reply['status']}: {money(reply['amount'])}")
 

{pokerbots_dev-0.1.2 → pokerbots_dev-0.1.4}/src/pokerbots_cli/docs.md

@@ -7,7 +7,7 @@ start
   pb upload [dir]            upload a new version: v1, v2, ...
   pb deploy v1 --paper       play free games with v1
   pb deploy v1 --live        play for money with v1
-  pb stop --paper|--live     stop playing
+  pb stop --paper|--live     stop playing; queued games still play
   pb status                  versions, rating, balance, recent games
   pb watch                   the same, refreshed every 5 seconds
   pb docs [--plain]          show this
@@ -19,7 +19,8 @@ money
 
   Your wallet key is ~/.config/pokerbots/wallet.json and never leaves your
   machine. Send USDC on Solana to its address, then deposit. We pay the
-  network fees. Large withdrawals may wait for review.
+  network fees. Withdrawals go to the wallet you last deposited from.
+  Large withdrawals may wait for review.
 
 bot.py
   class Bot:
@@ -29,8 +30,9 @@ bot.py
           return ("fold",)
 
   A new Bot is created for every game. act is called for every decision.
-  A late reply (over 20 ms), an error or an illegal action counts as
-  check, or fold if check is not legal. Uploads are the bot's directory,
+  Each decision gets 20 ms of CPU time, and must reply within 100 ms.
+  A late reply, an error or an illegal action counts as check, or fold
+  if check is not legal. Uploads are the bot's directory,
   up to 1 MB zipped. Bots run with the Python standard library only, no
   network and no file writes.
 
@@ -68,7 +70,7 @@ game
   blinds on hand n: n / 2n
   ends at last bot standing or 100 hands
   at 100 hands, places go by chips
-  20 ms per decision, else check/fold
+  20 ms CPU per decision, else check/fold
   up to 5 games a minute per bot
   paper tables are filled with house bots; live tables are 6 players
 

pokerbots_dev-0.1.4/src/pokerbots_cli/fmt.py

@@ -0,0 +1,55 @@
+import os
+import sys
+from datetime import datetime, timezone
+
+MICRO = 1_000_000
+INK, PAPER = "17;17;17", "244;243;239"
+
+
+def colored():
+    return sys.stdout.isatty() and not os.environ.get("NO_COLOR")
+
+
+def bold(text):
+    return f"\x1b[1m{text}\x1b[22m" if colored() else text
+
+
+def table(rows, labels=False, header=False):
+    """Aligned columns; bold the first column (labels) or first row (header)."""
+    rows = [[str(c) for c in row] for row in rows]
+    widths = [max(len(r[i]) for r in rows if i < len(r)) for i in range(max(map(len, rows)))]
+    lines = []
+    for n, r in enumerate(rows):
+        cells = [c.ljust(w) for c, w in zip(r, widths)]
+        if header and n == 0:
+            cells = [bold(c) for c in cells]
+        elif labels:
+            cells[0] = bold(cells[0])
+        lines.append("  ".join(cells).rstrip())
+    return "\n".join(lines)
+
+
+def money(micro):
+    cents = round(micro / 10_000)
+    return f"{cents}¢" if abs(cents) < 100 else f"${cents / 100:,.2f}"
+
+
+def signed(value, unit=""):
+    if value is None:
+        return "-"
+    return ("+" if value > 0 else "") + (money(value) if unit == "money" else f"{value:.0f}")
+
+
+def when(utc):
+    return datetime.fromisoformat(utc).replace(tzinfo=timezone.utc).astimezone().strftime("%m-%d %H:%M")
+
+
+def parse_money(text):
+    value = round(float(text.lstrip("$")) * MICRO)
+    if value <= 0:
+        raise ValueError("amount must be positive")
+    return value
+
+
+def place(n):
+    return {1: "1st", 2: "2nd", 3: "3rd"}.get(n, f"{n}th") if n else "-"

{pokerbots_dev-0.1.2 → pokerbots_dev-0.1.4}/tests/test_agent.py

@@ -13,6 +13,12 @@ class Fixed:
         return self.reply(state)
 
 
+def busy(seconds):
+    end = time.thread_time() + seconds
+    while time.thread_time() < end:
+        pass
+
+
 def run(reply):
     agent = Agent(Fixed(reply))
     return agent(dict(STATE)), agent
@@ -25,8 +31,12 @@ def test_legal_actions_pass_and_raises_clamp():
 
 
 def test_bad_bots_fold():
-    action, agent = run(lambda s: time.sleep(0.03))
+    action, agent = run(lambda s: time.sleep(0.15))
+    assert action == ("fold",) and agent.late == 1
+    action, agent = run(lambda s: busy(0.03))
     assert action == ("fold",) and agent.late == 1
+    action, agent = run(lambda s: time.sleep(0.03) or ("call",))
+    assert action == ("call",) and agent.late == 0
     action, agent = run(lambda s: 1 / 0)
     assert action == ("fold",) and "ZeroDivisionError" in agent.error
     action, agent = run(lambda s: ("check",))

{pokerbots_dev-0.1.2 → pokerbots_dev-0.1.4}/tests/test_cli.py

@@ -1,3 +1,5 @@
+import re
+
 import pytest
 
 from pokerbots_cli.main import main
@@ -14,7 +16,7 @@ def test_init_then_test(tmp_path, capsys):
     bot = tmp_path / "mybot"
     assert main(["init", str(bot)]) == 0
     assert main(["test", str(bot), "--games", "3", "--seed", "1"]) == 0
-    assert "errors      0" in capsys.readouterr().out
+    assert re.search(r"errors\s+0\n", capsys.readouterr().out)
 
 
 def test_docs_plain(capsys):

pokerbots_dev-0.1.2/src/pokerbots_cli/fmt.py

@@ -1,23 +0,0 @@
-MICRO = 1_000_000
-
-
-def table(rows):
-    rows = [[str(c) for c in row] for row in rows]
-    widths = [max(len(r[i]) for r in rows if i < len(r)) for i in range(max(map(len, rows)))]
-    return "\n".join("  ".join(c.ljust(w) for c, w in zip(r, widths)).rstrip() for r in rows)
-
-
-def money(micro):
-    cents = round(micro / 10_000)
-    return f"{cents}¢" if abs(cents) < 100 else f"${cents / 100:,.2f}"
-
-
-def parse_money(text):
-    value = round(float(text.lstrip("$")) * MICRO)
-    if value <= 0:
-        raise ValueError("amount must be positive")
-    return value
-
-
-def place(n):
-    return {1: "1st", 2: "2nd", 3: "3rd"}.get(n, f"{n}th") if n else "-"