Update app.py

app.py

@@ -85,11 +85,11 @@ def detect_combined(image):
         result_text = "Product Nestle\n\n"
         for class_name, count in nestle_class_count.items():
             result_text += f"{class_name}: {count}\n"
-        result_text += f"\nTotal Product Nestle: {total_nestle}\n\n"
+        result_text += f"\nTotal Products Nestle: {total_nestle}\n\n"
 
         result_text += "Competitor Products\n\n"
         if competitor_class_count:
-            result_text += f"Total Competitor: {total_competitor}\n"  # Hanya total, tidak per kelas
+            result_text += f"Total Unclassified Products: {total_competitor}\n"  # Hanya total, tidak per kelas
         else:
             result_text += "No competitors detected\n"
 
@@ -106,12 +106,17 @@ def detect_combined(image):
         # Kompetitor (Merah) dengan nama 'unclassified'
         for comp in competitor_boxes:
             x1, y1, x2, y2 = comp['box']
-            # Ubah nama kelas menjadi 'unclassified' jika sesuai dengan kategori yang disebutkan
-            display_name = "unclassified" if comp['class'] in ["beverage . bottle . cans"] else comp['class']
-            cv2.rectangle(img, (int(x1), int(y1)), (int(x2), int(y2)), (0,0,255), 2)
-            cv2.putText(img, f"{display_name} {comp['confidence']:.2f}", 
-                       (int(x1), int(y1-10)), cv2.FONT_HERSHEY_SIMPLEX, 0.5, (0,0,255), 2)
-
+            
+            # Define a list of target classes to rename
+            unclassified_classes = ["beverage", "cans", "bottle"]
+            
+            # Normalize the class name to be case-insensitive and check if it's in the unclassified list
+            display_name = "unclassified" if any(class_name in comp['class'].lower() for class_name in unclassified_classes) else comp['class']
+            
+            cv2.rectangle(img, (int(x1), int(y1)), (int(x2), int(y2)), (0, 0, 255), 2)
+            cv2.putText(img, f"{display_name} {comp['confidence']:.2f}",
+                        (int(x1), int(y1-10)), cv2.FONT_HERSHEY_SIMPLEX, 0.5, (0, 0, 255), 2)
+            
         output_path = "/tmp/combined_output.jpg"
         cv2.imwrite(output_path, img)