Update app.py

app.py

@@ -1,20 +1,14 @@
-# Gradio YOLOv8 Det v0.2.2
+# Gradio YOLOv8 Det v0.2.4
 # 创建人：曾逸夫
-# 创建时间：2023-01-23
+# 创建时间：2023-08-14
 
 import argparse
-import csv
-import os
-import sys
-
-from ultralytics import YOLO
-
-csv.field_size_limit(sys.maxsize)
-
 import gc
 import json
+import os
 import random
 import shutil
+import sys
 from collections import Counter
 from pathlib import Path
 
@@ -25,6 +19,11 @@ import numpy as np
 import pandas as pd
 import plotly.express as px
 from matplotlib import font_manager
+from ultralytics import YOLO
+
+# pip_source = "https://pypi.tuna.tsinghua.edu.cn/simple some-package"
+# os.system(f"pip install gradio --upgrade -i {pip_source}")
+# os.system(f"pip install ultralytics --upgrade -i {pip_source}")
 
 ROOT_PATH = sys.path[0]  # 项目根目录
 
@@ -45,7 +44,7 @@ from util.fonts_opt import is_fonts
 ROOT_PATH = sys.path[0]  # 根目录
 
 # Gradio YOLOv8 Det版本
-GYD_VERSION = "Gradio YOLOv8 Det v0.2.2"
+GYD_VERSION = "Gradio YOLOv8 Det v0.2.3"
 
 # 文件后缀
 suffix_list = [".csv", ".yaml"]
@@ -58,7 +57,7 @@ obj_style = ["小目标", "中目标", "大目标"]
 
 
 def parse_args(known=False):
-    parser = argparse.ArgumentParser(description="Gradio YOLOv8 Det v0.2.2")
+    parser = argparse.ArgumentParser(description="Gradio YOLOv8 Det v0.2.3")
     parser.add_argument("--model_type", "-mt", default="online", type=str, help="model type")
     parser.add_argument("--source", "-src", default="upload", type=str, help="image input source")
     parser.add_argument("--source_video", "-src_v", default="upload", type=str, help="video input source")
@@ -67,7 +66,7 @@ def parse_args(known=False):
     parser.add_argument(
         "--model_cfg",
         "-mc",
-        default="./model_config/model_name_p5_all.yaml",
+        default="./model_config/model_name_all.yaml",
         type=str,
         help="model config",
     )
@@ -197,11 +196,14 @@ def pil_draw(img, score_l, bbox_l, cls_l, cls_index_l, textFont, color_list):
     for score, (xmin, ymin, xmax, ymax), label, cls_index in zip(score_l, bbox_l, cls_l, cls_index_l):
         img_pil.rectangle([xmin, ymin, xmax, ymax], fill=None, outline=color_list[cls_index], width=2)  # 边界框
         countdown_msg = f"{id}-{label} {score:.2f}"
-        text_w, text_h = textFont.getsize(countdown_msg)  # 标签尺寸
-
+        # text_w, text_h = textFont.getsize(countdown_msg)  # 标签尺寸 pillow 9.5.0
+        # left, top, left + width, top + height
+        # 标签尺寸 pillow 10.0.0
+        text_xmin, text_ymin, text_xmax, text_ymax = textFont.getbbox(countdown_msg)
         # 标签背景
         img_pil.rectangle(
-            (xmin, ymin, xmin + text_w, ymin + text_h),
+            # (xmin, ymin, xmin + text_w, ymin + text_h), # pillow 9.5.0
+            (xmin, ymin, xmin + text_xmax - text_xmin, ymin + text_ymax - text_ymin),  # pillow 10.0.0
             fill=color_list[cls_index],
             outline=color_list[cls_index],
         )
@@ -368,7 +370,6 @@ def main(args):
     cls_name = args.cls_name
     inference_size = args.inference_size
     slider_step = args.slider_step
-    is_share = args.is_share
 
     is_fonts(f"{ROOT_PATH}/fonts")  # 检查字体文件
 
@@ -405,9 +406,7 @@ def main(args):
     title = "Gradio YOLOv8 Det"
 
     # 描述
-    description = "<div align='center'>Object detection and image segmentation system based on YOLOv8</div>\
-        <div align='center'>Author: 曾逸夫（Zeng Yifu）, Github: https://github.com/Zengyf-CVer, \
-            thanks to <a href='https://github.com/gradio-app/gradio'>Gradio</a> & <a href='https://github.com/ultralytics/ultralytics'>YOLOv8</a></div>"
+    description = "<div align='center'>基于YOLOv8的目标检测与图像分割系统</div>"
 
     # 示例图片
     examples_imgs = [
@@ -462,6 +461,14 @@ def main(args):
         flagging_options=["good", "generally", "bad"],
     )
 
+    return gyd_img
+
+
+if __name__ == "__main__":
+    args = parse_args()
+    gyd_img = main(args)
+    is_share = args.is_share
+
     gyd_img.launch(
         inbrowser=True,  # 自动打开默认浏览器
         show_tips=True,  # 自动显示gradio最新功能
@@ -470,8 +477,3 @@ def main(args):
         show_error=True,  # 在浏览器控制台中显示错误信息
         quiet=True,  # 禁止大多数打印语句
     )
-
-
-if __name__ == "__main__":
-    args = parse_args()
-    main(args)