Refractord backend code

Author: tushar1977

backend/app/routes/face_clusters.py

@@ -1,9 +1,10 @@
 import logging
 from binascii import Error as Base64Error
 import base64
+from typing import Annotated
 import uuid
 import os
-from fastapi import APIRouter, HTTPException, status
+from fastapi import APIRouter, HTTPException, Query, status
 from app.database.face_clusters import (
     db_get_cluster_by_id,
     db_update_cluster,
@@ -22,7 +23,7 @@
     GetClusterImagesData,
     ImageInCluster,
 )
-from app.schemas.images import AddSingleBase64ImageRequest, AddSingleImageRequest
+from app.schemas.images import AddSingleBase64ImageRequest, AddSingleImageRequest, InputType
 from app.utils.faceSearch import perform_face_search
 
 
@@ -208,35 +209,32 @@ def get_cluster_images(cluster_id: str):
     "/face-search",
     responses={code: {"model": ErrorResponse} for code in [400, 500]},
 )
-def face_tagging(payload: AddSingleImageRequest):
-    image_path = payload.path
-    if not os.path.isfile(image_path):
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail=ErrorResponse(
-                success=False,
-                error="Invalid file path",
-                message="The provided path is not a valid file",
-            ).model_dump(),
-        )
-    return perform_face_search(image_path)
-
+def face_tagging(payload: AddSingleImageRequest | AddSingleBase64ImageRequest, input_type: Annotated[InputType, Query(description="Choose input type: 'path' or 'base64'")] = InputType.path):
+    image_path = None
 
-@router.post("/face-search-base64")
-def face_search_base64(payload: AddSingleBase64ImageRequest):
-    base64_data = payload.base64_data
-    if not base64_data:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail=ErrorResponse(
-                success=False,
-                error="No base64 data",
-                message="Base64 image data is required.",
-            ).model_dump(),
-        )
+    if input_type == InputType.path:
+        if not os.path.isfile(payload.path):
+            raise HTTPException(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                detail=ErrorResponse(
+                    success=False,
+                    error="Invalid file path",
+                    message="The provided path is not a valid file",
+                ).model_dump(),
+            )
+        image_path = payload.path
 
-    image_path = None
-    try:
+    elif input_type == InputType.base64:
+        base64_data = payload.base64_data
+        if not base64_data:
+            raise HTTPException(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                detail=ErrorResponse(
+                    success=False,
+                    error="No base64 data",
+                    message="Base64 image data is required.",
+                ).model_dump(),
+            )
         try:
             image_bytes = base64.b64decode(base64_data.split(",")[-1])
         except (Base64Error, ValueError):
@@ -251,14 +249,11 @@ def face_search_base64(payload: AddSingleBase64ImageRequest):
         image_id = str(uuid.uuid4())[:8]
         temp_dir = "temp_uploads"
         os.makedirs(temp_dir, exist_ok=True)
-        image_path = os.path.join(temp_dir, f"{image_id}.jpeg")
+        local_image_path = os.path.join(temp_dir, f"{image_id}.jpeg")
 
-        with open(image_path, "wb") as f:
+        with open(local_image_path, "wb") as f:
             f.write(image_bytes)
 
-        result = perform_face_search(image_path)
-        return result
+        image_path = local_image_path
 
-    finally:
-        if image_path and os.path.exists(image_path):
-            os.remove(image_path)
+    return perform_face_search(image_path)

backend/app/schemas/images.py

@@ -1,7 +1,13 @@
+from enum import Enum
 from pydantic import BaseModel
 from typing import Optional, List, Union
 
 
+class InputType(str, Enum):
+    path = "path"
+    base64 = "base64"
+
+
 # Request Model
 class AddSingleImageRequest(BaseModel):
     path: str

docs/backend/backend_python/openapi.json

@@ -1042,15 +1042,36 @@
         ],
         "summary": "Face Tagging",
         "operationId": "face_tagging_face_clusters_face_search_post",
+        "parameters": [
+          {
+            "name": "input_type",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/InputType",
+              "description": "Choose input type: 'path' or 'base64'",
+              "default": "path"
+            },
+            "description": "Choose input type: 'path' or 'base64'"
+          }
+        ],
         "requestBody": {
+          "required": true,
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/AddSingleImageRequest"
+                "anyOf": [
+                  {
+                    "$ref": "#/components/schemas/AddSingleImageRequest"
+                  },
+                  {
+                    "$ref": "#/components/schemas/AddSingleBase64ImageRequest"
+                  }
+                ],
+                "title": "Payload"
               }
             }
-          },
-          "required": true
+          }
         },
         "responses": {
           "200": {
@@ -1062,63 +1083,24 @@
             }
           },
           "400": {
-            "description": "Bad Request",
             "content": {
               "application/json": {
                 "schema": {
                   "$ref": "#/components/schemas/app__schemas__face_clusters__ErrorResponse"
                 }
               }
-            }
+            },
+            "description": "Bad Request"
           },
           "500": {
-            "description": "Internal Server Error",
             "content": {
               "application/json": {
                 "schema": {
                   "$ref": "#/components/schemas/app__schemas__face_clusters__ErrorResponse"
                 }
               }
-            }
-          },
-          "422": {
-            "description": "Validation Error",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/face-clusters/face-search-base64": {
-      "post": {
-        "tags": [
-          "Face Clusters"
-        ],
-        "summary": "Face Search Base64",
-        "operationId": "face_search_base64_face_clusters_face_search_base64_post",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/AddSingleBase64ImageRequest"
-              }
-            }
-          },
-          "required": true
-        },
-        "responses": {
-          "200": {
-            "description": "Successful Response",
-            "content": {
-              "application/json": {
-                "schema": {}
-              }
-            }
+            },
+            "description": "Internal Server Error"
           },
           "422": {
             "description": "Validation Error",
@@ -2110,6 +2092,14 @@
         "title": "ImageInCluster",
         "description": "Represents an image that contains faces from a specific cluster."
       },
+      "InputType": {
+        "type": "string",
+        "enum": [
+          "path",
+          "base64"
+        ],
+        "title": "InputType"
+      },
       "MetadataModel": {
         "properties": {
           "name": {

frontend/src/api/apiEndpoints.ts

@@ -4,8 +4,8 @@ export const imagesEndpoints = {
 
 export const faceClustersEndpoints = {
   getAllClusters: '/face-clusters/',
-  searchForFaces: '/face-clusters/face-search',
-  searchForFacesBase64: '/face-clusters/face-search-base64',
+  searchForFaces: '/face-clusters/face-search?input_type=path',
+  searchForFacesBase64: '/face-clusters/face-search?input_type=base64',
   renameCluster: (clusterId: string) => `/face-clusters/${clusterId}`,
   getClusterImages: (clusterId: string) => `/face-clusters/${clusterId}/images`,
 };

frontend/src/components/Navigation/Navbar/Navbar.tsx

@@ -35,7 +35,7 @@ export function Navbar() {
             <div className="relative mr-2 ml-2">
               <img
                 src={
-                  queryImage?.includes('base64')
+                  queryImage?.startsWith('data:')
                     ? queryImage
                     : convertFileSrc(queryImage)
                 }