feat (server-revamp): added gmaps mcp

itsskofficial · itsskofficial · commit 2b124f7f84ed · 2025-06-16T17:16:45.000+05:30
diff --git a/src/client/.env.template b/src/client/.env.template
@@ -1,4 +1,3 @@
-# src/client/.env.template
 # For env vars related to the Google project and Auth0 setup, comment in the discussion titled 'Request Environment Variables (.env) Here' (https://github.com/existence-master/Sentient/discussions/13) Make sure to keep the values in this file empty while committing to the repository
  
 NEXT_PUBLIC_APP_SERVER_URL=
diff --git a/src/client/app/api/chat/message/route.js b/src/client/app/api/chat/message/route.js
@@ -1,4 +1,3 @@
-// src/client/app/api/chat/message/route.js
 import { NextResponse } from "next/server"
 import { auth0 } from "@lib/auth0"
 import { getBackendAuthHeader } from "@lib/auth0"
@@ -13,8 +12,14 @@ export async function POST(request) {
 	}
 
 	try {
-		const { input, chatId, enable_internet, enable_weather, enable_news } =
-			await request.json()
+		const {
+			input,
+			chatId,
+			enable_internet,
+			enable_weather,
+			enable_news,
+			enable_maps
+		} = await request.json()
 		const authHeader = await getBackendAuthHeader()
 
 		// Fetch user pricing/credits to pass to the backend
@@ -41,7 +46,8 @@ export async function POST(request) {
 					credits,
 					enable_internet,
 					enable_weather,
-					enable_news
+					enable_news,
+					enable_maps
 				}),
 				// IMPORTANT: duplex must be set to 'half' to stream response body in Next.js Edge/Node runtime
 				duplex: "half"
diff --git a/src/client/app/chat/[[...chatId]]/page.js b/src/client/app/chat/[[...chatId]]/page.js
@@ -1,4 +1,3 @@
-// src/client/app/chat/[[...chatId]]/page.js
 "use client"
 import React, { useState, useEffect, useRef, useCallback, use } from "react"
 import { useRouter } from "next/navigation"
@@ -23,7 +22,8 @@ import {
 	IconFileText,
 	IconPresentation,
 	IconTable,
-	IconMessageOff
+	IconMessageOff,
+	IconMap
 } from "@tabler/icons-react"
 import toast from "react-hot-toast"
 import GmailSearchResults from "@components/agents/GmailSearchResults"
@@ -65,6 +65,7 @@ const Chat = ({ params }) => {
 	const [isInternetEnabled, setInternetEnabled] = useState(false)
 	const [isWeatherEnabled, setWeatherEnabled] = useState(false)
 	const [isNewsEnabled, setNewsEnabled] = useState(false)
+	const [isMapsEnabled, setMapsEnabled] = useState(false)
 
 	// --- Refs ---
 	const textareaRef = useRef(null)
@@ -270,7 +271,8 @@ const Chat = ({ params }) => {
 					chatId: currentChatId,
 					enable_internet: isInternetEnabled,
 					enable_weather: isWeatherEnabled,
-					enable_news: isNewsEnabled
+					enable_news: isNewsEnabled,
+					enable_maps: isMapsEnabled
 				}),
 				signal: abortControllerRef.current.signal
 			})
@@ -698,6 +700,26 @@ const Chat = ({ params }) => {
 														}
 													/>
 												</label>
