Bump version: 0.1.2 → 0.1.3

Reviewed-on: #8

.dockerignore

@@ -13,3 +13,4 @@ dist/
 .gitignore
 .env
 *.sock
+.venv

.gitea/workflows/release.yml

@@ -75,6 +75,18 @@ jobs:
         run: |
           git config user.name "Gitea CI"
           git config user.email "ci@git.theprivateserver.de"
+
+      - name: Determine branch to push to
+        id: push_branch
+        run: |
+          if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
+            # workflow_dispatch runs on a branch ref like refs/heads/main
+            BRANCH=${GITHUB_REF#refs/heads/}
+          else
+            # for a merged PR use the PR base ref (target branch)
+            BRANCH=${{ github.event.pull_request.base.ref }}
+          fi
+          echo "PUSH_BRANCH=$BRANCH" >> $GITHUB_ENV
       - name: Bump version
         id: bump
         run: |
@@ -133,7 +145,7 @@ jobs:
         uses: ad-m/github-push-action@master
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ github.ref }}
+          branch: ${{ env.PUSH_BRANCH }}
       - name: Build Changelog
         id: build_changelog
         uses: https://github.com/mikepenz/release-changelog-builder-action@v5

.gitea/workflows/test_pr.yml

@@ -0,0 +1,98 @@
+name: PR tests
+
+on:
+  pull_request:
+    types: [opened, synchronize, edited, reopened]
+
+jobs:
+  build-image:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+
+      - name: (optional) Prepare dependencies
+        run: |
+          uv python install --python-version-file pyproject.toml || true
+          uv sync --all-groups || true
+          uv add pip || true
+          uv export --format requirements.txt -o requirements.txt || true
+
+      - name: Build image
+        run: |
+          docker build -t semapform-api:test-pr .
+
+      - name: Save image artifact
+        run: |
+          docker save semapform-api:test-pr -o semapform-api.tar
+
+      - name: Upload image artifact
+        uses: https://github.com/christopherHX/gitea-upload-artifact@v4
+        with:
+          name: semapform-image
+          path: semapform-api.tar
+          retention-days: 1
+
+  smoke-tests:
+    needs: build-image
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Download image artifact
+        uses: christopherhx/gitea-download-artifact@v4
+        with:
+          name: semapform-image
+
+      - name: Restore image
+        run: |
+          docker load -i semapform-api.tar
+
+      - name: Start container (background)
+        run: |
+          docker run -d --name semapform-test semapform-api:test-pr sleep infinity
+
+      - name: Start server in container and smoke test HTTP (in-container)
+        run: |
+          set -x
+          # start the server inside the container (detached)
+          docker exec -d semapform-test python api_service.py || true
+
+          # show container status to aid debugging
+          docker ps -a --filter name=semapform-test || true
+
+          echo "waiting for service to become ready inside container"
+          set -e
+          READY=0
+          for i in $(seq 1 20); do
+            echo "ready attempt $i"
+            if docker exec semapform-test python -c 'import urllib.request,sys; urllib.request.urlopen("http://127.0.0.1:8001/health", timeout=1); print("ok")' ; then
+              READY=1
+              break
+            fi
+            sleep 1
+          done
+          if [ "$READY" -ne 1 ]; then
+            echo "service did not become ready"
+            docker logs semapform-test --tail 200 || true
+            exit 1
+          fi
+
+          echo "running test_api.py inside container"
+          docker exec semapform-test python test_api.py || true
+
+          docker logs semapform-test --tail 200 || true
+
+      - name: Cleanup container
+        if: always()
+        run: |
+          docker rm -f semapform-test || true

Dockerfile

@@ -1,43 +1,13 @@
-FROM python:3.13-slim AS builder
+FROM python:3.13.9-slim
 
-# Prevent Python from writing .pyc files and enable unbuffered stdout/stderr
+RUN apt update
-ENV PYTHONDONTWRITEBYTECODE=1 \
+RUN apt upgrade -y
-    PYTHONUNBUFFERED=1 \
-    PIP_DISABLE_PIP_VERSION_CHECK=1 \
-    PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 
 WORKDIR /app
 
