captchakraken 2.8.0 → 3.0.0

package/python/src/captchakraken/prompts.py

@@ -1,39 +1,3 @@
-"""Prompt resolution: every model gets the prompts it was trained on.
-
-Why this exists
----------------
-The prompt a captcha model is sent has to be the prompt it was trained on. When
-they drift, nothing errors — the model answers in a schema the client does not
-recognise and puzzles silently fail. That has happened: see failure-mode 3 in
-the finetune repo's `scripts/check_prompt_parity.py`, where the shipped prompt
-kept asking for the legacy `output`/`simulate_drag`/PascalCase schema long after
-the LoRA had been retrained on `action: drag`/`drags[]`.
-
-Hardcoding ONE generation of prompts makes that inevitable the moment a new
-model trains on different ones: updating the constants breaks every already-
-published model, and not updating them breaks the new one. There is no version
-of "one set of constants" that is correct.
-
-So this module ships the built-ins for EVERY generation still in service, and
-`models.json` records which generation each model was trained on. A model keeps
-working forever, whatever this client later ships.
-
-Resolution order
-----------------
-1. ``CAPTCHA_PROMPTS_FILE`` — explicit local path. Wins over everything; use it
-   for a model you built yourself and have not published.
-2. ``models.json`` — the registry shipped with this client. FIRST, not last,
-   because it is the only source that works for a private model (the production
-   adapter is gated on the Hub and 401s) or one published before prompts.json
-   existed, and because it is the source the release gate actually verifies.
-3. The served model's repo on the Hub, when it looks like ``org/name`` and
-   ``huggingface_hub`` is importable — covers models published after this
-   client was released.
-4. The built-ins for whatever generation ``latest`` is on, with a warning.
-
-A prompt lookup must never fail a solve, so every step degrades rather than
-raises.
-"""
 from __future__ import annotations
 
 import json
@@ -43,37 +7,17 @@ from dataclasses import dataclass
 from pathlib import Path
 from typing import Any, Dict, Optional
 
+from .kinds import Availability, PromptFamily
+
 _MODELS_PATH = Path(__file__).with_name("models.json")
 _PROMPTS_FILE_ENV = "CAPTCHA_PROMPTS_FILE"
 _DISABLE_FETCH_ENV = "CAPTCHA_PROMPTS_NO_FETCH"
 
-# The newest generation this client ships built-ins for. NOT "the version to
-# send" — that is per model, resolved below. This exists so the finetune repo
-# can ask "do you speak the generation I am training?" without importing us.
 LATEST_PROMPT_VERSION = "2"
 
 
