serpapi · vladm-serpapi · Dec 3, 2025 · Dec 3, 2025 · Dec 3, 2025
diff --git a/.env.example b/.env.example
@@ -1,16 +1,8 @@
 # SerpApi MCP Server Configuration
 
-# Required: Your SerpApi API key
-# Get your key from: https://serpapi.com/manage-api-key
-SERPAPI_API_KEY=your_api_key_here
-
-# Optional: Default search engine (default: google_light)
-# Options: google, google_light, bing, yahoo, duckduckgo, yandex, baidu, youtube_search, ebay, walmart
-SERPAPI_DEFAULT_ENGINE=google_light
-
-# Optional: Request timeout in seconds (default: 30)
-SERPAPI_TIMEOUT=30
-
-# Optional: MCP Server Configuration
+# MCP Server Configuration
+# Host to bind the server to (default: 0.0.0.0)
 MCP_HOST=0.0.0.0
+
+# Port to run the server on (default: 8000)
 MCP_PORT=8000
diff --git a/README.md b/README.md
@@ -11,8 +11,8 @@ A Model Context Protocol (MCP) server implementation that integrates with [SerpA
 - **Real-time Weather Data**: Location-based weather with forecasts via search queries
 - **Stock Market Data**: Company financials and market data through search integration
 - **Dynamic Result Processing**: Automatically detects and formats different result types
-- **Raw JSON Support**: Option to return full unprocessed API responses
-- **Structured Results**: Clean, formatted output optimized for AI consumption
+- **Flexible Response Modes**: Complete or compact JSON responses
+- **JSON Responses**: Structured JSON output with complete or compact modes
 
 ## Quick Start
 
@@ -74,7 +74,7 @@ The parameters you can provide are specific for each API engine. Some sample par
 - `params.q` (required): Search query
 - `params.engine`: Search engine (default: "google_light") 
 - `params.location`: Geographic filter
-- `raw`: Return raw JSON (default: false)
+- `mode`: Response mode - "complete" (default) or "compact"
 - ...see other parameters on the [SerpApi API reference](https://serpapi.com/search-api)
 
 **Examples:**
@@ -83,7 +83,8 @@ The parameters you can provide are specific for each API engine. Some sample par
 {"name": "search", "arguments": {"params": {"q": "coffee shops", "location": "Austin, TX"}}}
 {"name": "search", "arguments": {"params": {"q": "weather in London"}}}
 {"name": "search", "arguments": {"params": {"q": "AAPL stock"}}}
-{"name": "search", "arguments": {"params": {"q": "news"}, "raw": true}}
+{"name": "search", "arguments": {"params": {"q": "news"}, "mode": "compact"}}
+{"name": "search", "arguments": {"params": {"q": "detailed search"}, "mode": "complete"}}
 ```
 
 **Supported Engines:** Google, Bing, Yahoo, DuckDuckGo, YouTube, eBay, and more.

diff --git a/src/server.py b/src/server.py
@@ -57,103 +57,12 @@ async def dispatch(self, request: Request, call_next):
         return await call_next(request)
 
 
-def format_answer_box(answer_box: dict[str, Any]) -> str:
-    """Format answer_box results for weather, finance, and other structured data."""
-    if answer_box.get("type") == "weather_result":
-        result = f"Temperature: {answer_box.get('temperature', 'N/A')}\n"
-        result += f"Unit: {answer_box.get('unit', 'N/A')}\n"
-        result += f"Precipitation: {answer_box.get('precipitation', 'N/A')}\n"
-        result += f"Humidity: {answer_box.get('humidity', 'N/A')}\n"
-        result += f"Wind: {answer_box.get('wind', 'N/A')}\n"
-        result += f"Location: {answer_box.get('location', 'N/A')}\n"
-        result += f"Date: {answer_box.get('date', 'N/A')}\n"
-        result += f"Weather: {answer_box.get('weather', 'N/A')}"
-
-        # Add forecast if available
-        if "forecast" in answer_box:
-            result += "\n\nDaily Forecast:\n"
-            for day in answer_box["forecast"]:
-                result += f"{day.get('day', 'N/A')}: {day.get('weather', 'N/A')} "
-                if "temperature" in day:
-                    high = day["temperature"].get("high", "N/A")
-                    low = day["temperature"].get("low", "N/A")
-                    result += f"(High: {high}, Low: {low})"
-                result += "\n"
-
-        return result
-
-    elif answer_box.get("type") == "finance_results":
-        result = f"Title: {answer_box.get('title', 'N/A')}\n"
-        result += f"Exchange: {answer_box.get('exchange', 'N/A')}\n"
-        result += f"Stock: {answer_box.get('stock', 'N/A')}\n"
-        result += f"Currency: {answer_box.get('currency', 'N/A')}\n"
-        result += f"Price: {answer_box.get('price', 'N/A')}\n"
-        result += f"Previous Close: {answer_box.get('previous_close', 'N/A')}\n"
-
-        if "price_movement" in answer_box:
-            pm = answer_box["price_movement"]
-            result += f"Price Movement: {pm.get('price', 'N/A')} ({pm.get('percentage', 'N/A')}%) {pm.get('movement', 'N/A')}\n"
-
-        if "table" in answer_box:
-            result += "\nFinancial Metrics:\n"
-            for row in answer_box["table"]:
-                result += f"{row.get('name', 'N/A')}: {row.get('value', 'N/A')}\n"
-
-        return result
-    else:
-        # Generic answer box formatting
-        result = ""
-        for key, value in answer_box.items():
-            if key != "type":
-                result += f"{key.replace('_', ' ').title()}: {value}\n"
-        return result
-
-
-def format_organic_results(organic_results: list[Any]) -> str:
-    """Format organic search results."""
-    formatted_results = []
-    for result in organic_results:
-        title = result.get("title", "No title")
-        link = result.get("link", "No link")
-        snippet = result.get("snippet", "No snippet")
-        formatted_results.append(f"Title: {title}\nLink: {link}\nSnippet: {snippet}\n")
-    return "\n".join(formatted_results) if formatted_results else ""
-
-
-def format_news_results(news_results: list[Any]) -> str:
-    """Format news search results."""
-    formatted_results = []
-    for result in news_results:
-        title = result.get("title", "No title")
-        link = result.get("link", "No link")
-        snippet = result.get("snippet", "No snippet")
-        date = result.get("date", "No date")
-        source = result.get("source", "No source")
-        formatted_results.append(
-            f"Title: {title}\nSource: {source}\nDate: {date}\nLink: {link}\nSnippet: {snippet}\n"
-        )
-    return "\n".join(formatted_results) if formatted_results else ""
-
-
-def format_images_results(images_results: list[Any]) -> str:
-    """Format image search results."""
-    formatted_results = []
-    for result in images_results:
-        title = result.get("title", "No title")
-        link = result.get("link", "No link")
-        thumbnail = result.get("thumbnail", "No thumbnail")
-        formatted_results.append(
-            f"Title: {title}\nImage: {link}\nThumbnail: {thumbnail}\n"
-        )
-    return "\n".join(formatted_results) if formatted_results else ""
-
-
 @mcp.tool()
-async def search(params: dict[str, Any] = {}, raw: bool = False) -> str:
+async def search(params: dict[str, Any] = {}, mode: str = "complete") -> str:
     """Universal search tool supporting all SerpApi engines and result types.
 
     This tool consolidates weather, stock, and general search functionality into a single interface.
-    It dynamically processes multiple result types and provides structured output.
+    It processes multiple result types and returns structured JSON output.
 
     Args:
         params: Dictionary of engine-specific parameters. Common parameters include:
@@ -162,17 +71,24 @@ async def search(params: dict[str, Any] = {}, raw: bool = False) -> str:
             - location: Geographic location filter
             - num: Number of results to return
 
-        raw: If True, returns the raw JSON response from SerpApi (default: False)
+        mode: Response mode (default: "complete")
+            - "complete": Returns full JSON response with all fields
+            - "compact": Returns JSON response with metadata fields removed
 
     Returns:
-        A formatted string of search results or raw JSON data, or an error message.
+        A JSON string containing search results or an error message.
 
     Examples:
         Weather: {"q": "weather in London", "engine": "google"}
         Stock: {"q": "AAPL stock", "engine": "google"}
         General: {"q": "coffee shops", "engine": "google_light", "location": "Austin, TX"}
+        Compact: {"q": "news", "mode": "compact"}
     """
 
+    # Validate mode parameter
+    if mode not in ["complete", "compact"]:
+        return "Error: Invalid mode. Must be 'complete' or 'compact'"
+
     request = get_http_request()
     if hasattr(request, "state") and request.state.api_key:
         api_key = request.state.api_key
@@ -188,56 +104,21 @@ async def search(params: dict[str, Any] = {}, raw: bool = False) -> str:
     try:
         data = serpapi.search(search_params).as_dict()
 
-        # Return raw JSON if requested
-        if raw:
-            return json.dumps(data, indent=2, ensure_ascii=False)
-
-        # Process results in priority order
-        formatted_output = ""
-
-        # 1. Answer box (weather, finance, knowledge graph, etc.) - highest priority
-        if "answer_box" in data:
-            formatted_output += "=== Answer Box ===\n"
-            formatted_output += format_answer_box(data["answer_box"])
-            formatted_output += "\n\n"
-
-        # 2. News results
-        if "news_results" in data and data["news_results"]:
-            formatted_output += "=== News Results ===\n"
-            formatted_output += format_news_results(data["news_results"])
-            formatted_output += "\n\n"
-
-        # 3. Organic results
-        if "organic_results" in data and data["organic_results"]:
-            formatted_output += "=== Search Results ===\n"
-            formatted_output += format_organic_results(data["organic_results"])
-            formatted_output += "\n\n"
-
-        # 4. Image results
-        if "images_results" in data and data["images_results"]:
-            formatted_output += "=== Image Results ===\n"
-            formatted_output += format_images_results(data["images_results"])
-            formatted_output += "\n\n"
-
-        # 5. Shopping results
-        if "shopping_results" in data and data["shopping_results"]:
-            formatted_output += "=== Shopping Results ===\n"
-            shopping_results = []
-            for result in data["shopping_results"]:
-                title = result.get("title", "No title")
-                price = result.get("price", "No price")
-                link = result.get("link", "No link")
-                source = result.get("source", "No source")
-                shopping_results.append(
-                    f"Title: {title}\nPrice: {price}\nSource: {source}\nLink: {link}\n"
-                )
-            formatted_output += "\n".join(shopping_results) + "\n\n"
-
-        # Return formatted output or fallback message
-        if formatted_output.strip():
-            return formatted_output.strip()
-        else:
-            return "No results found for the given query. Try adjusting your search parameters or engine."
+        # Apply mode-specific filtering
+        if mode == "compact":
+            # Remove specified fields for compact mode
+            fields_to_remove = [
+                "search_metadata",
+                "search_parameters",
+                "search_information",
+                "pagination",
+                "serpapi_pagination",
+            ]
+            for field in fields_to_remove:
+                data.pop(field, None)
+
+        # Return JSON response for both modes
+        return json.dumps(data, indent=2, ensure_ascii=False)
 
     except serpapi.exceptions.HTTPError as e:
         if "429" in str(e):