Update UI

.idea/workspace.xml

@@ -4,14 +4,13 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d7806539-b6d6-42e7-bb45-1565f5d54891" name="Changes" comment="IoU evaluator">
-      <change afterPath="$PROJECT_DIR$/yolo_model.py" afterDir="false" />
+    <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" />
-      <change beforePath="$PROJECT_DIR$/yolo_fire.py" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -30,6 +29,21 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="HighlightingSettingsPerFile">
+    <setting file="file://$USER_HOME$/Library/Caches/JetBrains/PyCharm2023.3/python_stubs/580317742/posix.py" root0="SKIP_INSPECTION" />
+    <setting file="file:///opt/homebrew/anaconda3/envs/detector/lib/python3.10/site-packages/torch/utils/_contextlib.py" root0="SKIP_INSPECTION" />
+    <setting file="file:///opt/homebrew/anaconda3/envs/detector/lib/python3.10/site-packages/ultralytics/data/base.py" root0="SKIP_INSPECTION" />
+    <setting file="file:///opt/homebrew/anaconda3/envs/detector/lib/python3.10/site-packages/ultralytics/data/build.py" root0="SKIP_INSPECTION" />
+    <setting file="file:///opt/homebrew/anaconda3/envs/detector/lib/python3.10/site-packages/ultralytics/data/dataset.py" root0="SKIP_INSPECTION" />
+    <setting file="file:///opt/homebrew/anaconda3/envs/detector/lib/python3.10/site-packages/ultralytics/data/utils.py" root0="SKIP_INSPECTION" />
+    <setting file="file:///opt/homebrew/anaconda3/envs/detector/lib/python3.10/site-packages/ultralytics/engine/model.py" root0="SKIP_INSPECTION" />
+    <setting file="file:///opt/homebrew/anaconda3/envs/detector/lib/python3.10/site-packages/ultralytics/engine/validator.py" root0="SKIP_INSPECTION" />
+    <setting file="file:///opt/homebrew/anaconda3/envs/detector/lib/python3.10/site-packages/ultralytics/models/yolo/detect/val.py" root0="SKIP_INSPECTION" />
+    <setting file="file:///opt/homebrew/anaconda3/envs/detector/lib/python3.10/site-packages/ultralytics/utils/checks.py" root0="SKIP_INSPECTION" />
+    <setting file="file:///opt/homebrew/anaconda3/envs/detector/lib/python3.10/site-packages/ultralytics/utils/metrics.py" root0="SKIP_INSPECTION" />
+    <setting file="file:///opt/homebrew/anaconda3/envs/detector/lib/python3.10/site-packages/yaml/scanner.py" root0="SKIP_INSPECTION" />
+    <setting file="file:///opt/homebrew/anaconda3/envs/detector/lib/python3.10/zipfile.py" root0="SKIP_INSPECTION" />
+  </component>
   <component name="MarkdownSettingsMigration">
     <option name="stateVersion" value="1" />
   </component>
