Change: Camera api model hierarchy

Author: Gogobobo11

src/api/api.py

@@ -221,10 +221,8 @@ async def get_camera(camera_id: int):
                 )
 
         @self.app.put("/cameras/{camera_id}")
-        async def update_camera(camera_id: int, updated_fields: Request):
+        async def update_camera(camera_id: int, updated_fields: CameraBase):
             try:
-                updated_fields = await updated_fields.json()
-                
                 camera = self.db_manager.update_camera(camera_id, updated_fields)
 
                 if camera is None:

src/api/models.py

@@ -2,55 +2,74 @@
 from pydantic import BaseModel, field_validator, Field
 import json
 
-class CreateCamera(BaseModel):
-    title: str
-    source: str
-    image_width: int
-    image_height: int
-    calib: Any
-    latitude: float
-    longitude: float
+# class CreateCamera(BaseModel):
+#     title: str
+#     source: str
+#     image_width: int
+#     image_height: int
+#     calib: Any
+#     latitude: float
+#     longitude: float
 
-    @field_validator('title')
-    @classmethod
-    def validate_title(cls, title):
-        if len(title) < 1 or len(title) > 200:
-            raise ValueError(f"Invalid camera title: {title}")
-        return title
+#     @field_validator('title')
+#     @classmethod
+#     def validate_title(cls, title):
+#         if len(title) < 1 or len(title) > 200:
+#             raise ValueError(f"Invalid camera title: {title}")
+#         return title
 
-    @field_validator('source')
-    @classmethod
-    def validate_source(cls, source):
-        return source
+#     @field_validator('source')
+#     @classmethod
+#     def validate_source(cls, source):
+#         return source
 
-    @field_validator('latitude')
-    @classmethod
-    def validate_latitude(cls, latitude):
-        if latitude > 90 or latitude < -90:
-            raise ValueError(f"Invalid latitude value: {latitude}")
-        return latitude
+#     @field_validator('latitude')
+#     @classmethod
+#     def validate_latitude(cls, latitude):
+#         if latitude > 90 or latitude < -90:
+#             raise ValueError(f"Invalid latitude value: {latitude}")
+#         return latitude
 
-    @field_validator('longitude')
-    @classmethod
-    def validate_longitude(cls, longitude):
-        if longitude > 180 or longitude < -180:
-            raise ValueError(f"Invalid longitude value: {longitude}")
-        return longitude
+#     @field_validator('longitude')
+#     @classmethod
+#     def validate_longitude(cls, longitude):
+#         if longitude > 180 or longitude < -180:
+#             raise ValueError(f"Invalid longitude value: {longitude}")
+#         return longitude
 
-    @field_validator('image_width')
-    @classmethod
-    def validate_image_width(cls, image_width):
-        if image_width <= 0: 
-            raise ValueError(f"Invalid image_width value: {image_width}")
-        return image_width
+#     @field_validator('image_width')
+#     @classmethod
+#     def validate_image_width(cls, image_width):
+#         if image_width <= 0: 
+#             raise ValueError(f"Invalid image_width value: {image_width}")
+#         return image_width
 
-    @field_validator('image_height')
-    @classmethod
-    def validate_image_height(cls, image_height):
-        if image_height <= 0: 
-            raise ValueError(f"Invalid image_height value: {image_height}")
-        return image_height
+#     @field_validator('image_height')
+#     @classmethod
+#     def validate_image_height(cls, image_height):
+#         if image_height <= 0: 
+#             raise ValueError(f"Invalid image_height value: {image_height}")
+#         return image_height
 
+#     @field_validator('calib')
+#     @classmethod
+#     def validate_calib(cls, calib):
+#         if calib is not None:
+#             try:
+#                 json.dumps(calib)
+#             except:
+#                 raise ValueError(f"Invalid calibration data")
+#         return calib
+    
+class CameraBase(BaseModel):
+    title: Optional[str] = Field(None, min_length=3, max_length=120)
+    source: Optional[str] = Field(None, max_length=250)
+    image_width: Optional[int] = Field(None, gt=0)
+    image_height: Optional[int] = Field(None, gt=0)
+    calib: Any
+    latitude: Optional[float] = Field(None, ge=-90, le=90)
+    longitude: Optional[float] = Field(None, ge=-180, le=180)
+
     @field_validator('calib')
     @classmethod
     def validate_calib(cls, calib):
@@ -60,6 +79,15 @@ def validate_calib(cls, calib):
             except:
                 raise ValueError(f"Invalid calibration data")
         return calib
+    
+class CreateCamera(CameraBase):
+    title: str = Field(min_length=3, max_length=120)
+    source: str = Field(max_length=250)
+    image_width: int = Field(gt=0)
+    image_height: int = Field(gt=0)
+    calib: Any
+    latitude: float = Field(ge=-90, le=90)
+    longitude: float = Field(ge=-180, le=180)
 
 class Point(BaseModel):
     latitude: float = Field(ge=-90, le=90)

src/db_manager/db_manager.py

@@ -303,15 +303,13 @@ def get_camera(self, camera_id):
             return camera.serialize() if camera is not None else None
 
     def update_camera(self, camera_id, updated_fields):
-        if not isinstance(updated_fields, dict):
-            raise HTTPException(
-                status_code=400,
-                detail="Request body must be a JSON dict"
-            )
-        
         with self.get_session() as session:
             stmt = update(Camera).where(Camera.id == camera_id)
 
+            updated_field = updated_fields.model_dump(
+                exclude_none=True
+            )
+
             stmt = stmt.values(updated_fields)
 
             session.execute(stmt)