+												<label
+													htmlFor="maps-toggle"
+													className="flex items-center gap-1.5 cursor-pointer hover:text-white transition-colors"
+												>
+													<IconMap
+														size={16}
+														className={
+															isMapsEnabled
+																? "text-lightblue"
+																: ""
+														}
+													/>
+													<span>Maps</span>
+													<Switch
+														checked={isMapsEnabled}
+														onCheckedChange={
+															setMapsEnabled
+														}
+													/>
+												</label>
 											</div>
 											{connectedIntegrations.length >
 												0 && (
diff --git a/src/client/app/settings/page.js b/src/client/app/settings/page.js
@@ -26,7 +26,8 @@ import {
 	IconLock,
 	IconLockOpen,
 	IconPresentation,
-	IconTable
+	IconTable,
+	IconMapPin
 } from "@tabler/icons-react"
 import { useState, useEffect, useCallback } from "react"
 import Sidebar from "@components/Sidebar"
@@ -41,6 +42,7 @@ const integrationIcons = {
 	gdocs: IconFileText,
 	gslides: IconPresentation,
 	gsheets: IconTable,
+	gmaps: IconMapPin,
 	slack: IconBrandSlack,
 	notion: IconBrandNotion,
 	accuweather: IconCloud,
@@ -267,8 +269,8 @@ const GoogleAuthSettings = ({ mode, onModeChange, onSaveSuccess }) => {
 				</li>
 				<li>
 					Enable the APIs you want to use (e.g., Gmail API, Google
-					Drive API, Google Calendar API) in the "APIs & Services"
-					dashboard.
+					Drive API, Google Calendar API, Google Maps Platform APIs)
+					in the "APIs & Services" dashboard.
 				</li>
 				<li>
 					Go to "Credentials", click "Create Credentials", and select
@@ -306,6 +308,7 @@ const GoogleAuthSettings = ({ mode, onModeChange, onSaveSuccess }) => {
 						<li>https://www.googleapis.com/auth/documents</li>
 						<li>https://www.googleapis.com/auth/presentations</li>
 						<li>https://www.googleapis.com/auth/spreadsheets</li>
+						<li>https://www.googleapis.com/auth/cloud-platform</li>
 					</ul>
 				</li>
 			</ol>
@@ -475,6 +478,7 @@ const Settings = () => {
 				gslides:
 					"https://www.googleapis.com/auth/presentations https://www.googleapis.com/auth/drive",
 				gsheets: "https://www.googleapis.com/auth/spreadsheets",
+				gmaps: "https://www.googleapis.com/auth/cloud-platform",
 				github: "repo user"
 			}
 
diff --git a/src/server/.env.template b/src/server/.env.template
@@ -47,4 +47,5 @@ NEWS_MCP_SERVER_URL=http://localhost:9012/sse
 CHAT_TOOLS_MCP_SERVER_URL=http://localhost:9013/sse
 GDOCS_MCP_SERVER_URL=http://localhost:9004/sse
 GSLIDES_MCP_SERVER_URL=http://localhost:9014/sse
-GSHEETS_MCP_SERVER_URL=http://localhost:9015/sse
+GSHEETS_MCP_SERVER_URL=http://localhost:9015/sse
+GMAPS_MCP_SERVER_URL=http://localhost:9016/sse
diff --git a/src/server/main/chat/models.py b/src/server/main/chat/models.py
@@ -1,4 +1,3 @@
-# src/server/main/chat/models.py
 from pydantic import BaseModel, Field
 from typing import Optional, Any
 
@@ -10,6 +9,7 @@ class ChatMessageInput(BaseModel):
     enable_internet: Optional[bool] = False
     enable_weather: Optional[bool] = False
     enable_news: Optional[bool] = False
+    enable_maps: Optional[bool] = False
 
 class ChatHistoryRequest(BaseModel):
     chatId: Any
diff --git a/src/server/main/chat/utils.py b/src/server/main/chat/utils.py
@@ -9,7 +9,7 @@
 
 from ..db import MongoManager
 from ..llm import get_qwen_assistant
-from ..config import MEMORY_MCP_SERVER_URL
+from ..config import MEMORY_MCP_SERVER_URL, INTEGRATIONS_CONFIG
 
 logger = logging.getLogger(__name__)
 
@@ -39,13 +39,12 @@ async def generate_chat_llm_stream(
     assistant_message_id_override: Optional[str] = None,
     enable_internet: bool = False,
     enable_weather: bool = False,
-    enable_news: bool = False
+    enable_news: bool = False,
+    enable_maps: bool = False
     ) -> AsyncGenerator[Dict[str, Any], None]:
     assistant_message_id = assistant_message_id_override or str(uuid.uuid4())
 
     try:
-        from ..config import INTEGRATIONS_CONFIG
-
         active_mcp_servers = {}
 
         # Always connect memory and chat tools
@@ -55,25 +54,20 @@ async def generate_chat_llm_stream(
                 mcp_config = config["mcp_server_config"]
                 active_mcp_servers[mcp_config["name"]] = {"url": mcp_config["url"], "headers": {"X-User-ID": user_id}}
 
-        # Conditionally connect internet search
-        if enable_internet:
-            config = INTEGRATIONS_CONFIG.get("internet_search")
-            if config and "mcp_server_config" in config:
-                mcp_config = config["mcp_server_config"]
-                active_mcp_servers[mcp_config["name"]] = {"url": mcp_config["url"], "headers": {"X-User-ID": user_id}}
-
-        # Conditionally connect weather
-        if enable_weather:
-            config = INTEGRATIONS_CONFIG.get("accuweather")
-            if config and "mcp_server_config" in config:
-                mcp_config = config["mcp_server_config"]
-                active_mcp_servers[mcp_config["name"]] = {"url": mcp_config["url"], "headers": {"X-User-ID": user_id}}
-
-        if enable_news:
-            config = INTEGRATIONS_CONFIG.get("news")
-            if config and "mcp_server_config" in config:
-                mcp_config = config["mcp_server_config"]
-                active_mcp_servers[mcp_config["name"]] = {"url": mcp_config["url"], "headers": {"X-User-ID": user_id}}
+        # Conditionally connect tools based on toggles
+        tool_flags = {
+            "internet_search": enable_internet,
+            "accuweather": enable_weather,
+            "news": enable_news,
+            "gmaps": enable_maps
+        }
+
+        for service_name, is_enabled in tool_flags.items():
+            if is_enabled:
+                config = INTEGRATIONS_CONFIG.get(service_name)
+                if config and "mcp_server_config" in config:
+                    mcp_config = config["mcp_server_config"]
+                    active_mcp_servers[mcp_config["name"]] = {"url": mcp_config["url"], "headers": {"X-User-ID": user_id}}
 
         tools = [{"mcpServers": active_mcp_servers}]
 
@@ -106,11 +100,12 @@ def worker():
                     f"You are a helpful AI assistant named Sentient. The user's name is {username}. The current date is {datetime.datetime.now().strftime('%Y-%m-%d')}.\n\n"
                     "You have access to a few tools:\n"
                     "- Use memory tools (`search_memories`, `save_long_term_fact`, etc.) to remember and recall information about the user.\n"
-                    "- If the user asks you to perform an action (e.g., 'send an email', 'create a presentation'), use the `create_task_from_description` tool to hand it off to the planning system. Do not try to execute it yourself.\n"
+                    "- If the user asks for an action to be performed (e.g., 'send an email', 'create a presentation'), use the `create_task_from_description` tool to hand it off to the planning system. Do not try to execute it yourself.\n"
                     "- You can check the status of a task with `get_task_status`.\n"
                     f"- Internet search is currently {'ENABLED' if enable_internet else 'DISABLED'}. You can use it to find real-time information if enabled.\n"
                     f"- Weather information is currently {'ENABLED' if enable_weather else 'DISABLED'}.\n"
-                    f"- News headlines and articles are currently {'ENABLED' if enable_news else 'DISABLED'}.\n\n"
+                    f"- News headlines and articles are currently {'ENABLED' if enable_news else 'DISABLED'}.\n"
+                    f"- Google Maps for places and directions is currently {'ENABLED' if enable_maps else 'DISABLED'}.\n\n"
                     "Be conversational and helpful."
                 )
                 qwen_assistant = get_qwen_assistant(system_message=system_prompt, function_list=tools)
diff --git a/src/server/main/config.py b/src/server/main/config.py
@@ -140,6 +140,16 @@
             "url": os.getenv("GSHEETS_MCP_SERVER_URL", "http://localhost:9015/sse")
         }
     },
+    "gmaps": {
+        "display_name": "Google Maps",
+        "description": "Search for places and get directions.",
+        "auth_type": "oauth",
+        "icon": "IconMapPin",
+        "mcp_server_config": {
+            "name": "gmaps_server",
+            "url": os.getenv("GMAPS_MCP_SERVER_URL", "http://localhost:9016/sse")
+        }
+    },
     "slack": { # User-configurable Manual
         "display_name": "Slack",
         "description": "Connect to your Slack workspace to send messages and more.",
diff --git a/src/server/main/misc/routes.py b/src/server/main/misc/routes.py
@@ -86,8 +86,11 @@ async def _validate_gcp_credentials(creds_json_str: str, user_email: str) -> boo
     """
     try:
         creds_info = json.loads(creds_json_str)
-        # We need drive scope for the about.get call
-        scopes = ['https://www.googleapis.com/auth/drive.readonly']
+        # We need drive scope for the about.get call and cloud-platform for maps
+        scopes = [
+            'https://www.googleapis.com/auth/drive.readonly',
+            'https://www.googleapis.com/auth/cloud-platform'
+        ]
         
         creds = service_account.Credentials.from_service_account_info(
             creds_info, scopes=scopes, subject=user_email
diff --git a/src/server/mcp-hub/gmaps/.env.template b/src/server/mcp-hub/gmaps/.env.template
@@ -0,0 +1,6 @@
+# HTTP Server configuration for FastMCP
+MCP_SERVER_HOST=127.0.0.1
+MCP_SERVER_PORT=9016
+
+# This MCP uses the main server's Google credentials.
+# No separate API key is needed if using the Service Account or OAuth flow.
diff --git a/src/server/mcp-hub/gmaps/__init__.py b/src/server/mcp-hub/gmaps/__init__.py
@@ -0,0 +1 @@
+# This file can remain empty. It marks the 'gmaps' directory as a Python package.
diff --git a/src/server/mcp-hub/gmaps/auth.py b/src/server/mcp-hub/gmaps/auth.py
@@ -0,0 +1,111 @@
+import os
+import json
+import base64
+from typing import Optional
+
+import motor.motor_asyncio
+from cryptography.hazmat.backends import default_backend
+from cryptography.hazmat.primitives import padding
+from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
+from dotenv import load_dotenv
+from fastmcp import Context
+from fastmcp.exceptions import ToolError
+from google.oauth2 import service_account
+from google.oauth2.credentials import Credentials
+
+# Load from main server .env, which is two levels up
+dotenv_path = os.path.join(os.path.dirname(__file__), "..", "..", ".env")
+load_dotenv(dotenv_path=dotenv_path)
+
+MONGO_URI = os.getenv("MONGO_URI")
+MONGO_DB_NAME = os.getenv("MONGO_DB_NAME")
+AES_SECRET_KEY_HEX = os.getenv("AES_SECRET_KEY")
+AES_IV_HEX = os.getenv("AES_IV")
+
+AES_SECRET_KEY: Optional[bytes] = (
+    bytes.fromhex(AES_SECRET_KEY_HEX)
+    if AES_SECRET_KEY_HEX and len(AES_SECRET_KEY_HEX) == 64
+    else None
+)
+AES_IV: Optional[bytes] = (
+    bytes.fromhex(AES_IV_HEX) if AES_IV_HEX and len(AES_IV_HEX) == 32 else None
+)
+
+
+def aes_decrypt(encrypted_data: str) -> str:
+    if not AES_SECRET_KEY or not AES_IV:
+        raise ValueError("AES encryption keys are not configured in the environment.")
+    backend = default_backend()
+    cipher = Cipher(algorithms.AES(AES_SECRET_KEY), modes.CBC(AES_IV), backend=backend)
+    decryptor = cipher.decryptor()
+    encrypted_bytes = base64.b64decode(encrypted_data)
+    decrypted = decryptor.update(encrypted_bytes) + decryptor.finalize()
+    unpadder = padding.PKCS7(algorithms.AES.block_size).unpadder()
+    unpadded_data = unpadder.update(decrypted) + unpadder.finalize()
+    return unpadded_data.decode()
+
+
+client = motor.motor_asyncio.AsyncIOMotorClient(MONGO_URI)
+db = client[MONGO_DB_NAME]
+users_collection = db["user_profiles"]
+
+
+def get_user_id_from_context(ctx: Context) -> str:
+    http_request = ctx.get_http_request()
+    if not http_request:
+        raise ToolError("HTTP request context is not available.")
+    user_id = http_request.headers.get("X-User-ID")
+    if not user_id:
+        raise ToolError("Authentication failed: 'X-User-ID' header is missing.")
+    return user_id
+
+
+async def get_google_creds(user_id: str) -> Credentials:
+    user_doc = await users_collection.find_one({"user_id": user_id})
+    if not user_doc or not user_doc.get("userData"):
+        raise ToolError(f"User profile or userData not found for user_id: {user_id}.")
+
+    user_data = user_doc["userData"]
+    google_auth_config = user_data.get("googleAuth", {})
+    auth_mode = google_auth_config.get("mode", "default")
+    # Define scopes needed by this MCP
+    scopes = [
+        "https://www.googleapis.com/auth/cloud-platform",
+    ]
+
+    if auth_mode == "custom":
+        user_email = user_data.get("personalInfo", {}).get("email")
+        if not user_email:
+            raise ToolError(
+                "User email is not available for service account impersonation."
+            )
+
+        encrypted_creds = google_auth_config.get("encryptedCredentials")
+        if not encrypted_creds:
+            raise ToolError(
+                "Custom Google auth mode is selected, but no credentials are provided."
+            )
+
+        try:
+            decrypted_creds_json = aes_decrypt(encrypted_creds)
+            service_account_info = json.loads(decrypted_creds_json)
+            creds = service_account.Credentials.from_service_account_info(
+                service_account_info, scopes=scopes, subject=user_email
+            )
+            return creds
+        except Exception as e:
+            raise ToolError(f"Failed to use custom Google credentials: {e}")
+
+    else:  # Default OAuth Flow
+        # Maps doesn't require a dedicated connection like Gmail/Drive, it uses the platform scope.
+        # We check if *any* Google OAuth service is connected to get a token.
+        gdrive_data = user_data.get("integrations", {}).get("gdrive")
+        if not gdrive_data or not gdrive_data.get("connected"):
+             raise ToolError(f"No active Google integration found to use for Maps. Please connect Google Drive first.")
+        
+        try:
+            decrypted_creds_str = aes_decrypt(gdrive_data["credentials"])
+            token_info = json.loads(decrypted_creds_str)
+            return Credentials.from_authorized_user_info(token_info)
+        except Exception as e:
+            raise ToolError(f"Failed to decrypt or parse default OAuth token: {e}")
diff --git a/src/server/mcp-hub/gmaps/main.py b/src/server/mcp-hub/gmaps/main.py
diff --git a/src/server/mcp-hub/gmaps/prompts.py b/src/server/mcp-hub/gmaps/prompts.py
diff --git a/src/server/mcp-hub/gmaps/requirements.txt b/src/server/mcp-hub/gmaps/requirements.txt
diff --git a/src/server/mcp-hub/gmaps/test_client.py b/src/server/mcp-hub/gmaps/test_client.py
diff --git a/src/server/mcp-hub/gmaps/utils.py b/src/server/mcp-hub/gmaps/utils.py

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-# src/client/.env.template`
`2`	`1`	`# For env vars related to the Google project and Auth0 setup, comment in the discussion titled 'Request Environment Variables (.env) Here' (https://github.com/existence-master/Sentient/discussions/13) Make sure to keep the values in this file empty while committing to the repository`
`3`	`2`
`4`	`3`	`NEXT_PUBLIC_APP_SERVER_URL=`