Efremenko Arhip
3a1461315f
Let a signed-in user turn their own machine into a worker without the shared token. The coordinator already binds a JWT-authenticated registration to owner_id as untrusted; this adds the missing pieces. userservice: long-lived worker keys (scimesh_wk_live_*, hash-at-rest) with create/list/revoke and a public /worker-tokens/exchange that trades a key for a short-lived JWT carrying the owner current role/verified. python worker: SCIMESH_WORKER_KEY + SCIMESH_USERSERVICE_URL; a token provider exchanges the key and refreshes the JWT proactively and on 401, so a long-running worker survives token expiry. Static bearer token path is unchanged. coordinator UI: an "add your machine" page that mints a key and shows a ready-to-run command, proxying key management to the userservice; the dashboard gains an owner-scoped "my machines" section. docs: how to run a worker from your account, plus the untrusted/quorum/ verified trust model.
105 lines
3.7 KiB
Python
105 lines
3.7 KiB
Python
"""Console entry point for ``scimesh-worker``."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import argparse
|
|
import logging
|
|
from pathlib import Path
|
|
|
|
from .artifacts import HttpArtifactClient
|
|
from .auth import provider_from_config
|
|
from .config import WorkerConfig
|
|
from .coordinator import HttpCoordinatorClient
|
|
from .daemon import WorkerDaemon
|
|
from .runners import SciMeshRunner
|
|
|
|
|
|
def build_parser() -> argparse.ArgumentParser:
|
|
"""Build the worker CLI parser for command-line use and focused tests."""
|
|
parser = argparse.ArgumentParser(
|
|
prog="scimesh-worker",
|
|
epilog=(
|
|
"Environment: SCIMESH_COORDINATOR_URL, SCIMESH_WORK_DIR, "
|
|
"SCIMESH_WORKER_NAME, SCIMESH_CPU_COUNT, SCIMESH_MEMORY_MB, "
|
|
"SCIMESH_POLL_INTERVAL, SCIMESH_REQUEST_TIMEOUT, "
|
|
"SCIMESH_HEARTBEAT_INTERVAL, SCIMESH_CLEANUP_AFTER_SECONDS, "
|
|
"SCIMESH_MAX_TASKS, SCIMESH_BEARER_TOKEN, SCIMESH_WORKER_KEY, and "
|
|
"SCIMESH_USERSERVICE_URL. SCIMESH_WORKER_ID is a legacy/test override."
|
|
),
|
|
)
|
|
parser.add_argument("--coordinator-url")
|
|
parser.add_argument("--worker-id")
|
|
parser.add_argument("--work-dir")
|
|
parser.add_argument("--worker-name")
|
|
parser.add_argument(
|
|
"--worker-key",
|
|
help="Long-lived worker key from the web UI; the worker exchanges it for "
|
|
"short-lived tokens, binding it to your account. Requires --userservice-url.",
|
|
)
|
|
parser.add_argument(
|
|
"--userservice-url",
|
|
help="Base URL of the userservice that issues tokens for --worker-key",
|
|
)
|
|
parser.add_argument("--cpu-count", type=int)
|
|
parser.add_argument("--memory-mb", type=int)
|
|
parser.add_argument("--poll-interval", type=float)
|
|
parser.add_argument("--request-timeout", type=float)
|
|
parser.add_argument("--heartbeat-interval", type=float)
|
|
parser.add_argument("--cleanup-after-seconds", type=float)
|
|
lifecycle = parser.add_mutually_exclusive_group()
|
|
lifecycle.add_argument(
|
|
"--once",
|
|
action="store_true",
|
|
help="Claim at most one task, then exit; exit immediately when the queue is empty",
|
|
)
|
|
lifecycle.add_argument(
|
|
"--max-tasks",
|
|
type=int,
|
|
help="Process this many claimed tasks, then exit",
|
|
)
|
|
return parser
|
|
|
|
|
|
def main(argv: list[str] | None = None) -> int:
|
|
parser = build_parser()
|
|
args = parser.parse_args(argv)
|
|
overrides = {
|
|
key: value
|
|
for key, value in vars(args).items()
|
|
if value is not None and key != "once"
|
|
}
|
|
if args.once:
|
|
overrides["max_tasks"] = 1
|
|
overrides["exit_when_idle"] = True
|
|
if "work_dir" in overrides:
|
|
overrides["work_dir"] = Path(overrides["work_dir"])
|
|
try:
|
|
config = WorkerConfig.from_environment(overrides)
|
|
except (TypeError, ValueError) as error:
|
|
parser.error(str(error))
|
|
logging.basicConfig(level=logging.INFO, format="%(asctime)s %(levelname)s %(message)s")
|
|
# One shared token strategy backs both clients: a worker key (exchanged and
|
|
# refreshed) or a static bearer token, decided by what the config carries.
|
|
tokens = provider_from_config(
|
|
worker_key=config.worker_key,
|
|
userservice_url=config.userservice_url,
|
|
bearer_token=config.bearer_token,
|
|
request_timeout=config.request_timeout,
|
|
)
|
|
client = HttpCoordinatorClient(
|
|
config.coordinator_url, config.request_timeout, token_provider=tokens
|
|
)
|
|
completed_without_interruption = WorkerDaemon(
|
|
config,
|
|
client,
|
|
HttpArtifactClient(
|
|
config.coordinator_url, config.request_timeout, token_provider=tokens
|
|
),
|
|
SciMeshRunner(),
|
|
).run_forever()
|
|
return 0 if completed_without_interruption else 130
|
|
|
|
|
|
if __name__ == "__main__":
|
|
raise SystemExit(main())
|