wild-cloud/wild-pc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Run python services in place via uv run

Browse Source 
A python-runner service ran from a tool venv (uv tool install --editable),
separate from the project venv that uv sync manages. The editable link kept
source live, but dependencies were resolved independently in each venv, so a
new dependency landed in the project venv and never reached the running
service — leaving no clean rollout for it.

Deploy now emits ExecStart=uv run --project <source> --no-dev <program>,
running the service in place from its own project venv. uv run syncs the env
to the lockfile before launching, so a single restart picks up both code and
dependency changes; the ExecStart is deterministic from source and never goes
stale. The tool-venv install is gated to the command runner only; uv tool
install is reserved for tool-behavior programs, where PATH is the point. A
python service with no resolvable source falls back to a PATH lookup.
This commit is contained in:
Paul Payne
2026-06-17 11:03:11 -07:00
parent cd0a3bc9e2
commit 26a00c4073
3 changed files with 112 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
core/src/castle_core/deploy.py
View File

@@ -200,11 +200,15 @@ def _build_deployed_service(
env = dict(svc.defaults.env) if (svc.defaults and svc.defaults.env) else {}
env = resolve_env_vars(env, _env_context(name, config_key, port))
# Ensure python tool is installed before resolving binary
_ensure_python_tool(config, svc.program, messages)
# `command`-runner services resolve a tool on PATH → ensure it's installed.
# `python`-runner services run in place via `uv run` (below) — no tool venv.
if run.runner == "command":
_ensure_python_tool(config, svc.program, messages)
# Build run_cmd
run_cmd = _build_run_cmd(name, run, env, messages)
run_cmd = _build_run_cmd(
name, run, env, messages, _program_source_dir(config, svc.program)
)
# Proxy: a path prefix (handle_path on the gateway) and/or a hostname (a
# dedicated host site block, so a root-based app serves unchanged).
@@ -253,8 +257,11 @@ def _build_deployed_job(
config_key = job.program or name
env = dict(job.defaults.env) if (job.defaults and job.defaults.env) else {}
env = resolve_env_vars(env, _env_context(name, config_key, None))
_ensure_python_tool(config, job.program, messages)
run_cmd = _build_run_cmd(name, run, env, messages)
if run.runner == "command":
_ensure_python_tool(config, job.program, messages)
run_cmd = _build_run_cmd(
name, run, env, messages, _program_source_dir(config, job.program)
)
stack = None
if job.program and job.program in config.programs:
@@ -293,10 +300,25 @@ def _python_tool_needs_install(program: str) -> bool:
return False
def _program_source_dir(config: CastleConfig, program: str | None) -> Path | None:
"""The absolute source dir of a referenced program, if any.
`load_config` has already resolved `source` to an absolute path (repo: and
relative forms included), so this is a plain lookup."""
if program and program in config.programs:
src = config.programs[program].source
if src:
return Path(src)
return None
def _ensure_python_tool(
config: CastleConfig, program: str | None, messages: list[str]
) -> None:
"""Ensure a Python program's editable install is current."""
"""Ensure a Python program's editable install is current.
Only the `command` runner needs this — it resolves a tool on PATH. The
`python` runner runs in place via `uv run` and never touches a tool venv."""
if not program or program not in config.programs:
return
comp = config.programs[program]
@@ -323,17 +345,33 @@ def _ensure_python_tool(
messages.append(f"Installed {program}")
def _build_run_cmd(name: str, run: object, env: dict[str, str], messages: list[str]) -> list[str]:
def _build_run_cmd(
name: str,
run: object,
env: dict[str, str],
messages: list[str],
source_dir: Path | None = None,
) -> list[str]:
"""Build a run command list from a RunSpec."""
match run.runner: # type: ignore[union-attr]
case "python":
resolved = shutil.which(run.program) # type: ignore[union-attr]
if not resolved:
messages.append(
f"Warning: '{run.program}' not on PATH. " # type: ignore[union-attr]
f"Install with: uv tool install --editable <source>"
)
cmd = [resolved or run.program] # type: ignore[union-attr]
# Run the program in place from its own project venv via `uv run`,
# which syncs the env to the lockfile before launching. One venv per
# program (no separate tool venv); restart picks up both code and
# dependency changes. Falls back to a PATH lookup only when there's no
# resolvable source (a service that declares run.program without a
# catalog program).
if source_dir and source_dir.is_dir():
uv = shutil.which("uv") or "uv"
cmd = [uv, "run", "--project", str(source_dir), "--no-dev", run.program] # type: ignore[union-attr]
else:
resolved = shutil.which(run.program) # type: ignore[union-attr]
if not resolved:
messages.append(
f"Warning: '{run.program}' has no source dir and is not on " # type: ignore[union-attr]
f"PATH. Declare a program source, or install it."
)
cmd = [resolved or run.program] # type: ignore[union-attr]
if run.args: # type: ignore[union-attr]
cmd.extend(run.args) # type: ignore[union-attr]
return cmd