Merge branch 'fix/1293-production-zoom-scroll' into test-release/pr1295-workflow

Author: VanshajPoonia

.github/workflows/stale-merge-conflicts.yml

@@ -0,0 +1,58 @@
+name: Close stale merge-conflicted PRs
+
+on:
+  schedule:
+    - cron: "17 2 * * *"
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  issues: write
+  pull-requests: write
+
+jobs:
+  stale-merge-conflicts:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Warn and close inactive merge-conflicted PRs
+        uses: actions/stale@v10
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+          # Do not process issues.
+          days-before-issue-stale: -1
+          days-before-issue-close: -1
+
+          # Only process PRs that still have unresolved merge conflicts.
+          only-pr-labels: "PR has merge conflicts"
+
+          # Warn after 30 inactive days, then close after 5 more inactive days.
+          days-before-pr-stale: 30
+          days-before-pr-close: 5
+
+          # Use a separate stale label so the original merge-conflict label keeps its meaning.
+          stale-pr-label: "stale merge conflict"
+          close-pr-label: "closed stale merge conflict"
+
+          # If the contributor comments or updates the PR, remove stale state and restart the timer.
+          remove-pr-stale-when-updated: true
+
+          # Help process larger backlogs across daily runs.
+          operations-per-run: 100
+
+          stale-pr-message: |
+            ⚠️ **This PR still has unresolved merge conflicts and has been inactive for the past 30 days.**
+
+            The `PR has merge conflicts` label is still applied, and there has been no recent activity on this PR.
+
+            Please resolve the merge conflicts or leave a comment if you are still actively working on it.
+
+            If there is no further activity within the next 5 days, this PR may be automatically closed to help keep the PR backlog manageable.
+
+          close-pr-message: |
+            🔒 **Closing this PR due to unresolved merge conflicts and prolonged inactivity.**
+
+            This PR still had unresolved merge conflicts, and there was no activity within 5 days of the stale warning being posted.
+
+            You may reopen this PR or submit a new one after resolving the merge conflicts.

backend/app/database/images.py

@@ -1,6 +1,8 @@
 # Standard library imports
 import sqlite3
 from typing import Any, List, Mapping, Tuple, TypedDict, Union, Optional
+import json
+
 from datetime import datetime
 
 # App-specific imports
@@ -456,6 +458,41 @@ def db_toggle_image_favourite_status(image_id: str) -> bool:
         conn.close()
 
 
+def db_get_image_by_id(image_id: str) -> Optional[dict]:
+    """
+    Get a single image by ID with its favorite status.
+    """
+    conn = _connect()
+    cursor = conn.cursor()
+    try:
+        cursor.execute(
+            """
+            SELECT id, path, folder_id, thumbnailPath, metadata, isTagged, isFavourite
+            FROM images
+            WHERE id = ?
+        """,
+            (image_id,),
+        )
+        row = cursor.fetchone()
+        if not row:
+            return None
+        try:
+            metadata = json.loads(row[4]) if row[4] else {}
+        except json.JSONDecodeError:
+            metadata = {}
+        return {
+            "id": row[0],
+            "path": row[1],
+            "folder_id": row[2],
+            "thumbnailPath": row[3],
+            "metadata": metadata,
+            "isTagged": bool(row[5]),
+            "isFavourite": bool(row[6]),
+        }
+    finally:
+        conn.close()
+
+
 # ============================================================================
 # MEMORIES FEATURE - Location and Time-based Queries
 # ============================================================================

backend/app/logging/setup_logging.py

