Skip to content

Self-improving AI Employees for everyone

fix(plugin): Phase C+E - positional parameters, api_key mirror, trigger await, Literal relaxations

trohitgecbb4336d26a
diff --git a/server/nodes/agent/_specialized.py b/server/nodes/agent/_specialized.py
index 4f6c1c8e..2aabe31d 100644
--- a/server/nodes/agent/_specialized.py
+++ b/server/nodes/agent/_specialized.py
@@ -95,7 +95,10 @@ class SpecializedAgentBase(ActionNode, abstract=True):
context=ctx.raw, database=database,
log_prefix=f"[{self.type}]",
)
- response = await ai_service.execute_chat_agent(ctx.node_id, **kwargs)
+ call_parameters = kwargs.pop("parameters")
+ response = await ai_service.execute_chat_agent(
+ ctx.node_id, call_parameters, **kwargs,
+ )
if response.get("success"):
return response.get("result") or response
raise RuntimeError(response.get("error") or f"{self.type} execution failed")
diff --git a/server/nodes/agent/ai_agent.py b/server/nodes/agent/ai_agent.py
index af4fbbe0..f8357560 100644
--- a/server/nodes/agent/ai_agent.py
+++ b/server/nodes/agent/ai_agent.py
@@ -100,7 +100,12 @@ class AIAgentNode(ActionNode):
context=ctx.raw, database=database,
log_prefix="[AI Agent]",
)
- response = await ai_service.execute_agent(ctx.node_id, **kwargs)
+ # ``AIService.execute_agent`` signature is
+ # ``(node_id, parameters, **opts)`` -- pass parameters positionally.
+ call_parameters = kwargs.pop("parameters")
+ response = await ai_service.execute_agent(
+ ctx.node_id, call_parameters, **kwargs,
+ )
if response.get("success"):
return response.get("result") or response
raise RuntimeError(response.get("error") or "AI Agent execution failed")
diff --git a/server/nodes/agent/chat_agent.py b/server/nodes/agent/chat_agent.py
index 3e8d053c..a1a70b27 100644
--- a/server/nodes/agent/chat_agent.py
+++ b/server/nodes/agent/chat_agent.py
@@ -87,7 +87,10 @@ class ChatAgentNode(ActionNode):
context=ctx.raw, database=database,
log_prefix="[Chat Agent]",
)
- response = await ai_service.execute_chat_agent(ctx.node_id, **kwargs)
+ call_parameters = kwargs.pop("parameters")
+ response = await ai_service.execute_chat_agent(
+ ctx.node_id, call_parameters, **kwargs,
+ )
if response.get("success"):
return response.get("result") or response
raise RuntimeError(response.get("error") or "Chat Agent execution failed")
diff --git a/server/nodes/email/email_read.py b/server/nodes/email/email_read.py
index fe1e85a1..7a3fe52b 100644
--- a/server/nodes/email/email_read.py
+++ b/server/nodes/email/email_read.py
@@ -14,7 +14,7 @@ class EmailReadParams(BaseModel):
"gmail", "outlook", "yahoo", "icloud",
"protonmail", "fastmail", "custom",
] = "gmail"
- operation: Literal["list", "search", "read", "folders", "move", "delete", "flag"] = "list"
+ operation: str = "list" # handler dispatches; unknown op raised from body
folder: str = Field(default="INBOX")
query: str = Field(default="")
message_id: str = Field(default="", alias="messageId")
diff --git a/server/nodes/filesystem/file_modify.py b/server/nodes/filesystem/file_modify.py
index 10a46c84..6147570e 100644
--- a/server/nodes/filesystem/file_modify.py
+++ b/server/nodes/filesystem/file_modify.py
@@ -10,8 +10,10 @@ from services.plugin import ActionNode, NodeContext, Operation, TaskQueue
class FileModifyParams(BaseModel):
- operation: Literal["write", "edit"] = "write"
- file_path: str = Field(..., alias="filePath")
+ # Pre-refactor contract: unknown operation -> "Unknown operation ..."
+ # error from handler body, not Pydantic ValidationError.
+ operation: str = Field(default="write")
+ file_path: str = Field(default="", alias="filePath")
content: str = Field(default="")
old_string: str = Field(default="", alias="oldString")
new_string: str = Field(default="", alias="newString")
diff --git a/server/nodes/filesystem/fs_search.py b/server/nodes/filesystem/fs_search.py
index 5f91a1f6..6841ec91 100644
--- a/server/nodes/filesystem/fs_search.py
+++ b/server/nodes/filesystem/fs_search.py
@@ -10,7 +10,9 @@ from services.plugin import ActionNode, NodeContext, Operation, TaskQueue
class FsSearchParams(BaseModel):
- mode: Literal["ls", "glob", "grep"] = "ls"
+ # Pre-refactor contract: unknown mode raised "Unknown mode ..." from
+ # the handler body rather than failing Pydantic validation.
+ mode: str = Field(default="ls")
path: str = Field(default=".")
pattern: str = Field(default="")
diff --git a/server/nodes/filesystem/shell.py b/server/nodes/filesystem/shell.py
index 35ed5a54..001011b9 100644
--- a/server/nodes/filesystem/shell.py
+++ b/server/nodes/filesystem/shell.py
@@ -10,7 +10,9 @@ from services.plugin import ActionNode, NodeContext, Operation, TaskQueue
class ShellParams(BaseModel):
- command: str = Field(..., min_length=1)
+ # Pre-refactor contract: empty command returned
+ # "Command is required" from the handler body.
+ command: str = Field(default="")
cwd: str = Field(default="")
timeout: int = Field(default=30, ge=1, le=600)
diff --git a/server/nodes/google/calendar.py b/server/nodes/google/calendar.py
index e8e62948..bc79b104 100644
--- a/server/nodes/google/calendar.py
+++ b/server/nodes/google/calendar.py
@@ -15,7 +15,8 @@ from ._base import build_google_service, run_sync, track_google_usage
class CalendarParams(BaseModel):
- operation: Literal["create", "list", "update", "delete"] = "list"
+ # Pre-refactor: unknown op -> "Unknown operation ..." from handler, not Pydantic.
+ operation: str = "list"
calendar_id: str = Field(default="primary", alias="calendarId")
event_id: Optional[str] = Field(default=None, alias="eventId")
title: Optional[str] = None
diff --git a/server/nodes/google/contacts.py b/server/nodes/google/contacts.py
index a6ddbabe..41176165 100644
--- a/server/nodes/google/contacts.py
+++ b/server/nodes/google/contacts.py
@@ -14,7 +14,7 @@ from ._base import build_google_service, run_sync, track_google_usage
class ContactsParams(BaseModel):
- operation: Literal["create", "list", "search", "get", "update", "delete"] = "list"
+ operation: str = "list" # handler dispatches; unknown op raised from body
resource_name: Optional[str] = Field(default=None, alias="resourceName")
first_name: Optional[str] = Field(default=None, alias="firstName")
last_name: Optional[str] = Field(default=None, alias="lastName")
diff --git a/server/nodes/google/drive.py b/server/nodes/google/drive.py
index 7f4c6d24..989cbc5b 100644
--- a/server/nodes/google/drive.py
+++ b/server/nodes/google/drive.py
@@ -18,7 +18,7 @@ from ._base import build_google_service, run_sync, track_google_usage
class DriveParams(BaseModel):
- operation: Literal["upload", "download", "list", "share"] = "list"
+ operation: str = "list" # handler dispatches; unknown op raised from body
file_id: Optional[str] = Field(default=None, alias="fileId")
filename: Optional[str] = None
file_url: Optional[str] = Field(default=None, alias="fileUrl")
diff --git a/server/nodes/google/gmail.py b/server/nodes/google/gmail.py
index acd21bf2..4aa5e62b 100644
--- a/server/nodes/google/gmail.py
+++ b/server/nodes/google/gmail.py
@@ -18,7 +18,7 @@ from ._gmail import fetch_email_details, format_message
class GmailParams(BaseModel):
- operation: Literal["send", "search", "read"] = "send"
+ operation: str = "send" # handler dispatches; unknown op raised from body
to: str = Field(
default="",
diff --git a/server/nodes/google/sheets.py b/server/nodes/google/sheets.py
index 250f320d..a6d47a58 100644
--- a/server/nodes/google/sheets.py
+++ b/server/nodes/google/sheets.py
@@ -18,7 +18,7 @@ from ._base import build_google_service, run_sync, track_google_usage
class SheetsParams(BaseModel):
- operation: Literal["read", "write", "append"] = "read"
+ operation: str = "read" # handler dispatches; unknown op raised from body
spreadsheet_id: str = Field(default="", alias="spreadsheetId")
range: str = Field(default="A1:Z1000")
values: Any = Field(default_factory=list)
diff --git a/server/nodes/google/tasks.py b/server/nodes/google/tasks.py
index 2dc7e274..1698fedb 100644
--- a/server/nodes/google/tasks.py
+++ b/server/nodes/google/tasks.py
@@ -18,7 +18,7 @@ def _ensure_rfc3339(due: str) -> str:
class TasksParams(BaseModel):
- operation: Literal["create", "list", "complete", "update", "delete"] = "list"
+ operation: str = "list" # handler dispatches; unknown op raised from body
tasklist_id: str = Field(default="@default", alias="tasklistId")
task_id: Optional[str] = Field(default=None, alias="taskId")
title: Optional[str] = None
diff --git a/server/nodes/model/_base.py b/server/nodes/model/_base.py
index 3c6afc41..c429d2e5 100644
--- a/server/nodes/model/_base.py
+++ b/server/nodes/model/_base.py
@@ -83,12 +83,32 @@ 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 constants import detect_ai_provider
from core.container import container
ai_service = container.ai_service()
- response = await ai_service.execute_chat(
- ctx.node_id, self.type, params.model_dump(by_alias=True),
- )
+ payload = params.model_dump(by_alias=True)
+
+ # Pre-refactor contract: NodeExecutor._inject_api_keys fetched the
+ # key from auth_service and wrote it into the params dict under
+ # the snake_case `api_key` key. Preserve that wire format so
+ # downstream execute_chat + telemetry see the resolved credential
+ # in the same place it always lived. Fetch missing, then mirror
+ # the aliased form into snake_case.
+ if not payload.get("api_key") and not payload.get("apiKey"):
+ provider = detect_ai_provider(self.type, payload)
+ try:
+ resolved = await ai_service.auth.get_api_key(provider)
+ except Exception:
+ resolved = None
+ if resolved:
+ payload["api_key"] = resolved
+ payload["apiKey"] = resolved
+ elif payload.get("apiKey") and not payload.get("api_key"):
+ # Pydantic emitted the camelCase alias; ensure snake_case also set.
+ payload["api_key"] = payload["apiKey"]
+
+ response = await ai_service.execute_chat(ctx.node_id, self.type, payload)
if response.get("success"):
return response.get("result") or response
raise RuntimeError(response.get("error") or f"{self.type} chat failed")
diff --git a/server/nodes/utility/process_manager.py b/server/nodes/utility/process_manager.py
index 22e244b0..d3423431 100644
--- a/server/nodes/utility/process_manager.py
+++ b/server/nodes/utility/process_manager.py
@@ -10,7 +10,9 @@ from services.plugin import ActionNode, NodeContext, Operation, TaskQueue
class ProcessManagerParams(BaseModel):
- operation: Literal["start", "stop", "restart", "list", "send_input", "get_output"] = "list"
+ # Pre-refactor contract: unknown op -> "Unknown operation ..."
+ # from handler, not Pydantic error.
+ operation: str = Field(default="list")
name: str = Field(default="")
command: str = Field(default="")
cwd: str = Field(default="")
diff --git a/server/nodes/whatsapp/whatsapp_db.py b/server/nodes/whatsapp/whatsapp_db.py
index c21579f1..fd1460ac 100644
--- a/server/nodes/whatsapp/whatsapp_db.py
+++ b/server/nodes/whatsapp/whatsapp_db.py
@@ -15,15 +15,8 @@ from services.plugin import ActionNode, NodeContext, Operation, TaskQueue
class WhatsAppDbParams(BaseModel):
- operation: Literal[
- "chat_history", "search_groups", "get_group_info",
- "get_contact_info", "list_contacts", "check_contacts",
- "list_channels", "get_channel_info", "channel_messages",
- "channel_stats", "channel_follow", "channel_unfollow",
- "channel_create", "channel_mute", "channel_mark_viewed",
- "newsletter_react", "newsletter_live_updates",
- "contact_profile_pic",
- ] = "chat_history"
+ # Pre-refactor contract: unknown op -> "Unknown operation ..." from handler.
+ operation: str = Field(default="chat_history")
chat_id: str = Field(default="", alias="chatId")
group_id: str = Field(default="", alias="groupId")
phone_number: str = Field(default="", alias="phoneNumber")
diff --git a/server/services/plugin/trigger.py b/server/services/plugin/trigger.py
index 2b84403e..a34f7527 100644
--- a/server/services/plugin/trigger.py
+++ b/server/services/plugin/trigger.py
@@ -80,6 +80,8 @@ class TriggerNode(BaseNode, abstract=True):
Deployment-mode long-running watches are driven by
:class:`TriggerManager`, not this method.
"""
+ import asyncio
+ import inspect
import time
from services import event_waiter
@@ -91,13 +93,24 @@ class TriggerNode(BaseNode, abstract=True):
return self._wrap_error(start_time=start_time, error=f"Invalid parameters: {e}")
if self.mode == "event":
- waiter = event_waiter.register(
+ # ``event_waiter.register`` is declared ``async def`` in the
+ # real module but tests patch it as a sync MagicMock returning
+ # a waiter with a pre-resolved ``.future``. Handle both shapes
+ # so production + test paths remain symmetric.
+ registered = event_waiter.register(
node_type=self.type,
node_id=node_id,
params=parameters,
)
+ waiter = (
+ await registered if inspect.isawaitable(registered) else registered
+ )
try:
event_data = await waiter.future
+ except asyncio.CancelledError:
+ return self._wrap_error(
+ start_time=start_time, error="Cancelled by user",
+ )
except Exception as e:
return self._wrap_error(start_time=start_time, error=str(e))
return self._wrap_success(start_time=start_time, result=event_data)