machinaos 0.0.78 → 0.0.80

package/server/nodes/google/{contacts.py → contacts/__init__.py}

@@ -8,9 +8,9 @@ from pydantic import BaseModel, ConfigDict, Field
 
 from services.plugin import ActionNode, NodeContext, Operation, TaskQueue
 
-from ._credentials import GoogleCredential
+from .._credentials import GoogleCredential
 
-from ._base import build_google_service, run_sync, track_google_usage
+from .._base import build_google_service, run_sync, track_google_usage
 
 
 _CREATE = {"displayOptions": {"show": {"operation": ["create"]}}}
@@ -41,8 +41,10 @@ class ContactsParams(BaseModel):
     page_size: int = Field(default=100, ge=1, le=1000, json_schema_extra=_LIST_OR_SEARCH)
     page_token: Optional[str] = Field(default=None, json_schema_extra=_LIST)
     sort_order: Literal[
-        "LAST_MODIFIED_ASCENDING", "LAST_MODIFIED_DESCENDING",
-        "FIRST_NAME_ASCENDING", "LAST_NAME_ASCENDING",
+        "LAST_MODIFIED_ASCENDING",
+        "LAST_MODIFIED_DESCENDING",
+        "FIRST_NAME_ASCENDING",
+        "LAST_NAME_ASCENDING",
     ] = Field(default="LAST_MODIFIED_DESCENDING", json_schema_extra=_LIST)
 
     # Update-only
@@ -70,30 +72,30 @@ class ContactsOutput(BaseModel):
 
 
 def _format_contact(person: Dict[str, Any]) -> Dict[str, Any]:
-    names = person.get('names', [{}])
-    emails = person.get('emailAddresses', [])
-    phones = person.get('phoneNumbers', [])
-    orgs = person.get('organizations', [])
-    photos = person.get('photos', [])
+    names = person.get("names", [{}])
+    emails = person.get("emailAddresses", [])
+    phones = person.get("phoneNumbers", [])
+    orgs = person.get("organizations", [])
+    photos = person.get("photos", [])
 
     primary_name = names[0] if names else {}
-    primary_email = next((e for e in emails if e.get('metadata', {}).get('primary')), emails[0] if emails else {})
-    primary_phone = next((p for p in phones if p.get('metadata', {}).get('primary')), phones[0] if phones else {})
+    primary_email = next((e for e in emails if e.get("metadata", {}).get("primary")), emails[0] if emails else {})
+    primary_phone = next((p for p in phones if p.get("metadata", {}).get("primary")), phones[0] if phones else {})
     primary_org = orgs[0] if orgs else {}
-    primary_photo = next((p for p in photos if p.get('metadata', {}).get('primary')), photos[0] if photos else {})
+    primary_photo = next((p for p in photos if p.get("metadata", {}).get("primary")), photos[0] if photos else {})
 
     return {
-        'resource_name': person.get('resourceName'),
-        'display_name': primary_name.get('displayName', ''),
-        'given_name': primary_name.get('givenName', ''),
-        'family_name': primary_name.get('familyName', ''),
-        'email': primary_email.get('value', ''),
-        'phone': primary_phone.get('value', ''),
-        'company': primary_org.get('name', ''),
-        'job_title': primary_org.get('title', ''),
-        'photo_url': primary_photo.get('url', ''),
-        'emails': [e.get('value') for e in emails],
-        'phones': [p.get('value') for p in phones],
+        "resource_name": person.get("resourceName"),
+        "display_name": primary_name.get("displayName", ""),
+        "given_name": primary_name.get("givenName", ""),
+        "family_name": primary_name.get("familyName", ""),
+        "email": primary_email.get("value", ""),
+        "phone": primary_phone.get("value", ""),
+        "company": primary_org.get("name", ""),
+        "job_title": primary_org.get("title", ""),
+        "photo_url": primary_photo.get("url", ""),
+        "emails": [e.get("value") for e in emails],
+        "phones": [p.get("value") for p in phones],
     }
 
 
@@ -104,11 +106,11 @@ class ContactsNode(ActionNode):
     group = ("google", "tool")
     description = "Google Contacts create / list / search / get / update / delete"
     component_kind = "square"
+    tool_name = "google_contacts"
+    tool_description = "Manage Google Contacts. Operations: create (new contact), list (browse), search (find by name/email/phone), get (details by resource name), update (modify), delete (remove)."
     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}
     credentials = (GoogleCredential,)
