diff --git a/backend/app/routes/albums.py b/backend/app/routes/albums.py index ae0408613..d62650dc9 100644 --- a/backend/app/routes/albums.py +++ b/backend/app/routes/albums.py @@ -8,11 +8,10 @@ GetAlbumImagesRequest, GetAlbumImagesResponse, UpdateAlbumRequest, - SuccessResponse, - ErrorResponse, ImageIdsRequest, Album, ) +from app.schemas.common import ErrorResponse, SuccessResponse from app.database.albums import ( db_get_all_albums, db_get_album_by_name, diff --git a/backend/app/routes/avatar.py b/backend/app/routes/avatar.py new file mode 100644 index 000000000..c5cf2acdc --- /dev/null +++ b/backend/app/routes/avatar.py @@ -0,0 +1,117 @@ +from fastapi import APIRouter, HTTPException, UploadFile, File, status +from fastapi.responses import FileResponse +import os +import uuid +import io +from PIL import Image +from app.database.metadata import db_get_metadata, db_update_metadata +from app.schemas.common import ErrorResponse + +router = APIRouter() + +UPLOAD_DIR = "uploads/avatars" +ALLOWED_EXTENSIONS = {".png", ".jpg", ".jpeg"} +MAX_FILE_SIZE = 5 * 1024 * 1024 # 5MB + +os.makedirs(UPLOAD_DIR, exist_ok=True) + +@router.post("/upload") +async def upload_avatar(file: UploadFile = File(...)): + """Upload and set user avatar""" + try: + # Validate file extension + file_ext = os.path.splitext(file.filename)[1].lower() + if file_ext not in ALLOWED_EXTENSIONS: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail=ErrorResponse( + success=False, + error="Invalid file type", + message="Only PNG, JPG, and JPEG files are allowed" + ).model_dump() + ) + + # Read and validate file size + content = await file.read() + if len(content) > MAX_FILE_SIZE: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail=ErrorResponse( + success=False, + error="File too large", + message="File size must be less than 5MB" + ).model_dump() + ) + + # Generate unique filename + filename = f"{uuid.uuid4()}{file_ext}" + filepath = os.path.join(UPLOAD_DIR, filename) + + # Process and save image + try: + image = Image.open(io.BytesIO(content)) + # Resize to 200x200 for consistency + image = image.resize((200, 200), Image.Resampling.LANCZOS) + image.save(filepath, optimize=True, quality=85) + except Exception as e: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail=ErrorResponse( + success=False, + error="Invalid image", + message="Unable to process image file" + ).model_dump() + ) + + # Update user preferences with new avatar path + metadata = db_get_metadata() or {} + user_prefs = metadata.get("user_preferences", {}) + + # Remove old avatar file if exists + old_avatar = user_prefs.get("avatar") + if old_avatar and old_avatar.startswith("/avatars/uploads/"): + old_path = old_avatar.replace("/avatars/uploads/", f"{UPLOAD_DIR}/") + if os.path.exists(old_path): + os.remove(old_path) + + user_prefs["avatar"] = f"/avatars/uploads/{filename}" + metadata["user_preferences"] = user_prefs + + if not db_update_metadata(metadata): + # Clean up uploaded file on database error + if os.path.exists(filepath): + os.remove(filepath) + raise HTTPException( + status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, + detail=ErrorResponse( + success=False, + error="Database error", + message="Failed to save avatar preference" + ).model_dump() + ) + + return { + "success": True, + "message": "Avatar uploaded successfully", + "avatar_url": f"/avatars/uploads/{filename}" + } + + except HTTPException: + raise + except Exception as e: + raise HTTPException( + status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, + detail=ErrorResponse( + success=False, + error="Internal server error", + message=f"Failed to upload avatar: {str(e)}" + ).model_dump() + ) + +@router.get("/uploads/{filename}") +async def get_avatar(filename: str): + """Serve uploaded avatar files""" + filepath = os.path.join(UPLOAD_DIR, filename) + if not os.path.exists(filepath): + raise HTTPException(status_code=404, detail="Avatar not found") + return FileResponse(filepath) \ No newline at end of file diff --git a/backend/app/routes/face_clusters.py b/backend/app/routes/face_clusters.py index 99974ac4a..c436d91b5 100644 --- a/backend/app/routes/face_clusters.py +++ b/backend/app/routes/face_clusters.py @@ -11,7 +11,7 @@ db_get_all_clusters_with_face_counts, db_get_images_by_cluster_id, # Add this import ) -from app.schemas.face_clusters import ( +from app.schemas.faces import ( RenameClusterRequest, RenameClusterResponse, RenameClusterData, diff --git a/backend/app/routes/folders.py b/backend/app/routes/folders.py index a66cca27c..5821c43a7 100644 --- a/backend/app/routes/folders.py +++ b/backend/app/routes/folders.py @@ -16,7 +16,6 @@ AddFolderRequest, AddFolderResponse, AddFolderData, - ErrorResponse, UpdateAITaggingRequest, UpdateAITaggingResponse, UpdateAITaggingData, @@ -30,6 +29,7 @@ GetAllFoldersData, FolderDetails, ) +from app.schemas.common import ErrorResponse import os from app.utils.folders import ( folder_util_add_folder_tree, diff --git a/backend/app/routes/images.py b/backend/app/routes/images.py index 2e40cd825..0488459f1 100644 --- a/backend/app/routes/images.py +++ b/backend/app/routes/images.py @@ -1,7 +1,7 @@ from fastapi import APIRouter, HTTPException, Query, status from typing import List, Optional from app.database.images import db_get_all_images -from app.schemas.images import ErrorResponse +from app.schemas.common 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 diff --git a/backend/app/routes/user_preferences.py b/backend/app/routes/user_preferences.py index 3a80d4464..987eca0aa 100644 --- a/backend/app/routes/user_preferences.py +++ b/backend/app/routes/user_preferences.py @@ -5,8 +5,8 @@ UpdateUserPreferencesRequest, UpdateUserPreferencesResponse, UserPreferencesData, - ErrorResponse, ) +from app.schemas.common import ErrorResponse router = APIRouter() @@ -31,6 +31,7 @@ def get_user_preferences(): user_preferences = UserPreferencesData( YOLO_model_size=user_prefs_data.get("YOLO_model_size", "small"), GPU_Acceleration=user_prefs_data.get("GPU_Acceleration", True), + avatar=user_prefs_data.get("avatar"), ) return GetUserPreferencesResponse( @@ -59,7 +60,9 @@ def update_user_preferences(request: UpdateUserPreferencesRequest): """Update user preferences in metadata.""" try: # Step 1: Validate that at least one field is provided - if request.YOLO_model_size is None and request.GPU_Acceleration is None: + if (request.YOLO_model_size is None and + request.GPU_Acceleration is None and + request.avatar is None): raise ValueError("At least one preference field must be provided") # Step 2: Get current metadata @@ -74,6 +77,9 @@ def update_user_preferences(request: UpdateUserPreferencesRequest): if request.GPU_Acceleration is not None: current_user_prefs["GPU_Acceleration"] = request.GPU_Acceleration + + if request.avatar is not None: + current_user_prefs["avatar"] = request.avatar # Step 5: Update metadata with new user preferences metadata["user_preferences"] = current_user_prefs @@ -95,6 +101,7 @@ def update_user_preferences(request: UpdateUserPreferencesRequest): user_preferences = UserPreferencesData( YOLO_model_size=current_user_prefs.get("YOLO_model_size", "small"), GPU_Acceleration=current_user_prefs.get("GPU_Acceleration", True), + avatar=current_user_prefs.get("avatar"), ) return UpdateUserPreferencesResponse( diff --git a/backend/app/schemas/album.py b/backend/app/schemas/album.py index cae98e650..d3708d466 100644 --- a/backend/app/schemas/album.py +++ b/backend/app/schemas/album.py @@ -1,6 +1,7 @@ from pydantic import BaseModel, Field, field_validator from typing import Optional, List from pydantic_core.core_schema import ValidationInfo +from .common import ErrorResponse, SuccessResponse class Album(BaseModel): @@ -75,12 +76,4 @@ class GetAlbumImagesResponse(BaseModel): image_ids: List[str] -class SuccessResponse(BaseModel): - success: bool - msg: str - -class ErrorResponse(BaseModel): - success: bool = False - message: str - error: str diff --git a/backend/app/schemas/common.py b/backend/app/schemas/common.py new file mode 100644 index 000000000..a882fa5da --- /dev/null +++ b/backend/app/schemas/common.py @@ -0,0 +1,15 @@ +from pydantic import BaseModel +from typing import Optional + + +class ErrorResponse(BaseModel): + """Common error response model used across all endpoints""" + success: bool = False + message: str + error: str + + +class SuccessResponse(BaseModel): + """Common success response model""" + success: bool + message: str \ No newline at end of file diff --git a/backend/app/schemas/face_clusters.py b/backend/app/schemas/faces.py similarity index 76% rename from backend/app/schemas/face_clusters.py rename to backend/app/schemas/faces.py index 7744d91ce..884d867a1 100644 --- a/backend/app/schemas/face_clusters.py +++ b/backend/app/schemas/faces.py @@ -1,13 +1,38 @@ from pydantic import BaseModel from typing import List, Optional, Dict, Union, Any +from .common import ErrorResponse -# Request Models +# Face Tagging Models +class SimilarPair(BaseModel): + image1: str + image2: str + similarity: float + + +class FaceMatchingResponse(BaseModel): + success: bool + message: str + similar_pairs: List[SimilarPair] + + +class FaceClustersResponse(BaseModel): + success: bool + message: str + clusters: Dict[int, List[str]] + + +class GetRelatedImagesResponse(BaseModel): + success: bool + message: str + data: Dict[str, List[str]] + + +# Face Clusters Models class RenameClusterRequest(BaseModel): cluster_name: str -# Response Models class RenameClusterData(BaseModel): cluster_id: str cluster_name: str @@ -20,12 +45,6 @@ class RenameClusterResponse(BaseModel): data: Optional[RenameClusterData] = None -class ErrorResponse(BaseModel): - success: bool = False - message: Optional[str] = None - error: Optional[str] = None - - class ClusterMetadata(BaseModel): cluster_id: str cluster_name: Optional[str] @@ -46,7 +65,6 @@ class GetClustersResponse(BaseModel): class ImageInCluster(BaseModel): """Represents an image that contains faces from a specific cluster.""" - id: str path: str thumbnailPath: Optional[str] = None @@ -58,7 +76,6 @@ class ImageInCluster(BaseModel): class GetClusterImagesData(BaseModel): """Data model for cluster images response.""" - cluster_id: str cluster_name: Optional[str] = None images: List[ImageInCluster] @@ -67,7 +84,6 @@ class GetClusterImagesData(BaseModel): class GetClusterImagesResponse(BaseModel): """Response model for getting images in a cluster.""" - success: bool message: Optional[str] = None error: Optional[str] = None @@ -82,4 +98,4 @@ class GlobalReclusterResponse(BaseModel): success: bool message: Optional[str] = None error: Optional[str] = None - data: Optional[GlobalReclusterData] = None + data: Optional[GlobalReclusterData] = None \ No newline at end of file diff --git a/backend/app/schemas/facetagging.py b/backend/app/schemas/facetagging.py deleted file mode 100644 index bd2544a04..000000000 --- a/backend/app/schemas/facetagging.py +++ /dev/null @@ -1,33 +0,0 @@ -from pydantic import BaseModel -from typing import List, Dict - - -# Response Model -class SimilarPair(BaseModel): - image1: str - image2: str - similarity: float - - -class FaceMatchingResponse(BaseModel): - success: bool - message: str - similar_pairs: List[SimilarPair] - - -class FaceClustersResponse(BaseModel): - success: bool - message: str - clusters: Dict[int, List[str]] - - -class GetRelatedImagesResponse(BaseModel): - success: bool - message: str - data: Dict[str, List[str]] - - -class ErrorResponse(BaseModel): - success: bool = False - message: str - error: str diff --git a/backend/app/schemas/folders.py b/backend/app/schemas/folders.py index 63045241b..8012cc5ce 100644 --- a/backend/app/schemas/folders.py +++ b/backend/app/schemas/folders.py @@ -1,5 +1,6 @@ from pydantic import BaseModel from typing import Optional, List +from .common import ErrorResponse # Request Models @@ -97,7 +98,4 @@ class SyncFolderResponse(BaseModel): data: Optional[SyncFolderData] = None -class ErrorResponse(BaseModel): - success: bool = False - message: Optional[str] = None - error: Optional[str] = None + diff --git a/backend/app/schemas/images.py b/backend/app/schemas/images.py index 47f939c4f..bcee9e152 100644 --- a/backend/app/schemas/images.py +++ b/backend/app/schemas/images.py @@ -1,6 +1,7 @@ from enum import Enum from pydantic import BaseModel from typing import Optional, List, Union +from .common import ErrorResponse class InputType(str, Enum): @@ -56,10 +57,7 @@ class GetImagesResponse(BaseModel): data: ImagesResponse -class ErrorResponse(BaseModel): - success: bool = False - message: str - error: str + class AddMultipleImagesResponse(BaseModel): diff --git a/backend/app/schemas/test.py b/backend/app/schemas/test.py index 0ee51b40b..939e5624f 100644 --- a/backend/app/schemas/test.py +++ b/backend/app/schemas/test.py @@ -38,10 +38,7 @@ class AddSingleImageResponse(BaseModel): data: Dict[str, str] -class ErrorResponse(BaseModel): - success: bool = False - message: str - error: str + class TestImageResponse(BaseModel): diff --git a/backend/app/schemas/user_preferences.py b/backend/app/schemas/user_preferences.py index d24191d78..e8ba5ced9 100644 --- a/backend/app/schemas/user_preferences.py +++ b/backend/app/schemas/user_preferences.py @@ -1,5 +1,6 @@ from pydantic import BaseModel from typing import Optional, Literal +from .common import ErrorResponse class UserPreferencesData(BaseModel): @@ -7,6 +8,7 @@ class UserPreferencesData(BaseModel): YOLO_model_size: Literal["nano", "small", "medium"] = "small" GPU_Acceleration: bool = True + avatar: Optional[str] = None class GetUserPreferencesResponse(BaseModel): @@ -22,6 +24,7 @@ class UpdateUserPreferencesRequest(BaseModel): YOLO_model_size: Optional[Literal["nano", "small", "medium"]] = None GPU_Acceleration: Optional[bool] = None + avatar: Optional[str] = None class UpdateUserPreferencesResponse(BaseModel): @@ -32,9 +35,4 @@ class UpdateUserPreferencesResponse(BaseModel): user_preferences: UserPreferencesData -class ErrorResponse(BaseModel): - """Error response model""" - success: bool - error: str - message: str diff --git a/backend/app/utils/folders.py b/backend/app/utils/folders.py index ec014f479..8bbebc9aa 100644 --- a/backend/app/utils/folders.py +++ b/backend/app/utils/folders.py @@ -8,7 +8,7 @@ db_update_parent_ids_for_subtree, db_delete_folders_batch, ) -from app.schemas.folders import ErrorResponse +from app.schemas.common import ErrorResponse from app.logging.setup_logging import get_logger logger = get_logger(__name__) diff --git a/backend/main.py b/backend/main.py index db591cd97..681f9a8c6 100644 --- a/backend/main.py +++ b/backend/main.py @@ -25,6 +25,7 @@ from app.routes.images import router as images_router from app.routes.face_clusters import router as face_clusters_router from app.routes.user_preferences import router as user_preferences_router +from app.routes.avatar import router as avatar_router from fastapi.openapi.utils import get_openapi from app.logging.setup_logging import ( configure_uvicorn_logging, @@ -130,6 +131,7 @@ async def root(): app.include_router( user_preferences_router, prefix="/user-preferences", tags=["User Preferences"] ) +app.include_router(avatar_router, prefix="/avatars", tags=["Avatar"]) # Entry point for running with: python3 main.py diff --git a/backend/tests/test_avatar.py b/backend/tests/test_avatar.py new file mode 100644 index 000000000..8abea7cb5 --- /dev/null +++ b/backend/tests/test_avatar.py @@ -0,0 +1,96 @@ +import pytest +import os +import tempfile +from fastapi.testclient import TestClient +from PIL import Image +import io + +# Import the main app +import sys +sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) +from main import app + +client = TestClient(app) + +def create_test_image(format="PNG", size=(100, 100)): + """Create a test image in memory""" + image = Image.new("RGB", size, color="red") + img_bytes = io.BytesIO() + image.save(img_bytes, format=format) + img_bytes.seek(0) + return img_bytes + +def test_upload_avatar_success(): + """Test successful avatar upload""" + # Create a test image + test_image = create_test_image("PNG") + + response = client.post( + "/avatars/upload", + files={"file": ("test.png", test_image, "image/png")} + ) + + assert response.status_code == 200 + data = response.json() + assert data["success"] is True + assert "avatar_url" in data + assert data["avatar_url"].startswith("/avatars/uploads/") + +def test_upload_avatar_invalid_format(): + """Test avatar upload with invalid file format""" + # Create a text file instead of image + text_content = b"This is not an image" + + response = client.post( + "/avatars/upload", + files={"file": ("test.txt", io.BytesIO(text_content), "text/plain")} + ) + + assert response.status_code == 400 + data = response.json() + assert "Invalid file type" in str(data) + +def test_upload_avatar_too_large(): + """Test avatar upload with file too large""" + # Create a large image (simulate > 5MB) + large_image = create_test_image("PNG", size=(3000, 3000)) + + response = client.post( + "/avatars/upload", + files={"file": ("large.png", large_image, "image/png")} + ) + + # This might pass if the image is compressed enough, so we'll check the logic + # The actual size check happens in the endpoint + assert response.status_code in [200, 400] + +def test_update_user_preferences_with_avatar(): + """Test updating user preferences with avatar""" + avatar_url = "/avatars/avatar1.png" + + response = client.put( + "/user-preferences/", + json={"avatar": avatar_url} + ) + + assert response.status_code == 200 + data = response.json() + assert data["success"] is True + assert data["user_preferences"]["avatar"] == avatar_url + +def test_get_user_preferences_with_avatar(): + """Test getting user preferences including avatar""" + # First set an avatar + avatar_url = "/avatars/avatar2.png" + client.put("/user-preferences/", json={"avatar": avatar_url}) + + # Then get preferences + response = client.get("/user-preferences/") + + assert response.status_code == 200 + data = response.json() + assert data["success"] is True + assert data["user_preferences"]["avatar"] == avatar_url + +if __name__ == "__main__": + pytest.main([__file__]) \ No newline at end of file diff --git a/docs/backend/backend_python/openapi.json b/docs/backend/backend_python/openapi.json index fbf40091b..c8f87e390 100644 --- a/docs/backend/backend_python/openapi.json +++ b/docs/backend/backend_python/openapi.json @@ -68,7 +68,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/app__schemas__folders__ErrorResponse" + "$ref": "#/components/schemas/ErrorResponse" } } } @@ -78,7 +78,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/app__schemas__folders__ErrorResponse" + "$ref": "#/components/schemas/ErrorResponse" } } } @@ -88,7 +88,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/app__schemas__folders__ErrorResponse" + "$ref": "#/components/schemas/ErrorResponse" } } } @@ -98,7 +98,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/app__schemas__folders__ErrorResponse" + "$ref": "#/components/schemas/ErrorResponse" } } } @@ -150,7 +150,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/app__schemas__folders__ErrorResponse" + "$ref": "#/components/schemas/ErrorResponse" } } } @@ -160,7 +160,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/app__schemas__folders__ErrorResponse" + "$ref": "#/components/schemas/ErrorResponse" } } } @@ -212,7 +212,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/app__schemas__folders__ErrorResponse" + "$ref": "#/components/schemas/ErrorResponse" } } } @@ -222,7 +222,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/app__schemas__folders__ErrorResponse" + "$ref": "#/components/schemas/ErrorResponse" } } } @@ -274,7 +274,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/app__schemas__folders__ErrorResponse" + "$ref": "#/components/schemas/ErrorResponse" } } } @@ -284,7 +284,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/app__schemas__folders__ErrorResponse" + "$ref": "#/components/schemas/ErrorResponse" } } } @@ -336,7 +336,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/app__schemas__folders__ErrorResponse" + "$ref": "#/components/schemas/ErrorResponse" } } } @@ -346,7 +346,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/app__schemas__folders__ErrorResponse" + "$ref": "#/components/schemas/ErrorResponse" } } } @@ -356,7 +356,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/app__schemas__folders__ErrorResponse" + "$ref": "#/components/schemas/ErrorResponse" } } } @@ -398,7 +398,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/app__schemas__folders__ErrorResponse" + "$ref": "#/components/schemas/ErrorResponse" } } } @@ -868,7 +868,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/app__schemas__images__ErrorResponse" + "$ref": "#/components/schemas/ErrorResponse" } } }, @@ -970,7 +970,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/app__schemas__face_clusters__ErrorResponse" + "$ref": "#/components/schemas/ErrorResponse" } } }, @@ -980,7 +980,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/app__schemas__face_clusters__ErrorResponse" + "$ref": "#/components/schemas/ErrorResponse" } } }, @@ -990,7 +990,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/app__schemas__face_clusters__ErrorResponse" + "$ref": "#/components/schemas/ErrorResponse" } } }, @@ -1033,7 +1033,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/app__schemas__face_clusters__ErrorResponse" + "$ref": "#/components/schemas/ErrorResponse" } } } @@ -1075,7 +1075,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/app__schemas__face_clusters__ErrorResponse" + "$ref": "#/components/schemas/ErrorResponse" } } }, @@ -1085,7 +1085,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/app__schemas__face_clusters__ErrorResponse" + "$ref": "#/components/schemas/ErrorResponse" } } }, @@ -1152,7 +1152,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/app__schemas__face_clusters__ErrorResponse" + "$ref": "#/components/schemas/ErrorResponse" } } }, @@ -1162,7 +1162,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/app__schemas__face_clusters__ErrorResponse" + "$ref": "#/components/schemas/ErrorResponse" } } }, @@ -1205,7 +1205,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/app__schemas__face_clusters__ErrorResponse" + "$ref": "#/components/schemas/ErrorResponse" } } } @@ -1237,7 +1237,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/app__schemas__user_preferences__ErrorResponse" + "$ref": "#/components/schemas/ErrorResponse" } } } @@ -1277,7 +1277,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/app__schemas__user_preferences__ErrorResponse" + "$ref": "#/components/schemas/ErrorResponse" } } } @@ -1287,7 +1287,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/app__schemas__user_preferences__ErrorResponse" + "$ref": "#/components/schemas/ErrorResponse" } } } @@ -1304,6 +1304,87 @@ } } } + }, + "/avatars/upload": { + "post": { + "tags": [ + "Avatar" + ], + "summary": "Upload Avatar", + "description": "Upload and set user avatar", + "operationId": "upload_avatar_avatars_upload_post", + "requestBody": { + "content": { + "multipart/form-data": { + "schema": { + "$ref": "#/components/schemas/Body_upload_avatar_avatars_upload_post" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "Successful Response", + "content": { + "application/json": { + "schema": {} + } + } + }, + "422": { + "description": "Validation Error", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HTTPValidationError" + } + } + } + } + } + } + }, + "/avatars/uploads/{filename}": { + "get": { + "tags": [ + "Avatar" + ], + "summary": "Get Avatar", + "description": "Serve uploaded avatar files", + "operationId": "get_avatar_avatars_uploads__filename__get", + "parameters": [ + { + "name": "filename", + "in": "path", + "required": true, + "schema": { + "type": "string", + "title": "Filename" + } + } + ], + "responses": { + "200": { + "description": "Successful Response", + "content": { + "application/json": { + "schema": {} + } + } + }, + "422": { + "description": "Validation Error", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HTTPValidationError" + } + } + } + } + } + } } }, "components": { @@ -1435,6 +1516,20 @@ ], "title": "Album" }, + "Body_upload_avatar_avatars_upload_post": { + "properties": { + "file": { + "type": "string", + "format": "binary", + "title": "File" + } + }, + "type": "object", + "required": [ + "file" + ], + "title": "Body_upload_avatar_avatars_upload_post" + }, "ClusterMetadata": { "properties": { "cluster_id": { @@ -1619,6 +1714,30 @@ ], "title": "DeleteFoldersResponse" }, + "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", + "description": "Common error response model used across all endpoints" + }, "FaceSearchRequest": { "properties": { "path": { @@ -2431,17 +2550,18 @@ "type": "boolean", "title": "Success" }, - "msg": { + "message": { "type": "string", - "title": "Msg" + "title": "Message" } }, "type": "object", "required": [ "success", - "msg" + "message" ], - "title": "SuccessResponse" + "title": "SuccessResponse", + "description": "Common success response model" }, "SyncFolderData": { "properties": { @@ -2725,6 +2845,17 @@ } ], "title": "Gpu Acceleration" + }, + "avatar": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "title": "Avatar" } }, "type": "object", @@ -2770,6 +2901,17 @@ "type": "boolean", "title": "Gpu Acceleration", "default": true + }, + "avatar": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "title": "Avatar" } }, "type": "object", @@ -2808,119 +2950,6 @@ "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" } } } diff --git a/frontend/src/api/avatar.ts b/frontend/src/api/avatar.ts new file mode 100644 index 000000000..3000b1c2b --- /dev/null +++ b/frontend/src/api/avatar.ts @@ -0,0 +1,64 @@ +const API_BASE_URL = 'http://localhost:52123'; + +export interface UserPreferences { + YOLO_model_size: string; + GPU_Acceleration: boolean; + avatar?: string; +} + +export interface AvatarUploadResponse { + success: boolean; + message: string; + avatar_url: string; +} + +export const avatarApi = { + async uploadAvatar(file: File): Promise { + const formData = new FormData(); + formData.append('file', file); + + const response = await fetch(`${API_BASE_URL}/avatars/upload`, { + method: 'POST', + body: formData, + }); + + if (!response.ok) { + const error = await response.json(); + throw new Error(error.detail?.message || 'Upload failed'); + } + + return response.json(); + }, + + async updateUserPreferences(preferences: Partial): Promise { + const response = await fetch(`${API_BASE_URL}/user-preferences/`, { + method: 'PUT', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify(preferences), + }); + + if (!response.ok) { + const error = await response.json(); + throw new Error(error.detail?.message || 'Update failed'); + } + }, + + async getUserPreferences(): Promise<{ user_preferences: UserPreferences }> { + const response = await fetch(`${API_BASE_URL}/user-preferences/`); + + if (!response.ok) { + throw new Error('Failed to fetch user preferences'); + } + + return response.json(); + }, + + getAvatarUrl(avatarPath: string): string { + if (avatarPath.startsWith('/avatars/uploads/')) { + return `${API_BASE_URL}${avatarPath}`; + } + return avatarPath; // Preset avatar + } +}; \ No newline at end of file diff --git a/frontend/src/components/AvatarUpdateCard.tsx b/frontend/src/components/AvatarUpdateCard.tsx new file mode 100644 index 000000000..a0f2a2667 --- /dev/null +++ b/frontend/src/components/AvatarUpdateCard.tsx @@ -0,0 +1,126 @@ +import React, { useState, useRef } from 'react'; +import { Button } from '@/components/ui/button'; +import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'; +import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar'; +import { Camera, Upload, Image as ImageIcon } from 'lucide-react'; +import { avatars } from '@/constants/avatars'; +import { avatarApi } from '@/api/avatar'; + +interface AvatarUpdateCardProps { + currentAvatar?: string; + onAvatarUpdate: (avatarUrl: string) => void; +} + +export const AvatarUpdateCard: React.FC = ({ + currentAvatar, + onAvatarUpdate, +}) => { + const [isUploading, setIsUploading] = useState(false); + const [selectedPreset, setSelectedPreset] = useState(null); + const fileInputRef = useRef(null); + + const handleFileUpload = async (event: React.ChangeEvent) => { + const file = event.target.files?.[0]; + if (!file) return; + + // Validate file type + if (!['image/png', 'image/jpeg', 'image/jpg'].includes(file.type)) { + alert('Please select a PNG or JPG image'); + return; + } + + // Validate file size (5MB) + if (file.size > 5 * 1024 * 1024) { + alert('File size must be less than 5MB'); + return; + } + + setIsUploading(true); + try { + const result = await avatarApi.uploadAvatar(file); + const avatarUrl = avatarApi.getAvatarUrl(result.avatar_url); + onAvatarUpdate(avatarUrl); + } catch (error) { + console.error('Avatar upload failed:', error); + alert(`Failed to upload avatar: ${error instanceof Error ? error.message : 'Unknown error'}`); + } finally { + setIsUploading(false); + } + }; + + const handlePresetSelect = (avatar: string) => { + setSelectedPreset(avatar); + onAvatarUpdate(avatar); + }; + + return ( + + + + + Profile Photo + + + Choose your profile photo from our collection or upload your own + + + + {/* Current Photo */} +
+ + + + + + +
+

Your current photo

+ +

PNG, JPG up to 5MB

+
+ +
+ + {/* Photo Gallery */} +
+

or choose from gallery

+
+ {avatars.map((avatar, index) => ( + + ))} +
+
+ + + ); +}; \ No newline at end of file diff --git a/frontend/src/constants/avatars.ts b/frontend/src/constants/avatars.ts index 1f13bd4f2..65273c03c 100644 --- a/frontend/src/constants/avatars.ts +++ b/frontend/src/constants/avatars.ts @@ -8,3 +8,5 @@ export const avatars = [ '/avatars/avatar7.png', '/avatars/avatar8.png', ]; + +export const DEFAULT_AVATAR = '/avatars/avatar1.png'; diff --git a/frontend/src/pages/SettingsPage/Settings.tsx b/frontend/src/pages/SettingsPage/Settings.tsx index fdc84cd8f..93965cdf0 100644 --- a/frontend/src/pages/SettingsPage/Settings.tsx +++ b/frontend/src/pages/SettingsPage/Settings.tsx @@ -4,6 +4,7 @@ import React from 'react'; import FolderManagementCard from './components/FolderManagementCard'; import UserPreferencesCard from './components/UserPreferencesCard'; import ApplicationControlsCard from './components/ApplicationControlsCard'; +import { UserProfileCard } from './components/UserProfileCard'; /** * Settings page component @@ -13,6 +14,9 @@ const Settings: React.FC = () => { return (
+ {/* User Profile */} + + {/* Folder Management */} diff --git a/frontend/src/pages/SettingsPage/components/UserProfileCard.tsx b/frontend/src/pages/SettingsPage/components/UserProfileCard.tsx new file mode 100644 index 000000000..17a2a1de2 --- /dev/null +++ b/frontend/src/pages/SettingsPage/components/UserProfileCard.tsx @@ -0,0 +1,140 @@ +import React, { useState, useEffect } from 'react'; +import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'; +import { Input } from '@/components/ui/input'; +import { Label } from '@/components/ui/label'; +import { Button } from '@/components/ui/button'; +import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar'; +import { AvatarUpdateCard } from '@/components/AvatarUpdateCard'; +import { User, Save, Camera } from 'lucide-react'; +import { useDispatch } from 'react-redux'; +import { setName, setAvatar } from '@/features/onboardingSlice'; +import { avatarApi } from '@/api/avatar'; + +export const UserProfileCard: React.FC = () => { + const dispatch = useDispatch(); + const [name, setLocalName] = useState(localStorage.getItem('name') || ''); + const [currentAvatar, setCurrentAvatar] = useState(null); + const [isLoading, setIsLoading] = useState(false); + const [isSaving, setIsSaving] = useState(false); + + // Load current user preferences including avatar + useEffect(() => { + const loadUserPreferences = async () => { + setIsLoading(true); + try { + const data = await avatarApi.getUserPreferences(); + const avatar = data.user_preferences?.avatar; + if (avatar) { + const avatarUrl = avatarApi.getAvatarUrl(avatar); + setCurrentAvatar(avatarUrl); + } else { + // Fallback to localStorage avatar (from onboarding) + const localAvatar = localStorage.getItem('avatar'); + if (localAvatar) { + setCurrentAvatar(localAvatar); + } + } + } catch (error) { + console.error('Failed to load user preferences:', error); + // Fallback to localStorage + const localAvatar = localStorage.getItem('avatar'); + if (localAvatar) { + setCurrentAvatar(localAvatar); + } + } finally { + setIsLoading(false); + } + }; + + loadUserPreferences(); + }, []); + + const handleNameSave = async () => { + setIsSaving(true); + try { + // Update localStorage and Redux state + localStorage.setItem('name', name); + dispatch(setName(name)); + } catch (error) { + console.error('Failed to save name:', error); + } finally { + setIsSaving(false); + } + }; + + const handleAvatarUpdate = async (avatarUrl: string) => { + try { + // Update backend preferences + await avatarApi.updateUserPreferences({ avatar: avatarUrl }); + + setCurrentAvatar(avatarUrl); + // Update localStorage and Redux state + localStorage.setItem('avatar', avatarUrl); + dispatch(setAvatar(avatarUrl)); + } catch (error) { + console.error('Failed to update avatar:', error); + alert(`Failed to update avatar: ${error instanceof Error ? error.message : 'Unknown error'}`); + } + }; + + return ( +
+ {/* Basic Profile Info */} + + + + + Profile Information + + + Manage your display name and profile photo + + + +
+
+ + + + + + +
+ +
+
+
+
+ +
+ setLocalName(e.target.value)} + placeholder="Enter your name" + className="flex-1" + /> + +
+
+
+
+ + + + {/* Avatar Update */} + +
+ ); +}; \ No newline at end of file diff --git a/scripts/setup.sh b/scripts/setup.sh old mode 100644 new mode 100755