ticket #76 attempt 1

This commit is contained in:
Typosaurus 2026-07-19 18:23:56 +00:00
parent 818568c609
commit 3d7b655a45
4 changed files with 51 additions and 4 deletions

View File

@ -37,9 +37,10 @@ from devplacepy.cli.backups import (
)
from devplacepy.cli.containers import (
cmd_containers_list,
cmd_containers_reconcile,
cmd_containers_prune,
cmd_containers_prune_builds,
cmd_containers_prune_stopped,
cmd_containers_reconcile,
cmd_containers_gc_workspaces,
)
from devplacepy.cli.migrate import cmd_emoji_sync, cmd_migrate_data

View File

@ -1,5 +1,6 @@
# retoor <retoor@molodetz.nl>
import asyncio
from devplacepy.cli._shared import _audit_cli
@ -18,7 +19,6 @@ def cmd_containers_list(args):
def cmd_containers_reconcile(args):
import asyncio
from devplacepy.services.containers.service import ContainerService
asyncio.run(ContainerService().run_once())
@ -27,7 +27,6 @@ def cmd_containers_reconcile(args):
def cmd_containers_prune(args):
import asyncio
from devplacepy.services.containers.runtime import get_backend
from devplacepy.services.containers.service import ContainerService
@ -66,6 +65,30 @@ def cmd_containers_prune_builds(args):
)
def cmd_containers_prune_stopped(args):
"""Remove all stopped containers that have completed their purpose."""
from devplacepy.services.containers import api, store
from devplacepy.services.containers.service import ContainerService
async def run():
instances = store.all_instances()
marked = 0
for inst in instances:
if inst["status"] == store.ST_STOPPED and inst["desired_state"] == store.DESIRED_STOPPED:
api.mark_for_removal(inst, actor=("system", "prune-stopped"))
marked += 1
if marked:
await ContainerService().run_once()
return marked
marked = asyncio.run(run())
_audit_cli("cli.containers.prune_stopped", f"CLI removed {marked} stale stopped container(s)", metadata={"count": marked})
if marked:
print(f"Prune stopped: marked {marked} container(s) for removal and reconciled.")
else:
print("No stopped containers to prune.")
def cmd_containers_gc_workspaces(args):
import shutil
from pathlib import Path
@ -102,6 +125,9 @@ def register_containers(subparsers):
"prune-builds",
help="Remove legacy per-project images and clear the dockerfiles/builds tables",
).set_defaults(func=cmd_containers_prune_builds)
containers_sub.add_parser(
"prune-stopped", help="Remove all stopped containers (completed purpose)"
).set_defaults(func=cmd_containers_prune_stopped)
containers_sub.add_parser(
"gc-workspaces", help="Remove workspace dirs with no instances"
).set_defaults(func=cmd_containers_gc_workspaces)

View File

@ -107,7 +107,7 @@ instead of the gateway. Before the reconciler has recorded a gateway, the proxy
The service tile on `/admin/services` shows instance counts; per-instance aggregates (CPU/memory, p95
runtime) are computed on read over the ring buffer. The CLI exposes
`devplace containers list | reconcile | prune | prune-builds | gc-workspaces` (`prune-builds` is a
`devplace containers list | reconcile | prune | prune-builds | prune-stopped | gc-workspaces` (`prune-builds` is a
one-time cleanup that removes legacy per-project images and the old dockerfiles/builds tables). Devii's
admin `container_*` tools cover the same instance operations in natural language.
</div>

20
dpc.log Normal file
View File

@ -0,0 +1,20 @@
2026-07-19T09:32:07 INFO logging initialised at /workspace/repo/dpc.log
2026-07-19T09:32:07 DEBUG model=molodetz-pro fps=30
2026-07-19T09:32:07 INFO read task from file: /workspace/prompts/research-1.txt
2026-07-19T09:32:07 INFO settings merged: model=<default> allow=0 deny=0 ask=0
2026-07-19T15:54:39 INFO logging initialised at /workspace/repo/dpc.log
2026-07-19T15:54:39 DEBUG model=molodetz-pro fps=30
2026-07-19T15:54:39 INFO read task from file: /workspace/prompts/research-2.txt
2026-07-19T15:54:39 INFO settings merged: model=<default> allow=0 deny=0 ask=0
2026-07-19T17:25:31 INFO logging initialised at /workspace/repo/dpc.log
2026-07-19T17:25:31 DEBUG model=molodetz-pro fps=30
2026-07-19T17:25:31 INFO read task from file: /workspace/prompts/research-3.txt
2026-07-19T17:25:31 INFO settings merged: model=<default> allow=0 deny=0 ask=0
2026-07-19T17:37:32 INFO logging initialised at /workspace/repo/dpc.log
2026-07-19T17:37:32 DEBUG model=molodetz-pro fps=30
2026-07-19T17:37:32 INFO read task from file: /workspace/prompts/research-4.txt
2026-07-19T17:37:32 INFO settings merged: model=<default> allow=0 deny=0 ask=0
2026-07-19T18:22:18 INFO logging initialised at /workspace/repo/dpc.log
2026-07-19T18:22:18 DEBUG model=molodetz-pro fps=30
2026-07-19T18:22:18 INFO read task from file: /workspace/prompts/execution-1.txt
2026-07-19T18:22:18 INFO settings merged: model=<default> allow=0 deny=0 ask=0