@@ -128,16 +130,16 @@ class ContactsNode(ActionNode):
             if not params.first_name:
                 raise RuntimeError("First name is required")
             body: Dict[str, Any] = {
-                'names': [{'givenName': params.first_name, 'familyName': params.last_name or ''}],
+                "names": [{"givenName": params.first_name, "familyName": params.last_name or ""}],
             }
             if params.email:
-                body['emailAddresses'] = [{'value': params.email}]
+                body["emailAddresses"] = [{"value": params.email}]
             if params.phone:
-                body['phoneNumbers'] = [{'value': params.phone}]
+                body["phoneNumbers"] = [{"value": params.phone}]
             if params.company or params.job_title:
-                body['organizations'] = [{'name': params.company or '', 'title': params.job_title or ''}]
+                body["organizations"] = [{"name": params.company or "", "title": params.job_title or ""}]
             if params.notes:
-                body['biographies'] = [{'value': params.notes, 'contentType': 'TEXT_PLAIN'}]
+                body["biographies"] = [{"value": params.notes, "contentType": "TEXT_PLAIN"}]
 
             result = await run_sync(lambda: people_svc.createContact(body=body).execute())
             await track_google_usage("google_contacts", ctx.node_id, "create", 1, ctx.raw)
@@ -145,44 +147,48 @@ class ContactsNode(ActionNode):
 
         if op == "list":
             list_kwargs = {
-                'resourceName': 'people/me',
-                'pageSize': params.page_size,
-                'personFields': 'names,emailAddresses,phoneNumbers,organizations,photos,biographies',
-                'sortOrder': params.sort_order,
+                "resourceName": "people/me",
+                "pageSize": params.page_size,
+                "personFields": "names,emailAddresses,phoneNumbers,organizations,photos,biographies",
+                "sortOrder": params.sort_order,
             }
             if params.page_token:
-                list_kwargs['pageToken'] = params.page_token
+                list_kwargs["pageToken"] = params.page_token
             result = await run_sync(lambda: people_svc.connections().list(**list_kwargs).execute())
-            connections = result.get('connections', [])
+            connections = result.get("connections", [])
             contacts = [_format_contact(p) for p in connections]
             await track_google_usage("google_contacts", ctx.node_id, "list", len(contacts), ctx.raw)
             return ContactsOutput(
                 operation="list",
                 contacts=contacts,
                 count=len(contacts),
-                total_people=result.get('totalPeople', 0),
-                next_page_token=result.get('nextPageToken'),
+                total_people=result.get("totalPeople", 0),
+                next_page_token=result.get("nextPageToken"),
             )
 
         if op == "search":
             if not params.query:
                 raise RuntimeError("Search query is required")
-            result = await run_sync(lambda: people_svc.searchContacts(
-                query=params.query,
-                pageSize=min(params.page_size, 30),
-                readMask='names,emailAddresses,phoneNumbers,organizations,photos',
-            ).execute())
-            contacts = [_format_contact(r.get('person', {})) for r in result.get('results', [])]
+            result = await run_sync(
+                lambda: people_svc.searchContacts(
+                    query=params.query,
+                    pageSize=min(params.page_size, 30),
+                    readMask="names,emailAddresses,phoneNumbers,organizations,photos",
+                ).execute()
+            )
+            contacts = [_format_contact(r.get("person", {})) for r in result.get("results", [])]
             await track_google_usage("google_contacts", ctx.node_id, "search", len(contacts), ctx.raw)
             return ContactsOutput(operation="search", contacts=contacts, count=len(contacts))
 
         if op == "get":
             if not params.resource_name:
                 raise RuntimeError("Resource name is required")
-            result = await run_sync(lambda: people_svc.get(
-                resourceName=params.resource_name,
-                personFields='names,emailAddresses,phoneNumbers,organizations,photos,biographies,addresses',
-            ).execute())
+            result = await run_sync(
+                lambda: people_svc.get(
+                    resourceName=params.resource_name,
+                    personFields="names,emailAddresses,phoneNumbers,organizations,photos,biographies,addresses",
+                ).execute()
+            )
             await track_google_usage("google_contacts", ctx.node_id, "get", 1, ctx.raw)
             return ContactsOutput(operation="get", contact=_format_contact(result))
 
@@ -197,10 +203,12 @@ class ContactsNode(ActionNode):
             if not params.resource_name:
                 raise RuntimeError("Resource name is required")
 
