pixlstash 1.7.0.dev2__tar.gz → 1.7.0.dev4__tar.gz

{pixlstash-1.7.0.dev2/pixlstash.egg-info → pixlstash-1.7.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pixlstash
-Version: 1.7.0.dev2
+Version: 1.7.0.dev4
 Summary: Self-hosted picture library with AI tagging, semantic search, and a clean web UI
 Author-email: Gaute Lindkvist <lindkvis@gmail.com>
 License-Expression: GPL-3.0-only AND MIT
@@ -110,9 +110,10 @@ PixlStash runs on your machine and serves the UI at a local (or Internet-facing)
   </a>
 </p>
 
-PixlStash is available as a **native desktop app for Windows and Linux**
-(no Python or browser tab required), as a Docker image, or as a pip package
-(which also runs on macOS). The desktop app ships a ready-to-run CPU runtime,
+PixlStash is available as a **native desktop app for Windows, macOS (Apple
+Silicon), and Linux** (no Python or browser tab required), as a Docker image, or
+as a pip package that runs anywhere Python does (including Intel Macs). The
+desktop app ships a ready-to-run CPU runtime,
 so it works offline out of the box, and auto-detects your hardware to offer
 optional GPU acceleration (NVIDIA CUDA, or experimental AMD ROCm), which it
 installs on demand straight from PyPI / PyTorch.

{pixlstash-1.7.0.dev2 → pixlstash-1.7.0.dev4}/README.md

@@ -36,9 +36,10 @@ PixlStash runs on your machine and serves the UI at a local (or Internet-facing)
   </a>
 </p>
 
-PixlStash is available as a **native desktop app for Windows and Linux**
-(no Python or browser tab required), as a Docker image, or as a pip package
-(which also runs on macOS). The desktop app ships a ready-to-run CPU runtime,
+PixlStash is available as a **native desktop app for Windows, macOS (Apple
+Silicon), and Linux** (no Python or browser tab required), as a Docker image, or
+as a pip package that runs anywhere Python does (including Intel Macs). The
+desktop app ships a ready-to-run CPU runtime,
 so it works offline out of the box, and auto-detects your hardware to offer
 optional GPU acceleration (NVIDIA CUDA, or experimental AMD ROCm), which it
 installs on demand straight from PyPI / PyTorch.

{pixlstash-1.7.0.dev2 → pixlstash-1.7.0.dev4}/frontend/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "pixlstash-frontend",
-  "version": "1.7.0-dev.2",
+  "version": "1.7.0-dev.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "pixlstash-frontend",
-      "version": "1.7.0-dev.2",
+      "version": "1.7.0-dev.4",
       "dependencies": {
         "@mdi/font": "^7.4.47",
         "axios": "^1.16.0",

{pixlstash-1.7.0.dev2 → pixlstash-1.7.0.dev4}/frontend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pixlstash-frontend",
   "private": true,
-  "version": "1.7.0-dev.2",
+  "version": "1.7.0-dev.4",
   "type": "module",
   "scripts": {
     "dev": "vite",

{pixlstash-1.7.0.dev2 → pixlstash-1.7.0.dev4}/pixlstash/db_models/__init__.py

@@ -1,5 +1,6 @@
 from .character import Character  # noqa: F401
 from .deleted_file_log import DeletedFileLog  # noqa: F401
+from .detection import Detection  # noqa: F401
 from .face import Face  # noqa: F401
 from .picture import Picture, SortMechanism  # noqa: F401
 from .picture_project import PictureProjectMember  # noqa: F401

pixlstash-1.7.0.dev4/pixlstash/db_models/detection.py

@@ -0,0 +1,95 @@
+import json
+
+from sqlalchemy import Float
+from sqlmodel import (
+    Column,
+    ForeignKey,
+    Integer,
+    select,
+    String,
+    SQLModel,
+    Field,
+    Relationship,
+    UniqueConstraint,
+)
+from typing import List, Optional, TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from .picture import Picture
+
+
+class Detection(SQLModel, table=True):
+    """An object-detection bounding box for a picture.
+
+    Mirrors :class:`~pixlstash.db_models.face.Face`'s bbox-as-JSON convention so
+    the frontend overlay, scope enforcement, and copy-on-output logic can be
+    reused — but stores an open-vocabulary ``label`` (e.g. ``"dog"``) instead of
+    a face/character. Produced by a user-triggered detection pass (see
+    :class:`~pixlstash.tasks.detection_task.DetectionTask`), never by a
+    background WorkFinder.
+    """
+
+    id: int = Field(default=None, primary_key=True)
+
+    picture_id: int = Field(
+        sa_column=Column(
+            Integer,
+            ForeignKey("picture.id", ondelete="CASCADE"),
+            index=True,
+        ),
+        default=None,
+    )
+    frame_index: int = Field(default=0)
+    detection_index: int = Field(default=0)
+
+    label: Optional[str] = Field(
+        sa_column=Column("label", String, default=None, index=True)
+    )
+    bbox_: Optional[str] = Field(sa_column=Column("bbox", String, default=None))
+    # Florence grounding/OD returns no per-box confidence, so score is nullable;
+    # other detectors may populate it.
+    score: Optional[float] = Field(sa_column=Column("score", Float, default=None))
+    # Detector provenance, e.g. "florence2:od" or "florence2:grounding".
+    source: Optional[str] = Field(sa_column=Column("source", String, default=None))
+    # JSON escape-hatch for future per-detection data (masks, generation params).
+    attributes_: Optional[str] = Field(
+        sa_column=Column("attributes", String, default=None)
+    )
+
+    # Relationships
+    picture: Optional["Picture"] = Relationship(back_populates="detections")
+
+    __table_args__ = (UniqueConstraint("picture_id", "frame_index", "detection_index"),)
+
+    def __init__(self, *args, bbox=None, **kwargs):
+        super().__init__(*args, **kwargs)
+        if bbox is not None:
+            self.bbox = bbox
+
+    @property
+    def bbox(self) -> Optional[List[int]]:
+        """Return the bounding box as ``[x1, y1, x2, y2]`` pixels, or None."""
+        if self.bbox_:
+            return json.loads(self.bbox_)
+        return None
+
+    @bbox.setter
+    def bbox(self, bbox: List[int]):
+        """Set the bounding box from a list of integers."""
+        self.bbox_ = json.dumps(bbox)
+
+    @classmethod
+    def find(cls, session, **filters) -> List["Detection"]:
+        """Find detections by picture_id, frame_index, and/or detection_index.
+
+        Supports passing a list for picture_id (uses ``IN`` if so).
+        """
+        query = select(cls)
+        for attr, value in filters.items():
+            if hasattr(cls, attr):
+                col = getattr(cls, attr)
+                if attr == "picture_id" and isinstance(value, list):
+                    query = query.where(col.in_(value))
+                else:
+                    query = query.where(col == value)
+        return session.exec(query).all()

{pixlstash-1.7.0.dev2 → pixlstash-1.7.0.dev4}/pixlstash/db_models/picture.py

@@ -35,6 +35,7 @@ from pixlstash.pixl_logging import get_logger
 
 if TYPE_CHECKING:
     from .character import Character
+    from .detection import Detection
     from .picture_likeness import PictureLikeness
     from .project import Project
     from .reference_folder import ReferenceFolder
@@ -307,6 +308,13 @@ class Picture(SQLModel, table=True):
             "passive_deletes": True,
         },
     )
+    detections: List["Detection"] = Relationship(
+        back_populates="picture",
+        sa_relationship_kwargs={
+            "cascade": "all, delete-orphan",
+            "passive_deletes": True,
+        },
+    )
     tags: List["Tag"] = Relationship(
         back_populates="picture",
         sa_relationship_kwargs={

{pixlstash-1.7.0.dev2 → pixlstash-1.7.0.dev4}/pixlstash/db_models/tag.py

@@ -20,6 +20,12 @@ DEFAULT_SMART_SCORE_PENALIZED_TAGS = {
     "silicone breasts": 0,
     "malformed foot": 4,
     "pixelated": 2,
+    # IQA / signal-degradation tags (added 2026-06-20). Weights are an initial
+    # proposal to tune; the tagger detection thresholds come from the post-train gate.
+    "compression artifacts": 3,
+    "noise": 2,
+    "oversaturation": 2,
+    "watermark": 4,
 }
 # Tags that PixlTagger merges into a parent just before training (its tag_remap),
 # mirrored here as PixlStash's own editable copy. A picture tagged with a child here