Self-improving AI Employees for everyone
Python ai-agentsai-employeeai-employeesassistantautonomous-agentsco-employeescompanygrok-botinstinctloop-agentsmuseown-your-datapersonalself-hosted
refactor(google): move 4 option loaders into nodes/google/_option_loaders.py (Wave 11.I, M.2)
trohitgbbbad1e25360
diff --git a/server/nodes/google/__init__.py b/server/nodes/google/__init__.pyindex d669fa0c..c765da6c 100644--- a/server/nodes/google/__init__.py+++ b/server/nodes/google/__init__.py@@ -26,14 +26,30 @@ this module by name.from services.event_waiter import register_filter_builderfrom services.status_broadcaster import register_service_refresh-from services.ws_handler_registry import register_router, register_ws_handlers+from services.ws_handler_registry import (+ register_option_loader,+ register_router,+ register_ws_handlers,+)from . import _routerfrom ._filters import build_gmail_filterfrom ._handlers import WS_HANDLERS+from ._option_loaders import (+ load_calendar_list,+ load_drive_folders,+ load_gmail_labels,+ load_tasklists,+)from ._refresh import refresh_google_statusregister_ws_handlers(WS_HANDLERS)register_router(_router.router, name="google")register_service_refresh(refresh_google_status)register_filter_builder("gmailReceive", build_gmail_filter)++# loadOptionsMethod loaders (Wave 11.I, milestone M.2).+register_option_loader("gmailLabels", load_gmail_labels)+register_option_loader("googleCalendarList", load_calendar_list)+register_option_loader("googleDriveFolders", load_drive_folders)+register_option_loader("googleTasklists", load_tasklists)diff --git a/server/nodes/google/_option_loaders.py b/server/nodes/google/_option_loaders.pynew file mode 100644index 00000000..f3470566--- /dev/null+++ b/server/nodes/google/_option_loaders.py@@ -0,0 +1,107 @@+"""Google Workspace ``loadOptionsMethod`` loaders.++Wave 11.I, milestone M.2. Each function is registered with+``services.ws_handler_registry.register_option_loader`` from+``__init__.py``.++Reuses :func:`._auth_helper.get_google_credentials` so the OAuth dance+is identical to the workflow-execution path. ``params`` may carry+``account_mode`` / ``customer_id`` (multi-tenant customer mode) -- the+auth helper falls back to owner tokens otherwise.+"""++from __future__ import annotations++import asyncio+from typing import Any, Dict, List++from googleapiclient.discovery import build++from ._auth_helper import get_google_credentials+++async def _google_service(api: str, version: str, params: Dict[str, Any]):+ """Build a googleapiclient service under the right OAuth credentials."""+ creds = await get_google_credentials(params, {})+ loop = asyncio.get_event_loop()+ return await loop.run_in_executor(+ None, lambda: build(api, version, credentials=creds)+ )+++async def load_gmail_labels(params: Dict[str, Any]) -> List[Dict[str, Any]]:+ """Gmail labels for the label-filter selector on gmailReceive and+ gmail (search)."""+ service = await _google_service("gmail", "v1", params)+ loop = asyncio.get_event_loop()+ response = await loop.run_in_executor(+ None, lambda: service.users().labels().list(userId="me").execute()+ )+ labels = response.get("labels", [])+ # Stable sort: system labels alphabetical first, then user labels.+ labels.sort(+ key=lambda label: (+ label.get("type") != "system",+ (label.get("name") or "").lower(),+ )+ )+ return [+ {"value": label["id"], "label": label.get("name") or label["id"]}+ for label in labels+ ]+++async def load_calendar_list(params: Dict[str, Any]) -> List[Dict[str, Any]]:+ """Calendar list for the calendarId picker on calendar CRUD."""+ service = await _google_service("calendar", "v3", params)+ loop = asyncio.get_event_loop()+ response = await loop.run_in_executor(+ None, lambda: service.calendarList().list().execute()+ )+ entries = response.get("items", [])+ # Primary first, rest alphabetised.+ entries.sort(+ key=lambda c: (not c.get("primary", False), (c.get("summary") or "").lower())+ )+ return [+ {+ "value": c.get("id", ""),+ "label": c.get("summary") or c.get("id", ""),+ "description": "Primary" if c.get("primary") else c.get("description", ""),+ }+ for c in entries+ ]+++async def load_drive_folders(params: Dict[str, Any]) -> List[Dict[str, Any]]:+ """Drive folders for the folderId picker on drive upload/list."""+ service = await _google_service("drive", "v3", params)+ loop = asyncio.get_event_loop()+ query = "mimeType='application/vnd.google-apps.folder' and trashed=false"+ response = await loop.run_in_executor(+ None,+ lambda: service.files()+ .list(q=query, fields="files(id, name, parents)", pageSize=200)+ .execute(),+ )+ folders = response.get("files", [])+ folders.sort(key=lambda f: (f.get("name") or "").lower())+ return [+ {"value": f.get("id", ""), "label": f.get("name") or f.get("id", "")}+ for f in folders+ ]+++async def load_tasklists(params: Dict[str, Any]) -> List[Dict[str, Any]]:+ """Task lists for the tasklistId picker on tasks CRUD."""+ service = await _google_service("tasks", "v1", params)+ loop = asyncio.get_event_loop()+ response = await loop.run_in_executor(+ None, lambda: service.tasklists().list().execute()+ )+ lists = response.get("items", [])+ lists.sort(key=lambda label: (label.get("title") or "").lower())+ return [+ {"value": label.get("id", ""), "label": label.get("title") or label.get("id", "")}+ for label in lists+ ]diff --git a/server/services/node_option_loaders/__init__.py b/server/services/node_option_loaders/__init__.pyindex 453debfa..9e7067fc 100644--- a/server/services/node_option_loaders/__init__.py+++ b/server/services/node_option_loaders/__init__.py@@ -19,12 +19,6 @@ from typing import Any, Awaitable, Callable, Optionalfrom services.ws_handler_registry import get_option_loaderfrom .android_loaders import load_android_service_actions-from .google_loaders import (- load_gmail_labels,- load_google_calendar_list,- load_google_drive_folders,- load_google_tasklists,-)# Async loader signature: (params: dict) -> list of {value, label, ...}@@ -34,10 +28,6 @@ LoadOptionsFn = Callable[[dict[str, Any]], Awaitable[list[dict[str, Any]]]]# Legacy table for not-yet-migrated plugins. Shrinks one entry per M.x# commit; deleted entirely at the end of M.3.LEGACY_LOAD_OPTIONS_REGISTRY: dict[str, LoadOptionsFn] = {- "gmailLabels": load_gmail_labels,- "googleCalendarList": load_google_calendar_list,- "googleDriveFolders": load_google_drive_folders,- "googleTasklists": load_google_tasklists,"getAndroidServiceActions": load_android_service_actions,}diff --git a/server/services/node_option_loaders/google_loaders.py b/server/services/node_option_loaders/google_loaders.pydeleted file mode 100644index a0d4b2df..00000000--- a/server/services/node_option_loaders/google_loaders.py+++ /dev/null@@ -1,97 +0,0 @@-"""Google Workspace loadOptions adapters.--Wave 6 Phase 4b. Adds dynamic-option loaders for the Gmail label-picker and Calendar list picker. Reuses-nodes/google/_auth_helper.get_google_credentials() so the OAuth-dance is identical to the workflow-execution path.--Adding more Google loaders (e.g. Drive folder picker, Sheets-spreadsheet picker) = one async function + one entry in this file's-exports + one line in services/node_option_loaders/__init__.py.-"""--import asyncio-from typing import Any---async def _google_service(api: str, version: str, params: dict[str, Any]):- """Build a googleapiclient service under the right OAuth credentials.- `params` may carry ``account_mode`` / ``customer_id`` (customer-mode- multi-tenant) — falls back to owner tokens otherwise."""-- from googleapiclient.discovery import build-- from nodes.google._auth_helper import get_google_credentials-- creds = await get_google_credentials(params, {})- loop = asyncio.get_event_loop()- return await loop.run_in_executor(None, lambda: build(api, version, credentials=creds))---async def load_gmail_labels(params: dict[str, Any]) -> list[dict[str, Any]]:- """Gmail labels for the label-filter selector on gmailReceive and- gmail (search)."""-- service = await _google_service("gmail", "v1", params)- loop = asyncio.get_event_loop()- response = await loop.run_in_executor(None, lambda: service.users().labels().list(userId="me").execute())- labels = response.get("labels", [])- # Stable sort: system labels alphabetical first, then user labels.- labels.sort(key=lambda l: (l.get("type") != "system", (l.get("name") or "").lower()))- return [- {"value": l["id"], "label": l.get("name") or l["id"]}- for l in labels- ]---async def load_google_calendar_list(params: dict[str, Any]) -> list[dict[str, Any]]:- """Calendar list for the calendarId picker on calendar CRUD."""-- service = await _google_service("calendar", "v3", params)- loop = asyncio.get_event_loop()- response = await loop.run_in_executor(None, lambda: service.calendarList().list().execute())- entries = response.get("items", [])- # Primary first, rest alphabetised.- entries.sort(key=lambda c: (not c.get("primary", False), (c.get("summary") or "").lower()))- return [- {- "value": c.get("id", ""),- "label": c.get("summary") or c.get("id", ""),- "description": "Primary" if c.get("primary") else c.get("description", ""),- }- for c in entries- ]---async def load_google_drive_folders(params: dict[str, Any]) -> list[dict[str, Any]]:- """Drive folders for the folderId picker on drive upload/list."""-- service = await _google_service("drive", "v3", params)- loop = asyncio.get_event_loop()- query = "mimeType='application/vnd.google-apps.folder' and trashed=false"- response = await loop.run_in_executor(- None,- lambda: service.files()- .list(q=query, fields="files(id, name, parents)", pageSize=200)- .execute(),- )- folders = response.get("files", [])- folders.sort(key=lambda f: (f.get("name") or "").lower())- return [- {"value": f.get("id", ""), "label": f.get("name") or f.get("id", "")}- for f in folders- ]---async def load_google_tasklists(params: dict[str, Any]) -> list[dict[str, Any]]:- """Task lists for the tasklistId picker on tasks CRUD."""-- service = await _google_service("tasks", "v1", params)- loop = asyncio.get_event_loop()- response = await loop.run_in_executor(None, lambda: service.tasklists().list().execute())- lists = response.get("items", [])- lists.sort(key=lambda l: (l.get("title") or "").lower())- return [- {"value": l.get("id", ""), "label": l.get("title") or l.get("id", "")}- for l in lists- ]