Files
computer-playbook/utils/update/base.py
T
kevinveenbirkenbachandClaude Opus 4.7 4d4267e433 refactor(env): SPOT worker chain (INFINITO_WORKER_ENABLED/CPU/FETCH)
Rename INFINITO_PARALLEL -> INFINITO_WORKER_ENABLED and add two derived
keys so consumers no longer multiply by their own factor: the env
generator resolves the cascade once at `make dotenv` time and bakes
the integer counts into `.env`.

Chain:
- INFINITO_WORKER_ENABLED (operator toggle, default true)
- INFINITO_WORKER_CPU     = cpu_count() when ENABLED truthy, else 1
- INFINITO_WORKER_FETCH   = CPU * 20 for I/O-bound bulk fetches,
                            collapsing to 1 when CPU == 1

Handlers:
- utils/env/handlers/infinito_worker.py (the prior single key)
  removed
- utils/env/handlers/infinito_worker_cpu.py + infinito_worker_fetch.py
  added; registry orders them after `passthrough` so the cascade
  reads its dependency from the env-builder state.

Consumers (now 1-liners):
- tests/external/repository/test_urls_reachable.py reads
  INFINITO_WORKER_FETCH directly.
- utils/update/base.py::resolve_max_fetch_workers() reads it directly;
  utils/update/{docker,repository}.py keep using that helper plus a
  ThreadPoolExecutor for the actual bulk fetch (with `dict(pool.map(...))`
  satisfying PERF403).
- scripts/lint/autoformat.sh + docs/contributing/tools/make.md
  rename INFINITO_PARALLEL -> INFINITO_WORKER_ENABLED.

Tests:
- EXPECTED_BASELINE_KEYS in test_dotenv_generator updated to track the
  three new keys.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-20 20:40:34 +02:00

71 lines
2.1 KiB
Python

"""Semver primitives shared by every version-bump backend.
A "version" here is a tag of the shape ``v?<numeric-semver>(-<flavor>)?``,
where the numeric part has 1 to 4 dot-separated components and the
optional ``-<flavor>`` suffix is an opaque discriminator (e.g. the
Docker Official Image tag ``5.4.5-php8.3-apache`` or the npm-style
``1.2.3-alpha``).
Upgrade candidates MUST share the same depth (1, 2, 3 or 4 components)
AND the same flavor as the current tag, so that ``5.4.5-php8.3-apache``
never silently bumps to ``5.4.6-php8.4-apache`` (different runtime) or
to ``5.4.6`` (different depth).
"""
from __future__ import annotations
import os
import re
_SEMVER_CORE = r"v?\d+(?:\.\d+){0,3}"
_VERSIONED_TAG_RE = re.compile(rf"^(?P<semver>{_SEMVER_CORE})(?P<flavor>-\S+)?$")
def _parse_versioned_tag(tag: str) -> tuple[str, str] | None:
match = _VERSIONED_TAG_RE.match(str(tag).strip())
if match is None:
return None
return match.group("semver"), match.group("flavor") or ""
def is_semver(value: str) -> bool:
return _parse_versioned_tag(value) is not None
def version_key(tag: str) -> tuple[int, ...]:
parsed = _parse_versioned_tag(tag)
if parsed is None:
return (0,) * 4
semver, _flavor = parsed
parts = tuple(int(part) for part in semver.lstrip("v").split("."))
return parts + (0,) * (4 - len(parts))
def version_depth(tag: str) -> int:
parsed = _parse_versioned_tag(tag)
if parsed is None:
return 0
semver, _flavor = parsed
return len(semver.lstrip("v").split("."))
def version_flavor(tag: str) -> str:
"""Return the ``-<flavor>`` suffix of a versioned tag, or "" when none."""
parsed = _parse_versioned_tag(tag)
return parsed[1] if parsed else ""
def latest_semver(tags: list[str], depth: int, flavor: str = "") -> str | None:
candidates = [
tag
for tag in tags
if is_semver(tag)
and version_depth(tag) == depth
and version_flavor(tag) == flavor
]
return max(candidates, key=version_key, default=None)
def resolve_max_fetch_workers() -> int:
return int(os.environ.get("INFINITO_WORKER_FETCH", "1"))