obot-platform · tybalex · May 20, 2025 · May 20, 2025
diff --git a/google/gmail/apis/drafts.py b/google/gmail/apis/drafts.py
@@ -50,7 +50,7 @@ async def list_drafts(service, max_results=None):
                 )
 
             dataset_id = await gptscript_client.add_dataset_elements(
-                elements, name=f"gmail_drafts"
+                elements, name=f"gmail_drafts", description=f"list of drafts in Gmail"
             )
 
             print(f"Created dataset with ID {dataset_id} with {len(elements)} drafts")
@@ -65,7 +65,7 @@ def draft_to_string(service, draft):
     draft_id = draft["id"]
     draft_msg = service.users().drafts().get(userId="me", id=draft_id).execute()
     msg = draft_msg["message"]
-    subject, sender, to, cc, bcc, date = extract_message_headers(msg)
+    subject, sender, to, cc, bcc, date, _ = extract_message_headers(msg)
     return (
         draft_id,
         f"Draft ID: {draft_id}, From: {sender}, Subject: {subject}, To: {to}, CC: {cc}, Bcc: {bcc}, Saved: {date}",

diff --git a/google/gmail/commands/__init__.py b/google/gmail/commands/__init__.py
@@ -4,3 +4,4 @@
 from commands.update_label import update_label_tool
 from commands.delete_label import delete_label_tool
 from commands.modify_message_labels import modify_message_labels_tool
+from commands.list_drafts import list_drafts_tool
diff --git a/google/gmail/listDrafts.py → google/gmail/commands/list_drafts.py b/google/gmail/listDrafts.py → google/gmail/commands/list_drafts.py
@@ -5,15 +5,11 @@
 from apis.helpers import client
 
 
-async def main():
+async def list_drafts_tool():
     max_results = os.getenv("MAX_RESULTS", "100")
     if max_results is not None:
         max_results = int(max_results)
 
     service = client("gmail", "v1")
 
     await list_drafts(service, max_results)
-
-
-if __name__ == "__main__":
-    asyncio.run(main())
diff --git a/google/gmail/main.py b/google/gmail/main.py
@@ -7,9 +7,9 @@
     update_label_tool,
     delete_label_tool,
     modify_message_labels_tool,
+    list_drafts_tool,
 )
 
-
 async def main():
 
     if len(sys.argv) != 2:
@@ -33,6 +33,8 @@ async def main():
                 delete_label_tool()
             case "modify_message_labels":
                 modify_message_labels_tool()
+            case "list_drafts":
+                await list_drafts_tool()
             case _:
                 print(f"Command {command} not found")
     except Exception as e:

diff --git a/google/gmail/tool.gpt b/google/gmail/tool.gpt
@@ -87,7 +87,7 @@ Tools: github.com/gptscript-ai/datasets/filter
 Param: max_results: Maximum number of drafts to list (Optional: Default will list 100 drafts)
 Param: attachments: A comma separated list of workspace file paths to attach to the email (Optional)
 
-#!/usr/bin/env python3 ${GPTSCRIPT_TOOL_DIR}/listDrafts.py
+#!/usr/bin/env python3 ${GPTSCRIPT_TOOL_DIR}/main.py list_drafts
 
 ---
 Name: Create Draft