Update main.py

main.py

@@ -1,63 +1,84 @@
 import httpx
 import json
 from fastapi import FastAPI, HTTPException, Query
-from typing import Optional
+from pydantic import BaseModel, Field
+from typing import Optional, List, Dict, Any
 
 # Initialize the FastAPI app
 app = FastAPI(
-    title="FastAPI DuckDuckGo API Proxy",
-    description="A FastAPI proxy for the DuckDuckGo Instant Answer API.",
-    version="1.0.0",
+    title="FastAPI DuckDuckGo Instant Answer API Proxy",
+    description="A proxy for the DuckDuckGo Instant Answer API. This API provides direct answers and summaries, but not a list of general web search results.",
+    version="1.1.0",
 )
 
-# Define the base URL for the DuckDuckGo Instant Answer API (for JSON results)
+# Define Pydantic models for a cleaner response structure
+class SearchResult(BaseModel):
+    heading: Optional[str] = Field(None, description="The title of the answer.")
+    answer: Optional[str] = Field(None, description="A direct answer to the query.")
+    abstract: Optional[str] = Field(None, description="A summary or abstract of the topic.")
+    abstract_url: Optional[str] = Field(None, description="The URL for the abstract source.")
+    image_url: Optional[str] = Field(None, description="A relevant image URL.")
+    related_topics: List[Dict[str, Any]] = Field([], description="A list of related topics.")
+    raw_response: Dict[str, Any] = Field({}, description="The full, raw JSON response from the API.")
+
+# Define the base URL for the DuckDuckGo Instant Answer API
 DUCKDUCKGO_API_URL = "https://api.duckduckgo.com/"
 
-@app.get("/search", tags=["Search"])
+@app.get("/search", 
+         tags=["Search"],
+         response_model=SearchResult,
+         summary="Get an Instant Answer from DuckDuckGo")
 async def search_duckduckgo(
-    q: str = Query(..., description="The search query."),
+    q: str = Query(..., description="The search query. Try 'what is the capital of France' or 'Google' to see results."),
 ):
     """
-    Performs a search using the DuckDuckGo Instant Answer API and returns the results in JSON format.
+    Performs a search using the DuckDuckGo Instant Answer API.
+    
+    This endpoint returns structured information for queries that have a direct answer. 
+    It will return an empty response for general web search queries that do not trigger an Instant Answer.
     """
     params = {
         "q": q,
-        "format": "json",  # Request JSON format
-        "no_html": 1,      # Disable HTML in the response
+        "format": "json",
+        "no_html": 1,
     }
 
     async with httpx.AsyncClient() as client:
         try:
             response = await client.get(DUCKDUCKGO_API_URL, params=params)
-            
-            # Raise an exception for bad status codes (4xx or 5xx)
             response.raise_for_status()
-            
-            # The API returns an empty string for no results, which is not valid JSON.
-            # Handle this case explicitly.
+
             if not response.text:
-                return {"results": [], "message": "No results found."}
+                return SearchResult(raw_response={"message": "No results found."})
 
-            # Attempt to parse the JSON response
-            return response.json()
+            data = response.json()
+            
+            # Check if a meaningful answer is present.
+            # The 'Type' field is 'A' for Article, 'D' for Disambiguation, 'C' for category. Empty for no result.
+            if data.get("Type") or data.get("AbstractText"):
+                return SearchResult(
+                    heading=data.get("Heading"),
+                    answer=data.get("Answer"),
+                    abstract=data.get("AbstractText"),
+                    abstract_url=data.get("AbstractURL"),
+                    image_url=f'https://duckduckgo.com{data.get("Image")}' if data.get("Image") else None,
+                    related_topics=data.get("RelatedTopics", []),
+                    raw_response=data
+                )
+            else:
+                # Return an empty but valid SearchResult if no instant answer was found
+                return SearchResult(
+                    raw_response=data,
+                    related_topics=[{"message": "No direct Instant Answer found for this query."}]
+                )
 
         except json.JSONDecodeError:
-            # If the response is not valid JSON, raise an internal server error
-            raise HTTPException(
-                status_code=500,
-                detail=f"Failed to decode JSON from DuckDuckGo API. Response text: {response.text}",
-            )
+            raise HTTPException(status_code=500, detail="Failed to decode JSON from DuckDuckGo API.")
         except httpx.HTTPStatusError as e:
-            raise HTTPException(
-                status_code=e.response.status_code,
-                detail=f"Error from DuckDuckGo API: {e.response.text}",
-            )
+            raise HTTPException(status_code=e.response.status_code, detail=f"Error from DuckDuckGo API: {e.response.text}")
         except httpx.RequestError as e:
-            raise HTTPException(
-                status_code=500,
-                detail=f"Failed to connect to DuckDuckGo API: {str(e)}",
-            )
+            raise HTTPException(status_code=500, detail=f"Failed to connect to DuckDuckGo API: {str(e)}")
 
 @app.get("/", tags=["Root"])
 async def read_root():
-    return {"message": "Welcome to the DuckDuckGo API proxy!"}
+    return {"message": "Welcome to the DuckDuckGo Instant Answer API proxy!"}