Merge pull request #228 from SocialChangeLab/dev

Fix keywords trend

Author: davidpomerenke

.devcontainer/devcontainer.json

@@ -23,8 +23,6 @@
 			"installTools": true,
 			"version": "3.10"
 		},
-		"ghcr.io/devcontainers-contrib/features/poetry:2": { },
-		"ghcr.io/nikobockerman/devcontainer-features/poetry-persistent-cache:1": { },
 		"ghcr.io/devcontainers-contrib/features/ruff:1": { },
 		"ghcr.io/devcontainers-contrib/features/starship:1": { },
 

.devcontainer/postCreateCommand.sh

@@ -48,4 +48,4 @@ Rscript -e 'renv::restore(project	= "/workspaces/media-impact-monitor/backend-R"
 ####
 
 echo 'eval "$(starship init bash)"' >> ~/.bashrc
-cd backend-python && poetry config virtualenvs.in-project true && poetry install # install everything once at setup
+cd backend-python && uv sync # install everything once at setup

.devcontainer/postStartCommand.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/bash
 ## postStartCommand.sh
 
-cd backend-python && source .venv/bin/activate && poetry install # install changed packages
+cd backend-python && source .venv/bin/activate && uv sync # install changed packages
 # bash

.dockerignore

@@ -0,0 +1,96 @@
+# Version control
+.git
+.gitignore
+.github
+.gitattributes
+
+# Development environments
+.vscode
+.devcontainer
+.venv
+**/.venv
+**/__pycache__
+**/*.pyc
+**/*.pyo
+**/*.pyd
+.Python
+**/env/
+**/venv/
+**/ENV/
+**/env.bak/
+**/venv.bak/
+
+# Build and cache directories
+cache/
+**/cache/
+.pytest_cache/
+**/.pytest_cache/
+.coverage
+htmlcov/
+.tox/
+.nox/
+dist/
+build/
+*.egg-info/
+
+# Frontend
+frontend-nextjs/
+frontend-observable/
+**/node_modules/
+*.log
+
+# Documentation and notebooks
+docs/
+notebooks/
+*.md
+!README.md
+
+# System files
+.DS_Store
+**/.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+
+# Environment and secrets
+.env
+.env.*
+*.pem
+*.key
+
+# IDE specific
+.idea/
+*.swp
+*.swo
+.vscode/
+*.sublime-workspace
+*.sublime-project
+
+# Temporary files
+*.tmp
+*.temp
+*.bak
+*.swp
+*~
+
+# Large data files
+*.csv
+*.json
+*.parquet
+*.db
+*.sqlite
+*.sqlite3
+
+# Python specific
+**/.python-version
+**/.coverage
+**/.pytest_cache/
+**/.mypy_cache/
+**/.ruff_cache/
+**/.tox/
+**/.nox/
+**/.hypothesis/
+**/.ipynb_checkpoints/ 

.env.example

@@ -3,7 +3,6 @@ ACLED_EMAIL=
 ACLED_KEY=
 # media data
 MEDIACLOUD_API_TOKEN=
-ZENROWS_API_KEY=
 # google trends data
 DATAFORSEO_EMAIL=
 DATAFORSEO_PASSWORD=

.github/workflows/deploy.yml

@@ -41,24 +41,23 @@ jobs:
       with:
         python-version: '3.10'
 
-    - name: Install Poetry
+    - name: Install uv
       run: |
-        pip install poetry
+        pip install uv
 
     - name: Install dependencies
       run: |
         cd backend-python
-        poetry install
+        uv sync
 
     - name: Run pytest
       run: |
         cd backend-python
-        poetry run pytest
+        uv run --extra dev pytest
       env:
         MEDIACLOUD_API_TOKEN: ${{ secrets.MEDIACLOUD_API_TOKEN }}
         ACLED_EMAIL: ${{ secrets.ACLED_EMAIL }}
         ACLED_KEY: ${{ secrets.ACLED_KEY }}
-        ZENROWS_API_KEY: ${{ secrets.ZENROWS_API_KEY }}
         AZURE_API_BASE: ${{ secrets.AZURE_API_BASE }}
         AZURE_API_VERSION: ${{ secrets.AZURE_API_VERSION }}
         AZURE_API_KEY: ${{ secrets.AZURE_API_KEY }}

.vscode/launch.json

@@ -19,8 +19,8 @@
                 "media_impact_monitor.api:app",
                 "--host=0.0.0.0",
                 "--port=8000",
-                "--reload",
-                "--reload-dir=backend-python/media_impact_monitor"
+                // "--reload",
+                // "--reload-dir=backend-python/media_impact_monitor"
             ],
             "jinja": true
         }

Dockerfile

@@ -1,25 +1,21 @@
 # build it: docker build -t socialchangelab/media-impact-monitor --build-arg VCS_REF=$(git rev-parse --short HEAD) --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') .
 # run it: docker run -p 8000:8000 -e MEDIACLOUD_API_TOKEN="${MEDIACLOUD_API_TOKEN}" -e ACLED_EMAIL="${ACLED_EMAIL}" -e ACLED_KEY="${ACLED_KEY}" socialchangelab/media-impact-monitor
-FROM --platform=linux/amd64 python:3.10-slim
-# install poetry
-RUN pip install --upgrade pip
-RUN pip install poetry
-# copy the poetry files and install the dependencies
-COPY backend-python/poetry.lock backend-python/pyproject.toml backend-python/README.md /app/backend-python/
+FROM --platform=linux/amd64 ghcr.io/astral-sh/uv:python3.10-bookworm
+# copy the uv files and install the dependencies
+COPY backend-python/uv.lock backend-python/pyproject.toml backend-python/README.md /app/backend-python/
 WORKDIR /app/backend-python
-RUN poetry config virtualenvs.create false \
-    && poetry install --no-interaction --no-ansi
+RUN uv sync
 # copy the rest of the files and set the working directory
 WORKDIR /app/
-COPY . /app/
+COPY backend-python/ /app/backend-python/
 WORKDIR /app/backend-python
 # set git commit and build date
 ARG VCS_REF
 ARG BUILD_DATE
 ENV VCS_REF=$VCS_REF
 ENV BUILD_DATE=$BUILD_DATE
 # run the application
-CMD ["uvicorn", "media_impact_monitor.api:app", "--host", "0.0.0.0", "--port", "8000"]
+CMD ["uv", "run", "uvicorn", "media_impact_monitor.api:app", "--host", "0.0.0.0", "--port", "8000"]
 # OCI Labels as per https://github.com/opencontainers/image-spec/blob/main/annotations.md
 LABEL org.opencontainers.image.title="media-impact-monitor"
 LABEL org.opencontainers.image.description="Media Impact Monitor"