Update UI

.idea/workspace.xml

@@ -6,11 +6,8 @@
   <component name="ChangeListManager">
     <list default="true" id="d7806539-b6d6-42e7-bb45-1565f5d54891" name="Changes" comment="Update UI">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/Dockerfile" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/demo.py" beforeDir="false" afterPath="$PROJECT_DIR$/demo.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/evaluator.py" beforeDir="false" afterPath="$PROJECT_DIR$/evaluator.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/tests/coco8.zip" beforeDir="false" afterPath="$PROJECT_DIR$/tests/coco8.zip" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yolo_dataset.py" beforeDir="false" afterPath="$PROJECT_DIR$/yolo_dataset.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -236,7 +233,7 @@
       <workItem from="1705812482464" duration="711000" />
       <workItem from="1705845330999" duration="11089000" />
       <workItem from="1706104589422" duration="517000" />
-      <workItem from="1706105118954" duration="3764000" />
+      <workItem from="1706105118954" duration="5313000" />
     </task>
     <task id="LOCAL-00001" summary="init commit">
       <option name="closed" value="true" />
@@ -422,7 +419,15 @@
       <option name="project" value="LOCAL" />
       <updated>1705850745341</updated>
     </task>
-    <option name="localTasksCounter" value="24" />
+    <task id="LOCAL-00024" summary="Update UI">
+      <option name="closed" value="true" />
+      <created>1706108912066</created>
+      <option name="number" value="00024" />
+      <option name="presentableId" value="LOCAL-00024" />
+      <option name="project" value="LOCAL" />
+      <updated>1706108912066</updated>
+    </task>
+    <option name="localTasksCounter" value="25" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -478,7 +483,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/evaluator.py</url>
-          <line>77</line>
+          <line>81</line>
           <option name="timeStamp" value="17" />
         </line-breakpoint>
       </breakpoints>
@@ -488,7 +493,7 @@
     <SUITE FILE_PATH="coverage/detector$yolo_dataset.coverage" NAME="yolo_dataset Coverage Results" MODIFIED="1705852113469" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/detector$evaluator.coverage" NAME="evaluator Coverage Results" MODIFIED="1706107083258" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/detector$demo.coverage" NAME="demo Coverage Results" MODIFIED="1706108414052" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/detector$streamlit.coverage" NAME="streamlit Coverage Results" MODIFIED="1706108547026" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
+    <SUITE FILE_PATH="coverage/detector$streamlit.coverage" NAME="streamlit Coverage Results" MODIFIED="1706110239818" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
     <SUITE FILE_PATH="coverage/detector$extract.coverage" NAME="yolo_dataset Coverage Results" MODIFIED="1705764465837" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
   </component>
 </project>

demo.py

@@ -51,14 +51,18 @@ def evaluate(model: YoloModel):
             # Slider for changing confidence
             confidence = st.slider('Confidence Threshold', 0, 100, 30)
             yolo_dataset = YoloDataset.from_zip_file(ZipFile(buffer))
-            metrics_res = capture_output(evaluator.evaluate)(model=model.model,
-                                                             dataset=yolo_dataset,
-                                                             confidence_threshold=confidence / 100.0)
-            with metrics_res as metrics:
+            capture_output(evaluator.coco_evaluate)(model=model.model,
+                                                    dataset=yolo_dataset,
+                                                    confidence_threshold=confidence / 100.0)
+            with evaluator.yolo_evaluator(model, yolo_dataset) as metrics:
+                st.subheader("Metrics:")
+                st.write("Speed: ")
                 st.json(metrics.speed)
-                st.json(metrics.result_dict)
-                for pic in os.listdir(metrics.val.save_dir):
-                    st.image(os.path.join(metrics.val.save_dir, pic), use_column_width=True)
+                st.write("Results: ")
+                st.json(metrics.results_dict)
+                for pic in os.listdir(metrics.save_dir):
+                    st.write(pic)
+                    st.image(os.path.join(metrics.save_dir, pic), use_column_width=True)
 
 
 def detect(model: YoloModel):

evaluator.py

@@ -11,7 +11,7 @@ from yolo_model import YoloModel
 image_loader = Callable[[str], Image]
 
 
-def evaluate(model: YoloModel, dataset: YoloDataset, confidence_threshold=0.6):
+def coco_evaluate(model: YoloModel, dataset: YoloDataset, confidence_threshold=0.6):
     coco_gt = dataset.to_coco()
     # initialize evaluator with ground truth (gt)
     evaluator = CocoEvaluator(coco_gt=coco_gt, iou_types=["bbox"])
@@ -30,10 +30,13 @@ def evaluate(model: YoloModel, dataset: YoloDataset, confidence_threshold=0.6):
 
     if len(evaluator.eval_imgs["bbox"]) == 0:
         print("No detections!")
-        return
-    evaluator.synchronize_between_processes()
-    evaluator.accumulate()
-    evaluator.summarize()
+    else:
+        evaluator.synchronize_between_processes()
+        evaluator.accumulate()
+        evaluator.summarize()
+
+
+def yolo_evaluator(model: YoloModel, dataset: YoloDataset):
     return Metrics(model=model, material=dataset.to_material())
 
 
@@ -45,6 +48,7 @@ class Metrics:
 
     def __enter__(self):
         if self.val is None:
+            self.material.__enter__()
             self.val = self.model.model.val(data=self.material.yaml)
         return self.val