-            current = await run_sync(lambda: people_svc.get(
-                resourceName=params.resource_name,
-                personFields='names,emailAddresses,phoneNumbers,organizations,metadata',
-            ).execute())
+            current = await run_sync(
+                lambda: people_svc.get(
+                    resourceName=params.resource_name,
+                    personFields="names,emailAddresses,phoneNumbers,organizations,metadata",
+                ).execute()
+            )
 
             first = params.update_first_name or params.first_name
             last = params.update_last_name or params.last_name
@@ -209,34 +217,38 @@ class ContactsNode(ActionNode):
             company = params.update_company or params.company
             job_title = params.update_job_title or params.job_title
 
-            body: Dict[str, Any] = {'etag': current.get('etag')}
+            body: Dict[str, Any] = {"etag": current.get("etag")}
             update_fields: List[str] = []
 
             if first or last:
-                cur_names = current.get('names', [{}])[0]
-                body['names'] = [{
-                    'givenName': first or cur_names.get('givenName', ''),
-                    'familyName': last or cur_names.get('familyName', ''),
-                }]
-                update_fields.append('names')
+                cur_names = current.get("names", [{}])[0]
+                body["names"] = [
+                    {
+                        "givenName": first or cur_names.get("givenName", ""),
+                        "familyName": last or cur_names.get("familyName", ""),
+                    }
+                ]
+                update_fields.append("names")
             if email:
-                body['emailAddresses'] = [{'value': email}]
-                update_fields.append('emailAddresses')
+                body["emailAddresses"] = [{"value": email}]
+                update_fields.append("emailAddresses")
             if phone:
-                body['phoneNumbers'] = [{'value': phone}]
-                update_fields.append('phoneNumbers')
+                body["phoneNumbers"] = [{"value": phone}]
+                update_fields.append("phoneNumbers")
             if company or job_title:
-                body['organizations'] = [{'name': company or '', 'title': job_title or ''}]
-                update_fields.append('organizations')
+                body["organizations"] = [{"name": company or "", "title": job_title or ""}]
+                update_fields.append("organizations")
 
             if not update_fields:
                 raise RuntimeError("At least one field to update is required")
 
-            result = await run_sync(lambda: people_svc.updateContact(
-                resourceName=params.resource_name,
-                body=body,
-                updatePersonFields=','.join(update_fields),
-            ).execute())
+            result = await run_sync(
+                lambda: people_svc.updateContact(
+                    resourceName=params.resource_name,
+                    body=body,
+                    updatePersonFields=",".join(update_fields),
+                ).execute()
+            )
             await track_google_usage("google_contacts", ctx.node_id, "update", 1, ctx.raw)
             return ContactsOutput(operation="update", contact=_format_contact(result))
 

package/server/nodes/google/contacts/meta.json

@@ -0,0 +1,3 @@
+{
+  "color": "#4285F4"
+}

package/server/nodes/google/{drive.py → drive/__init__.py}

@@ -12,9 +12,9 @@ from pydantic import BaseModel, ConfigDict, Field
 
 from services.plugin import ActionNode, NodeContext, Operation, TaskQueue
 
-from ._credentials import GoogleCredential
+from .._credentials import GoogleCredential
 
-from ._base import build_google_service, run_sync, track_google_usage
+from .._base import build_google_service, run_sync, track_google_usage
 
 
 _UPLOAD = {"displayOptions": {"show": {"operation": ["upload"]}}}
@@ -86,10 +86,10 @@ class DriveOutput(BaseModel):
 
 
 _FILE_TYPE_QUERY = {
-    'folder': "mimeType = 'application/vnd.google-apps.folder'",
-    'document': "mimeType = 'application/vnd.google-apps.document'",
-    'spreadsheet': "mimeType = 'application/vnd.google-apps.spreadsheet'",
-    'image': "mimeType contains 'image/'",
+    "folder": "mimeType = 'application/vnd.google-apps.folder'",
+    "document": "mimeType = 'application/vnd.google-apps.document'",
+    "spreadsheet": "mimeType = 'application/vnd.google-apps.spreadsheet'",
+    "image": "mimeType contains 'image/'",
 }
 
 
@@ -100,11 +100,11 @@ class DriveNode(ActionNode):
     group = ("google", "tool")
     description = "Google Drive upload / download / list / share files"
     component_kind = "square"
+    tool_name = "google_drive"
+    tool_description = "Manage Google Drive files. Operations: upload (add file from URL), download (get file by ID), list (find files), share (share with user)."
     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}
     credentials = (GoogleCredential,)