-# ── built-in templates, one entry per generation in service ─────────────────
-#
-# A PURE LITERAL, deliberately: the finetune repo's check_prompt_parity.py reads
-# it by AST without importing this package (which pulls in pydantic/cv2 that the
-# training venv need not have). Keep it literal — an f-string, a .join(), or a
-# reference to another constant makes it unreadable to that gate, and the gate
-# going quiet is how prompt drift got shipped last time.
-#
-#   1 — CaptchaKrakenV1_Lora, Sunlight-AWQ-4bit, Twilight-FP8, CaptchaKraken_v1.1.
-#       985-char action prompt. No slider clause. No animated ("video") family
-#       and no distorted-text ("text") family: a v1 model cannot answer either
-#       request, which is why both are null rather than a copy of v2's.
-#   2 — adds the PUZZLE PIECE SLIDER clause and the animated + text families.
-#       Byte-identical to src/synthetic/reasoning/instructions.py
-#       ::PIXEL_INSTRUCTION_TEMPLATE, ::VIDEO_INSTRUCTION_TEMPLATE and
-#       ::TEXT_INSTRUCTION in the finetune repo at PROMPT_VERSION 2.
-#
-# Do not edit a published generation's text. Ever. Those models are frozen and
-# so are their prompts; a change here is a change to what an already-shipped
-# model is asked, which is the bug this whole module exists to prevent. New
-# text means a NEW generation.
+# Pure literals only, no f-strings, joins or constant references: the training repo's release parity gate reads
+# this dict by AST without importing the package, and the gate going quiet is how prompt drift shipped once.
 BUILTIN_PROMPTS = {
     "1": {
         "action_pixel": (
@@ -108,12 +52,6 @@ BUILTIN_PROMPTS = {
         "text": None,
     },
     "2": {
-        # UNPUBLISHED as of 2026-08-03: no entry in models.json names generation
-        # 2, `latest` is a generation-1 model, and no training run has produced
-        # a deployable one. That is the ONLY reason its text may still move —
-        # the freeze protects models that exist, and none exists here. The
-        # moment a model registers against "2", this text is frozen with it and
-        # a change means generation 3.
         "action_pixel": (
             "Your task is to solve the captcha. Read the instruction at the top of the image carefully.\n\n"
             "Look at the puzzle and decide what action solves it. All coordinates you return must be on a "
@@ -200,13 +138,11 @@ BUILTIN_PROMPTS = {
 }
 
 
-# ── the registry ────────────────────────────────────────────────────────────
-
 def _load_registry() -> Dict[str, Any]:
     try:
         with _MODELS_PATH.open(encoding="utf-8") as fh:
             return json.load(fh)
-    except (OSError, ValueError):  # a broken registry must not fail a solve
+    except (OSError, ValueError):
         return {}
 
 
@@ -221,24 +157,23 @@ def registry() -> Dict[str, Any]:
 
 
 def registered_models() -> Dict[str, Dict[str, Any]]:
-    """Every model this client knows about, repo id -> entry."""
     return {k: v for k, v in (registry().get("models") or {}).items()
             if isinstance(v, dict)}
 
 
 def latest_model() -> Optional[str]:
-    """The model you get when you do not pin one."""
     return registry().get("latest")
 
 
-def canonical_model_id(model: Optional[str]) -> Optional[str]:
-    """Repo id for `model`, resolving a served alias.
+def served_aliases() -> Dict[str, str]:
+    return dict(registry().get("served_aliases") or {})
+
+
+def hosted_default_model() -> Optional[str]:
+    return registry().get("hosted_default")
+
 
-    A hosted endpoint serves a BARE NAME (`captcha`), not a repo id, so the
-    string the client sends as `model` is often not something the registry can
-    be keyed by. Without this indirection every hosted solve would fall through
-    to the default-version branch and lose the whole point of the map.
-    """
+def canonical_model_id(model: Optional[str]) -> Optional[str]:
     if not model:
         return None
     if model in registered_models():
@@ -247,85 +182,37 @@ def canonical_model_id(model: Optional[str]) -> Optional[str]:
     return alias if isinstance(alias, str) else None
 
 
-# ── availability: can these weights be obtained at all? ─────────────────────
-#
-# Same registry, same reason as prompt_version and pixel_budget: it is a fact
-# about the MODEL, and the one place that already decides what an unpinned
-# client downloads. See models.json's header comment.
-
-PUBLIC = "public"
-PRIVATE = "private"
-LICENSED = "licensed"
-#: Anything outside this set is a typo, and a typo must not read as "public".
-#: The whole class of bug this file exists to prevent is a field that fails
-#: open — `check_prompt_parity.py` rejects an unknown value at release time,
-#: and `is_licensed` below treats one as licensed rather than guessing.
-#:
-#: Spelled out as literals rather than `(PUBLIC, PRIVATE, LICENSED)`: the
-#: release gate reads this file by AST so it can run in a training venv with no
-#: client installed, and `ast.literal_eval` cannot follow a name. A tuple of
-#: names reads as "unset" to the gate, which is the check silently not running.
-#: `tests/test_prompt_registry.py` pins that all four constants agree.
+PUBLIC = Availability.PUBLIC
+PRIVATE = Availability.PRIVATE
+LICENSED = Availability.LICENSED
+# String literals, like BUILTIN_PROMPTS: the parity gate reads this tuple by AST, and enum references are not literals to it.
 AVAILABILITIES = ("public", "private", "licensed")
 
 
-def availability(model: Optional[str]) -> str:
-    """`"public"`, `"private"` or `"licensed"` for `model`. Absent means public.
-
-    The three answer ONE question — can these weights be obtained, and by whom:
-
-      public     on the Hub, by anyone.
-      private    on the Hub in a PRIVATE repo. The bytes exist and `fetch`
-                 pulls them, but only for a token this account has authorised.
-                 Everyone else gets 401/404 from the Hub, which is the right
-                 answer and not something to pre-empt with a refusal.
-      licensed   no Hub repo at all. Hosted API or a licence we issue.
-
-    `private` is the newest and it is NOT a softer `licensed`. They differ in
-    what an authorised holder can do, which is the whole reason the field is
-    not a boolean: a licensed model has nothing to download however good your
-    credentials are, so refusing early is a KINDNESS — it replaces a
-    `RepositoryNotFoundError` that reads as "you are not logged in" with the
-    truth. Doing the same to a private model would be a lie, and would make our
-    own admin token unable to pull weights it is entitled to.
-
-    An unregistered model is public too: it is not ours, and refusing to
-    download a stranger's adapter because we have never heard of it would break
-    every self-hoster who trained their own.
-    """
+def availability(model: Optional[str]) -> Availability:
+    """Unset reads as public; an unrecognised value fails closed as licensed, never as a softer licence."""
     entry = registered_models().get(canonical_model_id(model) or "") or {}
     value = entry.get("availability")
-    return value if isinstance(value, str) and value else PUBLIC
+    if not (isinstance(value, str) and value):
+        return Availability.PUBLIC
+    try:
+        return Availability(value)
+    except ValueError:
+        return Availability.LICENSED
 
 
 def is_licensed(model: Optional[str]) -> bool:
-    """True if these weights are NOT OBTAINABLE AT ALL — hosted API or licence.
-
-    Fails CLOSED on an unrecognised value. A registry that says `"licenced"`
-    must not hand out a proprietary model because of a spelling.
-
-    False for `private`: those weights are downloadable, by the holder of a
-    token we authorised. Proprietary and unobtainable are different facts, and
-    this function answers the second one — `requires_auth` answers the first.
-    """
-    return availability(model) not in (PUBLIC, PRIVATE)
+    # PRIVATE is not a softer LICENSED: refusing a licensed model early replaces a RepositoryNotFoundError that
+    # reads as "not logged in" with the truth, but refusing a private one would stop our own token pulling weights.
+    return availability(model) == Availability.LICENSED
 
 
 def requires_auth(model: Optional[str]) -> bool:
-    """True if pulling these weights needs a token we authorised.
+    return availability(model) == Availability.PRIVATE
 
-    Separate from `is_licensed` because the two diverge exactly where it
-    matters: a `private` model needs a token AND can be fetched with one, a
-    `licensed` model needs no token because there is nothing to fetch.
-    """
-    return availability(model) == PRIVATE
-
-
-# ── prompt sets ─────────────────────────────────────────────────────────────
 
 @dataclass
 class PromptSet:
-    """The prompts to send one particular model, and where they came from."""
 
     version: str
     action_prompt: str
@@ -337,22 +224,12 @@ class PromptSet:
 
     def grid_prompt(self, *, rows: int, cols: int, grid_hint: str = "",
                     puzzle_type: Optional[str] = None) -> str:
-        """A published prompts.json carries grid prompts already rendered per
-        puzzle type; prefer that exact string when the type is known, since it
-        is literally what the model trained on. Otherwise render the template,
-        which is how this client has always built them."""
         if puzzle_type and puzzle_type in self.grid_by_type:
             return self.grid_by_type[puzzle_type]
         return self.grid_template.format(rows=rows, cols=cols,
                                          total=rows * cols, grid_hint=grid_hint)
 
     def video_prompt(self, n_keyframes: int) -> str:
-        """The prompt for a challenge served as `n_keyframes` stills.
-
-        The count is in the text because the model has no other way to know how
-        many images arrived — frame identities live in the prompt, not in the
-        image payload.
-        """
         n = int(n_keyframes)
         if n < 1:
             raise ValueError(f"a keyframe request needs at least one frame, got {n_keyframes}")
@@ -366,16 +243,6 @@ class PromptSet:
         return self.video_template.format(n=n, listing=listing)
 
     def text_prompt(self) -> str:
-        """The prompt for a DISTORTED-TEXT captcha — one where the answer is a
-        string typed into the widget's box, not a point on the picture.
-
-        Asking for this when the generation has no such family is a hard error
-        rather than a silent fall back to the click/drag prompt: that prompt
-        asks for coordinates the puzzle has no use for, so a v1 model handed a
-        BotDetect image answers with a point, the driver clicks a random spot on
-        the letters, and the box stays empty. Failing loudly here names the
-        actual problem — the model predates the family.
-        """
         if self.text_template is None:
             raise ValueError(
                 f"prompt generation {self.version} has no distorted-text prompt — "
@@ -386,7 +253,6 @@ class PromptSet:
 
 
 def builtin(version: str) -> Optional[PromptSet]:
-    """The built-in PromptSet for a generation, or None if we don't ship it."""
     spec = BUILTIN_PROMPTS.get(str(version))
     if spec is None:
         return None
@@ -402,9 +268,6 @@ def builtin(version: str) -> Optional[PromptSet]:
 
 
 def _from_doc(doc: Dict[str, Any], source: str) -> PromptSet:
-    """A published prompts.json. Anything it omits falls back to the built-ins
-    for the version it declares — a partial file should narrow what we take from
-    it, not silently drop a whole prompt family."""
     version = str(doc.get("prompt_version", LATEST_PROMPT_VERSION))
     base = builtin(version) or builtin(LATEST_PROMPT_VERSION)
     templates = doc.get("templates") or {}
@@ -429,8 +292,7 @@ def _warn(msg: str) -> None:
 
 
 def resolve(model: Optional[str]) -> PromptSet:
-    """The PromptSet for `model`. Never raises — see the module docstring for
-    the resolution order and why the registry comes before the Hub."""
+    """File, then registry, then the Hub: the registry is the only source that works for a private model (the production adapter is gated and 401s)."""
     key = model or ""
     if key in _cache:
         return _cache[key]
@@ -442,7 +304,7 @@ def resolve(model: Optional[str]) -> PromptSet:
         try:
             with open(explicit, encoding="utf-8") as fh:
                 ps = _from_doc(json.load(fh), f"file:{explicit}")
-        except Exception as exc:  # noqa: BLE001 — never fail a solve over this
+        except Exception as exc:
             _warn(f"could not read {_PROMPTS_FILE_ENV}={explicit}: {exc}; "
                   "falling back to the registry")
 
@@ -453,9 +315,6 @@ def resolve(model: Optional[str]) -> PromptSet:
         if version:
             ps = builtin(version)
             if ps is None:
-                # Registered against a generation we ship no text for. The
-                # release gate exists to make this unreachable; if it happens
-                # anyway, say so loudly rather than guessing.
                 _warn(f"{repo_id} is registered as prompt_version {version}, which this "
                       f"client ships no prompts for — using v{LATEST_PROMPT_VERSION}. "
                       "Upgrade captchakraken.")
@@ -464,15 +323,12 @@ def resolve(model: Optional[str]) -> PromptSet:
 
     if ps is None and model and "/" in model and os.getenv(_DISABLE_FETCH_ENV, "0") != "1":
         try:
-            from huggingface_hub import hf_hub_download  # lazy: optional dependency
+            from huggingface_hub import hf_hub_download
 
             path = hf_hub_download(repo_id=model, filename="prompts.json")
             with open(path, encoding="utf-8") as fh:
                 ps = _from_doc(json.load(fh), f"hub:{model}")
         except Exception:
-            # No prompts.json, no hub, offline, or gated. All expected — the
-            # registry above is the supported path; this is a bonus for models
-            # published after this client shipped.
             ps = None
 
     if ps is None:
@@ -489,32 +345,17 @@ def resolve(model: Optional[str]) -> PromptSet:
     return ps
 
 
-# ─── training pixel budget ──────────────────────────────────────────────────
-# Same registry, same reason, different axis. See models.json's header comment:
-# an adapter learns to read a puzzle at whatever MIN_PIXELS/MAX_PIXELS band its
-# training exported, and serving it under a different band is the prompt bug
-# wearing a different hat — silent, and wrong on every puzzle.
-
 MIN_PIXELS_ENV = "CAPTCHA_MIN_PIXELS"
 MAX_PIXELS_ENV = "CAPTCHA_MAX_PIXELS"
 
 
 @dataclass(frozen=True)
 class PixelBudget:
-    """The image-area band a model was trained under, in pixels.
-
-    `minimum` is a floor: smaller images are upscaled to it. `maximum` is a
-    ceiling, or None for "send it as-is and let the server decide" — which is
-    what every model published before this field existed did.
-    """
     minimum: int
     maximum: Optional[int]
     source: str
 
 
-#: What the client did before models.json carried a budget. 448² is Qwen's own
-#: ViT floor; there was never a ceiling. Anything unregistered keeps this, so
-#: adding the field cannot change an existing deployment.
 DEFAULT_PIXEL_BUDGET = PixelBudget(minimum=448 * 448, maximum=None,
                                    source="client-default")
 
@@ -528,13 +369,7 @@ def _env_int(name: str) -> Optional[int]:
 
 
 def pixel_budget(model: Optional[str]) -> PixelBudget:
-    """The budget to send `model` images at. Never raises.
-
-    Order mirrors `resolve`: an explicit env pin wins, then the registry, then
-    the historical default. There is deliberately no Hub fetch — a wrong budget
-    degrades quality silently, so it may only come from a source we can verify
-    offline.
-    """
+    # Deliberately no Hub fetch here: a wrong budget degrades quality silently.
     env_min, env_max = _env_int(MIN_PIXELS_ENV), _env_int(MAX_PIXELS_ENV)
     if env_min or env_max:
         return PixelBudget(
@@ -553,52 +388,21 @@ def pixel_budget(model: Optional[str]) -> PixelBudget:
     return DEFAULT_PIXEL_BUDGET
 
 
-# ─── expert routing: WHICH ADAPTER answers this prompt family ───────────────
-#
-# Same registry, same reason again, one more axis. A routed model is not one
-# adapter: `Abyss` is four LoRAs behind one endpoint, and the thing that picks
-# between them is the prompt family the request is about to send — grid, pixel,
-# video, text. See docs/MOE_LORA_DESIGN.md §11 ("the router is the prompt
-# family, and it already exists").
-#
-# It lives HERE rather than in the solver for the reason prompt_version does:
-# which experts exist is a fact about the MODEL. A client that hardcoded four
-# names would send them to v1.2, which serves one adapter under one name, and
-# every request would 404 on a model the endpoint has never heard of.
-#
-# ABSENT MEANS NOT ROUTED, and that is the whole backwards-compatibility story:
-# every published model today declares no `experts`, so `experts()` returns {},
-# `route()` returns the name the caller already had, and the bytes on the wire
-# are identical.
-
 EXPERT_ENV = "CAPTCHA_EXPERT"
 
-#: The prompt families, which are also the only keys an `experts` map may
-#: carry. `pixel` is the click/drag family — `PromptSet.action_prompt` — and is
-#: spelled that way rather than `action_pixel` because it is what ckgate's
-#: PROMPT_MARKERS already calls it, and two spellings of one router is how a
-#: family ends up unrouted on one side.
+# String literals: the parity gate reads this tuple by AST. The enum is PromptFamily.
 PROMPT_FAMILIES = ("pixel", "grid", "video", "text")
 
 
-def experts(model: Optional[str]) -> Dict[str, str]:
-    """Prompt family -> served adapter name, for a ROUTED model.
-
-    `{}` for anything that is not routed, which is every model published so
-    far. Callers apply it unconditionally; an empty map is a no-op.
-
-    Unknown family keys are DROPPED rather than passed through. A typo in the
-    registry would otherwise be a name nothing ever selects — invisible,
-    because the fallback below is a working solve at a slightly worse score,
-    which is the exact failure mode this whole module exists to prevent.
-    """
+def experts(model: Optional[str]) -> Dict[PromptFamily, str]:
+    """Unknown family keys are dropped with a warning, never raised: the day the `text` family reached ckgate without a marker, refusing it cost every distorted-text solve for a day."""
     repo_id = canonical_model_id(model)
     entry = (registered_models().get(repo_id) or {}) if repo_id else {}
     mapping = entry.get("experts")
     if not isinstance(mapping, dict):
         return {}
-    out = {}
-    for family in PROMPT_FAMILIES:
+    out: Dict[PromptFamily, str] = {}
+    for family in PromptFamily:
         name = mapping.get(family)
         if isinstance(name, str) and name:
             out[family] = name
@@ -610,32 +414,16 @@ def experts(model: Optional[str]) -> Dict[str, str]:
     return out
 
 
-def route(model: Optional[str], family: Optional[str], *,
+def route(model: Optional[str], family: Optional[PromptFamily], *,
           pin: Optional[str] = None) -> str:
-    """The `model` string to put on the wire for one request.
-
-    `model` is what the caller would have sent — a served name or a repo id —
-    and is returned unchanged whenever the model is not routed, which is what
-    keeps every existing deployment byte-identical.
-
-    `pin` forces one family for every request, whatever `family` says. That is
-    what a gate wants: serve one arm, grade the types it owns, serve the next.
-    An unknown `pin` RAISES, because a benchmark that silently measured the
-    generalist and reported it as the expert is a number nobody can catch.
-
-    An unrecognised or unmapped `family` degrades to `model` — the generalist —
-    never to another expert and never to an error. A caller prompting in their
-    own words is the expected case for a shipped model, and the day the
-    generation-2 `text` family reached ckgate without a marker, refusing it cost
-    every distorted-text solve in production for a day.
-    """
+    """An unknown pin raises (a benchmark that silently measured the generalist is a number nobody can catch); an unknown family degrades to the generalist."""
     if pin is not None:
         pin = pin.strip()
     if pin:
         if pin not in PROMPT_FAMILIES:
             raise ValueError(
                 f"unknown expert {pin!r}; have {', '.join(PROMPT_FAMILIES)}")
-        family = pin
+        family = PromptFamily(pin)
     mapping = experts(model)
     if not mapping:
         if pin:
@@ -648,17 +436,13 @@ def route(model: Optional[str], family: Optional[str], *,
 
 
 def _env_str(name: str) -> Optional[str]:
-    """Like `_env_int`, and read through the same indirection for the same
-    second reason: `test_public_contract.py` finds environment variables by
-    grepping for `os.environ.get(<NAME>)`, so naming the CONSTANT there records
-    `EXPERT_ENV` in the published env list as though it were a variable anyone
-    could set. The literal is picked up from the assignment above instead."""
+    # The indirection matters: test_public_contract greps environ reads by name, and reading EXPERT_ENV inline would record the constant as a variable.
     return (os.environ.get(name) or "").strip() or None
 
 
-def expert_pin() -> Optional[str]:
-    """`CAPTCHA_EXPERT`, or None. Empty and unset are the same thing."""
-    return _env_str(EXPERT_ENV)
+def expert_pin() -> Optional[PromptFamily]:
+    raw = _env_str(EXPERT_ENV)
+    return PromptFamily(raw) if raw else None
 
 
 def clear_cache() -> None: