Update app.py

app.py

@@ -21,33 +21,31 @@ from utils.general import check_img_size, check_requirements, check_imshow, non_
 from utils.plots import plot_one_box
 from utils.torch_utils import select_device, load_classifier, time_synchronized, TracedModel
 from PIL import Image
-
-parser = argparse.ArgumentParser()
-parser.add_argument('--weights', nargs='+', type=str, default='yolov7-e6.pt', help='model.pt path(s)')
-parser.add_argument('--source', type=str, default='Inference/', help='source')  # file/folder, 0 for webcam
-parser.add_argument('--img-size', type=int, default=640, help='inference size (pixels)')
-parser.add_argument('--conf-thres', type=float, default=0.25, help='object confidence threshold')
-parser.add_argument('--iou-thres', type=float, default=0.45, help='IOU threshold for NMS')
-parser.add_argument('--device', default='', help='cuda device, i.e. 0 or 0,1,2,3 or cpu')
-parser.add_argument('--view-img', action='store_true', help='display results')
-parser.add_argument('--save-txt', action='store_true', help='save results to *.txt')
-parser.add_argument('--save-conf', action='store_true', help='save confidences in --save-txt labels')
-parser.add_argument('--nosave', action='store_true', help='do not save images/videos')
-parser.add_argument('--classes', nargs='+', type=int, help='filter by class: --class 0, or --class 0 2 3')
-parser.add_argument('--agnostic-nms', action='store_true', help='class-agnostic NMS')
-parser.add_argument('--augment', action='store_true', help='augmented inference')
-parser.add_argument('--update', action='store_true', help='update all models')
-parser.add_argument('--project', default='runs/detect', help='save results to project/name')
-parser.add_argument('--name', default='exp', help='save results to project/name')
-parser.add_argument('--exist-ok', action='store_true', help='existing project/name ok, do not increment')
-parser.add_argument('--trace', action='store_true', help='trace model')
-opt = parser.parse_args()
-
  
 
 
 
-def detect(img):
+def detect(img,model):
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--weights', nargs='+', type=str, default=model+".pt", help='model.pt path(s)')
+    parser.add_argument('--source', type=str, default='Inference/', help='source')  # file/folder, 0 for webcam
+    parser.add_argument('--img-size', type=int, default=640, help='inference size (pixels)')
+    parser.add_argument('--conf-thres', type=float, default=0.25, help='object confidence threshold')
+    parser.add_argument('--iou-thres', type=float, default=0.45, help='IOU threshold for NMS')
+    parser.add_argument('--device', default='', help='cuda device, i.e. 0 or 0,1,2,3 or cpu')
+    parser.add_argument('--view-img', action='store_true', help='display results')
+    parser.add_argument('--save-txt', action='store_true', help='save results to *.txt')
+    parser.add_argument('--save-conf', action='store_true', help='save confidences in --save-txt labels')
+    parser.add_argument('--nosave', action='store_true', help='do not save images/videos')
+    parser.add_argument('--classes', nargs='+', type=int, help='filter by class: --class 0, or --class 0 2 3')
+    parser.add_argument('--agnostic-nms', action='store_true', help='class-agnostic NMS')
+    parser.add_argument('--augment', action='store_true', help='augmented inference')
+    parser.add_argument('--update', action='store_true', help='update all models')
+    parser.add_argument('--project', default='runs/detect', help='save results to project/name')
+    parser.add_argument('--name', default='exp', help='save results to project/name')
+    parser.add_argument('--exist-ok', action='store_true', help='existing project/name ok, do not increment')
+    parser.add_argument('--trace', action='store_true', help='trace model')
+    opt = parser.parse_args()
     img.save("Inference/test.jpg")
     source, weights, view_img, save_txt, imgsz, trace = opt.source, opt.weights, opt.view_img, opt.save_txt, opt.img_size, opt.trace
     save_img = True  # save inference images
@@ -189,4 +187,4 @@ with torch.no_grad():
         for opt.weights in ['yolov7-e6.pt']:
             strip_optimizer(opt.weights)
    
-gr.Interface(detect,gr.Image(type="pil"), gr.Image(type="pil"),title="Yolov7",examples=[["horses.jpeg"]],description="demo for <a href='https://github.com/WongKinYiu/yolov7' style='text-decoration: underline' target='_blank'>WongKinYiu/yolov7</a> Trainable bag-of-freebies sets new state-of-the-art for real-time object detectors").launch()
+gr.Interface(detect,[gr.Image(type="pil"),gr.Dropdown(choices=["yolov7","yolov7-e6e","yolov7-e6"])], gr.Image(type="pil"),title="Yolov7",examples=[["horses.jpeg"]],description="demo for <a href='https://github.com/WongKinYiu/yolov7' style='text-decoration: underline' target='_blank'>WongKinYiu/yolov7</a> Trainable bag-of-freebies sets new state-of-the-art for real-time object detectors").launch()