@@ -126,11 +126,11 @@ class DriveNode(ActionNode):
             if not params.file_url and not params.file_content:
                 raise RuntimeError("Either file_url or file_content is required")
 
-            metadata = {'name': params.filename}
+            metadata = {"name": params.filename}
             if params.folder_id:
-                metadata['parents'] = [params.folder_id]
+                metadata["parents"] = [params.folder_id]
             if params.description:
-                metadata['description'] = params.description
+                metadata["description"] = params.description
 
             mime_type = params.mime_type
             if params.file_url:
@@ -138,47 +138,52 @@ class DriveNode(ActionNode):
                     resp = await client.get(params.file_url, timeout=60.0)
                     resp.raise_for_status()
                     file_bytes = resp.content
-                    if mime_type == 'application/octet-stream' and 'content-type' in resp.headers:
-                        mime_type = resp.headers['content-type'].split(';')[0]
+                    if mime_type == "application/octet-stream" and "content-type" in resp.headers:
+                        mime_type = resp.headers["content-type"].split(";")[0]
             else:
                 file_bytes = base64.b64decode(params.file_content)
 
             media = MediaIoBaseUpload(io.BytesIO(file_bytes), mimetype=mime_type, resumable=True)
-            result = await run_sync(lambda: files_svc.create(
-                body=metadata, media_body=media,
-                fields='id, name, mimeType, size, webViewLink, webContentLink, createdTime',
-            ).execute())
+            result = await run_sync(
+                lambda: files_svc.create(
+                    body=metadata,
+                    media_body=media,
+                    fields="id, name, mimeType, size, webViewLink, webContentLink, createdTime",
+                ).execute()
+            )
             await track_google_usage("google_drive", ctx.node_id, "upload", 1, ctx.raw)
             return DriveOutput(
                 operation="upload",
-                file_id=result.get('id'),
-                name=result.get('name'),
-                mime_type=result.get('mimeType'),
-                size=int(result.get('size')) if result.get('size') else None,
-                web_link=result.get('webViewLink'),
-                download_link=result.get('webContentLink'),
-                created_time=result.get('createdTime'),
+                file_id=result.get("id"),
+                name=result.get("name"),
+                mime_type=result.get("mimeType"),
+                size=int(result.get("size")) if result.get("size") else None,
+                web_link=result.get("webViewLink"),
+                download_link=result.get("webContentLink"),
+                created_time=result.get("createdTime"),
             )
 
         if op == "download":
             if not params.file_id:
                 raise RuntimeError("File ID is required")
 
-            metadata = await run_sync(lambda: files_svc.get(
-                fileId=params.file_id,
-                fields='id, name, mimeType, size, webViewLink, webContentLink',
-            ).execute())
+            metadata = await run_sync(
+                lambda: files_svc.get(
+                    fileId=params.file_id,
+                    fields="id, name, mimeType, size, webViewLink, webContentLink",
+                ).execute()
+            )
 
             if params.output_format == "url":
                 await track_google_usage("google_drive", ctx.node_id, "download", 1, ctx.raw)
                 return DriveOutput(
                     operation="download",
-                    file_id=metadata.get('id'),
-                    name=metadata.get('name'),
-                    mime_type=metadata.get('mimeType'),
-                    size=int(metadata.get('size')) if metadata.get('size') else None,
-                    download_url=metadata.get('webContentLink'),
-                    web_link=metadata.get('webViewLink'),
+                    file_id=metadata.get("id"),
+                    name=metadata.get("name"),
+                    mime_type=metadata.get("mimeType"),
+                    size=int(metadata.get("size")) if metadata.get("size") else None,
+                    download_url=metadata.get("webContentLink"),
+                    web_link=metadata.get("webViewLink"),
                 )
 
             def _download():
@@ -194,11 +199,11 @@ class DriveNode(ActionNode):
             await track_google_usage("google_drive", ctx.node_id, "download", 1, ctx.raw)
             return DriveOutput(
                 operation="download",
-                file_id=metadata.get('id'),
-                name=metadata.get('name'),
-                mime_type=metadata.get('mimeType'),
+                file_id=metadata.get("id"),
+                name=metadata.get("name"),
+                mime_type=metadata.get("mimeType"),
                 size=len(file_bytes),
-                content_base64=base64.b64encode(file_bytes).decode('utf-8'),
+                content_base64=base64.b64encode(file_bytes).decode("utf-8"),
             )
 
         if op == "list":
