mirror of
https://github.com/kuhyx/utils.git
synced 2026-11-10 22:07:15 +01:00
The hook entry was an absolute /home/kuhy/utils path, copied from a config written for ~/.claude where it only ever ran locally. On an Actions runner that is exit code 127 — "No such file or directory" — so gatelock-precommit and crdt-sync-precommit failed on every commit of this refactor while the hook silently checked nothing. Now repo-relative, matching the sibling hooks (`entry: scripts/check_subproject_scope.sh`): pre-commit always runs from the git root, so it resolves the same in both places. Fixing that made the CI configs runnable locally, and `--all-files` then found what per-file runs had missed — ruff pruning imports that exist *for* their re-export. `import crdt_sync` was broken three separate ways (FileSyncStateStore, encode_key, FileCredentialStore). Each affected module now states an explicit __all__ so the autofixer cannot take them again, and the two files that pushed past the cap once __all__ was added are split further: _firebase.py 260 -> 247 + _fberrors 25 _sync.py 257 -> 188 + _syncargs 91 Test patch targets followed the code they patch: gatelock._outputs.shutil -> _xrandr.shutil, gatelock._arbiter.Path -> _claims.Path. gatelock and crdt-sync both pass `pre-commit run --all-files` in full; 389 and 259 tests at 100% branch coverage; the root gate exits 0. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01CFSGeWxHPY5rHUGrPqhcmG
109 lines
3.9 KiB
Python
109 lines
3.9 KiB
Python
"""Downloading peers' logs, skipping the ones we already have.
|
|
|
|
Split from :mod:`crdt_sync._sync`, which keeps the push half and the
|
|
orchestration. The revision map is the optimisation that makes a tick cheap:
|
|
a peer whose published revision matches what we last merged is not fetched at
|
|
all, so a quiet device costs one small read instead of one read per peer.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from dataclasses import dataclass
|
|
import logging
|
|
from typing import TYPE_CHECKING
|
|
|
|
if TYPE_CHECKING:
|
|
from collections.abc import Callable
|
|
|
|
from crdt_sync._log import Log
|
|
from crdt_sync._remote import RemoteStore
|
|
from crdt_sync._syncstate import SyncState
|
|
|
|
from crdt_sync._revisions import revision_of
|
|
|
|
_logger = logging.getLogger(__name__)
|
|
|
|
|
|
def _remote_revs(client: RemoteStore, revs_path: str) -> dict[str, str]:
|
|
"""Return every peer's published revision, cheaply where possible.
|
|
|
|
Degrades to an empty map -- meaning "fetch everything", the old behaviour
|
|
-- on any backend without a bulk-map read, so correctness never depends
|
|
on the optimisation being available.
|
|
"""
|
|
get_string_map = getattr(client, "get_string_map", None)
|
|
if get_string_map is None:
|
|
return {}
|
|
return get_string_map(revs_path)
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class _PullContext:
|
|
"""Everything :func:`_pull_remote_logs` needs for one tick's pull.
|
|
|
|
A bundle rather than eight positional parameters: they are always passed
|
|
together, from one call site, and several share a type -- exactly the
|
|
shape where a positional mix-up is silent.
|
|
"""
|
|
|
|
client: RemoteStore
|
|
own_ids: frozenset[str]
|
|
path_prefix: str
|
|
filename: str
|
|
decode: Callable[[str], Log]
|
|
remote_revs: dict[str, str]
|
|
state: SyncState
|
|
|
|
|
|
def _pull_remote_logs(
|
|
ctx: _PullContext,
|
|
seen_revs: dict[str, str],
|
|
) -> list[Log]:
|
|
"""Return every other device's last-pushed log, skipping this one.
|
|
|
|
A device whose pushed file is corrupt or unparsable (e.g. an interrupted
|
|
push) is logged and skipped, same as one that has never pushed at all --
|
|
the remote is an external system boundary, and one bad device's file must
|
|
not stall merging in every other device's.
|
|
|
|
``own_ids`` is a *set* rather than a single id because a device that has
|
|
migrated from a role constant to a persisted uuid still owns the log it
|
|
pushed under the old id. Matching only the current id would pull that
|
|
file back and re-merge this device's own pre-migration history as though
|
|
a peer had written it -- idempotent, but pure wasted transfer.
|
|
|
|
Records into ``seen_revs`` which peers are now merged in, so the next
|
|
tick can skip them.
|
|
"""
|
|
remote_logs: list[Log] = []
|
|
for other_device_id in ctx.client.list_directory(ctx.path_prefix):
|
|
if other_device_id in ctx.own_ids:
|
|
continue
|
|
remote_rev = ctx.remote_revs.get(other_device_id)
|
|
if remote_rev is not None and remote_rev == ctx.state.peer_revs.get(
|
|
other_device_id
|
|
):
|
|
# Unchanged since we last merged it, and that merge is already
|
|
# part of local_log -- so the (potentially hundreds of KB)
|
|
# download is pure waste. Carry the revision forward so it stays
|
|
# skipped next tick.
|
|
seen_revs[other_device_id] = remote_rev
|
|
continue
|
|
text = ctx.client.get_file_text(
|
|
f"{ctx.path_prefix}/{other_device_id}/{ctx.filename}"
|
|
)
|
|
if text is None:
|
|
continue
|
|
try:
|
|
remote_logs.append(ctx.decode(text))
|
|
except (ValueError, KeyError, TypeError):
|
|
_logger.warning(
|
|
"Unparsable log pushed by device %r, skipping",
|
|
other_device_id,
|
|
)
|
|
# Deliberately not recorded as seen: a corrupt push must be
|
|
# retried next tick, not remembered as merged.
|
|
continue
|
|
seen_revs[other_device_id] = remote_rev or revision_of(text)
|
|
return remote_logs
|