fix (mcp-enhancement): fixes to merged code for gdocs, gmail and notion mcp servers

Author: Kabeer2004

src/server/mcp_hub/gdocs/main.py

@@ -1,41 +1,27 @@
 import os
 import asyncio
+import json
 from typing import Dict, Any, Optional, List
-from qwen_agent.agents import Assistant
-from .tools import register_tools
-from . import auth, prompts, utils
+
 from dotenv import load_dotenv
 from fastmcp import FastMCP, Context
 from googleapiclient.errors import HttpError
 
 
+from . import auth, prompts
+
 # --- LLM and Environment Configuration ---
 ENVIRONMENT = os.getenv('ENVIRONMENT', 'dev-local')
 if ENVIRONMENT == 'dev-local':
     dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
     if os.path.exists(dotenv_path):
         load_dotenv(dotenv_path=dotenv_path)
 
-OPENAI_API_BASE_URL = os.getenv("OPENAI_API_BASE_URL", "http://localhost:11434")
-OPENAI_MODEL_NAME = os.getenv("OPENAI_MODEL_NAME", "qwen3:4b")
-OPENAI_API_KEY = os.getenv("OPENAI_API_KEY", "ollama")
-
-def get_generator_agent():
-    """Initializes a Qwen agent specifically for generating JSON outlines internally."""
-    llm_cfg = {
-        'model': OPENAI_MODEL_NAME,
-        'model_server': f"{OPENAI_API_BASE_URL.rstrip('/')}/v1",
-        'api_key': OPENAI_API_KEY,
-    }
-    return Assistant(llm=llm_cfg, system_message=prompts.JSON_GENERATOR_SYSTEM_PROMPT, function_list=[])
-
 mcp = FastMCP(
     name="GDocsServer",
     instructions="This server provides tools to create and manage Google Docs.",
 )
 
-register_tools(mcp)
-
 @mcp.resource("prompt://gdocs-agent-system")
 def get_gdocs_system_prompt() -> str:
     """Provides the system prompt that instructs the main orchestrator agent on how to use the gdocs tools."""

src/server/mcp_hub/gmail/utils.py

@@ -94,3 +94,4 @@ async def summarize_emails_with_gemini(emails: List[Dict]) -> str:
         response = client.generate_content(prompt)
         return response.text
     except Exception as e:
+        return {"status": "failure", "error": str(e)}

src/server/mcp_hub/notion/main.py

@@ -3,7 +3,8 @@
 from typing import Dict, Any, Optional, List
 
 from dotenv import load_dotenv
-from fastmcp import FastMCP, Context, ToolError
+from fastmcp import FastMCP, Context
+from fastmcp.exceptions import ToolError
 from fastmcp.prompts.prompt import Message
 from notion_client.helpers import is_full_page_or_database