@@ -210,36 +215,39 @@ class DriveNode(ActionNode):
             if params.file_types in _FILE_TYPE_QUERY:
                 query_parts.append(_FILE_TYPE_QUERY[params.file_types])
             query_parts.append("trashed = false")
-            full_query = ' and '.join(query_parts)
+            full_query = " and ".join(query_parts)
 
             list_kwargs = {
-                'pageSize': min(params.max_results, 1000),
-                'fields': 'nextPageToken, files(id, name, mimeType, size, webViewLink, webContentLink, createdTime, modifiedTime, parents, owners)',
-                'orderBy': params.order_by,
+                "pageSize": min(params.max_results, 1000),
+                "fields": "nextPageToken, files(id, name, mimeType, size, webViewLink, webContentLink, createdTime, modifiedTime, parents, owners)",
+                "orderBy": params.order_by,
             }
             if full_query:
-                list_kwargs['q'] = full_query
+                list_kwargs["q"] = full_query
 
             result = await run_sync(lambda: files_svc.list(**list_kwargs).execute())
-            raw = result.get('files', [])
-            formatted = [{
-                "file_id": f.get('id'),
-                "name": f.get('name'),
-                "mime_type": f.get('mimeType'),
-                "size": f.get('size'),
-                "web_link": f.get('webViewLink'),
-                "download_link": f.get('webContentLink'),
-                "created_time": f.get('createdTime'),
-                "modified_time": f.get('modifiedTime'),
-                "parent_ids": f.get('parents', []),
-                "owner": f.get('owners', [{}])[0].get('emailAddress') if f.get('owners') else None,
-            } for f in raw]
+            raw = result.get("files", [])
+            formatted = [
+                {
+                    "file_id": f.get("id"),
+                    "name": f.get("name"),
+                    "mime_type": f.get("mimeType"),
+                    "size": f.get("size"),
+                    "web_link": f.get("webViewLink"),
+                    "download_link": f.get("webContentLink"),
+                    "created_time": f.get("createdTime"),
+                    "modified_time": f.get("modifiedTime"),
+                    "parent_ids": f.get("parents", []),
+                    "owner": f.get("owners", [{}])[0].get("emailAddress") if f.get("owners") else None,
+                }
+                for f in raw
+            ]
             await track_google_usage("google_drive", ctx.node_id, "list", len(formatted), ctx.raw)
             return DriveOutput(
                 operation="list",
                 files=formatted,
                 count=len(formatted),
-                next_page_token=result.get('nextPageToken'),
+                next_page_token=result.get("nextPageToken"),
             )
 
         if op == "share":
@@ -248,25 +256,32 @@ class DriveNode(ActionNode):
             if not params.email:
                 raise RuntimeError("Email address is required")
 
-            perm = await run_sync(lambda: svc.permissions().create(
-                fileId=params.file_id,
-                body={'type': 'user', 'role': params.role, 'emailAddress': params.email},
-                sendNotificationEmail=params.send_notification,
-                emailMessage=params.message or None,
-                fields='id, type, role, emailAddress',
-            ).execute())
-            file_info = await run_sync(lambda: files_svc.get(
-                fileId=params.file_id, fields='id, name, webViewLink',
-            ).execute())
+            perm = await run_sync(
+                lambda: svc.permissions()
+                .create(
+                    fileId=params.file_id,
+                    body={"type": "user", "role": params.role, "emailAddress": params.email},
+                    sendNotificationEmail=params.send_notification,
+                    emailMessage=params.message or None,
+                    fields="id, type, role, emailAddress",
+                )
+                .execute()
+            )
+            file_info = await run_sync(
+                lambda: files_svc.get(
+                    fileId=params.file_id,
+                    fields="id, name, webViewLink",
+                ).execute()
+            )
             await track_google_usage("google_drive", ctx.node_id, "share", 1, ctx.raw)
             return DriveOutput(
                 operation="share",
-                permission_id=perm.get('id'),
+                permission_id=perm.get("id"),
                 file_id=params.file_id,
-                file_name=file_info.get('name'),
+                file_name=file_info.get("name"),
                 shared_with=params.email,
                 role=params.role,
-                web_link=file_info.get('webViewLink'),
+                web_link=file_info.get("webViewLink"),
             )
 
         raise RuntimeError(f"Unknown Drive operation: {op}")

package/server/nodes/google/drive/meta.json

@@ -0,0 +1,3 @@
+{
+  "color": "#0F9D58"
+}