@@ -47,9 +61,10 @@
   </component>
   <component name="PropertiesComponent"><![CDATA[{
   "keyToString": {
-    "Python.demo.executor": "Run",
-    "Python.evaluator.executor": "Run",
+    "Python.demo.executor": "Debug",
+    "Python.evaluator.executor": "Debug",
     "Python.extract.executor": "Run",
+    "Python.streamlit.executor": "Debug",
     "Python.yolo_dataset.executor": "Run",
     "RunOnceActivity.OpenProjectViewOnStart": "true",
     "RunOnceActivity.ShowReadmeOnStart": "true",
@@ -74,7 +89,7 @@
       <recent name="$PROJECT_DIR$" />
     </key>
   </component>
-  <component name="RunManager" selected="Python.yolo_dataset">
+  <component name="RunManager" selected="Python.streamlit">
     <configuration name="demo" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="detector" />
       <option name="ENV_FILES" value="" />
@@ -121,6 +136,30 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
+    <configuration name="streamlit" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
+      <module name="detector" />
+      <option name="ENV_FILES" value="" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="SDK_NAME" value="detector" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+      <option name="SCRIPT_NAME" value="streamlit" />
+      <option name="PARAMETERS" value="run demo.py" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="true" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
+    </configuration>
     <configuration name="yolo_dataset" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="detector" />
       <option name="ENV_FILES" value="" />
@@ -150,7 +189,8 @@
       <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
-      <option name="SDK_HOME" value="" />
+      <option name="SDK_HOME" value="/opt/homebrew/anaconda3/envs/detector/bin/python" />
+      <option name="SDK_NAME" value="detector" />
       <option name="WORKING_DIRECTORY" value="" />
       <option name="IS_MODULE_SDK" value="false" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
@@ -159,11 +199,18 @@
       <option name="launchJavascriptDebuger" value="false" />
       <method v="2" />
     </configuration>
+    <list>
+      <item itemvalue="FastAPI.detector" />
+      <item itemvalue="Python.streamlit" />
+      <item itemvalue="Python.demo" />
+      <item itemvalue="Python.evaluator" />
+      <item itemvalue="Python.yolo_dataset" />
+    </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Python.yolo_dataset" />
-        <item itemvalue="Python.evaluator" />
         <item itemvalue="Python.demo" />
+        <item itemvalue="Python.evaluator" />
+        <item itemvalue="Python.yolo_dataset" />
       </list>
     </recent_temporary>
   </component>
@@ -187,7 +234,9 @@
       <workItem from="1702476484538" duration="9613000" />
       <workItem from="1705757850315" duration="14186000" />
       <workItem from="1705812482464" duration="711000" />
-      <workItem from="1705845330999" duration="5355000" />
+      <workItem from="1705845330999" duration="11089000" />
+      <workItem from="1706104589422" duration="517000" />
+      <workItem from="1706105118954" duration="3764000" />
     </task>
     <task id="LOCAL-00001" summary="init commit">
       <option name="closed" value="true" />
@@ -365,7 +414,15 @@
       <option name="project" value="LOCAL" />
       <updated>1705771207294</updated>
     </task>
-    <option name="localTasksCounter" value="23" />
+    <task id="LOCAL-00023" summary="Update UI">
+      <option name="closed" value="true" />
+      <created>1705850745341</created>
+      <option name="number" value="00023" />
+      <option name="presentableId" value="LOCAL-00023" />
+      <option name="project" value="LOCAL" />
+      <updated>1705850745341</updated>
+    </task>
+    <option name="localTasksCounter" value="24" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -408,12 +465,30 @@
     <MESSAGE value="use /run/secrets" />
     <MESSAGE value="fix confidence" />
     <MESSAGE value="IoU evaluator" />
-    <option name="LAST_COMMIT_MESSAGE" value="IoU evaluator" />
+    <MESSAGE value="Update UI" />
+    <option name="LAST_COMMIT_MESSAGE" value="Update UI" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file:///opt/homebrew/anaconda3/envs/detector/lib/python3.10/site-packages/ultralytics/data/utils.py</url>
+          <line>311</line>
+          <option name="timeStamp" value="9" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/evaluator.py</url>
+          <line>77</line>
+          <option name="timeStamp" value="17" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/detector$yolo_dataset.coverage" NAME="yolo_dataset Coverage Results" MODIFIED="1705850662461" 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="1702302380580" 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="1705847678258" 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$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$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>

Dockerfile

@@ -14,5 +14,6 @@ RUN pip install -r requirements.txt
 RUN --mount=type=secret,id=HF_TOKEN,mode=0444,required=true \
     HF_TOKEN=$(cat /run/secrets/HF_TOKEN) python yolo_model.py \
     --weight_files=SHOU-ISD/fire-and-smoke:yolov8n.pt \
-    --weight_files=SHOU-ISD/yolo-cracks:best.pt
+    --weight_files=SHOU-ISD/yolo-cracks:best.pt \
+    --weight_files=ultralyticsplus/yolov8s:yolov8s.pt
 ENTRYPOINT ["streamlit", "run", "demo.py"]

demo.py

@@ -1,4 +1,5 @@
 import contextlib
+import os
 import time
 from functools import wraps
 from io import StringIO
@@ -13,6 +14,7 @@ from yolo_model import YoloModel
 
 fire_and_smoke = YoloModel("SHOU-ISD/fire-and-smoke", "yolov8n.pt")
 crack = YoloModel("SHOU-ISD/yolo-cracks", "best.pt")
+coco = YoloModel("ultralyticsplus/yolov8s", "yolov8s.pt")
 
 
 def main():
@@ -22,13 +24,14 @@ def main():
         layout="centered")
 
     model = None
-    model_choice = None
     with st.sidebar:
-        model_choice = st.radio("Select Model", ["Fire&Smoke", "Crack"])
+        model_choice = st.radio("Select Model", ["Fire&Smoke", "Crack", "Coco"])
         if model_choice == "Fire&Smoke":
             model = fire_and_smoke
         elif model_choice == "Crack":
             model = crack
+        elif model_choice == "Coco":
+            model = coco
 
     st.title(f"{model_choice} Detection:")
 
@@ -48,9 +51,14 @@ def evaluate(model: YoloModel):
             # Slider for changing confidence
             confidence = st.slider('Confidence Threshold', 0, 100, 30)
             yolo_dataset = YoloDataset.from_zip_file(ZipFile(buffer))
-            capture_output(evaluator.evaluate)(model=model.model,
-                                               coco_gt=yolo_dataset.to_coco(), loader=yolo_dataset.load_image,
-                                               confidence_threshold=confidence / 100.0)
+            metrics_res = capture_output(evaluator.evaluate)(model=model.model,
+                                                             dataset=yolo_dataset,
+                                                             confidence_threshold=confidence / 100.0)
+            with metrics_res as metrics:
+                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)
 
 
 def detect(model: YoloModel):

evaluator.py

@@ -1,17 +1,18 @@
+import shutil
 from typing import Callable
 
 from PIL.Image import Image
 from coco_eval import CocoEvaluator
-from pycocotools.coco import COCO
 from tqdm import tqdm
 
-from yolo_dataset import YoloDataset
+from yolo_dataset import YoloDataset, MaterialYoloDataset
 from yolo_model import YoloModel
 
 image_loader = Callable[[str], Image]
 
 
-def evaluate(model: YoloModel, coco_gt: COCO, loader: image_loader, confidence_threshold=0.6):
+def 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"])
 
@@ -19,7 +20,7 @@ def evaluate(model: YoloModel, coco_gt: COCO, loader: image_loader, confidence_t
     for image_id, annotations in tqdm(coco_gt.imgToAnns.items()):
         # get the inputs
         image = coco_gt.imgs[image_id]
-        results = model.model(source=loader(image["file_name"]))
+        results = model.model(source=dataset.load_image(image["file_name"]))
         for result in results:
             coco_anns = yolo_boxes_to_coco_annotations(image_id, result.boxes,
                                                        confidence_threshold=confidence_threshold)
@@ -33,6 +34,23 @@ def evaluate(model: YoloModel, coco_gt: COCO, loader: image_loader, confidence_t
     evaluator.synchronize_between_processes()
     evaluator.accumulate()
     evaluator.summarize()
+    return Metrics(model=model, material=dataset.to_material())
+
+
+class Metrics:
+    def __init__(self, model: YoloModel, material: MaterialYoloDataset):
+        self.model = model
+        self.material = material
+        self.val = None
+
+    def __enter__(self):
+        if self.val is None:
+            self.val = self.model.model.val(data=self.material.yaml)
+        return self.val
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.material.__exit__(exc_type, exc_val, exc_tb)
+        shutil.rmtree(self.val.save_dir)
 
 
 def yolo_boxes_to_coco_annotations(image_id: int, yolo_boxes, confidence_threshold=0.6):
@@ -53,13 +71,14 @@ def main():
     coco_gt = yolo_dataset.to_coco()
     model = YoloModel("ultralyticsplus/yolov8s", "yolov8s.pt")
     # model = YoloModel("SHOU-ISD/fire-and-smoke", "yolov8n.pt")
-    evaluate(model=model, coco_gt=coco_gt, loader=yolo_dataset.load_image, confidence_threshold=0.1)
+    # evaluate(model=model, coco_gt=coco_gt, loader=yolo_dataset.load_image, confidence_threshold=0.1)
     # Validate the model
-    metrics = model.model.val()  # no arguments needed, dataset and settings remembered
-    print(metrics.box.map)  # map50-95
-    print(metrics.box.map50)  # map50
-    print(metrics.box.map75)  # map75
-    print(metrics.box.maps)  # a list contains map50-95 of each category
+    with yolo_dataset.to_material() as material:
+        metrics = model.model.val(data=material.yaml)
+        print(metrics.box.map)  # map50-95
+        print(metrics.box.map50)  # map50
+        print(metrics.box.map75)  # map75
+        print(metrics.box.maps)  # a list contains map50-95 of each category
 
 
 if __name__ == '__main__':

yolo_dataset.py

@@ -12,7 +12,6 @@
 #     ├── 1.txt
 #     ├── 2.txt
 #     └── ...
-import os
 import pathlib
 import shutil
 from datetime import datetime
@@ -20,7 +19,6 @@ from typing import Optional
 from zipfile import ZipFile
 
 from PIL import Image
-from pycocotools import coco
 from pycocotools.coco import COCO
 
 yolo_label = {
@@ -126,8 +124,9 @@ class YoloDataset:
         namelist = zip_file.namelist()
         root_name = namelist[0]
         namelist = list(filter(lambda x: not zip_file.getinfo(x).is_dir(), namelist))
-        if 'classes.txt' in namelist:
-            classes = zip_file.read('classes.txt').decode('utf-8').split('\n')
+        cls_filename = root_name + 'classes.txt'
+        if cls_filename in namelist:
+            classes = zip_file.read(cls_filename).decode('utf-8').split('\n')
         else:
             classes = []
         images = list(filter(lambda x: x.startswith(root_name + 'images'), namelist))
@@ -192,7 +191,7 @@ class YoloDataset:
                 "supercategory": None,
             })
 
-        coco_ds = coco.COCO()
+        coco_ds = COCO()
         coco_ds.dataset = {
             "images": images,
             "annotations": annotations,
@@ -201,36 +200,58 @@ class YoloDataset:
         coco_ds.createIndex()
         return coco_ds
 
-    def to_yaml(self):
-        """
-        :return: Yaml format in
-            <code>
-            path: ../datasets/coco128 # dataset root dir
-            val: images/train2017 # val images (relative to 'path') 128 images
-
-            # Classes
-            names:
-              0: person
-            </code>
-        """
-        try:
-            # recursively create dir
-            pathlib.Path(f'datasets/{self._zip_file.filename}').mkdir(parents=True, exist_ok=True)
-            self._zip_file.extractall(f'datasets/{self._zip_file.filename}')
-            with open(f'datasets/{self._zip_file.filename}/data.yaml', 'w') as f:
-                f.write(f'path: ../datasets/{self._zip_file.filename}\n')
-                f.write(f'val: images/train2017\n')
-                f.write(f'\n')
-                f.write(f'# Classes\n')
-                f.write(f'names:\n')
-                for i in range(len(self._classes)):
-                    f.write(f'  {i}: {self._classes[i]}\n')
-        finally:
-            shutil.rmtree(f'datasets/{self._zip_file.filename}')
+    def to_material(self):
+        return MaterialYoloDataset(self)
 
+    @property
+    def zip_file(self):
+        return self._zip_file
 
-if __name__ == '__main__':
+    @property
+    def classes(self):
+        return self._classes
+
+
+class MaterialYoloDataset:
+    def __init__(self, dataset: YoloDataset):
+        print(dataset.to_coco().cats)
+        self._classes = dataset.classes
+        self._zip_file = dataset.zip_file
+        self._root = self._zip_file.namelist()[0][:-1]
+
+    def __enter__(self):
+        # recursively create dir
+        dataset_path = pathlib.Path(f'./datasets/')
+        dataset_path.mkdir(parents=True, exist_ok=True)
+        self._zip_file.extractall(f'./datasets/')
+        with open(f'./datasets/{self._root}/data.yaml', 'w+') as f:
+            f.write(f'path: {dataset_path.absolute()}/{self._root}/\n')
+            f.write(f'train: images/train\n')
+            f.write(f'val: images/val\n')
+            f.write(f'\n')
+            f.write(f'# Classes\n')
+            f.write(f'names:\n')
+            for i in range(len(self._classes)):
+                f.write(f'  {i}: {self._classes[i]}\n')
+            else:
+                for i in range(0, 2):
+                    f.write(f'  {i}: unknown\n')
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        shutil.rmtree(f'./datasets/{self._root}')
+
+    @property
+    def yaml(self):
+        return pathlib.Path(f'./datasets/{self._root}/data.yaml').absolute()
+
+
+def main():
     dataset = YoloDataset.from_path('tests/coco8.zip')
     coco = dataset.to_coco()
     print(coco)
-    dataset.to_yaml()
+    print(dataset.to_material().yaml)
+
+
+if __name__ == '__main__':
+    main()