Update main.py

main.py

@@ -3,8 +3,6 @@
 from fastapi import FastAPI, Query
 from fastapi.responses import Response
 import requests
-from bs4 import BeautifulSoup
-from urllib.parse import quote
 import xml.etree.ElementTree as ET
 from datetime import datetime
 from typing import Optional
@@ -12,6 +10,9 @@ from typing import Optional
 app = FastAPI()
 
 # ========== FB2 Generator ==========
+from bs4 import BeautifulSoup
+from urllib.parse import quote
+
 def html_to_fb2(title: str, body: str) -> str:
     clean_text = BeautifulSoup(body, "html.parser").get_text(separator="\n")
     return f"""<?xml version='1.0' encoding='utf-8'?>
@@ -32,28 +33,30 @@ def html_to_fb2(title: str, body: str) -> str:
   </body>
 </FictionBook>"""
 
-# ========== DuckDuckGo Search ==========
+# ========== DuckDuckGo JSON Search ==========
 def duckduckgo_search(query: str):
-    res = requests.post(
-        "https://html.duckduckgo.com/html/", 
-        data={"q": query}, 
-        headers={"User-Agent": "Mozilla/5.0"}, 
-        timeout=10
-    )
+    api_url = "https://api.duckduckgo.com/"
+    params = {
+        "q": query,
+        "format": "json",
+        "no_html": 1,
+        "skip_disambig": 1
+    }
+    res = requests.get(api_url, params=params, headers={"User-Agent": "Mozilla/5.0"}, timeout=10)
     res.raise_for_status()
-    soup = BeautifulSoup(res.text, "html.parser")
+    data = res.json()
     results = []
-    for a in soup.select("a.result__a"):
-        href = a.get("href")
-        title = a.get_text()
-        if href and title:
-            results.append((title.strip(), href))
-        if len(results) >= 10:
-            break
-    return results
+    def extract_topics(topics):
+        for item in topics:
+            if "FirstURL" in item and "Text" in item:
+                results.append((item["Text"], item["FirstURL"]))
+            elif "Topics" in item:
+                extract_topics(item["Topics"])
+    extract_topics(data.get("RelatedTopics", []))
+    return results[:10]
 
-# ========== OPDS Feed Generation ==========
-def create_feed(entries: list, templated: bool, q: Optional[str]) -> bytes:
+# ========== OPDS Feed Generator ==========
+def create_feed(entries: list, q: Optional[str]) -> bytes:
     ns = "http://www.w3.org/2005/Atom"
     ET.register_namespace("", ns)
     feed = ET.Element("feed", xmlns=ns)
@@ -62,15 +65,14 @@ def create_feed(entries: list, templated: bool, q: Optional[str]) -> bytes:
     ET.SubElement(feed, "updated").text = datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ")
 
     # OpenSearch templated search link
-    link_attrs = {
+    ET.SubElement(feed, "link", {
         "rel": "search",
         "type": "application/atom+xml;profile=opds-catalog;kind=search",
         "href": "/opds?q={searchTerms}",
         "templated": "true"
-    }
-    ET.SubElement(feed, "link", link_attrs)
+    })
 
-    # Add entries for search results
+    # Add entries
     for entry_info in entries:
         entry = ET.SubElement(feed, "entry")
         ET.SubElement(entry, "id").text = entry_info['id']
@@ -81,8 +83,8 @@ def create_feed(entries: list, templated: bool, q: Optional[str]) -> bytes:
     return ET.tostring(feed, encoding="utf-8", xml_declaration=True)
 
 # ========== Routes ==========
-@app.get("/opds", include_in_schema=False)
-def opds(q: Optional[str] = Query(None, alias="q", description="Search query")) -> Response:
+@app.get("/opds")
+def opds(q: Optional[str] = Query(None, description="Search query")) -> Response:
     entries = []
     kind = "search"
     if q:
@@ -99,7 +101,7 @@ def opds(q: Optional[str] = Query(None, alias="q", description="Search query"))
                 }
             })
         kind = "acquisition"
-    xml_data = create_feed(entries, templated=True, q=q)
+    xml_data = create_feed(entries, q)
     return Response(content=xml_data,
                     media_type=f"application/atom+xml;profile=opds-catalog;kind={kind}")
 
@@ -107,6 +109,7 @@ def opds(q: Optional[str] = Query(None, alias="q", description="Search query"))
 def download_fb2(url: str) -> Response:
     res = requests.get(url, headers={"User-Agent": "Mozilla/5.0"}, timeout=10)
     res.raise_for_status()
+    from bs4 import BeautifulSoup
     soup = BeautifulSoup(res.text, "html.parser")
     title = soup.title.string.strip() if soup.title and soup.title.string else "article"
     fb2 = html_to_fb2(title, str(soup.body))
@@ -117,3 +120,16 @@ def download_fb2(url: str) -> Response:
         headers={"Content-Disposition": f"attachment; filename={filename}"}
     )
 
+# File: Dockerfile
+FROM python:3.11-slim
+WORKDIR /app
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+COPY main.py .
+CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"]
+
+# File: requirements.txt
+fastapi
+uvicorn
+requests
+beautifulsoup4