refactor: composition root in lifespan, break core↔services cycle, shared data layer
The gateway was the composition root, device registry, inbound-call policy, and call-operations service in one class, with core↔services circular imports papered over by function-local imports, wiring done by assigning private attributes, and MCP tools duplicating REST query logic against their own sessions. Composition: - main.py's lifespan now builds every service and wires them by constructor/registration. gateway.from_config() is gone; core/ no longer imports services/ anywhere — the cycle is dead. - Inbound-call policy moved to ReceptionistService.on_inbound_call (routing evaluation, reject/answer, screening dispatch); wired as the engine's on_incoming_call by the lifespan. Receptionist deps (tts/transcription/recording/routing) are constructor-injected — no more gateway._tts reach-through or importing hold_slayer's private _get_llm (now services.llm_client.get_llm, shared). - Hold-slayer launch goes through a mode-handler registry (register_mode_handler); the gateway no longer knows the service's type. CallManager takes on_call_ended in its constructor. - build_sip_engine() is a pure function taking explicit callbacks. - api/routing.py uses the routing service from app.state via a proper dependency instead of gateway._routing. Shared data layer: - db.session_scope() is the one session convention (get_db wraps it). - services/call_persistence.py gains the query/write functions and the single StoredCallFlow→CallFlow mapper; api/call_flows.py, api/call_history.py, and the six DB-touching MCP tools are thin wrappers over them — the two surfaces can't drift. - legs_for_call() replaces the three private _call_legs scans (gateway transfer/hangup, REST dtmf, MCP dtmf). 7 new tests (mode-handler launch, on_call_ended hook, receptionist inbound answer/reject, call-flow CRUD round-trip and history routes against real SQLite through the shared layer). aiosqlite added to dev deps for that. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -6,7 +6,7 @@ from fastapi import APIRouter, Depends, HTTPException
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from api.deps import get_gateway
|
||||
from api.deps import get_gateway, get_routing_service
|
||||
from core.gateway import AIPSTNGateway
|
||||
from db.database import Device as DeviceDB
|
||||
from db.database import get_db
|
||||
@@ -15,36 +15,31 @@ from models.routing import (
|
||||
RoutingRuleCreate,
|
||||
RoutingRuleUpdate,
|
||||
)
|
||||
from services.routing import RoutingService
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
@router.get("/rules", response_model=list[RoutingRule])
|
||||
async def list_rules(gateway: AIPSTNGateway = Depends(get_gateway)):
|
||||
if gateway._routing is None:
|
||||
raise HTTPException(status_code=503, detail="Routing service not ready")
|
||||
return sorted(gateway._routing.rules, key=lambda r: (r.priority, r.id))
|
||||
async def list_rules(routing: RoutingService = Depends(get_routing_service)):
|
||||
return sorted(routing.rules, key=lambda r: (r.priority, r.id))
|
||||
|
||||
|
||||
@router.post("/rules", response_model=RoutingRule, status_code=201)
|
||||
async def create_rule(
|
||||
payload: RoutingRuleCreate,
|
||||
gateway: AIPSTNGateway = Depends(get_gateway),
|
||||
routing: RoutingService = Depends(get_routing_service),
|
||||
):
|
||||
if gateway._routing is None:
|
||||
raise HTTPException(status_code=503, detail="Routing service not ready")
|
||||
return await gateway._routing.create_rule(payload)
|
||||
return await routing.create_rule(payload)
|
||||
|
||||
|
||||
@router.put("/rules/{rule_id}", response_model=RoutingRule)
|
||||
async def update_rule(
|
||||
rule_id: str,
|
||||
payload: RoutingRuleUpdate,
|
||||
gateway: AIPSTNGateway = Depends(get_gateway),
|
||||
routing: RoutingService = Depends(get_routing_service),
|
||||
):
|
||||
if gateway._routing is None:
|
||||
raise HTTPException(status_code=503, detail="Routing service not ready")
|
||||
rule = await gateway._routing.update_rule(rule_id, payload)
|
||||
rule = await routing.update_rule(rule_id, payload)
|
||||
if rule is None:
|
||||
raise HTTPException(status_code=404, detail=f"Rule {rule_id} not found")
|
||||
return rule
|
||||
@@ -53,11 +48,9 @@ async def update_rule(
|
||||
@router.delete("/rules/{rule_id}")
|
||||
async def delete_rule(
|
||||
rule_id: str,
|
||||
gateway: AIPSTNGateway = Depends(get_gateway),
|
||||
routing: RoutingService = Depends(get_routing_service),
|
||||
):
|
||||
if gateway._routing is None:
|
||||
raise HTTPException(status_code=503, detail="Routing service not ready")
|
||||
ok = await gateway._routing.delete_rule(rule_id)
|
||||
ok = await routing.delete_rule(rule_id)
|
||||
if not ok:
|
||||
raise HTTPException(status_code=404, detail=f"Rule {rule_id} not found")
|
||||
return {"status": "deleted", "rule_id": rule_id}
|
||||
|
||||
Reference in New Issue
Block a user