From 2906d37138723de9a777098d5194af0706fef061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janusz=20Mik=C5=82uszka?= Date: Sat, 24 Jan 2026 18:40:38 +0100 Subject: [PATCH 01/30] Initial commit --- .gitignore | 10 ++++++++++ .python-version | 1 + main.py | 6 ++++++ pyproject.toml | 7 +++++++ 4 files changed, 24 insertions(+) create mode 100644 .gitignore create mode 100644 .python-version create mode 100644 main.py create mode 100644 pyproject.toml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..505a3b1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +# Python-generated files +__pycache__/ +*.py[oc] +build/ +dist/ +wheels/ +*.egg-info + +# Virtual environments +.venv diff --git a/.python-version b/.python-version new file mode 100644 index 0000000..6324d40 --- /dev/null +++ b/.python-version @@ -0,0 +1 @@ +3.14 diff --git a/main.py b/main.py new file mode 100644 index 0000000..58ce375 --- /dev/null +++ b/main.py @@ -0,0 +1,6 @@ +def main(): + print("Hello from gallery!") + + +if __name__ == "__main__": + main() diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..a2059da --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,7 @@ +[project] +name = "gallery" +version = "0.1.0" +description = "Add your description here" +readme = "README.md" +requires-python = ">=3.14" +dependencies = [] From 6b472a9c08b697675ee29f5026aa408981be43e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janusz=20Mik=C5=82uszka?= Date: Sun, 25 Jan 2026 18:10:42 +0100 Subject: [PATCH 02/30] Add PRD and mcp initial config --- .cursor/mcp.json | 9 +++++ docs/prd.md | 86 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 .cursor/mcp.json create mode 100644 docs/prd.md diff --git a/.cursor/mcp.json b/.cursor/mcp.json new file mode 100644 index 0000000..433bd63 --- /dev/null +++ b/.cursor/mcp.json @@ -0,0 +1,9 @@ +{ + "mcpServers": { + "10x-mvp-tracker": { + "command": "npx", + "args": ["-y", "@przeprogramowani/10x-mvp-tracker@latest"], + "transport": "stdio" + } + } +} diff --git a/docs/prd.md b/docs/prd.md new file mode 100644 index 0000000..12bb6db --- /dev/null +++ b/docs/prd.md @@ -0,0 +1,86 @@ +# Dokument Wymagań Produktu (PRD) – System "SmartGallery" (MVP) + +## 1. Wstęp i Cel Projektu + +**Główny problem:** Organizacja i katalogowanie zdjęć jest procesem czasochłonnym, co prowadzi do gromadzenia nieuporządkowanych zbiorów danych ("cyfrowy bałagan"), do których użytkownicy rzadko wracają. + +**Cel produktu:** Stworzenie inteligentnej galerii zdjęć w przeglądarce, która automatyzuje proces tagowania i opisywania zdjęć przy użyciu AI, umożliwiając błyskawiczne wyszukiwanie i łatwe udostępnianie wspomnień. + +--- + +## 2. Grupa Docelowa i Persona + +* **Użytkownik domowy:** Osoba posiadająca tysiące zdjęć rozproszonych na różnych nośnikach, chcąca szybko odnaleźć konkretne momenty (np. "zdjęcie psa z wakacji") bez ręcznego opisywania każdego pliku. + +--- + +## 3. Zakres Funkcjonalny MVP + +### 3.1. Zarządzanie Strukturą + +* **Hierarchia:** Galeria -> Album -> Zdjęcie. +* **Wgrywanie (Upload):** +* Pojedyncze pliki (do 5MB) lub paczki ZIP/TAR (do 100MB). +* **Mapowanie folderów:** ZIP wgrany do Galerii tworzy Albumy na podstawie nazw folderów wewnątrz (1 poziom głębokości). +* Obsługa formatów: JPG, PNG, HEIC/HEIF (z automatyczną konwersją do JPG). + + +* **Masowe działania (Bulk Actions):** Seryjne przenoszenie zdjęć między albumami, usuwanie oraz masowa edycja tagów. + +### 3.2. Automatyzacja i AI + +* **Obiekty (Yolo):** Automatyczne rozpoznawanie obiektów i przypisywanie tagów (opcjonalne przy uploadzie, możliwe do wyzwolenia później). +* **Tekst (OCR):** Ekstrakcja tekstu ze zdjęć (polski/angielski) w celu umożliwienia wyszukiwania po treści (np. szyldy, dokumenty). +* **Metadane EXIF:** Automatyczne pobieranie danych: data, model aparatu, ISO (opcjonalne, za zgodą użytkownika). +* **Pętla zwrotna:** Usuwanie/edycja tagu przez użytkownika jest sygnałem dla systemu do poprawy algorytmu. + +### 3.3. Wyszukiwanie i Przeglądanie + +* **Live Search:** Wyszukiwanie po tytułach, tagach AI, tekście z OCR oraz parametrach EXIF (np. ISO). +* **Widok:** Responsywny Grid View z optymalizacją wyświetlania (miniaturki). +* **Ulubione:** System oznaczania zdjęć "gwiazdką". + +### 3.4. Udostępnianie i Prywatność + +* **Poziomy dostępu:** Galerie Prywatne (domyślne) oraz Publiczne (wyszukiwalne dla wszystkich). +* **Udostępnianie:** Przekazywanie dostępu poprzez adres e-mail. Udostępnione galerie trafiają do sekcji "Udostępnione dla mnie" u odbiorcy (tylko widok). +* **Bezpieczeństwo:** Przycisk "Zgłoś nadużycie" (Report button) w galeriach publicznych. + +--- + +## 4. Specyfikacja Techniczna i Ograniczenia + +| Cecha | Specyfikacja | +| --- | --- | +| **Platforma** | Przeglądarka internetowa (RWD) | +| **Storage** | Limit 5GB na użytkownika (wliczając kosz) | +| **Logowanie** | Lokalne konto + Social Login (Google, Facebook itp.) | +| **Usuwanie** | Soft delete (5 dni w koszu), po tym czasie permanentne usunięcie | +| **Eksport** | Paczka ZIP (struktura folderów) + plik JSON z metadanymi | +| **Powiadomienia** | Systemowe (wewnątrz aplikacji) o nowych udostępnieniach | + +--- + +## 5. User Stories + +1. **Jako użytkownik**, chcę wgrać cały folder z wakacji w formacie ZIP, aby system automatycznie stworzył mi album o tej samej nazwie. +2. **Jako użytkownik**, chcę wpisać słowo "pizza" w wyszukiwarkę, aby znaleźć zdjęcia z restauracji, mimo że sam ich nie opisałem. +3. **Jako użytkownik**, chcę udostępnić galerię rodzinie po ich mailach, aby tylko oni mogli oglądać moje prywatne zdjęcia. +4. **Jako fotograf-amator**, chcę przefiltrować zdjęcia po ISO 800, aby sprawdzić jakość zdjęć nocnych z mojego aparatu. + +--- + +## 6. Kryteria Sukcesu (KPI) + +* **Adopcja:** Średnia liczba zdjęć wgranych przez aktywnego użytkownika w ciągu pierwszego miesiąca. +* **Efektywność AI:** Stosunek tagów zaakceptowanych/pozostawionych przez użytkownika do tagów usuniętych ręcznie. +* **Precyzja wyszukiwania:** Liczba wyszukiwań zakończonych kliknięciem w wynik (zdjęcie). + +--- + +## 7. Zarządzanie Ryzykiem + +* **Ryzyko:** Przekroczenie limitu 5GB przez użytkowników domowych. +* **Mitygacja:** Wyraźny wskaźnik zajętości miejsca w UI i proaktywne sugestie czyszczenia kosza. +* **Ryzyko:** Błędna konwersja HEIC. +* **Mitygacja:** Implementacja sprawdzonych bibliotek serwerowych (np. ImageMagick/Libheif) i informowanie o błędach pojedynczych plików. From 8ceb809d2ef8e5ecc696a4c3ea6921528bea48e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janusz=20Mik=C5=82uszka?= Date: Sun, 25 Jan 2026 18:11:08 +0100 Subject: [PATCH 03/30] Add django initial app, django-allauth, nginx config, seaweed, postgresql --- .env.example | 37 ++++++ .gitignore | 30 +++++ Dockerfile | 38 +++++++ app/config/__init__.py | 0 app/config/asgi.py | 16 +++ app/config/settings.py | 247 +++++++++++++++++++++++++++++++++++++++++ app/config/urls.py | 23 ++++ app/config/wsgi.py | 16 +++ app/manage.py | 22 ++++ docker-compose.yml | 86 ++++++++++++++ nginx/nginx.conf | 73 ++++++++++++ pyproject.toml | 13 ++- 12 files changed, 599 insertions(+), 2 deletions(-) create mode 100644 .env.example create mode 100644 Dockerfile create mode 100644 app/config/__init__.py create mode 100644 app/config/asgi.py create mode 100644 app/config/settings.py create mode 100644 app/config/urls.py create mode 100644 app/config/wsgi.py create mode 100755 app/manage.py create mode 100644 docker-compose.yml create mode 100644 nginx/nginx.conf diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..2351055 --- /dev/null +++ b/.env.example @@ -0,0 +1,37 @@ +# Django Settings +SECRET_KEY=your-secret-key-here-change-in-production +DEBUG=True +ALLOWED_HOSTS=localhost,127.0.0.1 +SITE_ID=1 + +# Database Configuration +DB_NAME=gallery +DB_USER=postgres +DB_PASSWORD=postgres +DB_HOST=db +DB_PORT=5432 + +# Authentication Configuration +ACCOUNT_EMAIL_VERIFICATION=mandatory +# Options: 'mandatory', 'optional', or 'none' + +# Social Authentication - Google +GOOGLE_CLIENT_ID=your-google-client-id +GOOGLE_SECRET=your-google-secret + +# Social Authentication - Facebook +FACEBOOK_APP_ID=your-facebook-app-id +FACEBOOK_APP_SECRET=your-facebook-app-secret + +# Social Authentication - GitHub +GITHUB_CLIENT_ID=your-github-client-id +GITHUB_SECRET=your-github-secret + +# SeaweedFS / S3 Configuration +USE_S3=False +AWS_ACCESS_KEY_ID= +AWS_SECRET_ACCESS_KEY= +AWS_STORAGE_BUCKET_NAME=gallery +AWS_S3_ENDPOINT_URL=http://seaweedfs:8333 +AWS_S3_REGION_NAME=us-east-1 +AWS_S3_USE_SSL=False diff --git a/.gitignore b/.gitignore index 505a3b1..856b5e9 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,33 @@ wheels/ # Virtual environments .venv +venv/ +env/ + +# Django +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal +/media +/staticfiles +/static + +# Environment variables +.env +.env.local +.env.*.local + +# IDE +.vscode/ +.idea/ +*.swp +*.swo +*~ + +# OS +.DS_Store +Thumbs.db + +# Docker +.dockerignore diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..5e33144 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,38 @@ +# Use Python 3.14 slim image +FROM python:3.14-slim + +# Set environment variables +ENV PYTHONDONTWRITEBYTECODE=1 +ENV PYTHONUNBUFFERED=1 +ENV DEBIAN_FRONTEND=noninteractive + +# Set work directory +WORKDIR /app + +# Install system dependencies +RUN apt-get update && apt-get install -y \ + postgresql-client \ + libpq-dev \ + gcc \ + && rm -rf /var/lib/apt/lists/* + +# Install Python dependencies +COPY pyproject.toml ./ +RUN pip install --no-cache-dir --upgrade pip && \ + pip install --no-cache-dir -e . + +# Copy Django app (manage.py and config/ will be directly in /app) +COPY app/ . + +# Collect static files +RUN python manage.py collectstatic --noinput || true + +# Create a non-root user +RUN useradd -m -u 1000 appuser && chown -R appuser:appuser /app +USER appuser + +# Expose port +EXPOSE 8000 + +# Run gunicorn +CMD ["gunicorn", "--bind", "0.0.0.0:8000", "--workers", "4", "--timeout", "120", "config.wsgi:application"] diff --git a/app/config/__init__.py b/app/config/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/app/config/asgi.py b/app/config/asgi.py new file mode 100644 index 0000000..ed7c431 --- /dev/null +++ b/app/config/asgi.py @@ -0,0 +1,16 @@ +""" +ASGI config for config project. + +It exposes the ASGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/5.2/howto/deployment/asgi/ +""" + +import os + +from django.core.asgi import get_asgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings') + +application = get_asgi_application() diff --git a/app/config/settings.py b/app/config/settings.py new file mode 100644 index 0000000..a8f141a --- /dev/null +++ b/app/config/settings.py @@ -0,0 +1,247 @@ +""" +Django settings for config project. + +Generated by 'django-admin startproject' using Django 5.2.1. + +For more information on this file, see +https://docs.djangoproject.com/en/5.2/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/5.2/ref/settings/ +""" + +import os +from pathlib import Path +from dotenv import load_dotenv + +# Build paths inside the project like this: BASE_DIR / 'subdir'. +# BASE_DIR points to /app (where manage.py is located) +BASE_DIR = Path(__file__).resolve().parent.parent + +# Load environment variables from .env file +# Try project root first (for local dev), then fall back to BASE_DIR +load_dotenv(BASE_DIR.parent / '.env') # Project root +load_dotenv(BASE_DIR / '.env', override=False) # App directory (fallback) + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/5.2/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = os.getenv('SECRET_KEY', 'django-insecure-z&x2fgjdjshurb8*p9jtwlov@hy!_h&+obyi1(kl7u^#u5#dr$') + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = os.getenv('DEBUG', 'True') == 'True' + +ALLOWED_HOSTS = os.getenv('ALLOWED_HOSTS', 'localhost,127.0.0.1').split(',') + + +# Application definition + +INSTALLED_APPS = [ + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', + 'django.contrib.sites', # Required for allauth + + # allauth + 'allauth', + 'allauth.account', + 'allauth.socialaccount', + 'allauth.socialaccount.providers.google', + 'allauth.socialaccount.providers.facebook', + 'allauth.socialaccount.providers.github', +] + +# Add storages if using S3/SeaweedFS +USE_S3 = os.getenv('USE_S3', 'False') == 'True' +if USE_S3: + INSTALLED_APPS.append('storages') + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', + 'allauth.account.middleware.AccountMiddleware', +] + +ROOT_URLCONF = 'config.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'config.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/5.2/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.postgresql', + 'NAME': os.getenv('DB_NAME', 'gallery'), + 'USER': os.getenv('DB_USER', 'postgres'), + 'PASSWORD': os.getenv('DB_PASSWORD', 'postgres'), + 'HOST': os.getenv('DB_HOST', 'db'), + 'PORT': os.getenv('DB_PORT', '5432'), + } +} + + +# Password validation +# https://docs.djangoproject.com/en/5.2/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/5.2/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/5.2/howto/static-files/ + +STATIC_URL = '/static/' +STATIC_ROOT = BASE_DIR / 'staticfiles' + +MEDIA_URL = '/media/' +MEDIA_ROOT = BASE_DIR / 'media' + +# SeaweedFS / S3 Storage Configuration +if USE_S3: + # SeaweedFS S3-compatible storage + AWS_ACCESS_KEY_ID = os.getenv('AWS_ACCESS_KEY_ID', '') + AWS_SECRET_ACCESS_KEY = os.getenv('AWS_SECRET_ACCESS_KEY', '') + AWS_STORAGE_BUCKET_NAME = os.getenv('AWS_STORAGE_BUCKET_NAME', 'gallery') + AWS_S3_ENDPOINT_URL = os.getenv('AWS_S3_ENDPOINT_URL', 'http://seaweedfs:8333') + AWS_S3_REGION_NAME = os.getenv('AWS_S3_REGION_NAME', 'us-east-1') + AWS_S3_USE_SSL = os.getenv('AWS_S3_USE_SSL', 'False') == 'True' + AWS_S3_FILE_OVERWRITE = False + AWS_DEFAULT_ACL = None + + # Use S3 for media files + DEFAULT_FILE_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage' + STATICFILES_STORAGE = 'storages.backends.s3boto3.S3StaticStorage' + +# Default primary key field type +# https://docs.djangoproject.com/en/5.2/ref/settings/#default-auto-field + +DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' + +# Authentication Configuration +AUTHENTICATION_BACKENDS = [ + # Django default authentication (username/password) + 'django.contrib.auth.backends.ModelBackend', + # allauth authentication (social accounts) + 'allauth.account.auth_backends.AuthenticationBackend', +] + +# Site ID (required for allauth) +SITE_ID = int(os.getenv('SITE_ID', '1')) + +# allauth Configuration +ACCOUNT_AUTHENTICATION_METHOD = 'email' # Use email instead of username +ACCOUNT_EMAIL_REQUIRED = True +ACCOUNT_USERNAME_REQUIRED = False +ACCOUNT_EMAIL_VERIFICATION = os.getenv('ACCOUNT_EMAIL_VERIFICATION', 'mandatory') # 'mandatory', 'optional', or 'none' +ACCOUNT_UNIQUE_EMAIL = True +ACCOUNT_SIGNUP_EMAIL_ENTER_TWICE = True +ACCOUNT_SESSION_REMEMBER = True + +# Login/Logout URLs +LOGIN_URL = '/accounts/login/' +LOGIN_REDIRECT_URL = '/' +LOGOUT_REDIRECT_URL = '/' + +# Social Account Providers Configuration +SOCIALACCOUNT_PROVIDERS = { + 'google': { + 'SCOPE': [ + 'profile', + 'email', + ], + 'AUTH_PARAMS': { + 'access_type': 'online', + }, + 'APP': { + 'client_id': os.getenv('GOOGLE_CLIENT_ID', ''), + 'secret': os.getenv('GOOGLE_SECRET', ''), + 'key': '', + } + }, + 'facebook': { + 'METHOD': 'oauth2', + 'SCOPE': ['email', 'public_profile'], + 'AUTH_PARAMS': {'auth_type': 'reauthenticate'}, + 'INIT_PARAMS': {'cookie': True}, + 'FIELDS': [ + 'id', + 'first_name', + 'last_name', + 'middle_name', + 'name', + 'name_format', + 'picture', + 'short_name', + 'email', + ], + 'EXCHANGE_TOKEN': True, + 'APP': { + 'client_id': os.getenv('FACEBOOK_APP_ID', ''), + 'secret': os.getenv('FACEBOOK_APP_SECRET', ''), + 'key': '', + } + }, + 'github': { + 'SCOPE': [ + 'user', + 'user:email', + ], + 'APP': { + 'client_id': os.getenv('GITHUB_CLIENT_ID', ''), + 'secret': os.getenv('GITHUB_SECRET', ''), + 'key': '', + } + } +} diff --git a/app/config/urls.py b/app/config/urls.py new file mode 100644 index 0000000..66c5ea3 --- /dev/null +++ b/app/config/urls.py @@ -0,0 +1,23 @@ +""" +URL configuration for config project. + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/5.2/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: path('', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.urls import include, path + 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) +""" +from django.contrib import admin +from django.urls import path, include + +urlpatterns = [ + path('admin/', admin.site.urls), + path('accounts/', include('allauth.urls')), +] diff --git a/app/config/wsgi.py b/app/config/wsgi.py new file mode 100644 index 0000000..e2fbd58 --- /dev/null +++ b/app/config/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for config project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/5.2/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings') + +application = get_wsgi_application() diff --git a/app/manage.py b/app/manage.py new file mode 100755 index 0000000..8e7ac79 --- /dev/null +++ b/app/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +"""Django's command-line utility for administrative tasks.""" +import os +import sys + + +def main(): + """Run administrative tasks.""" + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings') + try: + from django.core.management import execute_from_command_line + except ImportError as exc: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) from exc + execute_from_command_line(sys.argv) + + +if __name__ == '__main__': + main() diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..10984b4 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,86 @@ +version: '3.8' + +services: + db: + image: postgres:16-alpine + container_name: gallery_db + environment: + POSTGRES_DB: ${DB_NAME:-gallery} + POSTGRES_USER: ${DB_USER:-postgres} + POSTGRES_PASSWORD: ${DB_PASSWORD:-postgres} + volumes: + - postgres_data:/var/lib/postgresql/data + ports: + - "${DB_PORT:-5432}:5432" + healthcheck: + test: ["CMD-SHELL", "pg_isready -U ${DB_USER:-postgres}"] + interval: 10s + timeout: 5s + retries: 5 + networks: + - gallery_network + + seaweedfs: + image: chrislusf/seaweedfs:latest + container_name: gallery_seaweedfs + command: "server -master.port=9333 -volume.port=8080 -filer.port=8888 -s3.port=8333" + ports: + - "9333:9333" # Master + - "8080:8080" # Volume + - "8888:8888" # Filer + - "8333:8333" # S3 + volumes: + - seaweedfs_data:/data + networks: + - gallery_network + healthcheck: + test: ["CMD-SHELL", "wget --quiet --tries=1 --spider http://localhost:9333/dir/status || exit 1"] + interval: 30s + timeout: 10s + retries: 3 + start_period: 10s + + web: + build: . + container_name: gallery_web + command: sh -c "python manage.py migrate --noinput && gunicorn --bind 0.0.0.0:8000 --workers 4 --timeout 120 config.wsgi:application" + volumes: + - ./app:/app + - static_volume:/app/staticfiles + - media_volume:/app/media + ports: + - "8000:8000" + env_file: + - .env + depends_on: + db: + condition: service_healthy + seaweedfs: + condition: service_healthy + networks: + - gallery_network + + nginx: + image: nginx:alpine + container_name: gallery_nginx + ports: + - "80:80" + - "443:443" + volumes: + - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro + - static_volume:/static:ro + - media_volume:/media:ro + depends_on: + - web + networks: + - gallery_network + +volumes: + postgres_data: + seaweedfs_data: + static_volume: + media_volume: + +networks: + gallery_network: + driver: bridge diff --git a/nginx/nginx.conf b/nginx/nginx.conf new file mode 100644 index 0000000..3e6329f --- /dev/null +++ b/nginx/nginx.conf @@ -0,0 +1,73 @@ +user nginx; +worker_processes auto; +error_log /var/log/nginx/error.log warn; +pid /var/run/nginx.pid; + +events { + worker_connections 1024; + use epoll; +} + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; + + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 2048; + client_max_body_size 100M; + + gzip on; + gzip_vary on; + gzip_proxied any; + gzip_comp_level 6; + gzip_types text/plain text/css text/xml text/javascript application/json application/javascript application/xml+rss; + + upstream django { + server web:8000; + } + + server { + listen 80; + server_name localhost; + + # Security headers + add_header X-Frame-Options "SAMEORIGIN" always; + add_header X-Content-Type-Options "nosniff" always; + add_header X-XSS-Protection "1; mode=block" always; + + # Static files + location /static/ { + alias /static/; + expires 30d; + add_header Cache-Control "public, immutable"; + } + + # Media files + location /media/ { + alias /media/; + expires 7d; + add_header Cache-Control "public"; + } + + # Proxy to Django + location / { + proxy_pass http://django; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_redirect off; + proxy_read_timeout 300s; + proxy_connect_timeout 75s; + } + } +} diff --git a/pyproject.toml b/pyproject.toml index a2059da..6e030a4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,16 @@ [project] name = "gallery" version = "0.1.0" -description = "Add your description here" +description = "SmartGallery - Intelligent Photo Gallery with AI Tagging" readme = "README.md" requires-python = ">=3.14" -dependencies = [] +dependencies = [ + "Django>=5.0.0", + "psycopg2-binary>=2.9.9", + "django-storages>=1.14.2", + "boto3>=1.34.0", + "Pillow>=10.2.0", + "python-dotenv>=1.0.0", + "gunicorn>=21.2.0", + "django-allauth>=0.57.0", +] From 55036fc2d4fe3eff2675d7c8ae399d784d29b9cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janusz=20Mik=C5=82uszka?= Date: Sun, 25 Jan 2026 18:17:43 +0100 Subject: [PATCH 04/30] Add Celery and YAML based config for Django --- .env.example | 10 +++ .gitignore | 4 ++ app/config/__init__.py | 5 ++ app/config/celery.py | 25 +++++++ app/config/config_loader.py | 130 ++++++++++++++++++++++++++++++++++++ app/config/settings.py | 127 +++++++++++++++++++---------------- config.example.yaml | 73 ++++++++++++++++++++ docker-compose.yml | 93 +++++++++++++++++++++++++- nginx/nginx.conf | 17 +++++ pyproject.toml | 4 ++ 10 files changed, 428 insertions(+), 60 deletions(-) create mode 100644 app/config/celery.py create mode 100644 app/config/config_loader.py create mode 100644 config.example.yaml diff --git a/.env.example b/.env.example index 2351055..c89cdbc 100644 --- a/.env.example +++ b/.env.example @@ -27,6 +27,16 @@ FACEBOOK_APP_SECRET=your-facebook-app-secret GITHUB_CLIENT_ID=your-github-client-id GITHUB_SECRET=your-github-secret +# Celery Configuration +CELERY_BROKER_URL=redis://redis:6379/0 +CELERY_RESULT_BACKEND=redis://redis:6379/0 +REDIS_PORT=6379 + +# Flower Configuration (Celery Monitoring) +FLOWER_PORT=5555 +FLOWER_USERNAME=admin +FLOWER_PASSWORD=change-this-password-in-production + # SeaweedFS / S3 Configuration USE_S3=False AWS_ACCESS_KEY_ID= diff --git a/.gitignore b/.gitignore index 856b5e9..ca63a66 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,10 @@ db.sqlite3-journal .env.local .env.*.local +# Configuration files +config.yaml +!config.example.yaml + # IDE .vscode/ .idea/ diff --git a/app/config/__init__.py b/app/config/__init__.py index e69de29..15d7c50 100644 --- a/app/config/__init__.py +++ b/app/config/__init__.py @@ -0,0 +1,5 @@ +# This will make sure the app is always imported when +# Django starts so that shared_task will use this app. +from .celery import app as celery_app + +__all__ = ('celery_app',) diff --git a/app/config/celery.py b/app/config/celery.py new file mode 100644 index 0000000..4de9784 --- /dev/null +++ b/app/config/celery.py @@ -0,0 +1,25 @@ +""" +Celery configuration for the gallery project. +""" +import os +from celery import Celery +from django.conf import settings + +# Set the default Django settings module for the 'celery' program. +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings') + +app = Celery('gallery') + +# Using a string here means the worker doesn't have to serialize +# the configuration object to child processes. +# - namespace='CELERY' means all celery-related configuration keys +# should have a `CELERY_` prefix. +app.config_from_object('django.conf:settings', namespace='CELERY') + +# Load task modules from all registered Django apps. +app.autodiscover_tasks() + + +@app.task(bind=True, ignore_result=True) +def debug_task(self): + print(f'Request: {self.request!r}') diff --git a/app/config/config_loader.py b/app/config/config_loader.py new file mode 100644 index 0000000..3071ee3 --- /dev/null +++ b/app/config/config_loader.py @@ -0,0 +1,130 @@ +""" +Configuration loader that reads from YAML file and environment variables. +Environment variables take precedence over YAML values. +""" +import os +import yaml +from pathlib import Path +from typing import Any, Dict, Optional + + +class ConfigLoader: + """Load configuration from YAML file with environment variable overrides.""" + + def __init__(self, config_path: Optional[Path] = None): + """ + Initialize config loader. + + Args: + config_path: Path to YAML config file. If None, tries common locations. + """ + self.config_path = config_path or self._find_config_file() + self.config: Dict[str, Any] = {} + self._load_config() + + def _find_config_file(self) -> Path: + """Find config.yaml in common locations.""" + # Try in order: /app/config.yaml (container), project root, app directory + possible_paths = [ + Path('/app/config.yaml'), # Docker config mount + Path(__file__).resolve().parent.parent.parent / 'config.yaml', # Project root + Path(__file__).resolve().parent / 'config.yaml', # App directory + ] + + for path in possible_paths: + if path.exists(): + return path + + # Return default path even if it doesn't exist (will use defaults) + return possible_paths[1] + + def _load_config(self) -> None: + """Load YAML configuration file.""" + if self.config_path.exists(): + try: + with open(self.config_path, 'r') as f: + self.config = yaml.safe_load(f) or {} + except Exception as e: + print(f"Warning: Could not load config from {self.config_path}: {e}") + self.config = {} + else: + print(f"Warning: Config file not found at {self.config_path}, using defaults") + self.config = {} + + def get(self, key_path: str, default: Any = None, env_var: Optional[str] = None) -> Any: + """ + Get configuration value by dot-separated key path. + + Args: + key_path: Dot-separated path (e.g., 'django.debug') + default: Default value if not found + env_var: Optional environment variable name to check first + + Returns: + Configuration value, with env var taking precedence + """ + # Check environment variable first if provided + if env_var: + env_value = os.getenv(env_var) + if env_value is not None: + # Try to convert to appropriate type + if isinstance(default, bool): + return env_value.lower() in ('true', '1', 'yes', 'on') + elif isinstance(default, int): + try: + return int(env_value) + except ValueError: + return env_value + elif isinstance(default, list): + return [item.strip() for item in env_value.split(',')] + return env_value + + # Navigate through nested dict + keys = key_path.split('.') + value = self.config + + for key in keys: + if isinstance(value, dict) and key in value: + value = value[key] + else: + return default + + return value + + def get_list(self, key_path: str, default: Optional[list] = None, env_var: Optional[str] = None) -> list: + """Get configuration value as a list.""" + value = self.get(key_path, default or [], env_var) + if isinstance(value, list): + return value + elif isinstance(value, str): + return [item.strip() for item in value.split(',')] + return default or [] + + def get_bool(self, key_path: str, default: bool = False, env_var: Optional[str] = None) -> bool: + """Get configuration value as a boolean.""" + value = self.get(key_path, default, env_var) + if isinstance(value, bool): + return value + if isinstance(value, str): + return value.lower() in ('true', '1', 'yes', 'on') + return bool(value) + + def get_int(self, key_path: str, default: int = 0, env_var: Optional[str] = None) -> int: + """Get configuration value as an integer.""" + value = self.get(key_path, default, env_var) + try: + return int(value) + except (ValueError, TypeError): + return default + + +# Global config loader instance +_config_loader: Optional[ConfigLoader] = None + + +def get_config_loader() -> ConfigLoader: + """Get or create the global config loader instance.""" + global _config_loader + if _config_loader is None: + _config_loader = ConfigLoader() + return _config_loader diff --git a/app/config/settings.py b/app/config/settings.py index a8f141a..be4e044 100644 --- a/app/config/settings.py +++ b/app/config/settings.py @@ -23,17 +23,21 @@ load_dotenv(BASE_DIR.parent / '.env') # Project root load_dotenv(BASE_DIR / '.env', override=False) # App directory (fallback) +# Load YAML configuration +from .config_loader import get_config_loader +config = get_config_loader() + # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/5.2/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = os.getenv('SECRET_KEY', 'django-insecure-z&x2fgjdjshurb8*p9jtwlov@hy!_h&+obyi1(kl7u^#u5#dr$') +SECRET_KEY = config.get('django.secret_key', 'django-insecure-z&x2fgjdjshurb8*p9jtwlov@hy!_h&+obyi1(kl7u^#u5#dr$', 'SECRET_KEY') # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = os.getenv('DEBUG', 'True') == 'True' +DEBUG = config.get_bool('django.debug', False, 'DEBUG') -ALLOWED_HOSTS = os.getenv('ALLOWED_HOSTS', 'localhost,127.0.0.1').split(',') +ALLOWED_HOSTS = config.get_list('django.allowed_hosts', ['localhost', '127.0.0.1'], 'ALLOWED_HOSTS') # Application definition @@ -57,7 +61,7 @@ ] # Add storages if using S3/SeaweedFS -USE_S3 = os.getenv('USE_S3', 'False') == 'True' +USE_S3 = config.get_bool('storage.use_s3', False, 'USE_S3') if USE_S3: INSTALLED_APPS.append('storages') @@ -99,11 +103,11 @@ DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql', - 'NAME': os.getenv('DB_NAME', 'gallery'), - 'USER': os.getenv('DB_USER', 'postgres'), - 'PASSWORD': os.getenv('DB_PASSWORD', 'postgres'), - 'HOST': os.getenv('DB_HOST', 'db'), - 'PORT': os.getenv('DB_PORT', '5432'), + 'NAME': config.get('database.name', 'gallery', 'DB_NAME'), + 'USER': config.get('database.user', 'postgres', 'DB_USER'), + 'PASSWORD': config.get('database.password', 'postgres', 'DB_PASSWORD'), + 'HOST': config.get('database.host', 'db', 'DB_HOST'), + 'PORT': config.get('database.port', '5432', 'DB_PORT'), } } @@ -130,9 +134,8 @@ # Internationalization # https://docs.djangoproject.com/en/5.2/topics/i18n/ -LANGUAGE_CODE = 'en-us' - -TIME_ZONE = 'UTC' +LANGUAGE_CODE = config.get('django.language_code', 'en-us') +TIME_ZONE = config.get('django.timezone', 'UTC') USE_I18N = True @@ -142,21 +145,21 @@ # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/5.2/howto/static-files/ -STATIC_URL = '/static/' -STATIC_ROOT = BASE_DIR / 'staticfiles' +STATIC_URL = config.get('static_files.static_url', '/static/') +STATIC_ROOT = BASE_DIR / config.get('static_files.static_root', 'staticfiles') -MEDIA_URL = '/media/' -MEDIA_ROOT = BASE_DIR / 'media' +MEDIA_URL = config.get('static_files.media_url', '/media/') +MEDIA_ROOT = BASE_DIR / config.get('static_files.media_root', 'media') # SeaweedFS / S3 Storage Configuration if USE_S3: # SeaweedFS S3-compatible storage - AWS_ACCESS_KEY_ID = os.getenv('AWS_ACCESS_KEY_ID', '') - AWS_SECRET_ACCESS_KEY = os.getenv('AWS_SECRET_ACCESS_KEY', '') - AWS_STORAGE_BUCKET_NAME = os.getenv('AWS_STORAGE_BUCKET_NAME', 'gallery') - AWS_S3_ENDPOINT_URL = os.getenv('AWS_S3_ENDPOINT_URL', 'http://seaweedfs:8333') - AWS_S3_REGION_NAME = os.getenv('AWS_S3_REGION_NAME', 'us-east-1') - AWS_S3_USE_SSL = os.getenv('AWS_S3_USE_SSL', 'False') == 'True' + AWS_ACCESS_KEY_ID = config.get('storage.s3.access_key_id', '', 'AWS_ACCESS_KEY_ID') + AWS_SECRET_ACCESS_KEY = config.get('storage.s3.secret_access_key', '', 'AWS_SECRET_ACCESS_KEY') + AWS_STORAGE_BUCKET_NAME = config.get('storage.s3.bucket_name', 'gallery', 'AWS_STORAGE_BUCKET_NAME') + AWS_S3_ENDPOINT_URL = config.get('storage.s3.endpoint_url', 'http://seaweedfs:8333', 'AWS_S3_ENDPOINT_URL') + AWS_S3_REGION_NAME = config.get('storage.s3.region_name', 'us-east-1', 'AWS_S3_REGION_NAME') + AWS_S3_USE_SSL = config.get_bool('storage.s3.use_ssl', False, 'AWS_S3_USE_SSL') AWS_S3_FILE_OVERWRITE = False AWS_DEFAULT_ACL = None @@ -178,70 +181,76 @@ ] # Site ID (required for allauth) -SITE_ID = int(os.getenv('SITE_ID', '1')) +SITE_ID = config.get_int('django.site_id', 1, 'SITE_ID') # allauth Configuration ACCOUNT_AUTHENTICATION_METHOD = 'email' # Use email instead of username ACCOUNT_EMAIL_REQUIRED = True ACCOUNT_USERNAME_REQUIRED = False -ACCOUNT_EMAIL_VERIFICATION = os.getenv('ACCOUNT_EMAIL_VERIFICATION', 'mandatory') # 'mandatory', 'optional', or 'none' +ACCOUNT_EMAIL_VERIFICATION = config.get('authentication.account_email_verification', 'mandatory', 'ACCOUNT_EMAIL_VERIFICATION') ACCOUNT_UNIQUE_EMAIL = True ACCOUNT_SIGNUP_EMAIL_ENTER_TWICE = True ACCOUNT_SESSION_REMEMBER = True # Login/Logout URLs LOGIN_URL = '/accounts/login/' -LOGIN_REDIRECT_URL = '/' -LOGOUT_REDIRECT_URL = '/' +LOGIN_REDIRECT_URL = config.get('authentication.login_redirect_url', '/') +LOGOUT_REDIRECT_URL = config.get('authentication.logout_redirect_url', '/') # Social Account Providers Configuration -SOCIALACCOUNT_PROVIDERS = { - 'google': { - 'SCOPE': [ - 'profile', - 'email', - ], - 'AUTH_PARAMS': { - 'access_type': 'online', - }, +SOCIALACCOUNT_PROVIDERS = {} + +# Google OAuth +if config.get_bool('social_auth.google.enabled', False): + SOCIALACCOUNT_PROVIDERS['google'] = { + 'SCOPE': ['profile', 'email'], + 'AUTH_PARAMS': {'access_type': 'online'}, 'APP': { - 'client_id': os.getenv('GOOGLE_CLIENT_ID', ''), - 'secret': os.getenv('GOOGLE_SECRET', ''), + 'client_id': config.get('social_auth.google.client_id', '', 'GOOGLE_CLIENT_ID'), + 'secret': config.get('social_auth.google.secret', '', 'GOOGLE_SECRET'), 'key': '', } - }, - 'facebook': { + } + +# Facebook OAuth +if config.get_bool('social_auth.facebook.enabled', False): + SOCIALACCOUNT_PROVIDERS['facebook'] = { 'METHOD': 'oauth2', 'SCOPE': ['email', 'public_profile'], 'AUTH_PARAMS': {'auth_type': 'reauthenticate'}, 'INIT_PARAMS': {'cookie': True}, 'FIELDS': [ - 'id', - 'first_name', - 'last_name', - 'middle_name', - 'name', - 'name_format', - 'picture', - 'short_name', - 'email', + 'id', 'first_name', 'last_name', 'middle_name', + 'name', 'name_format', 'picture', 'short_name', 'email', ], 'EXCHANGE_TOKEN': True, 'APP': { - 'client_id': os.getenv('FACEBOOK_APP_ID', ''), - 'secret': os.getenv('FACEBOOK_APP_SECRET', ''), + 'client_id': config.get('social_auth.facebook.app_id', '', 'FACEBOOK_APP_ID'), + 'secret': config.get('social_auth.facebook.app_secret', '', 'FACEBOOK_APP_SECRET'), 'key': '', } - }, - 'github': { - 'SCOPE': [ - 'user', - 'user:email', - ], + } + +# GitHub OAuth +if config.get_bool('social_auth.github.enabled', False): + SOCIALACCOUNT_PROVIDERS['github'] = { + 'SCOPE': ['user', 'user:email'], 'APP': { - 'client_id': os.getenv('GITHUB_CLIENT_ID', ''), - 'secret': os.getenv('GITHUB_SECRET', ''), + 'client_id': config.get('social_auth.github.client_id', '', 'GITHUB_CLIENT_ID'), + 'secret': config.get('social_auth.github.secret', '', 'GITHUB_SECRET'), 'key': '', } } -} + +# Celery Configuration +CELERY_BROKER_URL = config.get('celery.broker_url', 'redis://redis:6379/0', 'CELERY_BROKER_URL') +CELERY_RESULT_BACKEND = config.get('celery.result_backend', 'redis://redis:6379/0', 'CELERY_RESULT_BACKEND') +CELERY_ACCEPT_CONTENT = ['json'] +CELERY_TASK_SERIALIZER = 'json' +CELERY_RESULT_SERIALIZER = 'json' +CELERY_TIMEZONE = TIME_ZONE +CELERY_TASK_TRACK_STARTED = True +CELERY_TASK_TIME_LIMIT = config.get_int('celery.task_time_limit', 1800, None) # seconds +CELERY_TASK_SOFT_TIME_LIMIT = config.get_int('celery.task_soft_time_limit', 1500, None) # seconds +CELERY_WORKER_PREFETCH_MULTIPLIER = config.get_int('celery.worker_prefetch_multiplier', 1, None) +CELERY_WORKER_MAX_TASKS_PER_CHILD = config.get_int('celery.worker_max_tasks_per_child', 1000, None) diff --git a/config.example.yaml b/config.example.yaml new file mode 100644 index 0000000..8d3e8f9 --- /dev/null +++ b/config.example.yaml @@ -0,0 +1,73 @@ +# Gallery Service Configuration Example +# Copy this file to config.yaml and customize for your environment +# This file is mounted into containers via docker-compose configs + +django: + secret_key: "" # Override via SECRET_KEY env var for security + debug: false + allowed_hosts: + - localhost + - 127.0.0.1 + site_id: 1 + timezone: "UTC" + language_code: "en-us" + +database: + name: "gallery" + user: "postgres" + password: "postgres" # Override via DB_PASSWORD env var + host: "db" + port: 5432 + +authentication: + account_email_verification: "mandatory" # mandatory, optional, none + login_redirect_url: "/" + logout_redirect_url: "/" + +social_auth: + google: + enabled: false + client_id: "" + secret: "" + facebook: + enabled: false + app_id: "" + app_secret: "" + github: + enabled: false + client_id: "" + secret: "" + +celery: + broker_url: "redis://redis:6379/0" + result_backend: "redis://redis:6379/0" + task_time_limit: 1800 # 30 minutes in seconds + task_soft_time_limit: 1500 # 25 minutes in seconds + worker_prefetch_multiplier: 1 + worker_max_tasks_per_child: 1000 + worker_concurrency: 4 + +flower: + port: 5555 + username: "admin" + password: "" # Override via FLOWER_PASSWORD env var + +storage: + use_s3: false + s3: + endpoint_url: "http://seaweedfs:8333" + bucket_name: "gallery" + region_name: "us-east-1" + use_ssl: false + access_key_id: "" + secret_access_key: "" + +static_files: + static_url: "/static/" + static_root: "staticfiles" + media_url: "/media/" + media_root: "media" + +server: + gunicorn_workers: 4 + gunicorn_timeout: 120 diff --git a/docker-compose.yml b/docker-compose.yml index 10984b4..05da255 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,6 +20,22 @@ services: networks: - gallery_network + redis: + image: redis:7-alpine + container_name: gallery_redis + ports: + - "${REDIS_PORT:-6379}:6379" + volumes: + - redis_data:/data + command: redis-server --appendonly yes + healthcheck: + test: ["CMD", "redis-cli", "ping"] + interval: 10s + timeout: 5s + retries: 5 + networks: + - gallery_network + seaweedfs: image: chrislusf/seaweedfs:latest container_name: gallery_seaweedfs @@ -43,11 +59,14 @@ services: web: build: . container_name: gallery_web - command: sh -c "python manage.py migrate --noinput && gunicorn --bind 0.0.0.0:8000 --workers 4 --timeout 120 config.wsgi:application" + command: sh -c "python manage.py migrate --noinput && gunicorn --bind 0.0.0.0:8000 --workers ${GUNICORN_WORKERS:-4} --timeout ${GUNICORN_TIMEOUT:-120} config.wsgi:application" volumes: - ./app:/app - static_volume:/app/staticfiles - media_volume:/app/media + configs: + - source: gallery_config + target: /app/config.yaml ports: - "8000:8000" env_file: @@ -55,11 +74,77 @@ services: depends_on: db: condition: service_healthy + redis: + condition: service_healthy seaweedfs: condition: service_healthy networks: - gallery_network + celery: + build: . + container_name: gallery_celery + command: celery -A config worker --loglevel=info --concurrency=${CELERY_WORKER_CONCURRENCY:-4} + volumes: + - ./app:/app + - media_volume:/app/media + configs: + - source: gallery_config + target: /app/config.yaml + env_file: + - .env + depends_on: + db: + condition: service_healthy + redis: + condition: service_healthy + networks: + - gallery_network + + celery-beat: + build: . + container_name: gallery_celery_beat + command: celery -A config beat --loglevel=info + volumes: + - ./app:/app + configs: + - source: gallery_config + target: /app/config.yaml + env_file: + - .env + depends_on: + db: + condition: service_healthy + redis: + condition: service_healthy + networks: + - gallery_network + + flower: + build: . + container_name: gallery_flower + command: > + sh -c " + if [ -n \"$$FLOWER_USERNAME\" ] && [ -n \"$$FLOWER_PASSWORD\" ]; then + celery -A config flower --port=5555 --basic_auth=$$FLOWER_USERNAME:$$FLOWER_PASSWORD + else + echo 'ERROR: FLOWER_USERNAME and FLOWER_PASSWORD must be set for security!' + exit 1 + fi + " + ports: + - "${FLOWER_PORT:-5555}:5555" + configs: + - source: gallery_config + target: /app/config.yaml + env_file: + - .env + depends_on: + - celery + - redis + networks: + - gallery_network + nginx: image: nginx:alpine container_name: gallery_nginx @@ -72,15 +157,21 @@ services: - media_volume:/media:ro depends_on: - web + - flower networks: - gallery_network volumes: postgres_data: + redis_data: seaweedfs_data: static_volume: media_volume: +configs: + gallery_config: + file: ./config.yaml + networks: gallery_network: driver: bridge diff --git a/nginx/nginx.conf b/nginx/nginx.conf index 3e6329f..7e9d9b1 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -35,6 +35,10 @@ http { server web:8000; } + upstream flower { + server flower:5555; + } + server { listen 80; server_name localhost; @@ -58,6 +62,19 @@ http { add_header Cache-Control "public"; } + # Flower (Celery monitoring) + location /flower/ { + proxy_pass http://flower/; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_redirect off; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + } + # Proxy to Django location / { proxy_pass http://django; diff --git a/pyproject.toml b/pyproject.toml index 6e030a4..50f0371 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,4 +13,8 @@ dependencies = [ "python-dotenv>=1.0.0", "gunicorn>=21.2.0", "django-allauth>=0.57.0", + "celery>=5.3.0", + "flower>=2.0.0", + "redis>=5.0.0", + "pyyaml>=6.0.0", ] From 2c335dad7888a0d7b77705686773a0b9fc5efa6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janusz=20Mik=C5=82uszka?= Date: Sun, 25 Jan 2026 18:23:37 +0100 Subject: [PATCH 05/30] Update config loader to accept yaml key as also env key --- .env.example | 66 +++++++++++++++++++++------------- app/config/config_loader.py | 58 +++++++++++++++++++++++++----- app/config/settings.py | 70 ++++++++++++++++++++++--------------- 3 files changed, 132 insertions(+), 62 deletions(-) diff --git a/.env.example b/.env.example index c89cdbc..c677e25 100644 --- a/.env.example +++ b/.env.example @@ -1,47 +1,63 @@ # Django Settings -SECRET_KEY=your-secret-key-here-change-in-production -DEBUG=True -ALLOWED_HOSTS=localhost,127.0.0.1 -SITE_ID=1 +# Environment variable names can match YAML paths exactly (dot-separated lowercase) +# or use traditional format (uppercase with underscores) +# Both formats work: 'django.secret_key' OR 'DJANGO_SECRET_KEY' +django.secret_key=your-secret-key-here-change-in-production +django.debug=True +django.allowed_hosts=localhost,127.0.0.1 +django.site_id=1 +# Alternative uppercase format also works: +# DJANGO_SECRET_KEY=your-secret-key-here-change-in-production +# DJANGO_DEBUG=True # Database Configuration -DB_NAME=gallery -DB_USER=postgres -DB_PASSWORD=postgres -DB_HOST=db -DB_PORT=5432 +# Dot-separated format (matches YAML exactly) or uppercase underscore format +database.name=gallery +database.user=postgres +database.password=postgres +database.host=db +database.port=5432 +# Alternative: DATABASE_NAME, DATABASE_USER, etc. also work # Authentication Configuration -ACCOUNT_EMAIL_VERIFICATION=mandatory +# Dot-separated format (matches YAML exactly) +authentication.account_email_verification=mandatory # Options: 'mandatory', 'optional', or 'none' # Social Authentication - Google -GOOGLE_CLIENT_ID=your-google-client-id -GOOGLE_SECRET=your-google-secret +# Dot-separated format preferred, uppercase underscore also works +social_auth.google.enabled=true +social_auth.google.client_id=your-google-client-id +social_auth.google.secret=your-google-secret # Social Authentication - Facebook -FACEBOOK_APP_ID=your-facebook-app-id -FACEBOOK_APP_SECRET=your-facebook-app-secret +social_auth.facebook.enabled=false +social_auth.facebook.app_id=your-facebook-app-id +social_auth.facebook.app_secret=your-facebook-app-secret # Social Authentication - GitHub -GITHUB_CLIENT_ID=your-github-client-id -GITHUB_SECRET=your-github-secret +social_auth.github.enabled=false +social_auth.github.client_id=your-github-client-id +social_auth.github.secret=your-github-secret # Celery Configuration -CELERY_BROKER_URL=redis://redis:6379/0 -CELERY_RESULT_BACKEND=redis://redis:6379/0 +# Dot-separated format (matches YAML exactly) +celery.broker_url=redis://redis:6379/0 +celery.result_backend=redis://redis:6379/0 REDIS_PORT=6379 # Flower Configuration (Celery Monitoring) +# Note: FLOWER_USERNAME and FLOWER_PASSWORD are still used directly (not from config.yaml) FLOWER_PORT=5555 FLOWER_USERNAME=admin FLOWER_PASSWORD=change-this-password-in-production # SeaweedFS / S3 Configuration -USE_S3=False -AWS_ACCESS_KEY_ID= -AWS_SECRET_ACCESS_KEY= -AWS_STORAGE_BUCKET_NAME=gallery -AWS_S3_ENDPOINT_URL=http://seaweedfs:8333 -AWS_S3_REGION_NAME=us-east-1 -AWS_S3_USE_SSL=False +# Dot-separated format (matches YAML exactly) +storage.use_s3=False +storage.s3.access_key_id= +storage.s3.secret_access_key= +storage.s3.bucket_name=gallery +storage.s3.endpoint_url=http://seaweedfs:8333 +storage.s3.region_name=us-east-1 +storage.s3.use_ssl=False diff --git a/app/config/config_loader.py b/app/config/config_loader.py index 3071ee3..be494b5 100644 --- a/app/config/config_loader.py +++ b/app/config/config_loader.py @@ -5,7 +5,7 @@ import os import yaml from pathlib import Path -from typing import Any, Dict, Optional +from typing import Any, Dict, List, Optional class ConfigLoader: @@ -51,6 +51,20 @@ def _load_config(self) -> None: print(f"Warning: Config file not found at {self.config_path}, using defaults") self.config = {} + def _get_env_var_candidates(self, key_path: str) -> List[str]: + """ + Get possible environment variable names for a YAML key path. + Returns list in order of preference (most preferred first). + + Examples: + 'django.secret_key' -> ['django.secret_key', 'DJANGO_SECRET_KEY'] + 'database.name' -> ['database.name', 'DATABASE_NAME'] + """ + return [ + key_path, # Dot-separated lowercase (matches YAML exactly) + key_path.upper().replace('.', '_'), # Uppercase underscore (traditional) + ] + def get(self, key_path: str, default: Any = None, env_var: Optional[str] = None) -> Any: """ Get configuration value by dot-separated key path. @@ -58,14 +72,21 @@ def get(self, key_path: str, default: Any = None, env_var: Optional[str] = None) Args: key_path: Dot-separated path (e.g., 'django.debug') default: Default value if not found - env_var: Optional environment variable name to check first + env_var: Optional environment variable name. If None, auto-derived from key_path. + Checks both 'django.debug' and 'DJANGO_DEBUG' formats. Returns: Configuration value, with env var taking precedence """ - # Check environment variable first if provided - if env_var: - env_value = os.getenv(env_var) + # Auto-derive env var candidates from key_path if not provided + if env_var is None: + env_var_candidates = self._get_env_var_candidates(key_path) + else: + env_var_candidates = [env_var] + + # Check environment variables in order of preference + for env_var_name in env_var_candidates: + env_value = os.getenv(env_var_name) if env_value is not None: # Try to convert to appropriate type if isinstance(default, bool): @@ -92,7 +113,14 @@ def get(self, key_path: str, default: Any = None, env_var: Optional[str] = None) return value def get_list(self, key_path: str, default: Optional[list] = None, env_var: Optional[str] = None) -> list: - """Get configuration value as a list.""" + """ + Get configuration value as a list. + + Args: + key_path: Dot-separated path (e.g., 'django.allowed_hosts') + default: Default value if not found + env_var: Optional environment variable name. If None, auto-derived from key_path. + """ value = self.get(key_path, default or [], env_var) if isinstance(value, list): return value @@ -101,7 +129,14 @@ def get_list(self, key_path: str, default: Optional[list] = None, env_var: Optio return default or [] def get_bool(self, key_path: str, default: bool = False, env_var: Optional[str] = None) -> bool: - """Get configuration value as a boolean.""" + """ + Get configuration value as a boolean. + + Args: + key_path: Dot-separated path (e.g., 'django.debug') + default: Default value if not found + env_var: Optional environment variable name. If None, auto-derived from key_path. + """ value = self.get(key_path, default, env_var) if isinstance(value, bool): return value @@ -110,7 +145,14 @@ def get_bool(self, key_path: str, default: bool = False, env_var: Optional[str] return bool(value) def get_int(self, key_path: str, default: int = 0, env_var: Optional[str] = None) -> int: - """Get configuration value as an integer.""" + """ + Get configuration value as an integer. + + Args: + key_path: Dot-separated path (e.g., 'celery.task_time_limit') + default: Default value if not found + env_var: Optional environment variable name. If None, auto-derived from key_path. + """ value = self.get(key_path, default, env_var) try: return int(value) diff --git a/app/config/settings.py b/app/config/settings.py index be4e044..e80df6c 100644 --- a/app/config/settings.py +++ b/app/config/settings.py @@ -32,12 +32,15 @@ # See https://docs.djangoproject.com/en/5.2/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = config.get('django.secret_key', 'django-insecure-z&x2fgjdjshurb8*p9jtwlov@hy!_h&+obyi1(kl7u^#u5#dr$', 'SECRET_KEY') +# Uses DJANGO_SECRET_KEY env var or config.yaml django.secret_key +SECRET_KEY = config.get('django.secret_key', 'django-insecure-z&x2fgjdjshurb8*p9jtwlov@hy!_h&+obyi1(kl7u^#u5#dr$') # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = config.get_bool('django.debug', False, 'DEBUG') +# Uses DJANGO_DEBUG env var or config.yaml django.debug +DEBUG = config.get_bool('django.debug', False) -ALLOWED_HOSTS = config.get_list('django.allowed_hosts', ['localhost', '127.0.0.1'], 'ALLOWED_HOSTS') +# Uses DJANGO_ALLOWED_HOSTS env var or config.yaml django.allowed_hosts +ALLOWED_HOSTS = config.get_list('django.allowed_hosts', ['localhost', '127.0.0.1']) # Application definition @@ -61,7 +64,8 @@ ] # Add storages if using S3/SeaweedFS -USE_S3 = config.get_bool('storage.use_s3', False, 'USE_S3') +# Uses STORAGE_USE_S3 env var or config.yaml storage.use_s3 +USE_S3 = config.get_bool('storage.use_s3', False) if USE_S3: INSTALLED_APPS.append('storages') @@ -103,11 +107,12 @@ DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql', - 'NAME': config.get('database.name', 'gallery', 'DB_NAME'), - 'USER': config.get('database.user', 'postgres', 'DB_USER'), - 'PASSWORD': config.get('database.password', 'postgres', 'DB_PASSWORD'), - 'HOST': config.get('database.host', 'db', 'DB_HOST'), - 'PORT': config.get('database.port', '5432', 'DB_PORT'), + # Uses DATABASE_NAME, DATABASE_USER, etc. env vars or config.yaml + 'NAME': config.get('database.name', 'gallery'), + 'USER': config.get('database.user', 'postgres'), + 'PASSWORD': config.get('database.password', 'postgres'), + 'HOST': config.get('database.host', 'db'), + 'PORT': config.get('database.port', '5432'), } } @@ -154,12 +159,13 @@ # SeaweedFS / S3 Storage Configuration if USE_S3: # SeaweedFS S3-compatible storage - AWS_ACCESS_KEY_ID = config.get('storage.s3.access_key_id', '', 'AWS_ACCESS_KEY_ID') - AWS_SECRET_ACCESS_KEY = config.get('storage.s3.secret_access_key', '', 'AWS_SECRET_ACCESS_KEY') - AWS_STORAGE_BUCKET_NAME = config.get('storage.s3.bucket_name', 'gallery', 'AWS_STORAGE_BUCKET_NAME') - AWS_S3_ENDPOINT_URL = config.get('storage.s3.endpoint_url', 'http://seaweedfs:8333', 'AWS_S3_ENDPOINT_URL') - AWS_S3_REGION_NAME = config.get('storage.s3.region_name', 'us-east-1', 'AWS_S3_REGION_NAME') - AWS_S3_USE_SSL = config.get_bool('storage.s3.use_ssl', False, 'AWS_S3_USE_SSL') + # Uses STORAGE_S3_ACCESS_KEY_ID, STORAGE_S3_SECRET_ACCESS_KEY, etc. env vars or config.yaml + AWS_ACCESS_KEY_ID = config.get('storage.s3.access_key_id', '') + AWS_SECRET_ACCESS_KEY = config.get('storage.s3.secret_access_key', '') + AWS_STORAGE_BUCKET_NAME = config.get('storage.s3.bucket_name', 'gallery') + AWS_S3_ENDPOINT_URL = config.get('storage.s3.endpoint_url', 'http://seaweedfs:8333') + AWS_S3_REGION_NAME = config.get('storage.s3.region_name', 'us-east-1') + AWS_S3_USE_SSL = config.get_bool('storage.s3.use_ssl', False) AWS_S3_FILE_OVERWRITE = False AWS_DEFAULT_ACL = None @@ -181,13 +187,15 @@ ] # Site ID (required for allauth) -SITE_ID = config.get_int('django.site_id', 1, 'SITE_ID') +# Uses DJANGO_SITE_ID env var or config.yaml django.site_id +SITE_ID = config.get_int('django.site_id', 1) # allauth Configuration ACCOUNT_AUTHENTICATION_METHOD = 'email' # Use email instead of username ACCOUNT_EMAIL_REQUIRED = True ACCOUNT_USERNAME_REQUIRED = False -ACCOUNT_EMAIL_VERIFICATION = config.get('authentication.account_email_verification', 'mandatory', 'ACCOUNT_EMAIL_VERIFICATION') +# Uses AUTHENTICATION_ACCOUNT_EMAIL_VERIFICATION env var or config.yaml +ACCOUNT_EMAIL_VERIFICATION = config.get('authentication.account_email_verification', 'mandatory') ACCOUNT_UNIQUE_EMAIL = True ACCOUNT_SIGNUP_EMAIL_ENTER_TWICE = True ACCOUNT_SESSION_REMEMBER = True @@ -201,18 +209,20 @@ SOCIALACCOUNT_PROVIDERS = {} # Google OAuth +# Uses SOCIAL_AUTH_GOOGLE_ENABLED, SOCIAL_AUTH_GOOGLE_CLIENT_ID, etc. env vars or config.yaml if config.get_bool('social_auth.google.enabled', False): SOCIALACCOUNT_PROVIDERS['google'] = { 'SCOPE': ['profile', 'email'], 'AUTH_PARAMS': {'access_type': 'online'}, 'APP': { - 'client_id': config.get('social_auth.google.client_id', '', 'GOOGLE_CLIENT_ID'), - 'secret': config.get('social_auth.google.secret', '', 'GOOGLE_SECRET'), + 'client_id': config.get('social_auth.google.client_id', ''), + 'secret': config.get('social_auth.google.secret', ''), 'key': '', } } # Facebook OAuth +# Uses SOCIAL_AUTH_FACEBOOK_ENABLED, SOCIAL_AUTH_FACEBOOK_APP_ID, etc. env vars or config.yaml if config.get_bool('social_auth.facebook.enabled', False): SOCIALACCOUNT_PROVIDERS['facebook'] = { 'METHOD': 'oauth2', @@ -225,32 +235,34 @@ ], 'EXCHANGE_TOKEN': True, 'APP': { - 'client_id': config.get('social_auth.facebook.app_id', '', 'FACEBOOK_APP_ID'), - 'secret': config.get('social_auth.facebook.app_secret', '', 'FACEBOOK_APP_SECRET'), + 'client_id': config.get('social_auth.facebook.app_id', ''), + 'secret': config.get('social_auth.facebook.app_secret', ''), 'key': '', } } # GitHub OAuth +# Uses SOCIAL_AUTH_GITHUB_ENABLED, SOCIAL_AUTH_GITHUB_CLIENT_ID, etc. env vars or config.yaml if config.get_bool('social_auth.github.enabled', False): SOCIALACCOUNT_PROVIDERS['github'] = { 'SCOPE': ['user', 'user:email'], 'APP': { - 'client_id': config.get('social_auth.github.client_id', '', 'GITHUB_CLIENT_ID'), - 'secret': config.get('social_auth.github.secret', '', 'GITHUB_SECRET'), + 'client_id': config.get('social_auth.github.client_id', ''), + 'secret': config.get('social_auth.github.secret', ''), 'key': '', } } # Celery Configuration -CELERY_BROKER_URL = config.get('celery.broker_url', 'redis://redis:6379/0', 'CELERY_BROKER_URL') -CELERY_RESULT_BACKEND = config.get('celery.result_backend', 'redis://redis:6379/0', 'CELERY_RESULT_BACKEND') +# Uses CELERY_BROKER_URL, CELERY_RESULT_BACKEND, etc. env vars or config.yaml +CELERY_BROKER_URL = config.get('celery.broker_url', 'redis://redis:6379/0') +CELERY_RESULT_BACKEND = config.get('celery.result_backend', 'redis://redis:6379/0') CELERY_ACCEPT_CONTENT = ['json'] CELERY_TASK_SERIALIZER = 'json' CELERY_RESULT_SERIALIZER = 'json' CELERY_TIMEZONE = TIME_ZONE CELERY_TASK_TRACK_STARTED = True -CELERY_TASK_TIME_LIMIT = config.get_int('celery.task_time_limit', 1800, None) # seconds -CELERY_TASK_SOFT_TIME_LIMIT = config.get_int('celery.task_soft_time_limit', 1500, None) # seconds -CELERY_WORKER_PREFETCH_MULTIPLIER = config.get_int('celery.worker_prefetch_multiplier', 1, None) -CELERY_WORKER_MAX_TASKS_PER_CHILD = config.get_int('celery.worker_max_tasks_per_child', 1000, None) +CELERY_TASK_TIME_LIMIT = config.get_int('celery.task_time_limit', 1800) # seconds +CELERY_TASK_SOFT_TIME_LIMIT = config.get_int('celery.task_soft_time_limit', 1500) # seconds +CELERY_WORKER_PREFETCH_MULTIPLIER = config.get_int('celery.worker_prefetch_multiplier', 1) +CELERY_WORKER_MAX_TASKS_PER_CHILD = config.get_int('celery.worker_max_tasks_per_child', 1000) From b3ab0b65dd486ed0891524910caca01d9ac5b709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janusz=20Mik=C5=82uszka?= Date: Mon, 26 Jan 2026 21:25:29 +0100 Subject: [PATCH 06/30] Add Celery worker for the GPU related tasks --- Dockerfile.celery | 61 +++++++++++++++++++++++++++++++++++++++ app/config/celery.py | 22 ++++++++++++++ app/config/example_gpu.py | 15 ++++++++++ app/config/settings.py | 12 ++++++++ docker-compose.yml | 35 +++++++++++++++++++++- requirements-celery.txt | 17 +++++++++++ 6 files changed, 161 insertions(+), 1 deletion(-) create mode 100644 Dockerfile.celery create mode 100644 app/config/example_gpu.py create mode 100644 requirements-celery.txt diff --git a/Dockerfile.celery b/Dockerfile.celery new file mode 100644 index 0000000..f8625c3 --- /dev/null +++ b/Dockerfile.celery @@ -0,0 +1,61 @@ +# Dockerfile for Celery worker with NVIDIA GPU support +# For YOLO object recognition and PaddleOCR +# Optimized for Windows WSL + +# Use NVIDIA CUDA base image with Python 3.11 (Python 3.14 not available in CUDA images yet) +# Using CUDA 12.1 runtime with cuDNN for deep learning frameworks +FROM nvidia/cuda:12.1.0-cudnn8-runtime-ubuntu22.04 + +# Set environment variables +ENV PYTHONDONTWRITEBYTECODE=1 +ENV PYTHONUNBUFFERED=1 +ENV DEBIAN_FRONTEND=noninteractive +ENV NVIDIA_VISIBLE_DEVICES=all +ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility + +# Install Python 3.11 and system dependencies +RUN apt-get update && apt-get install -y \ + python3.11 \ + python3.11-dev \ + python3-pip \ + postgresql-client \ + libpq-dev \ + gcc \ + g++ \ + libgl1-mesa-glx \ + libglib2.0-0 \ + libsm6 \ + libxext6 \ + libxrender-dev \ + libgomp1 \ + wget \ + git \ + && rm -rf /var/lib/apt/lists/* + +# Create symlink for python and pip +RUN ln -s /usr/bin/python3.11 /usr/bin/python && \ + ln -s /usr/bin/pip3 /usr/bin/pip + +# Set work directory +WORKDIR /app + +# Upgrade pip +RUN pip install --no-cache-dir --upgrade pip setuptools wheel + +# Copy and install GPU-specific dependencies +COPY requirements-celery.txt ./ +RUN pip install --no-cache-dir -r requirements-celery.txt + +# Install project dependencies +COPY pyproject.toml ./ +RUN pip install --no-cache-dir -e . + +# Copy Django app +COPY app/ . + +# Create a non-root user +RUN useradd -m -u 1000 appuser && chown -R appuser:appuser /app +USER appuser + +# Default command (can be overridden in docker-compose) +CMD ["celery", "-A", "config", "worker", "--loglevel=info", "--concurrency=2"] diff --git a/app/config/celery.py b/app/config/celery.py index 4de9784..4da6ac2 100644 --- a/app/config/celery.py +++ b/app/config/celery.py @@ -1,5 +1,27 @@ """ Celery configuration for the gallery project. + +This project uses two separate Celery workers: +1. CPU worker (celery) - handles CPU-bound tasks, listens to 'cpu' queue +2. GPU worker (celery-gpu) - handles GPU-intensive tasks (YOLO, PaddleOCR), listens to 'gpu' queue + +To route tasks to specific queues: + +Option 1: Using task routing in settings.py + CELERY_TASK_ROUTES = { + 'app.tasks.gpu_task': {'queue': 'gpu'}, + 'app.tasks.cpu_task': {'queue': 'cpu'}, + } + +Option 2: Using queue parameter when calling tasks + from app.tasks import process_image_with_yolo + process_image_with_yolo.apply_async(args=[image_id], queue='gpu') + +Option 3: Using @app.task decorator + @app.task(queue='gpu') + def process_image_with_yolo(image_id): + # GPU task code + pass """ import os from celery import Celery diff --git a/app/config/example_gpu.py b/app/config/example_gpu.py new file mode 100644 index 0000000..7519e54 --- /dev/null +++ b/app/config/example_gpu.py @@ -0,0 +1,15 @@ +# Option 1: Using queue parameter +from app.tasks import process_image_with_yolo +process_image_with_yolo.apply_async(args=[image_id], queue='gpu') + +# Option 2: Using decorator +@app.task(queue='gpu') +def process_image_with_yolo(image_id): + # Your GPU task code here + pass + +# Option 3: Configure in settings.py +CELERY_TASK_ROUTES = { + 'app.tasks.process_image_with_yolo': {'queue': 'gpu'}, + 'app.tasks.process_image_with_paddleocr': {'queue': 'gpu'}, +} \ No newline at end of file diff --git a/app/config/settings.py b/app/config/settings.py index e80df6c..a120328 100644 --- a/app/config/settings.py +++ b/app/config/settings.py @@ -266,3 +266,15 @@ CELERY_TASK_SOFT_TIME_LIMIT = config.get_int('celery.task_soft_time_limit', 1500) # seconds CELERY_WORKER_PREFETCH_MULTIPLIER = config.get_int('celery.worker_prefetch_multiplier', 1) CELERY_WORKER_MAX_TASKS_PER_CHILD = config.get_int('celery.worker_max_tasks_per_child', 1000) + +# Celery Queue Configuration +# Separate queues for CPU and GPU tasks +CELERY_TASK_ROUTES = { + # Route GPU-intensive tasks (YOLO, PaddleOCR) to GPU queue + # Example: 'gallery.tasks.process_image_with_gpu': {'queue': 'gpu'}, + # Route CPU tasks to CPU queue + # Example: 'gallery.tasks.process_metadata': {'queue': 'cpu'}, +} +CELERY_TASK_DEFAULT_QUEUE = 'cpu' # Default queue for tasks without explicit routing +CELERY_TASK_DEFAULT_EXCHANGE = 'tasks' +CELERY_TASK_DEFAULT_ROUTING_KEY = 'cpu' diff --git a/docker-compose.yml b/docker-compose.yml index 05da255..c1df47b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -84,7 +84,7 @@ services: celery: build: . container_name: gallery_celery - command: celery -A config worker --loglevel=info --concurrency=${CELERY_WORKER_CONCURRENCY:-4} + command: celery -A config worker --loglevel=info --concurrency=${CELERY_CPU_WORKER_CONCURRENCY:-4} --queues=cpu volumes: - ./app:/app - media_volume:/app/media @@ -101,6 +101,38 @@ services: networks: - gallery_network + celery-gpu: + build: + context: . + dockerfile: Dockerfile.celery + container_name: gallery_celery_gpu + command: celery -A config worker --loglevel=info --concurrency=${CELERY_GPU_WORKER_CONCURRENCY:-2} --queues=gpu + volumes: + - ./app:/app + - media_volume:/app/media + configs: + - source: gallery_config + target: /app/config.yaml + env_file: + - .env + environment: + - NVIDIA_VISIBLE_DEVICES=all + - NVIDIA_DRIVER_CAPABILITIES=compute,utility + deploy: + resources: + reservations: + devices: + - driver: nvidia + count: all + capabilities: [gpu] + depends_on: + db: + condition: service_healthy + redis: + condition: service_healthy + networks: + - gallery_network + celery-beat: build: . container_name: gallery_celery_beat @@ -141,6 +173,7 @@ services: - .env depends_on: - celery + - celery-gpu - redis networks: - gallery_network diff --git a/requirements-celery.txt b/requirements-celery.txt new file mode 100644 index 0000000..aaf4a30 --- /dev/null +++ b/requirements-celery.txt @@ -0,0 +1,17 @@ +# PyTorch with CUDA 12.1 support (for YOLO) +# Note: PyTorch requires special index URL, install separately or use --extra-index-url +--extra-index-url https://download.pytorch.org/whl/cu121 +torch +torchvision +torchaudio + +# YOLO (ultralytics) +ultralytics + +# PaddleOCR with GPU support +paddlepaddle-gpu +paddleocr + +# OpenCV for image processing +opencv-python-headless +opencv-contrib-python-headless From 7ddbdf1c660579a5cc039a895aa9c4be54470357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janusz=20Mik=C5=82uszka?= Date: Mon, 26 Jan 2026 21:30:55 +0100 Subject: [PATCH 07/30] Pre download Yolo models during docker buildy --- Dockerfile.celery | 13 +++++- scripts/download_yolo_models.py | 70 +++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 scripts/download_yolo_models.py diff --git a/Dockerfile.celery b/Dockerfile.celery index f8625c3..436a4e6 100644 --- a/Dockerfile.celery +++ b/Dockerfile.celery @@ -12,6 +12,7 @@ ENV PYTHONUNBUFFERED=1 ENV DEBIAN_FRONTEND=noninteractive ENV NVIDIA_VISIBLE_DEVICES=all ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility +ENV ULTRALYTICS_CACHE_DIR=/app/.ultralytics # Install Python 3.11 and system dependencies RUN apt-get update && apt-get install -y \ @@ -53,8 +54,16 @@ RUN pip install --no-cache-dir -e . # Copy Django app COPY app/ . -# Create a non-root user -RUN useradd -m -u 1000 appuser && chown -R appuser:appuser /app +# Copy and run script to download YOLO models during build +COPY scripts/download_yolo_models.py ./scripts/ +RUN python scripts/download_yolo_models.py && \ + rm -rf /root/.cache/pip && \ + rm -rf /tmp/* + +# Create a non-root user and set permissions +RUN useradd -m -u 1000 appuser && \ + chown -R appuser:appuser /app && \ + chown -R appuser:appuser /app/.ultralytics || true USER appuser # Default command (can be overridden in docker-compose) diff --git a/scripts/download_yolo_models.py b/scripts/download_yolo_models.py new file mode 100644 index 0000000..9c11ea4 --- /dev/null +++ b/scripts/download_yolo_models.py @@ -0,0 +1,70 @@ +#!/usr/bin/env python3 +""" +Script to pre-download YOLO models during Docker build. +This ensures models are available in the image and don't need to be downloaded at runtime. +""" +import os +import sys +from pathlib import Path + +try: + from ultralytics import YOLO + + # Set cache directory (models are typically cached in ~/.ultralytics) + # We'll use a directory in /app to ensure it's part of the image + cache_dir = Path("/app/.ultralytics") + cache_dir.mkdir(parents=True, exist_ok=True) + + # Set environment variable for ultralytics cache + os.environ['ULTRALYTICS_CACHE_DIR'] = str(cache_dir) + + print("=" * 60) + print("Downloading YOLO models during Docker build...") + print("=" * 60) + + # List of models to download (you can customize this) + models_to_download = [ + ('yolov8n.pt', 'YOLOv8n (nano) - smallest, fastest'), + ('yolov8s.pt', 'YOLOv8s (small) - good balance'), + ('yolov8m.pt', 'YOLOv8m (medium) - better accuracy'), + # Uncomment if you need larger models: + # ('yolov8l.pt', 'YOLOv8l (large) - high accuracy'), + # ('yolov8x.pt', 'YOLOv8x (extra large) - best accuracy'), + ] + + downloaded_models = [] + + for model_name, description in models_to_download: + try: + print(f"\n[{len(downloaded_models) + 1}/{len(models_to_download)}] {description}") + print(f"Downloading {model_name}...") + model = YOLO(model_name) + model_path = getattr(model, 'ckpt_path', model_name) + print(f"✓ {model_name} downloaded successfully") + print(f" Location: {model_path}") + downloaded_models.append(model_name) + except Exception as e: + print(f"✗ Failed to download {model_name}: {e}") + # Continue with other models even if one fails + continue + + print("\n" + "=" * 60) + if downloaded_models: + print(f"✓ Successfully downloaded {len(downloaded_models)} model(s):") + for model in downloaded_models: + print(f" - {model}") + print(f"\nModels cached in: {cache_dir}") + else: + print("✗ No models were downloaded successfully!") + sys.exit(1) + print("=" * 60) + +except ImportError as e: + print(f"✗ Error: ultralytics package not installed: {e}") + print("Make sure requirements-celery.txt includes 'ultralytics'") + sys.exit(1) +except Exception as e: + print(f"✗ Unexpected error: {e}") + import traceback + traceback.print_exc() + sys.exit(1) From 222e6bebd98b844aff5ddda8b206912626389ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janusz=20Mik=C5=82uszka?= Date: Mon, 26 Jan 2026 21:45:23 +0100 Subject: [PATCH 08/30] Add instructions for the split deployment --- .env.example | 8 + DEPLOYMENT.md | 269 +++++++++++++++++++++++++++++ QUICK_START.md | 74 ++++++++ WIREGUARD_SETUP.md | 381 +++++++++++++++++++++++++++++++++++++++++ docker-compose.gpu.yml | 46 +++++ docker-compose.vps.yml | 185 ++++++++++++++++++++ docker-compose.yml | 6 + 7 files changed, 969 insertions(+) create mode 100644 DEPLOYMENT.md create mode 100644 QUICK_START.md create mode 100644 WIREGUARD_SETUP.md create mode 100644 docker-compose.gpu.yml create mode 100644 docker-compose.vps.yml diff --git a/.env.example b/.env.example index c677e25..0aaa884 100644 --- a/.env.example +++ b/.env.example @@ -12,11 +12,15 @@ django.site_id=1 # Database Configuration # Dot-separated format (matches YAML exactly) or uppercase underscore format +# For VPS: Use local database database.name=gallery database.user=postgres database.password=postgres database.host=db database.port=5432 +# For Local GPU Worker: Use VPS database via WireGuard VPN +# database.host=10.0.0.1 +# database.port=5432 # Alternative: DATABASE_NAME, DATABASE_USER, etc. also work # Authentication Configuration @@ -42,8 +46,12 @@ social_auth.github.secret=your-github-secret # Celery Configuration # Dot-separated format (matches YAML exactly) +# For VPS: Use local Redis celery.broker_url=redis://redis:6379/0 celery.result_backend=redis://redis:6379/0 +# For Local GPU Worker: Use VPS Redis via WireGuard VPN +# celery.broker_url=redis://10.0.0.1:6379/0 +# celery.result_backend=redis://10.0.0.1:6379/0 REDIS_PORT=6379 # Flower Configuration (Celery Monitoring) diff --git a/DEPLOYMENT.md b/DEPLOYMENT.md new file mode 100644 index 0000000..2b9848a --- /dev/null +++ b/DEPLOYMENT.md @@ -0,0 +1,269 @@ +# Deployment Guide - Split Architecture with WireGuard VPN + +This guide explains how to deploy the gallery application across two machines using WireGuard VPN for secure connections: +- **VPS (Cloud Server)**: Web server, database, Redis, CPU Celery workers +- **Local Laptop**: GPU Celery worker for YOLO and PaddleOCR + +**⚠️ Important:** This deployment uses WireGuard VPN to securely connect the local GPU worker to VPS services. Redis and PostgreSQL are NOT exposed to the internet. See [WIREGUARD_SETUP.md](WIREGUARD_SETUP.md) for detailed WireGuard configuration. + +## Architecture Overview + +``` +┌─────────────────────────────────┐ +│ VPS (Cloud Server) │ +│ ┌─────────┐ ┌──────────┐ │ +│ │ Web │ │ Nginx │ │ +│ └─────────┘ └──────────┘ │ +│ ┌─────────┐ ┌──────────┐ │ +│ │ DB │ │ Redis │◄────┼──┐ +│ └─────────┘ └──────────┘ │ │ +│ ┌─────────┐ ┌──────────┐ │ │ +│ │ Celery │ │ Celery │ │ │ +│ │ (CPU) │ │ Beat │ │ │ +│ └─────────┘ └──────────┘ │ │ +│ ┌─────────┐ │ │ +│ │ Flower │ │ │ +│ └─────────┘ │ │ +└─────────────────────────────────┘ │ + │ + │ Redis Connection + │ (Port 6380) + │ +┌─────────────────────────────────┐ │ +│ Local Laptop (GPU) │ │ +│ ┌──────────────┐ │ │ +│ │ Celery-GPU │────────────────┘ │ +│ │ (YOLO/OCR) │ │ +│ └──────────────┘ │ +└─────────────────────────────────┘ +``` + +## Prerequisites + +### VPS Requirements +- Docker and Docker Compose installed +- Ports open: 80, 443, 51820 (WireGuard UDP), 8000 (Web) +- WireGuard installed and configured (see [WIREGUARD_SETUP.md](WIREGUARD_SETUP.md)) +- Firewall configured to allow WireGuard port (51820/UDP) from your local IP + +### Local Laptop Requirements +- Docker and Docker Compose installed +- NVIDIA GPU with drivers installed +- NVIDIA Container Toolkit installed +- WSL2 (if on Windows) +- WireGuard installed and configured (see [WIREGUARD_SETUP.md](WIREGUARD_SETUP.md)) +- WireGuard VPN connection to VPS established + +## VPS Setup + +1. **Clone the repository on VPS:** + ```bash + git clone + cd gallery + ``` + +2. **Create `.env` file:** + ```bash + cp .env.example .env + ``` + +3. **Configure `.env` for VPS:** + ```env + # Database + DB_NAME=gallery + DB_USER=postgres + DB_PASSWORD=your_secure_password + DB_HOST=db + DB_PORT=5432 + + # Redis (internal) + REDIS_PORT=6379 + REDIS_EXTERNAL_PORT=6380 + + # Celery + CELERY_BROKER_URL=redis://redis:6379/0 + CELERY_RESULT_BACKEND=redis://redis:6379/0 + + # Flower (monitoring) + FLOWER_USERNAME=admin + FLOWER_PASSWORD=your_secure_password + FLOWER_PORT=5555 + ``` + +4. **Start services:** + ```bash + docker-compose -f docker-compose.vps.yml up -d + ``` + +5. **Verify services are running:** + ```bash + docker-compose -f docker-compose.vps.yml ps + ``` + +6. **Configure PostgreSQL for remote access (if GPU worker needs DB access):** + ```bash + # Note: GPU worker typically only needs Redis connection + # Database access is usually only needed if tasks directly query DB + # If needed, configure PostgreSQL to accept remote connections + ``` + +7. **Get your VPS IP address:** + ```bash + # On Linux + hostname -I + # Or check your VPS provider's dashboard + ``` + +## Local Laptop Setup + +1. **Clone the repository on local machine:** + ```bash + git clone + cd gallery + ``` + +2. **Create `.env` file:** + ```bash + cp .env.example .env + ``` + +3. **Configure WireGuard VPN first:** + - Follow the instructions in [WIREGUARD_SETUP.md](WIREGUARD_SETUP.md) + - Ensure WireGuard connection is established and tested + - Verify you can ping `10.0.0.1` from your local machine + +4. **Configure `.env` for local GPU worker:** + ```env + # VPS Connection via WireGuard VPN (10.0.0.1 is the VPS WireGuard IP) + CELERY_BROKER_URL=redis://10.0.0.1:6379/0 + CELERY_RESULT_BACKEND=redis://10.0.0.1:6379/0 + + # Database connection to VPS via WireGuard + DATABASE_HOST=10.0.0.1 + DATABASE_PORT=5432 + DATABASE_NAME=gallery + DATABASE_USER=postgres + DATABASE_PASSWORD=your_secure_password + + # Celery GPU Worker + CELERY_GPU_WORKER_CONCURRENCY=2 + ``` + +5. **Update `config.yaml` or use environment variables (optional):** + ```yaml + celery: + broker_url: "redis://10.0.0.1:6379/0" + result_backend: "redis://10.0.0.1:6379/0" + + database: + host: "10.0.0.1" + port: 5432 + name: "gallery" + user: "postgres" + password: "your_secure_password" + ``` + +6. **Start GPU worker:** + ```bash + docker-compose -f docker-compose.gpu.yml up -d + ``` + +7. **Verify GPU worker is running:** + ```bash + docker-compose -f docker-compose.gpu.yml ps + docker-compose -f docker-compose.gpu.yml logs celery-gpu + ``` + +## Security Considerations + +### WireGuard VPN Security +- **Redis and PostgreSQL are NOT exposed to the internet** - they are only accessible via WireGuard VPN +- WireGuard provides encrypted, authenticated connections +- Only the WireGuard port (51820/UDP) needs to be open on the VPS +- Configure firewall to only allow WireGuard port from your local IP + +### Redis Security +- Redis is accessible only via WireGuard VPN (10.0.0.1:6379) +- **Optional but recommended**: Add Redis password authentication + ```bash + # In docker-compose.vps.yml, update Redis command: + command: redis-server --appendonly yes --bind 0.0.0.0 --requirepass YOUR_REDIS_PASSWORD + ``` +- Then update `CELERY_BROKER_URL` to: `redis://:YOUR_REDIS_PASSWORD@10.0.0.1:6379/0` + +### Database Security +- PostgreSQL is accessible only via WireGuard VPN (10.0.0.1:5432) +- Use strong passwords +- Consider using SSL connections for database (even within VPN) + +### Firewall Rules +On VPS, configure firewall to only allow: +- Port 80/443: From anywhere (web traffic) +- Port 51820/UDP: Only from your local laptop IP (WireGuard VPN) +- Port 8000: Optional, for direct web access (or use nginx reverse proxy) + +## Testing the Connection + +### Test WireGuard Connection +```bash +# From local machine, ping VPS WireGuard IP +ping 10.0.0.1 + +# Check WireGuard status +sudo wg show +``` + +### Test Redis Connection from Local Machine +```bash +# Install redis-cli if needed +# On Ubuntu/Debian: +sudo apt-get install redis-tools + +# Test connection via WireGuard +redis-cli -h 10.0.0.1 -p 6379 ping +``` + +### Test Database Connection +```bash +# From local machine via WireGuard +psql -h 10.0.0.1 -p 5432 -U postgres -d gallery +``` + +### Monitor Workers +- Access Flower on VPS: `http://YOUR_VPS_IP:5555` +- You should see both CPU and GPU workers listed + +## Troubleshooting + +### GPU Worker Can't Connect to Redis +- **First, verify WireGuard is connected:** `sudo wg show` and `ping 10.0.0.1` +- Check Redis is running: `docker-compose -f docker-compose.vps.yml ps redis` +- Test connection: `redis-cli -h 10.0.0.1 -p 6379 ping` +- Check WireGuard routing: `ip route show` + +### GPU Worker Can't Connect to Database +- **First, verify WireGuard is connected:** `sudo wg show` and `ping 10.0.0.1` +- Check PostgreSQL is running: `docker-compose -f docker-compose.vps.yml ps db` +- Test connection: `psql -h 10.0.0.1 -p 5432 -U postgres -d gallery` +- Verify Docker network allows WireGuard access + +### Tasks Not Processing on GPU Worker +- Verify tasks are routed to 'gpu' queue +- Check Celery routing configuration in `settings.py` +- Monitor logs: `docker-compose -f docker-compose.gpu.yml logs -f celery-gpu` + +## Maintenance + +### Updating Code +1. Pull latest code on both machines +2. Rebuild and restart: + - VPS: `docker-compose -f docker-compose.vps.yml up -d --build` + - Local: `docker-compose -f docker-compose.gpu.yml up -d --build` + +### Viewing Logs +- VPS: `docker-compose -f docker-compose.vps.yml logs -f` +- Local: `docker-compose -f docker-compose.gpu.yml logs -f celery-gpu` + +### Stopping Services +- VPS: `docker-compose -f docker-compose.vps.yml down` +- Local: `docker-compose -f docker-compose.gpu.yml down` diff --git a/QUICK_START.md b/QUICK_START.md new file mode 100644 index 0000000..cd38727 --- /dev/null +++ b/QUICK_START.md @@ -0,0 +1,74 @@ +# Quick Start - Split Deployment with WireGuard + +**⚠️ Prerequisite:** Set up WireGuard VPN first! See [WIREGUARD_SETUP.md](WIREGUARD_SETUP.md) + +## VPS Setup (5 minutes) + +```bash +# 1. Clone and configure +git clone +cd gallery +cp .env.example .env +# Edit .env with your settings + +# 2. Start all services +docker-compose -f docker-compose.vps.yml up -d + +# 3. Check status +docker-compose -f docker-compose.vps.yml ps + +# 4. Get your VPS IP +hostname -I +``` + +## Local GPU Worker Setup (5 minutes) + +```bash +# 1. Clone and configure +git clone +cd gallery +cp .env.example .env + +# 2. Ensure WireGuard is connected (ping 10.0.0.1 should work) + +# 3. Edit .env - Use WireGuard IP (10.0.0.1): +# celery.broker_url=redis://10.0.0.1:6379/0 +# celery.result_backend=redis://10.0.0.1:6379/0 +# database.host=10.0.0.1 + +# 4. Start GPU worker +docker-compose -f docker-compose.gpu.yml up -d + +# 5. Check logs +docker-compose -f docker-compose.gpu.yml logs -f celery-gpu +``` + +## Verify Everything Works + +1. **Check VPS services:** + - Web: http://YOUR_VPS_IP:8000 + - Flower: http://YOUR_VPS_IP:5555 (should show both workers) + +2. **Check GPU worker logs:** + ```bash + docker-compose -f docker-compose.gpu.yml logs celery-gpu + ``` + +3. **Test task routing:** + - Send a GPU task and verify it processes on local GPU worker + - Send a CPU task and verify it processes on VPS CPU worker + +## Common Issues + +**GPU worker can't connect to Redis:** +- **First check WireGuard:** `sudo wg show` and `ping 10.0.0.1` +- Verify Redis is running: `docker-compose -f docker-compose.vps.yml ps redis` +- Test connection: `redis-cli -h 10.0.0.1 -p 6379 ping` + +**GPU worker can't connect to database:** +- Usually not needed if tasks don't access DB directly +- If needed, configure PostgreSQL for remote access (see DEPLOYMENT.md) + +**Tasks not processing:** +- Check queue names match: CPU tasks → 'cpu' queue, GPU tasks → 'gpu' queue +- Verify routing in `settings.py` CELERY_TASK_ROUTES diff --git a/WIREGUARD_SETUP.md b/WIREGUARD_SETUP.md new file mode 100644 index 0000000..38a6519 --- /dev/null +++ b/WIREGUARD_SETUP.md @@ -0,0 +1,381 @@ +# WireGuard VPN Setup Guide + +This guide explains how to set up WireGuard VPN to securely connect your local GPU worker to the VPS services without exposing Redis and PostgreSQL to the internet. + +## Architecture with WireGuard + +``` +┌─────────────────────────────────┐ +│ VPS (Cloud Server) │ +│ ┌──────────────────────────┐ │ +│ │ WireGuard Server │ │ +│ │ IP: 10.0.0.1/24 │ │ +│ └──────────────────────────┘ │ +│ ┌─────────┐ ┌──────────┐ │ +│ │ Web │ │ Nginx │ │ +│ └─────────┘ └──────────┘ │ +│ ┌─────────┐ ┌──────────┐ │ +│ │ DB │ │ Redis │ │ +│ │10.0.0.1 │ │10.0.0.1 │ │ +│ └─────────┘ └──────────┘ │ +│ ┌─────────┐ │ +│ │ Celery │ │ +│ │ (CPU) │ │ +│ └─────────┘ │ +└─────────────────────────────────┘ + ▲ + │ WireGuard VPN + │ (Encrypted Tunnel) + │ +┌─────────────────────────────────┐ +│ Local Laptop (GPU) │ +│ ┌──────────────────────────┐ │ +│ │ WireGuard Client │ │ +│ │ IP: 10.0.0.2/24 │ │ +│ └──────────────────────────┘ │ +│ ┌──────────────┐ │ +│ │ Celery-GPU │ │ +│ │ (YOLO/OCR) │ │ +│ └──────────────┘ │ +└─────────────────────────────────┘ +``` + +## VPS Setup (WireGuard Server) + +### 1. Install WireGuard + +```bash +# Ubuntu/Debian +sudo apt update +sudo apt install wireguard wireguard-tools + +# CentOS/RHEL +sudo yum install epel-release +sudo yum install wireguard-tools + +# Verify installation +wg --version +``` + +### 2. Enable IP Forwarding + +```bash +# Enable IP forwarding +echo "net.ipv4.ip_forward=1" | sudo tee -a /etc/sysctl.conf +sudo sysctl -p +``` + +### 3. Generate Server Keys + +```bash +# Create WireGuard directory +sudo mkdir -p /etc/wireguard +cd /etc/wireguard + +# Generate private key +sudo wg genkey | sudo tee server_private.key | sudo wg pubkey | sudo tee server_public.key + +# Set permissions +sudo chmod 600 server_private.key +``` + +### 4. Create Server Configuration + +```bash +sudo nano /etc/wireguard/wg0.conf +``` + +Add the following configuration: + +```ini +[Interface] +# Server private key (from server_private.key) +PrivateKey = YOUR_SERVER_PRIVATE_KEY_HERE + +# Server WireGuard IP address +Address = 10.0.0.1/24 + +# Listen on UDP port 51820 +ListenPort = 51820 + +# Firewall rules - allow forwarding +PostUp = iptables -A FORWARD -i wg0 -j ACCEPT; iptables -A FORWARD -o wg0 -j ACCEPT; iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE +PostDown = iptables -D FORWARD -i wg0 -j ACCEPT; iptables -D FORWARD -o wg0 -j ACCEPT; iptables -t nat -D POSTROUTING -o eth0 -j MASQUERADE + +[Peer] +# Client public key (will be added after generating client keys) +PublicKey = CLIENT_PUBLIC_KEY_WILL_BE_ADDED_HERE +# Client WireGuard IP +AllowedIPs = 10.0.0.2/32 +``` + +**Important:** Replace `eth0` with your actual network interface name (check with `ip addr` or `ifconfig`). + +### 5. Start WireGuard Server + +```bash +# Enable and start WireGuard +sudo systemctl enable wg-quick@wg0 +sudo systemctl start wg-quick@wg0 + +# Check status +sudo wg show +sudo systemctl status wg-quick@wg0 +``` + +### 6. Configure Firewall + +```bash +# Allow WireGuard port (51820/UDP) +sudo ufw allow 51820/udp + +# Or with iptables +sudo iptables -A INPUT -p udp --dport 51820 -j ACCEPT +``` + +## Local Machine Setup (WireGuard Client) + +### 1. Install WireGuard + +**Windows (WSL2):** +```bash +# In WSL2 +sudo apt update +sudo apt install wireguard wireguard-tools + +# Or use Windows WireGuard client from: https://www.wireguard.com/install/ +``` + +**Linux:** +```bash +sudo apt update +sudo apt install wireguard wireguard-tools +``` + +**macOS:** +```bash +brew install wireguard-tools +``` + +### 2. Generate Client Keys + +```bash +# Create WireGuard directory +sudo mkdir -p /etc/wireguard +cd /etc/wireguard + +# Generate private key +sudo wg genkey | sudo tee client_private.key | sudo wg pubkey | sudo tee client_public.key + +# Set permissions +sudo chmod 600 client_private.key + +# Display public key (you'll need this for the server) +sudo cat client_public.key +``` + +### 3. Add Client Public Key to Server + +On the VPS, add the client's public key to the server configuration: + +```bash +sudo nano /etc/wireguard/wg0.conf +``` + +Update the `[Peer]` section with the client's public key: + +```ini +[Peer] +PublicKey = YOUR_CLIENT_PUBLIC_KEY_HERE +AllowedIPs = 10.0.0.2/32 +``` + +Then restart WireGuard on the server: +```bash +sudo systemctl restart wg-quick@wg0 +``` + +### 4. Create Client Configuration + +On the local machine: + +```bash +sudo nano /etc/wireguard/wg0.conf +``` + +Add the following configuration: + +```ini +[Interface] +# Client private key +PrivateKey = YOUR_CLIENT_PRIVATE_KEY_HERE + +# Client WireGuard IP address +Address = 10.0.0.2/24 + +[Peer] +# Server public key (from server_public.key on VPS) +PublicKey = YOUR_SERVER_PUBLIC_KEY_HERE + +# VPS public IP address and WireGuard port +Endpoint = YOUR_VPS_PUBLIC_IP:51820 + +# Routes all traffic through VPN (or use 10.0.0.0/24 for only WireGuard network) +AllowedIPs = 10.0.0.0/24 + +# Keep connection alive +PersistentKeepalive = 25 +``` + +### 5. Start WireGuard Client + +```bash +# Start WireGuard +sudo wg-quick up wg0 + +# Check status +sudo wg show + +# To stop +sudo wg-quick down wg0 + +# Enable on boot (Linux) +sudo systemctl enable wg-quick@wg0 +sudo systemctl start wg-quick@wg0 +``` + +**Windows:** Use the WireGuard GUI application and import the configuration file. + +### 6. Test Connection + +```bash +# From local machine, ping the VPS WireGuard IP +ping 10.0.0.1 + +# Test Redis connection +redis-cli -h 10.0.0.1 -p 6379 ping + +# Test PostgreSQL connection +psql -h 10.0.0.1 -p 5432 -U postgres -d gallery +``` + +## Update Application Configuration + +### VPS Configuration + +Update `docker-compose.vps.yml` to bind services to WireGuard IP: + +```yaml +redis: + command: redis-server --appendonly yes --bind 0.0.0.0 + # Redis will be accessible via WireGuard IP (10.0.0.1) + +db: + # PostgreSQL will be accessible via WireGuard IP (10.0.0.1) +``` + +### Local GPU Worker Configuration + +Update `.env` on local machine: + +```env +# Use WireGuard IP instead of public IP +celery.broker_url=redis://10.0.0.1:6379/0 +celery.result_backend=redis://10.0.0.1:6379/0 + +# Database connection via WireGuard +database.host=10.0.0.1 +database.port=5432 +``` + +## Security Best Practices + +1. **Use Strong Keys:** WireGuard keys are already cryptographically strong, but keep them secure. + +2. **Firewall Rules:** Only allow WireGuard port (51820/UDP) from trusted IPs if possible. + +3. **Regular Updates:** Keep WireGuard updated: + ```bash + sudo apt update && sudo apt upgrade wireguard + ``` + +4. **Backup Keys:** Securely backup your private keys (encrypted). + +5. **Monitor Connections:** + ```bash + # Check active connections + sudo wg show + + # Monitor traffic + sudo watch -n 1 'wg show wg0 dump' + ``` + +## Troubleshooting + +### Connection Issues + +1. **Check WireGuard status:** + ```bash + sudo wg show + sudo systemctl status wg-quick@wg0 + ``` + +2. **Verify firewall rules:** + ```bash + sudo ufw status + sudo iptables -L -n + ``` + +3. **Check routing:** + ```bash + ip route show + ``` + +4. **Test connectivity:** + ```bash + ping 10.0.0.1 # From client to server + ping 10.0.0.2 # From server to client + ``` + +### Docker Network Issues + +If Docker containers can't reach WireGuard IPs: + +1. **Enable IP forwarding in Docker:** + ```bash + # Check Docker network settings + docker network inspect gallery_network + ``` + +2. **Use host network mode (if needed):** + ```yaml + # In docker-compose, for services that need WireGuard access + network_mode: host + ``` + +3. **Or configure Docker to use WireGuard interface:** + ```bash + # Add route in Docker network + docker network create --subnet=172.20.0.0/16 gallery_network + ``` + +## Quick Reference + +**Server IP:** 10.0.0.1 +**Client IP:** 10.0.0.2 +**Network:** 10.0.0.0/24 +**Port:** 51820/UDP + +**Server commands:** +```bash +sudo systemctl start wg-quick@wg0 +sudo systemctl stop wg-quick@wg0 +sudo wg show +``` + +**Client commands:** +```bash +sudo wg-quick up wg0 +sudo wg-quick down wg0 +sudo wg show +``` diff --git a/docker-compose.gpu.yml b/docker-compose.gpu.yml new file mode 100644 index 0000000..d0aa0b8 --- /dev/null +++ b/docker-compose.gpu.yml @@ -0,0 +1,46 @@ +# Docker Compose for Local GPU Worker +# Runs ONLY: celery-gpu worker +# Connects to Redis and Database on remote VPS + +version: '3.8' + +services: + celery-gpu: + build: + context: . + dockerfile: Dockerfile.celery + container_name: gallery_celery_gpu + command: celery -A config worker --loglevel=info --concurrency=${CELERY_GPU_WORKER_CONCURRENCY:-2} --queues=gpu + volumes: + - ./app:/app + - media_volume:/app/media + configs: + - source: gallery_config + target: /app/config.yaml + env_file: + - .env + environment: + - NVIDIA_VISIBLE_DEVICES=all + - NVIDIA_DRIVER_CAPABILITIES=compute,utility + # Redis and Database connections are configured via .env file + # Make sure to set CELERY_BROKER_URL, CELERY_RESULT_BACKEND, and database.* in .env + deploy: + resources: + reservations: + devices: + - driver: nvidia + count: all + capabilities: [gpu] + networks: + - gallery_network + +volumes: + media_volume: + +configs: + gallery_config: + file: ./config.yaml + +networks: + gallery_network: + driver: bridge diff --git a/docker-compose.vps.yml b/docker-compose.vps.yml new file mode 100644 index 0000000..4a95c96 --- /dev/null +++ b/docker-compose.vps.yml @@ -0,0 +1,185 @@ +# Docker Compose for VPS (Cloud Server) +# Runs: web, db, redis, celery (CPU), celery-beat, flower, nginx, seaweedfs +# Does NOT run: celery-gpu (runs on local machine) + +version: '3.8' + +services: + db: + image: postgres:16-alpine + container_name: gallery_db + environment: + POSTGRES_DB: ${DB_NAME:-gallery} + POSTGRES_USER: ${DB_USER:-postgres} + POSTGRES_PASSWORD: ${DB_PASSWORD:-postgres} + volumes: + - postgres_data:/var/lib/postgresql/data + ports: + - "${DB_PORT:-5432}:5432" + # PostgreSQL accessible via WireGuard VPN (10.0.0.1:5432) + # No external port exposure needed - secured via WireGuard + healthcheck: + test: ["CMD-SHELL", "pg_isready -U ${DB_USER:-postgres}"] + interval: 10s + timeout: 5s + retries: 5 + networks: + - gallery_network + + redis: + image: redis:7-alpine + container_name: gallery_redis + ports: + - "${REDIS_PORT:-6379}:6379" + # Redis accessible via WireGuard VPN (10.0.0.1:6379) + # No external port exposure needed - secured via WireGuard + volumes: + - redis_data:/data + command: redis-server --appendonly yes --bind 0.0.0.0 + healthcheck: + test: ["CMD", "redis-cli", "ping"] + interval: 10s + timeout: 5s + retries: 5 + networks: + - gallery_network + + seaweedfs: + image: chrislusf/seaweedfs:latest + container_name: gallery_seaweedfs + command: "server -master.port=9333 -volume.port=8080 -filer.port=8888 -s3.port=8333" + ports: + - "9333:9333" # Master + - "8080:8080" # Volume + - "8888:8888" # Filer + - "8333:8333" # S3 + volumes: + - seaweedfs_data:/data + networks: + - gallery_network + healthcheck: + test: ["CMD-SHELL", "wget --quiet --tries=1 --spider http://localhost:9333/dir/status || exit 1"] + interval: 30s + timeout: 10s + retries: 3 + start_period: 10s + + web: + build: . + container_name: gallery_web + command: sh -c "python manage.py migrate --noinput && gunicorn --bind 0.0.0.0:8000 --workers ${GUNICORN_WORKERS:-4} --timeout ${GUNICORN_TIMEOUT:-120} config.wsgi:application" + volumes: + - ./app:/app + - static_volume:/app/staticfiles + - media_volume:/app/media + configs: + - source: gallery_config + target: /app/config.yaml + ports: + - "8000:8000" + env_file: + - .env + depends_on: + db: + condition: service_healthy + redis: + condition: service_healthy + seaweedfs: + condition: service_healthy + networks: + - gallery_network + + celery: + build: . + container_name: gallery_celery + command: celery -A config worker --loglevel=info --concurrency=${CELERY_CPU_WORKER_CONCURRENCY:-4} --queues=cpu + volumes: + - ./app:/app + - media_volume:/app/media + configs: + - source: gallery_config + target: /app/config.yaml + env_file: + - .env + depends_on: + db: + condition: service_healthy + redis: + condition: service_healthy + networks: + - gallery_network + + celery-beat: + build: . + container_name: gallery_celery_beat + command: celery -A config beat --loglevel=info + volumes: + - ./app:/app + configs: + - source: gallery_config + target: /app/config.yaml + env_file: + - .env + depends_on: + db: + condition: service_healthy + redis: + condition: service_healthy + networks: + - gallery_network + + flower: + build: . + container_name: gallery_flower + command: > + sh -c " + if [ -n \"$$FLOWER_USERNAME\" ] && [ -n \"$$FLOWER_PASSWORD\" ]; then + celery -A config flower --port=5555 --basic_auth=$$FLOWER_USERNAME:$$FLOWER_PASSWORD + else + echo 'ERROR: FLOWER_USERNAME and FLOWER_PASSWORD must be set for security!' + exit 1 + fi + " + ports: + - "${FLOWER_PORT:-5555}:5555" + configs: + - source: gallery_config + target: /app/config.yaml + env_file: + - .env + depends_on: + - celery + - redis + networks: + - gallery_network + + nginx: + image: nginx:alpine + container_name: gallery_nginx + ports: + - "80:80" + - "443:443" + volumes: + - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro + - static_volume:/static:ro + - media_volume:/media:ro + depends_on: + - web + - flower + networks: + - gallery_network + +volumes: + postgres_data: + redis_data: + seaweedfs_data: + static_volume: + media_volume: + +configs: + gallery_config: + file: ./config.yaml + +networks: + gallery_network: + driver: bridge diff --git a/docker-compose.yml b/docker-compose.yml index c1df47b..853dc9c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,9 @@ +# Main docker-compose.yml - Use for local development with all services +# For production split deployment: +# - VPS: Use docker-compose.vps.yml +# - Local GPU: Use docker-compose.gpu.yml +# See DEPLOYMENT.md for details + version: '3.8' services: From 772ce381ad22979206e076f3701469102febe257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janusz=20Mik=C5=82uszka?= Date: Mon, 26 Jan 2026 21:51:52 +0100 Subject: [PATCH 09/30] Add security explanation behind deploy strategy --- SECURITY_EXPLANATION.md | 271 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 271 insertions(+) create mode 100644 SECURITY_EXPLANATION.md diff --git a/SECURITY_EXPLANATION.md b/SECURITY_EXPLANATION.md new file mode 100644 index 0000000..5f23414 --- /dev/null +++ b/SECURITY_EXPLANATION.md @@ -0,0 +1,271 @@ +# Security Explanation: How Redis and PostgreSQL are Protected + +## Overview + +With WireGuard VPN, Redis and PostgreSQL are **NOT exposed to the public internet**. They are only accessible through an encrypted VPN tunnel. Here's how it works: + +## Network Architecture + +``` +┌─────────────────────────────────────────────────────────┐ +│ INTERNET (Public) │ +│ │ +│ ┌──────────────────────────────────────────────────┐ │ +│ │ VPS (Cloud Server) │ │ +│ │ │ │ +│ │ ┌──────────────────────────────────────────┐ │ │ +│ │ │ Firewall / Network Security │ │ │ +│ │ │ ✅ Port 80/443 (HTTP/HTTPS) - OPEN │ │ │ +│ │ │ ✅ Port 51820/UDP (WireGuard) - OPEN │ │ │ +│ │ │ ❌ Port 6379 (Redis) - CLOSED │ │ │ +│ │ │ ❌ Port 5432 (PostgreSQL) - CLOSED │ │ │ +│ │ └──────────────────────────────────────────┘ │ │ +│ │ │ │ +│ │ ┌──────────────────────────────────────────┐ │ │ +│ │ │ WireGuard VPN Server │ │ │ +│ │ │ IP: 10.0.0.1 │ │ │ +│ │ │ 🔒 Encrypted Tunnel Entry Point │ │ │ +│ │ └──────────────────────────────────────────┘ │ │ +│ │ │ │ │ +│ │ │ 🔒 Encrypted VPN Tunnel │ │ +│ │ │ │ │ +│ │ ┌──────────▼──────────────────────────────┐ │ │ +│ │ │ Docker Network (gallery_network) │ │ │ +│ │ │ ┌──────────┐ ┌──────────┐ │ │ │ +│ │ │ │ Redis │ │PostgreSQL│ │ │ │ +│ │ │ │ :6379 │ │ :5432 │ │ │ │ +│ │ │ │ │ │ │ │ │ │ +│ │ │ │ Only accessible from │ │ │ +│ │ │ │ WireGuard network (10.0.0.0/24) │ │ │ +│ │ │ └──────────┘ └──────────┘ │ │ │ +│ │ └────────────────────────────────────────┘ │ │ +│ └──────────────────────────────────────────────────┘ │ +│ │ +│ 🔒 WireGuard Encrypted Tunnel │ +│ │ +│ ┌──────────────────────────────────────────────────┐ │ +│ │ Local Laptop (Your Machine) │ │ +│ │ │ │ +│ │ ┌──────────────────────────────────────────┐ │ │ +│ │ │ WireGuard VPN Client │ │ │ +│ │ │ IP: 10.0.0.2 │ │ │ +│ │ │ 🔒 Encrypted Tunnel Exit Point │ │ │ +│ │ └──────────────────────────────────────────┘ │ │ +│ │ │ │ │ +│ │ ┌───────────▼──────────────────────────────┐ │ │ +│ │ │ Docker Container (celery-gpu) │ │ │ +│ │ │ Connects to: │ │ │ +│ │ │ - redis://10.0.0.1:6379 │ │ │ +│ │ │ - postgres://10.0.0.1:5432 │ │ │ +│ │ └──────────────────────────────────────────┘ │ │ +│ └──────────────────────────────────────────────────┘ │ +└─────────────────────────────────────────────────────────┘ +``` + +## Security Layers + +### Layer 1: Network Firewall (VPS) + +**What's Exposed:** +- ✅ Port 80/443: HTTP/HTTPS (web traffic) - **Necessary for public access** +- ✅ Port 51820/UDP: WireGuard VPN - **Only way to access databases** + +**What's NOT Exposed:** +- ❌ Port 6379 (Redis): **Completely blocked from internet** +- ❌ Port 5432 (PostgreSQL): **Completely blocked from internet** + +**Result:** Even if someone knows your VPS IP address, they **cannot** directly connect to Redis or PostgreSQL. These ports are not reachable from the internet. + +### Layer 2: WireGuard VPN Authentication + +**How WireGuard Protects:** + +1. **Cryptographic Authentication:** + - Each peer (server and client) has a public/private key pair + - Only devices with the correct private key can join the VPN + - Keys are cryptographically strong (256-bit) + +2. **Encryption:** + - All traffic through WireGuard is encrypted using modern cryptography + - Even if someone intercepts the traffic, they can't read it + +3. **IP Whitelisting:** + - Only devices with WireGuard client configured can get a VPN IP (10.0.0.2) + - The server only accepts connections from authenticated clients + +**To Access Redis/PostgreSQL, an Attacker Would Need:** +1. Your VPS IP address ✅ (publicly known) +2. WireGuard server private key ❌ (only on VPS, never shared) +3. WireGuard client private key ❌ (only on your local machine) +4. Your local machine's WireGuard configuration ❌ (encrypted, password-protected) + +### Layer 3: Docker Network Isolation + +**Internal Network:** +- Redis and PostgreSQL run inside Docker containers +- They're on a private Docker network (`gallery_network`) +- They bind to `0.0.0.0` (all interfaces) but are only accessible through: + - Other Docker containers on the same network + - WireGuard VPN clients (10.0.0.1 can route to Docker network) + +**Result:** Even if someone gains access to your VPS, they would still need: +- WireGuard VPN access to reach the Docker network +- Or direct shell access to the VPS to access containers + +## Comparison: Before vs After WireGuard + +### ❌ BEFORE (Insecure - Exposed to Internet) + +``` +Internet → VPS Firewall → Redis (Port 6379) ← Anyone can try to connect! +Internet → VPS Firewall → PostgreSQL (Port 5432) ← Anyone can try to connect! +``` + +**Risks:** +- Port scanners can discover open Redis/PostgreSQL ports +- Brute force attacks on authentication +- Unencrypted connections (unless SSL configured) +- Vulnerabilities in Redis/PostgreSQL exposed to internet +- DDoS attacks possible + +### ✅ AFTER (Secure - WireGuard VPN) + +``` +Internet → VPS Firewall → ❌ Redis (Port 6379) - BLOCKED +Internet → VPS Firewall → ❌ PostgreSQL (Port 5432) - BLOCKED + +Your Laptop → WireGuard VPN → VPS WireGuard (10.0.0.1) → Redis/PostgreSQL + ↑ + Only accessible through + encrypted VPN tunnel +``` + +**Benefits:** +- Ports not visible to internet scanners +- No direct attack surface +- All traffic encrypted +- Authentication required (WireGuard keys) +- Only your authorized device can connect + +## What Attackers See + +### Port Scan from Internet: +```bash +# Attacker runs: nmap -p 6379,5432 YOUR_VPS_IP +# Result: +6379/tcp closed # ✅ Not accessible +5432/tcp closed # ✅ Not accessible +51820/udp open # WireGuard - but requires keys to connect +``` + +**Attacker cannot:** +- Connect to Redis +- Connect to PostgreSQL +- See what services are running on those ports +- Attempt brute force attacks + +**Attacker can:** +- See that WireGuard is running (port 51820) +- But cannot connect without valid keys + +## Additional Security Measures (Recommended) + +Even with WireGuard, you should still: + +### 1. Redis Password Authentication (Optional but Recommended) +```yaml +# In docker-compose.vps.yml +redis: + command: redis-server --appendonly yes --bind 0.0.0.0 --requirepass YOUR_STRONG_PASSWORD +``` + +Then in `.env`: +```env +celery.broker_url=redis://:YOUR_STRONG_PASSWORD@10.0.0.1:6379/0 +``` + +**Why:** Defense in depth - even if WireGuard is compromised, Redis still requires a password. + +### 2. PostgreSQL Strong Passwords +```env +database.password=your_very_strong_password_here +``` + +**Why:** Defense in depth - even if WireGuard is compromised, PostgreSQL still requires authentication. + +### 3. Firewall Rules +```bash +# Only allow WireGuard port from your IP +sudo ufw allow from YOUR_LOCAL_IP to any port 51820 proto udp +``` + +**Why:** Limits who can even attempt to connect to WireGuard. + +### 4. Regular Updates +- Keep WireGuard updated +- Keep Redis and PostgreSQL updated +- Monitor for security advisories + +## Security Summary + +| Aspect | Status | Explanation | +|--------|--------|-------------| +| **Redis exposed to internet?** | ❌ NO | Only accessible via WireGuard VPN (10.0.0.1:6379) | +| **PostgreSQL exposed to internet?** | ❌ NO | Only accessible via WireGuard VPN (10.0.0.1:5432) | +| **Traffic encrypted?** | ✅ YES | All traffic through WireGuard is encrypted | +| **Authentication required?** | ✅ YES | WireGuard requires cryptographic keys | +| **Ports visible to scanners?** | ❌ NO | Ports 6379 and 5432 are closed on firewall | +| **Can attackers brute force?** | ❌ NO | They can't even reach the services | +| **Can attackers intercept traffic?** | ❌ NO | Traffic is encrypted through VPN tunnel | + +## Real-World Attack Scenarios + +### Scenario 1: Port Scanner Attack +``` +Attacker: Scans YOUR_VPS_IP for common database ports +Result: Ports 6379 and 5432 show as CLOSED +Outcome: ✅ Attacker gives up, can't find services +``` + +### Scenario 2: Brute Force Attack +``` +Attacker: Tries to brute force Redis password +Result: Can't connect - port is not accessible +Outcome: ✅ Attack fails before it even starts +``` + +### Scenario 3: Man-in-the-Middle Attack +``` +Attacker: Intercepts network traffic between you and VPS +Result: Sees encrypted WireGuard packets +Outcome: ✅ Can't decrypt without WireGuard keys +``` + +### Scenario 4: WireGuard Key Theft +``` +Attacker: Steals your WireGuard private key +Result: Can connect to VPN, but still needs: + - Redis password (if configured) + - PostgreSQL password +Outcome: ⚠️ Partial access - but still requires database credentials +``` + +**Mitigation:** Use strong database passwords even with WireGuard! + +## Conclusion + +**Redis and PostgreSQL are secure because:** + +1. ✅ **They are NOT exposed to the internet** - ports are closed on firewall +2. ✅ **Only accessible through encrypted VPN tunnel** - WireGuard provides encryption +3. ✅ **Authentication required** - WireGuard keys prevent unauthorized access +4. ✅ **Network isolation** - Docker network adds another layer +5. ✅ **Defense in depth** - Multiple security layers work together + +**Without WireGuard keys, an attacker cannot:** +- See that Redis/PostgreSQL exist +- Connect to them +- Attempt to exploit them +- Intercept or read traffic + +This is **significantly more secure** than exposing these services directly to the internet! From 73e72fa6ba45873a5b66ee57011ca168ed48e638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janusz=20Mik=C5=82uszka?= Date: Mon, 26 Jan 2026 21:52:42 +0100 Subject: [PATCH 10/30] Move documents into docs/ directory --- DEPLOYMENT.md => docs/DEPLOYMENT.md | 0 SECURITY_EXPLANATION.md => docs/SECURITY_EXPLANATION.md | 0 WIREGUARD_SETUP.md => docs/WIREGUARD_SETUP.md | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename DEPLOYMENT.md => docs/DEPLOYMENT.md (100%) rename SECURITY_EXPLANATION.md => docs/SECURITY_EXPLANATION.md (100%) rename WIREGUARD_SETUP.md => docs/WIREGUARD_SETUP.md (100%) diff --git a/DEPLOYMENT.md b/docs/DEPLOYMENT.md similarity index 100% rename from DEPLOYMENT.md rename to docs/DEPLOYMENT.md diff --git a/SECURITY_EXPLANATION.md b/docs/SECURITY_EXPLANATION.md similarity index 100% rename from SECURITY_EXPLANATION.md rename to docs/SECURITY_EXPLANATION.md diff --git a/WIREGUARD_SETUP.md b/docs/WIREGUARD_SETUP.md similarity index 100% rename from WIREGUARD_SETUP.md rename to docs/WIREGUARD_SETUP.md From a35a89ee68019d8f339e1c319a349ee3e20fa877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janusz=20Mik=C5=82uszka?= Date: Mon, 26 Jan 2026 22:12:39 +0100 Subject: [PATCH 11/30] Add gallery app --- app/config/settings.py | 23 ++ app/config/urls.py | 1 + app/gallery/README.md | 143 ++++++++ app/gallery/__init__.py | 1 + app/gallery/admin.py | 45 +++ app/gallery/apps.py | 7 + app/gallery/migrations/__init__.py | 1 + app/gallery/models.py | 553 +++++++++++++++++++++++++++++ app/gallery/serializers.py | 194 ++++++++++ app/gallery/urls.py | 16 + app/gallery/utils.py | 132 +++++++ app/gallery/views.py | 282 +++++++++++++++ docs/NGINX_SIGNED_URLS.md | 141 ++++++++ nginx/nginx.conf | 37 +- pyproject.toml | 1 + 15 files changed, 1575 insertions(+), 2 deletions(-) create mode 100644 app/gallery/README.md create mode 100644 app/gallery/__init__.py create mode 100644 app/gallery/admin.py create mode 100644 app/gallery/apps.py create mode 100644 app/gallery/migrations/__init__.py create mode 100644 app/gallery/models.py create mode 100644 app/gallery/serializers.py create mode 100644 app/gallery/urls.py create mode 100644 app/gallery/utils.py create mode 100644 app/gallery/views.py create mode 100644 docs/NGINX_SIGNED_URLS.md diff --git a/app/config/settings.py b/app/config/settings.py index a120328..0b4d28b 100644 --- a/app/config/settings.py +++ b/app/config/settings.py @@ -54,6 +54,9 @@ 'django.contrib.staticfiles', 'django.contrib.sites', # Required for allauth + # Third-party + 'rest_framework', # Django REST Framework + # allauth 'allauth', 'allauth.account', @@ -61,6 +64,9 @@ 'allauth.socialaccount.providers.google', 'allauth.socialaccount.providers.facebook', 'allauth.socialaccount.providers.github', + + # Local apps + 'gallery', ] # Add storages if using S3/SeaweedFS @@ -278,3 +284,20 @@ CELERY_TASK_DEFAULT_QUEUE = 'cpu' # Default queue for tasks without explicit routing CELERY_TASK_DEFAULT_EXCHANGE = 'tasks' CELERY_TASK_DEFAULT_ROUTING_KEY = 'cpu' + +# Gallery App Configuration +GALLERY_MEDIA_BASE_URL = config.get('gallery.media_base_url', '/media') +GALLERY_SIGNED_URL_SECRET = config.get('gallery.signed_url_secret', None) # Optional, falls back to SECRET_KEY +GALLERY_SIGNED_URL_EXPIRES_IN = config.get_int('gallery.signed_url_expires_in', 3600) # 1 hour default + +# REST Framework Configuration +REST_FRAMEWORK = { + 'DEFAULT_AUTHENTICATION_CLASSES': [ + 'rest_framework.authentication.SessionAuthentication', + ], + 'DEFAULT_PERMISSION_CLASSES': [ + 'rest_framework.permissions.IsAuthenticated', + ], + 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination', + 'PAGE_SIZE': 50, +} diff --git a/app/config/urls.py b/app/config/urls.py index 66c5ea3..1b6e6e6 100644 --- a/app/config/urls.py +++ b/app/config/urls.py @@ -20,4 +20,5 @@ urlpatterns = [ path('admin/', admin.site.urls), path('accounts/', include('allauth.urls')), + path('', include('gallery.urls')), ] diff --git a/app/gallery/README.md b/app/gallery/README.md new file mode 100644 index 0000000..50e94dd --- /dev/null +++ b/app/gallery/README.md @@ -0,0 +1,143 @@ +# Gallery Django App + +Django app for managing photo galleries with support for SeaweedFS storage and signed URLs. + +## Models + +### Gallery +- Top-level container for albums +- Tied to User (owner) +- Has type: `private` (default) or `public` +- Fields: name, description, tags, is_favorite +- Supports sharing with other users via `GalleryShare` + +### Album +- Container for pictures within a gallery +- Belongs to a Gallery +- Fields: name, description, tags, exif_metadata +- Soft delete support + +### Picture +- Individual photo stored on SeaweedFS +- Belongs to an Album +- Stores SeaweedFS file ID and URL +- AI-generated tags (YOLO) and OCR text (PaddleOCR) +- EXIF metadata +- User-defined tags +- Soft delete support + +## Features + +- **Signed URLs**: Generate secure, time-limited URLs for media files +- **Soft Delete**: All models support soft deletion with `deleted_at` field +- **Sharing**: Galleries can be shared with other users +- **AI Integration**: Support for AI tags and OCR text +- **REST API**: Full REST API using Django REST Framework + +## API Endpoints + +### Galleries +- `GET /api/galleries/` - List galleries +- `POST /api/galleries/` - Create gallery +- `GET /api/galleries/{id}/` - Get gallery details +- `PUT /api/galleries/{id}/` - Update gallery +- `DELETE /api/galleries/{id}/` - Delete gallery +- `POST /api/galleries/{id}/share/` - Share gallery with users +- `POST /api/galleries/{id}/unshare/` - Remove share access +- `POST /api/galleries/{id}/toggle_favorite/` - Toggle favorite + +### Albums +- `GET /api/albums/` - List albums +- `POST /api/albums/` - Create album +- `GET /api/albums/{id}/` - Get album with pictures +- `PUT /api/albums/{id}/` - Update album +- `DELETE /api/albums/{id}/` - Delete album + +### Pictures +- `GET /api/pictures/` - List pictures +- `POST /api/pictures/` - Create picture +- `GET /api/pictures/{id}/` - Get picture details +- `PUT /api/pictures/{id}/` - Update picture +- `DELETE /api/pictures/{id}/` - Delete picture +- `GET /api/pictures/{id}/signed_url/` - Get new signed URL +- `POST /api/pictures/{id}/toggle_favorite/` - Toggle favorite +- `POST /api/pictures/{id}/add_tag/` - Add tag +- `POST /api/pictures/{id}/remove_tag/` - Remove tag + +## Signed URLs + +Signed URLs are generated using MD5 (compatible with Nginx `secure_link` module): + +```python +from gallery.utils import generate_signed_url + +signed = generate_signed_url('file-id-123', expires_in=3600) +# Returns: { +# 'url': '/media/file-id-123?st=signature&e=1234567890', +# 'expires_at': 1234567890, +# 'expires_in': 3600 +# } +``` + +URLs are validated by Nginx before serving files. See `docs/NGINX_SIGNED_URLS.md` for configuration. + +## Settings + +Add to `settings.py`: + +```python +# Gallery App Configuration +GALLERY_MEDIA_BASE_URL = '/media' +GALLERY_SIGNED_URL_SECRET = 'your-secret-key' # Optional, defaults to SECRET_KEY +GALLERY_SIGNED_URL_EXPIRES_IN = 3600 # 1 hour default +``` + +## Usage Example + +```python +from gallery.models import Gallery, Album, Picture +from gallery.utils import generate_signed_url + +# Create gallery +gallery = Gallery.objects.create( + owner=user, + name="My Vacation", + gallery_type=Gallery.GalleryType.PRIVATE +) + +# Create album +album = Album.objects.create( + gallery=gallery, + name="Beach Photos" +) + +# Create picture +picture = Picture.objects.create( + album=album, + title="Sunset", + seaweedfs_file_id="abc123", + seaweedfs_url="http://seaweedfs:8888/abc123" +) + +# Generate signed URL +signed_url = generate_signed_url(picture.seaweedfs_file_id) +print(signed_url['url']) # /media/abc123?st=...&e=... +``` + +## Permissions + +- Users can only access galleries they own or that are shared with them +- Gallery owners can share/unshare galleries +- Shared users have read-only access by default (can be set to edit) + +## Soft Delete + +All models support soft deletion: + +```python +gallery.soft_delete() # Sets deleted_at +gallery.restore() # Clears deleted_at +gallery.is_deleted # Check if deleted +``` + +Soft-deleted items are automatically excluded from querysets. diff --git a/app/gallery/__init__.py b/app/gallery/__init__.py new file mode 100644 index 0000000..b7daa4f --- /dev/null +++ b/app/gallery/__init__.py @@ -0,0 +1 @@ +default_app_config = 'gallery.apps.GalleryConfig' diff --git a/app/gallery/admin.py b/app/gallery/admin.py new file mode 100644 index 0000000..62705b3 --- /dev/null +++ b/app/gallery/admin.py @@ -0,0 +1,45 @@ +from django.contrib import admin +from .models import Gallery, Album, Picture, GalleryShare, Tag + + +@admin.register(Tag) +class TagAdmin(admin.ModelAdmin): + list_display = ['name', 'slug', 'usage_count', 'created_at'] + list_filter = ['created_at'] + search_fields = ['name', 'slug'] + readonly_fields = ['slug', 'usage_count', 'created_at'] + ordering = ['name'] + + +@admin.register(Gallery) +class GalleryAdmin(admin.ModelAdmin): + list_display = ['name', 'owner', 'gallery_type', 'is_favorite', 'created_at', 'deleted_at'] + list_filter = ['gallery_type', 'is_favorite', 'tags', 'created_at', 'deleted_at'] + search_fields = ['name', 'description', 'owner__username', 'owner__email', 'tags__name'] + readonly_fields = ['created_at', 'updated_at'] + filter_horizontal = ['shared_with', 'tags'] + + +@admin.register(Album) +class AlbumAdmin(admin.ModelAdmin): + list_display = ['name', 'gallery', 'created_at', 'deleted_at'] + list_filter = ['tags', 'created_at', 'deleted_at'] + search_fields = ['name', 'description', 'gallery__name', 'tags__name'] + readonly_fields = ['created_at', 'updated_at'] + filter_horizontal = ['tags'] + + +@admin.register(Picture) +class PictureAdmin(admin.ModelAdmin): + list_display = ['title', 'album', 'file_size', 'width', 'height', 'is_favorite', 'uploaded_at', 'deleted_at'] + list_filter = ['is_favorite', 'tags', 'uploaded_at', 'deleted_at', 'mime_type'] + search_fields = ['title', 'description', 'album__name', 'ocr_text', 'tags__name'] + readonly_fields = ['uploaded_at', 'updated_at', 'seaweedfs_file_id'] + filter_horizontal = ['tags'] + + +@admin.register(GalleryShare) +class GalleryShareAdmin(admin.ModelAdmin): + list_display = ['gallery', 'user', 'can_edit', 'shared_at'] + list_filter = ['can_edit', 'shared_at'] + search_fields = ['gallery__name', 'user__username', 'user__email'] diff --git a/app/gallery/apps.py b/app/gallery/apps.py new file mode 100644 index 0000000..9db82fd --- /dev/null +++ b/app/gallery/apps.py @@ -0,0 +1,7 @@ +from django.apps import AppConfig + + +class GalleryConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'gallery' + verbose_name = 'Gallery' diff --git a/app/gallery/migrations/__init__.py b/app/gallery/migrations/__init__.py new file mode 100644 index 0000000..4e99a83 --- /dev/null +++ b/app/gallery/migrations/__init__.py @@ -0,0 +1 @@ +# Gallery app migrations diff --git a/app/gallery/models.py b/app/gallery/models.py new file mode 100644 index 0000000..b29538d --- /dev/null +++ b/app/gallery/models.py @@ -0,0 +1,553 @@ +""" +Gallery models: Gallery, Album, Picture, Tag +""" +from django.db import models +from django.contrib.auth import get_user_model +from django.core.validators import MinLengthValidator +from django.utils import timezone +from django.utils.text import slugify +import json + +User = get_user_model() + + +class Tag(models.Model): + """Shared Tag model for Gallery, Album, and Picture""" + + name = models.CharField( + max_length=100, + unique=True, + db_index=True, + verbose_name='Tag Name', + help_text='Tag name (case-insensitive, normalized)' + ) + slug = models.SlugField( + max_length=100, + unique=True, + db_index=True, + verbose_name='Tag Slug', + help_text='URL-friendly tag identifier' + ) + created_at = models.DateTimeField( + auto_now_add=True, + verbose_name='Created At' + ) + usage_count = models.PositiveIntegerField( + default=0, + verbose_name='Usage Count', + help_text='Number of times this tag is used across all objects' + ) + + class Meta: + verbose_name = 'Tag' + verbose_name_plural = 'Tags' + ordering = ['name'] + indexes = [ + models.Index(fields=['name']), + models.Index(fields=['slug']), + ] + + def __str__(self): + return self.name + + def save(self, *args, **kwargs): + """Auto-generate slug from name""" + if not self.slug: + self.slug = slugify(self.name) + # Normalize name to lowercase for consistency + self.name = self.name.lower().strip() + super().save(*args, **kwargs) + + @classmethod + def get_or_create_tag(cls, name): + """Get or create a tag by name (case-insensitive)""" + name_normalized = name.lower().strip() + slug = slugify(name_normalized) + tag, created = cls.objects.get_or_create( + slug=slug, + defaults={'name': name_normalized} + ) + return tag, created + + def increment_usage(self): + """Increment usage count""" + Tag.objects.filter(pk=self.pk).update(usage_count=models.F('usage_count') + 1) + self.refresh_from_db() + + def decrement_usage(self): + """Decrement usage count""" + Tag.objects.filter(pk=self.pk, usage_count__gt=0).update(usage_count=models.F('usage_count') - 1) + self.refresh_from_db() + + +class Gallery(models.Model): + """Gallery model - top level container for albums""" + + class GalleryType(models.TextChoices): + PRIVATE = 'private', 'Private' + PUBLIC = 'public', 'Public' + + owner = models.ForeignKey( + User, + on_delete=models.CASCADE, + related_name='galleries', + verbose_name='Owner' + ) + name = models.CharField( + max_length=200, + validators=[MinLengthValidator(1)], + verbose_name='Gallery Name' + ) + description = models.TextField( + blank=True, + verbose_name='Description' + ) + gallery_type = models.CharField( + max_length=10, + choices=GalleryType.choices, + default=GalleryType.PRIVATE, + verbose_name='Gallery Type' + ) + tags = models.ManyToManyField( + Tag, + related_name='galleries', + blank=True, + verbose_name='Tags', + help_text='Tags for the gallery' + ) + is_favorite = models.BooleanField( + default=False, + verbose_name='Is Favorite' + ) + created_at = models.DateTimeField( + auto_now_add=True, + verbose_name='Created At' + ) + updated_at = models.DateTimeField( + auto_now=True, + verbose_name='Updated At' + ) + deleted_at = models.DateTimeField( + null=True, + blank=True, + verbose_name='Deleted At' + ) + + # Shared access + shared_with = models.ManyToManyField( + User, + through='GalleryShare', + related_name='shared_galleries', + blank=True, + verbose_name='Shared With' + ) + + class Meta: + verbose_name = 'Gallery' + verbose_name_plural = 'Galleries' + ordering = ['-created_at'] + indexes = [ + models.Index(fields=['owner', 'gallery_type']), + models.Index(fields=['deleted_at']), + ] + + def __str__(self): + return f"{self.name} ({self.owner.username})" + + @property + def is_deleted(self): + """Check if gallery is soft deleted""" + return self.deleted_at is not None + + def soft_delete(self): + """Soft delete the gallery""" + self.deleted_at = timezone.now() + self.save(update_fields=['deleted_at']) + + def restore(self): + """Restore soft deleted gallery""" + self.deleted_at = None + self.save(update_fields=['deleted_at']) + + def add_tag(self, tag_name): + """Add a tag to the gallery""" + tag, _ = Tag.get_or_create_tag(tag_name) + if tag not in self.tags.all(): + self.tags.add(tag) + tag.increment_usage() + + def remove_tag(self, tag_name): + """Remove a tag from the gallery""" + try: + tag = Tag.objects.get(slug=slugify(tag_name.lower().strip())) + if tag in self.tags.all(): + self.tags.remove(tag) + tag.decrement_usage() + except Tag.DoesNotExist: + pass + + @classmethod + def search_by_tags(cls, tag_names, user=None): + """Search galleries by tags""" + queryset = cls.objects.filter(deleted_at__isnull=True) + if user: + queryset = queryset.filter(owner=user) + + if tag_names: + queryset = queryset.filter(tags__name__in=tag_names).distinct() + + return queryset + + def set_tags(self, tag_names): + """Set tags from a list of tag names""" + # Remove old tags + for tag in self.tags.all(): + self.tags.remove(tag) + tag.decrement_usage() + + # Add new tags + for tag_name in tag_names: + self.add_tag(tag_name) + + +class GalleryShare(models.Model): + """Through model for sharing galleries with users""" + gallery = models.ForeignKey( + Gallery, + on_delete=models.CASCADE, + related_name='shares' + ) + user = models.ForeignKey( + User, + on_delete=models.CASCADE, + related_name='gallery_shares' + ) + shared_at = models.DateTimeField( + auto_now_add=True, + verbose_name='Shared At' + ) + can_edit = models.BooleanField( + default=False, + verbose_name='Can Edit' + ) + + class Meta: + unique_together = ['gallery', 'user'] + verbose_name = 'Gallery Share' + verbose_name_plural = 'Gallery Shares' + ordering = ['-shared_at'] + + +class Album(models.Model): + """Album model - container for pictures within a gallery""" + + gallery = models.ForeignKey( + Gallery, + on_delete=models.CASCADE, + related_name='albums', + verbose_name='Gallery' + ) + name = models.CharField( + max_length=200, + validators=[MinLengthValidator(1)], + verbose_name='Album Name' + ) + description = models.TextField( + blank=True, + verbose_name='Description' + ) + tags = models.ManyToManyField( + Tag, + related_name='albums', + blank=True, + verbose_name='Tags', + help_text='Tags for the album' + ) + exif_metadata = models.JSONField( + default=dict, + blank=True, + help_text='EXIF metadata extracted from pictures' + ) + created_at = models.DateTimeField( + auto_now_add=True, + verbose_name='Created At' + ) + updated_at = models.DateTimeField( + auto_now=True, + verbose_name='Updated At' + ) + deleted_at = models.DateTimeField( + null=True, + blank=True, + verbose_name='Deleted At' + ) + + class Meta: + verbose_name = 'Album' + verbose_name_plural = 'Albums' + ordering = ['-created_at'] + indexes = [ + models.Index(fields=['gallery', 'deleted_at']), + ] + + def __str__(self): + return f"{self.name} ({self.gallery.name})" + + @property + def is_deleted(self): + """Check if album is soft deleted""" + return self.deleted_at is not None + + def soft_delete(self): + """Soft delete the album""" + self.deleted_at = timezone.now() + self.save(update_fields=['deleted_at']) + + def restore(self): + """Restore soft deleted album""" + self.deleted_at = None + self.save(update_fields=['deleted_at']) + + def update_exif_metadata(self, metadata_dict): + """Update EXIF metadata, merging with existing""" + if not isinstance(self.exif_metadata, dict): + self.exif_metadata = {} + self.exif_metadata.update(metadata_dict) + self.save(update_fields=['exif_metadata']) + + def add_tag(self, tag_name): + """Add a tag to the album""" + tag, _ = Tag.get_or_create_tag(tag_name) + if tag not in self.tags.all(): + self.tags.add(tag) + tag.increment_usage() + + def remove_tag(self, tag_name): + """Remove a tag from the album""" + try: + tag = Tag.objects.get(slug=slugify(tag_name.lower().strip())) + if tag in self.tags.all(): + self.tags.remove(tag) + tag.decrement_usage() + except Tag.DoesNotExist: + pass + + @classmethod + def search_by_tags(cls, tag_names, gallery=None): + """Search albums by tags""" + queryset = cls.objects.filter(deleted_at__isnull=True) + if gallery: + queryset = queryset.filter(gallery=gallery) + + if tag_names: + queryset = queryset.filter(tags__name__in=tag_names).distinct() + + return queryset + + def set_tags(self, tag_names): + """Set tags from a list of tag names""" + # Remove old tags + for tag in self.tags.all(): + self.tags.remove(tag) + tag.decrement_usage() + + # Add new tags + for tag_name in tag_names: + self.add_tag(tag_name) + + +class Picture(models.Model): + """Picture model - individual photo stored on SeaweedFS""" + + album = models.ForeignKey( + Album, + on_delete=models.CASCADE, + related_name='pictures', + verbose_name='Album' + ) + title = models.CharField( + max_length=200, + blank=True, + verbose_name='Title' + ) + description = models.TextField( + blank=True, + verbose_name='Description' + ) + + # SeaweedFS storage + seaweedfs_file_id = models.CharField( + max_length=100, + unique=True, + verbose_name='SeaweedFS File ID', + help_text='File ID from SeaweedFS' + ) + seaweedfs_url = models.URLField( + max_length=500, + blank=True, + verbose_name='SeaweedFS URL', + help_text='Full URL to file in SeaweedFS' + ) + file_size = models.PositiveIntegerField( + null=True, + blank=True, + verbose_name='File Size (bytes)' + ) + mime_type = models.CharField( + max_length=100, + default='image/jpeg', + verbose_name='MIME Type' + ) + width = models.PositiveIntegerField( + null=True, + blank=True, + verbose_name='Width (px)' + ) + height = models.PositiveIntegerField( + null=True, + blank=True, + verbose_name='Height (px)' + ) + + # AI-generated metadata + ai_tags = models.JSONField( + default=list, + blank=True, + help_text='Tags generated by AI (YOLO)' + ) + ocr_text = models.TextField( + blank=True, + help_text='Text extracted by OCR (PaddleOCR)' + ) + exif_data = models.JSONField( + default=dict, + blank=True, + help_text='EXIF metadata from the image' + ) + + # User metadata + tags = models.ManyToManyField( + Tag, + related_name='pictures', + blank=True, + verbose_name='Tags', + help_text='User-defined tags' + ) + is_favorite = models.BooleanField( + default=False, + verbose_name='Is Favorite' + ) + + # Timestamps + taken_at = models.DateTimeField( + null=True, + blank=True, + verbose_name='Taken At', + help_text='Date/time when photo was taken (from EXIF)' + ) + uploaded_at = models.DateTimeField( + auto_now_add=True, + verbose_name='Uploaded At' + ) + updated_at = models.DateTimeField( + auto_now=True, + verbose_name='Updated At' + ) + deleted_at = models.DateTimeField( + null=True, + blank=True, + verbose_name='Deleted At' + ) + + class Meta: + verbose_name = 'Picture' + verbose_name_plural = 'Pictures' + ordering = ['-uploaded_at'] + indexes = [ + models.Index(fields=['album', 'deleted_at']), + models.Index(fields=['taken_at']), + models.Index(fields=['is_favorite']), + ] + + def __str__(self): + return f"{self.title or 'Untitled'} ({self.album.name})" + + @property + def is_deleted(self): + """Check if picture is soft deleted""" + return self.deleted_at is not None + + def soft_delete(self): + """Soft delete the picture""" + self.deleted_at = timezone.now() + self.save(update_fields=['deleted_at']) + + def restore(self): + """Restore soft deleted picture""" + self.deleted_at = None + self.save(update_fields=['deleted_at']) + + @property + def all_tags(self): + """Get all tags (user tags + AI tags)""" + user_tag_names = [tag.name for tag in self.tags.all()] + return list(set(user_tag_names + self.ai_tags)) + + def add_tag(self, tag_name): + """Add a user-defined tag to the picture""" + tag, _ = Tag.get_or_create_tag(tag_name) + if tag not in self.tags.all(): + self.tags.add(tag) + tag.increment_usage() + + def remove_tag(self, tag_name): + """Remove a user-defined tag from the picture""" + try: + tag = Tag.objects.get(slug=slugify(tag_name.lower().strip())) + if tag in self.tags.all(): + self.tags.remove(tag) + tag.decrement_usage() + except Tag.DoesNotExist: + pass + + @classmethod + def search_by_tags(cls, tag_names, album=None, user=None): + """Search pictures by tags""" + queryset = cls.objects.filter(deleted_at__isnull=True) + if album: + queryset = queryset.filter(album=album) + if user: + queryset = queryset.filter(album__gallery__owner=user) + + if tag_names: + queryset = queryset.filter(tags__name__in=tag_names).distinct() + + return queryset + + def set_tags(self, tag_names): + """Set tags from a list of tag names""" + # Remove old tags + for tag in self.tags.all(): + self.tags.remove(tag) + tag.decrement_usage() + + # Add new tags + for tag_name in tag_names: + self.add_tag(tag_name) + + def add_ai_tag(self, tag_name): + """Add AI-generated tag (stored in JSONField, not Tag model)""" + if tag_name not in self.ai_tags: + self.ai_tags.append(tag_name) + self.save(update_fields=['ai_tags']) + # Optionally also create a Tag for AI tags for easier searching + tag, _ = Tag.get_or_create_tag(tag_name) + if tag not in self.tags.all(): + self.tags.add(tag) + tag.increment_usage() + + def remove_ai_tag(self, tag_name): + """Remove AI-generated tag""" + if tag_name in self.ai_tags: + self.ai_tags.remove(tag_name) + self.save(update_fields=['ai_tags']) diff --git a/app/gallery/serializers.py b/app/gallery/serializers.py new file mode 100644 index 0000000..07f4c5d --- /dev/null +++ b/app/gallery/serializers.py @@ -0,0 +1,194 @@ +""" +DRF serializers for Gallery API +""" +from rest_framework import serializers +from django.contrib.auth import get_user_model +from .models import Gallery, Album, Picture, GalleryShare, Tag +from .utils import generate_signed_url + +User = get_user_model() + + +class TagSerializer(serializers.ModelSerializer): + """Serializer for Tag model""" + class Meta: + model = Tag + fields = ['id', 'name', 'slug', 'usage_count'] + read_only_fields = ['slug', 'usage_count'] + + +class TagListField(serializers.Field): + """Custom field to handle tags as list of names""" + def to_representation(self, value): + """Convert Tag queryset to list of tag names""" + return [tag.name for tag in value.all()] + + def to_internal_value(self, data): + """Convert list of tag names to Tag objects""" + if not isinstance(data, list): + raise serializers.ValidationError("Tags must be a list of tag names") + return data + + +class PictureSerializer(serializers.ModelSerializer): + """Serializer for Picture model with signed URL""" + signed_url = serializers.SerializerMethodField() + all_tags = serializers.SerializerMethodField() + tags = TagListField() + album_name = serializers.CharField(source='album.name', read_only=True) + + class Meta: + model = Picture + fields = [ + 'id', 'title', 'description', 'album', 'album_name', + 'seaweedfs_file_id', 'signed_url', 'file_size', 'mime_type', + 'width', 'height', 'ai_tags', 'ocr_text', 'exif_data', + 'tags', 'all_tags', 'is_favorite', 'taken_at', + 'uploaded_at', 'updated_at' + ] + read_only_fields = [ + 'seaweedfs_file_id', 'signed_url', 'file_size', 'mime_type', + 'width', 'height', 'uploaded_at', 'updated_at' + ] + + def get_signed_url(self, obj): + """Generate signed URL for the picture""" + if not obj.seaweedfs_file_id: + return None + try: + signed = generate_signed_url(obj.seaweedfs_file_id) + return signed['url'] + except Exception: + return None + + def get_all_tags(self, obj): + """Get all tags (user tags + AI tags)""" + return obj.all_tags + + def update(self, instance, validated_data): + """Handle tag updates""" + tags_data = validated_data.pop('tags', None) + instance = super().update(instance, validated_data) + + if tags_data is not None: + instance.set_tags(tags_data) + + return instance + + def create(self, validated_data): + """Handle tag creation""" + tags_data = validated_data.pop('tags', []) + instance = super().create(validated_data) + + if tags_data: + instance.set_tags(tags_data) + + return instance + + +class AlbumSerializer(serializers.ModelSerializer): + """Serializer for Album model""" + picture_count = serializers.SerializerMethodField() + tags = TagListField() + gallery_name = serializers.CharField(source='gallery.name', read_only=True) + + class Meta: + model = Album + fields = [ + 'id', 'name', 'description', 'gallery', 'gallery_name', + 'tags', 'exif_metadata', 'picture_count', + 'created_at', 'updated_at' + ] + read_only_fields = ['created_at', 'updated_at'] + + def get_picture_count(self, obj): + """Get count of non-deleted pictures""" + return obj.pictures.filter(deleted_at__isnull=True).count() + + def update(self, instance, validated_data): + """Handle tag updates""" + tags_data = validated_data.pop('tags', None) + instance = super().update(instance, validated_data) + + if tags_data is not None: + instance.set_tags(tags_data) + + return instance + + def create(self, validated_data): + """Handle tag creation""" + tags_data = validated_data.pop('tags', []) + instance = super().create(validated_data) + + if tags_data: + instance.set_tags(tags_data) + + return instance + + +class AlbumDetailSerializer(AlbumSerializer): + """Detailed album serializer with pictures""" + pictures = PictureSerializer(many=True, read_only=True) + + class Meta(AlbumSerializer.Meta): + fields = AlbumSerializer.Meta.fields + ['pictures'] + + +class GalleryShareSerializer(serializers.ModelSerializer): + """Serializer for GalleryShare""" + user_email = serializers.EmailField(source='user.email', read_only=True) + user_username = serializers.CharField(source='user.username', read_only=True) + + class Meta: + model = GalleryShare + fields = ['id', 'user', 'user_email', 'user_username', 'can_edit', 'shared_at'] + read_only_fields = ['shared_at'] + + +class GallerySerializer(serializers.ModelSerializer): + """Serializer for Gallery model""" + owner_username = serializers.CharField(source='owner.username', read_only=True) + album_count = serializers.SerializerMethodField() + tags = TagListField() + shared_with_users = GalleryShareSerializer(source='shares', many=True, read_only=True) + + class Meta: + model = Gallery + fields = [ + 'id', 'name', 'description', 'owner', 'owner_username', + 'gallery_type', 'tags', 'is_favorite', 'album_count', + 'shared_with_users', 'created_at', 'updated_at' + ] + read_only_fields = ['owner', 'created_at', 'updated_at'] + + def get_album_count(self, obj): + """Get count of non-deleted albums""" + return obj.albums.filter(deleted_at__isnull=True).count() + + def update(self, instance, validated_data): + """Handle tag updates""" + tags_data = validated_data.pop('tags', None) + instance = super().update(instance, validated_data) + + if tags_data is not None: + instance.set_tags(tags_data) + + return instance + + def create(self, validated_data): + """Handle tag creation""" + tags_data = validated_data.pop('tags', []) + instance = super().create(validated_data) + + if tags_data: + instance.set_tags(tags_data) + + return instance + + +class GalleryDetailSerializer(GallerySerializer): + """Detailed gallery serializer with albums""" + albums = AlbumSerializer(many=True, read_only=True) + + class Meta(GallerySerializer.Meta): + fields = GallerySerializer.Meta.fields + ['albums'] diff --git a/app/gallery/urls.py b/app/gallery/urls.py new file mode 100644 index 0000000..915b36b --- /dev/null +++ b/app/gallery/urls.py @@ -0,0 +1,16 @@ +""" +URL configuration for Gallery app +""" +from django.urls import path, include +from rest_framework.routers import DefaultRouter +from .views import GalleryViewSet, AlbumViewSet, PictureViewSet, TagViewSet + +router = DefaultRouter() +router.register(r'galleries', GalleryViewSet, basename='gallery') +router.register(r'albums', AlbumViewSet, basename='album') +router.register(r'pictures', PictureViewSet, basename='picture') +router.register(r'tags', TagViewSet, basename='tag') + +urlpatterns = [ + path('api/', include(router.urls)), +] diff --git a/app/gallery/utils.py b/app/gallery/utils.py new file mode 100644 index 0000000..1cef18b --- /dev/null +++ b/app/gallery/utils.py @@ -0,0 +1,132 @@ +""" +Utility functions for Gallery app, including signed URL generation for SeaweedFS +""" +import hmac +import hashlib +import base64 +import time +from urllib.parse import urlencode, quote +from django.conf import settings +from django.core.exceptions import ImproperlyConfigured + + +def generate_signed_url(file_id, expires_in=3600, secret_key=None, algorithm='md5'): + """ + Generate a signed URL for SeaweedFS file access. + + The signed URL format is compatible with Nginx secure_link module: + /path/to/file?st=signature&e=expires + + Args: + file_id: SeaweedFS file ID + expires_in: URL expiration time in seconds (default: 1 hour) + secret_key: Secret key for signing (defaults to SECRET_KEY from settings) + algorithm: Hash algorithm ('md5' for nginx secure_link, 'sha256' for custom) + + Returns: + dict with 'url' and 'expires_at' keys + """ + if secret_key is None: + secret_key = getattr(settings, 'GALLERY_SIGNED_URL_SECRET', None) + if secret_key is None: + # Fallback to Django SECRET_KEY + secret_key = settings.SECRET_KEY + + if not secret_key: + raise ImproperlyConfigured( + "GALLERY_SIGNED_URL_SECRET or SECRET_KEY must be set for signed URLs" + ) + + # Calculate expiration timestamp + expires_at = int(time.time()) + expires_in + + # Get base URL and construct full URI path + base_url = getattr(settings, 'GALLERY_MEDIA_BASE_URL', '/media') + uri_path = f"{base_url}/{quote(file_id)}" + + # Create the string to sign + # For nginx secure_link_md5: "$uri$secure_link_expires$secure_link_secret" + # This means: /media/file_id + expires_at + secret_key + string_to_sign = f"{uri_path}{expires_at}{secret_key}" + + # Generate signature based on algorithm + if algorithm == 'md5': + # Use MD5 for nginx secure_link compatibility + signature = hashlib.md5(string_to_sign.encode('utf-8')).hexdigest() + else: + # Use HMAC-SHA256 for custom validation + signature = hmac.new( + secret_key.encode('utf-8'), + string_to_sign.encode('utf-8'), + hashlib.sha256 + ).digest() + signature = base64.urlsafe_b64encode(signature).decode('utf-8').rstrip('=') + + # Build query parameters + params = { + 'st': signature, # signature + 'e': expires_at # expires + } + + # Construct the signed URL + signed_url = f"{uri_path}?{urlencode(params)}" + + return { + 'url': signed_url, + 'expires_at': expires_at, + 'expires_in': expires_in + } + + +def verify_signed_url(file_id, signature, expires_at, secret_key=None, algorithm='md5', uri_path=None): + """ + Verify a signed URL signature. + + This can be used server-side for additional validation (Nginx handles it by default). + + Args: + file_id: SeaweedFS file ID + signature: Signature from URL (st parameter) + expires_at: Expiration timestamp from URL (e parameter) + secret_key: Secret key for verification + algorithm: Hash algorithm ('md5' or 'sha256') + uri_path: Full URI path (for MD5 verification) + + Returns: + bool: True if signature is valid and not expired + """ + if secret_key is None: + secret_key = getattr(settings, 'GALLERY_SIGNED_URL_SECRET', None) + if secret_key is None: + secret_key = settings.SECRET_KEY + + if not secret_key: + return False + + # Check if expired + if int(time.time()) > int(expires_at): + return False + + # Recreate the signature + if algorithm == 'md5': + if uri_path is None: + base_url = getattr(settings, 'GALLERY_MEDIA_BASE_URL', '/media') + uri_path = f"{base_url}/{quote(file_id)}" + string_to_sign = f"{uri_path}{expires_at}{secret_key}" + expected_signature = hashlib.md5(string_to_sign.encode('utf-8')).hexdigest() + return hmac.compare_digest(expected_signature, signature) + else: + # SHA256 verification + base_url = getattr(settings, 'GALLERY_MEDIA_BASE_URL', '/media') + uri_path = uri_path or f"{base_url}/{quote(file_id)}" + string_to_sign = f"{uri_path}{expires_at}{secret_key}" + expected_signature = hmac.new( + secret_key.encode('utf-8'), + string_to_sign.encode('utf-8'), + hashlib.sha256 + ).digest() + expected_signature_b64 = base64.urlsafe_b64encode(expected_signature).decode('utf-8').rstrip('=') + signature_padded = signature + if len(signature_padded) % 4: + signature_padded += '=' * (4 - len(signature_padded) % 4) + return hmac.compare_digest(expected_signature_b64, signature_padded) diff --git a/app/gallery/views.py b/app/gallery/views.py new file mode 100644 index 0000000..dacd909 --- /dev/null +++ b/app/gallery/views.py @@ -0,0 +1,282 @@ +""" +API views for Gallery app +""" +from rest_framework import viewsets, status +from rest_framework.decorators import action +from rest_framework.response import Response +from rest_framework.permissions import IsAuthenticated +from django.shortcuts import get_object_or_404 +from django.db.models import Q +from .models import Gallery, Album, Picture, GalleryShare, Tag +from .serializers import ( + GallerySerializer, GalleryDetailSerializer, + AlbumSerializer, AlbumDetailSerializer, + PictureSerializer, TagSerializer +) +from .utils import generate_signed_url + + +class TagViewSet(viewsets.ReadOnlyModelViewSet): + """ + ViewSet for Tag operations (read-only, tags are managed through objects) + """ + serializer_class = TagSerializer + permission_classes = [IsAuthenticated] + search_fields = ['name', 'slug'] + + def get_queryset(self): + """Get tags used by the user's galleries/albums/pictures""" + user = self.request.user + # Get tags from user's galleries, albums, and pictures + gallery_tags = Tag.objects.filter(galleries__owner=user).distinct() + album_tags = Tag.objects.filter(albums__gallery__owner=user).distinct() + picture_tags = Tag.objects.filter(pictures__album__gallery__owner=user).distinct() + + return (gallery_tags | album_tags | picture_tags).distinct().order_by('name') + + @action(detail=False, methods=['get']) + def popular(self, request): + """Get most popular tags""" + limit = int(request.query_params.get('limit', 20)) + tags = Tag.objects.filter(usage_count__gt=0).order_by('-usage_count')[:limit] + serializer = self.get_serializer(tags, many=True) + return Response(serializer.data) + + +class GalleryViewSet(viewsets.ModelViewSet): + """ + ViewSet for Gallery operations + """ + serializer_class = GallerySerializer + permission_classes = [IsAuthenticated] + + def get_queryset(self): + """Get galleries accessible by the user""" + user = self.request.user + queryset = Gallery.objects.filter( + Q(owner=user) | Q(shared_with=user), + deleted_at__isnull=True + ).distinct() + + # Filter by tags if provided + tags = self.request.query_params.getlist('tags') + if tags: + queryset = queryset.filter(tags__name__in=tags).distinct() + + return queryset + + def get_serializer_class(self): + """Use detail serializer for retrieve action""" + if self.action == 'retrieve': + return GalleryDetailSerializer + return GallerySerializer + + def perform_create(self, serializer): + """Set owner to current user""" + serializer.save(owner=self.request.user) + + @action(detail=True, methods=['post']) + def share(self, request, pk=None): + """Share gallery with users by email""" + gallery = self.get_object() + + # Check permission + if gallery.owner != request.user: + return Response( + {'error': 'Only gallery owner can share'}, + status=status.HTTP_403_FORBIDDEN + ) + + emails = request.data.get('emails', []) + can_edit = request.data.get('can_edit', False) + + if not isinstance(emails, list): + return Response( + {'error': 'emails must be a list'}, + status=status.HTTP_400_BAD_REQUEST + ) + + shared_users = [] + from django.contrib.auth import get_user_model + User = get_user_model() + + for email in emails: + try: + user = User.objects.get(email=email) + share, created = GalleryShare.objects.get_or_create( + gallery=gallery, + user=user, + defaults={'can_edit': can_edit} + ) + if not created: + share.can_edit = can_edit + share.save() + shared_users.append(user.email) + except User.DoesNotExist: + # Could send invitation email here + pass + + return Response({ + 'message': f'Gallery shared with {len(shared_users)} users', + 'shared_with': shared_users + }) + + @action(detail=True, methods=['post']) + def unshare(self, request, pk=None): + """Remove share access for a user""" + gallery = self.get_object() + + if gallery.owner != request.user: + return Response( + {'error': 'Only gallery owner can unshare'}, + status=status.HTTP_403_FORBIDDEN + ) + + user_id = request.data.get('user_id') + if not user_id: + return Response( + {'error': 'user_id is required'}, + status=status.HTTP_400_BAD_REQUEST + ) + + GalleryShare.objects.filter(gallery=gallery, user_id=user_id).delete() + + return Response({'message': 'Share access removed'}) + + @action(detail=True, methods=['post']) + def toggle_favorite(self, request, pk=None): + """Toggle favorite status""" + gallery = self.get_object() + gallery.is_favorite = not gallery.is_favorite + gallery.save(update_fields=['is_favorite']) + return Response({'is_favorite': gallery.is_favorite}) + + +class AlbumViewSet(viewsets.ModelViewSet): + """ + ViewSet for Album operations + """ + serializer_class = AlbumSerializer + permission_classes = [IsAuthenticated] + + def get_queryset(self): + """Get albums accessible by the user""" + user = self.request.user + gallery_id = self.request.query_params.get('gallery_id') + + queryset = Album.objects.filter( + gallery__owner=user, + deleted_at__isnull=True + ) | Album.objects.filter( + gallery__shared_with=user, + deleted_at__isnull=True + ) + + if gallery_id: + queryset = queryset.filter(gallery_id=gallery_id) + + # Filter by tags if provided + tags = self.request.query_params.getlist('tags') + if tags: + queryset = queryset.filter(tags__name__in=tags).distinct() + + return queryset.distinct() + + def get_serializer_class(self): + """Use detail serializer for retrieve action""" + if self.action == 'retrieve': + return AlbumDetailSerializer + return AlbumSerializer + + def perform_create(self, serializer): + """Check permission and create album""" + gallery = serializer.validated_data['gallery'] + + # Check if user has access to gallery + if gallery.owner != self.request.user and not gallery.shared_with.filter(id=self.request.user.id).exists(): + raise PermissionError('You do not have access to this gallery') + + serializer.save() + + +class PictureViewSet(viewsets.ModelViewSet): + """ + ViewSet for Picture operations + """ + serializer_class = PictureSerializer + permission_classes = [IsAuthenticated] + + def get_queryset(self): + """Get pictures accessible by the user""" + user = self.request.user + album_id = self.request.query_params.get('album_id') + + queryset = Picture.objects.filter( + album__gallery__owner=user, + deleted_at__isnull=True + ) | Picture.objects.filter( + album__gallery__shared_with=user, + deleted_at__isnull=True + ) + + if album_id: + queryset = queryset.filter(album_id=album_id) + + # Filter by tags if provided + tags = self.request.query_params.getlist('tags') + if tags: + queryset = queryset.filter(tags__name__in=tags).distinct() + + return queryset.distinct() + + @action(detail=True, methods=['get']) + def signed_url(self, request, pk=None): + """Get a new signed URL for the picture""" + picture = self.get_object() + + expires_in = int(request.query_params.get('expires_in', 3600)) + signed = generate_signed_url(picture.seaweedfs_file_id, expires_in=expires_in) + + return Response(signed) + + @action(detail=True, methods=['post']) + def toggle_favorite(self, request, pk=None): + """Toggle favorite status""" + picture = self.get_object() + picture.is_favorite = not picture.is_favorite + picture.save(update_fields=['is_favorite']) + return Response({'is_favorite': picture.is_favorite}) + + @action(detail=True, methods=['post']) + def add_tag(self, request, pk=None): + """Add a tag to the picture""" + picture = self.get_object() + tag_name = request.data.get('tag') + + if not tag_name: + return Response( + {'error': 'tag is required'}, + status=status.HTTP_400_BAD_REQUEST + ) + + picture.add_tag(tag_name) + tag_names = [tag.name for tag in picture.tags.all()] + + return Response({'tags': tag_names}) + + @action(detail=True, methods=['post']) + def remove_tag(self, request, pk=None): + """Remove a tag from the picture""" + picture = self.get_object() + tag_name = request.data.get('tag') + + if not tag_name: + return Response( + {'error': 'tag is required'}, + status=status.HTTP_400_BAD_REQUEST + ) + + picture.remove_tag(tag_name) + tag_names = [tag.name for tag in picture.tags.all()] + + return Response({'tags': tag_names}) diff --git a/docs/NGINX_SIGNED_URLS.md b/docs/NGINX_SIGNED_URLS.md new file mode 100644 index 0000000..04fc02a --- /dev/null +++ b/docs/NGINX_SIGNED_URLS.md @@ -0,0 +1,141 @@ +# Nginx Signed URL Configuration + +This document explains how to configure Nginx to validate signed URLs for SeaweedFS media files. + +## Overview + +Django generates signed URLs for pictures stored in SeaweedFS. Nginx validates these URLs using the `secure_link` module before serving the files. + +## URL Format + +Signed URLs have the format: +``` +/media/{file_id}?st={signature}&e={expires_timestamp} +``` + +Where: +- `st`: HMAC-SHA256 signature (base64url encoded) +- `e`: Unix timestamp when URL expires + +## Nginx Configuration + +The Nginx configuration uses the `secure_link` module to validate URLs: + +```nginx +location /media/ { + secure_link $arg_st,$arg_e; + secure_link_md5 "$uri$secure_link_expires$secure_link_secret"; + + if ($secure_link = "") { + return 403; + } + if ($secure_link = "0") { + return 403; + } + + # Proxy to SeaweedFS or serve locally + proxy_pass http://seaweedfs:8888/; + # OR + alias /media/; +} +``` + +## Setting the Secret Key + +The `secure_link_secret` must match the secret used by Django. Set it in Nginx: + +### Option 1: Environment Variable (Recommended) + +In `docker-compose.yml`: +```yaml +nginx: + environment: + - SECURE_LINK_SECRET=${GALLERY_SIGNED_URL_SECRET:-${SECRET_KEY}} +``` + +Then in Nginx config: +```nginx +secure_link_secret $SECURE_LINK_SECRET; +``` + +### Option 2: Direct Configuration + +```nginx +secure_link_secret "your-secret-key-here"; +``` + +**Important:** This secret must match: +- Django `GALLERY_SIGNED_URL_SECRET` setting, OR +- Django `SECRET_KEY` if `GALLERY_SIGNED_URL_SECRET` is not set + +## How It Works + +1. **Django generates signed URL:** + ```python + from gallery.utils import generate_signed_url + signed = generate_signed_url(file_id, expires_in=3600) + # Returns: /media/{file_id}?st={signature}&e={expires} + ``` + +2. **Browser requests the URL:** + ``` + GET /media/abc123?st=xyz&e=1234567890 + ``` + +3. **Nginx validates:** + - Extracts `st` (signature) and `e` (expires) from query params + - Recomputes signature using: `HMAC-SHA256(uri + expires + secret)` + - Compares with provided signature + - Checks if current time < expires timestamp + - Returns 403 if invalid or expired + +4. **If valid, serves file:** + - Proxies to SeaweedFS, OR + - Serves from local storage + +## Testing + +### Generate a test URL in Django shell: +```python +from gallery.utils import generate_signed_url +signed = generate_signed_url("test-file-id", expires_in=3600) +print(signed['url']) +``` + +### Test with curl: +```bash +# Valid URL +curl "http://localhost/media/test-file-id?st=...&e=..." + +# Invalid signature (should return 403) +curl "http://localhost/media/test-file-id?st=wrong&e=1234567890" + +# Expired URL (should return 403) +curl "http://localhost/media/test-file-id?st=...&e=1" +``` + +## Security Notes + +1. **Secret Key:** Keep the secret key secure and never expose it +2. **Expiration:** URLs expire after the specified time (default 1 hour) +3. **HTTPS:** Use HTTPS in production to prevent URL interception +4. **Rate Limiting:** Consider adding rate limiting for media endpoints + +## Troubleshooting + +### 403 Forbidden Errors + +1. Check that `secure_link_secret` matches Django's secret +2. Verify URL format is correct +3. Check if URL has expired +4. Verify Nginx has `secure_link` module enabled: + ```bash + nginx -V 2>&1 | grep -o with-http_secure_link_module + ``` + +### Module Not Found + +If `secure_link` module is not available, you may need to: +- Recompile Nginx with `--with-http_secure_link_module` +- Use a different Nginx image that includes the module +- Use an alternative validation method (e.g., Django middleware) diff --git a/nginx/nginx.conf b/nginx/nginx.conf index 7e9d9b1..778da80 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -55,9 +55,42 @@ http { add_header Cache-Control "public, immutable"; } - # Media files + # Media files with signed URL validation + # This validates signed URLs generated by Django for SeaweedFS files + # Note: secure_link_secret must match GALLERY_SIGNED_URL_SECRET or SECRET_KEY from Django location /media/ { - alias /media/; + # Enable secure_link module for signed URL validation + # Format: secure_link $arg_st,$arg_e; + # Where: st=signature, e=expires timestamp + secure_link $arg_st,$arg_e; + + # MD5 hash of: $uri + $secure_link_expires + $secure_link_secret + # This must match the secret used in Django (GALLERY_SIGNED_URL_SECRET or SECRET_KEY) + secure_link_md5 "$uri$secure_link_expires$secure_link_secret"; + + # Set the secret key (should be passed as environment variable) + # In production, use: set $secure_link_secret "your-secret-key"; + # Or pass via environment variable in docker-compose + set $secure_link_secret "change-this-secret-key"; + + # If signature is invalid or expired, return 403 + if ($secure_link = "") { + return 403; + } + if ($secure_link = "0") { + return 403; + } + + # Proxy to SeaweedFS or serve from local storage + # Option 1: Proxy to SeaweedFS (recommended) + proxy_pass http://seaweedfs:8888/; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + + # Option 2: Serve from local storage (if files are synced) + # alias /media/; + expires 7d; add_header Cache-Control "public"; } diff --git a/pyproject.toml b/pyproject.toml index 50f0371..6f61e08 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,6 +13,7 @@ dependencies = [ "python-dotenv>=1.0.0", "gunicorn>=21.2.0", "django-allauth>=0.57.0", + "djangorestframework>=3.14.0", "celery>=5.3.0", "flower>=2.0.0", "redis>=5.0.0", From 1b7ce1717ecf8b594f257d288d7eda9f5a7cee74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janusz=20Mik=C5=82uszka?= Date: Mon, 26 Jan 2026 22:28:57 +0100 Subject: [PATCH 12/30] Add frontend for the Gallery --- app/config/settings.py | 4 +- app/gallery/README_FRONTEND.md | 118 ++++++ app/gallery/forms.py | 118 ++++++ app/gallery/template_views.py | 347 ++++++++++++++++++ .../templates/gallery/album_detail.html | 121 ++++++ app/gallery/templates/gallery/album_form.html | 67 ++++ app/gallery/templates/gallery/base.html | 109 ++++++ .../templates/gallery/gallery_detail.html | 122 ++++++ .../templates/gallery/gallery_form.html | 79 ++++ .../templates/gallery/gallery_list.html | 117 ++++++ .../templates/gallery/partials/empty.html | 1 + .../gallery/partials/favorite_button.html | 23 ++ .../templates/gallery/partials/tags_list.html | 59 +++ .../templates/gallery/picture_detail.html | 118 ++++++ app/gallery/templatetags/__init__.py | 1 + app/gallery/templatetags/gallery_tags.py | 19 + app/gallery/urls.py | 30 ++ app/templates/account/base.html | 53 +++ app/templates/account/login.html | 155 ++++++++ app/templates/account/logout.html | 34 ++ app/templates/account/password_reset.html | 58 +++ .../account/password_reset_done.html | 26 ++ app/templates/account/signup.html | 172 +++++++++ docs/FRONTEND.md | 128 +++++++ 24 files changed, 2078 insertions(+), 1 deletion(-) create mode 100644 app/gallery/README_FRONTEND.md create mode 100644 app/gallery/forms.py create mode 100644 app/gallery/template_views.py create mode 100644 app/gallery/templates/gallery/album_detail.html create mode 100644 app/gallery/templates/gallery/album_form.html create mode 100644 app/gallery/templates/gallery/base.html create mode 100644 app/gallery/templates/gallery/gallery_detail.html create mode 100644 app/gallery/templates/gallery/gallery_form.html create mode 100644 app/gallery/templates/gallery/gallery_list.html create mode 100644 app/gallery/templates/gallery/partials/empty.html create mode 100644 app/gallery/templates/gallery/partials/favorite_button.html create mode 100644 app/gallery/templates/gallery/partials/tags_list.html create mode 100644 app/gallery/templates/gallery/picture_detail.html create mode 100644 app/gallery/templatetags/__init__.py create mode 100644 app/gallery/templatetags/gallery_tags.py create mode 100644 app/templates/account/base.html create mode 100644 app/templates/account/login.html create mode 100644 app/templates/account/logout.html create mode 100644 app/templates/account/password_reset.html create mode 100644 app/templates/account/password_reset_done.html create mode 100644 app/templates/account/signup.html create mode 100644 docs/FRONTEND.md diff --git a/app/config/settings.py b/app/config/settings.py index 0b4d28b..5c6e9ba 100644 --- a/app/config/settings.py +++ b/app/config/settings.py @@ -17,6 +17,8 @@ # Build paths inside the project like this: BASE_DIR / 'subdir'. # BASE_DIR points to /app (where manage.py is located) BASE_DIR = Path(__file__).resolve().parent.parent +# Project root (one level up from app/) +PROJECT_ROOT = BASE_DIR.parent # Load environment variables from .env file # Try project root first (for local dev), then fall back to BASE_DIR @@ -91,7 +93,7 @@ TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [], + 'DIRS': [BASE_DIR / 'templates'], # Add app-level templates directory (app/templates) 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ diff --git a/app/gallery/README_FRONTEND.md b/app/gallery/README_FRONTEND.md new file mode 100644 index 0000000..ef896a6 --- /dev/null +++ b/app/gallery/README_FRONTEND.md @@ -0,0 +1,118 @@ +# Gallery Frontend - Quick Start + +## Overview + +The frontend is a Multi-Page Application (MPA) using: +- **Django Templates** for server-side rendering +- **HTMX** for interactive updates +- **Tailwind CSS** for styling + +## Features Implemented + +### ✅ Interactive Features (HTMX) + +1. **Toggle Favorite** - Click ⭐/☆ to toggle without page refresh +2. **Add Tags** - Inline form to add tags instantly +3. **Remove Tags** - Click × on any tag to remove it + +### ✅ Pages + +1. **Gallery List** (`/`) - Browse all galleries with search/filter +2. **Gallery Detail** (`/galleries//`) - View gallery with albums +3. **Gallery Create/Edit** - Forms for creating/editing galleries +4. **Album Detail** (`/albums//`) - View album with picture grid +5. **Picture Detail** (`/pictures//`) - View picture with metadata + +## How HTMX Works + +### Example: Toggle Favorite + +```html + + +``` + +**What happens:** +1. User clicks button +2. HTMX sends POST request to `/galleries//toggle-favorite/` +3. Server returns updated button HTML +4. HTMX replaces the button with new HTML +5. No page refresh! + +### Example: Remove Tag + +```html + +``` + +**What happens:** +1. User clicks × on tag +2. HTMX sends DELETE request with tag name +3. Server removes tag and returns empty string +4. HTMX removes the `` element +5. Tag disappears instantly! + +## URL Routes + +| URL | View | Description | +|-----|------|-------------| +| `/` | `gallery_list` | List all galleries | +| `/galleries/create/` | `gallery_create` | Create new gallery | +| `/galleries//` | `gallery_detail` | View gallery | +| `/galleries//edit/` | `gallery_edit` | Edit gallery | +| `/albums//` | `album_detail` | View album | +| `/pictures//` | `picture_detail` | View picture | + +## HTMX Endpoints + +| Endpoint | Method | Purpose | +|----------|--------|---------| +| `/galleries//toggle-favorite/` | POST | Toggle favorite | +| `/galleries//add-tag/` | POST | Add tag | +| `/galleries//remove-tag/` | DELETE | Remove tag | +| `/albums//add-tag/` | POST | Add tag | +| `/albums//remove-tag/` | DELETE | Remove tag | +| `/pictures//toggle-favorite/` | POST | Toggle favorite | + +## Testing + +1. **Start the server:** + ```bash + python manage.py runserver + ``` + +2. **Visit:** `http://localhost:8000/` + +3. **Test HTMX:** + - Click ⭐ to toggle favorite (should update instantly) + - Add a tag using the inline form + - Click × on a tag to remove it + +## Customization + +### Styling +- Edit `static/gallery/css/style.css` for custom styles +- Modify Tailwind classes in templates +- Or replace Tailwind with your CSS framework + +### HTMX Behavior +- Modify `hx-target`, `hx-swap` attributes +- Add `hx-trigger` for custom triggers +- Use `hx-indicator` for loading states + +## Next Steps + +- [ ] Add image upload functionality +- [ ] Implement picture grid with lazy loading +- [ ] Add search with live results (HTMX) +- [ ] Create bulk actions (HTMX) +- [ ] Add drag-and-drop for organizing diff --git a/app/gallery/forms.py b/app/gallery/forms.py new file mode 100644 index 0000000..f82e533 --- /dev/null +++ b/app/gallery/forms.py @@ -0,0 +1,118 @@ +""" +Django forms for Gallery app +""" +from django import forms +from .models import Gallery, Album, Picture + + +class GalleryForm(forms.ModelForm): + """Form for creating/editing Gallery""" + tags = forms.CharField( + required=False, + help_text="Enter tags separated by commas", + widget=forms.TextInput(attrs={'placeholder': 'vacation, beach, summer'}) + ) + + class Meta: + model = Gallery + fields = ['name', 'description', 'gallery_type'] + widgets = { + 'name': forms.TextInput(attrs={'class': 'form-control'}), + 'description': forms.Textarea(attrs={'class': 'form-control', 'rows': 4}), + 'gallery_type': forms.Select(attrs={'class': 'form-control'}), + } + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + if self.instance and self.instance.pk: + # Pre-populate tags for editing + self.fields['tags'].initial = ', '.join([tag.name for tag in self.instance.tags.all()]) + + def save(self, commit=True): + gallery = super().save(commit=commit) + + # Handle tags + tags_str = self.cleaned_data.get('tags', '') + if tags_str: + tag_names = [tag.strip() for tag in tags_str.split(',') if tag.strip()] + gallery.set_tags(tag_names) + elif commit: + # Clear tags if empty + gallery.tags.clear() + + return gallery + + +class AlbumForm(forms.ModelForm): + """Form for creating/editing Album""" + tags = forms.CharField( + required=False, + help_text="Enter tags separated by commas", + widget=forms.TextInput(attrs={'placeholder': 'summer, beach, 2024'}) + ) + + class Meta: + model = Album + fields = ['name', 'description'] + widgets = { + 'name': forms.TextInput(attrs={'class': 'form-control'}), + 'description': forms.Textarea(attrs={'class': 'form-control', 'rows': 4}), + } + + def __init__(self, *args, **kwargs): + self.gallery = kwargs.pop('gallery', None) + super().__init__(*args, **kwargs) + if self.instance and self.instance.pk: + # Pre-populate tags for editing + self.fields['tags'].initial = ', '.join([tag.name for tag in self.instance.tags.all()]) + + def save(self, commit=True): + album = super().save(commit=False) + if self.gallery: + album.gallery = self.gallery + if commit: + album.save() + + # Handle tags + tags_str = self.cleaned_data.get('tags', '') + if tags_str: + tag_names = [tag.strip() for tag in tags_str.split(',') if tag.strip()] + album.set_tags(tag_names) + elif commit: + # Clear tags if empty + album.tags.clear() + + return album + + +class PictureUploadForm(forms.ModelForm): + """Form for uploading pictures""" + file = forms.ImageField( + required=True, + help_text="Upload image file (JPG, PNG, HEIC)" + ) + tags = forms.CharField( + required=False, + help_text="Enter tags separated by commas", + widget=forms.TextInput(attrs={'placeholder': 'sunset, beach, vacation'}) + ) + + class Meta: + model = Picture + fields = ['title', 'description'] + widgets = { + 'title': forms.TextInput(attrs={'class': 'form-control'}), + 'description': forms.Textarea(attrs={'class': 'form-control', 'rows': 3}), + } + + def __init__(self, *args, **kwargs): + self.album = kwargs.pop('album', None) + super().__init__(*args, **kwargs) + + def save(self, commit=True): + # This form is mainly for file upload + # Actual saving will be handled in the view after processing + picture = super().save(commit=False) + if self.album: + picture.album = self.album + return picture diff --git a/app/gallery/template_views.py b/app/gallery/template_views.py new file mode 100644 index 0000000..a425bc8 --- /dev/null +++ b/app/gallery/template_views.py @@ -0,0 +1,347 @@ +""" +Template-based views for Gallery app with HTMX support +""" +from django.shortcuts import render, get_object_or_404, redirect +from django.contrib.auth.decorators import login_required +from django.contrib import messages +from django.db.models import Q +from django.http import HttpResponse, JsonResponse +from django.views.decorators.http import require_http_methods +from django.template.loader import render_to_string +from .models import Gallery, Album, Picture, Tag +from .forms import GalleryForm, AlbumForm +from .utils import generate_signed_url + + +@login_required +def gallery_list(request): + """List all galleries for the user""" + user = request.user + shared = request.GET.get('shared') == '1' + + if shared: + galleries = Gallery.objects.filter( + shared_with=user, + deleted_at__isnull=True + ).distinct() + else: + galleries = Gallery.objects.filter( + owner=user, + deleted_at__isnull=True + ) + + # Filter by search + search = request.GET.get('search') + if search: + galleries = galleries.filter( + Q(name__icontains=search) | + Q(description__icontains=search) | + Q(tags__name__icontains=search) + ).distinct() + + # Filter by type + gallery_type = request.GET.get('gallery_type') + if gallery_type: + galleries = galleries.filter(gallery_type=gallery_type) + + # Prefetch related + galleries = galleries.prefetch_related('tags', 'albums').order_by('-created_at') + + context = { + 'galleries': galleries, + } + return render(request, 'gallery/gallery_list.html', context) + + +@login_required +def gallery_detail(request, pk): + """View gallery details""" + gallery = get_object_or_404( + Gallery.objects.filter( + Q(owner=request.user) | Q(shared_with=request.user), + deleted_at__isnull=True + ), + pk=pk + ) + + # Prefetch albums with pictures + albums = gallery.albums.filter(deleted_at__isnull=True).prefetch_related('pictures', 'tags') + + context = { + 'gallery': gallery, + 'albums': albums, + } + return render(request, 'gallery/gallery_detail.html', context) + + +@login_required +def gallery_create(request): + """Create a new gallery""" + if request.method == 'POST': + form = GalleryForm(request.POST) + if form.is_valid(): + gallery = form.save(commit=False) + gallery.owner = request.user + gallery.save() + + # Handle tags + tags_str = request.POST.get('tags', '') + if tags_str: + tag_names = [tag.strip() for tag in tags_str.split(',') if tag.strip()] + gallery.set_tags(tag_names) + + messages.success(request, f'Gallery "{gallery.name}" created successfully!') + return redirect('gallery:gallery_detail', pk=gallery.id) + else: + form = GalleryForm() + + context = {'form': form} + return render(request, 'gallery/gallery_form.html', context) + + +@login_required +def gallery_edit(request, pk): + """Edit a gallery""" + gallery = get_object_or_404(Gallery, pk=pk, owner=request.user, deleted_at__isnull=True) + + if request.method == 'POST': + form = GalleryForm(request.POST, instance=gallery) + if form.is_valid(): + gallery = form.save() + messages.success(request, f'Gallery "{gallery.name}" updated successfully!') + return redirect('gallery:gallery_detail', pk=gallery.id) + else: + form = GalleryForm(instance=gallery) + + context = {'form': form, 'gallery': gallery} + return render(request, 'gallery/gallery_form.html', context) + + +@login_required +@require_http_methods(["POST"]) +def gallery_toggle_favorite(request, pk): + """Toggle favorite status (HTMX endpoint)""" + gallery = get_object_or_404( + Gallery.objects.filter( + Q(owner=request.user) | Q(shared_with=request.user), + deleted_at__isnull=True + ), + pk=pk + ) + + gallery.is_favorite = not gallery.is_favorite + gallery.save(update_fields=['is_favorite']) + + # Return updated button HTML for HTMX + button_html = render_to_string('gallery/partials/favorite_button.html', { + 'object': gallery, + 'object_type': 'gallery', + 'object_id': gallery.id, + }, request=request) + + return HttpResponse(button_html) + + +@login_required +@require_http_methods(["POST"]) +def gallery_add_tag(request, pk): + """Add tag to gallery (HTMX endpoint)""" + gallery = get_object_or_404( + Gallery.objects.filter( + Q(owner=request.user) | Q(shared_with=request.user), + deleted_at__isnull=True + ), + pk=pk + ) + + tag_name = request.POST.get('tag', '').strip() + if tag_name: + gallery.add_tag(tag_name) + + # Return updated tags HTML for HTMX + tags_html = render_to_string('gallery/partials/tags_list.html', { + 'object': gallery, + 'object_type': 'gallery', + 'object_id': gallery.id, + }, request=request) + + return HttpResponse(tags_html) + + +@login_required +@require_http_methods(["POST", "DELETE"]) +def gallery_remove_tag(request, pk): + """Remove tag from gallery (HTMX endpoint)""" + gallery = get_object_or_404( + Gallery.objects.filter( + Q(owner=request.user) | Q(shared_with=request.user), + deleted_at__isnull=True + ), + pk=pk + ) + + # HTMX sends DELETE but Django forms send POST + tag_name = request.POST.get('tag', '').strip() + if tag_name: + gallery.remove_tag(tag_name) + + # Return empty string to remove the tag element + return HttpResponse('') + + +@login_required +def album_detail(request, pk): + """View album details""" + album = get_object_or_404( + Album.objects.filter( + Q(gallery__owner=request.user) | Q(gallery__shared_with=request.user), + deleted_at__isnull=True + ), + pk=pk + ) + + # Generate signed URLs for pictures + pictures = album.pictures.filter(deleted_at__isnull=True).prefetch_related('tags') + for picture in pictures: + if picture.seaweedfs_file_id: + try: + signed = generate_signed_url(picture.seaweedfs_file_id) + picture.signed_url = signed['url'] + except Exception: + picture.signed_url = None + + context = { + 'album': album, + 'pictures': pictures, + } + return render(request, 'gallery/album_detail.html', context) + + +@login_required +def album_create(request, gallery_id): + """Create a new album""" + gallery = get_object_or_404( + Gallery.objects.filter( + Q(owner=request.user) | Q(shared_with=request.user), + deleted_at__isnull=True + ), + pk=gallery_id + ) + + if request.method == 'POST': + form = AlbumForm(request.POST, gallery=gallery) + if form.is_valid(): + album = form.save() + + # Handle tags + tags_str = request.POST.get('tags', '') + if tags_str: + tag_names = [tag.strip() for tag in tags_str.split(',') if tag.strip()] + album.set_tags(tag_names) + + messages.success(request, f'Album "{album.name}" created successfully!') + return redirect('gallery:album_detail', pk=album.id) + else: + form = AlbumForm(gallery=gallery) + + context = {'form': form, 'gallery': gallery} + return render(request, 'gallery/album_form.html', context) + + +@login_required +@require_http_methods(["POST"]) +def album_add_tag(request, pk): + """Add tag to album (HTMX endpoint)""" + album = get_object_or_404( + Album.objects.filter( + Q(gallery__owner=request.user) | Q(gallery__shared_with=request.user), + deleted_at__isnull=True + ), + pk=pk + ) + + tag_name = request.POST.get('tag', '').strip() + if tag_name: + album.add_tag(tag_name) + + # Return updated tags HTML for HTMX + tags_html = render_to_string('gallery/partials/tags_list.html', { + 'object': album, + 'object_type': 'album', + 'object_id': album.id, + }, request=request) + + return HttpResponse(tags_html) + + +@login_required +@require_http_methods(["POST", "DELETE"]) +def album_remove_tag(request, pk): + """Remove tag from album (HTMX endpoint)""" + album = get_object_or_404( + Album.objects.filter( + Q(gallery__owner=request.user) | Q(gallery__shared_with=request.user), + deleted_at__isnull=True + ), + pk=pk + ) + + # HTMX sends DELETE but Django forms send POST + tag_name = request.POST.get('tag', '').strip() + if tag_name: + album.remove_tag(tag_name) + + # Return empty string to remove the tag element + return HttpResponse('') + + +@login_required +def picture_detail(request, pk): + """View picture details""" + picture = get_object_or_404( + Picture.objects.filter( + Q(album__gallery__owner=request.user) | Q(album__gallery__shared_with=request.user), + deleted_at__isnull=True + ), + pk=pk + ) + + # Generate signed URL + signed_url = None + if picture.seaweedfs_file_id: + try: + signed = generate_signed_url(picture.seaweedfs_file_id) + signed_url = signed['url'] + except Exception: + pass + + context = { + 'picture': picture, + 'signed_url': signed_url, + } + return render(request, 'gallery/picture_detail.html', context) + + +@login_required +@require_http_methods(["POST"]) +def picture_toggle_favorite(request, pk): + """Toggle favorite status for picture (HTMX endpoint)""" + picture = get_object_or_404( + Picture.objects.filter( + Q(album__gallery__owner=request.user) | Q(album__gallery__shared_with=request.user), + deleted_at__isnull=True + ), + pk=pk + ) + + picture.is_favorite = not picture.is_favorite + picture.save(update_fields=['is_favorite']) + + # Return updated button HTML for HTMX + button_html = render_to_string('gallery/partials/favorite_button.html', { + 'object': picture, + 'object_type': 'picture', + 'object_id': picture.id, + }, request=request) + + return HttpResponse(button_html) diff --git a/app/gallery/templates/gallery/album_detail.html b/app/gallery/templates/gallery/album_detail.html new file mode 100644 index 0000000..b31d5e2 --- /dev/null +++ b/app/gallery/templates/gallery/album_detail.html @@ -0,0 +1,121 @@ +{% extends "gallery/base.html" %} +{% load static %} + +{% block title %}{{ album.name }} - SmartGallery{% endblock %} + +{% block content %} + +
+
+
+
+ ← {{ album.gallery.name }} +
+

{{ album.name }}

+

{{ album.description }}

+ + +
+ {% for tag in album.tags.all %} + + {{ tag.name }} + + + {% empty %} + No tags + {% endfor %} + +
+ + +
+
+
+ +
+ + Edit + +
+
+
+ + +
+
+

Pictures ({{ album.pictures.count }})

+ + + Upload Pictures + +
+ + {% if album.pictures.all %} +
+ {% for picture in album.pictures.all %} +
+ +
+ {% if picture.signed_url %} + {{ picture.title }} + {% else %} +
+ No Image +
+ {% endif %} + + +
+
+

{{ picture.title|default:"Untitled" }}

+ +
+ {% for tag in picture.tags.all|slice:":2" %} + {{ tag.name }} + {% endfor %} +
+
+ +
+ {% endfor %} +
+ {% else %} +
+

No pictures yet.

+ + Upload First Picture + +
+ {% endif %} +
+{% endblock %} diff --git a/app/gallery/templates/gallery/album_form.html b/app/gallery/templates/gallery/album_form.html new file mode 100644 index 0000000..5da0248 --- /dev/null +++ b/app/gallery/templates/gallery/album_form.html @@ -0,0 +1,67 @@ +{% extends "gallery/base.html" %} +{% load static %} + +{% block title %}{% if album %}Edit{% else %}Create{% endif %} Album - SmartGallery{% endblock %} + +{% block content %} +
+
+

+ {% if album %}Edit Album{% else %}Create New Album{% endif %} +

+ +
+ {% csrf_token %} + +
+ + + {% if form.name.errors %} +

{{ form.name.errors.0 }}

+ {% endif %} +
+ +
+ + +
+ +
+ + +

Enter tags separated by commas

+
+ +
+ + + Cancel + +
+
+
+
+{% endblock %} diff --git a/app/gallery/templates/gallery/base.html b/app/gallery/templates/gallery/base.html new file mode 100644 index 0000000..f42a8e9 --- /dev/null +++ b/app/gallery/templates/gallery/base.html @@ -0,0 +1,109 @@ + + + + + + {% block title %}SmartGallery{% endblock %} + + + + + + + + + + {% load static %} + + + {% block extra_head %}{% endblock %} + + + + + + + {% if messages %} +
+ {% for message in messages %} + + {% endfor %} +
+ {% endif %} + + +
+ {% block content %}{% endblock %} +
+ + +
+
+

+ SmartGallery © {% now "Y" %} +

+
+
+ + {% block extra_js %}{% endblock %} + + diff --git a/app/gallery/templates/gallery/gallery_detail.html b/app/gallery/templates/gallery/gallery_detail.html new file mode 100644 index 0000000..bf247c0 --- /dev/null +++ b/app/gallery/templates/gallery/gallery_detail.html @@ -0,0 +1,122 @@ +{% extends "gallery/base.html" %} +{% load static %} + +{% block title %}{{ gallery.name }} - SmartGallery{% endblock %} + +{% block content %} + +
+
+
+
+

{{ gallery.name }}

+ + +
+

{{ gallery.description }}

+ +
+ + {{ gallery.get_gallery_type_display }} + + Owner: {{ gallery.owner.username }} + {{ gallery.albums.count }} albums +
+ + +
+ {% for tag in gallery.tags.all %} + + {{ tag.name }} + + + {% empty %} + No tags + {% endfor %} + +
+ + +
+
+
+ +
+ + Edit + + + Back + +
+
+
+ + +
+
+

Albums

+ + + New Album + +
+ + {% if gallery.albums.all %} +
+ {% for album in gallery.albums.all %} +
+ +
+

{{ album.name }}

+

{{ album.description|truncatewords:10 }}

+

{{ album.pictures.count }} pictures

+ + +
+ {% for tag in album.tags.all|slice:":3" %} + {{ tag.name }} + {% endfor %} +
+
+ +
+ {% endfor %} +
+ {% else %} +
+

No albums yet.

+ + Create First Album + +
+ {% endif %} +
+{% endblock %} diff --git a/app/gallery/templates/gallery/gallery_form.html b/app/gallery/templates/gallery/gallery_form.html new file mode 100644 index 0000000..7cf4387 --- /dev/null +++ b/app/gallery/templates/gallery/gallery_form.html @@ -0,0 +1,79 @@ +{% extends "gallery/base.html" %} +{% load static %} + +{% block title %}{% if gallery %}Edit{% else %}Create{% endif %} Gallery - SmartGallery{% endblock %} + +{% block content %} +
+
+

+ {% if gallery %}Edit Gallery{% else %}Create New Gallery{% endif %} +

+ +
+ {% csrf_token %} + +
+ + + {% if form.name.errors %} +

{{ form.name.errors.0 }}

+ {% endif %} +
+ +
+ + +
+ +
+ + +
+ +
+ + +

Enter tags separated by commas

+
+ +
+ + + Cancel + +
+
+
+
+{% endblock %} diff --git a/app/gallery/templates/gallery/gallery_list.html b/app/gallery/templates/gallery/gallery_list.html new file mode 100644 index 0000000..8dbed39 --- /dev/null +++ b/app/gallery/templates/gallery/gallery_list.html @@ -0,0 +1,117 @@ +{% extends "gallery/base.html" %} +{% load static %} + +{% block title %}My Galleries - SmartGallery{% endblock %} + +{% block content %} +
+

+ {% if request.GET.shared %} + Shared With Me + {% else %} + My Galleries + {% endif %} +

+ + + New Gallery + +
+ + +
+
+ + + +
+
+ + +{% if galleries %} +
+ {% for gallery in galleries %} +
+
+
+

+ + {{ gallery.name }} + +

+ + +
+ +

{{ gallery.description|truncatewords:20 }}

+ +
+ + {{ gallery.get_gallery_type_display }} + + {{ gallery.album_count }} albums +
+ + +
+ {% for tag in gallery.tags.all %} + + {{ tag.name }} + + + {% empty %} + No tags + {% endfor %} +
+ +
+ + View + + + Edit + +
+
+
+ {% endfor %} +
+{% else %} +
+

No galleries found.

+ + Create Your First Gallery + +
+{% endif %} +{% endblock %} diff --git a/app/gallery/templates/gallery/partials/empty.html b/app/gallery/templates/gallery/partials/empty.html new file mode 100644 index 0000000..6e05f14 --- /dev/null +++ b/app/gallery/templates/gallery/partials/empty.html @@ -0,0 +1 @@ + diff --git a/app/gallery/templates/gallery/partials/favorite_button.html b/app/gallery/templates/gallery/partials/favorite_button.html new file mode 100644 index 0000000..ab613be --- /dev/null +++ b/app/gallery/templates/gallery/partials/favorite_button.html @@ -0,0 +1,23 @@ +{% if object_type == 'gallery' %} + +{% elif object_type == 'picture' %} + +{% endif %} diff --git a/app/gallery/templates/gallery/partials/tags_list.html b/app/gallery/templates/gallery/partials/tags_list.html new file mode 100644 index 0000000..e9e7369 --- /dev/null +++ b/app/gallery/templates/gallery/partials/tags_list.html @@ -0,0 +1,59 @@ +{% if object_type == 'gallery' %} + {% for tag in object.tags.all %} + + {{ tag.name }} + + + {% empty %} + No tags + {% endfor %} + +
+ + +
+{% elif object_type == 'album' %} + {% for tag in object.tags.all %} + + {{ tag.name }} + + + {% empty %} + No tags + {% endfor %} + +
+ + +
+{% endif %} diff --git a/app/gallery/templates/gallery/picture_detail.html b/app/gallery/templates/gallery/picture_detail.html new file mode 100644 index 0000000..16b1519 --- /dev/null +++ b/app/gallery/templates/gallery/picture_detail.html @@ -0,0 +1,118 @@ +{% extends "gallery/base.html" %} +{% load static %} + +{% block title %}{{ picture.title|default:"Picture" }} - SmartGallery{% endblock %} + +{% block content %} +
+ +
+ + ← Back to {{ picture.album.name }} + +
+ +
+
+ +
+ {% if signed_url %} + {{ picture.title|default:'Picture' }} + {% else %} +
+

No image available

+

File ID: {{ picture.seaweedfs_file_id }}

+
+ {% endif %} +
+ + +
+
+

+ {{ picture.title|default:"Untitled" }} +

+ + +
+ +

{{ picture.description }}

+ + +
+ {% if picture.width and picture.height %} +

Dimensions: {{ picture.width }} × {{ picture.height }} px

+ {% endif %} + {% if picture.file_size %} +

Size: {{ picture.file_size|filesizeformat }}

+ {% endif %} + {% if picture.taken_at %} +

Taken: {{ picture.taken_at|date:"F d, Y H:i" }}

+ {% endif %} +

Uploaded: {{ picture.uploaded_at|date:"F d, Y" }}

+
+ + +
+

Tags

+
+ {% for tag in picture.tags.all %} + + {{ tag.name }} + + {% empty %} + No tags + {% endfor %} +
+
+ + + {% if picture.ai_tags %} +
+

AI Tags

+
+ {% for tag in picture.ai_tags %} + + {{ tag }} + + {% endfor %} +
+
+ {% endif %} + + + {% if picture.ocr_text %} +
+

Extracted Text

+

{{ picture.ocr_text|truncatewords:50 }}

+
+ {% endif %} + + + {% if picture.exif_data %} +
+

EXIF Data

+
+ {% for key, value in picture.exif_data.items %} +

{{ key }}: {{ value }}

+ {% endfor %} +
+
+ {% endif %} +
+
+
+
+{% endblock %} diff --git a/app/gallery/templatetags/__init__.py b/app/gallery/templatetags/__init__.py new file mode 100644 index 0000000..4e57c57 --- /dev/null +++ b/app/gallery/templatetags/__init__.py @@ -0,0 +1 @@ +# Template tags for gallery app diff --git a/app/gallery/templatetags/gallery_tags.py b/app/gallery/templatetags/gallery_tags.py new file mode 100644 index 0000000..5328a47 --- /dev/null +++ b/app/gallery/templatetags/gallery_tags.py @@ -0,0 +1,19 @@ +""" +Custom template tags for Gallery app +""" +from django import template + +register = template.Library() + + +@register.filter +def filesizeformat(value): + """Format file size in human-readable format""" + if value is None: + return "Unknown" + + for unit in ['B', 'KB', 'MB', 'GB']: + if value < 1024.0: + return f"{value:.1f} {unit}" + value /= 1024.0 + return f"{value:.1f} TB" diff --git a/app/gallery/urls.py b/app/gallery/urls.py index 915b36b..c393899 100644 --- a/app/gallery/urls.py +++ b/app/gallery/urls.py @@ -4,7 +4,11 @@ from django.urls import path, include from rest_framework.routers import DefaultRouter from .views import GalleryViewSet, AlbumViewSet, PictureViewSet, TagViewSet +from . import template_views +app_name = 'gallery' + +# API routes router = DefaultRouter() router.register(r'galleries', GalleryViewSet, basename='gallery') router.register(r'albums', AlbumViewSet, basename='album') @@ -12,5 +16,31 @@ router.register(r'tags', TagViewSet, basename='tag') urlpatterns = [ + # API routes path('api/', include(router.urls)), + + # Template-based routes + path('', template_views.gallery_list, name='gallery_list'), + path('galleries/create/', template_views.gallery_create, name='gallery_create'), + path('galleries//', template_views.gallery_detail, name='gallery_detail'), + path('galleries//edit/', template_views.gallery_edit, name='gallery_edit'), + + # HTMX endpoints for galleries + path('galleries//toggle-favorite/', template_views.gallery_toggle_favorite, name='gallery_toggle_favorite'), + path('galleries//add-tag/', template_views.gallery_add_tag, name='gallery_add_tag'), + path('galleries//remove-tag/', template_views.gallery_remove_tag, name='gallery_remove_tag'), + + # Albums + path('albums//', template_views.album_detail, name='album_detail'), + path('galleries//albums/create/', template_views.album_create, name='album_create'), + + # HTMX endpoints for albums + path('albums//add-tag/', template_views.album_add_tag, name='album_add_tag'), + path('albums//remove-tag/', template_views.album_remove_tag, name='album_remove_tag'), + + # Pictures + path('pictures//', template_views.picture_detail, name='picture_detail'), + + # HTMX endpoints for pictures + path('pictures//toggle-favorite/', template_views.picture_toggle_favorite, name='picture_toggle_favorite'), ] diff --git a/app/templates/account/base.html b/app/templates/account/base.html new file mode 100644 index 0000000..0f452f3 --- /dev/null +++ b/app/templates/account/base.html @@ -0,0 +1,53 @@ + + + + + + {% block head_title %}{% endblock %} - SmartGallery + + + + + + {% load static %} + + + {% block extra_head %}{% endblock %} + + +
+
+ +
+ +

📷 SmartGallery

+ +

{% block page_title %}Welcome{% endblock %}

+
+ + + {% if messages %} +
+ {% for message in messages %} + + {% endfor %} +
+ {% endif %} + + +
+ {% block content %}{% endblock %} +
+ + +
+ {% block footer_links %}{% endblock %} +
+
+
+ + {% block extra_js %}{% endblock %} + + diff --git a/app/templates/account/login.html b/app/templates/account/login.html new file mode 100644 index 0000000..2417091 --- /dev/null +++ b/app/templates/account/login.html @@ -0,0 +1,155 @@ +{% extends "account/base.html" %} +{% load i18n %} +{% load account socialaccount %} + +{% block head_title %}{% trans "Sign In" %}{% endblock %} +{% block page_title %}Sign in to your account{% endblock %} + +{% block content %} +
+

Sign In

+ + + {% get_providers as socialaccount_providers %} + {% if socialaccount_providers %} +
+
+
+
+
+
+ Or continue with +
+
+ +
+ {% for provider in socialaccount_providers %} + {% if provider.id == "google" %} + + + + + + + + + {% elif provider.id == "facebook" %} + + + + + + {% elif provider.id == "github" %} + + + + + + {% else %} + + {{ provider.name }} + + {% endif %} + {% endfor %} +
+ +
+
+
+
+
+
+ Or use email +
+
+
+ {% endif %} +
+ + +
+ {% csrf_token %} + + {% if form.non_field_errors %} +
+ {{ form.non_field_errors }} +
+ {% endif %} + +
+ + + {% if form.login.errors %} +

{{ form.login.errors.0 }}

+ {% endif %} +
+ +
+ + + {% if form.password.errors %} +

{{ form.password.errors.0 }}

+ {% endif %} +
+ +
+
+ + +
+ +
+ + Forgot password? + +
+
+ + {% if redirect_field_value %} + + {% endif %} + +
+ +
+
+
+{% endblock %} + +{% block footer_links %} +

+ Don't have an account? + + Sign up + +

+{% endblock %} diff --git a/app/templates/account/logout.html b/app/templates/account/logout.html new file mode 100644 index 0000000..af7df61 --- /dev/null +++ b/app/templates/account/logout.html @@ -0,0 +1,34 @@ +{% extends "account/base.html" %} +{% load i18n %} + +{% block head_title %}{% trans "Sign Out" %}{% endblock %} +{% block page_title %}Sign out{% endblock %} + +{% block content %} +
+

Sign Out

+ +

+ Are you sure you want to sign out? +

+ +
+ {% csrf_token %} + {% if redirect_field_value %} + + {% endif %} + +
+ + + + Cancel + +
+
+
+{% endblock %} diff --git a/app/templates/account/password_reset.html b/app/templates/account/password_reset.html new file mode 100644 index 0000000..0fb3d4b --- /dev/null +++ b/app/templates/account/password_reset.html @@ -0,0 +1,58 @@ +{% extends "account/base.html" %} +{% load i18n %} + +{% block head_title %}{% trans "Password Reset" %}{% endblock %} +{% block page_title %}Reset your password{% endblock %} + +{% block content %} +
+

Password Reset

+ +

+ Forgotten your password? Enter your email address below, and we'll send you an email allowing you to reset it. +

+ +
+ {% csrf_token %} + + {% if form.non_field_errors %} +
+ {{ form.non_field_errors }} +
+ {% endif %} + +
+ + + {% if form.email.errors %} +

{{ form.email.errors.0 }}

+ {% endif %} +
+ +
+ +
+
+
+{% endblock %} + +{% block footer_links %} +

+ Remember your password? + + Sign in + +

+{% endblock %} diff --git a/app/templates/account/password_reset_done.html b/app/templates/account/password_reset_done.html new file mode 100644 index 0000000..d971358 --- /dev/null +++ b/app/templates/account/password_reset_done.html @@ -0,0 +1,26 @@ +{% extends "account/base.html" %} +{% load i18n %} + +{% block head_title %}{% trans "Password Reset" %}{% endblock %} +{% block page_title %}Password reset email sent{% endblock %} + +{% block content %} +
+
+ + + +
+ +

Check your email

+ +

+ We have sent you an email. If you have not received it please check your spam folder. Otherwise contact us if you do not receive it in a few minutes. +

+ + + Back to sign in + +
+{% endblock %} diff --git a/app/templates/account/signup.html b/app/templates/account/signup.html new file mode 100644 index 0000000..38ae198 --- /dev/null +++ b/app/templates/account/signup.html @@ -0,0 +1,172 @@ +{% extends "account/base.html" %} +{% load i18n %} + +{% block head_title %}{% trans "Sign Up" %}{% endblock %} +{% block page_title %}Create your account{% endblock %} + +{% block content %} +
+

Sign Up

+ + + {% load socialaccount %} + {% get_providers as socialaccount_providers %} + {% if socialaccount_providers %} +
+
+
+
+
+
+ Or continue with +
+
+ +
+ {% for provider in socialaccount_providers %} + {% if provider.id == "google" %} + + + + + + + + + {% elif provider.id == "facebook" %} + + + + + + {% elif provider.id == "github" %} + + + + + + {% else %} + + {{ provider.name }} + + {% endif %} + {% endfor %} +
+ +
+
+
+
+
+
+ Or use email +
+
+
+ {% endif %} +
+ + +
+ {% csrf_token %} + + {% if form.non_field_errors %} +
+ {{ form.non_field_errors }} +
+ {% endif %} + +
+ + + {% if form.email.errors %} +

{{ form.email.errors.0 }}

+ {% endif %} +
+ + {% if form.email2 %} +
+ + + {% if form.email2.errors %} +

{{ form.email2.errors.0 }}

+ {% endif %} +
+ {% endif %} + +
+ + + {% if form.password1.errors %} +

{{ form.password1.errors.0 }}

+ {% endif %} +
+ +
+ + + {% if form.password2.errors %} +

{{ form.password2.errors.0 }}

+ {% endif %} +
+ + {% if redirect_field_value %} + + {% endif %} + +
+ +
+
+
+{% endblock %} + +{% block footer_links %} +

+ Already have an account? + + Sign in + +

+{% endblock %} diff --git a/docs/FRONTEND.md b/docs/FRONTEND.md new file mode 100644 index 0000000..455c519 --- /dev/null +++ b/docs/FRONTEND.md @@ -0,0 +1,128 @@ +# Frontend Documentation - Gallery App + +## Overview + +The Gallery app uses a **Multi-Page Application (MPA)** approach with Django templates and HTMX for interactive updates. + +## Architecture + +- **Django Templates**: Server-rendered HTML pages +- **HTMX**: For interactive updates without full page refresh +- **Tailwind CSS**: For styling (via CDN) +- **No JavaScript Framework**: Pure Django + HTMX + +## Features + +### HTMX-Powered Interactions + +1. **Toggle Favorite** (⭐/☆) + - Galleries and Pictures + - Updates instantly without page refresh + - Uses `hx-post` to toggle favorite status + +2. **Add/Remove Tags** + - Interactive tag management + - Add tags via inline form + - Remove tags with × button + - Updates in real-time + +3. **Search and Filter** + - Server-side filtering + - Full page navigation (traditional MPA) + +## Template Structure + +``` +gallery/templates/gallery/ +├── base.html # Base template with navigation +├── gallery_list.html # List of galleries +├── gallery_detail.html # Gallery details with albums +├── gallery_form.html # Create/Edit gallery form +├── album_detail.html # Album with pictures grid +├── album_form.html # Create/Edit album form +├── picture_detail.html # Picture view with metadata +└── partials/ + ├── favorite_button.html # HTMX favorite toggle button + └── tags_list.html # HTMX tags list with add/remove +``` + +## HTMX Endpoints + +### Gallery Endpoints + +- `POST /galleries//toggle-favorite/` - Toggle favorite status +- `POST /galleries//add-tag/` - Add tag to gallery +- `DELETE /galleries//remove-tag/` - Remove tag from gallery + +### Album Endpoints + +- `POST /albums//add-tag/` - Add tag to album +- `DELETE /albums//remove-tag/` - Remove tag from album + +### Picture Endpoints + +- `POST /pictures//toggle-favorite/` - Toggle favorite status + +## HTMX Usage Examples + +### Toggle Favorite + +```html + +``` + +### Remove Tag + +```html + +``` + +### Add Tag + +```html +
+ + +
+``` + +## URL Structure + +- `/` - Gallery list +- `/galleries/create/` - Create gallery +- `/galleries//` - Gallery detail +- `/galleries//edit/` - Edit gallery +- `/albums//` - Album detail +- `/pictures//` - Picture detail + +## Styling + +- **Tailwind CSS** via CDN +- Custom CSS in `static/gallery/css/style.css` +- Responsive design (mobile-first) + +## CSRF Protection + +HTMX requests include CSRF tokens automatically via: +1. Global event listener in `base.html` +2. `hx-headers` attribute on specific elements +3. Django's CSRF middleware + +## Future Enhancements + +- Image upload with progress bar (HTMX) +- Inline editing (HTMX) +- Infinite scroll for pictures (HTMX) +- Drag-and-drop for organizing (vanilla JS + HTMX) +- Real-time search suggestions (HTMX) From 8bc160718b144548862f35b5c1e9273abd56106c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janusz=20Mik=C5=82uszka?= Date: Mon, 26 Jan 2026 23:08:45 +0100 Subject: [PATCH 13/30] Add initial tests and Github Actions to run those tests Todo: fix tests because for now they fail --- .github/workflows/README.md | 70 ++++++++ .github/workflows/lint.yml.disabled | 44 +++++ .github/workflows/tests.yml.disabled | 78 +++++++++ .gitignore | 11 ++ README_TESTING.md | 215 +++++++++++++++++++++++++ app/config/settings.py | 11 +- app/config/test_settings.py | 64 ++++++++ app/gallery/admin.py | 2 +- app/gallery/migrations/0001_initial.py | 140 ++++++++++++++++ app/tests/__init__.py | 3 + app/tests/conftest.py | 121 ++++++++++++++ app/tests/gallery/__init__.py | 3 + app/tests/gallery/test_models.py | 97 +++++++++++ app/tests/gallery/test_utils.py | 43 +++++ app/tests/gallery/test_views.py | 48 ++++++ pyproject.toml | 35 ++++ pytest.ini | 56 +++++++ 17 files changed, 1036 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/README.md create mode 100644 .github/workflows/lint.yml.disabled create mode 100644 .github/workflows/tests.yml.disabled create mode 100644 README_TESTING.md create mode 100644 app/config/test_settings.py create mode 100644 app/gallery/migrations/0001_initial.py create mode 100644 app/tests/__init__.py create mode 100644 app/tests/conftest.py create mode 100644 app/tests/gallery/__init__.py create mode 100644 app/tests/gallery/test_models.py create mode 100644 app/tests/gallery/test_utils.py create mode 100644 app/tests/gallery/test_views.py create mode 100644 pytest.ini diff --git a/.github/workflows/README.md b/.github/workflows/README.md new file mode 100644 index 0000000..1962ec7 --- /dev/null +++ b/.github/workflows/README.md @@ -0,0 +1,70 @@ +# GitHub Actions Workflows + +This directory contains GitHub Actions workflows for CI/CD. + +**Note:** Workflows are currently disabled (renamed to `.disabled`). To enable them, rename the files back to `.yml`. + +## Workflows + +### `tests.yml.disabled` (Currently Disabled) + +Runs the test suite on every pull request and push to main branches. + +**Features:** +- Tests on Python 3.11 and 3.12 +- Uses SQLite (no external database required) +- Generates coverage reports +- Uploads test results as artifacts +- Optional Codecov integration + +**Triggers:** +- Pull requests to `main`, `master`, or `develop` +- Pushes to `main`, `master`, or `develop` + +### `lint.yml.disabled` (Currently Disabled) + +Runs code quality checks (optional - can be enabled when you add linting tools). + +**Features:** +- Checks code formatting with `black` +- Checks import sorting with `isort` +- Runs `ruff` for linting + +**Note:** Currently set to not fail the build (`|| true`). Remove this when you're ready to enforce linting. + +## Setup + +### Codecov (Optional) + +If you want to use Codecov for coverage tracking: + +1. Sign up at [codecov.io](https://codecov.io) +2. Add your repository +3. The workflow will automatically upload coverage reports + +If you don't want Codecov, the workflow will still work - it just won't upload coverage (the step is set to `continue-on-error: true`). + +## Customization + +### Enable Workflows + +To enable the workflows, rename: +- `tests.yml.disabled` → `tests.yml` +- `lint.yml.disabled` → `lint.yml` + +### Add More Python Versions + +Edit `.github/workflows/tests.yml` (after enabling): + +```yaml +matrix: + python-version: ["3.11", "3.12", "3.13"] +``` + +### Add PostgreSQL for Integration Tests + +Uncomment the PostgreSQL service section in `tests.yml` if you need it for integration tests. + +### Enable Linting Enforcement + +Edit `.github/workflows/lint.yml` (after enabling) and remove `|| true` from the commands to make linting failures block PRs. diff --git a/.github/workflows/lint.yml.disabled b/.github/workflows/lint.yml.disabled new file mode 100644 index 0000000..4c3f0a4 --- /dev/null +++ b/.github/workflows/lint.yml.disabled @@ -0,0 +1,44 @@ +name: Lint + +on: + pull_request: + branches: + - main + - master + - develop + push: + branches: + - main + - master + - develop + +jobs: + lint: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: "3.11" + cache: 'pip' + + - name: Install linting dependencies + run: | + python -m pip install --upgrade pip + pip install ruff black isort mypy + + - name: Run ruff + run: | + ruff check app/ || true + + - name: Check code formatting with black + run: | + black --check app/ || true + + - name: Check import sorting with isort + run: | + isort --check-only app/ || true diff --git a/.github/workflows/tests.yml.disabled b/.github/workflows/tests.yml.disabled new file mode 100644 index 0000000..f089649 --- /dev/null +++ b/.github/workflows/tests.yml.disabled @@ -0,0 +1,78 @@ +name: Tests + +on: + pull_request: + branches: + - main + - master + - develop + push: + branches: + - main + - master + - develop + +jobs: + test: + runs-on: ubuntu-latest + + strategy: + matrix: + python-version: ["3.11", "3.12"] + + services: + # PostgreSQL is not needed since tests use SQLite + # But we can add it if needed for integration tests later + # postgres: + # image: postgres:16 + # env: + # POSTGRES_PASSWORD: postgres + # POSTGRES_DB: gallery_test + # options: >- + # --health-cmd pg_isready + # --health-interval 10s + # --health-timeout 5s + # --health-retries 5 + # ports: + # - 5432:5432 + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} + cache: 'pip' + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -e ".[dev]" + + - name: Run tests with pytest + env: + DJANGO_SETTINGS_MODULE: config.test_settings + run: | + pytest --cov=app --cov-report=xml --cov-report=term-missing --junitxml=junit.xml -v + + - name: Upload coverage to Codecov (optional) + uses: codecov/codecov-action@v4 + if: always() + continue-on-error: true + with: + file: ./coverage.xml + flags: unittests + name: codecov-umbrella + fail_ci_if_error: false + + - name: Upload test results + uses: actions/upload-artifact@v4 + if: always() + with: + name: test-results-${{ matrix.python-version }} + path: | + junit.xml + coverage.xml + retention-days: 30 diff --git a/.gitignore b/.gitignore index ca63a66..39c349b 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ env/ local_settings.py db.sqlite3 db.sqlite3-journal +test_db.sqlite3 # Test database (if using file-based SQLite for debugging) /media /staticfiles /static @@ -42,3 +43,13 @@ Thumbs.db # Docker .dockerignore + +# Test artifacts +.coverage +.coverage.* +coverage.xml +htmlcov/ +.pytest_cache/ +junit.xml +*.cover +.hypothesis/ diff --git a/README_TESTING.md b/README_TESTING.md new file mode 100644 index 0000000..1ef6984 --- /dev/null +++ b/README_TESTING.md @@ -0,0 +1,215 @@ +# Testing Guide + +This project uses **pytest** with **pytest-django** for testing. + +## Database Configuration + +**Tests use SQLite** (in-memory) instead of PostgreSQL for faster execution. This is automatically configured in `app/config/test_settings.py`. No PostgreSQL connection is required to run tests. + +The test settings file (`config/test_settings.py`) overrides the production database configuration to use SQLite, preventing connection attempts to the PostgreSQL host "db" during tests. + +## Setup + +### Install Dependencies + +```bash +pip install -e ".[dev]" +``` + +Or install pytest dependencies separately: + +```bash +pip install pytest pytest-django pytest-cov pytest-xdist factory-boy faker +``` + +## Running Tests + +### Run All Tests + +```bash +pytest +``` + +### Run Tests with Coverage + +```bash +pytest --cov=app --cov-report=html +``` + +This will generate an HTML coverage report in `htmlcov/index.html`. + +### Run Specific Tests + +```bash +# Run tests in a specific file +pytest app/gallery/tests/test_models.py + +# Run a specific test class +pytest app/gallery/tests/test_models.py::TestGalleryModel + +# Run a specific test function +pytest app/gallery/tests/test_models.py::TestGalleryModel::test_create_gallery +``` + +### Run Tests in Parallel + +```bash +pytest -n auto # Uses pytest-xdist +``` + +### Run Tests by Marker + +```bash +# Run only unit tests +pytest -m unit + +# Run only integration tests +pytest -m integration + +# Skip slow tests +pytest -m "not slow" +``` + +## Test Structure + +``` +app/ +├── tests/ +│ ├── conftest.py # Shared fixtures +│ ├── __init__.py +│ └── gallery/ +│ ├── __init__.py +│ ├── test_models.py # Model tests +│ ├── test_views.py # View tests +│ └── test_utils.py # Utility function tests +└── config/ + └── test_settings.py # Test-specific Django settings (uses SQLite) +``` + +## Available Fixtures + +### User Fixtures + +- `user` - Creates a test user +- `admin_user` - Creates an admin user +- `authenticated_client` - Django test client with logged-in user +- `authenticated_api_client` - DRF API client with authenticated user + +### Django Fixtures + +- `db` - Database access (auto-enabled for all tests) +- `client` - Django test client +- `api_client` - DRF API client +- `request_factory` - Request factory for testing views +- `settings_override` - Override Django settings in tests + +### Celery Fixtures + +- `celery_config` - Configure Celery for testing (synchronous execution) +- `celery_worker_parameters` - Celery worker parameters + +## Writing Tests + +### Example: Model Test + +```python +import pytest +from gallery.models import Gallery + +@pytest.mark.django_db +class TestGalleryModel: + def test_create_gallery(self, user): + gallery = Gallery.objects.create( + owner=user, + name="Test Gallery" + ) + assert gallery.name == "Test Gallery" +``` + +### Example: View Test + +```python +import pytest +from django.urls import reverse + +@pytest.mark.django_db +def test_gallery_list_view(authenticated_client): + url = reverse('gallery:gallery_list') + response = authenticated_client.get(url) + assert response.status_code == 200 +``` + +### Example: API Test + +```python +import pytest +from django.urls import reverse +from rest_framework import status + +@pytest.mark.django_db +def test_create_gallery_api(authenticated_api_client, user): + url = reverse('gallery:gallery-list') + data = { + 'name': 'Test Gallery', + 'gallery_type': 'private' + } + response = authenticated_api_client.post(url, data, format='json') + assert response.status_code == status.HTTP_201_CREATED +``` + +## Test Markers + +Use markers to categorize tests: + +```python +@pytest.mark.slow +def test_slow_operation(): + pass + +@pytest.mark.integration +def test_integration(): + pass + +@pytest.mark.unit +def test_unit(): + pass +``` + +## Configuration + +Test configuration is in: +- `pytest.ini` - Main pytest configuration (points to `config.test_settings`) +- `pyproject.toml` - Project metadata and optional dependencies +- `app/config/test_settings.py` - Test-specific Django settings (SQLite, no external services) +- `app/tests/conftest.py` - Shared fixtures + +## Coverage + +Coverage reports are generated automatically when running tests. View the HTML report: + +```bash +pytest --cov=app --cov-report=html +open htmlcov/index.html # On macOS +# or +start htmlcov/index.html # On Windows +``` + +## Continuous Integration + +For CI/CD, you can run: + +```bash +pytest --cov=app --cov-report=xml --junitxml=junit.xml +``` + +This generates: +- `coverage.xml` - Coverage report for CI +- `junit.xml` - Test results in JUnit format + +## Tips + +1. **Use fixtures** - Don't create test data manually, use fixtures +2. **Mark slow tests** - Use `@pytest.mark.slow` for tests that take time +3. **Use factories** - Consider using `factory-boy` for complex test data +4. **Test isolation** - Each test gets a fresh database transaction +5. **Parallel testing** - Use `pytest-xdist` for faster test runs diff --git a/app/config/settings.py b/app/config/settings.py index 5c6e9ba..1b44093 100644 --- a/app/config/settings.py +++ b/app/config/settings.py @@ -199,13 +199,16 @@ SITE_ID = config.get_int('django.site_id', 1) # allauth Configuration -ACCOUNT_AUTHENTICATION_METHOD = 'email' # Use email instead of username -ACCOUNT_EMAIL_REQUIRED = True -ACCOUNT_USERNAME_REQUIRED = False +# ACCOUNT_AUTHENTICATION_METHOD = 'email' # Use email instead of username # Also deprecated +ACCOUNT_LOGIN_METHODS = {'email'} +# ACCOUNT_EMAIL_REQUIRED = True # deprecated +ACCOUNT_SIGNUP_FIELDS = ['email*', 'email2*', 'password1*', 'password2*'] +# ACCOUNT_USERNAME_REQUIRED = False # Uses AUTHENTICATION_ACCOUNT_EMAIL_VERIFICATION env var or config.yaml ACCOUNT_EMAIL_VERIFICATION = config.get('authentication.account_email_verification', 'mandatory') ACCOUNT_UNIQUE_EMAIL = True -ACCOUNT_SIGNUP_EMAIL_ENTER_TWICE = True +# ACCOUNT_SIGNUP_EMAIL_ENTER_TWICE = True # Deprecated +ACCOUNT_SIGNUP_FIELDS = ['email*', 'email2*', 'password1*', 'password2*'] ACCOUNT_SESSION_REMEMBER = True # Login/Logout URLs diff --git a/app/config/test_settings.py b/app/config/test_settings.py new file mode 100644 index 0000000..6f8ae8f --- /dev/null +++ b/app/config/test_settings.py @@ -0,0 +1,64 @@ +""" +Django test settings for gallery project. + +This settings file is used specifically for running tests. +It uses SQLite instead of PostgreSQL and disables unnecessary features. +""" +# Import all settings first +from .settings import * # noqa: F401, F403 + +# Override database to use SQLite for tests +# This MUST be after the import to override the PostgreSQL config from settings.py +# This prevents trying to connect to PostgreSQL host "db" during test setup +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': ':memory:', # In-memory SQLite for fastest tests + } +} + +# Disable migrations during tests (faster) +class DisableMigrations: + def __contains__(self, item): + return True + + def __getitem__(self, item): + return None + + +MIGRATION_MODULES = DisableMigrations() + +# Speed up password hashing for tests +PASSWORD_HASHERS = [ + 'django.contrib.auth.hashers.MD5PasswordHasher', +] + +# Disable caching for tests +CACHES = { + 'default': { + 'BACKEND': 'django.core.cache.backends.dummy.DummyCache', + } +} + +# Disable email sending during tests +EMAIL_BACKEND = 'django.core.mail.backends.locmem.EmailBackend' + +# Use in-memory session backend for tests +SESSION_ENGINE = 'django.contrib.sessions.backends.cache' +SESSION_CACHE_ALIAS = 'default' + +# Disable logging during tests (optional, for cleaner output) +LOGGING_CONFIG = None + +# Celery configuration for tests (synchronous execution) +CELERY_TASK_ALWAYS_EAGER = True +CELERY_TASK_EAGER_PROPAGATES = True +CELERY_BROKER_URL = 'memory://' +CELERY_RESULT_BACKEND = 'cache+memory://' + +# Disable external services +USE_S3 = False + +# Test-specific settings +DEBUG = False +SECRET_KEY = 'test-secret-key-for-testing-only' # Not used in production diff --git a/app/gallery/admin.py b/app/gallery/admin.py index 62705b3..8678bbd 100644 --- a/app/gallery/admin.py +++ b/app/gallery/admin.py @@ -17,7 +17,7 @@ class GalleryAdmin(admin.ModelAdmin): list_filter = ['gallery_type', 'is_favorite', 'tags', 'created_at', 'deleted_at'] search_fields = ['name', 'description', 'owner__username', 'owner__email', 'tags__name'] readonly_fields = ['created_at', 'updated_at'] - filter_horizontal = ['shared_with', 'tags'] + # filter_horizontal = ['shared_with', 'tags'] @admin.register(Album) diff --git a/app/gallery/migrations/0001_initial.py b/app/gallery/migrations/0001_initial.py new file mode 100644 index 0000000..996a68f --- /dev/null +++ b/app/gallery/migrations/0001_initial.py @@ -0,0 +1,140 @@ +# Generated by Django 6.0.1 on 2026-01-26 21:41 + +import django.core.validators +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='Gallery', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=200, validators=[django.core.validators.MinLengthValidator(1)], verbose_name='Gallery Name')), + ('description', models.TextField(blank=True, verbose_name='Description')), + ('gallery_type', models.CharField(choices=[('private', 'Private'), ('public', 'Public')], default='private', max_length=10, verbose_name='Gallery Type')), + ('is_favorite', models.BooleanField(default=False, verbose_name='Is Favorite')), + ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')), + ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Updated At')), + ('deleted_at', models.DateTimeField(blank=True, null=True, verbose_name='Deleted At')), + ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='galleries', to=settings.AUTH_USER_MODEL, verbose_name='Owner')), + ], + options={ + 'verbose_name': 'Gallery', + 'verbose_name_plural': 'Galleries', + 'ordering': ['-created_at'], + }, + ), + migrations.CreateModel( + name='GalleryShare', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('shared_at', models.DateTimeField(auto_now_add=True, verbose_name='Shared At')), + ('can_edit', models.BooleanField(default=False, verbose_name='Can Edit')), + ('gallery', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='shares', to='gallery.gallery')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='gallery_shares', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'verbose_name': 'Gallery Share', + 'verbose_name_plural': 'Gallery Shares', + 'ordering': ['-shared_at'], + 'unique_together': {('gallery', 'user')}, + }, + ), + migrations.AddField( + model_name='gallery', + name='shared_with', + field=models.ManyToManyField(blank=True, related_name='shared_galleries', through='gallery.GalleryShare', to=settings.AUTH_USER_MODEL, verbose_name='Shared With'), + ), + migrations.CreateModel( + name='Tag', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(db_index=True, help_text='Tag name (case-insensitive, normalized)', max_length=100, unique=True, verbose_name='Tag Name')), + ('slug', models.SlugField(help_text='URL-friendly tag identifier', max_length=100, unique=True, verbose_name='Tag Slug')), + ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')), + ('usage_count', models.PositiveIntegerField(default=0, help_text='Number of times this tag is used across all objects', verbose_name='Usage Count')), + ], + options={ + 'verbose_name': 'Tag', + 'verbose_name_plural': 'Tags', + 'ordering': ['name'], + 'indexes': [models.Index(fields=['name'], name='gallery_tag_name_2a271b_idx'), models.Index(fields=['slug'], name='gallery_tag_slug_90ef48_idx')], + }, + ), + migrations.AddField( + model_name='gallery', + name='tags', + field=models.ManyToManyField(blank=True, help_text='Tags for the gallery', related_name='galleries', to='gallery.tag', verbose_name='Tags'), + ), + migrations.CreateModel( + name='Album', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=200, validators=[django.core.validators.MinLengthValidator(1)], verbose_name='Album Name')), + ('description', models.TextField(blank=True, verbose_name='Description')), + ('exif_metadata', models.JSONField(blank=True, default=dict, help_text='EXIF metadata extracted from pictures')), + ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')), + ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Updated At')), + ('deleted_at', models.DateTimeField(blank=True, null=True, verbose_name='Deleted At')), + ('gallery', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='albums', to='gallery.gallery', verbose_name='Gallery')), + ('tags', models.ManyToManyField(blank=True, help_text='Tags for the album', related_name='albums', to='gallery.tag', verbose_name='Tags')), + ], + options={ + 'verbose_name': 'Album', + 'verbose_name_plural': 'Albums', + 'ordering': ['-created_at'], + }, + ), + migrations.CreateModel( + name='Picture', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(blank=True, max_length=200, verbose_name='Title')), + ('description', models.TextField(blank=True, verbose_name='Description')), + ('seaweedfs_file_id', models.CharField(help_text='File ID from SeaweedFS', max_length=100, unique=True, verbose_name='SeaweedFS File ID')), + ('seaweedfs_url', models.URLField(blank=True, help_text='Full URL to file in SeaweedFS', max_length=500, verbose_name='SeaweedFS URL')), + ('file_size', models.PositiveIntegerField(blank=True, null=True, verbose_name='File Size (bytes)')), + ('mime_type', models.CharField(default='image/jpeg', max_length=100, verbose_name='MIME Type')), + ('width', models.PositiveIntegerField(blank=True, null=True, verbose_name='Width (px)')), + ('height', models.PositiveIntegerField(blank=True, null=True, verbose_name='Height (px)')), + ('ai_tags', models.JSONField(blank=True, default=list, help_text='Tags generated by AI (YOLO)')), + ('ocr_text', models.TextField(blank=True, help_text='Text extracted by OCR (PaddleOCR)')), + ('exif_data', models.JSONField(blank=True, default=dict, help_text='EXIF metadata from the image')), + ('is_favorite', models.BooleanField(default=False, verbose_name='Is Favorite')), + ('taken_at', models.DateTimeField(blank=True, help_text='Date/time when photo was taken (from EXIF)', null=True, verbose_name='Taken At')), + ('uploaded_at', models.DateTimeField(auto_now_add=True, verbose_name='Uploaded At')), + ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Updated At')), + ('deleted_at', models.DateTimeField(blank=True, null=True, verbose_name='Deleted At')), + ('album', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='pictures', to='gallery.album', verbose_name='Album')), + ('tags', models.ManyToManyField(blank=True, help_text='User-defined tags', related_name='pictures', to='gallery.tag', verbose_name='Tags')), + ], + options={ + 'verbose_name': 'Picture', + 'verbose_name_plural': 'Pictures', + 'ordering': ['-uploaded_at'], + 'indexes': [models.Index(fields=['album', 'deleted_at'], name='gallery_pic_album_i_e4e993_idx'), models.Index(fields=['taken_at'], name='gallery_pic_taken_a_f86cb8_idx'), models.Index(fields=['is_favorite'], name='gallery_pic_is_favo_afc0f9_idx')], + }, + ), + migrations.AddIndex( + model_name='gallery', + index=models.Index(fields=['owner', 'gallery_type'], name='gallery_gal_owner_i_4b36dc_idx'), + ), + migrations.AddIndex( + model_name='gallery', + index=models.Index(fields=['deleted_at'], name='gallery_gal_deleted_df2ebd_idx'), + ), + migrations.AddIndex( + model_name='album', + index=models.Index(fields=['gallery', 'deleted_at'], name='gallery_alb_gallery_57def7_idx'), + ), + ] diff --git a/app/tests/__init__.py b/app/tests/__init__.py new file mode 100644 index 0000000..7433404 --- /dev/null +++ b/app/tests/__init__.py @@ -0,0 +1,3 @@ +""" +Tests package for the gallery application. +""" diff --git a/app/tests/conftest.py b/app/tests/conftest.py new file mode 100644 index 0000000..1a6eec4 --- /dev/null +++ b/app/tests/conftest.py @@ -0,0 +1,121 @@ +""" +Pytest configuration and shared fixtures for Django tests. +""" +import pytest +from django.contrib.auth import get_user_model +from django.test import RequestFactory + +User = get_user_model() + + +@pytest.fixture(scope="function") +def db_access(db): + """ + Fixture to ensure database access is available. + This is a wrapper around pytest-django's db fixture. + """ + return db + + +@pytest.fixture +def user(db): + """ + Create a test user. + """ + return User.objects.create_user( + username="testuser", + email="test@example.com", + password="testpass123", + ) + + +@pytest.fixture +def admin_user(db): + """ + Create an admin user. + """ + return User.objects.create_superuser( + username="testuser", + email="admin@example.com", + password="adminpass123", + ) + + +@pytest.fixture +def authenticated_client(client, user): + """ + Create an authenticated client with a logged-in user. + """ + client.force_login(user) + return client + + +@pytest.fixture +def request_factory(): + """ + Create a request factory for testing views. + """ + return RequestFactory() + + +@pytest.fixture +def api_client(): + """ + Create a DRF API client for testing API views. + """ + from rest_framework.test import APIClient + return APIClient() + + +@pytest.fixture +def authenticated_api_client(api_client, user): + """ + Create an authenticated DRF API client. + """ + api_client.force_authenticate(user=user) + return api_client + + +@pytest.fixture(autouse=True) +def enable_db_access_for_all_tests(db): + """ + Automatically enable database access for all tests. + This ensures all tests can access the database without needing @pytest.mark.django_db. + """ + pass + + +@pytest.fixture +def settings_override(settings): + """ + Helper fixture to override Django settings in tests. + + Usage: + def test_something(settings_override): + settings_override.DEBUG = True + # ... test code ... + """ + return settings + + +@pytest.fixture +def celery_config(): + """ + Configure Celery for testing (use in-memory broker). + """ + return { + 'task_always_eager': True, # Execute tasks synchronously + 'task_eager_propagates': True, + 'broker_url': 'memory://', + 'result_backend': 'cache+memory://', + } + + +@pytest.fixture +def celery_worker_parameters(): + """ + Parameters for Celery worker in tests. + """ + return { + 'perform_ping_check': False, + } diff --git a/app/tests/gallery/__init__.py b/app/tests/gallery/__init__.py new file mode 100644 index 0000000..f3726ff --- /dev/null +++ b/app/tests/gallery/__init__.py @@ -0,0 +1,3 @@ +""" +Tests for the gallery app. +""" diff --git a/app/tests/gallery/test_models.py b/app/tests/gallery/test_models.py new file mode 100644 index 0000000..c00ca18 --- /dev/null +++ b/app/tests/gallery/test_models.py @@ -0,0 +1,97 @@ +""" +Tests for gallery models. +""" +import pytest +from django.contrib.auth import get_user_model +from gallery.models import Gallery, Album, Picture, Tag + +User = get_user_model() + + +@pytest.mark.django_db +class TestGalleryModel: + """Test Gallery model.""" + + def test_create_gallery(self, user): + """Test creating a gallery.""" + gallery = Gallery.objects.create( + owner=user, + name="Test Gallery", + description="Test description", + gallery_type="private" + ) + # print(gallery) + assert gallery.name == "Test Gallery" + assert gallery.owner == user + assert gallery.gallery_type == "private" + assert not gallery.is_favorite + + def test_gallery_soft_delete(self, user): + """Test soft delete functionality.""" + gallery = Gallery.objects.create( + owner=user, + name="Test Gallery" + ) + assert gallery.deleted_at is None + + gallery.soft_delete() + assert gallery.deleted_at is not None + + # Should not appear in default queryset + assert Gallery.objects.filter(pk=gallery.pk).count() == 0 + + def test_gallery_tags(self, user): + """Test adding and removing tags.""" + gallery = Gallery.objects.create( + owner=user, + name="Test Gallery" + ) + + tag1 = Tag.get_or_create_tag("vacation") + tag2 = Tag.get_or_create_tag("beach") + + gallery.add_tag("vacation") + gallery.add_tag("beach") + + assert gallery.tags.count() == 2 + assert tag1 in gallery.tags.all() + assert tag2 in gallery.tags.all() + + gallery.remove_tag("vacation") + assert gallery.tags.count() == 1 + assert tag1 not in gallery.tags.all() + + +@pytest.mark.django_db +class TestTagModel: + """Test Tag model.""" + + def test_create_tag(self): + """Test creating a tag.""" + tag, created = Tag.get_or_create_tag("test-tag") + assert tag.name == "test-tag" + assert tag.slug == "test-tag" + assert tag.usage_count == 1 + + def test_tag_normalization(self): + """Test tag name normalization.""" + tag1 = Tag.get_or_create_tag("Test Tag") + tag2 = Tag.get_or_create_tag("test tag") + tag3 = Tag.get_or_create_tag("TEST TAG") + + # All should be the same tag + assert tag1 == tag2 == tag3 + assert tag1.name == "test tag" + + def test_tag_usage_count(self): + """Test tag usage count tracking.""" + tag = Tag.get_or_create_tag("test") + assert tag.usage_count == 1 + + tag.increment_usage() + tag.refresh_from_db() + assert tag.usage_count == 2 + + tag.decrement_usage() + tag.refresh_from_db() + assert tag.usage_count == 1 diff --git a/app/tests/gallery/test_utils.py b/app/tests/gallery/test_utils.py new file mode 100644 index 0000000..cc7c4d5 --- /dev/null +++ b/app/tests/gallery/test_utils.py @@ -0,0 +1,43 @@ +""" +Tests for gallery utility functions. +""" +import pytest +from django.conf import settings +from gallery.utils import generate_signed_url, verify_signed_url + + +@pytest.mark.unit +class TestSignedURL: + """Test signed URL generation and verification.""" + + def test_generate_signed_url(self): + """Test generating a signed URL.""" + file_path = "/media/pictures/test.jpg" + signed_url = generate_signed_url(file_path) + + assert signed_url is not None + assert file_path in signed_url["url"] + assert "e=" in signed_url["url"] + assert "st=" in signed_url["url"] + + def test_verify_signed_url(self): + """Test verifying a signed URL.""" + file_path = "/media/pictures/test.jpg" + signed_url = generate_signed_url(file_path) + + # Extract the path and signature from the URL + assert verify_signed_url(signed_url) is True + + def test_expired_signed_url(self, settings_override): + """Test that expired URLs are rejected.""" + # Set a very short expiration time + settings_override.GALLERY_SIGNED_URL_EXPIRES_IN = 1 + + file_path = "/media/pictures/test.jpg" + signed_url = generate_signed_url(file_path) + + import time + time.sleep(2) # Wait for expiration + + # Note: This test might be flaky, but demonstrates the concept + # In practice, you'd mock time or use a test-specific expiration diff --git a/app/tests/gallery/test_views.py b/app/tests/gallery/test_views.py new file mode 100644 index 0000000..145844e --- /dev/null +++ b/app/tests/gallery/test_views.py @@ -0,0 +1,48 @@ +""" +Tests for gallery views. +""" +import pytest +from django.urls import reverse +from rest_framework import status + + +@pytest.mark.django_db +class TestGalleryListView: + """Test gallery list view.""" + + def test_list_galleries_unauthenticated(self, client): + """Test that unauthenticated users are redirected to login.""" + url = reverse('gallery:gallery_list') + response = client.get(url) + assert response.status_code in [302, 401] # Redirect or unauthorized + + def test_list_galleries_authenticated(self, authenticated_client, user): + """Test listing galleries for authenticated user.""" + url = reverse('gallery:gallery_list') + response = authenticated_client.get(url) + assert response.status_code == 200 + + +@pytest.mark.django_db +class TestGalleryAPIViewSet: + """Test Gallery API ViewSet.""" + + def test_list_galleries_api(self, authenticated_api_client, user): + """Test listing galleries via API.""" + url = reverse('gallery:gallery-list') + response = authenticated_api_client.get(url) + assert response.status_code == status.HTTP_200_OK + assert isinstance(response.data, list) + + def test_create_gallery_api(self, authenticated_api_client, user): + """Test creating a gallery via API.""" + url = reverse('gallery:gallery-list') + data = { + 'name': 'Test Gallery', + 'description': 'Test description', + 'gallery_type': 'private' + } + response = authenticated_api_client.post(url, data, format='json') + assert response.status_code == status.HTTP_201_CREATED + assert response.data['name'] == 'Test Gallery' + assert response.data['owner'] == user.id diff --git a/pyproject.toml b/pyproject.toml index 6f61e08..4c83446 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,9 +13,44 @@ dependencies = [ "python-dotenv>=1.0.0", "gunicorn>=21.2.0", "django-allauth>=0.57.0", + "django-allauth[socialaccount]>=0.57.0", "djangorestframework>=3.14.0", "celery>=5.3.0", "flower>=2.0.0", "redis>=5.0.0", "pyyaml>=6.0.0", + "requests==2.32.5", + "requests-oauthlib==2.0.0", + "python3-openid==3.2.0", + "pyjwt==2.10.1", + "python3-saml==1.16.0", +] + +[project.optional-dependencies] +dev = [ + "pytest>=8.0.0", + "pytest-django>=4.8.0", + "pytest-cov>=4.1.0", + "pytest-xdist>=3.5.0", + "factory-boy>=3.3.0", + "faker>=22.0.0", +] + +[tool.pytest.ini_options] +DJANGO_SETTINGS_MODULE = "config.test_settings" +python_files = ["test_*.py", "*_test.py"] +python_classes = ["Test*"] +python_functions = ["test_*"] +addopts = [ + "--strict-markers", + "--tb=short", + "--reuse-db", + "--nomigrations", + "-v", +] +testpaths = ["app/tests"] +markers = [ + "slow: marks tests as slow (deselect with '-m \"not slow\"')", + "integration: marks tests as integration tests", + "unit: marks tests as unit tests", ] diff --git a/pytest.ini b/pytest.ini new file mode 100644 index 0000000..c38a32b --- /dev/null +++ b/pytest.ini @@ -0,0 +1,56 @@ +[pytest] +# Django settings module - use test_settings for tests +DJANGO_SETTINGS_MODULE = config.test_settings + +# Test discovery patterns +python_files = test_*.py *_test.py +python_classes = Test* +python_functions = test_* + +# Test paths (relative to pytest.ini location) +testpaths = app/tests + +# Command line options +# Coverage is optional - remove --cov flags if you don't want coverage by default +# Note: --reuse-db is not used with SQLite in-memory database +addopts = + --strict-markers + --tb=short + --nomigrations + -v + +# Markers for test categorization +markers = + slow: marks tests as slow (deselect with '-m "not slow"') + integration: marks tests as integration tests + unit: marks tests as unit tests + requires_db: marks tests that require database access + requires_redis: marks tests that require Redis + requires_celery: marks tests that require Celery + +# Logging configuration +log_cli = true +log_cli_level = INFO +log_cli_format = %(asctime)s [%(levelname)8s] %(name)s: %(message)s +log_cli_date_format = %Y-%m-%d %H:%M:%S + +# Coverage configuration +[coverage:run] +source = app +omit = + */migrations/* + */tests/* + */test_*.py + */__pycache__/* + */venv/* + */env/* + +[coverage:report] +exclude_lines = + pragma: no cover + def __repr__ + raise AssertionError + raise NotImplementedError + if __name__ == .__main__.: + if TYPE_CHECKING: + @abstractmethod From 27ed146e9f9d187669fab5d251f9e2a1a13d3688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janusz=20Mik=C5=82uszka?= Date: Tue, 27 Jan 2026 22:05:59 +0100 Subject: [PATCH 14/30] Fix tests and add Makefiley --- Makefile | 158 +++++ app/config/test_settings.py | 5 +- app/gallery/serializers.py | 4 +- app/gallery/views.py | 4 +- app/tests/conftest.py | 4 + app/tests/gallery/test_models.py | 54 +- app/tests/gallery/test_utils.py | 49 +- app/tests/gallery/test_views.py | 2 +- uv.lock | 1017 ++++++++++++++++++++++++++++++ 9 files changed, 1267 insertions(+), 30 deletions(-) create mode 100644 Makefile create mode 100644 uv.lock diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..1969fa4 --- /dev/null +++ b/Makefile @@ -0,0 +1,158 @@ +.PHONY: help install install-dev sync lock test test-cov test-fast lint format clean runserver migrate makemigrations shell superuser collectstatic docker-up docker-down docker-logs docker-build docker-ps celery celery-beat celery-flower + +# Default target +help: + @echo "Available commands:" + @echo " make install - Install production dependencies" + @echo " make install-dev - Install development dependencies" + @echo " make sync - Sync dependencies from lock file" + @echo " make lock - Lock dependencies" + @echo " make test - Run all tests" + @echo " make test-cov - Run tests with coverage report" + @echo " make test-fast - Run tests in parallel" + @echo " make lint - Run linters" + @echo " make format - Format code" + @echo " make clean - Clean temporary files" + @echo " make runserver - Run Django development server" + @echo " make migrate - Run database migrations" + @echo " make makemigrations - Create new migrations" + @echo " make shell - Open Django shell" + @echo " make superuser - Create Django superuser" + @echo " make collectstatic - Collect static files" + @echo " make docker-up - Start Docker services" + @echo " make docker-down - Stop Docker services" + @echo " make docker-logs - View Docker logs" + @echo " make docker-build - Build Docker images" + @echo " make docker-ps - Show Docker container status" + @echo " make celery - Run Celery worker" + @echo " make celery-beat - Run Celery beat scheduler" + @echo " make celery-flower - Run Flower (Celery monitoring)" + +# Installation +install: + uv sync --no-dev + +install-dev: + uv sync + +sync: + uv sync + +lock: + uv lock + +# Testing +test: + uv run pytest + +test-cov: + uv run pytest --cov=app --cov-report=html --cov-report=term + +test-fast: + uv run pytest -n auto + +# Code quality +lint: + @echo "Running linters..." + @if command -v ruff > /dev/null; then \ + uv run ruff check app/; \ + else \ + echo "ruff not installed, skipping..."; \ + fi + @if command -v mypy > /dev/null; then \ + uv run mypy app/ || true; \ + else \ + echo "mypy not installed, skipping..."; \ + fi + +format: + @echo "Formatting code..." + @if command -v ruff > /dev/null; then \ + uv run ruff format app/; \ + else \ + echo "ruff not installed, skipping..."; \ + fi + @if command -v black > /dev/null; then \ + uv run black app/ || true; \ + else \ + echo "black not installed, skipping..."; \ + fi + +# Cleanup +clean: + find . -type d -name "__pycache__" -exec rm -r {} + 2>/dev/null || true + find . -type f -name "*.pyc" -delete + find . -type f -name "*.pyo" -delete + find . -type d -name "*.egg-info" -exec rm -r {} + 2>/dev/null || true + rm -rf .pytest_cache + rm -rf .coverage + rm -rf htmlcov + rm -rf dist + rm -rf build + rm -rf .mypy_cache + rm -rf .ruff_cache + +# Django commands +runserver: + uv run python app/manage.py runserver + +migrate: + uv run python app/manage.py migrate + +makemigrations: + uv run python app/manage.py makemigrations + +shell: + uv run python app/manage.py shell + +superuser: + uv run python app/manage.py createsuperuser + +collectstatic: + uv run python app/manage.py collectstatic --noinput + +# Docker commands +docker-up: + docker-compose up -d + +docker-down: + docker-compose down + +docker-logs: + docker-compose logs -f + +docker-build: + docker-compose build + +docker-ps: + docker-compose ps + +# Docker VPS specific +docker-up-vps: + docker-compose -f docker-compose.vps.yml up -d + +docker-down-vps: + docker-compose -f docker-compose.vps.yml down + +docker-logs-vps: + docker-compose -f docker-compose.vps.yml logs -f + +# Docker GPU specific +docker-up-gpu: + docker-compose -f docker-compose.gpu.yml up -d + +docker-down-gpu: + docker-compose -f docker-compose.gpu.yml down + +docker-logs-gpu: + docker-compose -f docker-compose.gpu.yml logs -f + +# Celery commands +celery: + uv run celery -A config.celery worker --loglevel=info + +celery-beat: + uv run celery -A config.celery beat --loglevel=info + +celery-flower: + uv run celery -A config.celery flower diff --git a/app/config/test_settings.py b/app/config/test_settings.py index 6f8ae8f..fd99af4 100644 --- a/app/config/test_settings.py +++ b/app/config/test_settings.py @@ -43,9 +43,8 @@ def __getitem__(self, item): # Disable email sending during tests EMAIL_BACKEND = 'django.core.mail.backends.locmem.EmailBackend' -# Use in-memory session backend for tests -SESSION_ENGINE = 'django.contrib.sessions.backends.cache' -SESSION_CACHE_ALIAS = 'default' +# Use database session backend for tests (more reliable than cache with DummyCache) +SESSION_ENGINE = 'django.contrib.sessions.backends.db' # Disable logging during tests (optional, for cleaner output) LOGGING_CONFIG = None diff --git a/app/gallery/serializers.py b/app/gallery/serializers.py index 07f4c5d..c5191e2 100644 --- a/app/gallery/serializers.py +++ b/app/gallery/serializers.py @@ -25,6 +25,8 @@ def to_representation(self, value): def to_internal_value(self, data): """Convert list of tag names to Tag objects""" + if data is None: + return [] if not isinstance(data, list): raise serializers.ValidationError("Tags must be a list of tag names") return data @@ -149,7 +151,7 @@ class GallerySerializer(serializers.ModelSerializer): """Serializer for Gallery model""" owner_username = serializers.CharField(source='owner.username', read_only=True) album_count = serializers.SerializerMethodField() - tags = TagListField() + tags = TagListField(required=False, allow_null=True) shared_with_users = GalleryShareSerializer(source='shares', many=True, read_only=True) class Meta: diff --git a/app/gallery/views.py b/app/gallery/views.py index dacd909..96cab3e 100644 --- a/app/gallery/views.py +++ b/app/gallery/views.py @@ -78,9 +78,9 @@ def perform_create(self, serializer): @action(detail=True, methods=['post']) def share(self, request, pk=None): """Share gallery with users by email""" - gallery = self.get_object() + gallery = get_object_or_404(Gallery, pk=pk, deleted_at__isnull=True) - # Check permission + # Check permission - only owner can share if gallery.owner != request.user: return Response( {'error': 'Only gallery owner can share'}, diff --git a/app/tests/conftest.py b/app/tests/conftest.py index 1a6eec4..14c6b2e 100644 --- a/app/tests/conftest.py +++ b/app/tests/conftest.py @@ -45,7 +45,11 @@ def admin_user(db): def authenticated_client(client, user): """ Create an authenticated client with a logged-in user. + Use login() instead of force_login() to avoid session UpdateError. """ + # Use login() with password to avoid session UpdateError + # This properly initializes the session through the authentication backend + # client.login(username=user.username, password='testpass123') client.force_login(user) return client diff --git a/app/tests/gallery/test_models.py b/app/tests/gallery/test_models.py index c00ca18..97ab99e 100644 --- a/app/tests/gallery/test_models.py +++ b/app/tests/gallery/test_models.py @@ -33,12 +33,18 @@ def test_gallery_soft_delete(self, user): name="Test Gallery" ) assert gallery.deleted_at is None + assert not gallery.is_deleted gallery.soft_delete() + gallery.refresh_from_db() assert gallery.deleted_at is not None + assert gallery.is_deleted - # Should not appear in default queryset - assert Gallery.objects.filter(pk=gallery.pk).count() == 0 + # Gallery still exists in database (soft delete doesn't remove it) + assert Gallery.objects.filter(pk=gallery.pk).exists() + + # But should not appear in filtered queryset (non-deleted only) + assert Gallery.objects.filter(pk=gallery.pk, deleted_at__isnull=True).count() == 0 def test_gallery_tags(self, user): """Test adding and removing tags.""" @@ -47,19 +53,35 @@ def test_gallery_tags(self, user): name="Test Gallery" ) - tag1 = Tag.get_or_create_tag("vacation") - tag2 = Tag.get_or_create_tag("beach") + tag1, _ = Tag.get_or_create_tag("vacation") + tag2, _ = Tag.get_or_create_tag("beach") + + # Tags start with usage_count = 0 + assert tag1.usage_count == 0 + assert tag2.usage_count == 0 gallery.add_tag("vacation") gallery.add_tag("beach") + # Refresh tags to get updated usage_count + tag1.refresh_from_db() + tag2.refresh_from_db() + + tags = gallery.tags.all() + assert gallery.tags.count() == 2 - assert tag1 in gallery.tags.all() - assert tag2 in gallery.tags.all() + assert tag1 in tags + assert tag2 in tags + # usage_count should be incremented when tags are added + assert tag1.usage_count == 1 + assert tag2.usage_count == 1 gallery.remove_tag("vacation") + tag1.refresh_from_db() assert gallery.tags.count() == 1 assert tag1 not in gallery.tags.all() + # usage_count should be decremented when tag is removed + assert tag1.usage_count == 0 @pytest.mark.django_db @@ -71,13 +93,14 @@ def test_create_tag(self): tag, created = Tag.get_or_create_tag("test-tag") assert tag.name == "test-tag" assert tag.slug == "test-tag" - assert tag.usage_count == 1 + # usage_count should be 0 when tag is first created (not used yet) + assert tag.usage_count == 0 def test_tag_normalization(self): """Test tag name normalization.""" - tag1 = Tag.get_or_create_tag("Test Tag") - tag2 = Tag.get_or_create_tag("test tag") - tag3 = Tag.get_or_create_tag("TEST TAG") + tag1, _ = Tag.get_or_create_tag("Test Tag") + tag2, _ = Tag.get_or_create_tag("test tag") + tag3, _ = Tag.get_or_create_tag("TEST TAG") # All should be the same tag assert tag1 == tag2 == tag3 @@ -85,7 +108,12 @@ def test_tag_normalization(self): def test_tag_usage_count(self): """Test tag usage count tracking.""" - tag = Tag.get_or_create_tag("test") + tag, _ = Tag.get_or_create_tag("test") + # Initially 0 when tag is created but not used + assert tag.usage_count == 0 + + tag.increment_usage() + tag.refresh_from_db() assert tag.usage_count == 1 tag.increment_usage() @@ -95,3 +123,7 @@ def test_tag_usage_count(self): tag.decrement_usage() tag.refresh_from_db() assert tag.usage_count == 1 + + tag.decrement_usage() + tag.refresh_from_db() + assert tag.usage_count == 0 diff --git a/app/tests/gallery/test_utils.py b/app/tests/gallery/test_utils.py index cc7c4d5..6e41127 100644 --- a/app/tests/gallery/test_utils.py +++ b/app/tests/gallery/test_utils.py @@ -2,6 +2,7 @@ Tests for gallery utility functions. """ import pytest +from urllib.parse import urlparse, parse_qs, unquote from django.conf import settings from gallery.utils import generate_signed_url, verify_signed_url @@ -12,32 +13,56 @@ class TestSignedURL: def test_generate_signed_url(self): """Test generating a signed URL.""" - file_path = "/media/pictures/test.jpg" - signed_url = generate_signed_url(file_path) + file_id = "01637037d6" # SeaweedFS file ID format (alphanumeric) + result = generate_signed_url(file_id) - assert signed_url is not None - assert file_path in signed_url["url"] - assert "e=" in signed_url["url"] - assert "st=" in signed_url["url"] + assert result is not None + assert isinstance(result, dict) + assert "url" in result + assert "expires_at" in result + assert "expires_in" in result + + signed_url = result["url"] + # Parse URL to extract file_id from path (accounting for URL encoding) + parsed_url = urlparse(signed_url) + path_file_id = unquote(parsed_url.path.split('/')[-1]) + assert path_file_id == file_id + assert "e=" in signed_url + assert "st=" in signed_url def test_verify_signed_url(self): """Test verifying a signed URL.""" - file_path = "/media/pictures/test.jpg" - signed_url = generate_signed_url(file_path) + file_id = "01637037d6" # SeaweedFS file ID format (alphanumeric) + result = generate_signed_url(file_id) + + # Parse the URL to extract signature and expires_at + parsed_url = urlparse(result["url"]) + query_params = parse_qs(parsed_url.query) + signature = query_params["st"][0] + expires_at = int(query_params["e"][0]) - # Extract the path and signature from the URL - assert verify_signed_url(signed_url) is True + # Verify the signed URL with all necessary arguments + assert verify_signed_url(file_id, signature, expires_at) is True def test_expired_signed_url(self, settings_override): """Test that expired URLs are rejected.""" # Set a very short expiration time settings_override.GALLERY_SIGNED_URL_EXPIRES_IN = 1 - file_path = "/media/pictures/test.jpg" - signed_url = generate_signed_url(file_path) + file_id = "01637037d6" # SeaweedFS file ID format (alphanumeric) + result = generate_signed_url(file_id, expires_in=1) + + # Parse the URL to extract signature and expires_at + parsed_url = urlparse(result["url"]) + query_params = parse_qs(parsed_url.query) + signature = query_params["st"][0] + expires_at = int(query_params["e"][0]) import time time.sleep(2) # Wait for expiration + # Verify that expired URL is rejected + assert verify_signed_url(file_id, signature, expires_at) is False + # Note: This test might be flaky, but demonstrates the concept # In practice, you'd mock time or use a test-specific expiration diff --git a/app/tests/gallery/test_views.py b/app/tests/gallery/test_views.py index 145844e..0a475b1 100644 --- a/app/tests/gallery/test_views.py +++ b/app/tests/gallery/test_views.py @@ -32,7 +32,7 @@ def test_list_galleries_api(self, authenticated_api_client, user): url = reverse('gallery:gallery-list') response = authenticated_api_client.get(url) assert response.status_code == status.HTTP_200_OK - assert isinstance(response.data, list) + assert isinstance(response.data["results"], list) def test_create_gallery_api(self, authenticated_api_client, user): """Test creating a gallery via API.""" diff --git a/uv.lock b/uv.lock new file mode 100644 index 0000000..ebc7198 --- /dev/null +++ b/uv.lock @@ -0,0 +1,1017 @@ +version = 1 +revision = 3 +requires-python = ">=3.14" + +[[package]] +name = "amqp" +version = "5.3.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "vine" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/79/fc/ec94a357dfc6683d8c86f8b4cfa5416a4c36b28052ec8260c77aca96a443/amqp-5.3.1.tar.gz", hash = "sha256:cddc00c725449522023bad949f70fff7b48f0b1ade74d170a6f10ab044739432", size = 129013, upload-time = "2024-11-12T19:55:44.051Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/26/99/fc813cd978842c26c82534010ea849eee9ab3a13ea2b74e95cb9c99e747b/amqp-5.3.1-py3-none-any.whl", hash = "sha256:43b3319e1b4e7d1251833a93d672b4af1e40f3d632d479b98661a95f117880a2", size = 50944, upload-time = "2024-11-12T19:55:41.782Z" }, +] + +[[package]] +name = "asgiref" +version = "3.11.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/76/b9/4db2509eabd14b4a8c71d1b24c8d5734c52b8560a7b1e1a8b56c8d25568b/asgiref-3.11.0.tar.gz", hash = "sha256:13acff32519542a1736223fb79a715acdebe24286d98e8b164a73085f40da2c4", size = 37969, upload-time = "2025-11-19T15:32:20.106Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/91/be/317c2c55b8bbec407257d45f5c8d1b6867abc76d12043f2d3d58c538a4ea/asgiref-3.11.0-py3-none-any.whl", hash = "sha256:1db9021efadb0d9512ce8ffaf72fcef601c7b73a8807a1bb2ef143dc6b14846d", size = 24096, upload-time = "2025-11-19T15:32:19.004Z" }, +] + +[[package]] +name = "billiard" +version = "4.2.4" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/58/23/b12ac0bcdfb7360d664f40a00b1bda139cbbbced012c34e375506dbd0143/billiard-4.2.4.tar.gz", hash = "sha256:55f542c371209e03cd5862299b74e52e4fbcba8250ba611ad94276b369b6a85f", size = 156537, upload-time = "2025-11-30T13:28:48.52Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/cb/87/8bab77b323f16d67be364031220069f79159117dd5e43eeb4be2fef1ac9b/billiard-4.2.4-py3-none-any.whl", hash = "sha256:525b42bdec68d2b983347ac312f892db930858495db601b5836ac24e6477cde5", size = 87070, upload-time = "2025-11-30T13:28:47.016Z" }, +] + +[[package]] +name = "boto3" +version = "1.42.36" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "botocore" }, + { name = "jmespath" }, + { name = "s3transfer" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/54/06/50ff808cf4f40efada8edc20f9d563ab287864423c874dfb94f755a60c52/boto3-1.42.36.tar.gz", hash = "sha256:a4eb51105c8c5d7b2bc2a9e2316e69baf69a55611275b9f189c0cf59f1aae171", size = 112839, upload-time = "2026-01-27T20:38:26.992Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/8d/d1/35d12f04a7792e2f5e9ddff3c7b60493a32027761380dee7f24ee8ae80cc/boto3-1.42.36-py3-none-any.whl", hash = "sha256:e0ff6f2747bfdec63405b35ea185a7aea35239c3f4fe99e4d29368a6de9c4a84", size = 140604, upload-time = "2026-01-27T20:38:25.349Z" }, +] + +[[package]] +name = "botocore" +version = "1.42.36" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "jmespath" }, + { name = "python-dateutil" }, + { name = "urllib3" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/66/4e/b24089cf7a77d38886ac4fbae300a3c4c6d68c1b9ccb66af03cb07b6c35c/botocore-1.42.36.tar.gz", hash = "sha256:2ebd89cc75927944e2cee51b7adce749f38e0cb269a758a6464a27f8bcca65fb", size = 14909073, upload-time = "2026-01-27T20:38:16.621Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e6/e8/f14d25bd768187424b385bc6a44e2ed5e96964e461ba019add03e48713c7/botocore-1.42.36-py3-none-any.whl", hash = "sha256:2cfae4c482e5e87bd835ab4289b711490c161ba57e852c06b65a03e7c25e08eb", size = 14583066, upload-time = "2026-01-27T20:38:14.02Z" }, +] + +[[package]] +name = "celery" +version = "5.6.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "billiard" }, + { name = "click" }, + { name = "click-didyoumean" }, + { name = "click-plugins" }, + { name = "click-repl" }, + { name = "kombu" }, + { name = "python-dateutil" }, + { name = "tzlocal" }, + { name = "vine" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/8f/9d/3d13596519cfa7207a6f9834f4b082554845eb3cd2684b5f8535d50c7c44/celery-5.6.2.tar.gz", hash = "sha256:4a8921c3fcf2ad76317d3b29020772103581ed2454c4c042cc55dcc43585009b", size = 1718802, upload-time = "2026-01-04T12:35:58.012Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/dd/bd/9ecd619e456ae4ba73b6583cc313f26152afae13e9a82ac4fe7f8856bfd1/celery-5.6.2-py3-none-any.whl", hash = "sha256:3ffafacbe056951b629c7abcf9064c4a2366de0bdfc9fdba421b97ebb68619a5", size = 445502, upload-time = "2026-01-04T12:35:55.894Z" }, +] + +[[package]] +name = "certifi" +version = "2026.1.4" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/e0/2d/a891ca51311197f6ad14a7ef42e2399f36cf2f9bd44752b3dc4eab60fdc5/certifi-2026.1.4.tar.gz", hash = "sha256:ac726dd470482006e014ad384921ed6438c457018f4b3d204aea4281258b2120", size = 154268, upload-time = "2026-01-04T02:42:41.825Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e6/ad/3cc14f097111b4de0040c83a525973216457bbeeb63739ef1ed275c1c021/certifi-2026.1.4-py3-none-any.whl", hash = "sha256:9943707519e4add1115f44c2bc244f782c0249876bf51b6599fee1ffbedd685c", size = 152900, upload-time = "2026-01-04T02:42:40.15Z" }, +] + +[[package]] +name = "cffi" +version = "2.0.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pycparser", marker = "implementation_name != 'PyPy'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/eb/56/b1ba7935a17738ae8453301356628e8147c79dbb825bcbc73dc7401f9846/cffi-2.0.0.tar.gz", hash = "sha256:44d1b5909021139fe36001ae048dbdde8214afa20200eda0f64c068cac5d5529", size = 523588, upload-time = "2025-09-08T23:24:04.541Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/92/c4/3ce07396253a83250ee98564f8d7e9789fab8e58858f35d07a9a2c78de9f/cffi-2.0.0-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:fc33c5141b55ed366cfaad382df24fe7dcbc686de5be719b207bb248e3053dc5", size = 185320, upload-time = "2025-09-08T23:23:18.087Z" }, + { url = "https://files.pythonhosted.org/packages/59/dd/27e9fa567a23931c838c6b02d0764611c62290062a6d4e8ff7863daf9730/cffi-2.0.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:c654de545946e0db659b3400168c9ad31b5d29593291482c43e3564effbcee13", size = 181487, upload-time = "2025-09-08T23:23:19.622Z" }, + { url = "https://files.pythonhosted.org/packages/d6/43/0e822876f87ea8a4ef95442c3d766a06a51fc5298823f884ef87aaad168c/cffi-2.0.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:24b6f81f1983e6df8db3adc38562c83f7d4a0c36162885ec7f7b77c7dcbec97b", size = 220049, upload-time = "2025-09-08T23:23:20.853Z" }, + { url = "https://files.pythonhosted.org/packages/b4/89/76799151d9c2d2d1ead63c2429da9ea9d7aac304603de0c6e8764e6e8e70/cffi-2.0.0-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:12873ca6cb9b0f0d3a0da705d6086fe911591737a59f28b7936bdfed27c0d47c", size = 207793, upload-time = "2025-09-08T23:23:22.08Z" }, + { url = "https://files.pythonhosted.org/packages/bb/dd/3465b14bb9e24ee24cb88c9e3730f6de63111fffe513492bf8c808a3547e/cffi-2.0.0-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:d9b97165e8aed9272a6bb17c01e3cc5871a594a446ebedc996e2397a1c1ea8ef", size = 206300, upload-time = "2025-09-08T23:23:23.314Z" }, + { url = "https://files.pythonhosted.org/packages/47/d9/d83e293854571c877a92da46fdec39158f8d7e68da75bf73581225d28e90/cffi-2.0.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:afb8db5439b81cf9c9d0c80404b60c3cc9c3add93e114dcae767f1477cb53775", size = 219244, upload-time = "2025-09-08T23:23:24.541Z" }, + { url = "https://files.pythonhosted.org/packages/2b/0f/1f177e3683aead2bb00f7679a16451d302c436b5cbf2505f0ea8146ef59e/cffi-2.0.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:737fe7d37e1a1bffe70bd5754ea763a62a066dc5913ca57e957824b72a85e205", size = 222828, upload-time = "2025-09-08T23:23:26.143Z" }, + { url = "https://files.pythonhosted.org/packages/c6/0f/cafacebd4b040e3119dcb32fed8bdef8dfe94da653155f9d0b9dc660166e/cffi-2.0.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:38100abb9d1b1435bc4cc340bb4489635dc2f0da7456590877030c9b3d40b0c1", size = 220926, upload-time = "2025-09-08T23:23:27.873Z" }, + { url = "https://files.pythonhosted.org/packages/3e/aa/df335faa45b395396fcbc03de2dfcab242cd61a9900e914fe682a59170b1/cffi-2.0.0-cp314-cp314-win32.whl", hash = "sha256:087067fa8953339c723661eda6b54bc98c5625757ea62e95eb4898ad5e776e9f", size = 175328, upload-time = "2025-09-08T23:23:44.61Z" }, + { url = "https://files.pythonhosted.org/packages/bb/92/882c2d30831744296ce713f0feb4c1cd30f346ef747b530b5318715cc367/cffi-2.0.0-cp314-cp314-win_amd64.whl", hash = "sha256:203a48d1fb583fc7d78a4c6655692963b860a417c0528492a6bc21f1aaefab25", size = 185650, upload-time = "2025-09-08T23:23:45.848Z" }, + { url = "https://files.pythonhosted.org/packages/9f/2c/98ece204b9d35a7366b5b2c6539c350313ca13932143e79dc133ba757104/cffi-2.0.0-cp314-cp314-win_arm64.whl", hash = "sha256:dbd5c7a25a7cb98f5ca55d258b103a2054f859a46ae11aaf23134f9cc0d356ad", size = 180687, upload-time = "2025-09-08T23:23:47.105Z" }, + { url = "https://files.pythonhosted.org/packages/3e/61/c768e4d548bfa607abcda77423448df8c471f25dbe64fb2ef6d555eae006/cffi-2.0.0-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:9a67fc9e8eb39039280526379fb3a70023d77caec1852002b4da7e8b270c4dd9", size = 188773, upload-time = "2025-09-08T23:23:29.347Z" }, + { url = "https://files.pythonhosted.org/packages/2c/ea/5f76bce7cf6fcd0ab1a1058b5af899bfbef198bea4d5686da88471ea0336/cffi-2.0.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:7a66c7204d8869299919db4d5069a82f1561581af12b11b3c9f48c584eb8743d", size = 185013, upload-time = "2025-09-08T23:23:30.63Z" }, + { url = "https://files.pythonhosted.org/packages/be/b4/c56878d0d1755cf9caa54ba71e5d049479c52f9e4afc230f06822162ab2f/cffi-2.0.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:7cc09976e8b56f8cebd752f7113ad07752461f48a58cbba644139015ac24954c", size = 221593, upload-time = "2025-09-08T23:23:31.91Z" }, + { url = "https://files.pythonhosted.org/packages/e0/0d/eb704606dfe8033e7128df5e90fee946bbcb64a04fcdaa97321309004000/cffi-2.0.0-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:92b68146a71df78564e4ef48af17551a5ddd142e5190cdf2c5624d0c3ff5b2e8", size = 209354, upload-time = "2025-09-08T23:23:33.214Z" }, + { url = "https://files.pythonhosted.org/packages/d8/19/3c435d727b368ca475fb8742ab97c9cb13a0de600ce86f62eab7fa3eea60/cffi-2.0.0-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:b1e74d11748e7e98e2f426ab176d4ed720a64412b6a15054378afdb71e0f37dc", size = 208480, upload-time = "2025-09-08T23:23:34.495Z" }, + { url = "https://files.pythonhosted.org/packages/d0/44/681604464ed9541673e486521497406fadcc15b5217c3e326b061696899a/cffi-2.0.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:28a3a209b96630bca57cce802da70c266eb08c6e97e5afd61a75611ee6c64592", size = 221584, upload-time = "2025-09-08T23:23:36.096Z" }, + { url = "https://files.pythonhosted.org/packages/25/8e/342a504ff018a2825d395d44d63a767dd8ebc927ebda557fecdaca3ac33a/cffi-2.0.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:7553fb2090d71822f02c629afe6042c299edf91ba1bf94951165613553984512", size = 224443, upload-time = "2025-09-08T23:23:37.328Z" }, + { url = "https://files.pythonhosted.org/packages/e1/5e/b666bacbbc60fbf415ba9988324a132c9a7a0448a9a8f125074671c0f2c3/cffi-2.0.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:6c6c373cfc5c83a975506110d17457138c8c63016b563cc9ed6e056a82f13ce4", size = 223437, upload-time = "2025-09-08T23:23:38.945Z" }, + { url = "https://files.pythonhosted.org/packages/a0/1d/ec1a60bd1a10daa292d3cd6bb0b359a81607154fb8165f3ec95fe003b85c/cffi-2.0.0-cp314-cp314t-win32.whl", hash = "sha256:1fc9ea04857caf665289b7a75923f2c6ed559b8298a1b8c49e59f7dd95c8481e", size = 180487, upload-time = "2025-09-08T23:23:40.423Z" }, + { url = "https://files.pythonhosted.org/packages/bf/41/4c1168c74fac325c0c8156f04b6749c8b6a8f405bbf91413ba088359f60d/cffi-2.0.0-cp314-cp314t-win_amd64.whl", hash = "sha256:d68b6cef7827e8641e8ef16f4494edda8b36104d79773a334beaa1e3521430f6", size = 191726, upload-time = "2025-09-08T23:23:41.742Z" }, + { url = "https://files.pythonhosted.org/packages/ae/3a/dbeec9d1ee0844c679f6bb5d6ad4e9f198b1224f4e7a32825f47f6192b0c/cffi-2.0.0-cp314-cp314t-win_arm64.whl", hash = "sha256:0a1527a803f0a659de1af2e1fd700213caba79377e27e4693648c2923da066f9", size = 184195, upload-time = "2025-09-08T23:23:43.004Z" }, +] + +[[package]] +name = "charset-normalizer" +version = "3.4.4" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/13/69/33ddede1939fdd074bce5434295f38fae7136463422fe4fd3e0e89b98062/charset_normalizer-3.4.4.tar.gz", hash = "sha256:94537985111c35f28720e43603b8e7b43a6ecfb2ce1d3058bbe955b73404e21a", size = 129418, upload-time = "2025-10-14T04:42:32.879Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/2a/35/7051599bd493e62411d6ede36fd5af83a38f37c4767b92884df7301db25d/charset_normalizer-3.4.4-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:da3326d9e65ef63a817ecbcc0df6e94463713b754fe293eaa03da99befb9a5bd", size = 207746, upload-time = "2025-10-14T04:41:33.773Z" }, + { url = "https://files.pythonhosted.org/packages/10/9a/97c8d48ef10d6cd4fcead2415523221624bf58bcf68a802721a6bc807c8f/charset_normalizer-3.4.4-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8af65f14dc14a79b924524b1e7fffe304517b2bff5a58bf64f30b98bbc5079eb", size = 147889, upload-time = "2025-10-14T04:41:34.897Z" }, + { url = "https://files.pythonhosted.org/packages/10/bf/979224a919a1b606c82bd2c5fa49b5c6d5727aa47b4312bb27b1734f53cd/charset_normalizer-3.4.4-cp314-cp314-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:74664978bb272435107de04e36db5a9735e78232b85b77d45cfb38f758efd33e", size = 143641, upload-time = "2025-10-14T04:41:36.116Z" }, + { url = "https://files.pythonhosted.org/packages/ba/33/0ad65587441fc730dc7bd90e9716b30b4702dc7b617e6ba4997dc8651495/charset_normalizer-3.4.4-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:752944c7ffbfdd10c074dc58ec2d5a8a4cd9493b314d367c14d24c17684ddd14", size = 160779, upload-time = "2025-10-14T04:41:37.229Z" }, + { url = "https://files.pythonhosted.org/packages/67/ed/331d6b249259ee71ddea93f6f2f0a56cfebd46938bde6fcc6f7b9a3d0e09/charset_normalizer-3.4.4-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:d1f13550535ad8cff21b8d757a3257963e951d96e20ec82ab44bc64aeb62a191", size = 159035, upload-time = "2025-10-14T04:41:38.368Z" }, + { url = "https://files.pythonhosted.org/packages/67/ff/f6b948ca32e4f2a4576aa129d8bed61f2e0543bf9f5f2b7fc3758ed005c9/charset_normalizer-3.4.4-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ecaae4149d99b1c9e7b88bb03e3221956f68fd6d50be2ef061b2381b61d20838", size = 152542, upload-time = "2025-10-14T04:41:39.862Z" }, + { url = "https://files.pythonhosted.org/packages/16/85/276033dcbcc369eb176594de22728541a925b2632f9716428c851b149e83/charset_normalizer-3.4.4-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:cb6254dc36b47a990e59e1068afacdcd02958bdcce30bb50cc1700a8b9d624a6", size = 149524, upload-time = "2025-10-14T04:41:41.319Z" }, + { url = "https://files.pythonhosted.org/packages/9e/f2/6a2a1f722b6aba37050e626530a46a68f74e63683947a8acff92569f979a/charset_normalizer-3.4.4-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:c8ae8a0f02f57a6e61203a31428fa1d677cbe50c93622b4149d5c0f319c1d19e", size = 150395, upload-time = "2025-10-14T04:41:42.539Z" }, + { url = "https://files.pythonhosted.org/packages/60/bb/2186cb2f2bbaea6338cad15ce23a67f9b0672929744381e28b0592676824/charset_normalizer-3.4.4-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:47cc91b2f4dd2833fddaedd2893006b0106129d4b94fdb6af1f4ce5a9965577c", size = 143680, upload-time = "2025-10-14T04:41:43.661Z" }, + { url = "https://files.pythonhosted.org/packages/7d/a5/bf6f13b772fbb2a90360eb620d52ed8f796f3c5caee8398c3b2eb7b1c60d/charset_normalizer-3.4.4-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:82004af6c302b5d3ab2cfc4cc5f29db16123b1a8417f2e25f9066f91d4411090", size = 162045, upload-time = "2025-10-14T04:41:44.821Z" }, + { url = "https://files.pythonhosted.org/packages/df/c5/d1be898bf0dc3ef9030c3825e5d3b83f2c528d207d246cbabe245966808d/charset_normalizer-3.4.4-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:2b7d8f6c26245217bd2ad053761201e9f9680f8ce52f0fcd8d0755aeae5b2152", size = 149687, upload-time = "2025-10-14T04:41:46.442Z" }, + { url = "https://files.pythonhosted.org/packages/a5/42/90c1f7b9341eef50c8a1cb3f098ac43b0508413f33affd762855f67a410e/charset_normalizer-3.4.4-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:799a7a5e4fb2d5898c60b640fd4981d6a25f1c11790935a44ce38c54e985f828", size = 160014, upload-time = "2025-10-14T04:41:47.631Z" }, + { url = "https://files.pythonhosted.org/packages/76/be/4d3ee471e8145d12795ab655ece37baed0929462a86e72372fd25859047c/charset_normalizer-3.4.4-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:99ae2cffebb06e6c22bdc25801d7b30f503cc87dbd283479e7b606f70aff57ec", size = 154044, upload-time = "2025-10-14T04:41:48.81Z" }, + { url = "https://files.pythonhosted.org/packages/b0/6f/8f7af07237c34a1defe7defc565a9bc1807762f672c0fde711a4b22bf9c0/charset_normalizer-3.4.4-cp314-cp314-win32.whl", hash = "sha256:f9d332f8c2a2fcbffe1378594431458ddbef721c1769d78e2cbc06280d8155f9", size = 99940, upload-time = "2025-10-14T04:41:49.946Z" }, + { url = "https://files.pythonhosted.org/packages/4b/51/8ade005e5ca5b0d80fb4aff72a3775b325bdc3d27408c8113811a7cbe640/charset_normalizer-3.4.4-cp314-cp314-win_amd64.whl", hash = "sha256:8a6562c3700cce886c5be75ade4a5db4214fda19fede41d9792d100288d8f94c", size = 107104, upload-time = "2025-10-14T04:41:51.051Z" }, + { url = "https://files.pythonhosted.org/packages/da/5f/6b8f83a55bb8278772c5ae54a577f3099025f9ade59d0136ac24a0df4bde/charset_normalizer-3.4.4-cp314-cp314-win_arm64.whl", hash = "sha256:de00632ca48df9daf77a2c65a484531649261ec9f25489917f09e455cb09ddb2", size = 100743, upload-time = "2025-10-14T04:41:52.122Z" }, + { url = "https://files.pythonhosted.org/packages/0a/4c/925909008ed5a988ccbb72dcc897407e5d6d3bd72410d69e051fc0c14647/charset_normalizer-3.4.4-py3-none-any.whl", hash = "sha256:7a32c560861a02ff789ad905a2fe94e3f840803362c84fecf1851cb4cf3dc37f", size = 53402, upload-time = "2025-10-14T04:42:31.76Z" }, +] + +[[package]] +name = "click" +version = "8.3.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "colorama", marker = "sys_platform == 'win32'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/3d/fa/656b739db8587d7b5dfa22e22ed02566950fbfbcdc20311993483657a5c0/click-8.3.1.tar.gz", hash = "sha256:12ff4785d337a1bb490bb7e9c2b1ee5da3112e94a8622f26a6c77f5d2fc6842a", size = 295065, upload-time = "2025-11-15T20:45:42.706Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/98/78/01c019cdb5d6498122777c1a43056ebb3ebfeef2076d9d026bfe15583b2b/click-8.3.1-py3-none-any.whl", hash = "sha256:981153a64e25f12d547d3426c367a4857371575ee7ad18df2a6183ab0545b2a6", size = 108274, upload-time = "2025-11-15T20:45:41.139Z" }, +] + +[[package]] +name = "click-didyoumean" +version = "0.3.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "click" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/30/ce/217289b77c590ea1e7c24242d9ddd6e249e52c795ff10fac2c50062c48cb/click_didyoumean-0.3.1.tar.gz", hash = "sha256:4f82fdff0dbe64ef8ab2279bd6aa3f6a99c3b28c05aa09cbfc07c9d7fbb5a463", size = 3089, upload-time = "2024-03-24T08:22:07.499Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1b/5b/974430b5ffdb7a4f1941d13d83c64a0395114503cc357c6b9ae4ce5047ed/click_didyoumean-0.3.1-py3-none-any.whl", hash = "sha256:5c4bb6007cfea5f2fd6583a2fb6701a22a41eb98957e63d0fac41c10e7c3117c", size = 3631, upload-time = "2024-03-24T08:22:06.356Z" }, +] + +[[package]] +name = "click-plugins" +version = "1.1.1.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "click" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/c3/a4/34847b59150da33690a36da3681d6bbc2ec14ee9a846bc30a6746e5984e4/click_plugins-1.1.1.2.tar.gz", hash = "sha256:d7af3984a99d243c131aa1a828331e7630f4a88a9741fd05c927b204bcf92261", size = 8343, upload-time = "2025-06-25T00:47:37.555Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/3d/9a/2abecb28ae875e39c8cad711eb1186d8d14eab564705325e77e4e6ab9ae5/click_plugins-1.1.1.2-py2.py3-none-any.whl", hash = "sha256:008d65743833ffc1f5417bf0e78e8d2c23aab04d9745ba817bd3e71b0feb6aa6", size = 11051, upload-time = "2025-06-25T00:47:36.731Z" }, +] + +[[package]] +name = "click-repl" +version = "0.3.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "click" }, + { name = "prompt-toolkit" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/cb/a2/57f4ac79838cfae6912f997b4d1a64a858fb0c86d7fcaae6f7b58d267fca/click-repl-0.3.0.tar.gz", hash = "sha256:17849c23dba3d667247dc4defe1757fff98694e90fe37474f3feebb69ced26a9", size = 10449, upload-time = "2023-06-15T12:43:51.141Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/52/40/9d857001228658f0d59e97ebd4c346fe73e138c6de1bce61dc568a57c7f8/click_repl-0.3.0-py3-none-any.whl", hash = "sha256:fb7e06deb8da8de86180a33a9da97ac316751c094c6899382da7feeeeb51b812", size = 10289, upload-time = "2023-06-15T12:43:48.626Z" }, +] + +[[package]] +name = "colorama" +version = "0.4.6" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d8/53/6f443c9a4a8358a93a6792e2acffb9d9d5cb0a5cfd8802644b7b1c9a02e4/colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44", size = 27697, upload-time = "2022-10-25T02:36:22.414Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335, upload-time = "2022-10-25T02:36:20.889Z" }, +] + +[[package]] +name = "coverage" +version = "7.13.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/ad/49/349848445b0e53660e258acbcc9b0d014895b6739237920886672240f84b/coverage-7.13.2.tar.gz", hash = "sha256:044c6951ec37146b72a50cc81ef02217d27d4c3640efd2640311393cbbf143d3", size = 826523, upload-time = "2026-01-25T13:00:04.889Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/55/53/1da9e51a0775634b04fcc11eb25c002fc58ee4f92ce2e8512f94ac5fc5bf/coverage-7.13.2-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:387a825f43d680e7310e6f325b2167dd093bc8ffd933b83e9aa0983cf6e0a2ef", size = 219213, upload-time = "2026-01-25T12:59:11.909Z" }, + { url = "https://files.pythonhosted.org/packages/46/35/b3caac3ebbd10230fea5a33012b27d19e999a17c9285c4228b4b2e35b7da/coverage-7.13.2-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:f0d7fea9d8e5d778cd5a9e8fc38308ad688f02040e883cdc13311ef2748cb40f", size = 219549, upload-time = "2026-01-25T12:59:13.638Z" }, + { url = "https://files.pythonhosted.org/packages/76/9c/e1cf7def1bdc72c1907e60703983a588f9558434a2ff94615747bd73c192/coverage-7.13.2-cp314-cp314-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:e080afb413be106c95c4ee96b4fffdc9e2fa56a8bbf90b5c0918e5c4449412f5", size = 250586, upload-time = "2026-01-25T12:59:15.808Z" }, + { url = "https://files.pythonhosted.org/packages/ba/49/f54ec02ed12be66c8d8897270505759e057b0c68564a65c429ccdd1f139e/coverage-7.13.2-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:a7fc042ba3c7ce25b8a9f097eb0f32a5ce1ccdb639d9eec114e26def98e1f8a4", size = 253093, upload-time = "2026-01-25T12:59:17.491Z" }, + { url = "https://files.pythonhosted.org/packages/fb/5e/aaf86be3e181d907e23c0f61fccaeb38de8e6f6b47aed92bf57d8fc9c034/coverage-7.13.2-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d0ba505e021557f7f8173ee8cd6b926373d8653e5ff7581ae2efce1b11ef4c27", size = 254446, upload-time = "2026-01-25T12:59:19.752Z" }, + { url = "https://files.pythonhosted.org/packages/28/c8/a5fa01460e2d75b0c853b392080d6829d3ca8b5ab31e158fa0501bc7c708/coverage-7.13.2-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:7de326f80e3451bd5cc7239ab46c73ddb658fe0b7649476bc7413572d36cd548", size = 250615, upload-time = "2026-01-25T12:59:21.928Z" }, + { url = "https://files.pythonhosted.org/packages/86/0b/6d56315a55f7062bb66410732c24879ccb2ec527ab6630246de5fe45a1df/coverage-7.13.2-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:abaea04f1e7e34841d4a7b343904a3f59481f62f9df39e2cd399d69a187a9660", size = 252452, upload-time = "2026-01-25T12:59:23.592Z" }, + { url = "https://files.pythonhosted.org/packages/30/19/9bc550363ebc6b0ea121977ee44d05ecd1e8bf79018b8444f1028701c563/coverage-7.13.2-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:9f93959ee0c604bccd8e0697be21de0887b1f73efcc3aa73a3ec0fd13feace92", size = 250418, upload-time = "2026-01-25T12:59:25.392Z" }, + { url = "https://files.pythonhosted.org/packages/1f/53/580530a31ca2f0cc6f07a8f2ab5460785b02bb11bdf815d4c4d37a4c5169/coverage-7.13.2-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:13fe81ead04e34e105bf1b3c9f9cdf32ce31736ee5d90a8d2de02b9d3e1bcb82", size = 250231, upload-time = "2026-01-25T12:59:27.888Z" }, + { url = "https://files.pythonhosted.org/packages/e2/42/dd9093f919dc3088cb472893651884bd675e3df3d38a43f9053656dca9a2/coverage-7.13.2-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:d6d16b0f71120e365741bca2cb473ca6fe38930bc5431c5e850ba949f708f892", size = 251888, upload-time = "2026-01-25T12:59:29.636Z" }, + { url = "https://files.pythonhosted.org/packages/fa/a6/0af4053e6e819774626e133c3d6f70fae4d44884bfc4b126cb647baee8d3/coverage-7.13.2-cp314-cp314-win32.whl", hash = "sha256:9b2f4714bb7d99ba3790ee095b3b4ac94767e1347fe424278a0b10acb3ff04fe", size = 221968, upload-time = "2026-01-25T12:59:31.424Z" }, + { url = "https://files.pythonhosted.org/packages/c4/cc/5aff1e1f80d55862442855517bb8ad8ad3a68639441ff6287dde6a58558b/coverage-7.13.2-cp314-cp314-win_amd64.whl", hash = "sha256:e4121a90823a063d717a96e0a0529c727fb31ea889369a0ee3ec00ed99bf6859", size = 222783, upload-time = "2026-01-25T12:59:33.118Z" }, + { url = "https://files.pythonhosted.org/packages/de/20/09abafb24f84b3292cc658728803416c15b79f9ee5e68d25238a895b07d9/coverage-7.13.2-cp314-cp314-win_arm64.whl", hash = "sha256:6873f0271b4a15a33e7590f338d823f6f66f91ed147a03938d7ce26efd04eee6", size = 221348, upload-time = "2026-01-25T12:59:34.939Z" }, + { url = "https://files.pythonhosted.org/packages/b6/60/a3820c7232db63be060e4019017cd3426751c2699dab3c62819cdbcea387/coverage-7.13.2-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:f61d349f5b7cd95c34017f1927ee379bfbe9884300d74e07cf630ccf7a610c1b", size = 219950, upload-time = "2026-01-25T12:59:36.624Z" }, + { url = "https://files.pythonhosted.org/packages/fd/37/e4ef5975fdeb86b1e56db9a82f41b032e3d93a840ebaf4064f39e770d5c5/coverage-7.13.2-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:a43d34ce714f4ca674c0d90beb760eb05aad906f2c47580ccee9da8fe8bfb417", size = 220209, upload-time = "2026-01-25T12:59:38.339Z" }, + { url = "https://files.pythonhosted.org/packages/54/df/d40e091d00c51adca1e251d3b60a8b464112efa3004949e96a74d7c19a64/coverage-7.13.2-cp314-cp314t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:bff1b04cb9d4900ce5c56c4942f047dc7efe57e2608cb7c3c8936e9970ccdbee", size = 261576, upload-time = "2026-01-25T12:59:40.446Z" }, + { url = "https://files.pythonhosted.org/packages/c5/44/5259c4bed54e3392e5c176121af9f71919d96dde853386e7730e705f3520/coverage-7.13.2-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:6ae99e4560963ad8e163e819e5d77d413d331fd00566c1e0856aa252303552c1", size = 263704, upload-time = "2026-01-25T12:59:42.346Z" }, + { url = "https://files.pythonhosted.org/packages/16/bd/ae9f005827abcbe2c70157459ae86053971c9fa14617b63903abbdce26d9/coverage-7.13.2-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e79a8c7d461820257d9aa43716c4efc55366d7b292e46b5b37165be1d377405d", size = 266109, upload-time = "2026-01-25T12:59:44.073Z" }, + { url = "https://files.pythonhosted.org/packages/a2/c0/8e279c1c0f5b1eaa3ad9b0fb7a5637fc0379ea7d85a781c0fe0bb3cfc2ab/coverage-7.13.2-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:060ee84f6a769d40c492711911a76811b4befb6fba50abb450371abb720f5bd6", size = 260686, upload-time = "2026-01-25T12:59:45.804Z" }, + { url = "https://files.pythonhosted.org/packages/b2/47/3a8112627e9d863e7cddd72894171c929e94491a597811725befdcd76bce/coverage-7.13.2-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:3bca209d001fd03ea2d978f8a4985093240a355c93078aee3f799852c23f561a", size = 263568, upload-time = "2026-01-25T12:59:47.929Z" }, + { url = "https://files.pythonhosted.org/packages/92/bc/7ea367d84afa3120afc3ce6de294fd2dcd33b51e2e7fbe4bbfd200f2cb8c/coverage-7.13.2-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:6b8092aa38d72f091db61ef83cb66076f18f02da3e1a75039a4f218629600e04", size = 261174, upload-time = "2026-01-25T12:59:49.717Z" }, + { url = "https://files.pythonhosted.org/packages/33/b7/f1092dcecb6637e31cc2db099581ee5c61a17647849bae6b8261a2b78430/coverage-7.13.2-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:4a3158dc2dcce5200d91ec28cd315c999eebff355437d2765840555d765a6e5f", size = 260017, upload-time = "2026-01-25T12:59:51.463Z" }, + { url = "https://files.pythonhosted.org/packages/2b/cd/f3d07d4b95fbe1a2ef0958c15da614f7e4f557720132de34d2dc3aa7e911/coverage-7.13.2-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:3973f353b2d70bd9796cc12f532a05945232ccae966456c8ed7034cb96bbfd6f", size = 262337, upload-time = "2026-01-25T12:59:53.407Z" }, + { url = "https://files.pythonhosted.org/packages/e0/db/b0d5b2873a07cb1e06a55d998697c0a5a540dcefbf353774c99eb3874513/coverage-7.13.2-cp314-cp314t-win32.whl", hash = "sha256:79f6506a678a59d4ded048dc72f1859ebede8ec2b9a2d509ebe161f01c2879d3", size = 222749, upload-time = "2026-01-25T12:59:56.316Z" }, + { url = "https://files.pythonhosted.org/packages/e5/2f/838a5394c082ac57d85f57f6aba53093b30d9089781df72412126505716f/coverage-7.13.2-cp314-cp314t-win_amd64.whl", hash = "sha256:196bfeabdccc5a020a57d5a368c681e3a6ceb0447d153aeccc1ab4d70a5032ba", size = 223857, upload-time = "2026-01-25T12:59:58.201Z" }, + { url = "https://files.pythonhosted.org/packages/44/d4/b608243e76ead3a4298824b50922b89ef793e50069ce30316a65c1b4d7ef/coverage-7.13.2-cp314-cp314t-win_arm64.whl", hash = "sha256:69269ab58783e090bfbf5b916ab3d188126e22d6070bbfc93098fdd474ef937c", size = 221881, upload-time = "2026-01-25T13:00:00.449Z" }, + { url = "https://files.pythonhosted.org/packages/d2/db/d291e30fdf7ea617a335531e72294e0c723356d7fdde8fba00610a76bda9/coverage-7.13.2-py3-none-any.whl", hash = "sha256:40ce1ea1e25125556d8e76bd0b61500839a07944cc287ac21d5626f3e620cad5", size = 210943, upload-time = "2026-01-25T13:00:02.388Z" }, +] + +[[package]] +name = "cryptography" +version = "46.0.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "cffi", marker = "platform_python_implementation != 'PyPy'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/9f/33/c00162f49c0e2fe8064a62cb92b93e50c74a72bc370ab92f86112b33ff62/cryptography-46.0.3.tar.gz", hash = "sha256:a8b17438104fed022ce745b362294d9ce35b4c2e45c1d958ad4a4b019285f4a1", size = 749258, upload-time = "2025-10-15T23:18:31.74Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1d/42/9c391dd801d6cf0d561b5890549d4b27bafcc53b39c31a817e69d87c625b/cryptography-46.0.3-cp311-abi3-macosx_10_9_universal2.whl", hash = "sha256:109d4ddfadf17e8e7779c39f9b18111a09efb969a301a31e987416a0191ed93a", size = 7225004, upload-time = "2025-10-15T23:16:52.239Z" }, + { url = "https://files.pythonhosted.org/packages/1c/67/38769ca6b65f07461eb200e85fc1639b438bdc667be02cf7f2cd6a64601c/cryptography-46.0.3-cp311-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:09859af8466b69bc3c27bdf4f5d84a665e0f7ab5088412e9e2ec49758eca5cbc", size = 4296667, upload-time = "2025-10-15T23:16:54.369Z" }, + { url = "https://files.pythonhosted.org/packages/5c/49/498c86566a1d80e978b42f0d702795f69887005548c041636df6ae1ca64c/cryptography-46.0.3-cp311-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:01ca9ff2885f3acc98c29f1860552e37f6d7c7d013d7334ff2a9de43a449315d", size = 4450807, upload-time = "2025-10-15T23:16:56.414Z" }, + { url = "https://files.pythonhosted.org/packages/4b/0a/863a3604112174c8624a2ac3c038662d9e59970c7f926acdcfaed8d61142/cryptography-46.0.3-cp311-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:6eae65d4c3d33da080cff9c4ab1f711b15c1d9760809dad6ea763f3812d254cb", size = 4299615, upload-time = "2025-10-15T23:16:58.442Z" }, + { url = "https://files.pythonhosted.org/packages/64/02/b73a533f6b64a69f3cd3872acb6ebc12aef924d8d103133bb3ea750dc703/cryptography-46.0.3-cp311-abi3-manylinux_2_28_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:e5bf0ed4490068a2e72ac03d786693adeb909981cc596425d09032d372bcc849", size = 4016800, upload-time = "2025-10-15T23:17:00.378Z" }, + { url = "https://files.pythonhosted.org/packages/25/d5/16e41afbfa450cde85a3b7ec599bebefaef16b5c6ba4ec49a3532336ed72/cryptography-46.0.3-cp311-abi3-manylinux_2_28_ppc64le.whl", hash = "sha256:5ecfccd2329e37e9b7112a888e76d9feca2347f12f37918facbb893d7bb88ee8", size = 4984707, upload-time = "2025-10-15T23:17:01.98Z" }, + { url = "https://files.pythonhosted.org/packages/c9/56/e7e69b427c3878352c2fb9b450bd0e19ed552753491d39d7d0a2f5226d41/cryptography-46.0.3-cp311-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:a2c0cd47381a3229c403062f764160d57d4d175e022c1df84e168c6251a22eec", size = 4482541, upload-time = "2025-10-15T23:17:04.078Z" }, + { url = "https://files.pythonhosted.org/packages/78/f6/50736d40d97e8483172f1bb6e698895b92a223dba513b0ca6f06b2365339/cryptography-46.0.3-cp311-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:549e234ff32571b1f4076ac269fcce7a808d3bf98b76c8dd560e42dbc66d7d91", size = 4299464, upload-time = "2025-10-15T23:17:05.483Z" }, + { url = "https://files.pythonhosted.org/packages/00/de/d8e26b1a855f19d9994a19c702fa2e93b0456beccbcfe437eda00e0701f2/cryptography-46.0.3-cp311-abi3-manylinux_2_34_ppc64le.whl", hash = "sha256:c0a7bb1a68a5d3471880e264621346c48665b3bf1c3759d682fc0864c540bd9e", size = 4950838, upload-time = "2025-10-15T23:17:07.425Z" }, + { url = "https://files.pythonhosted.org/packages/8f/29/798fc4ec461a1c9e9f735f2fc58741b0daae30688f41b2497dcbc9ed1355/cryptography-46.0.3-cp311-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:10b01676fc208c3e6feeb25a8b83d81767e8059e1fe86e1dc62d10a3018fa926", size = 4481596, upload-time = "2025-10-15T23:17:09.343Z" }, + { url = "https://files.pythonhosted.org/packages/15/8d/03cd48b20a573adfff7652b76271078e3045b9f49387920e7f1f631d125e/cryptography-46.0.3-cp311-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:0abf1ffd6e57c67e92af68330d05760b7b7efb243aab8377e583284dbab72c71", size = 4426782, upload-time = "2025-10-15T23:17:11.22Z" }, + { url = "https://files.pythonhosted.org/packages/fa/b1/ebacbfe53317d55cf33165bda24c86523497a6881f339f9aae5c2e13e57b/cryptography-46.0.3-cp311-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:a04bee9ab6a4da801eb9b51f1b708a1b5b5c9eb48c03f74198464c66f0d344ac", size = 4698381, upload-time = "2025-10-15T23:17:12.829Z" }, + { url = "https://files.pythonhosted.org/packages/96/92/8a6a9525893325fc057a01f654d7efc2c64b9de90413adcf605a85744ff4/cryptography-46.0.3-cp311-abi3-win32.whl", hash = "sha256:f260d0d41e9b4da1ed1e0f1ce571f97fe370b152ab18778e9e8f67d6af432018", size = 3055988, upload-time = "2025-10-15T23:17:14.65Z" }, + { url = "https://files.pythonhosted.org/packages/7e/bf/80fbf45253ea585a1e492a6a17efcb93467701fa79e71550a430c5e60df0/cryptography-46.0.3-cp311-abi3-win_amd64.whl", hash = "sha256:a9a3008438615669153eb86b26b61e09993921ebdd75385ddd748702c5adfddb", size = 3514451, upload-time = "2025-10-15T23:17:16.142Z" }, + { url = "https://files.pythonhosted.org/packages/2e/af/9b302da4c87b0beb9db4e756386a7c6c5b8003cd0e742277888d352ae91d/cryptography-46.0.3-cp311-abi3-win_arm64.whl", hash = "sha256:5d7f93296ee28f68447397bf5198428c9aeeab45705a55d53a6343455dcb2c3c", size = 2928007, upload-time = "2025-10-15T23:17:18.04Z" }, + { url = "https://files.pythonhosted.org/packages/f5/e2/a510aa736755bffa9d2f75029c229111a1d02f8ecd5de03078f4c18d91a3/cryptography-46.0.3-cp314-cp314t-macosx_10_9_universal2.whl", hash = "sha256:00a5e7e87938e5ff9ff5447ab086a5706a957137e6e433841e9d24f38a065217", size = 7158012, upload-time = "2025-10-15T23:17:19.982Z" }, + { url = "https://files.pythonhosted.org/packages/73/dc/9aa866fbdbb95b02e7f9d086f1fccfeebf8953509b87e3f28fff927ff8a0/cryptography-46.0.3-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:c8daeb2d2174beb4575b77482320303f3d39b8e81153da4f0fb08eb5fe86a6c5", size = 4288728, upload-time = "2025-10-15T23:17:21.527Z" }, + { url = "https://files.pythonhosted.org/packages/c5/fd/bc1daf8230eaa075184cbbf5f8cd00ba9db4fd32d63fb83da4671b72ed8a/cryptography-46.0.3-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:39b6755623145ad5eff1dab323f4eae2a32a77a7abef2c5089a04a3d04366715", size = 4435078, upload-time = "2025-10-15T23:17:23.042Z" }, + { url = "https://files.pythonhosted.org/packages/82/98/d3bd5407ce4c60017f8ff9e63ffee4200ab3e23fe05b765cab805a7db008/cryptography-46.0.3-cp314-cp314t-manylinux_2_28_aarch64.whl", hash = "sha256:db391fa7c66df6762ee3f00c95a89e6d428f4d60e7abc8328f4fe155b5ac6e54", size = 4293460, upload-time = "2025-10-15T23:17:24.885Z" }, + { url = "https://files.pythonhosted.org/packages/26/e9/e23e7900983c2b8af7a08098db406cf989d7f09caea7897e347598d4cd5b/cryptography-46.0.3-cp314-cp314t-manylinux_2_28_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:78a97cf6a8839a48c49271cdcbd5cf37ca2c1d6b7fdd86cc864f302b5e9bf459", size = 3995237, upload-time = "2025-10-15T23:17:26.449Z" }, + { url = "https://files.pythonhosted.org/packages/91/15/af68c509d4a138cfe299d0d7ddb14afba15233223ebd933b4bbdbc7155d3/cryptography-46.0.3-cp314-cp314t-manylinux_2_28_ppc64le.whl", hash = "sha256:dfb781ff7eaa91a6f7fd41776ec37c5853c795d3b358d4896fdbb5df168af422", size = 4967344, upload-time = "2025-10-15T23:17:28.06Z" }, + { url = "https://files.pythonhosted.org/packages/ca/e3/8643d077c53868b681af077edf6b3cb58288b5423610f21c62aadcbe99f4/cryptography-46.0.3-cp314-cp314t-manylinux_2_28_x86_64.whl", hash = "sha256:6f61efb26e76c45c4a227835ddeae96d83624fb0d29eb5df5b96e14ed1a0afb7", size = 4466564, upload-time = "2025-10-15T23:17:29.665Z" }, + { url = "https://files.pythonhosted.org/packages/0e/43/c1e8726fa59c236ff477ff2b5dc071e54b21e5a1e51aa2cee1676f1c986f/cryptography-46.0.3-cp314-cp314t-manylinux_2_34_aarch64.whl", hash = "sha256:23b1a8f26e43f47ceb6d6a43115f33a5a37d57df4ea0ca295b780ae8546e8044", size = 4292415, upload-time = "2025-10-15T23:17:31.686Z" }, + { url = "https://files.pythonhosted.org/packages/42/f9/2f8fefdb1aee8a8e3256a0568cffc4e6d517b256a2fe97a029b3f1b9fe7e/cryptography-46.0.3-cp314-cp314t-manylinux_2_34_ppc64le.whl", hash = "sha256:b419ae593c86b87014b9be7396b385491ad7f320bde96826d0dd174459e54665", size = 4931457, upload-time = "2025-10-15T23:17:33.478Z" }, + { url = "https://files.pythonhosted.org/packages/79/30/9b54127a9a778ccd6d27c3da7563e9f2d341826075ceab89ae3b41bf5be2/cryptography-46.0.3-cp314-cp314t-manylinux_2_34_x86_64.whl", hash = "sha256:50fc3343ac490c6b08c0cf0d704e881d0d660be923fd3076db3e932007e726e3", size = 4466074, upload-time = "2025-10-15T23:17:35.158Z" }, + { url = "https://files.pythonhosted.org/packages/ac/68/b4f4a10928e26c941b1b6a179143af9f4d27d88fe84a6a3c53592d2e76bf/cryptography-46.0.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:22d7e97932f511d6b0b04f2bfd818d73dcd5928db509460aaf48384778eb6d20", size = 4420569, upload-time = "2025-10-15T23:17:37.188Z" }, + { url = "https://files.pythonhosted.org/packages/a3/49/3746dab4c0d1979888f125226357d3262a6dd40e114ac29e3d2abdf1ec55/cryptography-46.0.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:d55f3dffadd674514ad19451161118fd010988540cee43d8bc20675e775925de", size = 4681941, upload-time = "2025-10-15T23:17:39.236Z" }, + { url = "https://files.pythonhosted.org/packages/fd/30/27654c1dbaf7e4a3531fa1fc77986d04aefa4d6d78259a62c9dc13d7ad36/cryptography-46.0.3-cp314-cp314t-win32.whl", hash = "sha256:8a6e050cb6164d3f830453754094c086ff2d0b2f3a897a1d9820f6139a1f0914", size = 3022339, upload-time = "2025-10-15T23:17:40.888Z" }, + { url = "https://files.pythonhosted.org/packages/f6/30/640f34ccd4d2a1bc88367b54b926b781b5a018d65f404d409aba76a84b1c/cryptography-46.0.3-cp314-cp314t-win_amd64.whl", hash = "sha256:760f83faa07f8b64e9c33fc963d790a2edb24efb479e3520c14a45741cd9b2db", size = 3494315, upload-time = "2025-10-15T23:17:42.769Z" }, + { url = "https://files.pythonhosted.org/packages/ba/8b/88cc7e3bd0a8e7b861f26981f7b820e1f46aa9d26cc482d0feba0ecb4919/cryptography-46.0.3-cp314-cp314t-win_arm64.whl", hash = "sha256:516ea134e703e9fe26bcd1277a4b59ad30586ea90c365a87781d7887a646fe21", size = 2919331, upload-time = "2025-10-15T23:17:44.468Z" }, + { url = "https://files.pythonhosted.org/packages/fd/23/45fe7f376a7df8daf6da3556603b36f53475a99ce4faacb6ba2cf3d82021/cryptography-46.0.3-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:cb3d760a6117f621261d662bccc8ef5bc32ca673e037c83fbe565324f5c46936", size = 7218248, upload-time = "2025-10-15T23:17:46.294Z" }, + { url = "https://files.pythonhosted.org/packages/27/32/b68d27471372737054cbd34c84981f9edbc24fe67ca225d389799614e27f/cryptography-46.0.3-cp38-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:4b7387121ac7d15e550f5cb4a43aef2559ed759c35df7336c402bb8275ac9683", size = 4294089, upload-time = "2025-10-15T23:17:48.269Z" }, + { url = "https://files.pythonhosted.org/packages/26/42/fa8389d4478368743e24e61eea78846a0006caffaf72ea24a15159215a14/cryptography-46.0.3-cp38-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:15ab9b093e8f09daab0f2159bb7e47532596075139dd74365da52ecc9cb46c5d", size = 4440029, upload-time = "2025-10-15T23:17:49.837Z" }, + { url = "https://files.pythonhosted.org/packages/5f/eb/f483db0ec5ac040824f269e93dd2bd8a21ecd1027e77ad7bdf6914f2fd80/cryptography-46.0.3-cp38-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:46acf53b40ea38f9c6c229599a4a13f0d46a6c3fa9ef19fc1a124d62e338dfa0", size = 4297222, upload-time = "2025-10-15T23:17:51.357Z" }, + { url = "https://files.pythonhosted.org/packages/fd/cf/da9502c4e1912cb1da3807ea3618a6829bee8207456fbbeebc361ec38ba3/cryptography-46.0.3-cp38-abi3-manylinux_2_28_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:10ca84c4668d066a9878890047f03546f3ae0a6b8b39b697457b7757aaf18dbc", size = 4012280, upload-time = "2025-10-15T23:17:52.964Z" }, + { url = "https://files.pythonhosted.org/packages/6b/8f/9adb86b93330e0df8b3dcf03eae67c33ba89958fc2e03862ef1ac2b42465/cryptography-46.0.3-cp38-abi3-manylinux_2_28_ppc64le.whl", hash = "sha256:36e627112085bb3b81b19fed209c05ce2a52ee8b15d161b7c643a7d5a88491f3", size = 4978958, upload-time = "2025-10-15T23:17:54.965Z" }, + { url = "https://files.pythonhosted.org/packages/d1/a0/5fa77988289c34bdb9f913f5606ecc9ada1adb5ae870bd0d1054a7021cc4/cryptography-46.0.3-cp38-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:1000713389b75c449a6e979ffc7dcc8ac90b437048766cef052d4d30b8220971", size = 4473714, upload-time = "2025-10-15T23:17:56.754Z" }, + { url = "https://files.pythonhosted.org/packages/14/e5/fc82d72a58d41c393697aa18c9abe5ae1214ff6f2a5c18ac470f92777895/cryptography-46.0.3-cp38-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:b02cf04496f6576afffef5ddd04a0cb7d49cf6be16a9059d793a30b035f6b6ac", size = 4296970, upload-time = "2025-10-15T23:17:58.588Z" }, + { url = "https://files.pythonhosted.org/packages/78/06/5663ed35438d0b09056973994f1aec467492b33bd31da36e468b01ec1097/cryptography-46.0.3-cp38-abi3-manylinux_2_34_ppc64le.whl", hash = "sha256:71e842ec9bc7abf543b47cf86b9a743baa95f4677d22baa4c7d5c69e49e9bc04", size = 4940236, upload-time = "2025-10-15T23:18:00.897Z" }, + { url = "https://files.pythonhosted.org/packages/fc/59/873633f3f2dcd8a053b8dd1d38f783043b5fce589c0f6988bf55ef57e43e/cryptography-46.0.3-cp38-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:402b58fc32614f00980b66d6e56a5b4118e6cb362ae8f3fda141ba4689bd4506", size = 4472642, upload-time = "2025-10-15T23:18:02.749Z" }, + { url = "https://files.pythonhosted.org/packages/3d/39/8e71f3930e40f6877737d6f69248cf74d4e34b886a3967d32f919cc50d3b/cryptography-46.0.3-cp38-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:ef639cb3372f69ec44915fafcd6698b6cc78fbe0c2ea41be867f6ed612811963", size = 4423126, upload-time = "2025-10-15T23:18:04.85Z" }, + { url = "https://files.pythonhosted.org/packages/cd/c7/f65027c2810e14c3e7268353b1681932b87e5a48e65505d8cc17c99e36ae/cryptography-46.0.3-cp38-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:3b51b8ca4f1c6453d8829e1eb7299499ca7f313900dd4d89a24b8b87c0a780d4", size = 4686573, upload-time = "2025-10-15T23:18:06.908Z" }, + { url = "https://files.pythonhosted.org/packages/0a/6e/1c8331ddf91ca4730ab3086a0f1be19c65510a33b5a441cb334e7a2d2560/cryptography-46.0.3-cp38-abi3-win32.whl", hash = "sha256:6276eb85ef938dc035d59b87c8a7dc559a232f954962520137529d77b18ff1df", size = 3036695, upload-time = "2025-10-15T23:18:08.672Z" }, + { url = "https://files.pythonhosted.org/packages/90/45/b0d691df20633eff80955a0fc7695ff9051ffce8b69741444bd9ed7bd0db/cryptography-46.0.3-cp38-abi3-win_amd64.whl", hash = "sha256:416260257577718c05135c55958b674000baef9a1c7d9e8f306ec60d71db850f", size = 3501720, upload-time = "2025-10-15T23:18:10.632Z" }, + { url = "https://files.pythonhosted.org/packages/e8/cb/2da4cc83f5edb9c3257d09e1e7ab7b23f049c7962cae8d842bbef0a9cec9/cryptography-46.0.3-cp38-abi3-win_arm64.whl", hash = "sha256:d89c3468de4cdc4f08a57e214384d0471911a3830fcdaf7a8cc587e42a866372", size = 2918740, upload-time = "2025-10-15T23:18:12.277Z" }, +] + +[[package]] +name = "defusedxml" +version = "0.7.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/0f/d5/c66da9b79e5bdb124974bfe172b4daf3c984ebd9c2a06e2b8a4dc7331c72/defusedxml-0.7.1.tar.gz", hash = "sha256:1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69", size = 75520, upload-time = "2021-03-08T10:59:26.269Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/07/6c/aa3f2f849e01cb6a001cd8554a88d4c77c5c1a31c95bdf1cf9301e6d9ef4/defusedxml-0.7.1-py2.py3-none-any.whl", hash = "sha256:a352e7e428770286cc899e2542b6cdaedb2b4953ff269a210103ec58f6198a61", size = 25604, upload-time = "2021-03-08T10:59:24.45Z" }, +] + +[[package]] +name = "django" +version = "6.0.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "asgiref" }, + { name = "sqlparse" }, + { name = "tzdata", marker = "sys_platform == 'win32'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/b5/9b/016f7e55e855ee738a352b05139d4f8b278d0b451bd01ebef07456ef3b0e/django-6.0.1.tar.gz", hash = "sha256:ed76a7af4da21551573b3d9dfc1f53e20dd2e6c7d70a3adc93eedb6338130a5f", size = 11069565, upload-time = "2026-01-06T18:55:53.069Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/95/b5/814ed98bd21235c116fd3436a7ed44d47560329a6d694ec8aac2982dbb93/django-6.0.1-py3-none-any.whl", hash = "sha256:a92a4ff14f664a896f9849009cb8afaca7abe0d6fc53325f3d1895a15253433d", size = 8338791, upload-time = "2026-01-06T18:55:46.175Z" }, +] + +[[package]] +name = "django-allauth" +version = "65.14.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "asgiref" }, + { name = "django" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/23/9b/061a6ac65c602eb721b13fbf9c665b20fb900f113a03ec8521b5fcf16b83/django_allauth-65.14.0.tar.gz", hash = "sha256:5529227aba2b1377d900e9274a3f24496c645e65400fbae3cad5789944bc4d0b", size = 1991909, upload-time = "2026-01-17T18:43:12.928Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ce/c8/2f959ff8466913d95ba72eb4a29bd7998d28a559786033a97b5bbdda2b81/django_allauth-65.14.0-py3-none-any.whl", hash = "sha256:448f5f7877f95fcbe1657256510fe7822d7871f202521a29e23ef937f3325a97", size = 1793052, upload-time = "2026-01-17T18:43:08.954Z" }, +] + +[package.optional-dependencies] +socialaccount = [ + { name = "oauthlib" }, + { name = "pyjwt", extra = ["crypto"] }, + { name = "requests" }, +] + +[[package]] +name = "django-storages" +version = "1.14.6" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "django" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/ff/d6/2e50e378fff0408d558f36c4acffc090f9a641fd6e084af9e54d45307efa/django_storages-1.14.6.tar.gz", hash = "sha256:7a25ce8f4214f69ac9c7ce87e2603887f7ae99326c316bc8d2d75375e09341c9", size = 87587, upload-time = "2025-04-02T02:34:55.103Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1f/21/3cedee63417bc5553eed0c204be478071c9ab208e5e259e97287590194f1/django_storages-1.14.6-py3-none-any.whl", hash = "sha256:11b7b6200e1cb5ffcd9962bd3673a39c7d6a6109e8096f0e03d46fab3d3aabd9", size = 33095, upload-time = "2025-04-02T02:34:53.291Z" }, +] + +[[package]] +name = "djangorestframework" +version = "3.16.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "django" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/8a/95/5376fe618646fde6899b3cdc85fd959716bb67542e273a76a80d9f326f27/djangorestframework-3.16.1.tar.gz", hash = "sha256:166809528b1aced0a17dc66c24492af18049f2c9420dbd0be29422029cfc3ff7", size = 1089735, upload-time = "2025-08-06T17:50:53.251Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b0/ce/bf8b9d3f415be4ac5588545b5fcdbbb841977db1c1d923f7568eeabe1689/djangorestframework-3.16.1-py3-none-any.whl", hash = "sha256:33a59f47fb9c85ede792cbf88bde71893bcda0667bc573f784649521f1102cec", size = 1080442, upload-time = "2025-08-06T17:50:50.667Z" }, +] + +[[package]] +name = "execnet" +version = "2.1.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/bf/89/780e11f9588d9e7128a3f87788354c7946a9cbb1401ad38a48c4db9a4f07/execnet-2.1.2.tar.gz", hash = "sha256:63d83bfdd9a23e35b9c6a3261412324f964c2ec8dcd8d3c6916ee9373e0befcd", size = 166622, upload-time = "2025-11-12T09:56:37.75Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ab/84/02fc1827e8cdded4aa65baef11296a9bbe595c474f0d6d758af082d849fd/execnet-2.1.2-py3-none-any.whl", hash = "sha256:67fba928dd5a544b783f6056f449e5e3931a5c378b128bc18501f7ea79e296ec", size = 40708, upload-time = "2025-11-12T09:56:36.333Z" }, +] + +[[package]] +name = "factory-boy" +version = "3.3.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "faker" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/ba/98/75cacae9945f67cfe323829fc2ac451f64517a8a330b572a06a323997065/factory_boy-3.3.3.tar.gz", hash = "sha256:866862d226128dfac7f2b4160287e899daf54f2612778327dd03d0e2cb1e3d03", size = 164146, upload-time = "2025-02-03T09:49:04.433Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/27/8d/2bc5f5546ff2ccb3f7de06742853483ab75bf74f36a92254702f8baecc79/factory_boy-3.3.3-py2.py3-none-any.whl", hash = "sha256:1c39e3289f7e667c4285433f305f8d506efc2fe9c73aaea4151ebd5cdea394fc", size = 37036, upload-time = "2025-02-03T09:49:01.659Z" }, +] + +[[package]] +name = "faker" +version = "40.1.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "tzdata", marker = "sys_platform == 'win32'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/5e/77/1c3ff07b6739b9a1d23ca01ec0a90a309a33b78e345a3eb52f9ce9240e36/faker-40.1.2.tar.gz", hash = "sha256:b76a68163aa5f171d260fc24827a8349bc1db672f6a665359e8d0095e8135d30", size = 1949802, upload-time = "2026-01-13T20:51:49.917Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/46/ec/91a434c8a53d40c3598966621dea9c50512bec6ce8e76fa1751015e74cef/faker-40.1.2-py3-none-any.whl", hash = "sha256:93503165c165d330260e4379fd6dc07c94da90c611ed3191a0174d2ab9966a42", size = 1985633, upload-time = "2026-01-13T20:51:47.982Z" }, +] + +[[package]] +name = "flower" +version = "2.0.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "celery" }, + { name = "humanize" }, + { name = "prometheus-client" }, + { name = "pytz" }, + { name = "tornado" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/09/a1/357f1b5d8946deafdcfdd604f51baae9de10aafa2908d0b7322597155f92/flower-2.0.1.tar.gz", hash = "sha256:5ab717b979530770c16afb48b50d2a98d23c3e9fe39851dcf6bc4d01845a02a0", size = 3220408, upload-time = "2023-08-13T14:37:46.073Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a6/ff/ee2f67c0ff146ec98b5df1df637b2bc2d17beeb05df9f427a67bd7a7d79c/flower-2.0.1-py2.py3-none-any.whl", hash = "sha256:9db2c621eeefbc844c8dd88be64aef61e84e2deb29b271e02ab2b5b9f01068e2", size = 383553, upload-time = "2023-08-13T14:37:41.552Z" }, +] + +[[package]] +name = "gallery" +version = "0.1.0" +source = { virtual = "." } +dependencies = [ + { name = "boto3" }, + { name = "celery" }, + { name = "django" }, + { name = "django-allauth", extra = ["socialaccount"] }, + { name = "django-storages" }, + { name = "djangorestframework" }, + { name = "flower" }, + { name = "gunicorn" }, + { name = "pillow" }, + { name = "psycopg2-binary" }, + { name = "pyjwt" }, + { name = "python-dotenv" }, + { name = "python3-openid" }, + { name = "python3-saml" }, + { name = "pyyaml" }, + { name = "redis" }, + { name = "requests" }, + { name = "requests-oauthlib" }, +] + +[package.optional-dependencies] +dev = [ + { name = "factory-boy" }, + { name = "faker" }, + { name = "pytest" }, + { name = "pytest-cov" }, + { name = "pytest-django" }, + { name = "pytest-xdist" }, +] + +[package.metadata] +requires-dist = [ + { name = "boto3", specifier = ">=1.34.0" }, + { name = "celery", specifier = ">=5.3.0" }, + { name = "django", specifier = ">=5.0.0" }, + { name = "django-allauth", specifier = ">=0.57.0" }, + { name = "django-allauth", extras = ["socialaccount"], specifier = ">=0.57.0" }, + { name = "django-storages", specifier = ">=1.14.2" }, + { name = "djangorestframework", specifier = ">=3.14.0" }, + { name = "factory-boy", marker = "extra == 'dev'", specifier = ">=3.3.0" }, + { name = "faker", marker = "extra == 'dev'", specifier = ">=22.0.0" }, + { name = "flower", specifier = ">=2.0.0" }, + { name = "gunicorn", specifier = ">=21.2.0" }, + { name = "pillow", specifier = ">=10.2.0" }, + { name = "psycopg2-binary", specifier = ">=2.9.9" }, + { name = "pyjwt", specifier = "==2.10.1" }, + { name = "pytest", marker = "extra == 'dev'", specifier = ">=8.0.0" }, + { name = "pytest-cov", marker = "extra == 'dev'", specifier = ">=4.1.0" }, + { name = "pytest-django", marker = "extra == 'dev'", specifier = ">=4.8.0" }, + { name = "pytest-xdist", marker = "extra == 'dev'", specifier = ">=3.5.0" }, + { name = "python-dotenv", specifier = ">=1.0.0" }, + { name = "python3-openid", specifier = "==3.2.0" }, + { name = "python3-saml", specifier = "==1.16.0" }, + { name = "pyyaml", specifier = ">=6.0.0" }, + { name = "redis", specifier = ">=5.0.0" }, + { name = "requests", specifier = "==2.32.5" }, + { name = "requests-oauthlib", specifier = "==2.0.0" }, +] +provides-extras = ["dev"] + +[[package]] +name = "gunicorn" +version = "24.1.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "packaging" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/78/0a/10739c03537ec5b131a867bf94df2e412b437696c7e5d26970e2198a80d2/gunicorn-24.1.1.tar.gz", hash = "sha256:f006d110e5cb3102859b4f5cd48335dbd9cc28d0d27cd24ddbdafa6c60929408", size = 287567, upload-time = "2026-01-24T01:15:31.359Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/96/90/cfe637677916fc6f53cd2b05d5746e249f683e1fa14c9e745a88c66f7290/gunicorn-24.1.1-py3-none-any.whl", hash = "sha256:757f6b621fc4f7581a90600b2cd9df593461f06a41d7259cb9b94499dc4095a8", size = 114920, upload-time = "2026-01-24T01:15:29.656Z" }, +] + +[[package]] +name = "humanize" +version = "4.15.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/ba/66/a3921783d54be8a6870ac4ccffcd15c4dc0dd7fcce51c6d63b8c63935276/humanize-4.15.0.tar.gz", hash = "sha256:1dd098483eb1c7ee8e32eb2e99ad1910baefa4b75c3aff3a82f4d78688993b10", size = 83599, upload-time = "2025-12-20T20:16:13.19Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c5/7b/bca5613a0c3b542420cf92bd5e5fb8ebd5435ce1011a091f66bb7693285e/humanize-4.15.0-py3-none-any.whl", hash = "sha256:b1186eb9f5a9749cd9cb8565aee77919dd7c8d076161cf44d70e59e3301e1769", size = 132203, upload-time = "2025-12-20T20:16:11.67Z" }, +] + +[[package]] +name = "idna" +version = "3.11" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/6f/6d/0703ccc57f3a7233505399edb88de3cbd678da106337b9fcde432b65ed60/idna-3.11.tar.gz", hash = "sha256:795dafcc9c04ed0c1fb032c2aa73654d8e8c5023a7df64a53f39190ada629902", size = 194582, upload-time = "2025-10-12T14:55:20.501Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/0e/61/66938bbb5fc52dbdf84594873d5b51fb1f7c7794e9c0f5bd885f30bc507b/idna-3.11-py3-none-any.whl", hash = "sha256:771a87f49d9defaf64091e6e6fe9c18d4833f140bd19464795bc32d966ca37ea", size = 71008, upload-time = "2025-10-12T14:55:18.883Z" }, +] + +[[package]] +name = "iniconfig" +version = "2.3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/72/34/14ca021ce8e5dfedc35312d08ba8bf51fdd999c576889fc2c24cb97f4f10/iniconfig-2.3.0.tar.gz", hash = "sha256:c76315c77db068650d49c5b56314774a7804df16fee4402c1f19d6d15d8c4730", size = 20503, upload-time = "2025-10-18T21:55:43.219Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/cb/b1/3846dd7f199d53cb17f49cba7e651e9ce294d8497c8c150530ed11865bb8/iniconfig-2.3.0-py3-none-any.whl", hash = "sha256:f631c04d2c48c52b84d0d0549c99ff3859c98df65b3101406327ecc7d53fbf12", size = 7484, upload-time = "2025-10-18T21:55:41.639Z" }, +] + +[[package]] +name = "isodate" +version = "0.7.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/54/4d/e940025e2ce31a8ce1202635910747e5a87cc3a6a6bb2d00973375014749/isodate-0.7.2.tar.gz", hash = "sha256:4cd1aa0f43ca76f4a6c6c0292a85f40b35ec2e43e315b59f06e6d32171a953e6", size = 29705, upload-time = "2024-10-08T23:04:11.5Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/15/aa/0aca39a37d3c7eb941ba736ede56d689e7be91cab5d9ca846bde3999eba6/isodate-0.7.2-py3-none-any.whl", hash = "sha256:28009937d8031054830160fce6d409ed342816b543597cece116d966c6d99e15", size = 22320, upload-time = "2024-10-08T23:04:09.501Z" }, +] + +[[package]] +name = "jmespath" +version = "1.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d3/59/322338183ecda247fb5d1763a6cbe46eff7222eaeebafd9fa65d4bf5cb11/jmespath-1.1.0.tar.gz", hash = "sha256:472c87d80f36026ae83c6ddd0f1d05d4e510134ed462851fd5f754c8c3cbb88d", size = 27377, upload-time = "2026-01-22T16:35:26.279Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/14/2f/967ba146e6d58cf6a652da73885f52fc68001525b4197effc174321d70b4/jmespath-1.1.0-py3-none-any.whl", hash = "sha256:a5663118de4908c91729bea0acadca56526eb2698e83de10cd116ae0f4e97c64", size = 20419, upload-time = "2026-01-22T16:35:24.919Z" }, +] + +[[package]] +name = "kombu" +version = "5.6.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "amqp" }, + { name = "packaging" }, + { name = "tzdata" }, + { name = "vine" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/b6/a5/607e533ed6c83ae1a696969b8e1c137dfebd5759a2e9682e26ff1b97740b/kombu-5.6.2.tar.gz", hash = "sha256:8060497058066c6f5aed7c26d7cd0d3b574990b09de842a8c5aaed0b92cc5a55", size = 472594, upload-time = "2025-12-29T20:30:07.779Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/fb/0f/834427d8c03ff1d7e867d3db3d176470c64871753252b21b4f4897d1fa45/kombu-5.6.2-py3-none-any.whl", hash = "sha256:efcfc559da324d41d61ca311b0c64965ea35b4c55cc04ee36e55386145dace93", size = 214219, upload-time = "2025-12-29T20:30:05.74Z" }, +] + +[[package]] +name = "lxml" +version = "6.0.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/aa/88/262177de60548e5a2bfc46ad28232c9e9cbde697bd94132aeb80364675cb/lxml-6.0.2.tar.gz", hash = "sha256:cd79f3367bd74b317dda655dc8fcfa304d9eb6e4fb06b7168c5cf27f96e0cd62", size = 4073426, upload-time = "2025-09-22T04:04:59.287Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/03/15/d4a377b385ab693ce97b472fe0c77c2b16ec79590e688b3ccc71fba19884/lxml-6.0.2-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:b0c732aa23de8f8aec23f4b580d1e52905ef468afb4abeafd3fec77042abb6fe", size = 8659801, upload-time = "2025-09-22T04:02:30.113Z" }, + { url = "https://files.pythonhosted.org/packages/c8/e8/c128e37589463668794d503afaeb003987373c5f94d667124ffd8078bbd9/lxml-6.0.2-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:4468e3b83e10e0317a89a33d28f7aeba1caa4d1a6fd457d115dd4ffe90c5931d", size = 4659403, upload-time = "2025-09-22T04:02:32.119Z" }, + { url = "https://files.pythonhosted.org/packages/00/ce/74903904339decdf7da7847bb5741fc98a5451b42fc419a86c0c13d26fe2/lxml-6.0.2-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:abd44571493973bad4598a3be7e1d807ed45aa2adaf7ab92ab7c62609569b17d", size = 4966974, upload-time = "2025-09-22T04:02:34.155Z" }, + { url = "https://files.pythonhosted.org/packages/1f/d3/131dec79ce61c5567fecf82515bd9bc36395df42501b50f7f7f3bd065df0/lxml-6.0.2-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:370cd78d5855cfbffd57c422851f7d3864e6ae72d0da615fca4dad8c45d375a5", size = 5102953, upload-time = "2025-09-22T04:02:36.054Z" }, + { url = "https://files.pythonhosted.org/packages/3a/ea/a43ba9bb750d4ffdd885f2cd333572f5bb900cd2408b67fdda07e85978a0/lxml-6.0.2-cp314-cp314-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:901e3b4219fa04ef766885fb40fa516a71662a4c61b80c94d25336b4934b71c0", size = 5055054, upload-time = "2025-09-22T04:02:38.154Z" }, + { url = "https://files.pythonhosted.org/packages/60/23/6885b451636ae286c34628f70a7ed1fcc759f8d9ad382d132e1c8d3d9bfd/lxml-6.0.2-cp314-cp314-manylinux_2_26_i686.manylinux_2_28_i686.whl", hash = "sha256:a4bf42d2e4cf52c28cc1812d62426b9503cdb0c87a6de81442626aa7d69707ba", size = 5352421, upload-time = "2025-09-22T04:02:40.413Z" }, + { url = "https://files.pythonhosted.org/packages/48/5b/fc2ddfc94ddbe3eebb8e9af6e3fd65e2feba4967f6a4e9683875c394c2d8/lxml-6.0.2-cp314-cp314-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:b2c7fdaa4d7c3d886a42534adec7cfac73860b89b4e5298752f60aa5984641a0", size = 5673684, upload-time = "2025-09-22T04:02:42.288Z" }, + { url = "https://files.pythonhosted.org/packages/29/9c/47293c58cc91769130fbf85531280e8cc7868f7fbb6d92f4670071b9cb3e/lxml-6.0.2-cp314-cp314-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:98a5e1660dc7de2200b00d53fa00bcd3c35a3608c305d45a7bbcaf29fa16e83d", size = 5252463, upload-time = "2025-09-22T04:02:44.165Z" }, + { url = "https://files.pythonhosted.org/packages/9b/da/ba6eceb830c762b48e711ded880d7e3e89fc6c7323e587c36540b6b23c6b/lxml-6.0.2-cp314-cp314-manylinux_2_31_armv7l.whl", hash = "sha256:dc051506c30b609238d79eda75ee9cab3e520570ec8219844a72a46020901e37", size = 4698437, upload-time = "2025-09-22T04:02:46.524Z" }, + { url = "https://files.pythonhosted.org/packages/a5/24/7be3f82cb7990b89118d944b619e53c656c97dc89c28cfb143fdb7cd6f4d/lxml-6.0.2-cp314-cp314-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:8799481bbdd212470d17513a54d568f44416db01250f49449647b5ab5b5dccb9", size = 5269890, upload-time = "2025-09-22T04:02:48.812Z" }, + { url = "https://files.pythonhosted.org/packages/1b/bd/dcfb9ea1e16c665efd7538fc5d5c34071276ce9220e234217682e7d2c4a5/lxml-6.0.2-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:9261bb77c2dab42f3ecd9103951aeca2c40277701eb7e912c545c1b16e0e4917", size = 5097185, upload-time = "2025-09-22T04:02:50.746Z" }, + { url = "https://files.pythonhosted.org/packages/21/04/a60b0ff9314736316f28316b694bccbbabe100f8483ad83852d77fc7468e/lxml-6.0.2-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:65ac4a01aba353cfa6d5725b95d7aed6356ddc0a3cd734de00124d285b04b64f", size = 4745895, upload-time = "2025-09-22T04:02:52.968Z" }, + { url = "https://files.pythonhosted.org/packages/d6/bd/7d54bd1846e5a310d9c715921c5faa71cf5c0853372adf78aee70c8d7aa2/lxml-6.0.2-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:b22a07cbb82fea98f8a2fd814f3d1811ff9ed76d0fc6abc84eb21527596e7cc8", size = 5695246, upload-time = "2025-09-22T04:02:54.798Z" }, + { url = "https://files.pythonhosted.org/packages/fd/32/5643d6ab947bc371da21323acb2a6e603cedbe71cb4c99c8254289ab6f4e/lxml-6.0.2-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:d759cdd7f3e055d6bc8d9bec3ad905227b2e4c785dc16c372eb5b5e83123f48a", size = 5260797, upload-time = "2025-09-22T04:02:57.058Z" }, + { url = "https://files.pythonhosted.org/packages/33/da/34c1ec4cff1eea7d0b4cd44af8411806ed943141804ac9c5d565302afb78/lxml-6.0.2-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:945da35a48d193d27c188037a05fec5492937f66fb1958c24fc761fb9d40d43c", size = 5277404, upload-time = "2025-09-22T04:02:58.966Z" }, + { url = "https://files.pythonhosted.org/packages/82/57/4eca3e31e54dc89e2c3507e1cd411074a17565fa5ffc437c4ae0a00d439e/lxml-6.0.2-cp314-cp314-win32.whl", hash = "sha256:be3aaa60da67e6153eb15715cc2e19091af5dc75faef8b8a585aea372507384b", size = 3670072, upload-time = "2025-09-22T04:03:38.05Z" }, + { url = "https://files.pythonhosted.org/packages/e3/e0/c96cf13eccd20c9421ba910304dae0f619724dcf1702864fd59dd386404d/lxml-6.0.2-cp314-cp314-win_amd64.whl", hash = "sha256:fa25afbadead523f7001caf0c2382afd272c315a033a7b06336da2637d92d6ed", size = 4080617, upload-time = "2025-09-22T04:03:39.835Z" }, + { url = "https://files.pythonhosted.org/packages/d5/5d/b3f03e22b3d38d6f188ef044900a9b29b2fe0aebb94625ce9fe244011d34/lxml-6.0.2-cp314-cp314-win_arm64.whl", hash = "sha256:063eccf89df5b24e361b123e257e437f9e9878f425ee9aae3144c77faf6da6d8", size = 3754930, upload-time = "2025-09-22T04:03:41.565Z" }, + { url = "https://files.pythonhosted.org/packages/5e/5c/42c2c4c03554580708fc738d13414801f340c04c3eff90d8d2d227145275/lxml-6.0.2-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:6162a86d86893d63084faaf4ff937b3daea233e3682fb4474db07395794fa80d", size = 8910380, upload-time = "2025-09-22T04:03:01.645Z" }, + { url = "https://files.pythonhosted.org/packages/bf/4f/12df843e3e10d18d468a7557058f8d3733e8b6e12401f30b1ef29360740f/lxml-6.0.2-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:414aaa94e974e23a3e92e7ca5b97d10c0cf37b6481f50911032c69eeb3991bba", size = 4775632, upload-time = "2025-09-22T04:03:03.814Z" }, + { url = "https://files.pythonhosted.org/packages/e4/0c/9dc31e6c2d0d418483cbcb469d1f5a582a1cd00a1f4081953d44051f3c50/lxml-6.0.2-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:48461bd21625458dd01e14e2c38dd0aea69addc3c4f960c30d9f59d7f93be601", size = 4975171, upload-time = "2025-09-22T04:03:05.651Z" }, + { url = "https://files.pythonhosted.org/packages/e7/2b/9b870c6ca24c841bdd887504808f0417aa9d8d564114689266f19ddf29c8/lxml-6.0.2-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:25fcc59afc57d527cfc78a58f40ab4c9b8fd096a9a3f964d2781ffb6eb33f4ed", size = 5110109, upload-time = "2025-09-22T04:03:07.452Z" }, + { url = "https://files.pythonhosted.org/packages/bf/0c/4f5f2a4dd319a178912751564471355d9019e220c20d7db3fb8307ed8582/lxml-6.0.2-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5179c60288204e6ddde3f774a93350177e08876eaf3ab78aa3a3649d43eb7d37", size = 5041061, upload-time = "2025-09-22T04:03:09.297Z" }, + { url = "https://files.pythonhosted.org/packages/12/64/554eed290365267671fe001a20d72d14f468ae4e6acef1e179b039436967/lxml-6.0.2-cp314-cp314t-manylinux_2_26_i686.manylinux_2_28_i686.whl", hash = "sha256:967aab75434de148ec80597b75062d8123cadf2943fb4281f385141e18b21338", size = 5306233, upload-time = "2025-09-22T04:03:11.651Z" }, + { url = "https://files.pythonhosted.org/packages/7a/31/1d748aa275e71802ad9722df32a7a35034246b42c0ecdd8235412c3396ef/lxml-6.0.2-cp314-cp314t-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:d100fcc8930d697c6561156c6810ab4a508fb264c8b6779e6e61e2ed5e7558f9", size = 5604739, upload-time = "2025-09-22T04:03:13.592Z" }, + { url = "https://files.pythonhosted.org/packages/8f/41/2c11916bcac09ed561adccacceaedd2bf0e0b25b297ea92aab99fd03d0fa/lxml-6.0.2-cp314-cp314t-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2ca59e7e13e5981175b8b3e4ab84d7da57993eeff53c07764dcebda0d0e64ecd", size = 5225119, upload-time = "2025-09-22T04:03:15.408Z" }, + { url = "https://files.pythonhosted.org/packages/99/05/4e5c2873d8f17aa018e6afde417c80cc5d0c33be4854cce3ef5670c49367/lxml-6.0.2-cp314-cp314t-manylinux_2_31_armv7l.whl", hash = "sha256:957448ac63a42e2e49531b9d6c0fa449a1970dbc32467aaad46f11545be9af1d", size = 4633665, upload-time = "2025-09-22T04:03:17.262Z" }, + { url = "https://files.pythonhosted.org/packages/0f/c9/dcc2da1bebd6275cdc723b515f93edf548b82f36a5458cca3578bc899332/lxml-6.0.2-cp314-cp314t-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:b7fc49c37f1786284b12af63152fe1d0990722497e2d5817acfe7a877522f9a9", size = 5234997, upload-time = "2025-09-22T04:03:19.14Z" }, + { url = "https://files.pythonhosted.org/packages/9c/e2/5172e4e7468afca64a37b81dba152fc5d90e30f9c83c7c3213d6a02a5ce4/lxml-6.0.2-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:e19e0643cc936a22e837f79d01a550678da8377d7d801a14487c10c34ee49c7e", size = 5090957, upload-time = "2025-09-22T04:03:21.436Z" }, + { url = "https://files.pythonhosted.org/packages/a5/b3/15461fd3e5cd4ddcb7938b87fc20b14ab113b92312fc97afe65cd7c85de1/lxml-6.0.2-cp314-cp314t-musllinux_1_2_armv7l.whl", hash = "sha256:1db01e5cf14345628e0cbe71067204db658e2fb8e51e7f33631f5f4735fefd8d", size = 4764372, upload-time = "2025-09-22T04:03:23.27Z" }, + { url = "https://files.pythonhosted.org/packages/05/33/f310b987c8bf9e61c4dd8e8035c416bd3230098f5e3cfa69fc4232de7059/lxml-6.0.2-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:875c6b5ab39ad5291588aed6925fac99d0097af0dd62f33c7b43736043d4a2ec", size = 5634653, upload-time = "2025-09-22T04:03:25.767Z" }, + { url = "https://files.pythonhosted.org/packages/70/ff/51c80e75e0bc9382158133bdcf4e339b5886c6ee2418b5199b3f1a61ed6d/lxml-6.0.2-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:cdcbed9ad19da81c480dfd6dd161886db6096083c9938ead313d94b30aadf272", size = 5233795, upload-time = "2025-09-22T04:03:27.62Z" }, + { url = "https://files.pythonhosted.org/packages/56/4d/4856e897df0d588789dd844dbed9d91782c4ef0b327f96ce53c807e13128/lxml-6.0.2-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:80dadc234ebc532e09be1975ff538d154a7fa61ea5031c03d25178855544728f", size = 5257023, upload-time = "2025-09-22T04:03:30.056Z" }, + { url = "https://files.pythonhosted.org/packages/0f/85/86766dfebfa87bea0ab78e9ff7a4b4b45225df4b4d3b8cc3c03c5cd68464/lxml-6.0.2-cp314-cp314t-win32.whl", hash = "sha256:da08e7bb297b04e893d91087df19638dc7a6bb858a954b0cc2b9f5053c922312", size = 3911420, upload-time = "2025-09-22T04:03:32.198Z" }, + { url = "https://files.pythonhosted.org/packages/fe/1a/b248b355834c8e32614650b8008c69ffeb0ceb149c793961dd8c0b991bb3/lxml-6.0.2-cp314-cp314t-win_amd64.whl", hash = "sha256:252a22982dca42f6155125ac76d3432e548a7625d56f5a273ee78a5057216eca", size = 4406837, upload-time = "2025-09-22T04:03:34.027Z" }, + { url = "https://files.pythonhosted.org/packages/92/aa/df863bcc39c5e0946263454aba394de8a9084dbaff8ad143846b0d844739/lxml-6.0.2-cp314-cp314t-win_arm64.whl", hash = "sha256:bb4c1847b303835d89d785a18801a883436cdfd5dc3d62947f9c49e24f0f5a2c", size = 3822205, upload-time = "2025-09-22T04:03:36.249Z" }, +] + +[[package]] +name = "oauthlib" +version = "3.3.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/0b/5f/19930f824ffeb0ad4372da4812c50edbd1434f678c90c2733e1188edfc63/oauthlib-3.3.1.tar.gz", hash = "sha256:0f0f8aa759826a193cf66c12ea1af1637f87b9b4622d46e866952bb022e538c9", size = 185918, upload-time = "2025-06-19T22:48:08.269Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/be/9c/92789c596b8df838baa98fa71844d84283302f7604ed565dafe5a6b5041a/oauthlib-3.3.1-py3-none-any.whl", hash = "sha256:88119c938d2b8fb88561af5f6ee0eec8cc8d552b7bb1f712743136eb7523b7a1", size = 160065, upload-time = "2025-06-19T22:48:06.508Z" }, +] + +[[package]] +name = "packaging" +version = "26.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/65/ee/299d360cdc32edc7d2cf530f3accf79c4fca01e96ffc950d8a52213bd8e4/packaging-26.0.tar.gz", hash = "sha256:00243ae351a257117b6a241061796684b084ed1c516a08c48a3f7e147a9d80b4", size = 143416, upload-time = "2026-01-21T20:50:39.064Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b7/b9/c538f279a4e237a006a2c98387d081e9eb060d203d8ed34467cc0f0b9b53/packaging-26.0-py3-none-any.whl", hash = "sha256:b36f1fef9334a5588b4166f8bcd26a14e521f2b55e6b9de3aaa80d3ff7a37529", size = 74366, upload-time = "2026-01-21T20:50:37.788Z" }, +] + +[[package]] +name = "pillow" +version = "12.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d0/02/d52c733a2452ef1ffcc123b68e6606d07276b0e358db70eabad7e40042b7/pillow-12.1.0.tar.gz", hash = "sha256:5c5ae0a06e9ea030ab786b0251b32c7e4ce10e58d983c0d5c56029455180b5b9", size = 46977283, upload-time = "2026-01-02T09:13:29.892Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/8c/87/bdf971d8bbcf80a348cc3bacfcb239f5882100fe80534b0ce67a784181d8/pillow-12.1.0-cp314-cp314-ios_13_0_arm64_iphoneos.whl", hash = "sha256:5cb7bc1966d031aec37ddb9dcf15c2da5b2e9f7cc3ca7c54473a20a927e1eb91", size = 4062533, upload-time = "2026-01-02T09:12:20.791Z" }, + { url = "https://files.pythonhosted.org/packages/ff/4f/5eb37a681c68d605eb7034c004875c81f86ec9ef51f5be4a63eadd58859a/pillow-12.1.0-cp314-cp314-ios_13_0_arm64_iphonesimulator.whl", hash = "sha256:97e9993d5ed946aba26baf9c1e8cf18adbab584b99f452ee72f7ee8acb882796", size = 4138546, upload-time = "2026-01-02T09:12:23.664Z" }, + { url = "https://files.pythonhosted.org/packages/11/6d/19a95acb2edbace40dcd582d077b991646b7083c41b98da4ed7555b59733/pillow-12.1.0-cp314-cp314-ios_13_0_x86_64_iphonesimulator.whl", hash = "sha256:414b9a78e14ffeb98128863314e62c3f24b8a86081066625700b7985b3f529bd", size = 3601163, upload-time = "2026-01-02T09:12:26.338Z" }, + { url = "https://files.pythonhosted.org/packages/fc/36/2b8138e51cb42e4cc39c3297713455548be855a50558c3ac2beebdc251dd/pillow-12.1.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:e6bdb408f7c9dd2a5ff2b14a3b0bb6d4deb29fb9961e6eb3ae2031ae9a5cec13", size = 5266086, upload-time = "2026-01-02T09:12:28.782Z" }, + { url = "https://files.pythonhosted.org/packages/53/4b/649056e4d22e1caa90816bf99cef0884aed607ed38075bd75f091a607a38/pillow-12.1.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:3413c2ae377550f5487991d444428f1a8ae92784aac79caa8b1e3b89b175f77e", size = 4657344, upload-time = "2026-01-02T09:12:31.117Z" }, + { url = "https://files.pythonhosted.org/packages/6c/6b/c5742cea0f1ade0cd61485dc3d81f05261fc2276f537fbdc00802de56779/pillow-12.1.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:e5dcbe95016e88437ecf33544ba5db21ef1b8dd6e1b434a2cb2a3d605299e643", size = 6232114, upload-time = "2026-01-02T09:12:32.936Z" }, + { url = "https://files.pythonhosted.org/packages/bf/8f/9f521268ce22d63991601aafd3d48d5ff7280a246a1ef62d626d67b44064/pillow-12.1.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:d0a7735df32ccbcc98b98a1ac785cc4b19b580be1bdf0aeb5c03223220ea09d5", size = 8042708, upload-time = "2026-01-02T09:12:34.78Z" }, + { url = "https://files.pythonhosted.org/packages/1a/eb/257f38542893f021502a1bbe0c2e883c90b5cff26cc33b1584a841a06d30/pillow-12.1.0-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0c27407a2d1b96774cbc4a7594129cc027339fd800cd081e44497722ea1179de", size = 6347762, upload-time = "2026-01-02T09:12:36.748Z" }, + { url = "https://files.pythonhosted.org/packages/c4/5a/8ba375025701c09b309e8d5163c5a4ce0102fa86bbf8800eb0d7ac87bc51/pillow-12.1.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:15c794d74303828eaa957ff8070846d0efe8c630901a1c753fdc63850e19ecd9", size = 7039265, upload-time = "2026-01-02T09:12:39.082Z" }, + { url = "https://files.pythonhosted.org/packages/cf/dc/cf5e4cdb3db533f539e88a7bbf9f190c64ab8a08a9bc7a4ccf55067872e4/pillow-12.1.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:c990547452ee2800d8506c4150280757f88532f3de2a58e3022e9b179107862a", size = 6462341, upload-time = "2026-01-02T09:12:40.946Z" }, + { url = "https://files.pythonhosted.org/packages/d0/47/0291a25ac9550677e22eda48510cfc4fa4b2ef0396448b7fbdc0a6946309/pillow-12.1.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:b63e13dd27da389ed9475b3d28510f0f954bca0041e8e551b2a4eb1eab56a39a", size = 7165395, upload-time = "2026-01-02T09:12:42.706Z" }, + { url = "https://files.pythonhosted.org/packages/4f/4c/e005a59393ec4d9416be06e6b45820403bb946a778e39ecec62f5b2b991e/pillow-12.1.0-cp314-cp314-win32.whl", hash = "sha256:1a949604f73eb07a8adab38c4fe50791f9919344398bdc8ac6b307f755fc7030", size = 6431413, upload-time = "2026-01-02T09:12:44.944Z" }, + { url = "https://files.pythonhosted.org/packages/1c/af/f23697f587ac5f9095d67e31b81c95c0249cd461a9798a061ed6709b09b5/pillow-12.1.0-cp314-cp314-win_amd64.whl", hash = "sha256:4f9f6a650743f0ddee5593ac9e954ba1bdbc5e150bc066586d4f26127853ab94", size = 7176779, upload-time = "2026-01-02T09:12:46.727Z" }, + { url = "https://files.pythonhosted.org/packages/b3/36/6a51abf8599232f3e9afbd16d52829376a68909fe14efe29084445db4b73/pillow-12.1.0-cp314-cp314-win_arm64.whl", hash = "sha256:808b99604f7873c800c4840f55ff389936ef1948e4e87645eaf3fccbc8477ac4", size = 2543105, upload-time = "2026-01-02T09:12:49.243Z" }, + { url = "https://files.pythonhosted.org/packages/82/54/2e1dd20c8749ff225080d6ba465a0cab4387f5db0d1c5fb1439e2d99923f/pillow-12.1.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:bc11908616c8a283cf7d664f77411a5ed2a02009b0097ff8abbba5e79128ccf2", size = 5268571, upload-time = "2026-01-02T09:12:51.11Z" }, + { url = "https://files.pythonhosted.org/packages/57/61/571163a5ef86ec0cf30d265ac2a70ae6fc9e28413d1dc94fa37fae6bda89/pillow-12.1.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:896866d2d436563fa2a43a9d72f417874f16b5545955c54a64941e87c1376c61", size = 4660426, upload-time = "2026-01-02T09:12:52.865Z" }, + { url = "https://files.pythonhosted.org/packages/5e/e1/53ee5163f794aef1bf84243f755ee6897a92c708505350dd1923f4afec48/pillow-12.1.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:8e178e3e99d3c0ea8fc64b88447f7cac8ccf058af422a6cedc690d0eadd98c51", size = 6269908, upload-time = "2026-01-02T09:12:54.884Z" }, + { url = "https://files.pythonhosted.org/packages/bc/0b/b4b4106ff0ee1afa1dc599fde6ab230417f800279745124f6c50bcffed8e/pillow-12.1.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:079af2fb0c599c2ec144ba2c02766d1b55498e373b3ac64687e43849fbbef5bc", size = 8074733, upload-time = "2026-01-02T09:12:56.802Z" }, + { url = "https://files.pythonhosted.org/packages/19/9f/80b411cbac4a732439e629a26ad3ef11907a8c7fc5377b7602f04f6fe4e7/pillow-12.1.0-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:bdec5e43377761c5dbca620efb69a77f6855c5a379e32ac5b158f54c84212b14", size = 6381431, upload-time = "2026-01-02T09:12:58.823Z" }, + { url = "https://files.pythonhosted.org/packages/8f/b7/d65c45db463b66ecb6abc17c6ba6917a911202a07662247e1355ce1789e7/pillow-12.1.0-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:565c986f4b45c020f5421a4cea13ef294dde9509a8577f29b2fc5edc7587fff8", size = 7068529, upload-time = "2026-01-02T09:13:00.885Z" }, + { url = "https://files.pythonhosted.org/packages/50/96/dfd4cd726b4a45ae6e3c669fc9e49deb2241312605d33aba50499e9d9bd1/pillow-12.1.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:43aca0a55ce1eefc0aefa6253661cb54571857b1a7b2964bd8a1e3ef4b729924", size = 6492981, upload-time = "2026-01-02T09:13:03.314Z" }, + { url = "https://files.pythonhosted.org/packages/4d/1c/b5dc52cf713ae46033359c5ca920444f18a6359ce1020dd3e9c553ea5bc6/pillow-12.1.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:0deedf2ea233722476b3a81e8cdfbad786f7adbed5d848469fa59fe52396e4ef", size = 7191878, upload-time = "2026-01-02T09:13:05.276Z" }, + { url = "https://files.pythonhosted.org/packages/53/26/c4188248bd5edaf543864fe4834aebe9c9cb4968b6f573ce014cc42d0720/pillow-12.1.0-cp314-cp314t-win32.whl", hash = "sha256:b17fbdbe01c196e7e159aacb889e091f28e61020a8abeac07b68079b6e626988", size = 6438703, upload-time = "2026-01-02T09:13:07.491Z" }, + { url = "https://files.pythonhosted.org/packages/b8/0e/69ed296de8ea05cb03ee139cee600f424ca166e632567b2d66727f08c7ed/pillow-12.1.0-cp314-cp314t-win_amd64.whl", hash = "sha256:27b9baecb428899db6c0de572d6d305cfaf38ca1596b5c0542a5182e3e74e8c6", size = 7182927, upload-time = "2026-01-02T09:13:09.841Z" }, + { url = "https://files.pythonhosted.org/packages/fc/f5/68334c015eed9b5cff77814258717dec591ded209ab5b6fb70e2ae873d1d/pillow-12.1.0-cp314-cp314t-win_arm64.whl", hash = "sha256:f61333d817698bdcdd0f9d7793e365ac3d2a21c1f1eb02b32ad6aefb8d8ea831", size = 2545104, upload-time = "2026-01-02T09:13:12.068Z" }, +] + +[[package]] +name = "pluggy" +version = "1.6.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f9/e2/3e91f31a7d2b083fe6ef3fa267035b518369d9511ffab804f839851d2779/pluggy-1.6.0.tar.gz", hash = "sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3", size = 69412, upload-time = "2025-05-15T12:30:07.975Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/54/20/4d324d65cc6d9205fabedc306948156824eb9f0ee1633355a8f7ec5c66bf/pluggy-1.6.0-py3-none-any.whl", hash = "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746", size = 20538, upload-time = "2025-05-15T12:30:06.134Z" }, +] + +[[package]] +name = "prometheus-client" +version = "0.24.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f0/58/a794d23feb6b00fc0c72787d7e87d872a6730dd9ed7c7b3e954637d8f280/prometheus_client-0.24.1.tar.gz", hash = "sha256:7e0ced7fbbd40f7b84962d5d2ab6f17ef88a72504dcf7c0b40737b43b2a461f9", size = 85616, upload-time = "2026-01-14T15:26:26.965Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/74/c3/24a2f845e3917201628ecaba4f18bab4d18a337834c1df2a159ee9d22a42/prometheus_client-0.24.1-py3-none-any.whl", hash = "sha256:150db128af71a5c2482b36e588fc8a6b95e498750da4b17065947c16070f4055", size = 64057, upload-time = "2026-01-14T15:26:24.42Z" }, +] + +[[package]] +name = "prompt-toolkit" +version = "3.0.52" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "wcwidth" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/a1/96/06e01a7b38dce6fe1db213e061a4602dd6032a8a97ef6c1a862537732421/prompt_toolkit-3.0.52.tar.gz", hash = "sha256:28cde192929c8e7321de85de1ddbe736f1375148b02f2e17edd840042b1be855", size = 434198, upload-time = "2025-08-27T15:24:02.057Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/84/03/0d3ce49e2505ae70cf43bc5bb3033955d2fc9f932163e84dc0779cc47f48/prompt_toolkit-3.0.52-py3-none-any.whl", hash = "sha256:9aac639a3bbd33284347de5ad8d68ecc044b91a762dc39b7c21095fcd6a19955", size = 391431, upload-time = "2025-08-27T15:23:59.498Z" }, +] + +[[package]] +name = "psycopg2-binary" +version = "2.9.11" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/ac/6c/8767aaa597ba424643dc87348c6f1754dd9f48e80fdc1b9f7ca5c3a7c213/psycopg2-binary-2.9.11.tar.gz", hash = "sha256:b6aed9e096bf63f9e75edf2581aa9a7e7186d97ab5c177aa6c87797cd591236c", size = 379620, upload-time = "2025-10-10T11:14:48.041Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/64/12/93ef0098590cf51d9732b4f139533732565704f45bdc1ffa741b7c95fb54/psycopg2_binary-2.9.11-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:92e3b669236327083a2e33ccfa0d320dd01b9803b3e14dd986a4fc54aa00f4e1", size = 3756567, upload-time = "2025-10-10T11:13:11.885Z" }, + { url = "https://files.pythonhosted.org/packages/7c/a9/9d55c614a891288f15ca4b5209b09f0f01e3124056924e17b81b9fa054cc/psycopg2_binary-2.9.11-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:e0deeb03da539fa3577fcb0b3f2554a97f7e5477c246098dbb18091a4a01c16f", size = 3864755, upload-time = "2025-10-10T11:13:17.727Z" }, + { url = "https://files.pythonhosted.org/packages/13/1e/98874ce72fd29cbde93209977b196a2edae03f8490d1bd8158e7f1daf3a0/psycopg2_binary-2.9.11-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:9b52a3f9bb540a3e4ec0f6ba6d31339727b2950c9772850d6545b7eae0b9d7c5", size = 4411646, upload-time = "2025-10-10T11:13:24.432Z" }, + { url = "https://files.pythonhosted.org/packages/5a/bd/a335ce6645334fb8d758cc358810defca14a1d19ffbc8a10bd38a2328565/psycopg2_binary-2.9.11-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:db4fd476874ccfdbb630a54426964959e58da4c61c9feba73e6094d51303d7d8", size = 4468701, upload-time = "2025-10-10T11:13:29.266Z" }, + { url = "https://files.pythonhosted.org/packages/44/d6/c8b4f53f34e295e45709b7568bf9b9407a612ea30387d35eb9fa84f269b4/psycopg2_binary-2.9.11-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:47f212c1d3be608a12937cc131bd85502954398aaa1320cb4c14421a0ffccf4c", size = 4166293, upload-time = "2025-10-10T11:13:33.336Z" }, + { url = "https://files.pythonhosted.org/packages/4b/e0/f8cc36eadd1b716ab36bb290618a3292e009867e5c97ce4aba908cb99644/psycopg2_binary-2.9.11-cp314-cp314-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e35b7abae2b0adab776add56111df1735ccc71406e56203515e228a8dc07089f", size = 3983184, upload-time = "2025-10-30T02:55:32.483Z" }, + { url = "https://files.pythonhosted.org/packages/53/3e/2a8fe18a4e61cfb3417da67b6318e12691772c0696d79434184a511906dc/psycopg2_binary-2.9.11-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:fcf21be3ce5f5659daefd2b3b3b6e4727b028221ddc94e6c1523425579664747", size = 3652650, upload-time = "2025-10-10T11:13:38.181Z" }, + { url = "https://files.pythonhosted.org/packages/76/36/03801461b31b29fe58d228c24388f999fe814dfc302856e0d17f97d7c54d/psycopg2_binary-2.9.11-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:9bd81e64e8de111237737b29d68039b9c813bdf520156af36d26819c9a979e5f", size = 3298663, upload-time = "2025-10-10T11:13:44.878Z" }, + { url = "https://files.pythonhosted.org/packages/97/77/21b0ea2e1a73aa5fa9222b2a6b8ba325c43c3a8d54272839c991f2345656/psycopg2_binary-2.9.11-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:32770a4d666fbdafab017086655bcddab791d7cb260a16679cc5a7338b64343b", size = 3044737, upload-time = "2025-10-30T02:55:35.69Z" }, + { url = "https://files.pythonhosted.org/packages/67/69/f36abe5f118c1dca6d3726ceae164b9356985805480731ac6712a63f24f0/psycopg2_binary-2.9.11-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:c3cb3a676873d7506825221045bd70e0427c905b9c8ee8d6acd70cfcbd6e576d", size = 3347643, upload-time = "2025-10-10T11:13:53.499Z" }, + { url = "https://files.pythonhosted.org/packages/e1/36/9c0c326fe3a4227953dfb29f5d0c8ae3b8eb8c1cd2967aa569f50cb3c61f/psycopg2_binary-2.9.11-cp314-cp314-win_amd64.whl", hash = "sha256:4012c9c954dfaccd28f94e84ab9f94e12df76b4afb22331b1f0d3154893a6316", size = 2803913, upload-time = "2025-10-10T11:13:57.058Z" }, +] + +[[package]] +name = "pycparser" +version = "3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/1b/7d/92392ff7815c21062bea51aa7b87d45576f649f16458d78b7cf94b9ab2e6/pycparser-3.0.tar.gz", hash = "sha256:600f49d217304a5902ac3c37e1281c9fe94e4d0489de643a9504c5cdfdfc6b29", size = 103492, upload-time = "2026-01-21T14:26:51.89Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/0c/c3/44f3fbbfa403ea2a7c779186dc20772604442dde72947e7d01069cbe98e3/pycparser-3.0-py3-none-any.whl", hash = "sha256:b727414169a36b7d524c1c3e31839a521725078d7b2ff038656844266160a992", size = 48172, upload-time = "2026-01-21T14:26:50.693Z" }, +] + +[[package]] +name = "pygments" +version = "2.19.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/b0/77/a5b8c569bf593b0140bde72ea885a803b82086995367bf2037de0159d924/pygments-2.19.2.tar.gz", hash = "sha256:636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887", size = 4968631, upload-time = "2025-06-21T13:39:12.283Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c7/21/705964c7812476f378728bdf590ca4b771ec72385c533964653c68e86bdc/pygments-2.19.2-py3-none-any.whl", hash = "sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b", size = 1225217, upload-time = "2025-06-21T13:39:07.939Z" }, +] + +[[package]] +name = "pyjwt" +version = "2.10.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/e7/46/bd74733ff231675599650d3e47f361794b22ef3e3770998dda30d3b63726/pyjwt-2.10.1.tar.gz", hash = "sha256:3cc5772eb20009233caf06e9d8a0577824723b44e6648ee0a2aedb6cf9381953", size = 87785, upload-time = "2024-11-28T03:43:29.933Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/61/ad/689f02752eeec26aed679477e80e632ef1b682313be70793d798c1d5fc8f/PyJWT-2.10.1-py3-none-any.whl", hash = "sha256:dcdd193e30abefd5debf142f9adfcdd2b58004e644f25406ffaebd50bd98dacb", size = 22997, upload-time = "2024-11-28T03:43:27.893Z" }, +] + +[package.optional-dependencies] +crypto = [ + { name = "cryptography" }, +] + +[[package]] +name = "pytest" +version = "9.0.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "colorama", marker = "sys_platform == 'win32'" }, + { name = "iniconfig" }, + { name = "packaging" }, + { name = "pluggy" }, + { name = "pygments" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/d1/db/7ef3487e0fb0049ddb5ce41d3a49c235bf9ad299b6a25d5780a89f19230f/pytest-9.0.2.tar.gz", hash = "sha256:75186651a92bd89611d1d9fc20f0b4345fd827c41ccd5c299a868a05d70edf11", size = 1568901, upload-time = "2025-12-06T21:30:51.014Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/3b/ab/b3226f0bd7cdcf710fbede2b3548584366da3b19b5021e74f5bde2a8fa3f/pytest-9.0.2-py3-none-any.whl", hash = "sha256:711ffd45bf766d5264d487b917733b453d917afd2b0ad65223959f59089f875b", size = 374801, upload-time = "2025-12-06T21:30:49.154Z" }, +] + +[[package]] +name = "pytest-cov" +version = "7.0.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "coverage" }, + { name = "pluggy" }, + { name = "pytest" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/5e/f7/c933acc76f5208b3b00089573cf6a2bc26dc80a8aece8f52bb7d6b1855ca/pytest_cov-7.0.0.tar.gz", hash = "sha256:33c97eda2e049a0c5298e91f519302a1334c26ac65c1a483d6206fd458361af1", size = 54328, upload-time = "2025-09-09T10:57:02.113Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ee/49/1377b49de7d0c1ce41292161ea0f721913fa8722c19fb9c1e3aa0367eecb/pytest_cov-7.0.0-py3-none-any.whl", hash = "sha256:3b8e9558b16cc1479da72058bdecf8073661c7f57f7d3c5f22a1c23507f2d861", size = 22424, upload-time = "2025-09-09T10:57:00.695Z" }, +] + +[[package]] +name = "pytest-django" +version = "4.11.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pytest" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/b1/fb/55d580352db26eb3d59ad50c64321ddfe228d3d8ac107db05387a2fadf3a/pytest_django-4.11.1.tar.gz", hash = "sha256:a949141a1ee103cb0e7a20f1451d355f83f5e4a5d07bdd4dcfdd1fd0ff227991", size = 86202, upload-time = "2025-04-03T18:56:09.338Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/be/ac/bd0608d229ec808e51a21044f3f2f27b9a37e7a0ebaca7247882e67876af/pytest_django-4.11.1-py3-none-any.whl", hash = "sha256:1b63773f648aa3d8541000c26929c1ea63934be1cfa674c76436966d73fe6a10", size = 25281, upload-time = "2025-04-03T18:56:07.678Z" }, +] + +[[package]] +name = "pytest-xdist" +version = "3.8.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "execnet" }, + { name = "pytest" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/78/b4/439b179d1ff526791eb921115fca8e44e596a13efeda518b9d845a619450/pytest_xdist-3.8.0.tar.gz", hash = "sha256:7e578125ec9bc6050861aa93f2d59f1d8d085595d6551c2c90b6f4fad8d3a9f1", size = 88069, upload-time = "2025-07-01T13:30:59.346Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ca/31/d4e37e9e550c2b92a9cbc2e4d0b7420a27224968580b5a447f420847c975/pytest_xdist-3.8.0-py3-none-any.whl", hash = "sha256:202ca578cfeb7370784a8c33d6d05bc6e13b4f25b5053c30a152269fd10f0b88", size = 46396, upload-time = "2025-07-01T13:30:56.632Z" }, +] + +[[package]] +name = "python-dateutil" +version = "2.9.0.post0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "six" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/66/c0/0c8b6ad9f17a802ee498c46e004a0eb49bc148f2fd230864601a86dcf6db/python-dateutil-2.9.0.post0.tar.gz", hash = "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3", size = 342432, upload-time = "2024-03-01T18:36:20.211Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ec/57/56b9bcc3c9c6a792fcbaf139543cee77261f3651ca9da0c93f5c1221264b/python_dateutil-2.9.0.post0-py2.py3-none-any.whl", hash = "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427", size = 229892, upload-time = "2024-03-01T18:36:18.57Z" }, +] + +[[package]] +name = "python-dotenv" +version = "1.2.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f0/26/19cadc79a718c5edbec86fd4919a6b6d3f681039a2f6d66d14be94e75fb9/python_dotenv-1.2.1.tar.gz", hash = "sha256:42667e897e16ab0d66954af0e60a9caa94f0fd4ecf3aaf6d2d260eec1aa36ad6", size = 44221, upload-time = "2025-10-26T15:12:10.434Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/14/1b/a298b06749107c305e1fe0f814c6c74aea7b2f1e10989cb30f544a1b3253/python_dotenv-1.2.1-py3-none-any.whl", hash = "sha256:b81ee9561e9ca4004139c6cbba3a238c32b03e4894671e181b671e8cb8425d61", size = 21230, upload-time = "2025-10-26T15:12:09.109Z" }, +] + +[[package]] +name = "python3-openid" +version = "3.2.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "defusedxml" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/5f/4a/29feb8da6c44f77007dcd29518fea73a3d5653ee02a587ae1f17f1f5ddb5/python3-openid-3.2.0.tar.gz", hash = "sha256:33fbf6928f401e0b790151ed2b5290b02545e8775f982485205a066f874aaeaf", size = 305600, upload-time = "2020-06-29T12:15:49.026Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e0/a5/c6ba13860bdf5525f1ab01e01cc667578d6f1efc8a1dba355700fb04c29b/python3_openid-3.2.0-py3-none-any.whl", hash = "sha256:6626f771e0417486701e0b4daff762e7212e820ca5b29fcc0d05f6f8736dfa6b", size = 133681, upload-time = "2020-06-29T12:15:47.502Z" }, +] + +[[package]] +name = "python3-saml" +version = "1.16.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "isodate" }, + { name = "lxml" }, + { name = "xmlsec" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/5d/98/6e0268c3a9893af3d4c5cf670183e0314cd6b5cb034a612d6a7cc5060df8/python3-saml-1.16.0.tar.gz", hash = "sha256:97c9669aecabc283c6e5fb4eb264f446b6e006f5267d01c9734f9d8bffdac133", size = 83468, upload-time = "2023-10-09T10:37:43.128Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/07/14/49d9828443b58bd5cc80a454c91b0f867fbf36a24975d501945e6cb9e32f/python3_saml-1.16.0-py3-none-any.whl", hash = "sha256:20b97d11b04f01ee22e98f4a38242e2fea2e28fbc7fbc9bdd57cab5ac7fc2d0d", size = 76155, upload-time = "2023-10-09T10:40:34.001Z" }, +] + +[[package]] +name = "pytz" +version = "2025.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f8/bf/abbd3cdfb8fbc7fb3d4d38d320f2441b1e7cbe29be4f23797b4a2b5d8aac/pytz-2025.2.tar.gz", hash = "sha256:360b9e3dbb49a209c21ad61809c7fb453643e048b38924c765813546746e81c3", size = 320884, upload-time = "2025-03-25T02:25:00.538Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/81/c4/34e93fe5f5429d7570ec1fa436f1986fb1f00c3e0f43a589fe2bbcd22c3f/pytz-2025.2-py2.py3-none-any.whl", hash = "sha256:5ddf76296dd8c44c26eb8f4b6f35488f3ccbf6fbbd7adee0b7262d43f0ec2f00", size = 509225, upload-time = "2025-03-25T02:24:58.468Z" }, +] + +[[package]] +name = "pyyaml" +version = "6.0.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/05/8e/961c0007c59b8dd7729d542c61a4d537767a59645b82a0b521206e1e25c2/pyyaml-6.0.3.tar.gz", hash = "sha256:d76623373421df22fb4cf8817020cbb7ef15c725b9d5e45f17e189bfc384190f", size = 130960, upload-time = "2025-09-25T21:33:16.546Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9d/8c/f4bd7f6465179953d3ac9bc44ac1a8a3e6122cf8ada906b4f96c60172d43/pyyaml-6.0.3-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:8d1fab6bb153a416f9aeb4b8763bc0f22a5586065f86f7664fc23339fc1c1fac", size = 181814, upload-time = "2025-09-25T21:32:35.712Z" }, + { url = "https://files.pythonhosted.org/packages/bd/9c/4d95bb87eb2063d20db7b60faa3840c1b18025517ae857371c4dd55a6b3a/pyyaml-6.0.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:34d5fcd24b8445fadc33f9cf348c1047101756fd760b4dacb5c3e99755703310", size = 173809, upload-time = "2025-09-25T21:32:36.789Z" }, + { url = "https://files.pythonhosted.org/packages/92/b5/47e807c2623074914e29dabd16cbbdd4bf5e9b2db9f8090fa64411fc5382/pyyaml-6.0.3-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:501a031947e3a9025ed4405a168e6ef5ae3126c59f90ce0cd6f2bfc477be31b7", size = 766454, upload-time = "2025-09-25T21:32:37.966Z" }, + { url = "https://files.pythonhosted.org/packages/02/9e/e5e9b168be58564121efb3de6859c452fccde0ab093d8438905899a3a483/pyyaml-6.0.3-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:b3bc83488de33889877a0f2543ade9f70c67d66d9ebb4ac959502e12de895788", size = 836355, upload-time = "2025-09-25T21:32:39.178Z" }, + { url = "https://files.pythonhosted.org/packages/88/f9/16491d7ed2a919954993e48aa941b200f38040928474c9e85ea9e64222c3/pyyaml-6.0.3-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c458b6d084f9b935061bc36216e8a69a7e293a2f1e68bf956dcd9e6cbcd143f5", size = 794175, upload-time = "2025-09-25T21:32:40.865Z" }, + { url = "https://files.pythonhosted.org/packages/dd/3f/5989debef34dc6397317802b527dbbafb2b4760878a53d4166579111411e/pyyaml-6.0.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:7c6610def4f163542a622a73fb39f534f8c101d690126992300bf3207eab9764", size = 755228, upload-time = "2025-09-25T21:32:42.084Z" }, + { url = "https://files.pythonhosted.org/packages/d7/ce/af88a49043cd2e265be63d083fc75b27b6ed062f5f9fd6cdc223ad62f03e/pyyaml-6.0.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:5190d403f121660ce8d1d2c1bb2ef1bd05b5f68533fc5c2ea899bd15f4399b35", size = 789194, upload-time = "2025-09-25T21:32:43.362Z" }, + { url = "https://files.pythonhosted.org/packages/23/20/bb6982b26a40bb43951265ba29d4c246ef0ff59c9fdcdf0ed04e0687de4d/pyyaml-6.0.3-cp314-cp314-win_amd64.whl", hash = "sha256:4a2e8cebe2ff6ab7d1050ecd59c25d4c8bd7e6f400f5f82b96557ac0abafd0ac", size = 156429, upload-time = "2025-09-25T21:32:57.844Z" }, + { url = "https://files.pythonhosted.org/packages/f4/f4/a4541072bb9422c8a883ab55255f918fa378ecf083f5b85e87fc2b4eda1b/pyyaml-6.0.3-cp314-cp314-win_arm64.whl", hash = "sha256:93dda82c9c22deb0a405ea4dc5f2d0cda384168e466364dec6255b293923b2f3", size = 143912, upload-time = "2025-09-25T21:32:59.247Z" }, + { url = "https://files.pythonhosted.org/packages/7c/f9/07dd09ae774e4616edf6cda684ee78f97777bdd15847253637a6f052a62f/pyyaml-6.0.3-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:02893d100e99e03eda1c8fd5c441d8c60103fd175728e23e431db1b589cf5ab3", size = 189108, upload-time = "2025-09-25T21:32:44.377Z" }, + { url = "https://files.pythonhosted.org/packages/4e/78/8d08c9fb7ce09ad8c38ad533c1191cf27f7ae1effe5bb9400a46d9437fcf/pyyaml-6.0.3-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:c1ff362665ae507275af2853520967820d9124984e0f7466736aea23d8611fba", size = 183641, upload-time = "2025-09-25T21:32:45.407Z" }, + { url = "https://files.pythonhosted.org/packages/7b/5b/3babb19104a46945cf816d047db2788bcaf8c94527a805610b0289a01c6b/pyyaml-6.0.3-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6adc77889b628398debc7b65c073bcb99c4a0237b248cacaf3fe8a557563ef6c", size = 831901, upload-time = "2025-09-25T21:32:48.83Z" }, + { url = "https://files.pythonhosted.org/packages/8b/cc/dff0684d8dc44da4d22a13f35f073d558c268780ce3c6ba1b87055bb0b87/pyyaml-6.0.3-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:a80cb027f6b349846a3bf6d73b5e95e782175e52f22108cfa17876aaeff93702", size = 861132, upload-time = "2025-09-25T21:32:50.149Z" }, + { url = "https://files.pythonhosted.org/packages/b1/5e/f77dc6b9036943e285ba76b49e118d9ea929885becb0a29ba8a7c75e29fe/pyyaml-6.0.3-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:00c4bdeba853cc34e7dd471f16b4114f4162dc03e6b7afcc2128711f0eca823c", size = 839261, upload-time = "2025-09-25T21:32:51.808Z" }, + { url = "https://files.pythonhosted.org/packages/ce/88/a9db1376aa2a228197c58b37302f284b5617f56a5d959fd1763fb1675ce6/pyyaml-6.0.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:66e1674c3ef6f541c35191caae2d429b967b99e02040f5ba928632d9a7f0f065", size = 805272, upload-time = "2025-09-25T21:32:52.941Z" }, + { url = "https://files.pythonhosted.org/packages/da/92/1446574745d74df0c92e6aa4a7b0b3130706a4142b2d1a5869f2eaa423c6/pyyaml-6.0.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:16249ee61e95f858e83976573de0f5b2893b3677ba71c9dd36b9cf8be9ac6d65", size = 829923, upload-time = "2025-09-25T21:32:54.537Z" }, + { url = "https://files.pythonhosted.org/packages/f0/7a/1c7270340330e575b92f397352af856a8c06f230aa3e76f86b39d01b416a/pyyaml-6.0.3-cp314-cp314t-win_amd64.whl", hash = "sha256:4ad1906908f2f5ae4e5a8ddfce73c320c2a1429ec52eafd27138b7f1cbe341c9", size = 174062, upload-time = "2025-09-25T21:32:55.767Z" }, + { url = "https://files.pythonhosted.org/packages/f1/12/de94a39c2ef588c7e6455cfbe7343d3b2dc9d6b6b2f40c4c6565744c873d/pyyaml-6.0.3-cp314-cp314t-win_arm64.whl", hash = "sha256:ebc55a14a21cb14062aa4162f906cd962b28e2e9ea38f9b4391244cd8de4ae0b", size = 149341, upload-time = "2025-09-25T21:32:56.828Z" }, +] + +[[package]] +name = "redis" +version = "7.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/43/c8/983d5c6579a411d8a99bc5823cc5712768859b5ce2c8afe1a65b37832c81/redis-7.1.0.tar.gz", hash = "sha256:b1cc3cfa5a2cb9c2ab3ba700864fb0ad75617b41f01352ce5779dabf6d5f9c3c", size = 4796669, upload-time = "2025-11-19T15:54:39.961Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/89/f0/8956f8a86b20d7bb9d6ac0187cf4cd54d8065bc9a1a09eb8011d4d326596/redis-7.1.0-py3-none-any.whl", hash = "sha256:23c52b208f92b56103e17c5d06bdc1a6c2c0b3106583985a76a18f83b265de2b", size = 354159, upload-time = "2025-11-19T15:54:38.064Z" }, +] + +[[package]] +name = "requests" +version = "2.32.5" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "certifi" }, + { name = "charset-normalizer" }, + { name = "idna" }, + { name = "urllib3" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/c9/74/b3ff8e6c8446842c3f5c837e9c3dfcfe2018ea6ecef224c710c85ef728f4/requests-2.32.5.tar.gz", hash = "sha256:dbba0bac56e100853db0ea71b82b4dfd5fe2bf6d3754a8893c3af500cec7d7cf", size = 134517, upload-time = "2025-08-18T20:46:02.573Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1e/db/4254e3eabe8020b458f1a747140d32277ec7a271daf1d235b70dc0b4e6e3/requests-2.32.5-py3-none-any.whl", hash = "sha256:2462f94637a34fd532264295e186976db0f5d453d1cdd31473c85a6a161affb6", size = 64738, upload-time = "2025-08-18T20:46:00.542Z" }, +] + +[[package]] +name = "requests-oauthlib" +version = "2.0.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "oauthlib" }, + { name = "requests" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/42/f2/05f29bc3913aea15eb670be136045bf5c5bbf4b99ecb839da9b422bb2c85/requests-oauthlib-2.0.0.tar.gz", hash = "sha256:b3dffaebd884d8cd778494369603a9e7b58d29111bf6b41bdc2dcd87203af4e9", size = 55650, upload-time = "2024-03-22T20:32:29.939Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/3b/5d/63d4ae3b9daea098d5d6f5da83984853c1bbacd5dc826764b249fe119d24/requests_oauthlib-2.0.0-py2.py3-none-any.whl", hash = "sha256:7dd8a5c40426b779b0868c404bdef9768deccf22749cde15852df527e6269b36", size = 24179, upload-time = "2024-03-22T20:32:28.055Z" }, +] + +[[package]] +name = "s3transfer" +version = "0.16.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "botocore" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/05/04/74127fc843314818edfa81b5540e26dd537353b123a4edc563109d8f17dd/s3transfer-0.16.0.tar.gz", hash = "sha256:8e990f13268025792229cd52fa10cb7163744bf56e719e0b9cb925ab79abf920", size = 153827, upload-time = "2025-12-01T02:30:59.114Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/fc/51/727abb13f44c1fcf6d145979e1535a35794db0f6e450a0cb46aa24732fe2/s3transfer-0.16.0-py3-none-any.whl", hash = "sha256:18e25d66fed509e3868dc1572b3f427ff947dd2c56f844a5bf09481ad3f3b2fe", size = 86830, upload-time = "2025-12-01T02:30:57.729Z" }, +] + +[[package]] +name = "six" +version = "1.17.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/94/e7/b2c673351809dca68a0e064b6af791aa332cf192da575fd474ed7d6f16a2/six-1.17.0.tar.gz", hash = "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81", size = 34031, upload-time = "2024-12-04T17:35:28.174Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b7/ce/149a00dd41f10bc29e5921b496af8b574d8413afcd5e30dfa0ed46c2cc5e/six-1.17.0-py2.py3-none-any.whl", hash = "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274", size = 11050, upload-time = "2024-12-04T17:35:26.475Z" }, +] + +[[package]] +name = "sqlparse" +version = "0.5.5" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/90/76/437d71068094df0726366574cf3432a4ed754217b436eb7429415cf2d480/sqlparse-0.5.5.tar.gz", hash = "sha256:e20d4a9b0b8585fdf63b10d30066c7c94c5d7a7ec47c889a2d83a3caa93ff28e", size = 120815, upload-time = "2025-12-19T07:17:45.073Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/49/4b/359f28a903c13438ef59ebeee215fb25da53066db67b305c125f1c6d2a25/sqlparse-0.5.5-py3-none-any.whl", hash = "sha256:12a08b3bf3eec877c519589833aed092e2444e68240a3577e8e26148acc7b1ba", size = 46138, upload-time = "2025-12-19T07:17:46.573Z" }, +] + +[[package]] +name = "tornado" +version = "6.5.4" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/37/1d/0a336abf618272d53f62ebe274f712e213f5a03c0b2339575430b8362ef2/tornado-6.5.4.tar.gz", hash = "sha256:a22fa9047405d03260b483980635f0b041989d8bcc9a313f8fe18b411d84b1d7", size = 513632, upload-time = "2025-12-15T19:21:03.836Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ab/a9/e94a9d5224107d7ce3cc1fab8d5dc97f5ea351ccc6322ee4fb661da94e35/tornado-6.5.4-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:d6241c1a16b1c9e4cc28148b1cda97dd1c6cb4fb7068ac1bedc610768dff0ba9", size = 443909, upload-time = "2025-12-15T19:20:48.382Z" }, + { url = "https://files.pythonhosted.org/packages/db/7e/f7b8d8c4453f305a51f80dbb49014257bb7d28ccb4bbb8dd328ea995ecad/tornado-6.5.4-cp39-abi3-macosx_10_9_x86_64.whl", hash = "sha256:2d50f63dda1d2cac3ae1fa23d254e16b5e38153758470e9956cbc3d813d40843", size = 442163, upload-time = "2025-12-15T19:20:49.791Z" }, + { url = "https://files.pythonhosted.org/packages/ba/b5/206f82d51e1bfa940ba366a8d2f83904b15942c45a78dd978b599870ab44/tornado-6.5.4-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d1cf66105dc6acb5af613c054955b8137e34a03698aa53272dbda4afe252be17", size = 445746, upload-time = "2025-12-15T19:20:51.491Z" }, + { url = "https://files.pythonhosted.org/packages/8e/9d/1a3338e0bd30ada6ad4356c13a0a6c35fbc859063fa7eddb309183364ac1/tornado-6.5.4-cp39-abi3-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:50ff0a58b0dc97939d29da29cd624da010e7f804746621c78d14b80238669335", size = 445083, upload-time = "2025-12-15T19:20:52.778Z" }, + { url = "https://files.pythonhosted.org/packages/50/d4/e51d52047e7eb9a582da59f32125d17c0482d065afd5d3bc435ff2120dc5/tornado-6.5.4-cp39-abi3-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e5fb5e04efa54cf0baabdd10061eb4148e0be137166146fff835745f59ab9f7f", size = 445315, upload-time = "2025-12-15T19:20:53.996Z" }, + { url = "https://files.pythonhosted.org/packages/27/07/2273972f69ca63dbc139694a3fc4684edec3ea3f9efabf77ed32483b875c/tornado-6.5.4-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:9c86b1643b33a4cd415f8d0fe53045f913bf07b4a3ef646b735a6a86047dda84", size = 446003, upload-time = "2025-12-15T19:20:56.101Z" }, + { url = "https://files.pythonhosted.org/packages/d1/83/41c52e47502bf7260044413b6770d1a48dda2f0246f95ee1384a3cd9c44a/tornado-6.5.4-cp39-abi3-musllinux_1_2_i686.whl", hash = "sha256:6eb82872335a53dd063a4f10917b3efd28270b56a33db69009606a0312660a6f", size = 445412, upload-time = "2025-12-15T19:20:57.398Z" }, + { url = "https://files.pythonhosted.org/packages/10/c7/bc96917f06cbee182d44735d4ecde9c432e25b84f4c2086143013e7b9e52/tornado-6.5.4-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:6076d5dda368c9328ff41ab5d9dd3608e695e8225d1cd0fd1e006f05da3635a8", size = 445392, upload-time = "2025-12-15T19:20:58.692Z" }, + { url = "https://files.pythonhosted.org/packages/0c/1a/d7592328d037d36f2d2462f4bc1fbb383eec9278bc786c1b111cbbd44cfa/tornado-6.5.4-cp39-abi3-win32.whl", hash = "sha256:1768110f2411d5cd281bac0a090f707223ce77fd110424361092859e089b38d1", size = 446481, upload-time = "2025-12-15T19:21:00.008Z" }, + { url = "https://files.pythonhosted.org/packages/d6/6d/c69be695a0a64fd37a97db12355a035a6d90f79067a3cf936ec2b1dc38cd/tornado-6.5.4-cp39-abi3-win_amd64.whl", hash = "sha256:fa07d31e0cd85c60713f2b995da613588aa03e1303d75705dca6af8babc18ddc", size = 446886, upload-time = "2025-12-15T19:21:01.287Z" }, + { url = "https://files.pythonhosted.org/packages/50/49/8dc3fd90902f70084bd2cd059d576ddb4f8bb44c2c7c0e33a11422acb17e/tornado-6.5.4-cp39-abi3-win_arm64.whl", hash = "sha256:053e6e16701eb6cbe641f308f4c1a9541f91b6261991160391bfc342e8a551a1", size = 445910, upload-time = "2025-12-15T19:21:02.571Z" }, +] + +[[package]] +name = "tzdata" +version = "2025.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/5e/a7/c202b344c5ca7daf398f3b8a477eeb205cf3b6f32e7ec3a6bac0629ca975/tzdata-2025.3.tar.gz", hash = "sha256:de39c2ca5dc7b0344f2eba86f49d614019d29f060fc4ebc8a417896a620b56a7", size = 196772, upload-time = "2025-12-13T17:45:35.667Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c7/b0/003792df09decd6849a5e39c28b513c06e84436a54440380862b5aeff25d/tzdata-2025.3-py2.py3-none-any.whl", hash = "sha256:06a47e5700f3081aab02b2e513160914ff0694bce9947d6b76ebd6bf57cfc5d1", size = 348521, upload-time = "2025-12-13T17:45:33.889Z" }, +] + +[[package]] +name = "tzlocal" +version = "5.3.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "tzdata", marker = "sys_platform == 'win32'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/8b/2e/c14812d3d4d9cd1773c6be938f89e5735a1f11a9f184ac3639b93cef35d5/tzlocal-5.3.1.tar.gz", hash = "sha256:cceffc7edecefea1f595541dbd6e990cb1ea3d19bf01b2809f362a03dd7921fd", size = 30761, upload-time = "2025-03-05T21:17:41.549Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c2/14/e2a54fabd4f08cd7af1c07030603c3356b74da07f7cc056e600436edfa17/tzlocal-5.3.1-py3-none-any.whl", hash = "sha256:eb1a66c3ef5847adf7a834f1be0800581b683b5608e74f86ecbcef8ab91bb85d", size = 18026, upload-time = "2025-03-05T21:17:39.857Z" }, +] + +[[package]] +name = "urllib3" +version = "2.6.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/c7/24/5f1b3bdffd70275f6661c76461e25f024d5a38a46f04aaca912426a2b1d3/urllib3-2.6.3.tar.gz", hash = "sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed", size = 435556, upload-time = "2026-01-07T16:24:43.925Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/39/08/aaaad47bc4e9dc8c725e68f9d04865dbcb2052843ff09c97b08904852d84/urllib3-2.6.3-py3-none-any.whl", hash = "sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4", size = 131584, upload-time = "2026-01-07T16:24:42.685Z" }, +] + +[[package]] +name = "vine" +version = "5.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/bd/e4/d07b5f29d283596b9727dd5275ccbceb63c44a1a82aa9e4bfd20426762ac/vine-5.1.0.tar.gz", hash = "sha256:8b62e981d35c41049211cf62a0a1242d8c1ee9bd15bb196ce38aefd6799e61e0", size = 48980, upload-time = "2023-11-05T08:46:53.857Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/03/ff/7c0c86c43b3cbb927e0ccc0255cb4057ceba4799cd44ae95174ce8e8b5b2/vine-5.1.0-py3-none-any.whl", hash = "sha256:40fdf3c48b2cfe1c38a49e9ae2da6fda88e4794c810050a728bd7413811fb1dc", size = 9636, upload-time = "2023-11-05T08:46:51.205Z" }, +] + +[[package]] +name = "wcwidth" +version = "0.5.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/64/6e/62daec357285b927e82263a81f3b4c1790215bc77c42530ce4a69d501a43/wcwidth-0.5.0.tar.gz", hash = "sha256:f89c103c949a693bf563377b2153082bf58e309919dfb7f27b04d862a0089333", size = 246585, upload-time = "2026-01-27T01:31:44.942Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f2/3e/45583b67c2ff08ad5a582d316fcb2f11d6cf0a50c7707ac09d212d25bc98/wcwidth-0.5.0-py3-none-any.whl", hash = "sha256:1efe1361b83b0ff7877b81ba57c8562c99cf812158b778988ce17ec061095695", size = 93772, upload-time = "2026-01-27T01:31:43.432Z" }, +] + +[[package]] +name = "xmlsec" +version = "1.3.17" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "lxml" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/49/14/538b75379e6ab8f688f14d8663e2ab138d9c778bac4999d155b5f33c71c1/xmlsec-1.3.17.tar.gz", hash = "sha256:f3fac9ae679f66585925cc00c5f6839ae36c1d03157619571dee18acc05b9c01", size = 115637, upload-time = "2025-11-11T16:20:46.019Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/77/2c/0169a383769d563f6582d5b3a2ccf7f612f4bf98cbd417a27287443b63c5/xmlsec-1.3.17-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:5d0e69291f90b28e9442d8e0e69d3e06cede8a3c44e856413fd284de81ce2888", size = 3450932, upload-time = "2025-11-11T16:20:14.334Z" }, + { url = "https://files.pythonhosted.org/packages/71/ed/be65923c5aa3097f422af3d917ffda15590ab0f4c9a5a5d78d520ae7fc9a/xmlsec-1.3.17-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:5616ad5016794b0dd41d03eef5b721e31bb306353226b25fc88fedb7d4f7c37e", size = 3847248, upload-time = "2025-11-11T16:20:15.71Z" }, + { url = "https://files.pythonhosted.org/packages/1b/58/24e047e6a5f0c266e949c7c03c2770163038e7abd322c95bfbae021f9477/xmlsec-1.3.17-cp314-cp314-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b4be73fbde421d6188300e02ad92d2d5435c708a35ede8124ebdf6b00330d7cb", size = 4428590, upload-time = "2025-11-11T16:20:18.012Z" }, + { url = "https://files.pythonhosted.org/packages/d6/23/e5212147d227da638311287045c90a47bb560b0552cc7daca0919a870220/xmlsec-1.3.17-cp314-cp314-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a3961102a6ba8250670814bd1086139fb918e03bf146ef85dc8b6084a9b027d1", size = 4169645, upload-time = "2025-11-11T16:20:19.646Z" }, + { url = "https://files.pythonhosted.org/packages/68/5d/ed1f6d18f7c10dc61f791aade218b2271b4fc3092dd499036bc391a32945/xmlsec-1.3.17-cp314-cp314-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:728058a1623a620811a3cdf2dd4894b5d9413ede20c8ddddf98fdea5eafe9529", size = 3878531, upload-time = "2025-11-11T16:20:20.964Z" }, + { url = "https://files.pythonhosted.org/packages/dd/eb/09050fd1dc109ebe5bfefd0eab0829cab4fae51b3a244949e31dccf144e1/xmlsec-1.3.17-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:593264c192d1836162d75478c8b1cb5874f3b69dcc5bdfac642a0933abefa93a", size = 4464490, upload-time = "2025-11-11T16:20:22.369Z" }, + { url = "https://files.pythonhosted.org/packages/e9/2e/52e9ef2b5c8ef2470e1e3ae3ef89f7ac45eecd267c7b3bab8a7ad7d68af1/xmlsec-1.3.17-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:3d1fc1fbe2e8585a3f468cf4154d0ec36cd95a15e68429ad8cc8ccd7c04e84ae", size = 4214358, upload-time = "2025-11-11T16:20:24.073Z" }, + { url = "https://files.pythonhosted.org/packages/ab/cd/5e9061027a203fd083b6058c2948ee1a16bd909d3a0e331e054362ca550e/xmlsec-1.3.17-cp314-cp314-win_amd64.whl", hash = "sha256:e2bf1d07c4f97afeb957f626b8c3ebb8cef300efa0cb95599e936c69a66a1b17", size = 2513252, upload-time = "2025-11-11T16:20:25.738Z" }, + { url = "https://files.pythonhosted.org/packages/93/e9/b2f4b9092434b854bcae0d901c10a7e96d2a12d03cc35dbf7a7b2c91502b/xmlsec-1.3.17-cp314-cp314-win_arm64.whl", hash = "sha256:3a6ced8c7744e896cb5a9fd0156d204df3143a62bae11be91cab8e9743d40eec", size = 2328451, upload-time = "2025-11-11T16:20:27.247Z" }, +] From 6eac1d3513e5b02abae3e3e5071d5a039321a71a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janusz=20Mik=C5=82uszka?= Date: Tue, 27 Jan 2026 22:14:48 +0100 Subject: [PATCH 15/30] Add SeaweedFS auth script --- Makefile | 8 +- README.md | 129 +++++++++++++++++++++- docs/SEAWEEDFS_AUTH.md | 186 ++++++++++++++++++++++++++++++++ scripts/setup_seaweedfs_auth.py | 130 ++++++++++++++++++++++ 4 files changed, 451 insertions(+), 2 deletions(-) create mode 100644 docs/SEAWEEDFS_AUTH.md create mode 100644 scripts/setup_seaweedfs_auth.py diff --git a/Makefile b/Makefile index 1969fa4..a29e380 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: help install install-dev sync lock test test-cov test-fast lint format clean runserver migrate makemigrations shell superuser collectstatic docker-up docker-down docker-logs docker-build docker-ps celery celery-beat celery-flower +.PHONY: help install install-dev sync lock test test-cov test-fast lint format clean runserver migrate makemigrations shell superuser collectstatic docker-up docker-down docker-logs docker-build docker-ps celery celery-beat celery-flower seaweedfs-auth # Default target help: @@ -27,6 +27,7 @@ help: @echo " make celery - Run Celery worker" @echo " make celery-beat - Run Celery beat scheduler" @echo " make celery-flower - Run Flower (Celery monitoring)" + @echo " make seaweedfs-auth - Create SeaweedFS S3 access keys" # Installation install: @@ -156,3 +157,8 @@ celery-beat: celery-flower: uv run celery -A config.celery flower + +# SeaweedFS commands +seaweedfs-auth: + @echo "Creating SeaweedFS S3 access keys..." + @uv run python scripts/setup_seaweedfs_auth.py --endpoint ${ENDPOINT:-http://localhost:8333} --output-format env diff --git a/README.md b/README.md index 41e7ab0..a46b277 100644 --- a/README.md +++ b/README.md @@ -1 +1,128 @@ -# gallery \ No newline at end of file +# SmartGallery + +Intelligent Photo Gallery with AI Tagging, built with Django and SeaweedFS. + +## Features + +- 📷 **Photo Gallery Management**: Organize photos into galleries and albums +- 🤖 **AI-Powered Tagging**: Automatic image tagging using YOLO +- 🔍 **OCR Support**: Extract text from images using PaddleOCR +- 🔐 **Secure File Access**: Signed URLs for media files +- 👥 **Sharing**: Share galleries with other users +- 🏷️ **Tagging System**: User-defined and AI-generated tags +- 🌐 **REST API**: Full REST API using Django REST Framework +- 📦 **SeaweedFS Storage**: Scalable distributed file storage + +## Quick Start + +See [QUICK_START.md](QUICK_START.md) for detailed setup instructions. + +### Basic Setup + +1. **Clone and configure:** + ```bash + git clone + cd gallery + cp .env.example .env + # Edit .env with your settings + ``` + +2. **Install dependencies:** + ```bash + make install-dev + ``` + +3. **Start services:** + ```bash + make docker-up + ``` + +4. **Run migrations:** + ```bash + make migrate + ``` + +5. **Create superuser:** + ```bash + make superuser + ``` + +## Documentation + +- **[QUICK_START.md](QUICK_START.md)** - Quick setup guide +- **[docs/DEPLOYMENT.md](docs/DEPLOYMENT.md)** - Production deployment guide +- **[docs/SEAWEEDFS_AUTH.md](docs/SEAWEEDFS_AUTH.md)** - SeaweedFS authentication setup +- **[docs/NGINX_SIGNED_URLS.md](docs/NGINX_SIGNED_URLS.md)** - Nginx signed URL configuration +- **[docs/WIREGUARD_SETUP.md](docs/WIREGUARD_SETUP.md)** - WireGuard VPN setup for split deployment +- **[README_TESTING.md](README_TESTING.md)** - Testing guide + +## SeaweedFS Authentication + +To enable SeaweedFS S3 storage with authentication: + +1. **Start SeaweedFS:** + ```bash + make docker-up + ``` + +2. **Create access keys:** + ```bash + make seaweedfs-auth + ``` + +3. **Add credentials to `.env`:** + ```bash + storage.use_s3=True + storage.s3.access_key_id= + storage.s3.secret_access_key= + ``` + +See [docs/SEAWEEDFS_AUTH.md](docs/SEAWEEDFS_AUTH.md) for detailed instructions. + +## Development + +### Running Tests + +```bash +make test # Run all tests +make test-cov # Run with coverage +make test-fast # Run in parallel +``` + +### Code Quality + +```bash +make lint # Run linters +make format # Format code +``` + +### Django Commands + +```bash +make runserver # Start development server +make migrate # Run migrations +make makemigrations # Create migrations +make shell # Django shell +make superuser # Create superuser +``` + +## Project Structure + +``` +gallery/ +├── app/ # Django application +│ ├── config/ # Django settings and configuration +│ ├── gallery/ # Gallery app (models, views, serializers) +│ └── tests/ # Test suite +├── docs/ # Documentation +├── scripts/ # Utility scripts +├── nginx/ # Nginx configuration +├── docker-compose.yml # Local development +├── docker-compose.vps.yml # VPS deployment +├── docker-compose.gpu.yml # GPU worker deployment +└── Makefile # Common commands +``` + +## License + +[Add your license here] diff --git a/docs/SEAWEEDFS_AUTH.md b/docs/SEAWEEDFS_AUTH.md new file mode 100644 index 0000000..5b90314 --- /dev/null +++ b/docs/SEAWEEDFS_AUTH.md @@ -0,0 +1,186 @@ +# SeaweedFS S3 Authentication Setup + +This guide explains how to set up authentication for SeaweedFS S3 API in the Gallery application. + +## Overview + +SeaweedFS provides S3-compatible API with embedded IAM (Identity and Access Management) for authentication. Unlike traditional S3 services, SeaweedFS doesn't have default credentials - you need to create access keys via the IAM API after starting the service. + +## Quick Start + +### 1. Start SeaweedFS + +Start your Docker services: + +```bash +# For VPS deployment +make docker-up-vps + +# Or for local development +make docker-up +``` + +Wait for SeaweedFS to be ready (check with `docker-compose ps` or `make docker-ps`). + +### 2. Create Access Keys + +Use the provided script to create access keys: + +```bash +# Using the script (recommended) +python scripts/setup_seaweedfs_auth.py + +# Or with custom endpoint +python scripts/setup_seaweedfs_auth.py --endpoint http://localhost:8333 + +# Output in .env format +python scripts/setup_seaweedfs_auth.py --output-format env + +# Output in YAML format +python scripts/setup_seaweedfs_auth.py --output-format yaml +``` + +### 3. Configure Credentials + +Add the generated credentials to your configuration: + +**Option A: Using .env file** + +```bash +# Add to .env file +storage.s3.access_key_id=your-access-key-id +storage.s3.secret_access_key=your-secret-access-key +storage.use_s3=True +``` + +**Option B: Using config.yaml** + +```yaml +storage: + use_s3: true + s3: + access_key_id: "your-access-key-id" + secret_access_key: "your-secret-access-key" + endpoint_url: "http://seaweedfs:8333" + bucket_name: "gallery" + region_name: "us-east-1" + use_ssl: false +``` + +### 4. Restart Services + +Restart your web service to apply the new credentials: + +```bash +docker-compose restart web +# Or +make docker-up-vps +``` + +## Manual Setup (Alternative) + +If you prefer to create access keys manually: + +### Using curl + +```bash +# Create access key for 'admin' identity +curl -X POST "http://localhost:8333/iam/createAccessKey?identity=admin" + +# Response will be JSON: +# { +# "accessKeyId": "your-access-key-id", +# "secretAccessKey": "your-secret-access-key" +# } +``` + +### Using Python + +```python +import requests + +response = requests.post("http://localhost:8333/iam/createAccessKey?identity=admin") +data = response.json() +print(f"Access Key ID: {data['accessKeyId']}") +print(f"Secret Access Key: {data['secretAccessKey']}") +``` + +## IAM API Endpoints + +SeaweedFS IAM API provides several endpoints for managing access keys: + +- **Create Access Key**: `POST /iam/createAccessKey?identity=` +- **List Access Keys**: `GET /iam/listAccessKeys?identity=` +- **Delete Access Key**: `DELETE /iam/deleteAccessKey?identity=&accessKeyId=` + +For more details, see [SeaweedFS IAM API documentation](https://github.com/seaweedfs/seaweedfs/wiki/Amazon-IAM-API). + +## Security Considerations + +1. **Store Credentials Securely**: Never commit access keys to version control. Use `.env` files (which are in `.gitignore`) or secure secret management. + +2. **Network Security**: + - SeaweedFS is only accessible within the Docker network (`gallery_network`) + - For VPS deployment, use WireGuard VPN to secure access + - Don't expose SeaweedFS ports publicly + +3. **Identity Management**: + - Use different identities for different applications or environments + - Rotate access keys periodically + - Delete unused access keys + +4. **Production Setup**: + - Use strong, randomly generated access keys + - Consider using environment variables from a secrets manager + - Enable SSL/TLS if accessing SeaweedFS over untrusted networks + +## Troubleshooting + +### Error: "Could not connect to SeaweedFS" + +- Ensure SeaweedFS container is running: `docker-compose ps` +- Check if the endpoint URL is correct (default: `http://localhost:8333`) +- For Docker network access, use `http://seaweedfs:8333` from within containers + +### Error: "HTTP 404 - IAM API not found" + +- Ensure you're using SeaweedFS version 3.x or later (IAM is enabled by default) +- Check that the S3 port (8333) is correctly exposed +- Verify the IAM API is enabled (it should be by default) + +### Access Keys Not Working + +- Verify credentials are correctly set in `.env` or `config.yaml` +- Ensure `storage.use_s3=True` is set +- Check Django logs for authentication errors +- Verify the bucket exists: `curl http://localhost:8333/s3/buckets` + +### Creating Bucket + +If the bucket doesn't exist, create it: + +```bash +# Using curl +curl -X PUT "http://localhost:8333/s3/bucket?name=gallery" + +# Or using AWS CLI (if configured) +aws --endpoint-url=http://localhost:8333 s3 mb s3://gallery +``` + +## Makefile Commands + +For convenience, you can use: + +```bash +# Create SeaweedFS access keys +make seaweedfs-auth + +# Create keys with custom endpoint +make seaweedfs-auth ENDPOINT=http://seaweedfs:8333 +``` + +## References + +- [SeaweedFS S3 API Documentation](https://github.com/seaweedfs/seaweedfs/wiki/Amazon-S3-API) +- [SeaweedFS IAM API Documentation](https://github.com/seaweedfs/seaweedfs/wiki/Amazon-IAM-API) +- [Django Storages Documentation](https://django-storages.readthedocs.io/) diff --git a/scripts/setup_seaweedfs_auth.py b/scripts/setup_seaweedfs_auth.py new file mode 100644 index 0000000..44cb685 --- /dev/null +++ b/scripts/setup_seaweedfs_auth.py @@ -0,0 +1,130 @@ +#!/usr/bin/env python3 +""" +Setup SeaweedFS S3 authentication by creating access keys via IAM API. + +This script creates access keys for SeaweedFS S3 API and outputs them +for use in your .env file or config.yaml. + +Usage: + python scripts/setup_seaweedfs_auth.py [--endpoint URL] [--identity IDENTITY] [--output-format FORMAT] + +Examples: + # Create keys with default settings + python scripts/setup_seaweedfs_auth.py + + # Create keys for specific identity + python scripts/setup_seaweedfs_auth.py --identity admin + + # Output in .env format + python scripts/setup_seaweedfs_auth.py --output-format env + + # Output in YAML format + python scripts/setup_seaweedfs_auth.py --output-format yaml +""" +import argparse +import json +import sys +from urllib.parse import urljoin +from urllib.request import urlopen, Request +from urllib.error import URLError, HTTPError + + +def create_access_key(endpoint, identity="admin"): + """ + Create an access key via SeaweedFS IAM API. + + Args: + endpoint: SeaweedFS S3/IAM endpoint URL (e.g., http://localhost:8333) + identity: Identity name for the access key (default: "admin") + + Returns: + dict: Response containing access_key_id and secret_access_key + """ + url = urljoin(endpoint.rstrip('/') + '/', f'iam/createAccessKey?identity={identity}') + + try: + request = Request(url, method='POST') + with urlopen(request, timeout=10) as response: + data = json.loads(response.read().decode()) + return data + except HTTPError as e: + print(f"Error: HTTP {e.code} - {e.reason}", file=sys.stderr) + if e.code == 404: + print("Make sure SeaweedFS is running and IAM API is enabled.", file=sys.stderr) + sys.exit(1) + except URLError as e: + print(f"Error: Could not connect to SeaweedFS at {endpoint}", file=sys.stderr) + print(f"Details: {e.reason}", file=sys.stderr) + sys.exit(1) + except json.JSONDecodeError as e: + print(f"Error: Invalid JSON response from SeaweedFS", file=sys.stderr) + print(f"Details: {e}", file=sys.stderr) + sys.exit(1) + + +def format_output(data, output_format): + """Format the access key data for output.""" + access_key_id = data.get('accessKeyId', '') + secret_access_key = data.get('secretAccessKey', '') + + if not access_key_id or not secret_access_key: + print("Error: Invalid response from SeaweedFS IAM API", file=sys.stderr) + print(f"Response: {data}", file=sys.stderr) + sys.exit(1) + + if output_format == 'env': + print("# SeaweedFS S3 Access Keys (add to .env file)") + print(f"storage.s3.access_key_id={access_key_id}") + print(f"storage.s3.secret_access_key={secret_access_key}") + elif output_format == 'yaml': + print("# SeaweedFS S3 Access Keys (add to config.yaml)") + print("storage:") + print(" s3:") + print(f" access_key_id: {access_key_id}") + print(f" secret_access_key: {secret_access_key}") + else: # default/json + print(json.dumps({ + 'access_key_id': access_key_id, + 'secret_access_key': secret_access_key + }, indent=2)) + + +def main(): + parser = argparse.ArgumentParser( + description='Create SeaweedFS S3 access keys via IAM API', + formatter_class=argparse.RawDescriptionHelpFormatter, + epilog=__doc__ + ) + parser.add_argument( + '--endpoint', + default='http://localhost:8333', + help='SeaweedFS S3/IAM endpoint URL (default: http://localhost:8333)' + ) + parser.add_argument( + '--identity', + default='admin', + help='Identity name for the access key (default: admin)' + ) + parser.add_argument( + '--output-format', + choices=['env', 'yaml', 'json'], + default='json', + help='Output format (default: json)' + ) + + args = parser.parse_args() + + print(f"Creating access key for identity '{args.identity}'...", file=sys.stderr) + print(f"Connecting to {args.endpoint}...", file=sys.stderr) + + data = create_access_key(args.endpoint, args.identity) + + print("\n✓ Access key created successfully!\n", file=sys.stderr) + format_output(data, args.output_format) + + print("\n⚠️ IMPORTANT: Save these credentials securely!", file=sys.stderr) + print(" Add them to your .env file or config.yaml", file=sys.stderr) + + +if __name__ == '__main__': + main() From b8636628c117f2f0409d17a98f0da75c9b949a2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janusz=20Mik=C5=82uszka?= Date: Wed, 28 Jan 2026 21:56:28 +0100 Subject: [PATCH 16/30] Some minor fixes --- .dockerignore | 38 +++++++ .gitignore | 8 +- app/config/config_loader.py | 6 +- app/config/logging_config.py | 27 +++++ app/config/settings.py | 195 +++++++++++++++++++++++++++++++++-- config.example.yaml | 16 +++ docker-compose.vps.yml | 36 ++++--- 7 files changed, 302 insertions(+), 24 deletions(-) create mode 100644 .dockerignore create mode 100644 app/config/logging_config.py diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..59cd293 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,38 @@ +.git +.gitignore +.github +.cursor + +__pycache__/ +*.py[cod] +*.pyo +*.pyd + +.venv/ +venv/ +env/ + +.pytest_cache/ +htmlcov/ +.coverage +.coverage.* +junit.xml + +# Local/dev config & secrets +.env +.env.* +config.yaml + +# Runtime/generated artifacts +app/celerybeat-schedule +app/celerybeat-schedule.* +**/celerybeat-schedule +**/celerybeat-schedule.* + +# Media/static outputs (generated or mounted at runtime) +media/ +static/ +staticfiles/ +app/media/ +app/static/ +app/staticfiles/ diff --git a/.gitignore b/.gitignore index 39c349b..7af3525 100644 --- a/.gitignore +++ b/.gitignore @@ -42,7 +42,13 @@ config.yaml Thumbs.db # Docker -.dockerignore + +# Celery beat schedule (runtime files) +celerybeat-schedule +celerybeat-schedule* +celerybeat-schedule.* +**/celerybeat-schedule +**/celerybeat-schedule.* # Test artifacts .coverage diff --git a/app/config/config_loader.py b/app/config/config_loader.py index be494b5..b1dc177 100644 --- a/app/config/config_loader.py +++ b/app/config/config_loader.py @@ -18,7 +18,7 @@ def __init__(self, config_path: Optional[Path] = None): Args: config_path: Path to YAML config file. If None, tries common locations. """ - self.config_path = config_path or self._find_config_file() + self.config_path = (Path(config_path) if isinstance(config_path, str) else config_path) or self._find_config_file() self.config: Dict[str, Any] = {} self._load_config() @@ -164,9 +164,9 @@ def get_int(self, key_path: str, default: int = 0, env_var: Optional[str] = None _config_loader: Optional[ConfigLoader] = None -def get_config_loader() -> ConfigLoader: +def get_config_loader(path: Optional[Path|str] = None) -> ConfigLoader: """Get or create the global config loader instance.""" global _config_loader if _config_loader is None: - _config_loader = ConfigLoader() + _config_loader = ConfigLoader(path) return _config_loader diff --git a/app/config/logging_config.py b/app/config/logging_config.py new file mode 100644 index 0000000..4af16f8 --- /dev/null +++ b/app/config/logging_config.py @@ -0,0 +1,27 @@ +""" +Logging configuration helper for structured logging. + +This module provides a convenient way to get loggers configured with JSON formatting. +Use this instead of importing logging directly for better structured logging. +""" + +import logging + + +def get_logger(name: str = None): + """ + Get a logger instance configured with JSON formatting. + + Args: + name: Logger name (typically __name__). If None, uses 'root'. + + Returns: + A logging.Logger instance configured with JSON formatting. + + Example: + from config.logging_config import get_logger + + logger = get_logger(__name__) + logger.info("User logged in", extra={'user_id': 123, 'ip_address': '192.168.1.1'}) + """ + return logging.getLogger(name) diff --git a/app/config/settings.py b/app/config/settings.py index 1b44093..ad90928 100644 --- a/app/config/settings.py +++ b/app/config/settings.py @@ -11,6 +11,9 @@ """ import os +import json +import logging +from datetime import datetime from pathlib import Path from dotenv import load_dotenv @@ -27,7 +30,7 @@ # Load YAML configuration from .config_loader import get_config_loader -config = get_config_loader() +config = get_config_loader(os.getenv('CONFIG_PATH', None)) # Quick-start development settings - unsuitable for production @@ -42,7 +45,7 @@ DEBUG = config.get_bool('django.debug', False) # Uses DJANGO_ALLOWED_HOSTS env var or config.yaml django.allowed_hosts -ALLOWED_HOSTS = config.get_list('django.allowed_hosts', ['localhost', '127.0.0.1']) +ALLOWED_HOSTS = config.get_list('django.allowed_hosts', ['localhost', '127.0.0.1', "0.0.0.0"]) # Application definition @@ -158,11 +161,48 @@ # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/5.2/howto/static-files/ -STATIC_URL = config.get('static_files.static_url', '/static/') -STATIC_ROOT = BASE_DIR / config.get('static_files.static_root', 'staticfiles') - -MEDIA_URL = config.get('static_files.media_url', '/media/') -MEDIA_ROOT = BASE_DIR / config.get('static_files.media_root', 'media') +def _resolve_root_path(value: str, base_dir: Path) -> Path: + """ + Resolve a filesystem path from config/env. + + - If `value` is absolute, use it as-is. + - If `value` is relative, resolve it under `base_dir`. + """ + p = Path(value) + return p if p.is_absolute() else (base_dir / p) + +def _normalize_url_prefix(value: str, default: str) -> str: + """ + Normalize URL prefixes like STATIC_URL and MEDIA_URL. + + Ensures: + - starts with '/' + - ends with '/' + """ + v = (value or "").strip() + if not v: + v = default + if not v.startswith("/"): + v = "/" + v + if not v.endswith("/"): + v = v + "/" + return v + + +# Allow env vars to override config.yaml (useful in Docker/K8s) +STATIC_URL = _normalize_url_prefix( + os.getenv('STATIC_URL', config.get('static_files.static_url', '/static/')), + default='/static/', +) +STATIC_ROOT_VALUE = os.getenv('STATIC_ROOT', config.get('static_files.static_root', 'staticfiles')) +STATIC_ROOT = _resolve_root_path(STATIC_ROOT_VALUE, BASE_DIR) + +MEDIA_URL = _normalize_url_prefix( + os.getenv('MEDIA_URL', config.get('static_files.media_url', '/media/')), + default='/media/', +) +MEDIA_ROOT_VALUE = os.getenv('MEDIA_ROOT', config.get('static_files.media_root', 'media')) +MEDIA_ROOT = _resolve_root_path(MEDIA_ROOT_VALUE, BASE_DIR) # SeaweedFS / S3 Storage Configuration if USE_S3: @@ -306,3 +346,144 @@ 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination', 'PAGE_SIZE': 50, } + +# Structured Logging Configuration +class JSONFormatter(logging.Formatter): + """Custom JSON formatter for structured logging.""" + + def format(self, record): + """Format log record as JSON.""" + log_data = { + 'timestamp': datetime.utcnow().isoformat() + 'Z', + 'level': record.levelname, + 'logger': record.name, + 'message': record.getMessage(), + 'module': record.module, + 'function': record.funcName, + 'line': record.lineno, + } + + # Add exception info if present + if record.exc_info: + log_data['exception'] = self.formatException(record.exc_info) + + # Add extra fields from record + if hasattr(record, 'user_id'): + log_data['user_id'] = record.user_id + if hasattr(record, 'request_id'): + log_data['request_id'] = record.request_id + if hasattr(record, 'ip_address'): + log_data['ip_address'] = record.ip_address + if hasattr(record, 'path'): + log_data['path'] = record.path + if hasattr(record, 'method'): + log_data['method'] = record.method + if hasattr(record, 'status_code'): + log_data['status_code'] = record.status_code + if hasattr(record, 'duration'): + log_data['duration'] = record.duration + + # Add any other extra fields + for key, value in record.__dict__.items(): + if key not in [ + 'name', 'msg', 'args', 'created', 'filename', 'funcName', + 'levelname', 'levelno', 'lineno', 'module', 'msecs', + 'message', 'pathname', 'process', 'processName', 'relativeCreated', + 'thread', 'threadName', 'exc_info', 'exc_text', 'stack_info', + 'asctime', 'taskName', 'task_id' + ]: + log_data[key] = value + + # Never let logging crash the app: coerce unknown objects (e.g. request/socket) to string. + return json.dumps(log_data, ensure_ascii=False, default=str) + +# Get log level from config or environment, default to INFO +LOG_LEVEL = config.get('logging.level', os.getenv('LOG_LEVEL', 'INFO')).upper() +LOG_FILE = config.get('logging.file', os.getenv('LOG_FILE', None)) +LOG_FILE_MAX_BYTES = config.get_int('logging.file_max_bytes', 10 * 1024 * 1024) # 10MB +LOG_FILE_BACKUP_COUNT = config.get_int('logging.file_backup_count', 5) + +# Configure logging handlers +handlers = { + 'console': { + 'class': 'logging.StreamHandler', + 'formatter': 'json', + 'level': LOG_LEVEL, + }, +} + +# Add file handler if log file is configured +if LOG_FILE: + handlers['file'] = { + 'class': 'logging.handlers.RotatingFileHandler', + 'filename': LOG_FILE, + 'maxBytes': LOG_FILE_MAX_BYTES, + 'backupCount': LOG_FILE_BACKUP_COUNT, + 'formatter': 'json', + 'level': LOG_LEVEL, + } + +LOGGING = { + 'version': 1, + 'disable_existing_loggers': False, + 'formatters': { + 'json': { + '()': JSONFormatter, + }, + 'verbose': { + 'format': '{levelname} {asctime} {module} {process:d} {thread:d} {message}', + 'style': '{', + }, + 'simple': { + 'format': '{levelname} {message}', + 'style': '{', + }, + }, + 'handlers': handlers, + 'root': { + 'handlers': list(handlers.keys()), + 'level': LOG_LEVEL, + }, + 'loggers': { + 'django': { + 'handlers': list(handlers.keys()), + 'level': config.get('logging.django_level', os.getenv('DJANGO_LOG_LEVEL', 'INFO')).upper(), + 'propagate': False, + }, + 'django.request': { + 'handlers': list(handlers.keys()), + 'level': config.get('logging.django_request_level', os.getenv('DJANGO_REQUEST_LOG_LEVEL', 'WARNING')).upper(), + 'propagate': False, + }, + 'django.server': { + 'handlers': list(handlers.keys()), + 'level': config.get('logging.django_server_level', os.getenv('DJANGO_SERVER_LOG_LEVEL', 'INFO')).upper(), + 'propagate': False, + }, + 'django.db.backends': { + 'handlers': list(handlers.keys()), + 'level': config.get('logging.django_db_level', os.getenv('DJANGO_DB_LOG_LEVEL', 'WARNING')).upper(), + 'propagate': False, + }, + 'gallery': { + 'handlers': list(handlers.keys()), + 'level': LOG_LEVEL, + 'propagate': False, + }, + 'celery': { + 'handlers': list(handlers.keys()), + 'level': config.get('logging.celery_level', os.getenv('CELERY_LOG_LEVEL', 'INFO')).upper(), + 'propagate': False, + }, + 'boto3': { + 'handlers': list(handlers.keys()), + 'level': config.get('logging.boto3_level', os.getenv('BOTO3_LOG_LEVEL', 'WARNING')).upper(), + 'propagate': False, + }, + 'botocore': { + 'handlers': list(handlers.keys()), + 'level': config.get('logging.botocore_level', os.getenv('BOTOCORE_LOG_LEVEL', 'WARNING')).upper(), + 'propagate': False, + }, + }, +} diff --git a/config.example.yaml b/config.example.yaml index 8d3e8f9..37de063 100644 --- a/config.example.yaml +++ b/config.example.yaml @@ -71,3 +71,19 @@ static_files: server: gunicorn_workers: 4 gunicorn_timeout: 120 + +logging: + # Log level: DEBUG, INFO, WARNING, ERROR, CRITICAL + level: "INFO" + # Optional: Log file path (enables file logging with rotation) + # file: "/var/log/gallery/app.log" + file_max_bytes: 10485760 # 10MB + file_backup_count: 5 + # Per-logger levels (optional, defaults to 'level' above) + django_level: "INFO" + django_request_level: "WARNING" + django_server_level: "INFO" + django_db_level: "WARNING" + celery_level: "INFO" + boto3_level: "WARNING" + botocore_level: "WARNING" diff --git a/docker-compose.vps.yml b/docker-compose.vps.yml index 4a95c96..528304c 100644 --- a/docker-compose.vps.yml +++ b/docker-compose.vps.yml @@ -57,26 +57,29 @@ services: - seaweedfs_data:/data networks: - gallery_network - healthcheck: - test: ["CMD-SHELL", "wget --quiet --tries=1 --spider http://localhost:9333/dir/status || exit 1"] - interval: 30s - timeout: 10s - retries: 3 - start_period: 10s + # healthcheck: + # test: ["CMD-SHELL", "wget --quiet --tries=1 --spider --timeout=5 http://localhost:8080/status || exit 1"] + # interval: 30s + # timeout: 10s + # retries: 5 + # start_period: 10s web: build: . container_name: gallery_web - command: sh -c "python manage.py migrate --noinput && gunicorn --bind 0.0.0.0:8000 --workers ${GUNICORN_WORKERS:-4} --timeout ${GUNICORN_TIMEOUT:-120} config.wsgi:application" + # command: sh -c "python manage.py migrate --noinput && gunicorn --bind 0.0.0.0:8000 --workers ${GUNICORN_WORKERS:-4} --timeout ${GUNICORN_TIMEOUT:-120} config.wsgi:application" + command: sh -c "python manage.py migrate --noinput && python3 manage.py runserver 0.0.0.0:8000" volumes: - ./app:/app - static_volume:/app/staticfiles - media_volume:/app/media configs: - source: gallery_config - target: /app/config.yaml + target: /config/config.yaml ports: - "8000:8000" + environment: + - CONFIG_PATH=/config/config.yaml env_file: - .env depends_on: @@ -84,8 +87,8 @@ services: condition: service_healthy redis: condition: service_healthy - seaweedfs: - condition: service_healthy + # seaweedfs: + # condition: service_healthy networks: - gallery_network @@ -98,7 +101,9 @@ services: - media_volume:/app/media configs: - source: gallery_config - target: /app/config.yaml + target: /config/config.yaml + environment: + - CONFIG_PATH=/config/config.yaml env_file: - .env depends_on: @@ -117,7 +122,9 @@ services: - ./app:/app configs: - source: gallery_config - target: /app/config.yaml + target: /config/config.yaml + environment: + - CONFIG_PATH=/config/config.yaml env_file: - .env depends_on: @@ -144,7 +151,9 @@ services: - "${FLOWER_PORT:-5555}:5555" configs: - source: gallery_config - target: /app/config.yaml + target: /config/config.yaml + environment: + - CONFIG_PATH=/config/config.yaml env_file: - .env depends_on: @@ -178,6 +187,7 @@ volumes: configs: gallery_config: + # external: true file: ./config.yaml networks: From 92d5fad7cade645bcb9e355acef34c0e03362741 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janusz=20Mik=C5=82uszka?= Date: Thu, 29 Jan 2026 22:49:05 +0100 Subject: [PATCH 17/30] Fix Makefile docker compose commands Add url for editing album and uploading images Fix signed urls for nginx --- .env.example | 2 +- Makefile | 22 ++--- app/config/settings.py | 18 +++- app/gallery/forms.py | 15 +-- app/gallery/template_views.py | 94 ++++++++++++++++++- app/gallery/templates/gallery/base.html | 2 +- .../templates/gallery/picture_upload.html | 86 +++++++++++++++++ app/gallery/urls.py | 4 +- app/gallery/utils.py | 33 ++++++- docker-compose.vps.yml | 8 +- nginx/nginx.conf | 28 ++++-- 11 files changed, 273 insertions(+), 39 deletions(-) create mode 100644 app/gallery/templates/gallery/picture_upload.html diff --git a/.env.example b/.env.example index 0aaa884..93eb12f 100644 --- a/.env.example +++ b/.env.example @@ -25,7 +25,7 @@ database.port=5432 # Authentication Configuration # Dot-separated format (matches YAML exactly) -authentication.account_email_verification=mandatory +authentication.account_email_verification=none # Options: 'mandatory', 'optional', or 'none' # Social Authentication - Google diff --git a/Makefile b/Makefile index a29e380..b896ecd 100644 --- a/Makefile +++ b/Makefile @@ -114,39 +114,39 @@ collectstatic: # Docker commands docker-up: - docker-compose up -d + docker compose up -d docker-down: - docker-compose down + docker compose down docker-logs: - docker-compose logs -f + docker compose logs -f docker-build: - docker-compose build + docker compose build docker-ps: - docker-compose ps + docker compose ps # Docker VPS specific docker-up-vps: - docker-compose -f docker-compose.vps.yml up -d + docker compose -f docker-compose.vps.yml up -d docker-down-vps: - docker-compose -f docker-compose.vps.yml down + docker compose -f docker-compose.vps.yml down docker-logs-vps: - docker-compose -f docker-compose.vps.yml logs -f + docker compose -f docker-compose.vps.yml logs -f # Docker GPU specific docker-up-gpu: - docker-compose -f docker-compose.gpu.yml up -d + docker compose -f docker-compose.gpu.yml up -d docker-down-gpu: - docker-compose -f docker-compose.gpu.yml down + docker compose -f docker-compose.gpu.yml down docker-logs-gpu: - docker-compose -f docker-compose.gpu.yml logs -f + docker compose -f docker-compose.gpu.yml logs -f # Celery commands celery: diff --git a/app/config/settings.py b/app/config/settings.py index ad90928..1c34b3e 100644 --- a/app/config/settings.py +++ b/app/config/settings.py @@ -220,6 +220,22 @@ def _normalize_url_prefix(value: str, default: str) -> str: # Use S3 for media files DEFAULT_FILE_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage' STATICFILES_STORAGE = 'storages.backends.s3boto3.S3StaticStorage' + STORAGES = { + 'default': { + 'BACKEND': 'storages.backends.s3boto3.S3Boto3Storage', + 'OPTIONS': { + 'bucket_name': AWS_STORAGE_BUCKET_NAME, + 'region_name': AWS_S3_REGION_NAME, + }, + }, + 'staticfiles': { + 'BACKEND': 'storages.backends.s3boto3.S3StaticStorage', + 'OPTIONS': { + 'bucket_name': AWS_STORAGE_BUCKET_NAME, + 'region_name': AWS_S3_REGION_NAME, + }, + }, + } # Default primary key field type # https://docs.djangoproject.com/en/5.2/ref/settings/#default-auto-field @@ -457,7 +473,7 @@ def format(self, record): }, 'django.server': { 'handlers': list(handlers.keys()), - 'level': config.get('logging.django_server_level', os.getenv('DJANGO_SERVER_LOG_LEVEL', 'INFO')).upper(), + 'level': config.get('logging.django_server_level', os.getenv('DJANGO_SERVER_LOG_LEVEL', 'WARNING')).upper(), 'propagate': False, }, 'django.db.backends': { diff --git a/app/gallery/forms.py b/app/gallery/forms.py index f82e533..176910c 100644 --- a/app/gallery/forms.py +++ b/app/gallery/forms.py @@ -30,15 +30,16 @@ def __init__(self, *args, **kwargs): def save(self, commit=True): gallery = super().save(commit=commit) + # print(f"Gallery: {gallery}") # Handle tags - tags_str = self.cleaned_data.get('tags', '') - if tags_str: - tag_names = [tag.strip() for tag in tags_str.split(',') if tag.strip()] - gallery.set_tags(tag_names) - elif commit: - # Clear tags if empty - gallery.tags.clear() + # tags_str = self.cleaned_data.get('tags', '') + # if tags_str: + # tag_names = [tag.strip() for tag in tags_str.split(',') if tag.strip()] + # gallery.set_tags(tag_names) + # elif commit: + # # Clear tags if empty + # gallery.tags.clear() return gallery diff --git a/app/gallery/template_views.py b/app/gallery/template_views.py index a425bc8..1c5feda 100644 --- a/app/gallery/template_views.py +++ b/app/gallery/template_views.py @@ -9,9 +9,11 @@ from django.views.decorators.http import require_http_methods from django.template.loader import render_to_string from .models import Gallery, Album, Picture, Tag -from .forms import GalleryForm, AlbumForm -from .utils import generate_signed_url +from .forms import GalleryForm, AlbumForm, PictureUploadForm +from .utils import generate_signed_url, upload_picture_file +import logging +logger = logging.getLogger(__name__) @login_required def gallery_list(request): @@ -209,7 +211,7 @@ def album_detail(request, pk): picture.signed_url = signed['url'] except Exception: picture.signed_url = None - + logger.warning(f"{pictures=}") context = { 'album': album, 'pictures': pictures, @@ -248,6 +250,30 @@ def album_create(request, gallery_id): return render(request, 'gallery/album_form.html', context) +@login_required +def album_edit(request, pk): + """Edit an album""" + album = get_object_or_404( + Album.objects.filter( + Q(gallery__owner=request.user) | Q(gallery__shared_with=request.user), + deleted_at__isnull=True + ), + pk=pk + ) + + if request.method == 'POST': + form = AlbumForm(request.POST, instance=album) + if form.is_valid(): + album = form.save() + messages.success(request, f'Album "{album.name}" updated successfully!') + return redirect('gallery:album_detail', pk=album.id) + else: + form = AlbumForm(instance=album) + + context = {'form': form, 'album': album, 'gallery': album.gallery} + return render(request, 'gallery/album_form.html', context) + + @login_required @require_http_methods(["POST"]) def album_add_tag(request, pk): @@ -295,6 +321,68 @@ def album_remove_tag(request, pk): return HttpResponse('') +@login_required +def picture_upload(request, album_id): + """Upload one or more pictures to an album""" + album = get_object_or_404( + Album.objects.filter( + Q(gallery__owner=request.user) | Q(gallery__shared_with=request.user), + deleted_at__isnull=True + ), + pk=album_id + ) + + if request.method == 'POST': + form = PictureUploadForm(request.POST, request.FILES, album=album) + if form.is_valid(): + uploaded_file = form.cleaned_data['file'] + width, height = None, None + try: + from PIL import Image + img = Image.open(uploaded_file) + width, height = img.size + uploaded_file.seek(0) + except Exception: + pass + + try: + file_id = upload_picture_file( + uploaded_file, + album_id=album.id, + content_type=getattr(uploaded_file, 'content_type', None), + ) + except Exception as e: + messages.error(request, f'Failed to save file: {e}') + context = {'form': form, 'album': album} + return render(request, 'gallery/picture_upload.html', context) + + picture = Picture( + album=album, + title=form.cleaned_data.get('title') or (uploaded_file.name or 'Untitled'), + description=form.cleaned_data.get('description', ''), + seaweedfs_file_id=file_id, + file_size=uploaded_file.size, + mime_type=getattr(uploaded_file, 'content_type', 'image/jpeg') or 'image/jpeg', + width=width, + height=height, + ) + picture.save() + + tags_str = form.cleaned_data.get('tags', '') + if tags_str: + tag_names = [t.strip() for t in tags_str.split(',') if t.strip()] + for tag_name in tag_names: + picture.add_tag(tag_name) + + messages.success(request, f'Picture "{picture.title}" uploaded successfully!') + return redirect('gallery:album_detail', pk=album.id) + else: + form = PictureUploadForm(album=album) + + context = {'form': form, 'album': album} + return render(request, 'gallery/picture_upload.html', context) + + @login_required def picture_detail(request, pk): """View picture details""" diff --git a/app/gallery/templates/gallery/base.html b/app/gallery/templates/gallery/base.html index f42a8e9..1928b78 100644 --- a/app/gallery/templates/gallery/base.html +++ b/app/gallery/templates/gallery/base.html @@ -44,7 +44,7 @@ {% block extra_head %}{% endblock %} - +