machinaos 0.0.78 → 0.0.80

package/server/nodes/android/_base.py

@@ -23,22 +23,22 @@ logger = get_logger(__name__)
 # Maps camelCase node types to snake_case service IDs.
 # Same map is mirrored in services/handlers/tools.py for the AI-tool path.
 SERVICE_ID_MAP: Dict[str, str] = {
-    'batteryMonitor': 'battery',
-    'networkMonitor': 'network',
-    'systemInfo': 'system_info',
-    'location': 'location',
-    'appLauncher': 'app_launcher',
-    'appList': 'app_list',
-    'wifiAutomation': 'wifi_automation',
-    'bluetoothAutomation': 'bluetooth_automation',
-    'audioAutomation': 'audio_automation',
-    'deviceStateAutomation': 'device_state',
-    'screenControlAutomation': 'screen_control',
-    'airplaneModeControl': 'airplane_mode',
-    'motionDetection': 'motion_detection',
-    'environmentalSensors': 'environmental_sensors',
-    'cameraControl': 'camera_control',
-    'mediaControl': 'media_control',
+    "batteryMonitor": "battery",
+    "networkMonitor": "network",
+    "systemInfo": "system_info",
+    "location": "location",
+    "appLauncher": "app_launcher",
+    "appList": "app_list",
+    "wifiAutomation": "wifi_automation",
+    "bluetoothAutomation": "bluetooth_automation",
+    "audioAutomation": "audio_automation",
+    "deviceStateAutomation": "device_state",
+    "screenControlAutomation": "screen_control",
+    "airplaneModeControl": "airplane_mode",
+    "motionDetection": "motion_detection",
+    "environmentalSensors": "environmental_sensors",
+    "cameraControl": "camera_control",
+    "mediaControl": "media_control",
 }
 
 
@@ -100,10 +100,8 @@ class AndroidServiceBase(ActionNode, abstract=True):
     group = ("android", "service")
     component_kind = "square"
     handles = (
-        {"name": "input-main", "kind": "input", "position": "left",
-         "label": "Input", "role": "main"},
-        {"name": "output-main", "kind": "output", "position": "right",
-         "label": "Output", "role": "main"},
+        {"name": "input-main", "kind": "input", "position": "left", "label": "Input", "role": "main"},
+        {"name": "output-main", "kind": "output", "position": "right", "label": "Output", "role": "main"},
     )
     annotations = {"destructive": False, "readonly": False, "open_world": True}
     task_queue = TaskQueue.ANDROID
@@ -121,11 +119,11 @@ class AndroidServiceBase(ActionNode, abstract=True):
 
         # Derive service_id from the registered node type (battery etc.) —
         # hidden params may not be in the DB so the type is the source of truth.
-        service_id = SERVICE_ID_MAP.get(self.type, payload.get('service_id', 'battery'))
-        action = payload.get('action', 'status')
-        service_params = payload.get('parameters', {})
-        android_host = payload.get('android_host', 'localhost')
-        android_port = payload.get('android_port', 8888)
+        service_id = SERVICE_ID_MAP.get(self.type, payload.get("service_id", "battery"))
+        action = payload.get("action", "status")
+        service_params = payload.get("parameters", {})
+        android_host = payload.get("android_host", "localhost")
+        android_port = payload.get("android_port", 8888)
 
         # Parse JSON-string parameters defensively.
         if isinstance(service_params, str):
@@ -136,13 +134,18 @@ class AndroidServiceBase(ActionNode, abstract=True):
 
         # Hoist root-level additional properties (e.g. package_name from
         # appLauncher's additionalProperties UI) into service_params.
