🔖 0.1.0 minimum usable app (not deployed)

.gitignore

@@ -1 +1,3 @@
-.vscode
+.vscode
+*.db
+__pycache__

app.py

@@ -6,20 +6,18 @@ import argparse
 import os
 import pathlib
 import subprocess
-import tarfile
 
 if os.getenv('SYSTEM') == 'spaces':
     import mim
 
     mim.uninstall('mmcv-full', confirm_yes=True)
     mim.install('mmcv-full==1.5.2', is_yes=True)
-    # mim.uninstall('mmdet', confirm_yes=True)
-    # mim.install('mmdet==2.20.0', is_yes=True)
+
 
     subprocess.call('pip uninstall -y opencv-python'.split())
     subprocess.call('pip uninstall -y opencv-python-headless'.split())
     subprocess.call('pip install opencv-python-headless==4.5.5.64'.split())
-    subprocess.call('conda install -c conda-forge pycocotools'.split())
+    subprocess.call('pip install pycocotools'.split())
     subprocess.call('pip install detectron2==0.5 -f https://dl.fbaipublicfiles.com/detectron2/wheels/cu101/torch1.7/index.html'.split())
 
 import cv2
@@ -28,9 +26,7 @@ import numpy as np
 
 from mmdet.apis import init_detector, inference_detector
 from utils import show_result
-import mmcv 
 from mmcv import Config
-import os.path as osp 
 
 DESCRIPTION = '''# OpenPSG
 
@@ -64,26 +60,29 @@ def update_input_image(image: np.ndarray) -> dict:
 def set_example_image(example: list) -> dict:
     return gr.Image.update(value=example[0])
 
+class Model:
+    def __init__(self, model_name, device='cpu'):
+        model_ckt ='OpenPSG/checkpoints/epoch_60.pth'
+        cfg = Config.fromfile('OpenPSG/configs/psgtr/psgtr_r50_psg_inference.py')
+        self.model = init_detector(cfg, model_ckt, device=device)
 
-def infer(model, input_image, num_rel):
-    result = inference_detector(model, input_image)
-    return show_result(input_image,
-                        result,
-                        is_one_stage=True,
-                        num_rel=num_rel,
-                        show=True
-                        )
+    def infer(self, input_image, num_rel):
+        result = inference_detector(self.model, input_image)
+        return show_result(input_image,
+                            result,
+                            is_one_stage=True,
+                            num_rel=num_rel,
+                            show=True
+                            )
 
 
 def main():
     args = parse_args()
 
-    model_ckt ='OpenPSG/checkpoints/epoch_60.pth'
-    cfg = Config.fromfile('OpenPSG/configs/psgtr/psgtr_r50_psg_inference.py')
-
-    model = init_detector(cfg, model_ckt, device=args.device)
-
     with gr.Blocks(theme=args.theme, css='style.css') as demo:
+        
+        model = Model('psgtr', device=args.device)
+        
         gr.Markdown(DESCRIPTION)
 
         with gr.Row():
@@ -100,10 +99,8 @@ def main():
                             label='Number of Relations')
                 with gr.Row():
                     run_button = gr.Button(value='Run')
-                    # prediction_results = gr.Variable()
             with gr.Column():
                 with gr.Row():
-                    # visualization = gr.Image(label='Result', type='numpy')
                     result = gr.Gallery(label='Result', type='numpy')
 
         with gr.Row():
@@ -118,9 +115,9 @@ def main():
                            inputs=input_image,
                            outputs=input_image)
         
-        run_button.click(fn=infer,
+        run_button.click(fn=model.infer,
                          inputs=[
-                             model, input_image
+                            input_image, num_rel
                          ],
                          outputs=result)