add detection fast api

.idea/workspace.xml

@@ -5,11 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="d7806539-b6d6-42e7-bb45-1565f5d54891" name="Changes" comment="add crack split.py">
-      <change afterPath="$PROJECT_DIR$/models/tools/draw.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/report.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/demo.py" beforeDir="false" afterPath="$PROJECT_DIR$/demo.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/models/yolo_crack.py" beforeDir="false" afterPath="$PROJECT_DIR$/models/yolo_crack.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yolo_model.py" beforeDir="false" afterPath="$PROJECT_DIR$/yolo_model.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/requirements.txt" beforeDir="false" afterPath="$PROJECT_DIR$/requirements.txt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -60,39 +59,43 @@
   </component>
   <component name="PropertiesComponent"><![CDATA[{
   "keyToString": {
+    "FastAPI.detector.executor": "Debug",
     "Python.demo.executor": "Debug",
     "Python.evaluator.executor": "Debug",
     "Python.extract.executor": "Run",
+    "Python.report.executor": "Run",
     "Python.streamlit.executor": "Run",
     "Python.yolo_crack.executor": "Run",
     "Python.yolo_dataset.executor": "Run",
     "RunOnceActivity.OpenProjectViewOnStart": "true",
     "RunOnceActivity.ShowReadmeOnStart": "true",
     "git-widget-placeholder": "main",
-    "last_opened_file_path": "/Users/famer.me/PycharmProjects/detector/tools",
+    "last_opened_file_path": "/Users/famer.me/PycharmProjects/detector/datasets/coco8/images/val",
     "node.js.detected.package.eslint": "true",
     "node.js.detected.package.tslint": "true",
     "node.js.selected.package.eslint": "(autodetect)",
     "node.js.selected.package.tslint": "(autodetect)",
     "nodejs_package_manager_path": "npm",
-    "settings.editor.selected.configurable": "settings.qodana",
+    "settings.editor.selected.configurable": "preferences.pluginManager",
     "vue.rearranger.settings.migration": "true"
   }
 }]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/datasets/coco8/images/val" />
       <recent name="$PROJECT_DIR$/tools" />
       <recent name="$PROJECT_DIR$/datasets" />
       <recent name="$PROJECT_DIR$/tests" />
       <recent name="$PROJECT_DIR$" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/datasets/coco8/images/report" />
       <recent name="$PROJECT_DIR$/models" />
       <recent name="$PROJECT_DIR$/tests" />
       <recent name="$PROJECT_DIR$" />
     </key>
   </component>
-  <component name="RunManager" selected="Python.yolo_crack">
+  <component name="RunManager" selected="FastAPI.detector">
     <configuration name="demo" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="detector" />
       <option name="ENV_FILES" value="" />
@@ -139,6 +142,29 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
+    <configuration name="report" type="PythonConfigurationType" factoryName="Python" temporary="true" 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="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <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="$PROJECT_DIR$/report.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <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="" />
@@ -228,6 +254,7 @@
     <list>
       <item itemvalue="FastAPI.detector" />
       <item itemvalue="Python.streamlit" />
+      <item itemvalue="Python.report" />
       <item itemvalue="Python.yolo_crack" />
       <item itemvalue="Python.demo" />
       <item itemvalue="Python.evaluator" />
@@ -235,17 +262,19 @@
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="Python.report" />
+        <item itemvalue="Python.yolo_dataset" />
         <item itemvalue="Python.yolo_crack" />
-        <item itemvalue="Python.demo" />
         <item itemvalue="Python.evaluator" />
-        <item itemvalue="Python.yolo_dataset" />
+        <item itemvalue="Python.demo" />
       </list>
     </recent_temporary>
   </component>
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-python-sdk-5a2391486177-2887949eec09-com.jetbrains.pycharm.pro.sharedIndexes.bundled-PY-233.13763.11" />
+        <option value="bundled-js-predefined-1d06a55b98c1-74d2a5396914-JavaScript-PY-241.14494.241" />
+        <option value="bundled-python-sdk-0509580d9d50-28c9f5db9ffe-com.jetbrains.pycharm.pro.sharedIndexes.bundled-PY-241.14494.241" />
       </set>
     </attachedChunks>
   </component>
@@ -272,6 +301,11 @@
       <workItem from="1706449264770" duration="4974000" />
       <workItem from="1706517295469" duration="2595000" />
       <workItem from="1706855634459" duration="14109000" />
+      <workItem from="1708327016792" duration="4898000" />
+      <workItem from="1708856137024" duration="98000" />
+      <workItem from="1708856451866" duration="718000" />
+      <workItem from="1714034677595" duration="2647000" />
+      <workItem from="1714110004313" duration="6341000" />
     </task>
     <task id="LOCAL-00001" summary="init commit">
       <option name="closed" value="true" />
@@ -592,11 +626,13 @@
     </breakpoint-manager>
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
+    <SUITE FILE_PATH="coverage/detector$streamlit.coverage" NAME="streamlit Coverage Results" MODIFIED="1706949799318" 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$" />
     <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$detector.coverage" NAME="detector Coverage Results" MODIFIED="1714119714139" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
     <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$report.coverage" NAME="report Coverage Results" MODIFIED="1708530028219" 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="1706949799318" 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$yolo_crack.coverage" NAME="yolo_crack Coverage Results" MODIFIED="1706950034213" 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$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>

main.py

@@ -1,13 +1,60 @@
-from fastapi import FastAPI
+import ultralytics.engine.results
+from fastapi import FastAPI, UploadFile
+from PIL import Image
+from yolo_model import YoloModel
 
 app = FastAPI()
 
+model = YoloModel("SHOU-ISD/fire-and-smoke", "yolov8n.pt")
+
 
 @app.get("/")
-async def root():
-    return {"message": "Hello World"}
+async def info():
+    return {
+        "model": f"Fire and Smoke Detection",
+        "version": "1.0",
+    }
+
+
+@app.post("/predict")
+async def predict(image: UploadFile):
+    if image.content_type not in ["image/jpeg", "image/png"]:
+        return {"error": "Invalid file type"}
+
+    im = Image.open(image.file)
+    res = model.detect(im)
+    return {
+        "list": [
+            detect_item(box, res_item.names)
+            for res_item in res
+            for box in res_item.boxes
+        ]
+    }
+
+
+CXYWH = {
+    "cx": float,
+    "cy": float,
+    "w": float,
+    "h": float,
+}
+
+DetectItem = {
+    "category": str,
+    "bbox": CXYWH,
+    "score": float,
+}
 
 
-@app.get("/hello/{name}")
-async def say_hello(name: str):
-    return {"message": f"Hello {name}"}
+def detect_item(box: ultralytics.engine.results.Boxes, mapping: dict[int, str]) -> DetectItem:
+    cx, cy, w, h = box.xywhn.tolist()[0]
+    return {
+        "category": mapping[int(box.cls)],
+        "bbox": {
+            "cx": cx,
+            "cy": cy,
+            "w": w,
+            "h": h,
+        },
+        "score": float(box.conf),
+    }

report.py

@@ -0,0 +1,54 @@
+import os
+
+
+def render(kernel, epochs, train_datasets, valid_datasets,
+           val_images, accuracy, precision, recall):
+    return f"""
+# Model Info
+* Kernel: {kernel}
+* Epochs: {epochs}
+* TrainSet: {train_datasets}
+* ValidSet: {valid_datasets}
+# Metrics
+* Accuracy: {accuracy}
+* Precision: {precision}
+* Recall: {recall}
+# Confusion Matrix
+![confusion_matrix](./confusion_matrix.png)
+# Valid Image Example
+{render_list(val_images)}
+""".strip()
+
+
+def render_list(lst):
+    return "".join(render_list_iter(lst))
+
+
+def render_list_iter(lst):
+    for item in lst:
+        yield f"""{render_item(item)}\n"""
+
+
+def render_item(item: tuple[str, str]):
+    original, pred = item
+    return f"""
+### Original Image
+![original_image]({original})
+### Predicted Image
+![predicted_image]({pred})
+""".strip()
+
+
+def main(val_images: list[tuple[str, str]]):
+
+    return render(kernel='yolov5s', epochs=100, train_datasets='coco', valid_datasets='coco',
+                  val_images=val_images,
+                  accuracy=0.9, precision=0.8, recall=0.7)
+
+
+if __name__ == '__main__':
+    out = 'datasets/coco8/images/report/report.md'
+    imgs = list(map(lambda x: (f"../val/{x}", f"../val/{x}"), os.listdir('datasets/coco8/images/val')))
+
+    with open(out, 'w') as f:
+        f.write(main(val_images=imgs))

requirements.txt

@@ -131,3 +131,4 @@ websockets==12.0
 wheel==0.42.0
 widgetsnbextension==4.0.9
 zipp==3.17.0
+python-multipart==0.0.9