-        for key in ('package_name',):
+        for key in ("package_name",):
             if payload.get(key):
                 service_params[key] = payload[key]
 
         logger.debug(
             "[Android] node_type=%s -> service_id=%s action=%s host=%s:%s params=%s",
-            self.type, service_id, action, android_host, android_port, service_params,
+            self.type,
+            service_id,
+            action,
+            android_host,
+            android_port,
+            service_params,
         )
 
         result = await android_service.execute_service(
@@ -173,9 +176,15 @@ class AndroidServiceBase(ActionNode, abstract=True):
 
 
 async def _execute_with_broadcast(
-    *, target_node_id: Optional[str], workflow_id: Optional[str],
-    service_id: str, action: str, parameters: Dict[str, Any],
-    host: str, port: int, log_label: str,
+    *,
+    target_node_id: Optional[str],
+    workflow_id: Optional[str],
+    service_id: str,
+    action: str,
+    parameters: Dict[str, Any],
+    host: str,
+    port: int,
+    log_label: str,
 ) -> Dict[str, Any]:
     """Run an Android service call with broadcast status for the UI node."""
     from ._dispatcher import AndroidService
@@ -184,14 +193,15 @@ async def _execute_with_broadcast(
     broadcaster = get_status_broadcaster()
     if target_node_id:
         await broadcaster.update_node_status(
-            target_node_id, "executing",
+            target_node_id,
+            "executing",
             {"message": f"Executing {action} via {log_label}"},
             workflow_id=workflow_id,
         )
 
     try:
         result = await AndroidService().execute_service(
-            node_id=target_node_id or 'tool',
+            node_id=target_node_id or "tool",
             service_id=service_id,
             action=action,
             parameters=parameters,
@@ -200,28 +210,30 @@ async def _execute_with_broadcast(
         )
 
         if target_node_id:
-            if result.get('success'):
+            if result.get("success"):
                 await broadcaster.update_node_status(
-                    target_node_id, "success",
-                    {"message": f"{action} completed", "result": result.get('result', {})},
+                    target_node_id,
+                    "success",
+                    {"message": f"{action} completed", "result": result.get("result", {})},
                     workflow_id=workflow_id,
                 )
             else:
                 await broadcaster.update_node_status(
-                    target_node_id, "error",
-                    {"message": result.get('error', 'Unknown error')},
+                    target_node_id,
+                    "error",
+                    {"message": result.get("error", "Unknown error")},
                     workflow_id=workflow_id,
                 )
 
-        if result.get('success'):
+        if result.get("success"):
             return {
                 "success": True,
                 "service": service_id,
                 "action": action,
-                "data": result.get('result', {}).get('data', result.get('result', {})),
+                "data": result.get("result", {}).get("data", result.get("result", {})),
             }
         return {
-            "error": result.get('error', 'Unknown error'),
+            "error": result.get("error", "Unknown error"),
             "service": service_id,
             "action": action,
         }
@@ -229,7 +241,8 @@ async def _execute_with_broadcast(
         logger.error(f"[{log_label}] Unexpected error: {e}")
         if target_node_id:
             await broadcaster.update_node_status(
-                target_node_id, "error",
+                target_node_id,
+                "error",
                 {"message": str(e)},
                 workflow_id=workflow_id,
             )
@@ -237,55 +250,53 @@ async def _execute_with_broadcast(
 
 
 async def execute_android_toolkit(
-    args: Dict[str, Any], config: Dict[str, Any],
+    args: Dict[str, Any],
+    config: Dict[str, Any],
 ) -> Dict[str, Any]:
     """Route an LLM tool call through the Android toolkit aggregator.
 
     Looks up the connected service in ``config['connected_services']``
     by ``service_id``, then executes through the broadcast helper.
     """
-    service_id = args.get('service_id', '')
-    action = args.get('action', '')
-    parameters = args.get('parameters') or {}
+    service_id = args.get("service_id", "")
+    action = args.get("action", "")
+    parameters = args.get("parameters") or {}
 
-    connected_services = config.get('connected_services', [])
+    connected_services = config.get("connected_services", [])
     if not service_id:
-        available = [s.get('service_id') or s.get('node_type') for s in connected_services]
+        available = [s.get("service_id") or s.get("node_type") for s in connected_services]
         return {
             "error": "No service_id provided",
-            "hint": (
-                f"Available services: {', '.join(available)}"
-                if available else "No services connected"
-            ),
+            "hint": (f"Available services: {', '.join(available)}" if available else "No services connected"),
         }
 
     target_service = next(
-        (
-            s for s in connected_services
-            if (s.get('service_id') or s.get('node_type')) == service_id
-        ),
+        (s for s in connected_services if (s.get("service_id") or s.get("node_type")) == service_id),
         None,
     )
     if not target_service:
-        available = [s.get('service_id') or s.get('node_type') for s in connected_services]
+        available = [s.get("service_id") or s.get("node_type") for s in connected_services]
         return {
             "error": f"Service '{service_id}' not connected to toolkit",
             "available_services": available,
         }
 
-    svc_params = target_service.get('parameters', {})
-    host = svc_params.get('android_host', 'localhost')
-    port = int(svc_params.get('android_port', 8888))
+    svc_params = target_service.get("parameters", {})
+    host = svc_params.get("android_host", "localhost")
+    port = int(svc_params.get("android_port", 8888))
     if not action:
-        action = svc_params.get('action') or target_service.get('action', 'status')
+        action = svc_params.get("action") or target_service.get("action", "status")
 
-    target_node_id = target_service.get('node_id')
-    workflow_id = config.get('workflow_id')
+    target_node_id = target_service.get("node_id")
+    workflow_id = config.get("workflow_id")
 
     logger.info(
         "[Android Toolkit] Executing %s.%s via '%s' (node: %s, workflow: %s)",
-        service_id, action, target_service.get('label'),
-        target_node_id, workflow_id,
+        service_id,
+        action,
+        target_service.get("label"),
+        target_node_id,
+        workflow_id,
     )
 
     return await _execute_with_broadcast(
@@ -294,33 +305,38 @@ async def execute_android_toolkit(
         service_id=service_id,
         action=action,
         parameters=parameters,
-        host=host, port=port,
+        host=host,
+        port=port,
         log_label="Android Toolkit",
     )
 
 
 async def execute_android_service_tool(
-    args: Dict[str, Any], config: Dict[str, Any],
+    args: Dict[str, Any],
+    config: Dict[str, Any],
 ) -> Dict[str, Any]:
     """Route an LLM tool call to a directly-connected Android service node.
 
     Uses ``SERVICE_ID_MAP[node_type]`` instead of the synthetic toolkit
     indirection — the LLM addresses each service node by its own type.
     """
-    node_type = config.get('node_type', '')
-    node_id = config.get('node_id', '')
-    node_params = config.get('parameters', {})
-    workflow_id = config.get('workflow_id')
+    node_type = config.get("node_type", "")
+    node_id = config.get("node_id", "")
+    node_params = config.get("parameters", {})
+    workflow_id = config.get("workflow_id")
 
     service_id = SERVICE_ID_MAP.get(node_type, node_type)
-    action = args.get('action') or node_params.get('action', 'status')
-    parameters = args.get('parameters') or {}
-    host = node_params.get('android_host', 'localhost')
-    port = int(node_params.get('android_port', 8888))
+    action = args.get("action") or node_params.get("action", "status")
+    parameters = args.get("parameters") or {}
+    host = node_params.get("android_host", "localhost")
+    port = int(node_params.get("android_port", 8888))
 
     logger.info(
         "[Android Service] Executing %s.%s (node: %s, workflow: %s)",
-        service_id, action, node_id, workflow_id,
+        service_id,
+        action,
+        node_id,
+        workflow_id,
     )
 
     return await _execute_with_broadcast(
@@ -329,6 +345,7 @@ async def execute_android_service_tool(
         service_id=service_id,
         action=action,
         parameters=parameters,
-        host=host, port=port,
+        host=host,
+        port=port,
         log_label="Android Service",
     )