-# Install build deps required to build wheels
+COPY requirements.txt .
-RUN apt-get update \
+RUN pip install --no-cache-dir -r requirements.txt --extra-index-url https://git.theprivateserver.de/api/packages/PHB/pypi/simple/
-    && apt-get install -y --no-install-recommends build-essential gcc \
-    && rm -rf /var/lib/apt/lists/*
 
-# Upgrade packaging tools and install runtime dependencies into a separate prefix
+COPY . .
-COPY requirements.txt ./
-RUN pip install --upgrade pip setuptools wheel \
-    && pip install --prefix=/install --no-cache-dir \
-    --extra-index-url https://git.theprivateserver.de/api/packages/PHB/pypi/simple/ \
-    -r requirements.txt \
-    && rm -rf /root/.cache/pip
 
-# Copy application source (only used to include app files in final image)
+ENTRYPOINT [ "python", "api_service.py" ]
-COPY . /app
-
-FROM python:3.13-slim
-
-ENV PYTHONDONTWRITEBYTECODE=1 \
-    PYTHONUNBUFFERED=1 \
-    API_PORT=8001
-
-WORKDIR /app
-
-# Copy installed packages from the builder image into the final image
-COPY --from=builder /install /usr/local
-# Copy application sources
-COPY --from=builder /app /app
-
-EXPOSE 8001
-
-# Run using uvicorn; the app is defined in `api_service.py` as `app`
-CMD ["uvicorn", "api_service:app", "--host", "0.0.0.0", "--port", "8001"]

api_service.py

@@ -1,18 +1,39 @@
-"""
+"""Lightweight Python API service for signature validation
-Lightweight Python API service for signature validation
 This can run independently to support the PHP application
 """
 
 import os
 import re
 
-from bibapi import catalogue
+# Avoid importing heavy modules at top-level to keep `import api_service` lightweight
 from fastapi import FastAPI, Query
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import JSONResponse
 
 app = FastAPI(title="Signature Validation API")
 
+# Optional path prefix support: when behind a reverse-proxy that uses a
+# URL prefix (eg. `https://api.example.tld/library/...`) set `API_PREFIX` to
+# that prefix (example: `/library`) so incoming requests are rewritten to the
+# application root. This keeps route definitions unchanged while supporting
+# both proxied and direct deployments.
+_api_prefix_raw = os.getenv("API_PREFIX", "").strip()
+api_prefix = ""
+if _api_prefix_raw:
+    if not _api_prefix_raw.startswith("/"):
+        _api_prefix_raw = "/" + _api_prefix_raw
+    api_prefix = _api_prefix_raw.rstrip("/")
+
+
+@app.middleware("http")
+async def _strip_api_prefix(request, call_next):
+    if api_prefix and request.url.path.startswith(api_prefix):
+        new_path = request.url.path[len(api_prefix) :]
+        request.scope["path"] = new_path or "/"
+        request.scope["root_path"] = api_prefix
+    return await call_next(request)
+
+
 # Allow PHP application to call this API
 app.add_middleware(
     CORSMiddleware,
@@ -22,15 +43,25 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
-# Initialize catalogue for signature validation
+# Catalogue is expensive to initialize at import time; instantiate lazily
-cat = catalogue.Catalogue()
+cat = None
+
+
+def _get_catalogue():
+    global cat
+    if cat is None:
+        # import inside function to avoid expensive work during module import
+        from bibapi import catalogue as _catalogue
+
+        cat = _catalogue.Catalogue()
+    return cat
 
 
 @app.get("/api/validate-signature")
 async def validate_signature(signature: str = Query(...)):
     """Validate a book signature and return total pages"""
     try:
-        book_result = cat.get_book_with_data(signature)
+        book_result = _get_catalogue().get_book_with_data(signature)
         if book_result and hasattr(book_result, "pages") and book_result.pages:
             # Try to extract numeric page count
             pages_str = str(book_result.pages)
@@ -39,7 +70,7 @@ async def validate_signature(signature: str = Query(...)):
             if match:
                 total_pages = int(match.group(1))
                 return JSONResponse(
-                    {"valid": True, "total_pages": total_pages, "signature": signature}
+                    {"valid": True, "total_pages": total_pages, "signature": signature},
                 )
 
         return JSONResponse(
@@ -47,13 +78,13 @@ async def validate_signature(signature: str = Query(...)):
                 "valid": False,
                 "error": "Signatur nicht gefunden oder keine Seitenzahl verfügbar",
                 "signature": signature,
-            }
+            },
         )
     except Exception as e:
         return JSONResponse(
             {
                 "valid": False,
-                "error": f"Fehler bei der Validierung: {str(e)}",
+                "error": f"Fehler bei der Validierung: {e!s}",
                 "signature": signature,
             },
             status_code=500,

pyproject.toml

@@ -1,20 +1,21 @@
 [project]
 name = "semapform-api"
-version = "0.1.1"
+version = "0.1.3"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.13"
 dependencies = [
-    "bibapi[catalogue]>=0.0.5",
+    "bibapi[catalogue]>=0.0.6",
     "fastapi>=0.122.0",
     "pip>=25.3",
+    "uvicorn>=0.38.0",
 ]
 [[tool.uv.index]]
 name = "gitea"
 url = "https://git.theprivateserver.de/api/packages/PHB/pypi/simple/"
 
 [tool.bumpversion]
-current_version = "0.1.1"
+current_version = "0.1.3"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"

test_api.py

@@ -0,0 +1,8 @@
+# test api endpoint with a signature, print the response
+import urllib.request
+
+response = urllib.request.urlopen(
+    "http://localhost:8001/api/validate-signature?signature=ST%20250%20U42%20%2815%29",
+)
+
+print(response.read().decode("utf-8"))