source /home/fark/anaconda3/bin/activate base

Revert "Revert last commit"

This reverts commit a5fd8341df701d30345e6253a4bb25db22d21a08.

Processor.py

@@ -10,18 +10,9 @@ class Processor():
         self.__model = torch.hub.load(
             'ultralytics/yolov5', 'yolov5x6', trust_repo=True)
 
-    def classify_images(self, images: List[NDArray]) -> List[str]:
-        result = []
-        class_names = self.__inference.dls.vocab
+    def classify_image(self, images: NDArray) -> str:
+        return self.__inference.predict(images)
 
-        test_dl = self.__inference.dls.test_dl(images)
-        tensors = self.__inference.get_preds(dl=test_dl, with_decoded=True)[2]
-        preds = [int(t.item()) for t in tensors]
-
-        for i in preds:
-            result.append(class_names[i])
-
-        return result
     def filter_image(self, image: Image) -> bool:
         results = self.__model(image)
         results = results.pandas().xyxy[0]

app.py

@@ -21,7 +21,8 @@ def process_images(images, processor: Processor):
         if processor.filter_image(image):
             filtered_images.append(np.asarray(image))
     
-    result = processor.classify_images(filtered_images)
+    for img in filtered_images:
+        result.append(processor.classify_image(img)[0])
 
     outfit = mode(result)