Skip to content

Self-improving AI Employees for everyone

refactor(plugins): migrate 54 container imports to services.plugin.deps (Wave 11.I, W1)

trohitg58a8f511dd8b
diff --git a/server/nodes/README.md b/server/nodes/README.md
index b04b547b..7bac8e19 100644
--- a/server/nodes/README.md
+++ b/server/nodes/README.md
@@ -296,8 +296,11 @@ Full reference: [docs-internal/plugin_system.md → "Self-contained plugin folde
- **Don't edit `server/nodes/__init__.py`** — it's a pure auto-discovery
walker. Adding a new folder doesn't need edits either; `pkgutil` finds
subpackages automatically.
-- **Don't instantiate services directly.** Use
- `from core.container import container; svc = container.X()`.
+- **Don't instantiate services directly.** Use the canonical lazy
+ helpers in `services.plugin.deps`:
+ `from services.plugin.deps import get_auth_service, get_database, get_cache, get_ai_service, get_text_service, get_maps_service, get_android_service`.
+ These resolve the singleton from the DI container at call time
+ (test monkeypatching depends on call-time lookup — never memoise).
- **Don't call `auth_service.get_api_key(...)` from plugins.** Declare
a `Credential` subclass; the `Connection` facade / service layer
resolves tokens.
diff --git a/server/nodes/agent/_specialized.py b/server/nodes/agent/_specialized.py
index 89625cf2..ed6e7328 100644
--- a/server/nodes/agent/_specialized.py
+++ b/server/nodes/agent/_specialized.py
@@ -110,12 +110,12 @@ class SpecializedAgentBase(ActionNode, abstract=True):
pre-dispatch flow. Team-lead teammate injection happens inside
``prepare_agent_call`` based on ``self.type``.
"""
- from core.container import container
+ from services.plugin.deps import get_ai_service, get_database
from ._inline import prepare_agent_call
- ai_service = container.ai_service()
- database = container.database()
+ ai_service = get_ai_service()
+ database = get_database()
kwargs = await prepare_agent_call(
node_id=ctx.node_id, node_type=self.type,
parameters=params.model_dump(),
diff --git a/server/nodes/agent/ai_agent.py b/server/nodes/agent/ai_agent.py
index 1ffe7dfa..3c8dd358 100644
--- a/server/nodes/agent/ai_agent.py
+++ b/server/nodes/agent/ai_agent.py
@@ -120,12 +120,12 @@ class AIAgentNode(ActionNode):
underlying LangGraph orchestration + tool binding + memory
I/O + streaming hooks stay in AIService.
"""
- from core.container import container
+ from services.plugin.deps import get_ai_service, get_database
from ._inline import prepare_agent_call
- ai_service = container.ai_service()
- database = container.database()
+ ai_service = get_ai_service()
+ database = get_database()
kwargs = await prepare_agent_call(
node_id=ctx.node_id, node_type=self.type,
parameters=params.model_dump(),
diff --git a/server/nodes/agent/chat_agent.py b/server/nodes/agent/chat_agent.py
index a28f9a84..92200a67 100644
--- a/server/nodes/agent/chat_agent.py
+++ b/server/nodes/agent/chat_agent.py
@@ -103,12 +103,12 @@ class ChatAgentNode(ActionNode):
@Operation("execute", cost={"service": "chat_agent", "action": "run", "count": 1})
async def execute_op(self, ctx: NodeContext, params: ChatAgentParams) -> Any:
"""Inlined from handlers/ai.handle_chat_agent (Wave 11.D.6)."""
- from core.container import container
+ from services.plugin.deps import get_ai_service, get_database
from ._inline import prepare_agent_call
- ai_service = container.ai_service()
- database = container.database()
+ ai_service = get_ai_service()
+ database = get_database()
kwargs = await prepare_agent_call(
node_id=ctx.node_id, node_type=self.type,
parameters=params.model_dump(),
diff --git a/server/nodes/agent/claude_code_agent.py b/server/nodes/agent/claude_code_agent.py
index f5ff3335..33c26f28 100644
--- a/server/nodes/agent/claude_code_agent.py
+++ b/server/nodes/agent/claude_code_agent.py
@@ -133,9 +133,9 @@ class ClaudeCodeAgentNode(ActionNode):
async def execute_op(
self, ctx: NodeContext, params: ClaudeCodeAgentParams,
) -> Any:
- from core.container import container
from services.cli_agent.service import get_ai_cli_service
from services.cli_agent.types import session_result_to_model
+ from services.plugin.deps import get_database
from services.status_broadcaster import get_status_broadcaster
start_time = time.time()
@@ -154,7 +154,7 @@ class ClaudeCodeAgentNode(ActionNode):
# This must run BEFORE prompt resolution so the auto-fallback can
# read from `input_data` exactly the way `nodes/agent/_inline.py`
# does for the standard agent path.
- database = container.database()
+ database = get_database()
_, skill_data, tool_data, input_data, _ = await collect_agent_connections(
node_id, ctx.raw, database, log_prefix="[Claude Code]",
)
diff --git a/server/nodes/agent/codex_agent.py b/server/nodes/agent/codex_agent.py
index 7d17c888..359c90c0 100644
--- a/server/nodes/agent/codex_agent.py
+++ b/server/nodes/agent/codex_agent.py
@@ -102,9 +102,9 @@ class CodexAgentNode(ActionNode):
async def execute_op(
self, ctx: NodeContext, params: CodexAgentParams,
) -> Any:
- from core.container import container
from services.cli_agent.service import get_ai_cli_service
from services.cli_agent.types import session_result_to_model
+ from services.plugin.deps import get_database
from services.status_broadcaster import get_status_broadcaster
start_time = time.time()
@@ -144,7 +144,7 @@ class CodexAgentNode(ActionNode):
if changed:
tasks[i] = t.model_copy(update=changed)
- database = container.database()
+ database = get_database()
_, skill_data, _, _, _ = await collect_agent_connections(
node_id, ctx.raw, database,
)
diff --git a/server/nodes/agent/deep_agent.py b/server/nodes/agent/deep_agent.py
index 1809a5f6..4943849e 100644
--- a/server/nodes/agent/deep_agent.py
+++ b/server/nodes/agent/deep_agent.py
@@ -39,11 +39,11 @@ class DeepAgentNode(ActionNode):
@Operation("execute", cost={"service": "deep_agent", "action": "run", "count": 1})
async def execute_op(self, ctx: NodeContext, params: SpecializedAgentParams) -> Any:
- from core.container import container
+ from services.plugin.deps import get_ai_service, get_database
from services.status_broadcaster import get_status_broadcaster
- ai_service = container.ai_service()
- database = container.database()
+ ai_service = get_ai_service()
+ database = get_database()
node_id = ctx.node_id
workflow_id = ctx.workflow_id
payload = params.model_dump()
diff --git a/server/nodes/agent/rlm_agent.py b/server/nodes/agent/rlm_agent.py
index 4a22fc0e..4052d6b1 100644
--- a/server/nodes/agent/rlm_agent.py
+++ b/server/nodes/agent/rlm_agent.py
@@ -38,11 +38,11 @@ class RLMAgentNode(ActionNode):
@Operation("execute", cost={"service": "rlm_agent", "action": "run", "count": 1})
async def execute_op(self, ctx: NodeContext, params: SpecializedAgentParams) -> Any:
- from core.container import container
+ from services.plugin.deps import get_ai_service, get_database
from services.status_broadcaster import get_status_broadcaster
- ai_service = container.ai_service()
- database = container.database()
+ ai_service = get_ai_service()
+ database = get_database()
node_id = ctx.node_id
workflow_id = ctx.workflow_id
payload = params.model_dump()
diff --git a/server/nodes/android/_base.py b/server/nodes/android/_base.py
index 81ede6a6..c38441bb 100644
--- a/server/nodes/android/_base.py
+++ b/server/nodes/android/_base.py
@@ -110,9 +110,9 @@ class AndroidServiceBase(ActionNode, abstract=True):
@Operation("invoke", cost={"service": "android", "action": "service_call", "count": 1})
async def invoke(self, ctx: NodeContext, params: AndroidServiceParams) -> Any:
- from core.container import container
+ from services.plugin.deps import get_android_service
- android_service = container.android_service()
+ android_service = get_android_service()
payload = params.model_dump()
# Derive service_id from the registered node type (battery etc.) —
diff --git a/server/nodes/android/_handlers.py b/server/nodes/android/_handlers.py
index f657bfbe..374b1671 100644
--- a/server/nodes/android/_handlers.py
+++ b/server/nodes/android/_handlers.py
@@ -31,18 +31,18 @@ logger = get_logger(__name__)
async def handle_get_android_devices(data: Dict[str, Any], websocket: WebSocket) -> Dict[str, Any]:
"""Get list of connected Android devices."""
- from core.container import container
+ from services.plugin.deps import get_android_service
- android_service = container.android_service()
+ android_service = get_android_service()
devices = await android_service.list_devices()
return {"devices": devices, "timestamp": time.time()}
async def handle_execute_android_action(data: Dict[str, Any], websocket: WebSocket) -> Dict[str, Any]:
"""Execute an Android service action."""
- from core.container import container
+ from services.plugin.deps import get_android_service
- android_service = container.android_service()
+ android_service = get_android_service()
broadcaster = get_status_broadcaster()
service_id, action = data["service_id"], data["action"]
node_id = data.get("node_id", f"android_{service_id}_{action}")
diff --git a/server/nodes/android/_option_loaders.py b/server/nodes/android/_option_loaders.py
index fe2915f0..77168832 100644
--- a/server/nodes/android/_option_loaders.py
+++ b/server/nodes/android/_option_loaders.py
@@ -32,9 +32,9 @@ async def load_service_actions(params: Dict[str, Any]) -> List[Dict[str, Any]]:
return []
try:
- from core.container import container
+ from services.plugin.deps import get_android_service
- android_svc = container.android_service()
+ android_svc = get_android_service()
actions = await android_svc.list_actions(service_id) # type: ignore[attr-defined]
return [
{"value": a, "label": a.replace("_", " ").title()}
diff --git a/server/nodes/android/_refresh.py b/server/nodes/android/_refresh.py
index b406cfae..171163e7 100644
--- a/server/nodes/android/_refresh.py
+++ b/server/nodes/android/_refresh.py
@@ -62,9 +62,9 @@ async def _auto_reconnect_body(broadcaster: "StatusBroadcaster", span) -> None:
return
# Look for a stored pairing session.
- from core.container import container
+ from services.plugin.deps import get_database
- database = container.database()
+ database = get_database()
session = await database.get_android_relay_session()
if not session:
span.set_attribute("path", "no_session")
diff --git a/server/nodes/android/_relay/client.py b/server/nodes/android/_relay/client.py
index fe831607..624df1bc 100644
--- a/server/nodes/android/_relay/client.py
+++ b/server/nodes/android/_relay/client.py
@@ -207,8 +207,8 @@ class RelayWebSocketClient:
async def _clear_stored_session(self):
"""Clear stored pairing session from database."""
try:
- from core.container import container
- database = container.database()
+ from services.plugin.deps import get_database
+ database = get_database()
await database.clear_android_relay_session()
logger.debug("[Relay] Cleared stored pairing session")
@@ -368,8 +368,8 @@ class RelayWebSocketClient:
async def _save_pairing_session(self):
"""Save pairing session to database for auto-reconnect."""
try:
- from core.container import container
- database = container.database()
+ from services.plugin.deps import get_database
+ database = get_database()
await database.save_android_relay_session(
relay_url=self.base_url,
diff --git a/server/nodes/android/_router.py b/server/nodes/android/_router.py
index ba39d300..558e1a6b 100644
--- a/server/nodes/android/_router.py
+++ b/server/nodes/android/_router.py
@@ -6,20 +6,12 @@ from typing import Dict, Any
from ._dispatcher import AndroidService
from core.logging import get_logger
+from services.plugin.deps import get_android_service
logger = get_logger(__name__)
router = APIRouter(prefix="/api/android", tags=["android"])
-def get_android_service() -> AndroidService:
- """FastAPI dependency: imports lazily to avoid the
- nodes/android/__init__ -> core.container -> nodes.android._dispatcher
- -> nodes.android.__init__ -> _router import cycle.
- """
- from core.container import container
- return container.android_service()
-
-
class AndroidServiceRequest(BaseModel):
"""Request model for Android service execution."""
service_id: str = Field(..., description="Android service ID (e.g., 'battery', 'network', 'app_launcher')")
diff --git a/server/nodes/email/_service.py b/server/nodes/email/_service.py
index c63a1a0b..dded6d15 100644
--- a/server/nodes/email/_service.py
+++ b/server/nodes/email/_service.py
@@ -57,8 +57,8 @@ class EmailService(ServiceSingleton):
Stored custom keys (email_imap_host, email_smtp_port, etc.) are used when
the provider is 'custom' or when a preset field is empty.
"""
- from core.container import container
- auth = container.auth_service()
+ from services.plugin.deps import get_auth_service
+ auth = get_auth_service()
provider = params.get("provider") or await auth.get_api_key("email_provider") or self.defaults.get("provider")
preset = self._provider_preset(provider)
diff --git a/server/nodes/google/_auth_helper.py b/server/nodes/google/_auth_helper.py
index 71cfd2d0..fafa9208 100644
--- a/server/nodes/google/_auth_helper.py
+++ b/server/nodes/google/_auth_helper.py
@@ -37,7 +37,7 @@ async def get_google_credentials(
Returns:
google.oauth2.credentials.Credentials ready for API use
"""
- from core.container import container
+ from services.plugin.deps import get_auth_service, get_database
account_mode = parameters.get('account_mode', 'owner')
customer_id = "owner"
@@ -47,7 +47,7 @@ async def get_google_credentials(
if not customer_id:
raise ValueError("customer_id required for customer mode")
- db = container.database()
+ db = get_database()
connection = await db.get_google_connection(customer_id)
if not connection:
raise ValueError(f"No Google connection for customer: {customer_id}")
@@ -61,7 +61,7 @@ async def get_google_credentials(
await db.update_google_last_used(customer_id)
else:
- auth_service = container.auth_service()
+ auth_service = get_auth_service()
tokens = await auth_service.get_oauth_tokens("google", customer_id="owner")
if not tokens or not tokens.get("access_token"):
@@ -75,7 +75,7 @@ async def get_google_credentials(
"google", customer_id="owner"
)
- auth_service = container.auth_service()
+ auth_service = get_auth_service()
client_id = await auth_service.get_api_key("google_client_id") or ""
client_secret = await auth_service.get_api_key("google_client_secret") or ""
diff --git a/server/nodes/google/_base.py b/server/nodes/google/_base.py
index 8180a3d4..7c6187c6 100644
--- a/server/nodes/google/_base.py
+++ b/server/nodes/google/_base.py
@@ -59,12 +59,12 @@ async def track_google_usage(
``google_tasks`` / ``google_contacts``. Google APIs are free at our
tier — this is analytics bookkeeping, cost is $0.
"""
- from core.container import container
+ from services.plugin.deps import get_database
pricing = get_pricing_service()
cost_data = pricing.calculate_api_cost(service, action, resource_count)
- db = container.database()
+ db = get_database()
await db.save_api_usage_metric({
'session_id': context.get('session_id', 'default'),
'node_id': node_id,
diff --git a/server/nodes/google/_handlers.py b/server/nodes/google/_handlers.py
index bc0600c5..c82e5265 100644
--- a/server/nodes/google/_handlers.py
+++ b/server/nodes/google/_handlers.py
@@ -25,9 +25,9 @@ async def _google_oauth_factory(
*, redirect_uri: Optional[str] = None, **_kwargs,
) -> GoogleOAuth:
"""Build a :class:`GoogleOAuth` from stored client credentials."""
- from core.container import container
+ from services.plugin.deps import get_auth_service
- auth_service = container.auth_service()
+ auth_service = get_auth_service()
client_id = await auth_service.get_api_key("google_client_id") or ""
client_secret = await auth_service.get_api_key("google_client_secret") or ""
return GoogleOAuth(
diff --git a/server/nodes/google/_refresh.py b/server/nodes/google/_refresh.py
index 132f0d34..8703a7ff 100644
--- a/server/nodes/google/_refresh.py
+++ b/server/nodes/google/_refresh.py
@@ -29,9 +29,9 @@ async def refresh_google_status(broadcaster: "StatusBroadcaster") -> None:
"""
with tracer.start_as_current_span("broadcaster.refresh_google") as span:
try:
- from core.container import container
+ from services.plugin.deps import get_auth_service
- auth_service = container.auth_service()
+ auth_service = get_auth_service()
tokens = await auth_service.get_oauth_tokens(
"google", customer_id="owner"
)
diff --git a/server/nodes/google/_router.py b/server/nodes/google/_router.py
index ceb74231..8badb61e 100644
--- a/server/nodes/google/_router.py
+++ b/server/nodes/google/_router.py
@@ -107,9 +107,9 @@ async def generate_customer_auth_url(
@router.get("/customer/{customer_id}/status")
async def get_customer_google_status(customer_id: str):
"""Get Google connection status for a customer."""
- from core.container import container
+ from services.plugin.deps import get_auth_service
- auth_service = container.auth_service()
+ auth_service = get_auth_service()
tokens = await auth_service.get_oauth_tokens("google", customer_id=customer_id)
if not tokens:
return {"connected": False, "customer_id": customer_id}
@@ -124,8 +124,8 @@ async def get_customer_google_status(customer_id: str):
@router.post("/customer/{customer_id}/disconnect")
async def disconnect_customer_google(customer_id: str):
"""Disconnect a customer's Google account."""
- from core.container import container
+ from services.plugin.deps import get_auth_service
- auth_service = container.auth_service()
+ auth_service = get_auth_service()
await auth_service.remove_oauth_tokens("google", customer_id=customer_id)
return {"success": True, "customer_id": customer_id}
diff --git a/server/nodes/location/_service.py b/server/nodes/location/_service.py
index b767de0f..8976c1b6 100644
--- a/server/nodes/location/_service.py
+++ b/server/nodes/location/_service.py
@@ -47,13 +47,13 @@ async def _track_maps_usage(
Returns:
Cost breakdown dict with operation, unit_cost, resource_count, total_cost
"""
- from core.container import container
+ from services.plugin.deps import get_database
pricing = get_pricing_service()
cost_data = pricing.calculate_api_cost('google_maps', action, resource_count)
# Save to database
- db = container.database()
+ db = get_database()
await db.save_api_usage_metric({
'session_id': session_id,
'node_id': node_id,
diff --git a/server/nodes/location/gmaps_create.py b/server/nodes/location/gmaps_create.py
index 67d4a5e5..13303bd1 100644
--- a/server/nodes/location/gmaps_create.py
+++ b/server/nodes/location/gmaps_create.py
@@ -61,9 +61,9 @@ class GmapsCreateNode(ActionNode):
@Operation("create")
async def create(self, ctx: NodeContext, params: GmapsCreateParams) -> Any:
- from core.container import container
+ from services.plugin.deps import get_maps_service
- maps_service = container.maps_service()
+ maps_service = get_maps_service()
response = await maps_service.create_map(
ctx.node_id, params.model_dump(), ctx.raw,
)
diff --git a/server/nodes/location/gmaps_locations.py b/server/nodes/location/gmaps_locations.py
index f11bd3e3..7308f134 100644
--- a/server/nodes/location/gmaps_locations.py
+++ b/server/nodes/location/gmaps_locations.py
@@ -72,9 +72,9 @@ class GmapsLocationsNode(ActionNode):
@Operation("geocode", cost={"service": "google_maps", "action": "geocode", "count": 1})
async def geocode(self, ctx: NodeContext, params: GmapsLocationsParams) -> Any:
- from core.container import container
+ from services.plugin.deps import get_maps_service
- maps_service = container.maps_service()
+ maps_service = get_maps_service()
response = await maps_service.geocode_location(
ctx.node_id, params.model_dump(), ctx.raw,
)
diff --git a/server/nodes/location/gmaps_nearby_places.py b/server/nodes/location/gmaps_nearby_places.py
index dde2a443..aab5ba6d 100644
--- a/server/nodes/location/gmaps_nearby_places.py
+++ b/server/nodes/location/gmaps_nearby_places.py
@@ -51,9 +51,9 @@ class GmapsNearbyPlacesNode(ActionNode):
@Operation("nearby", cost={"service": "google_maps", "action": "places_nearby", "count": 1})
async def nearby(self, ctx: NodeContext, params: GmapsNearbyPlacesParams) -> Any:
- from core.container import container
+ from services.plugin.deps import get_maps_service
- maps_service = container.maps_service()
+ maps_service = get_maps_service()
response = await maps_service.find_nearby_places(
ctx.node_id, params.model_dump(), ctx.raw,
)
diff --git a/server/nodes/model/_base.py b/server/nodes/model/_base.py
index 95e3e332..a0d2a34a 100644
--- a/server/nodes/model/_base.py
+++ b/server/nodes/model/_base.py
@@ -97,9 +97,9 @@ class ChatModelBase(ActionNode, abstract=True):
@Operation("chat", cost={"service": "chat_model", "action": "chat", "count": 1})
async def chat(self, ctx: NodeContext, params: ChatModelParams) -> Any:
- from core.container import container
+ from services.plugin.deps import get_ai_service
- ai_service = container.ai_service()
+ ai_service = get_ai_service()
# ``execute_chat`` raises ``NodeUserError`` directly for typed
# openai SDK failures (context overflow, bad key, server down) —
# BaseNode.execute() then logs at WARN with no traceback.
diff --git a/server/nodes/model/_credentials.py b/server/nodes/model/_credentials.py
index 059f8a8d..493693d6 100644
--- a/server/nodes/model/_credentials.py
+++ b/server/nodes/model/_credentials.py
@@ -49,9 +49,9 @@ class _LLMApiKey(ApiKeyCredential):
:class:`ProbeResult` on success; raises ``httpx``/``openai``
exceptions for the base ``Credential.validate`` to classify.
"""
- from core.container import container
+ from services.plugin.deps import get_ai_service
- ai_service = container.ai_service()
+ ai_service = get_ai_service()
models = await ai_service.fetch_models(cls.id, api_key)
return ProbeResult(
valid=True,
@@ -148,9 +148,9 @@ class _LocalLLM(_LLMApiKey):
@classmethod
async def resolve(cls, *, user_id: str = "owner") -> Dict[str, Any]:
- from core.container import container
+ from services.plugin.deps import get_auth_service
- api_key = await container.auth_service().get_api_key(cls.id)
+ api_key = await get_auth_service().get_api_key(cls.id)
return {"api_key": api_key or "ollama"}
@classmethod
diff --git a/server/nodes/model/_local_validator.py b/server/nodes/model/_local_validator.py
index ca7a6ca9..9acc625d 100644
--- a/server/nodes/model/_local_validator.py
+++ b/server/nodes/model/_local_validator.py
@@ -44,8 +44,8 @@ from typing import Any, Dict, List, Optional, Tuple
import httpx
import lmstudio
import ollama
-from core.container import container
from core.logging import get_logger
+from services.plugin.deps import get_auth_service
from services.status_broadcaster import get_status_broadcaster
logger = get_logger(__name__)
@@ -254,7 +254,7 @@ async def validate_local_llm(data: Dict[str, Any]) -> Dict[str, Any]:
if not base_url:
return {"success": False, "valid": False, "error": "Base URL required"}
- auth_service = container.auth_service()
+ auth_service = get_auth_service()
# Persist the URL first so the runtime path (services/ai.py) can
# read it via the existing {provider}_proxy lookup even before the
diff --git a/server/nodes/proxy/_usage.py b/server/nodes/proxy/_usage.py
index 581720a1..2de25600 100644
--- a/server/nodes/proxy/_usage.py
+++ b/server/nodes/proxy/_usage.py
@@ -23,7 +23,7 @@ async def track_proxy_usage(
workflow_id: Optional[str] = None,
session_id: str = "default",
) -> Dict[str, float]:
- from core.container import container
+ from services.plugin.deps import get_database
from services.pricing import get_pricing_service
pricing = get_pricing_service()
@@ -34,7 +34,7 @@ async def track_proxy_usage(
gb = bytes_transferred / (1024 ** 3)
total_cost = round(gb * cost_per_gb, 8)
- db = container.database()
+ db = get_database()
await db.save_api_usage_metric({
"session_id": session_id,
"node_id": node_id,
diff --git a/server/nodes/proxy/proxy_config.py b/server/nodes/proxy/proxy_config.py
index 7c7a5ce4..13e8198e 100644
--- a/server/nodes/proxy/proxy_config.py
+++ b/server/nodes/proxy/proxy_config.py
@@ -162,7 +162,7 @@ async def _list_routing_rules(proxy_svc) -> Dict[str, Any]:
async def _add_provider(p: Dict[str, Any], proxy_svc) -> Dict[str, Any]:
- from core.container import container
+ from services.plugin.deps import get_database
name = p.get("name", "")
if not name:
@@ -176,7 +176,7 @@ async def _add_provider(p: Dict[str, Any], proxy_svc) -> Dict[str, Any]:
except json.JSONDecodeError:
return {"success": False, "error": f"Invalid url_template JSON: {url_template_raw}"}
- db = container.database()
+ db = get_database()
await db.save_proxy_provider({
"name": name,
"enabled": p.get("enabled", True),
@@ -192,12 +192,12 @@ async def _add_provider(p: Dict[str, Any], proxy_svc) -> Dict[str, Any]:
async def _update_provider(p: Dict[str, Any], proxy_svc) -> Dict[str, Any]:
- from core.container import container
+ from services.plugin.deps import get_database
name = p.get("name", "")
if not name:
return {"success": False, "error": "Provider name is required"}
- db = container.database()
+ db = get_database()
existing = await db.get_proxy_provider(name)
if not existing:
return {"success": False, "error": f"Provider '{name}' not found"}
@@ -225,12 +225,12 @@ async def _update_provider(p: Dict[str, Any], proxy_svc) -> Dict[str, Any]:
async def _remove_provider(p: Dict[str, Any], proxy_svc) -> Dict[str, Any]:
- from core.container import container
+ from services.plugin.deps import get_database
name = p.get("name", "")
if not name:
return {"success": False, "error": "Provider name is required"}
- db = container.database()
+ db = get_database()
await db.delete_proxy_provider(name)
if proxy_svc:
await proxy_svc.reload_providers()
@@ -238,7 +238,7 @@ async def _remove_provider(p: Dict[str, Any], proxy_svc) -> Dict[str, Any]:
async def _set_credentials(p: Dict[str, Any], proxy_svc) -> Dict[str, Any]:
- from core.container import container
+ from services.plugin.deps import get_auth_service
name = p.get("name", "")
if not name:
@@ -247,7 +247,7 @@ async def _set_credentials(p: Dict[str, Any], proxy_svc) -> Dict[str, Any]:
if not username or not password:
return {"success": False, "error": "Username and password are required"}
- auth_svc = container.auth_service()
+ auth_svc = get_auth_service()
await auth_svc.store_api_key(f"proxy_{name}_username", username, [])
await auth_svc.store_api_key(f"proxy_{name}_password", password, [])
if proxy_svc:
@@ -291,7 +291,7 @@ async def _test_provider(p: Dict[str, Any], proxy_svc) -> Dict[str, Any]:
async def _add_routing_rule(p: Dict[str, Any], proxy_svc) -> Dict[str, Any]:
- from core.container import container
+ from services.plugin.deps import get_database
domain_pattern = p.get("domain_pattern", "")
if not domain_pattern:
@@ -305,7 +305,7 @@ async def _add_routing_rule(p: Dict[str, Any], proxy_svc) -> Dict[str, Any]:
except json.JSONDecodeError:
preferred = []
- db = container.database()
+ db = get_database()
await db.save_proxy_routing_rule({
"domain_pattern": domain_pattern,
"preferred_providers": json.dumps(preferred),
@@ -318,12 +318,12 @@ async def _add_routing_rule(p: Dict[str, Any], proxy_svc) -> Dict[str, Any]:
async def _remove_routing_rule(p: Dict[str, Any], proxy_svc) -> Dict[str, Any]:
- from core.container import container
+ from services.plugin.deps import get_database
rule_id = p.get("rule_id")
if not rule_id:
return {"success": False, "error": "rule_id is required"}
- db = container.database()
+ db = get_database()
await db.delete_proxy_routing_rule(int(rule_id))
if proxy_svc:
await proxy_svc.reload_providers()
diff --git a/server/nodes/scraper/apify_actor.py b/server/nodes/scraper/apify_actor.py
index 895e546d..d5d9eae2 100644
--- a/server/nodes/scraper/apify_actor.py
+++ b/server/nodes/scraper/apify_actor.py
@@ -23,8 +23,8 @@ logger = get_logger(__name__)
async def _get_apify_client():
"""Return an authenticated Apify client, or None if no token saved."""
from apify_client import ApifyClientAsync # lazy — optional dep
- from core.container import container
- auth_service = container.auth_service()
+ from services.plugin.deps import get_auth_service
+ auth_service = get_auth_service()
api_token = await auth_service.get_api_key("apify", "default")
if not api_token:
return None
diff --git a/server/nodes/stripe/_credentials.py b/server/nodes/stripe/_credentials.py
index b7d53268..2900bd24 100644
--- a/server/nodes/stripe/_credentials.py
+++ b/server/nodes/stripe/_credentials.py
@@ -27,7 +27,7 @@ class StripeCredential(Credential):
async def resolve(cls, *, user_id: str = "owner") -> Dict[str, Any]:
"""Return only the captured webhook signing secret. There is
no api_key — auth lives in the Stripe CLI's config file."""
- from core.container import container
+ from services.plugin.deps import get_auth_service
- secret = await container.auth_service().get_api_key("stripe_webhook_secret")
+ secret = await get_auth_service().get_api_key("stripe_webhook_secret")
return {"stripe_webhook_secret": secret} if secret else {}
diff --git a/server/nodes/stripe/_handlers.py b/server/nodes/stripe/_handlers.py
index c678e193..7597d6bc 100644
--- a/server/nodes/stripe/_handlers.py
+++ b/server/nodes/stripe/_handlers.py
@@ -78,8 +78,8 @@ _MARKER_TOKEN = "cli-managed"
async def _mark_logged_in() -> None:
- from core.container import container
- await container.auth_service().store_oauth_tokens(
+ from services.plugin.deps import get_auth_service
+ await get_auth_service().store_oauth_tokens(
provider="stripe",
access_token=_MARKER_TOKEN,
refresh_token=_MARKER_TOKEN,
@@ -87,8 +87,8 @@ async def _mark_logged_in() -> None:
async def _mark_logged_out() -> None:
- from core.container import container
- await container.auth_service().remove_oauth_tokens("stripe")
+ from services.plugin.deps import get_auth_service
+ await get_auth_service().remove_oauth_tokens("stripe")
async def _broadcast_credential_event(event_type: str) -> None:
diff --git a/server/nodes/stripe/_source.py b/server/nodes/stripe/_source.py
index f2d37273..ef3bff0c 100644
--- a/server/nodes/stripe/_source.py
+++ b/server/nodes/stripe/_source.py
@@ -120,8 +120,8 @@ class StripeListenSource(DaemonEventSource):
async def _persist_secret(self, secret: str) -> None:
try:
- from core.container import container
- await container.auth_service().store_api_key(_SECRET_FIELD, secret, models=[])
+ from services.plugin.deps import get_auth_service
+ await get_auth_service().store_api_key(_SECRET_FIELD, secret, models=[])
logger.info(
"[Stripe] webhook signing secret persisted (key=%s, len=%d)",
_SECRET_FIELD, len(secret),
diff --git a/server/nodes/telegram/_service.py b/server/nodes/telegram/_service.py
index 6c0c2120..5996b4e3 100644
--- a/server/nodes/telegram/_service.py
+++ b/server/nodes/telegram/_service.py
@@ -373,8 +373,8 @@ class TelegramService(ServiceSingleton):
f"(ID: {msg.from_user.id})"
)
try:
- from core.container import container
- auth = container.auth_service()
+ from services.plugin.deps import get_auth_service
+ auth = get_auth_service()
await auth.store_api_key(
"telegram_owner_chat_id",
str(msg.from_user.id),
diff --git a/server/nodes/telegram/telegram_send.py b/server/nodes/telegram/telegram_send.py
index 7fb73653..bc85f6f1 100644
--- a/server/nodes/telegram/telegram_send.py
+++ b/server/nodes/telegram/telegram_send.py
@@ -183,8 +183,8 @@ class TelegramSendNode(ActionNode):
chat_id = service.owner_chat_id
if not chat_id:
try:
- from core.container import container
- saved = await container.auth_service().get_api_key("telegram_owner_chat_id")
+ from services.plugin.deps import get_auth_service
+ saved = await get_auth_service().get_api_key("telegram_owner_chat_id")
if saved:
owner_id = int(saved)
await service.set_owner(owner_id)
diff --git a/server/nodes/text/file_handler.py b/server/nodes/text/file_handler.py
index 1907e508..76b155cd 100644
--- a/server/nodes/text/file_handler.py
+++ b/server/nodes/text/file_handler.py
@@ -63,9 +63,9 @@ class FileHandlerNode(ActionNode):
@Operation("wrap")
async def wrap(self, ctx: NodeContext, params: FileHandlerParams) -> Any:
- from core.container import container
+ from services.plugin.deps import get_text_service
- text_service = container.text_service()
+ text_service = get_text_service()
# Pass schema-canonical snake_case through to the service. The
# service's *output* dict still carries camelCase keys
# (`fileName` / `fileType`) by historical wire contract -- the
diff --git a/server/nodes/text/text_generator.py b/server/nodes/text/text_generator.py
index 2ad21192..b255d2e6 100644
--- a/server/nodes/text/text_generator.py
+++ b/server/nodes/text/text_generator.py
@@ -44,9 +44,9 @@ class TextGeneratorNode(ActionNode):
@Operation("generate")
async def generate(self, ctx: NodeContext, params: TextGeneratorParams) -> Any:
- from core.container import container
+ from services.plugin.deps import get_text_service
- text_service = container.text_service()
+ text_service = get_text_service()
response = await text_service.execute_text_generator(
ctx.node_id, params.model_dump(),
)
diff --git a/server/nodes/tool/agent_builder.py b/server/nodes/tool/agent_builder.py
index d747ce0a..7ac6ff10 100644
--- a/server/nodes/tool/agent_builder.py
+++ b/server/nodes/tool/agent_builder.py
@@ -30,19 +30,19 @@ to call something that isn't there yet.
from __future__ import annotations
-import logging
import uuid
from pathlib import Path
from typing import Any, Dict, List, Literal, Optional
from pydantic import BaseModel, ConfigDict, Field
+from core.logging import get_logger
from services import workflow_ops
from services.node_registry import registered_node_classes
from services.plugin import NodeContext, Operation, TaskQueue, ToolNode
-logger = logging.getLogger(__name__)
+logger = get_logger(__name__)
# ----------------------------------------------------------------------------
@@ -80,6 +80,11 @@ async def _broadcast(workflow_id: Optional[str], caller_id: str, ops: List[Dict[
"workflow_ops_apply",
{"workflow_id": workflow_id, "caller_node_id": caller_id, "operations": ops},
)
+ logger.info(
+ "[agentBuilder] broadcast workflow_ops_apply: workflow_id=%s "
+ "caller=%s ops=%s",
+ workflow_id, caller_id, [op.get("type") for op in ops],
+ )
except Exception as exc:
logger.warning(f"[agentBuilder] broadcast failed: {exc}", exc_info=True)
@@ -151,10 +156,38 @@ def _resolve_caller(ctx: NodeContext) -> str:
):
target = edge.get("target")
if target:
+ logger.info(
+ "[agentBuilder] caller resolved via input-tools edge: "
+ "self=%s -> agent=%s", self_id, target,
+ )
return target
+ logger.info(
+ "[agentBuilder] no input-tools edge found from %s; "
+ "falling back to self as caller (canvas: %d nodes, %d edges)",
+ self_id, len(ctx.nodes or []), len(ctx.edges or []),
+ )
return self_id
+def _log_op_entry(op: str, ctx: NodeContext, **fields: Any) -> None:
+ """Single INFO line per operation invocation. Captures workflow_id,
+ self_id, canvas size, and ctx.raw keys so a missing-canvas-data bug
+ is visible immediately (e.g. ``nodes=0 edges=0 raw_keys=[...]``
+ tells you exactly which plumbing layer dropped the canvas state).
+ """
+ nodes = ctx.nodes or []
+ edges = ctx.edges or []
+ extra = " ".join(f"{k}={v!r}" for k, v in fields.items() if v not in (None, ""))
+ logger.info(
+ "[agentBuilder.%s] workflow_id=%s self=%s nodes=%d edges=%d "
+ "raw_keys=%s%s",
+ op, ctx.workflow_id, ctx.node_id,
+ len(nodes), len(edges),
+ sorted((ctx.raw or {}).keys()),
+ f" {extra}" if extra else "",
+ )
+
+
# ----------------------------------------------------------------------------
# Params + Output schemas
# ----------------------------------------------------------------------------
@@ -282,6 +315,7 @@ class AgentBuilderNode(ToolNode):
async def inspect_canvas(
self, ctx: NodeContext, params: AgentBuilderParams,
) -> AgentBuilderOutput:
+ _log_op_entry("inspect_canvas", ctx)
nodes = list(ctx.nodes or [])
edges = list(ctx.edges or [])
caller_id = _resolve_caller(ctx)
@@ -348,6 +382,7 @@ class AgentBuilderNode(ToolNode):
async def add_tool(
self, ctx: NodeContext, params: AgentBuilderParams,
) -> AgentBuilderOutput:
+ _log_op_entry("add_tool", ctx, node_type=params.node_type)
node_type = (params.node_type or "").strip()
if not node_type:
return AgentBuilderOutput(
@@ -393,6 +428,7 @@ class AgentBuilderNode(ToolNode):
async def add_skill(
self, ctx: NodeContext, params: AgentBuilderParams,
) -> AgentBuilderOutput:
+ _log_op_entry("add_skill", ctx, skill_folder=params.skill_folder)
skill = (params.skill_folder or "").strip()
if not skill:
return AgentBuilderOutput(
@@ -470,6 +506,7 @@ class AgentBuilderNode(ToolNode):
async def add_subagent(
self, ctx: NodeContext, params: AgentBuilderParams,
) -> AgentBuilderOutput:
+ _log_op_entry("add_subagent", ctx, agent_type=params.agent_type)
agent_type = (params.agent_type or "").strip()
if not agent_type:
return AgentBuilderOutput(
@@ -542,6 +579,11 @@ class AgentBuilderNode(ToolNode):
async def create_workflow(
self, ctx: NodeContext, params: AgentBuilderParams,
) -> AgentBuilderOutput:
+ _log_op_entry(
+ "create_workflow", ctx,
+ workflow_name=params.workflow_name,
+ workflow_description=params.workflow_description,
+ )
name = (params.workflow_name or "").strip()
if not name:
return AgentBuilderOutput(
@@ -568,8 +610,8 @@ class AgentBuilderNode(ToolNode):
"nodeParameters": {},
}
- from core.container import container
- database = container.database()
+ from services.plugin.deps import get_database
+ database = get_database()
ok = await database.save_workflow(
workflow_id, name, workflow_data, description=description or None,
)
diff --git a/server/nodes/twitter/_base.py b/server/nodes/twitter/_base.py
index c5a568d3..8c3b7b80 100644
--- a/server/nodes/twitter/_base.py
+++ b/server/nodes/twitter/_base.py
@@ -28,12 +28,12 @@ async def track_twitter_usage(
node_id: str, action: str, resource_count: int, context: Dict[str, Any],
) -> Dict[str, float]:
"""Record a Twitter API call in ``api_usage_metrics``."""
- from core.container import container
+ from services.plugin.deps import get_database
pricing = get_pricing_service()
cost_data = pricing.calculate_api_cost('twitter', action, resource_count)
- db = container.database()
+ db = get_database()
await db.save_api_usage_metric({
'session_id': context.get('session_id', 'default'),
'node_id': node_id,
@@ -49,10 +49,10 @@ async def track_twitter_usage(
async def get_twitter_client():
"""Build an XDK Client from the stored OAuth2 access token."""
- from core.container import container
+ from services.plugin.deps import get_auth_service
from xdk import Client
- auth_service = container.auth_service()
+ auth_service = get_auth_service()
tokens = await auth_service.get_oauth_tokens("twitter", customer_id="owner")
if not tokens or not tokens.get("access_token"):
raise RuntimeError("Twitter not connected. Please authenticate via Credentials.")
@@ -61,11 +61,11 @@ async def get_twitter_client():
async def refresh_and_get_client():
"""Refresh the OAuth2 token and return a new client."""
- from core.container import container
from nodes.twitter._oauth import TwitterOAuth
+ from services.plugin.deps import get_auth_service
from xdk import Client
- auth_service = container.auth_service()
+ auth_service = get_auth_service()
tokens = await auth_service.get_oauth_tokens("twitter", customer_id="owner")
refresh_token = tokens.get("refresh_token", "") if tokens else ""
if not refresh_token:
diff --git a/server/nodes/twitter/_handlers.py b/server/nodes/twitter/_handlers.py
index 54888506..5c90bd41 100644
--- a/server/nodes/twitter/_handlers.py
+++ b/server/nodes/twitter/_handlers.py
@@ -28,9 +28,9 @@ async def _twitter_oauth_factory(
*, redirect_uri: Optional[str] = None, **_kwargs,
) -> TwitterOAuth:
"""Build a :class:`TwitterOAuth` from stored client credentials."""
- from core.container import container
+ from services.plugin.deps import get_auth_service
- auth_service = container.auth_service()
+ auth_service = get_auth_service()
client_id = await auth_service.get_api_key("twitter_client_id") or ""
client_secret = await auth_service.get_api_key("twitter_client_secret")
return TwitterOAuth(
@@ -51,9 +51,9 @@ async def _drop_legacy_api_key_entries() -> None:
as API keys. The OAuth tokens table is the canonical home now;
these orphans are cleaned on every logout for safety.
"""
- from core.container import container
+ from services.plugin.deps import get_auth_service
- auth_service = container.auth_service()
+ auth_service = get_auth_service()
for key in ("twitter_access_token", "twitter_refresh_token", "twitter_user_info"):
try:
await auth_service.remove_api_key(key)
diff --git a/server/nodes/twitter/_refresh.py b/server/nodes/twitter/_refresh.py
index 5aa04ee0..13e7caa6 100644
--- a/server/nodes/twitter/_refresh.py
+++ b/server/nodes/twitter/_refresh.py
@@ -32,9 +32,9 @@ async def refresh_twitter_status(broadcaster: "StatusBroadcaster") -> None:
"""
with tracer.start_as_current_span("broadcaster.refresh_twitter") as span:
try:
- from core.container import container
+ from services.plugin.deps import get_auth_service
- auth_service = container.auth_service()
+ auth_service = get_auth_service()
tokens = await auth_service.get_oauth_tokens(
"twitter", customer_id="owner"
)
diff --git a/server/services/plugin/deps.py b/server/services/plugin/deps.py
index 01565195..9d087265 100644
--- a/server/services/plugin/deps.py
+++ b/server/services/plugin/deps.py
@@ -28,11 +28,12 @@ Usage::
from __future__ import annotations
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
if TYPE_CHECKING:
from core.cache import CacheService
from core.database import Database
+ from services.ai import AIService
from services.auth import AuthService
@@ -65,4 +66,40 @@ def get_cache() -> "CacheService":
return container.cache()
-__all__ = ["get_auth_service", "get_database", "get_cache"]
+def get_ai_service() -> "AIService":
+ """Resolve the singleton :class:`services.ai.AIService`."""
+ from core.container import container
+
+ return container.ai_service()
+
+
+def get_text_service() -> Any:
+ """Resolve the singleton ``TextService`` (text generation)."""
+ from core.container import container
+
+ return container.text_service()
+
+
+def get_maps_service() -> Any:
+ """Resolve the singleton :class:`nodes.location._service.MapsService`."""
+ from core.container import container
+
+ return container.maps_service()
+
+
+def get_android_service() -> Any:
+ """Resolve the singleton :class:`nodes.android._dispatcher.AndroidService`."""
+ from core.container import container
+
+ return container.android_service()
+
+
+__all__ = [
+ "get_auth_service",
+ "get_database",
+ "get_cache",
+ "get_ai_service",
+ "get_text_service",
+ "get_maps_service",
+ "get_android_service",
+]