Merge pull request #958 from memeLab/new-ar-viewer

New AR viewer

Author: pablodiegoss

.env

@@ -1,4 +1,4 @@
-DJANGO_SECRET_KEY=local
+DJANGO_SECRET_KEY=local-dev-secret-key-not-for-production
 DJANGO_DEBUG=True
 USE_GRANIAN=False
 USE_POSTGRES=False

Dockerfile

@@ -8,7 +8,7 @@ ENV UV_PYTHON_VERSION=3.14.2 \
     UV_PYTHON_INSTALL_DIR=/python \
     UV_PYTHON_PREFERENCE=only-managed
 
-COPY --from=ghcr.io/astral-sh/uv:0.10.4 /uv /uvx /bin/
+COPY --from=ghcr.io/astral-sh/uv:0.11.25 /uv /uvx /bin/
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
@@ -18,6 +18,10 @@ RUN apt-get update && \
       curl \
       wget \
       git \
+      libavformat-dev \
+      libavcodec-dev \
+      libavutil-dev \
+      libswscale-dev \
   && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \
   && wget "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${dpkgArch}" -O /usr/local/bin/tini \
   && chmod +x /usr/local/bin/tini && tini --version \ 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "Jandig"
-version = "2.0.11"
+version = "3.0.0"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.13"
@@ -22,6 +22,7 @@ dependencies = [
   "granian[reload]>=2.5.0",
   "jinja2~=3.1",
   "markupsafe~=3.0",
+  "av>=14.0.0",
   "pillow~=12.2",
   "psycopg[binary,pool]>=3.2.9",
   "pymarker~=1.2",
@@ -38,12 +39,14 @@ dev = [
   "factory-boy~=3.3",
   "numpy>=2.3.1",
   "playwright~=1.49",
+  "pyopenssl>=26.3.0",
   "pytest-cov>=6.1.1",
   "pytest-django~=4.9",
   "pytest-playwright~=0.4",
   "pytest-xdist~=3.6",
   "pytest~=9.0",
   "ruff>=0.11.4",
+  "werkzeug>=3.1.8",
 ]
 
 
@@ -52,7 +55,7 @@ DJANGO_SETTINGS_MODULE = "config.test_settings"
 python_files = ["tests.py", "test_*.py", "*_tests.py"]
 testpaths = ["src/core", "src/users", "src/blog", "src/ui_tests"]
 pythonpath = "src"
-addopts="-n4"
+addopts="-n16"
 
 [tool.coverage.run]
 relative_files=true
@@ -72,3 +75,5 @@ target-version = "py313"
 profile="jinja"
 extension="jinja2"
 
+[tool.uv]
+exclude-newer="1 week"

src/config/jinja2.py

@@ -4,6 +4,8 @@
 from django.utils import translation
 from jinja2 import Environment
 
+from core.utils import filesizeformat
+
 
 def environment(**options):
     options["extensions"] = ["jinja2.ext.i18n"]
@@ -13,6 +15,7 @@ def environment(**options):
         {
             "static": staticfiles_storage.url,
             "url": reverse,
+            "enumerate": enumerate,
             "CUR_LANGUAGE": translation.get_language(),
             "languages": [
                 translation.get_language_info(code)
@@ -21,5 +24,7 @@ def environment(**options):
         }
     )
 
+    env.filters["filesizeformat"] = filesizeformat
+
     env.install_gettext_translations(translation, newstyle=True)
     return env

src/config/settings.py

@@ -52,7 +52,7 @@
 SENTRY_TRACES_SAMPLE_RATE = env("SENTRY_TRACES_SAMPLE_RATE", default=0.1)
 SENTRY_PROFILES_SAMPLE_RATE = env("SENTRY_PROFILES_SAMPLE_RATE", default=0.1)
 SENTRY_ENVIRONMENT = env("SENTRY_ENVIRONMENT", default="")
-SENTRY_RELEASE = env("SENTRY_RELEASE", default="2.0.11")
+SENTRY_RELEASE = env("SENTRY_RELEASE", default="3.0.0")
 
 
 def traces_sampler(sampling_context):

src/core/admin.py

@@ -1,3 +1,4 @@
+import json
 from io import BytesIO
 
 from django.contrib import admin
@@ -6,11 +7,13 @@
 from django.db.models import Count
 from django.utils.html import format_html
 from PIL import Image
-from pymarker import generate_patt_from_image, remove_borders_from_image
+from pymarker import remove_borders_from_image
 
+from core.marker_utils import generate_marker_variants
+from core.media_dimensions import extract_dimensions
 from core.models import Artwork, Exhibit, Marker, Object, Sound
-from core.utils import generate_uuid_name, get_admin_url
-from core.views.api_views import MarkerGeneratorAPIView
+from core.spritesheet_converter import gif_to_spritesheet
+from core.utils import filesizeformat, get_admin_url
 
 HTML_LINK = '<a href="{}">{}</a>'
 
@@ -72,10 +75,8 @@ def exhibits_count(self, obj):
     exhibits_count.admin_order_field = "_exhibits_count"
 
     def filesize(self, obj):
-        """File size in MB"""
-        if obj.file_size > 0:
-            return f"{obj.file_size / 1024 / 1024:.2f} MB"
-        return obj.file_size
+        """File size in human-readable format"""
+        return filesizeformat(obj.file_size)
 
     filesize.short_description = "File Size"
     filesize.admin_order_field = "file_size"
@@ -92,59 +93,33 @@ def regenerate_marker_white_border(modeladmin, request, queryset):
     Regenerate markers with white inner border.
     This action will regenerate the marker images with a white inner border.
     """
-    regenerate_marker(queryset, inner_border=True)
+    for marker in queryset:
+        generate_marker_variants(marker, inner_border=True)
 
 
 @admin.action(description="Regenerate Marker Without Inner Border")
 def regenerate_marker_no_inner_border(modeladmin, request, queryset):
     """Regenerate markers without inner border.
     This action will regenerate the marker images without a white inner border.
     """
-    regenerate_marker(queryset, inner_border=False)
+    for marker in queryset:
+        generate_marker_variants(marker, inner_border=False)
 
 
 @admin.action(description="Remove Border")
 def remove_border(modeladmin, request, queryset):
-    """Remove border from markers.
-    This action will regenerate the marker images without any borders.
+    """Remove border from markers and regenerate all variants.
+    This action will strip borders from the current source, save as original,
+    then regenerate all variants.
     """
     for marker in queryset:
         with Image.open(marker.source) as image:
             pil_image = remove_borders_from_image(image)
             blob = BytesIO()
-            pil_image.save(blob, "JPEG")
-            uuid = generate_uuid_name()
-            filename = f"{uuid}.jpg"
-            marker.file_size = marker.source.size
-            marker.source.save(filename, File(blob), save=True)
-            patt_str = generate_patt_from_image(pil_image)
-            marker.patt.save(
-                f"{uuid}.patt",
-                ContentFile(patt_str.encode("utf-8")),
-                save=True,
-            )
-        marker.save()
-
-
-def regenerate_marker(queryset, inner_border=False):
-    for marker in queryset:
-        with Image.open(marker.source) as image:
-            pil_image = MarkerGeneratorAPIView.generate_marker(
-                image, inner_border=inner_border
-            )
-            blob = BytesIO()
-            pil_image.save(blob, "JPEG")
-            uuid = generate_uuid_name()
-            filename = f"{uuid}.jpg"
-            marker.file_size = marker.source.size
+            pil_image.save(blob, "PNG")
+            filename = f"markers/{marker.pk}/original.png"
             marker.source.save(filename, File(blob), save=True)
-            patt_str = generate_patt_from_image(image)
-            marker.patt.save(
-                f"{uuid}.patt",
-                ContentFile(patt_str.encode("utf-8")),
-                save=True,
-            )
-        marker.save()
+        generate_marker_variants(marker, inner_border=False)
 
 
 @admin.register(Marker)
@@ -159,17 +134,123 @@ def image_preview(self, obj):
         return format_html(obj.as_html_thumbnail(), "")
 
 
+@admin.action(description="Generate spritesheets for selected GIF objects")
+def generate_spritesheets(modeladmin, request, queryset):
+    """Generate (or regenerate) PNG spritesheets and metadata JSON for GIF objects.
+
+    Running this action twice replaces the existing spritesheet and metadata
+    files, keeping only the original GIF source unchanged.
+    """
+    for obj in queryset.filter(file_extension="gif"):
+        if not obj.source:
+            continue
+
+        try:
+            storage = obj.source.storage
+
+            with obj.source.open("rb") as f:
+                png_bytes, metadata = gif_to_spritesheet(f)
+
+            # Save spritesheet PNG to objects/<pk>/spritesheet.png
+            spritesheet_path = f"objects/{obj.pk}/spritesheet.png"
+            _save_to_storage(storage, spritesheet_path, png_bytes)
+            obj.spritesheet_file.name = spritesheet_path
+
+            # Save metadata JSON to objects/<pk>/metadata.json
+            metadata_path = f"objects/{obj.pk}/metadata.json"
+            _save_to_storage(
+                storage, metadata_path, json.dumps(metadata).encode("utf-8")
+            )
+            obj.spritesheet_metadata.name = metadata_path
+
+            obj.save()
+        except Exception as e:
+            modeladmin.message_user(
+                request,
+                f"Failed to generate spritesheet for Object {obj.pk}: {e}",
+                level="error",
+            )
+
+
+def _save_to_storage(storage, path, content_bytes):
+    """Save content to storage, deleting existing file first for idempotency."""
+    try:
+        if storage.exists(path):
+            storage.delete(path)
+    except Exception:
+        pass
+    storage.save(path, ContentFile(content_bytes))
+
+
+class SpritesheetFilter(admin.SimpleListFilter):
+    title = "spritesheet status"
+    parameter_name = "has_spritesheet"
+
+    def lookups(self, request, model_admin):
+        return [
+            ("yes", "Has spritesheet"),
+            ("no", "Missing spritesheet (GIF only)"),
+        ]
+
+    def queryset(self, request, queryset):
+        if self.value() == "yes":
+            return queryset.exclude(spritesheet_file="").exclude(spritesheet_file=None)
+        if self.value() == "no":
+            from django.db.models import Q
+
+            return queryset.filter(file_extension="gif").filter(
+                Q(spritesheet_file="") | Q(spritesheet_file=None)
+            )
+        return queryset
+
+
 @admin.register(Object)
 class ObjectAdmin(BaseMarkerObjectAdmin):
     list_display = BaseMarkerObjectAdmin.list_display + [
         "file_extension",
+        "has_spritesheet",
     ]
     search_fields = ["title", "id"]
-    list_filter = ["file_extension"]
+    list_filter = ["file_extension", SpritesheetFilter]
+    actions = [generate_spritesheets, "populate_dimensions"]
 
     def image_preview(self, obj):
         return format_html(obj.as_html_thumbnail(), "")
 
+    def has_spritesheet(self, obj):
+        return bool(obj.spritesheet_file and obj.spritesheet_metadata)
+
+    @admin.action(description="Populate width/height dimensions for selected objects")
+    def populate_dimensions(self, request, queryset):
+        updated = 0
+        for obj in queryset:
+            try:
+                thumbnail = obj.thumbnail if obj.is_3d else None
+                with obj.source.open("rb") as f:
+                    thumb_file = None
+                    if thumbnail:
+                        try:
+                            thumb_file = thumbnail.open("rb")
+                        except Exception:
+                            thumb_file = None
+
+                    dims = extract_dimensions(f, obj.file_extension, thumb_file)
+
+                    if thumb_file:
+                        thumb_file.close()
+
+                if dims:
+                    obj.width, obj.height = dims
+                    obj.save(update_fields=["width", "height"])
+                    updated += 1
+            except Exception as e:
+                self.message_user(
+                    request,
+                    f"Failed for Object {obj.pk}: {e}",
+                    level="error",
+                )
+        self.message_user(request, f"Updated dimensions for {updated} object(s).")
+
 
 @admin.register(Artwork)
 class ArtworkAdmin(admin.ModelAdmin):