refactor(supervise): make Supervisor a service class the orchestrator calls
tracker-policy-pr / check-pr (pull_request) Successful in 12s
test / integration-docker (pull_request) Successful in 19s
lint / lint (push) Failing after 55s
test / unit (pull_request) Successful in 2m8s
test / integration-firecracker (pull_request) Successful in 3m25s
test / coverage (pull_request) Successful in 39s
test / publish-infra (pull_request) Has been skipped
tracker-policy-pr / check-pr (pull_request) Successful in 12s
test / integration-docker (pull_request) Successful in 19s
lint / lint (push) Failing after 55s
test / unit (pull_request) Successful in 2m8s
test / integration-firecracker (pull_request) Successful in 3m25s
test / coverage (pull_request) Successful in 39s
test / publish-infra (pull_request) Has been skipped
Turn the loose queue/audit functions in orchestrator/supervisor/queue.py into
methods on a concrete Supervisor service. The Orchestrator now owns an
injectable `self._supervisor` and calls `self._supervisor.write_proposal(...)`
etc., instead of module-level free functions — the supervise dependency is
explicit and mockable, and a Supervisor can be scoped to a `db_path` (defaults
to the host DB) so tests can point it at a temp database.
- Supervisor (in the package __init__) drops the ABC and gains write_proposal,
read_proposal, list_pending_proposals, list_all_pending_proposals,
write_response, read_response, archive_all_proposals, write_audit_entry,
read_audit_entries, plus the launch-time prepare().
- render_diff / sha256_hex are pure and stateless, so they move to
orchestrator/supervisor/util.py (re-exported from the facade) rather than
becoming methods.
- queue.py is deleted; service.py + the supervise tests call through a
Supervisor instance.
Full unit suite green (2243).
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -20,9 +20,8 @@ from bot_bottle.orchestrator.supervisor import (
|
||||
Proposal,
|
||||
STATUS_APPROVED,
|
||||
TOOL_EGRESS_ALLOW,
|
||||
read_response,
|
||||
sha256_hex,
|
||||
write_proposal,
|
||||
Supervisor,
|
||||
)
|
||||
|
||||
|
||||
@@ -185,7 +184,7 @@ class TestOrchestratorSupervise(unittest.TestCase):
|
||||
p = Proposal.new(
|
||||
bottle_slug=slug, tool=TOOL_EGRESS_ALLOW, proposed_file=proposed,
|
||||
justification="need it", current_file_hash=sha256_hex(proposed))
|
||||
write_proposal(p)
|
||||
Supervisor().write_proposal(p)
|
||||
return p.id
|
||||
|
||||
def test_pending_lists_queued_proposal(self) -> None:
|
||||
@@ -208,7 +207,7 @@ class TestOrchestratorSupervise(unittest.TestCase):
|
||||
assert rec is not None
|
||||
self.assertEqual(new_routes, rec.policy)
|
||||
# response written -> agent unblocks, proposal no longer pending
|
||||
self.assertEqual(STATUS_APPROVED, read_response("demo", pid).status)
|
||||
self.assertEqual(STATUS_APPROVED, Supervisor().read_response("demo", pid).status)
|
||||
self.assertEqual([], self.orch.supervise_pending())
|
||||
|
||||
def test_pending_carries_human_label(self) -> None:
|
||||
@@ -261,7 +260,7 @@ class TestOrchestratorSupervise(unittest.TestCase):
|
||||
rec = self.store.get(bottle_id)
|
||||
assert rec is not None
|
||||
self.assertEqual("routes:\n - host: existing.com\n", rec.policy)
|
||||
self.assertEqual("rejected", read_response("demo", pid).status)
|
||||
self.assertEqual("rejected", Supervisor().read_response("demo", pid).status)
|
||||
|
||||
def test_unknown_proposal_is_error(self) -> None:
|
||||
ok, err = self.orch.supervise_respond(
|
||||
|
||||
Reference in New Issue
Block a user