chore: use python image 3.13-slim instead of 3.13-alpine

Migrate from Python 3.11 to 3.13 with updated dependencies. Switch from PyPDF2 to pypdf library for better PDF processing. Add new U14 age groups and extract-pdf utility script.

.pre-commit-config.yaml

@@ -29,7 +29,7 @@ repos:
       - id: mypy
         exclude: ^(docs/|example-plugin/)
         args: [--ignore-missing-imports]
-        additional_dependencies: [types-requests, PyPDF2]
+        additional_dependencies: [types-requests, pypdf]
   - repo: https://github.com/adrienverge/yamllint.git
     rev: v1.37.1
     hooks:

AGENTS.md

@@ -84,7 +84,7 @@ poetry run fastapi run myice/webapi.py --host 127.0.0.1
 - Typer for CLI interface
 - FastAPI for web API
 - requests for HTTP requests
-- PyPDF2 for PDF processing
+- pypdf for PDF processing
 - Use rich for enhanced console output
 - Custom rl_ai_tools package for AI functionalities
 

Dockerfile

@@ -1,20 +1,38 @@
-FROM python:3.11
+# Multi-stage build to create a minimal image
+FROM python:3.13-slim AS builder
 
-RUN install -o www-data -g www-data -d -m 0755 /var/www
+# Create working directory
+WORKDIR /app
 
-USER www-data
+# poetry export -f requirements.txt --output requirements.txt --without-hashes
+# Copy dependency files
+COPY requirements.txt ./
 
-RUN curl -sSL https://install.python-poetry.org | python3 -
+# Install dependencies to a target directory
+RUN pip install --no-cache-dir --no-deps --disable-pip-version-check --target=/app/site-packages -r requirements.txt
 
-ENV PATH=/var/www/.local/bin:/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+# Use Alpine as the base image for a much smaller footprint
+FROM python:3.13-slim
 
-COPY README.md pyproject.toml poetry.lock docker-entrypoint.sh index.html favicon.ico /var/www/
+# Copy installed packages from builder stage
-COPY myice /var/www/myice
+COPY --from=builder /app/site-packages /app/site-packages
 
-WORKDIR /var/www
+# Copy application code
+COPY index.html favicon.ico /app/
+COPY myice /app/myice
 
-RUN poetry install && . $(poetry env info -p)
+# Set PYTHONPATH so Python can find our installed packages
+ENV PYTHONPATH=/app/site-packages
 
+# Set working directory
+WORKDIR /app
+
+# Create a non-root user for security
+RUN useradd --home-dir /app --no-create-home --uid 1000 myice
+USER myice
+
+# Expose port
 EXPOSE 8000
 
-ENTRYPOINT [ "/var/www/docker-entrypoint.sh" ]
+# Run the application
+ENTRYPOINT ["python", "-m", "uvicorn", "myice.webapi:app", "--host", "0.0.0.0", "--port", "8000"]

README.md

