Merge branch 'main' of https://github.com/HunyyDev/SE113.O12_KCPM into NMPhap/testing

app/dependencies.py

@@ -16,28 +16,26 @@ def get_current_user(
         user_doc_ref = db.collection("user").document(payload["sub"]).get()
         if not user_doc_ref.exists:
             raise HTTPException(status_code=400, detail="User profile not found")
-    except ExpiredIdTokenError:
+    except ExpiredIdTokenError as e:
+        logger.warning(e)
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
             detail="Token expired",
             headers={"WWW-Authenticate": "Bearer"},
         )
-    except InvalidIdTokenError:
+    except InvalidIdTokenError as e:
+        logger.warning(e)
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
             detail="Invalid token",
             headers={"WWW-Authenticate": "Bearer"},
         )
-    except ValueError:
+    except ValueError as e:
+        logger.warning(e)
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
             detail="Invalid token",
             headers={"WWW-Authenticate": "Bearer"},
         )
 
-    except Exception as e:
-        logger.info(e)
-        logger.error(e)
-        raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR)
-
     return payload

app/main.py

@@ -4,8 +4,6 @@ from fastapi.responses import RedirectResponse
 from app.graphdb.main import insert2PersonAndSetFriend, deleteFriend
 from .routers import image, video, friend_request, me
 
-import uvicorn
-
 app = FastAPI()
 
 app.include_router(image.router)
@@ -24,7 +22,3 @@ def hello():
 async def test():
     await insert2PersonAndSetFriend("1", "2")
     await deleteFriend("1", "2")
-
-
-if __name__ == "__main__":
-    uvicorn.run(app, host="0.0.0.0", port=8000)

app/routers/video.py

@@ -1,12 +1,12 @@
 import asyncio
-import json
-from multiprocessing import Process
 import os
 import re
 import shutil
 import time
 import aiofiles
 import cv2
+
+from multiprocessing import Process
 from fastapi import (
     APIRouter,
     Depends,
@@ -40,9 +40,13 @@ async def handleVideoRequest(
 
     try:
         if user["sub"] is None:
-            return HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="User not found")
+            return HTTPException(
+                status_code=status.HTTP_400_BAD_REQUEST, detail="User not found"
+            )
         id = str(now())
-        _, artifact_ref = db.collection("artifacts").add({"name": id + ".mp4", "status": "pending"})
+        _, artifact_ref = db.collection("artifacts").add(
+            {"name": id + ".mp4", "status": "pending"}
+        )
         os.mkdir(id)
         async with aiofiles.open(os.path.join(id, "input.mp4"), "wb") as out_file:
             while content := await file.read(1024):
@@ -153,38 +157,50 @@ def updateArtifact(artifactId: str, body):
     if not artifact_snapshot.exists:
         artifact_snapshot.update(body)
     sendMessage(artifactId)
+
+
 # This function cannot be automation test because the requirement of another device to receive notification
 def sendMessage(artifactId: str, message: str = None):
     token = []
     artifact = db.collection("artifacts").document(artifactId).get()
     if not artifact.exists:
         return
-    user_ref = db.collection("user").where(filter=FieldFilter("artifacts", "array-contains", "artifacts/" + artifactId))
+    user_ref = db.collection("user").where(
+        filter=FieldFilter("artifacts", "array-contains", "artifacts/" + artifactId)
+    )
     for user in user_ref:
-        token.append(user.get().to_dict()['deviceId'])
+        token.append(user.get().to_dict()["deviceId"])
     if message is not None:
-        messaging.MulticastMessage(data={"notification": {
-            "title": message,
-            "body":
-                "Video " +
-                artifact.name +
-                " has done inference. Click here to see the video",
-            },}, android=messaging.AndroidConfig(
+        messaging.MulticastMessage(
+            data={
+                "notification": {
+                    "title": message,
+                    "body": "Video "
+                    + artifact.name
+                    + " has done inference. Click here to see the video",
+                },
+            },
+            android=messaging.AndroidConfig(
                 notification=messaging.AndroidNotification(
-                    icon='stock_ticker_update',
-                    color='#f45342'
-            ),))
+                    icon="stock_ticker_update", color="#f45342"
+                ),
+            ),
+        )
     else:
-        messaging.MulticastMessage(data={"notification": {
-            "title": "Video " + artifact.name + " has done inference.",
-            "body":
-                "Video " +
-                artifact.name +
-                " has done inference. Click here to see the video",
-            },}, android=messaging.AndroidConfig(
+        messaging.MulticastMessage(
+            data={
+                "notification": {
+                    "title": "Video " + artifact.name + " has done inference.",
+                    "body": "Video "
+                    + artifact.name
+                    + " has done inference. Click here to see the video",
+                },
+            },
+            android=messaging.AndroidConfig(
                 notification=messaging.AndroidNotification(
-                    icon='stock_ticker_update',
-                    color='#f45342'
-            ),))
+                    icon="stock_ticker_update", color="#f45342"
+                ),
+            ),
+        )
     response = messaging.send_multicast(message)
-    return response.success_count
+    return response.success_count