Merge pull request #4 from flowdacity/migration

Migration to asyncio

Author: ochui

.github/workflows/test.yml

@@ -0,0 +1,51 @@
+name: Run tests and upload coverage
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    name: Run tests and collect coverage
+    runs-on: ubuntu-latest
+
+    services:
+      redis:
+        image: redis:7-alpine
+        ports:
+          - 6379:6379
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 5s
+          --health-timeout 5s
+          --health-retries 5
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install uv (with Python 3.12)
+        uses: astral-sh/setup-uv@v4
+        with:
+          python-version: "3.12"
+
+      - name: Install dependencies via uv
+        run: |
+          # installs main deps from [project.dependencies]
+          # plus dev group from [dependency-groups]
+          uv sync --group dev
+
+      - name: Run tests
+        run: |
+          uv run pytest --cov=fq_server --cov-branch --cov-report=xml
+
+      - name: Upload results to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          slug: flowdacity/flowdacity-queue-server

.gitignore

@@ -54,7 +54,7 @@ docs/_build/
 Dockerfile0
 Dockerfile1
 Dockerfile_supervisor
-test_sharq.py
+test_fq.py
 .idea/*
 venv/*
 .vscode/

.pre-commit-config.yaml

@@ -0,0 +1 @@
+3.12

.python-version

@@ -0,0 +1,28 @@
+# --- Build arguments with defaults ---
+ARG PYTHON_VERSION=3.12
+ARG PORT=8080
+
+# --- Base image ---
+FROM python:${PYTHON_VERSION}-slim
+
+# --- Re-declare build args as env for access after FROM ---
+ARG PORT
+ENV PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1 \
+    FQ_CONFIG=/app/docker.conf \
+    UV_LINK_MODE=copy \
+    PORT=${PORT}
+
+WORKDIR /app
+
+RUN pip install --no-cache-dir --upgrade uv
+
+COPY pyproject.toml uv.lock* ./
+
+RUN uv pip install --system --no-cache .
+
+COPY . .
+
+EXPOSE ${PORT}
+
+CMD ["sh", "-c", "uvicorn asgi:app --host 0.0.0.0 --port ${PORT}"]

.secrets.baseline

@@ -1 +1 @@
-include LICENSE.txt README.md sharq.conf
+include LICENSE.txt README.md fq.conf

CHANGELOG

@@ -1,24 +1,47 @@
-.PHONY: clean build install uninstall test run
+.PHONY: all clean build install uninstall test publish redis redis-down
 
-all: clean
+# Default target
+all: clean build
 
+# Remove Python + build artifacts
 clean:
-	find . -name \*.pyc -delete
-	find . -name \*.pyo -delete
-	find . -name \*~ -delete
-	rm -rf build dist SharQServer.egg-info
+	find . -name "*.pyc" -delete
+	find . -name "*.pyo" -delete
+	find . -name "*~" -delete
+	rm -rf dist build *.egg-info
 
+# Build package (requires: pip install build)
 build:
-	python setup.py sdist
+	python -m build
 
+# Install locally built package
 install:
-	pip install dist/SharQServer-*.tar.gz
+	pip install --force-reinstall dist/*.whl
 
+# Uninstall FQ completely
 uninstall:
-	yes | pip uninstall sharqserver
+	pip uninstall -y flowdacity-queue
 
+# Run tests — prefers pytest, falls back to python modules
 test:
-	python -m tests
+	@if python -c "import pytest" 2>/dev/null; then \
+		python -m pytest -q; \
+	else \
+		echo 'pytest not installed — running direct test modules'; \
+		python -m tests.test_routes; \
+	fi
 
-run:
-	sharq-server --config sharq.conf
+publish: clean
+	uv sync --group dev
+	uv run python -m build
+# 	@if [ -z "$$PYPI_API_TOKEN" ]; then echo "PYPI_API_TOKEN must be set"; exit 1; fi
+# 	uv run python -m twine upload dist/* -u __token__ -p "$$PYPI_API_TOKEN"
+	uv run python -m twine upload dist/*
+
+# Start Redis container
+redis:
+	docker compose up -d redis
+
+# Stop Redis container
+redis-down:
+	docker compose down