<Test>: Fix test]

app/__init__.py

@@ -27,14 +27,11 @@ key: str = os.environ.get("SUPABASE_KEY")
 supabase: Client = create_client(url, key)
 
 # LOAD FIREBASE ADMIN SDK
-if not firebase_admin._apps:
-    firebase_app = initialize_app(
-        credential=credentials.Certificate(
-            json.loads(os.environ.get("FIREBASE_CREDENTIALS"))
-        )
+firebase_app = initialize_app(
+    credential=credentials.Certificate(
+        json.loads(os.environ.get("FIREBASE_CREDENTIALS"))
     )
-else:
-    firebase_app = firebase_admin.get_app()
+)
 db = firestore.client()
 
 # LOAD NEO4J DB

app/custom_mmcv/main.py

@@ -17,7 +17,7 @@ def imshow_det_bboxes(
     img: Union[str, np.ndarray],
     bboxes: np.ndarray,
     labels: np.ndarray,
-    class_names: List[str] = None,
+    class_names: List[str] = [],
     score_thr: float = 0,
     bbox_color: ColorType = "green",
     text_color: ColorType = "green",
@@ -67,7 +67,7 @@ def imshow_det_bboxes(
         bbox_int = bbox.astype(np.int32)
         left_top = (bbox_int[0], bbox_int[1])
         right_bottom = (bbox_int[2], bbox_int[3])
-        if colors is not None:
+        if colors is not None and len(colors) > 0:
             bbox_color = text_color = color_val(colors[label])
         cv2.rectangle(img, left_top, right_bottom, bbox_color, thickness=thickness)
         label_text = class_names[label] if class_names is not None else f"cls {label}"

app/dependencies.py

@@ -4,7 +4,6 @@ from firebase_admin import auth
 from firebase_admin.auth import ExpiredIdTokenError, InvalidIdTokenError
 from app import logger
 from . import db
-
 security = HTTPBearer()
 
 

app/main.py

@@ -12,11 +12,6 @@ app.include_router(friend_request.router)
 app.include_router(me.router)
 
 
-@app.get("/", include_in_schema=False)
-def hello():
-    response = RedirectResponse(url="/docs")
-    return response
-
 
 @app.get("/test")
 async def test():

app/routers/image.py

@@ -20,10 +20,9 @@ async def handleImageRequest(
     try:
         img = imfrombytes(file, cv2.IMREAD_COLOR)
         if raw:
-            bboxes, labels = inferenceImage(img, threshold, True)
+            bboxes, labels = inferenceImage(img, threshold, raw)
             return {"bboxes": bboxes.tolist(), "labels": labels.tolist()}
-
-        img = inferenceImage(img, threshold, False)
+        img = inferenceImage(img, threshold, raw)
     except Exception as e:
         logger.error(e)
         return Response(content="Failed to read image", status_code=400)
@@ -37,7 +36,7 @@ async def handleImageRequest(
     return Response(content=jpeg_bytes, media_type="image/jpeg")
 
 
-def inferenceImage(img, threshold: float, isRaw: bool = False):
+def inferenceImage(img, threshold: float, isRaw: bool):
     bboxes, labels, _ = detector(img)
     if isRaw:
         removeIndexs = []

app/routers/video.py

@@ -62,50 +62,50 @@ async def handleVideoRequest(
 def now():
     return round(time.time() * 1000)
 
+def createThumbnail(thumbnail, inputDir):
+    thumbnail = cv2.resize(
+        src=thumbnail, dsize=(160, 160), interpolation=cv2.INTER_AREA
+    )
+    cv2.imwrite(os.path.join(inputDir, "thumbnail.jpg"), thumbnail)
+def inference_frame(inputDir, threshold:float=0.3):
+    cap = cv2.VideoCapture(
+        filename=os.path.join(inputDir, "input.mp4"), apiPreference=cv2.CAP_FFMPEG
+    )
+    fps = cap.get(cv2.CAP_PROP_FPS)
+    size = (
+        int(cap.get(cv2.CAP_PROP_FRAME_WIDTH)),
+        int(cap.get(cv2.CAP_PROP_FRAME_HEIGHT)),
+    )
+    result = cv2.VideoWriter(
+        filename=os.path.join(inputDir, "out.mp4"),
+        fourcc=cv2.VideoWriter_fourcc(*"mp4v"),
+        fps=fps,
+        frameSize=size,
+    )
 
+    isFirstFrame = True
+    thumbnail = None
+    while cap.isOpened():
+        res, frame = cap.read()
+        if isFirstFrame:
+            isFirstFrame = False
+            thumbnail = frame
+
+        if res == False:
+            break
+
+        resFram = inferenceImage(frame, threshold, False)
+        result.write(resFram)
+    cap.release()
+    result.release()
+    del cap
+    del result
+    return thumbnail
 async def inferenceVideo(artifactId: str, inputDir: str, threshold: float):
     try:
         Process(updateArtifact(artifactId, {"status": "processing"})).start()
-        cap = cv2.VideoCapture(
-            filename=os.path.join(inputDir, "input.mp4"), apiPreference=cv2.CAP_FFMPEG
-        )
-        fps = cap.get(cv2.CAP_PROP_FPS)
-        size = (
-            int(cap.get(cv2.CAP_PROP_FRAME_WIDTH)),
-            int(cap.get(cv2.CAP_PROP_FRAME_HEIGHT)),
-        )
-        result = cv2.VideoWriter(
-            filename=os.path.join(inputDir, "out.mp4"),
-            fourcc=cv2.VideoWriter_fourcc(*"mp4v"),
-            fps=fps,
-            frameSize=size,
-        )
-
-        isFirstFrame = True
-        thumbnail = None
-        while cap.isOpened():
-            res, frame = cap.read()
-            if isFirstFrame:
-                isFirstFrame = False
-                thumbnail = frame
-
-            if res == False:
-                break
-
-            resFram = inferenceImage(frame, threshold)
-            result.write(resFram)
-
-        cap.release()
-        result.release()
-
-        def createThumbnail(thumbnail):
-            thumbnail = cv2.resize(
-                src=thumbnail, dsize=(160, 160), interpolation=cv2.INTER_AREA
-            )
-            cv2.imwrite(os.path.join(inputDir, "thumbnail.jpg"), thumbnail)
-
-        createThumbnail(thumbnail)
-
+        thumbnail = inference_frame(inputDir, threshold=threshold)
+        createThumbnail(thumbnail, inputDir)
         async def uploadVideo():
             async with aiofiles.open(os.path.join(inputDir, "out.mp4"), "rb") as f:
                 supabase.storage.from_("video").upload(
@@ -149,7 +149,10 @@ async def inferenceVideo(artifactId: str, inputDir: str, threshold: float):
             )
         ).start()
     finally:
-        shutil.rmtree(inputDir)
+        try:
+            shutil.rmtree(inputDir)
+        except PermissionError as e:
+            print(e)
 
 
 def updateArtifact(artifactId: str, body):

coverage.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<coverage version="7.2.2" timestamp="1699431759592" lines-valid="371" lines-covered="301" line-rate="0.8113" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0">
+<coverage version="7.2.2" timestamp="1699459188469" lines-valid="371" lines-covered="252" line-rate="0.6792" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0">
 	<!-- Generated by coverage.py: https://coverage.readthedocs.io/en/7.2.2 -->
 	<!-- Based on https://raw.githubusercontent.com/cobertura/web/master/htdocs/xml/coverage-04.dtd -->
 	<sources>
@@ -102,6 +102,10 @@
 		</package>
 		<package name="custom_mmcv" line-rate="0.9697" branch-rate="0" complexity="0">
 			<classes>
+				<class name="__init__.py" filename="custom_mmcv/__init__.py" complexity="0" line-rate="1" branch-rate="0">
+					<methods/>
+					<lines/>
+				</class>
 				<class name="color.py" filename="custom_mmcv/color.py" complexity="0" line-rate="0.9688" branch-rate="0">
 					<methods/>
 					<lines>
@@ -182,6 +186,10 @@
 		</package>
 		<package name="graphdb" line-rate="0.3636" branch-rate="0" complexity="0">
 			<classes>
+				<class name="__init__.py" filename="graphdb/__init__.py" complexity="0" line-rate="1" branch-rate="0">
+					<methods/>
+					<lines/>
+				</class>
 				<class name="main.py" filename="graphdb/main.py" complexity="0" line-rate="0.3636" branch-rate="0">
 					<methods/>
 					<lines>
@@ -200,8 +208,12 @@
 				</class>
 			</classes>
 		</package>
-		<package name="routers" line-rate="0.7679" branch-rate="0" complexity="0">
+		<package name="routers" line-rate="0.5491" branch-rate="0" complexity="0">
 			<classes>
+				<class name="__init__.py" filename="routers/__init__.py" complexity="0" line-rate="1" branch-rate="0">
+					<methods/>
+					<lines/>
+				</class>
 				<class name="friend_request.py" filename="routers/friend_request.py" complexity="0" line-rate="0.6548" branch-rate="0">
 					<methods/>
 					<lines>
@@ -346,7 +358,7 @@
 						<line number="16" hits="0"/>
 					</lines>
 				</class>
-				<class name="video.py" filename="routers/video.py" complexity="0" line-rate="0.7895" branch-rate="0">
+				<class name="video.py" filename="routers/video.py" complexity="0" line-rate="0.2737" branch-rate="0">
 					<methods/>
 					<lines>
 						<line number="1" hits="1"/>
@@ -367,65 +379,65 @@
 						<line number="25" hits="1"/>
 						<line number="28" hits="1"/>
 						<line number="29" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="41" hits="1"/>
-						<line number="42" hits="1"/>
+						<line number="35" hits="0"/>
+						<line number="36" hits="0"/>
+						<line number="41" hits="0"/>
+						<line number="42" hits="0"/>
 						<line number="43" hits="0"/>
-						<line number="46" hits="1"/>
-						<line number="47" hits="1"/>
-						<line number="50" hits="1"/>
-						<line number="51" hits="1"/>
-						<line number="52" hits="1"/>
-						<line number="53" hits="1"/>
-						<line number="54" hits="1"/>
-						<line number="55" hits="1"/>
+						<line number="46" hits="0"/>
+						<line number="47" hits="0"/>
+						<line number="50" hits="0"/>
+						<line number="51" hits="0"/>
+						<line number="52" hits="0"/>
+						<line number="53" hits="0"/>
+						<line number="54" hits="0"/>
+						<line number="55" hits="0"/>
 						<line number="56" hits="0"/>
 						<line number="57" hits="0"/>
 						<line number="58" hits="0"/>
 						<line number="59" hits="0"/>
 						<line number="62" hits="1"/>
-						<line number="63" hits="1"/>
+						<line number="63" hits="0"/>
 						<line number="66" hits="1"/>
-						<line number="67" hits="1"/>
-						<line number="68" hits="1"/>
-						<line number="69" hits="1"/>
-						<line number="72" hits="1"/>
-						<line number="73" hits="1"/>
-						<line number="77" hits="1"/>
-						<line number="84" hits="1"/>
-						<line number="85" hits="1"/>
-						<line number="86" hits="1"/>
-						<line number="87" hits="1"/>
-						<line number="88" hits="1"/>
-						<line number="89" hits="1"/>
-						<line number="90" hits="1"/>
-						<line number="92" hits="1"/>
-						<line number="93" hits="1"/>
-						<line number="95" hits="1"/>
-						<line number="96" hits="1"/>
-						<line number="98" hits="1"/>
-						<line number="99" hits="1"/>
-						<line number="101" hits="1"/>
-						<line number="102" hits="1"/>
-						<line number="105" hits="1"/>
-						<line number="107" hits="1"/>
-						<line number="109" hits="1"/>
-						<line number="110" hits="1"/>
-						<line number="111" hits="1"/>
-						<line number="115" hits="1"/>
-						<line number="116" hits="1"/>
-						<line number="119" hits="1"/>
-						<line number="123" hits="1"/>
-						<line number="124" hits="1"/>
-						<line number="125" hits="1"/>
+						<line number="67" hits="0"/>
+						<line number="68" hits="0"/>
+						<line number="69" hits="0"/>
+						<line number="72" hits="0"/>
+						<line number="73" hits="0"/>
+						<line number="77" hits="0"/>
+						<line number="84" hits="0"/>
+						<line number="85" hits="0"/>
+						<line number="86" hits="0"/>
+						<line number="87" hits="0"/>
+						<line number="88" hits="0"/>
+						<line number="89" hits="0"/>
+						<line number="90" hits="0"/>
+						<line number="92" hits="0"/>
+						<line number="93" hits="0"/>
+						<line number="95" hits="0"/>
+						<line number="96" hits="0"/>
+						<line number="98" hits="0"/>
+						<line number="99" hits="0"/>
+						<line number="101" hits="0"/>
+						<line number="102" hits="0"/>
+						<line number="105" hits="0"/>
+						<line number="107" hits="0"/>
+						<line number="109" hits="0"/>
+						<line number="110" hits="0"/>
+						<line number="111" hits="0"/>
+						<line number="115" hits="0"/>
+						<line number="116" hits="0"/>
+						<line number="119" hits="0"/>
+						<line number="123" hits="0"/>
+						<line number="124" hits="0"/>
+						<line number="125" hits="0"/>
 						<line number="126" hits="0"/>
-						<line number="127" hits="1"/>
-						<line number="128" hits="1"/>
-						<line number="130" hits="1"/>
+						<line number="127" hits="0"/>
+						<line number="128" hits="0"/>
+						<line number="130" hits="0"/>
 						<line number="142" hits="0"/>
 						<line number="143" hits="0"/>
-						<line number="152" hits="1"/>
+						<line number="152" hits="0"/>
 						<line number="155" hits="1"/>
 						<line number="156" hits="1"/>
 						<line number="157" hits="1"/>

tests/test_image.py

@@ -24,7 +24,7 @@ class TestImageRoute():
     def test_inferenceImage(self):
         bboxes, labels = inferenceImage(mmcv.imread('demo.jpg'), 0.3, True)
         assert len(bboxes.tolist()) > 0 and len(labels.tolist()) > 0 and len(bboxes.tolist()) == len(labels.tolist())
-        result = inferenceImage(self.img, 0.3)
+        result = inferenceImage(self.img, 0.3, False)
         assert type(result) is np.ndarray and result.shape == self.img.shape
     def test_ImageAPI(self, client):
         payload = {}

tests/test_video.py

@@ -1,13 +1,17 @@
 from fastapi.testclient import TestClient
 from fastapi.routing import APIRoute
-from app.routers.video import updateArtifact
+from app.routers.video import updateArtifact, createThumbnail, inference_frame
 from app.main import app
 from app.constants import deviceId
 from app import db
+import platform
+import mmcv
 import os
 import pytest
 import requests
 import json
+import cv2
+import shutil
 from google.cloud.firestore_v1.base_query import FieldFilter
 
 def endpoints():
@@ -35,6 +39,7 @@ def user():
     response = requests.request("POST", url, headers=headers, data=payload)
     data = response.json()
     user = {"id": data['localId'], "token": data["idToken"]}
+    db.collection("user").document(user['id']).set({"deviceId": deviceId})
     yield user
     db.collection("user").document(user['id']).delete()
 class TestVideoAPI:
@@ -60,7 +65,6 @@ class TestVideoAPI:
         response = client.request("POST", 'video', headers=headers, data=payload, files=files)
         assert response.status_code == 401
         # Test when sent file is not a video
-        db.collection("user").document(user['id']).set({"deviceId": deviceId})
         payload = {}
         files=[
         ('file',('demo.jpg',open('demo.jpg','rb'),'application/octet-stream'))
@@ -68,7 +72,10 @@ class TestVideoAPI:
         headers = {
         'Authorization': "Bearer " + user['token']
         }
-        response = client.request("POST", 'video', headers=headers, data=payload, files=files)
+        while True:
+            response = client.request("POST", 'video', headers=headers, data=payload, files=files)
+            if response.status_code != 401:
+                break
         assert response.status_code == 400
         # Test when all requirements have been fulfilled
         payload = {}
@@ -104,5 +111,23 @@ class TestVideoAPI:
         assert db.collection("artifacts").document('test').get().to_dict()['status'] == 'test_done'
         #Delete data for next time test
         test_artifact.delete()
-        
-            
+    def test_inference_frame(self):
+        if not os.path.exists('test_vid'):
+            os.mkdir('test_vid')
+        shutil.copyfile('demo.mp4', 'test_vid/input.mp4')
+        thumbnail = inference_frame('test_vid')
+        assert os.path.exists("test_vid/out.mp4") and os.path.isfile('test_vid/out.mp4')
+        vidcap = cv2.VideoCapture('test_vid/input.mp4')
+        success, image = vidcap.read()
+        if success:
+            assert (image.shape == thumbnail.shape)
+        vidcap.release()
+        del vidcap
+        shutil.rmtree('test_vid')
+    def test_create_thumbnal(self):
+        vidcap = cv2.VideoCapture('demo.mp4')
+        success, image = vidcap.read()
+        if success:
+            createThumbnail(image, "")
+            result = mmcv.imread('thumbnail.jpg', channel_order='rgb')
+            assert (result.shape == (160, 160, 3))