@@ -237,7 +237,9 @@ def emit(self, record: logging.LogRecord) -> None:
         """
         # Get the appropriate module name
         module_name = record.name
-        if "." in module_name:
+        if module_name.startswith("uvicorn"):
+            module_name = "uvicorn"
+        elif "." in module_name:
             module_name = module_name.split(".")[-1]
 
         # Create a message that includes the original module in the format

backend/app/routes/images.py

@@ -4,9 +4,10 @@
 from app.schemas.images import ErrorResponse
 from app.utils.images import image_util_parse_metadata
 from pydantic import BaseModel
-from app.database.images import db_toggle_image_favourite_status
+from app.database.images import db_toggle_image_favourite_status, db_get_image_by_id
 from app.logging.setup_logging import get_logger
 
+
 # Initialize logger
 logger = get_logger(__name__)
 router = APIRouter()
@@ -97,26 +98,37 @@ class ToggleFavouriteRequest(BaseModel):
 
 @router.post("/toggle-favourite")
 def toggle_favourite(req: ToggleFavouriteRequest):
+    """
+    Toggle the favorite status of an image.
+    """
     image_id = req.image_id
     try:
         success = db_toggle_image_favourite_status(image_id)
         if not success:
             raise HTTPException(
-                status_code=404, detail="Image not found or failed to toggle"
+                status_code=status.HTTP_404_NOT_FOUND,
+                detail="Image not found or failed to toggle",
             )
         # Fetch updated status to return
-        image = next(
-            (img for img in db_get_all_images() if img["id"] == image_id), None
-        )
+        image = db_get_image_by_id(image_id)
+        if not image:
+            raise HTTPException(
+                status_code=status.HTTP_404_NOT_FOUND,
+                detail="Image not found after toggle",
+            )
         return {
             "success": True,
             "image_id": image_id,
             "isFavourite": image.get("isFavourite", False),
         }
-
+    except HTTPException:
+        raise  # Re-raise HTTPExceptions to preserve status codes
     except Exception as e:
         logger.error(f"error in /toggle-favourite route: {e}")
-        raise HTTPException(status_code=500, detail=f"Internal server error: {e}")
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=f"Internal server error: {e}",
+        )
 
 
 class ImageInfoResponse(BaseModel):

docs/backend/backend_python/openapi.json

@@ -2073,119 +2073,6 @@
         ],
         "title": "DeleteFoldersResponse"
       },
-      "app__schemas__folders__ErrorResponse": {
-        "properties": {
-          "success": {
-            "type": "boolean",
-            "title": "Success",
-            "default": false
-          },
-          "message": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Message"
-          },
-          "error": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Error"
-          }
-        },
-        "type": "object",
-        "title": "ErrorResponse"
-      },
-      "app__schemas__face_clusters__ErrorResponse": {
-        "properties": {
-          "success": {
-            "type": "boolean",
-            "title": "Success",
-            "default": false
-          },
-          "message": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Message"
-          },
-          "error": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Error"
-          }
-        },
-        "type": "object",
-        "title": "ErrorResponse"
-      },
-      "app__schemas__images__ErrorResponse": {
-        "properties": {
-          "success": {
-            "type": "boolean",
-            "title": "Success",
-            "default": false
-          },
-          "message": {
-            "type": "string",
-            "title": "Message"
-          },
-          "error": {
-            "type": "string",
-            "title": "Error"
-          }
-        },
-        "type": "object",
-        "required": [
-          "message",
-          "error"
-        ],
-        "title": "ErrorResponse"
-      },
-      "app__schemas__user_preferences__ErrorResponse": {
-        "properties": {
-          "success": {
-            "type": "boolean",
-            "title": "Success"
-          },
-          "error": {
-            "type": "string",
-            "title": "Error"
-          },
-          "message": {
-            "type": "string",
-            "title": "Message"
-          }
-        },
-        "type": "object",
-        "required": [
-          "success",
-          "error",
-          "message"
-        ],
-        "title": "ErrorResponse",
-        "description": "Error response model"
-      },
       "FaceSearchRequest": {
         "properties": {
           "path": {

docs/frontend/gallery-view.md

@@ -0,0 +1,35 @@
+# Gallery View
+
+The gallery view is the main way users browse and interact with their photos in PictoPy. It presents media in a responsive grid, organized by date, with filtering and AI-backed organization.
+
+## Overview
+
+The main gallery shows photos and videos in a grid layout. Images are grouped by date, and users can filter by tags, favourites, and other criteria. The gallery connects to the [state management](state-management.md) layer for images and folders, and uses shared [UI components](ui-components.md) for layout and controls.
+
+## Layout and Behavior
+
+- **Grid layout** – Media is displayed in a responsive grid that adapts to window size.
+- **Date grouping** – Items are organized chronologically (by capture or file date) for quick scanning.
+- **Filtering** – Users can filter by tagged status, favourites, and other attributes exposed in the UI.
+- **Thumbnails** – Each item is shown as a thumbnail with optional overlays (e.g. favourite icon, AI tags).
+
+## Key Components
+
+The gallery experience is built from several frontend components:
+
+- **ChronologicalGallery** – Renders the date-grouped grid of media.
+- **ImageCard** – Renders a single thumbnail, metadata hints, and interaction targets (e.g. select, favourite).
+- **MediaView** / **ImageViewer** – Full-size view and navigation when a photo or video is opened.
+- **MediaThumbnails** – Thumbnail strip or grid used in the lightbox/viewer.
+- **MediaInfoPanel** – Shows metadata, tags, and location for the currently viewed item.
+- **MediaViewControls**, **ZoomControls**, **NavigationButtons** – Control zoom, next/previous, and other viewer actions.
+
+## Screenshots
+
+For visual examples of the main gallery, AI tagging, and related screens, see [Screenshots](screenshots.md).
+
+## Related Documentation
+
+- [State Management](state-management.md) – How images and folders are stored and updated in the Redux store.
+- [Screenshots](screenshots.md) – Screenshots of the main gallery and other views.
+- [UI Components](ui-components.md) – Shared components used in the gallery and across the app.