v0.7.0

Dockerfile

@@ -1,28 +1,21 @@
-# first stage
-FROM python:3.11.5-slim AS builder
+FROM python:3.12.2-slim-bookworm
 
-ENV DEBIAN_FRONTEND=noninteractive
-ENV PYTHONDONTWRITEBYTECODE 1
-ENV PYTHONUNBUFFERED 1
-
-COPY requirements.txt .
-
-RUN apt-get update && apt-get install -y --no-install-recommends --no-install-suggests \
- 	&& pip install --no-cache-dir --user -r requirements.txt \
-	&& rm -rf /var/lib/apt/lists/*
+# Create appuser and switch to it
+RUN useradd --create-home appuser
+USER appuser
 
+# Include the directory where python packages are installed in the PATH
+ENV PATH="/home/appuser/.local/bin:${PATH}"
 
-# final stage
-FROM python:3.11.5-slim
+# Set the working directory to a folder inside appuser's home directory
+WORKDIR /home/appuser/app
 
-# copy only the dependencies installation from the 1st stage image
-COPY --from=builder /root/.local /root/.local
-
-# update PATH environment variable
-ENV PATH=/root/.local/bin:$PATH
-
-WORKDIR /code
+# Install dependencies
+COPY requirements.txt .
+RUN pip install --no-cache-dir --user -r requirements.txt
 
-COPY ./duckduckgo_search_api /code/duckduckgo_search_api
+# Copy the application code
+COPY ./duckduckgo_search_api /home/appuser/app/duckduckgo_search_api
 
+# Run the application
 CMD ["uvicorn", "duckduckgo_search_api.main:app", "--host", "0.0.0.0", "--port", "8000", "--log-level", "warning"]

duckduckgo_search_api/main.py

@@ -8,7 +8,7 @@
 from fastapi.responses import ORJSONResponse
 from pydantic import BaseModel
 
-__version__ = "0.6.0"
+__version__ = "0.7.0"
 
 
 TIMEOUT = 10
@@ -144,21 +144,19 @@ async def ddg_search(
     ] = None,
 ) -> list[DdgTextOut]:
     """DuckDuckGo text search. Query params: https://duckduckgo.com/params"""
-    results = []
     try:
         async with AsyncDDGS(proxies=PROXY, timeout=TIMEOUT) as ddgs:
-            async for r in ddgs.text(
+            results = await ddgs.text(
                 q,
                 region,
                 safesearch,
                 timelimit,
                 backend,
                 max_results,
-            ):
-                results.append(r)
+            )
+            return results
     except Exception as ex:
         logging.warning(ex)
-    return results
 
 
 @app.get("/images")
@@ -202,10 +200,9 @@ async def ddg_images_search(
 ) -> list[DdgImagesOut]:
     """DuckDuckGo images search."""
 
-    results = []
     try:
         async with AsyncDDGS(proxies=PROXY, timeout=TIMEOUT) as ddgs:
-            async for r in ddgs.images(
+            results = await ddgs.images(
                 q,
                 region,
                 safesearch,
@@ -216,11 +213,10 @@ async def ddg_images_search(
                 layout,
                 license_image,
                 max_results,
-            ):
-                results.append(r)
+            )
+            return results
     except Exception as ex:
         logging.warning(ex)
-    return results
 
 
 @app.get("/videos")
@@ -244,10 +240,9 @@ async def ddg_videos_search(
 ) -> list[DdgVideosOut]:
     """DuckDuckGo videos search."""
 
-    results = []
     try:
         async with AsyncDDGS(proxies=PROXY, timeout=TIMEOUT) as ddgs:
-            async for r in ddgs.videos(
+            results = await ddgs.videos(
                 q,
                 region,
                 safesearch,
@@ -256,11 +251,10 @@ async def ddg_videos_search(
                 duration,
                 license_videos,
                 max_results,
-            ):
-                results.append(r)
+            )
+            return results
     except Exception as ex:
         logging.warning(ex)
-    return results
 
 
 @app.get("/news")
@@ -279,20 +273,18 @@ async def ddg_news_search(
 ) -> list[DdgNewsOut]:
     """DuckDuckGo news search"""
 
-    results = []
     try:
         async with AsyncDDGS(proxies=PROXY, timeout=TIMEOUT) as ddgs:
-            async for r in ddgs.news(
+            results = await ddgs.news(
                 q,
                 region,
                 safesearch,
                 timelimit,
                 max_results,
-            ):
-                results.append(r)
+            )
+            return results
     except Exception as ex:
         logging.warning(ex)
-    return results
 
 
 if __name__ == "__main__":

requirements.txt

@@ -1,4 +1,4 @@
-duckduckgo_search==3.9.9
-fastapi==0.104.1
-orjson==3.9.10
-uvicorn[standard]==0.24.0
+duckduckgo_search==5.1.0
+fastapi==0.110.0
+orjson==3.9.15
+uvicorn[standard]==0.28.0