Fix: Show "Folder is empty" message for empty folders in AI tagging - Remove merge conflict

.github/workflows/pr-check-build.yml

@@ -3,6 +3,8 @@ on:
   pull_request:
     paths:
       - "frontend/**"
+
+
 
 jobs:
   tauri-build-check:

.github/workflows/pr-check-tests.yml

@@ -4,7 +4,8 @@ on:
   pull_request:
     branches:
       - main
-
+
+
 jobs:
   linting:
     runs-on: ubuntu-latest

backend/app/database/folders.py

@@ -395,11 +395,11 @@ def db_get_folder_ids_by_paths(
 
 
 def db_get_all_folder_details() -> (
-    List[Tuple[str, str, Optional[str], int, bool, Optional[bool]]]
+    List[Tuple[str, str, Optional[str], int, bool, Optional[bool], int]]
 ):
     """
     Get all folder details including folder_id, folder_path, parent_folder_id,
-    last_modified_time, AI_Tagging, and taggingCompleted.
+    last_modified_time, AI_Tagging, taggingCompleted, and image_count.
     Returns list of tuples with all folder information.
     """
     conn = sqlite3.connect(DATABASE_PATH)
@@ -408,9 +408,18 @@ def db_get_all_folder_details() -> (
     try:
         cursor.execute(
             """
-            SELECT folder_id, folder_path, parent_folder_id, last_modified_time, AI_Tagging, taggingCompleted 
-            FROM folders 
-            ORDER BY folder_path
+            SELECT 
+                f.folder_id, 
+                f.folder_path, 
+                f.parent_folder_id, 
+                f.last_modified_time, 
+                f.AI_Tagging, 
+                f.taggingCompleted,
+                COUNT(i.id) as image_count
+            FROM folders f
+            LEFT JOIN images i ON f.folder_id = i.folder_id
+            GROUP BY f.folder_id
+            ORDER BY f.folder_path
             """
         )
         return cursor.fetchall()

backend/app/routes/folders.py

@@ -451,6 +451,7 @@ def get_all_folders():
                 last_modified_time,
                 ai_tagging,
                 tagging_completed,
+                image_count,
             ) = folder_data
             folders.append(
                 FolderDetails(
@@ -460,6 +461,7 @@ def get_all_folders():
                     last_modified_time=last_modified_time,
                     AI_Tagging=ai_tagging,
                     taggingCompleted=tagging_completed,
+                    image_count=image_count,
                 )
             )
 

backend/app/schemas/folders.py

@@ -30,6 +30,7 @@ class FolderDetails(BaseModel):
     last_modified_time: int
     AI_Tagging: bool
     taggingCompleted: Optional[bool] = None
+    image_count: int = 0
 
 
 class GetAllFoldersData(BaseModel):

backend/tests/test_folders.py

@@ -98,6 +98,7 @@ def sample_folder_details():
             1693526400,  # timestamp
             True,  # AI_Tagging
             False,  # taggingCompleted
+            0,  # image_count
         ),
         (
             "folder-id-2",
@@ -106,6 +107,7 @@ def sample_folder_details():
             1693526500,
             False,
             True,
+            25,
         ),
     ]
 

docs/backend/backend_python/openapi.json

@@ -2253,6 +2253,11 @@
               }
             ],
             "title": "Taggingcompleted"
+          },
+          "image_count": {
+            "type": "integer",
+            "title": "Image Count",
+            "default": 0
           }
         },
         "type": "object",
@@ -3407,6 +3412,119 @@
           "type"
         ],
         "title": "ValidationError"
+      },
+      "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__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__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"
       }
     }
   }