gmail integration with merged gcal and config modifications

Author: waleedalzarooni

backend/app/controller/tool_controller.py

@@ -1,6 +1,7 @@
 from fastapi import APIRouter, HTTPException
 from app.utils.toolkit.notion_mcp_toolkit import NotionMCPToolkit
 from app.utils.toolkit.google_calendar_toolkit import GoogleCalendarToolkit
+from app.utils.toolkit.google_gmail_toolkit import GoogleGmailToolkit
 from app.utils.oauth_state_manager import oauth_state_manager
 from utils import traceroot_wrapper as traceroot
 from camel.toolkits.hybrid_browser_toolkit.hybrid_browser_toolkit_ts import (
@@ -104,10 +105,46 @@ async def install_tool(tool: str):
                 status_code=500,
                 detail=f"Failed to install {tool}: {str(e)}"
             )
+    elif tool == "google_gmail":
+        try:
+            # Try to initialize toolkit - will succeed if credentials exist
+            try:
+                toolkit = GoogleGmailToolkit("install_auth")
+                tools = [tool_func.func.__name__ for tool_func in toolkit.get_tools()]
+                logger.info(f"Successfully initialized Gmail toolkit with {len(tools)} tools")
+
+                return {
+                    "success": True,
+                    "tools": tools,
+                    "message": f"Successfully installed {tool} toolkit",
+                    "count": len(tools),
+                    "toolkit_name": "GoogleGmailToolkit"
+                }
+            except ValueError as auth_error:
+                # No credentials - need authorization
+                logger.info(f"No credentials found, starting authorization: {auth_error}")
+
+                # Start background authorization in a new thread
+                logger.info("Starting background Gmail authorization")
+                GoogleGmailToolkit.start_background_auth("install_auth")
+
+                return {
+                    "success": False,
+                    "status": "authorizing",
+                    "message": "Authorization required. Browser should open automatically. Complete authorization and try installing again.",
+                    "toolkit_name": "GoogleGmailToolkit",
+                    "requires_auth": True
+                }
+        except Exception as e:
+            logger.error(f"Failed to install {tool} toolkit: {e}")
+            raise HTTPException(
+                status_code=500,
+                detail=f"Failed to install {tool}: {str(e)}"
+            )
     else:
         raise HTTPException(
             status_code=404,
-            detail=f"Tool '{tool}' not found. Available tools: ['notion', 'google_calendar']"
+            detail=f"Tool '{tool}' not found. Available tools: ['notion', 'google_calendar', 'google_gmail']"
         )
 
 
@@ -134,6 +171,13 @@ async def list_available_tools():
                 "description": "Google Calendar integration for managing events and schedules",
                 "toolkit_class": "GoogleCalendarToolkit",
                 "requires_auth": True
+            },
+            {
+                "name": "google_gmail",
+                "display_name": "Gmail",
+                "description": "Gmail integration for managing emails, drafts, labels, contacts, and more",
+                "toolkit_class": "GoogleGmailToolkit",
+                "requires_auth": True
             }
         ]
     }
@@ -287,10 +331,40 @@ async def uninstall_tool(tool: str):
                 status_code=500,
                 detail=f"Failed to uninstall {tool}: {str(e)}"
             )
+
+    elif tool == "google_gmail":
+        try:
+            # Clean up Gmail token directory
+            token_dir = os.path.join(os.path.expanduser("~"), ".eigent", "tokens", "gmail")
+            if os.path.exists(token_dir):
+                shutil.rmtree(token_dir)
+                logger.info(f"Removed Gmail token directory: {token_dir}")
+
+            # Clear OAuth state manager cache
+            # This removes the cached credentials from memory
+            state = oauth_state_manager.get_state("google_gmail")
+            if state:
+                if state.status in ["pending", "authorizing"]:
+                    state.cancel()
+                    logger.info("Cancelled ongoing Gmail authorization")
+                # Clear the state completely to remove cached credentials
+                oauth_state_manager._states.pop("google_gmail", None)
+                logger.info("Cleared Gmail OAuth state cache")
+
+            return {
+                "success": True,
+                "message": f"Successfully uninstalled {tool} and cleaned up authentication tokens"
+            }
+        except Exception as e:
+            logger.error(f"Failed to uninstall {tool}: {e}")
+            raise HTTPException(
+                status_code=500,
+                detail=f"Failed to uninstall {tool}: {str(e)}"
+            )
     else:
         raise HTTPException(
             status_code=404,
-            detail=f"Tool '{tool}' not found. Available tools: ['notion', 'google_calendar']"
+            detail=f"Tool '{tool}' not found. Available tools: ['notion', 'google_calendar', 'google_gmail']"
         )
 
 

backend/app/utils/agent.py

@@ -25,7 +25,7 @@
 from app.utils.toolkit.file_write_toolkit import FileToolkit
 from app.utils.toolkit.google_calendar_toolkit import GoogleCalendarToolkit
 from app.utils.toolkit.google_drive_mcp_toolkit import GoogleDriveMCPToolkit
-from app.utils.toolkit.google_gmail_mcp_toolkit import GoogleGmailMCPToolkit
+from app.utils.toolkit.google_gmail_toolkit import GoogleGmailToolkit
 from app.utils.toolkit.human_toolkit import HumanToolkit
 from app.utils.toolkit.markitdown_toolkit import MarkItDownToolkit
 from app.utils.toolkit.mcp_search_toolkit import McpSearchToolkit
@@ -1280,7 +1280,7 @@ async def social_medium_agent(options: Chat):
         *RedditToolkit.get_can_use_tools(options.project_id),
         *await NotionMCPToolkit.get_can_use_tools(options.project_id),
         # *SlackToolkit.get_can_use_tools(options.project_id),
-        *await GoogleGmailMCPToolkit.get_can_use_tools(options.project_id, options.get_bun_env()),
+        *GoogleGmailToolkit.get_can_use_tools(options.project_id),
         *GoogleCalendarToolkit.get_can_use_tools(options.project_id),
         *HumanToolkit.get_can_use_tools(options.project_id, Agents.social_medium_agent),
         *TerminalToolkit(options.project_id, agent_name=Agents.social_medium_agent, clone_current_env=False).get_tools(),
@@ -1375,7 +1375,7 @@ async def social_medium_agent(options: Chat):
             LinkedInToolkit.toolkit_name(),
             RedditToolkit.toolkit_name(),
             NotionMCPToolkit.toolkit_name(),
-            GoogleGmailMCPToolkit.toolkit_name(),
+            GoogleGmailToolkit.toolkit_name(),
             GoogleCalendarToolkit.toolkit_name(),
             HumanToolkit.toolkit_name(),
             TerminalToolkit.toolkit_name(),
@@ -1455,7 +1455,7 @@ async def get_toolkits(tools: list[str], agent_name: str, api_task_id: str):
         "github_toolkit": GithubToolkit,
         "google_calendar_toolkit": GoogleCalendarToolkit,
         "google_drive_mcp_toolkit": GoogleDriveMCPToolkit,
-        "google_gmail_mcp_toolkit": GoogleGmailMCPToolkit,
+        "google_gmail_toolkit": GoogleGmailToolkit,
         "image_analysis_toolkit": ImageAnalysisToolkit,
         "linkedin_toolkit": LinkedInToolkit,
         "mcp_search_toolkit": McpSearchToolkit,