@@ -10,13 +10,17 @@ the PDFs you need.
 with [uv](https://docs.astral.sh/uv/getting-started/installation/):
 
 ```shell
-uv tool install --extra-index-url https://gitea.parano.ch/api/packages/herel/pypi/simple/ myice
+uv tool install \
+--extra-index-url https://gitea.parano.ch/api/packages/herel/pypi/simple/ \
+myice
 ```
 
 with [pipx](https://pipx.pypa.io/stable/installation/):
 
 ```shell
-pipx install --extra-index-url https://gitea.parano.ch/api/packages/herel/pypi/simple/ myice
+pipx install \
+--extra-index-url https://gitea.parano.ch/api/packages/herel/pypi/simple/ \
+myice
 ```
 
 ## configuration
@@ -80,9 +84,11 @@ Then open your browser at `http://localhost:8000`. The web interface allows you
 
 The web interface supports two authentication methods:
 
-1. **Infomaniak OpenID Connect (Recommended)**: Click the "Se connecter avec Infomaniak" button to authenticate using Infomaniak's OIDC provider. Only users in the allowed list will be granted access.
+1. **Infomaniak OpenID Connect (Recommended)**: Click the "Se connecter avec
+   Infomaniak" button to authenticate using Infomaniak's OIDC provider. Only
+   users in the allowed list will be granted access.
 
-2. **Static API Key**: For development purposes, you can still use `abc` as the token.
+1. **Static API Key**: For development purposes, you can still use `abc` as the token.
 
 ### Environment Variables
 
@@ -90,8 +96,8 @@ To configure OIDC authentication, set the following environment variables:
 
 - `CLIENT_ID`: Your OIDC client ID (default: 8ea04fbb-4237-4b1d-a895-0b3575a3af3f)
 - `CLIENT_SECRET`: Your OIDC client secret
-- `REDIRECT_URI`: The redirect URI (default: http://localhost:8000/callback)
+- `REDIRECT_URI`: The redirect URI (default: `http://localhost:8000/callback`)
-- `ALLOWED_USERS`: Comma-separated list of allowed email addresses (e.g., "user1@example.com,user2@example.com")
+- `ALLOWED_USERS`: Comma-separated list of allowed email addresses (e.g., `"user1@example.com,user2@example.com"`)
 
 The web API provides the following endpoints:
 
@@ -103,7 +109,8 @@ The web API provides the following endpoints:
 - `/callback` - Handle OIDC callback
 - `/userinfo` - Get user information
 
-All endpoints (except `/health`, `/login`, and `/callback`) require an Authorization header with a Bearer token.
+All endpoints (except `/health`, `/login`, and `/callback`) require an
+Authorization header with a Bearer token.
 
 ## mobile functions
 
@@ -198,9 +205,16 @@ To use a specific configuration section:
 ```text
 ❯ myice ai
 > prochain match u13 top ?
-< Le prochain match de l'équipe U13 Top se déroulera le dimanche 10 novembre 2024 contre HC Ajoie à la Raffeisen Arena de Porrentruy. Le match débutera à 14h00 et se terminera à 16h15.
+< Le prochain match de l'équipe U13 Top se déroulera le dimanche 10 novembre
+   2024 contre HC Ajoie à la Raffeisen Arena de Porrentruy. Le match débutera
+   à 14h00 et se terminera à 16h15.
 > et les u13 a ?
-< Le prochain match de l'équipe U13 A se déroulera le samedi 9 novembre 2024 contre HC Vallorbe à P. du Frézillon, 1337 Vallorbe VD. Le match débutera à 13h00 et se terminera à 15h00. Le prochain match à domicile de l'équipe U13 A se déroulera le dimanche 10 novembre 2024 contre CP Meyrin à Les Vernets, Glace extérieure, 1227 Les Acacias GE. Le match débutera à 13h00 et se terminera à 15h00.
+< Le prochain match de l'équipe U13 A se déroulera le samedi 9 novembre 2024
+   contre HC Vallorbe à P. du Frézillon, 1337 Vallorbe VD. Le match débutera à
+   13h00 et se terminera à 15h00. Le prochain match à domicile de l'équipe
+   U13 A se déroulera le dimanche 10 novembre 2024 contre CP Meyrin à
+   Les Vernets, Glace extérieure, 1227 Les Acacias GE. Le match débutera
+   à 13h00 et se terminera à 15h00.
 ```
 
 To use a specific configuration section:

docker-entrypoint.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /var/www/.local/bin/poetry run fastapi run myice/webapi.py

myice/myice.py

@@ -14,7 +14,7 @@ from enum import Enum
 from pathlib import Path
 from typing import Annotated
 from typing import List, Tuple
-import PyPDF2
+import pypdf
 import requests
 import typer
 from rich import print
@@ -148,6 +148,9 @@ class AgeGroup(str, Enum):
     u18e = "U18 (Elite)"
     u18el = "U18 (Elit)"
     u21e = "U21 (ELIT)"
+    u14t = "U14 (Top)"
+    u14t1 = "U14 (Top1)"
+    u14t2 = "U14 (Top2)"
 
 
 def normalize_age_group(value: str) -> AgeGroup | None:
@@ -423,19 +426,21 @@ def os_open(file: str) -> None:
 
 
 def extract_players(pdf_file: Path) -> List[str]:
-    reader = PyPDF2.PdfReader(pdf_file)
+    reader = pypdf.PdfReader(pdf_file)
     page = reader.pages[0]
 
     players = []
 
     def visitor_body(text, cm, tm, fontDict, fontSize):
+        global last_text
+        if text:
+            last_text = text
         (x, y) = (tm[4], tm[5])
-        # print(tm, text)
         if x > 79 and x < 80 and y < 741.93:
             # and y < 741.93 and y > 741.93 - 585.18:
-            players.append(text)
+            players.append(last_text.strip())
 
-    page.extract_text(visitor_text=visitor_body)
+    page.extract_text(visitor_text=visitor_body, extraction_mode="plain")
     return players
 
 

pyproject.toml

@@ -1,20 +1,20 @@
 [project]
 name = "myice"
-version = "v0.5.7"
+version = "v0.5.8"
 description = "myice parsing"
 authors = [
     { name = "Rene Luria", "email" = "<rene@luria.ch>"},
 ]
 license = "MIT"
 readme = "README.md"
-requires-python = ">=3.11"
+requires-python = ">=3.13"
 
 dependencies = [
-    "requests (>=2.32.3,<2.33.0)",
+    "requests (>=2.32.3)",
-    "typer (>=0.15.1,<0.16.0)",
+    "typer (>=0.15.1)",
-    "pypdf2 (>=3.0.1)",
+    "pypdf (>=6.0.0)",
     "rl-ai-tools >=1.9.0",
-    "fastapi[standard] (>=0.115.11,<0.116.0)",
+    "fastapi[standard] (>=0.115.11)",
 ]
 
 [tool.poetry.dependencies]

requirements.txt

@@ -0,0 +1,46 @@
+--extra-index-url https://pypi.purple.infomaniak.ch
+
+annotated-types==0.7.0 ; python_version >= "3.13"
+anyio==4.11.0 ; python_version >= "3.13"
+certifi==2025.8.3 ; python_version >= "3.13"
+charset-normalizer==3.4.3 ; python_version >= "3.13"
+click==8.1.8 ; python_version >= "3.13"
+colorama==0.4.6 ; (platform_system == "Windows" or sys_platform == "win32") and python_version >= "3.13"
+dnspython==2.8.0 ; python_version >= "3.13"
+email-validator==2.3.0 ; python_version >= "3.13"
+fastapi-cli==0.0.13 ; python_version >= "3.13"
+fastapi-cloud-cli==0.2.1 ; python_version >= "3.13"
+fastapi==0.118.0 ; python_version >= "3.13"
+h11==0.16.0 ; python_version >= "3.13"
+httpcore==1.0.9 ; python_version >= "3.13"
+httptools==0.6.4 ; python_version >= "3.13"
+httpx==0.28.1 ; python_version >= "3.13"
+idna==3.10 ; python_version >= "3.13"
+jinja2==3.1.6 ; python_version >= "3.13"
+markdown-it-py==4.0.0 ; python_version >= "3.13"
+markupsafe==3.0.3 ; python_version >= "3.13"
+mdurl==0.1.2 ; python_version >= "3.13"
+pydantic-core==2.33.2 ; python_version >= "3.13"
+pydantic==2.11.9 ; python_version >= "3.13"
+pygments==2.19.2 ; python_version >= "3.13"
+pypdf==6.1.1 ; python_version >= "3.13"
+python-dotenv==1.1.1 ; python_version >= "3.13"
+python-multipart==0.0.20 ; python_version >= "3.13"
+pyyaml==6.0.3 ; python_version >= "3.13"
+requests==2.32.5 ; python_version >= "3.13"
+rich-toolkit==0.15.1 ; python_version >= "3.13"
+rich==14.1.0 ; python_version >= "3.13"
+rignore==0.6.4 ; python_version >= "3.13"
+rl-ai-tools==1.15.0 ; python_version >= "3.13"
+sentry-sdk==2.39.0 ; python_version >= "3.13"
+shellingham==1.5.4 ; python_version >= "3.13"
+sniffio==1.3.1 ; python_version >= "3.13"
+starlette==0.48.0 ; python_version >= "3.13"
+typer==0.15.4 ; python_version >= "3.13"
+typing-extensions==4.15.0 ; python_version >= "3.13"
+typing-inspection==0.4.1 ; python_version >= "3.13"
+urllib3==2.5.0 ; python_version >= "3.13"
+uvicorn==0.37.0 ; python_version >= "3.13"
+uvloop==0.21.0 ; sys_platform != "win32" and sys_platform != "cygwin" and platform_python_implementation != "PyPy" and python_version >= "3.13"
+watchfiles==1.1.0 ; python_version >= "3.13"
+websockets==15.0.1 ; python_version >= "3.13"