diff --git a/.claude/memory/project-status.md b/.claude/memory/project-status.md index 3fb0fc7..adbf7e7 100644 --- a/.claude/memory/project-status.md +++ b/.claude/memory/project-status.md @@ -8,6 +8,11 @@ metadata: # Project Status (2026-07-13) +## Selected-node model placement (2026-07-14) + +- Admin Model placement now opens a node selector for load and release; the control-plane accepts optional `node_id` and targets only that registry assignment. Multi-model serving remains supported through `ADD_SHARD` and `max_loaded_shards`. +- Total node pool resource values are rendered from `/v1/network/map`'s `node.capacity` contract. Route selection remains assignment/capability/throughput/queue based; capacity is used for placement and falls back to tracker defaults only if a node truly omits it. + ## Distributed inference performance (2026-07-14) `DIP-001` is done in `.scratch/distributed-inference-performance/`: the deterministic two-node Route Session stub benchmark covers direct/relay plus cached/stateless prefill and decode. Its JSON and concise summary explicitly attribute model execution, activation encode/decode, compression, connection setup, relay queueing, local HTTP forwarding, and end-to-end seam latency. `PYTHONPATH=packages/node pytest -q tests/test_route_session_benchmark.py` passed (7); the fixture assertion checks output-token identity and connection attempts. diff --git a/_DEV_NOTES.md b/_DEV_NOTES.md index 28f7987..acb8dc4 100644 --- a/_DEV_NOTES.md +++ b/_DEV_NOTES.md @@ -16,12 +16,9 @@ .\.venv\Scripts\meshnet-node.exe start http://192.168.0.179:8081 --model-id Qwen/Qwen2.5-0.5B-Instruct --advertise-host 192.168.0.20 - .\.venv\Scripts\meshnet-node.exe start --tracker http://ai.neuron.d-popov.com --model-id Qwen/Qwen2.5-0.5B-Instruct --advertise-host 192.168.0.20 + .\.venv\Scripts\meshnet-node.exe start --tracker http://ai.neuron.d-popov.com --model Qwen/Qwen2.5-0.5B-Instruct --advertise-host 192.168.0.20 - we .\.venv\Scripts\meshnet-node.exe start ` - --tracker http://192.168.0.179:8081 ` - --model Qwen/Qwen2.5-0.5B-Instruct ` - --advertise-host 192.168.0.20 + we .\.venv\Scripts\meshnet-node.exe start --tracker http://192.168.0.179:8081 --model Qwen/Qwen2.5-0.5B-Instruct # trackers: https://meshnet.2.d-popov.com https://ai.neuron.d-popov.com diff --git a/packages/node/meshnet_node/hardware.py b/packages/node/meshnet_node/hardware.py index 7c97a06..9bffa9a 100644 --- a/packages/node/meshnet_node/hardware.py +++ b/packages/node/meshnet_node/hardware.py @@ -2,6 +2,7 @@ import json import os +import shutil import subprocess import time @@ -183,6 +184,17 @@ def with_forced_cpu(hw: dict) -> dict: return forced +def _with_model_drive(profile: dict) -> dict: + """Attach free space for the default model cache drive to tracker diagnostics.""" + try: + cache_root = os.path.expanduser("~/.cache/meshnet/shards") + profile["model_drive_free_bytes"] = shutil.disk_usage(os.path.expanduser("~")).free + profile["model_drive_path"] = cache_root + except OSError: + pass + return profile + + def detect_hardware() -> dict: """Detect GPU model and available VRAM. Returns hardware profile dict.""" ram_mb = _detect_ram_mb() @@ -208,23 +220,23 @@ def detect_hardware() -> dict: } if torch_gpu is not None and torch_gpu.get("gcn_arch"): profile["gcn_arch"] = torch_gpu["gcn_arch"] - return profile + return _with_model_drive(profile) except ImportError: pass torch_inventory = _gpu_inventory_profile(torch_gpu, ram_mb) if torch_inventory is not None: - return torch_inventory + return _with_model_drive(torch_inventory) nvidia_gpu = _gpu_inventory_profile(_detect_nvidia_smi_gpu_memory(), ram_mb) if nvidia_gpu is not None: - return nvidia_gpu + return _with_model_drive(nvidia_gpu) windows_gpu = _gpu_inventory_profile(_detect_windows_gpu_memory(), ram_mb) if windows_gpu is not None: - return windows_gpu + return _with_model_drive(windows_gpu) - return { + return _with_model_drive({ "device": "cpu", "gpu_name": None, "vram_mb": 0, @@ -232,7 +244,7 @@ def detect_hardware() -> dict: "shared_vram_mb": 0, "ram_mb": ram_mb, "cuda_available": False, - } + }) def benchmark_throughput_checked(device_str: str = "cpu") -> tuple[float, bool, str | None]: diff --git a/packages/node/meshnet_node/startup.py b/packages/node/meshnet_node/startup.py index 8affa2d..d1d1cf1 100644 --- a/packages/node/meshnet_node/startup.py +++ b/packages/node/meshnet_node/startup.py @@ -12,7 +12,7 @@ import urllib.error import urllib.parse import urllib.request from pathlib import Path -from typing import Any +from typing import Any, Callable from .admission import ( AdmissionRequirement, @@ -420,6 +420,7 @@ def _start_heartbeat( interval: float = _HEARTBEAT_INTERVAL_IDLE, node_ref: Any | None = None, start_time: float | None = None, + refresh_capability: Callable[[dict], dict | None] | None = None, ) -> threading.Thread: """Daemon thread: sends heartbeats and re-registers automatically after tracker restarts. @@ -431,6 +432,7 @@ def _start_heartbeat( which is logged for now (hot-reload implemented in US-026). """ _start_time = start_time or time.monotonic() + completed_directives: list[dict] = [] def _current_requests_snapshot() -> list[dict]: if node_ref is None: @@ -455,6 +457,8 @@ def _start_heartbeat( current_requests = _current_requests_snapshot() if current_requests: stats["current_requests"] = current_requests + if completed_directives: + stats["completed_directives"] = list(completed_directives) return stats def _sleep_interval() -> float: @@ -462,9 +466,26 @@ def _start_heartbeat( return _HEARTBEAT_INTERVAL_BUSY return interval + def _refresh_proof(payload: dict) -> None: + """Re-prove the current shard so a re-registration never presents an aged proof. + + The tracker refuses proofs older than its freshness budget: re-sending the + startup-time report after an outage would re-register the node unroutable. + """ + if refresh_capability is None or "capability_report" not in payload: + return + try: + fresh = refresh_capability(payload) + except Exception as exc: + print(f" [node] WARNING: capability re-validation failed: {exc}", flush=True) + return + if fresh: + payload["capability_report"] = fresh + def _reregister() -> bool: nonlocal node_id try: + _refresh_proof(register_payload) resp = _post_json(f"{tracker_url}/v1/nodes/register", register_payload) node_id = resp.get("node_id", node_id) if node_ref is not None: @@ -486,6 +507,7 @@ def _start_heartbeat( "managed_assignment": True, } try: + _refresh_proof(extra_payload) reg_resp = _post_json(f"{tracker_url}/v1/nodes/register", extra_payload) print( f" [node] registered additional model — node ID: {reg_resp.get('node_id')}", @@ -494,21 +516,26 @@ def _start_heartbeat( except Exception as exc: print(f" [node] WARNING: additional model registration failed: {exc}", flush=True) - def _apply_directives(directives: list[dict]) -> None: + def _apply_directives(directives: list[dict]) -> dict | None: if not directives: - return + return None if node_ref is None or not hasattr(node_ref, "apply_tracker_directives"): print(f" [node] tracker directives received: {directives}", flush=True) - return + return None try: applied = node_ref.apply_tracker_directives(directives) except Exception as exc: print(f" [node] WARNING: failed to apply tracker directives: {exc}", flush=True) - return + return None if applied: + completed_directives.append(dict(applied)) if applied.get("action") == "ADD_SHARD": _register_additional_assignment(applied) - return + return applied + if applied.get("action") in {"DROP_SHARD", "DROP_ALL_SHARDS"}: + # A release has no replacement range. It is not a failed + # heartbeat and must not re-register the released assignment. + return applied model_id = applied.get("model", register_payload.get("hf_repo") or register_payload.get("model")) register_payload["model"] = str(model_id).split("/")[-1] register_payload["hf_repo"] = model_id @@ -516,6 +543,7 @@ def _start_heartbeat( register_payload["shard_end"] = applied["shard_end"] register_payload["quantization"] = applied.get("quantization", register_payload.get("quantization")) register_payload["tracker_mode"] = bool(applied.get("tracker_mode", False)) + return applied def _loop() -> None: nonlocal node_id @@ -543,7 +571,10 @@ def _start_heartbeat( continue try: - resp = _post_json(hb_url, _get_stats()) + heartbeat = _get_stats() + resp = _post_json(hb_url, heartbeat) + if heartbeat.get("completed_directives"): + completed_directives.clear() _apply_directives(resp.get("directives", [])) new_asgn = resp.get("new_assignment") if new_asgn: @@ -580,6 +611,7 @@ def _register_with_tracker( reg_payload: dict, node: Any, start_time: float, + refresh_capability: Callable[[dict], dict | None] | None = None, ) -> str | None: """Register with the tracker, or start background retries when it is unreachable.""" try: @@ -587,7 +619,14 @@ def _register_with_tracker( tracker_node_id = str(reg_resp.get("node_id") or "?") setattr(node, "tracker_node_id", tracker_node_id) print(f" Registered with tracker — node ID: {tracker_node_id}", flush=True) - _start_heartbeat(tracker_url, tracker_node_id, reg_payload, node_ref=node, start_time=start_time) + _start_heartbeat( + tracker_url, + tracker_node_id, + reg_payload, + node_ref=node, + start_time=start_time, + refresh_capability=refresh_capability, + ) return tracker_node_id except Exception as exc: setattr(node, "tracker_node_id", None) @@ -599,6 +638,7 @@ def _register_with_tracker( reg_payload, node_ref=node, start_time=start_time, + refresh_capability=refresh_capability, ) return None @@ -748,6 +788,54 @@ def _admit_capability( return report +def _capability_refresher( + node: Any, + *, + manifest: RecipeManifest, + recipe: Recipe, + detected_device: str, + cache_dir: Path | None, + force_cpu: bool, + validator: CapabilityValidator | None = None, +) -> Callable[[dict], dict | None]: + """A fresh proof for what the node serves *now*, run at re-registration time. + + The startup proof ages past the tracker's freshness budget, and directives + can move the node to a shard the startup proof never covered — so every + re-registration re-proves against the currently loaded backend rather than + replaying the report captured at boot. + """ + def refresh(payload: dict) -> dict | None: + target_model = payload.get("hf_repo") or payload.get("model") + backend = None + accessor = getattr(node, "backend_for", None) + if callable(accessor) and target_model: + backend = accessor(str(target_model)) + if backend is None: + backend = getattr(node, "backend", None) + if backend is None: + return None + context = CapabilityContext( + backend=backend, + selection=DoctorSelection( + model_id=str(getattr(backend, "model_id", target_model)), + shard_start=int(getattr(backend, "shard_start", 0) or 0), + shard_end=int(getattr(backend, "shard_end", 0) or 0), + quantization=str(getattr(backend, "quantization", None) or "auto"), + cache_dir=cache_dir, + force_cpu=force_cpu, + ), + recipe=recipe, + manifest=manifest, + device=_capability_device(backend, detected_device), + ) + report = (validator or probe_capability)(context) + setattr(node, "capability_report", report) + return report.to_dict() + + return refresh + + def run_startup( tracker_url: str, port: int = 0, @@ -1079,6 +1167,15 @@ def run_startup( } tracker_node_id = _register_with_tracker( tracker_url, reg_payload, node, _node_start_time, + refresh_capability=_capability_refresher( + node, + manifest=manifest, + recipe=recipe, + detected_device=device, + cache_dir=cache_dir, + force_cpu=force_cpu, + validator=capability_validator, + ), ) print( @@ -1268,6 +1365,15 @@ def run_startup( } tracker_node_id = _register_with_tracker( tracker_url, auto_reg_payload, node, _node_start_time, + refresh_capability=_capability_refresher( + node, + manifest=manifest, + recipe=recipe, + detected_device=device, + cache_dir=cache_dir, + force_cpu=force_cpu, + validator=capability_validator, + ), ) shard_label = _format_shard_label( proof_shard.start, @@ -1477,6 +1583,15 @@ def run_startup( } tracker_node_id = _register_with_tracker( tracker_url, reg_payload, node, _node_start_time, + refresh_capability=_capability_refresher( + node, + manifest=manifest, + recipe=recipe, + detected_device=device, + cache_dir=cache_dir, + force_cpu=force_cpu, + validator=capability_validator, + ), ) print( f"\n{'=' * 32}\n" @@ -1564,7 +1679,22 @@ def run_startup( ) node_id = str(reg_resp["node_id"]) setattr(node, "tracker_node_id", node_id) - _start_heartbeat(tracker_url, node_id, reg_payload, node_ref=node, start_time=_node_start_time) + _start_heartbeat( + tracker_url, + node_id, + reg_payload, + node_ref=node, + start_time=_node_start_time, + refresh_capability=_capability_refresher( + node, + manifest=manifest, + recipe=recipe, + detected_device=device, + cache_dir=shard_path, + force_cpu=force_cpu, + validator=capability_validator, + ), + ) except Exception: node.stop() raise diff --git a/packages/node/meshnet_node/torch_server.py b/packages/node/meshnet_node/torch_server.py index 7bbabac..d464561 100644 --- a/packages/node/meshnet_node/torch_server.py +++ b/packages/node/meshnet_node/torch_server.py @@ -1543,8 +1543,32 @@ class TorchNodeServer: def loaded_model_ids(self) -> list[str]: return list(self._backends.keys()) + def backend_for(self, model_id: str) -> TorchModelShard | None: + """The loaded backend serving `model_id` — full repo id or short name.""" + backend = self._backends.get(model_id) + if backend is not None: + return backend + short = model_id.split("/")[-1].lower() + for key, candidate in self._backends.items(): + if key.split("/")[-1].lower() == short: + return candidate + return None + def apply_tracker_directives(self, directives: list[dict]) -> dict | None: """Apply tracker shard directives (LOAD_SHARD replace, ADD_SHARD load-more).""" + drop_all_directive = next( + (directive for directive in reversed(directives) if directive.get("action") == "DROP_ALL_SHARDS"), + None, + ) + if drop_all_directive is not None: + self._backends.clear() + self._backend = None + self._tracker_mode = False + if self._server is not None: + self._server.backends = {} + self._server.backend = None + self._server.tracker_mode = False + return {"action": "DROP_ALL_SHARDS"} drop_directive = next( (directive for directive in reversed(directives) if directive.get("action") == "DROP_SHARD"), None, diff --git a/packages/tracker/meshnet_tracker/dashboard.html b/packages/tracker/meshnet_tracker/dashboard.html index bbddc6c..0984262 100644 --- a/packages/tracker/meshnet_tracker/dashboard.html +++ b/packages/tracker/meshnet_tracker/dashboard.html @@ -44,12 +44,15 @@ .empty { color:var(--dim); font-style:italic; } .pill { display:inline-block; padding:0 7px; border-radius:9px; border:1px solid var(--border); font-size:11px; } - input, button { font:inherit; color:var(--fg); background:var(--bg); + input, button, select { font:inherit; color:var(--fg); background:var(--bg); border:1px solid var(--border); border-radius:6px; padding:5px 8px; } input { width:100%; margin-bottom:6px; } button { cursor:pointer; color:var(--accent); } button:hover { border-color:var(--accent); } button.small { font-size:11px; padding:1px 7px; } + dialog { color:var(--fg); background:var(--panel); border:1px solid var(--border); border-radius:8px; min-width:min(420px,calc(100vw - 32px)); } + dialog::backdrop { background:rgba(0,0,0,.55); } + .placement-dialog-actions { display:flex; justify-content:flex-end; gap:8px; margin-top:12px; } .form-row { display:flex; gap:8px; } .form-row button { white-space:nowrap; } .error-msg { color:var(--bad); font-size:12px; min-height:16px; } @@ -212,7 +215,7 @@ .chat-compose button:disabled { opacity:.45; cursor:not-allowed; } .console { background:var(--bg); border:1px solid var(--border); border-radius:6px; - min-height:160px; max-height:280px; overflow:auto; padding:7px 9px; + min-height:160px; max-height:520px; overflow-y:auto; overflow-x:auto; padding:7px 9px; white-space:pre-wrap; word-break:break-word; font-size:11px; } .console-line { padding:1px 0; border-bottom:1px solid #161b22; } @@ -296,6 +299,7 @@

Settlement history

admin login required

Tracker hive

loading…

Model placement

Choose a model to load or release.
admin login required
+

Total node pool

admin login required

All accounts (admin)

Strikes / bans / forfeitures

admin login required

Client balances

admin login required
@@ -323,6 +327,16 @@
no test output yet
+ +
+
+ + + + +
+
+