commit tạm

api.py

@@ -16,18 +16,21 @@ from common.utils import (
 
 app = Flask(__name__)
 
-# Load configuration and matcher
+# Load configuration and matcher zoo
 config = load_config(ROOT / "common/config.yaml")
 matcher_zoo_restored = get_matcher_zoo(config["matcher_zoo"])
-conf = matcher_zoo_restored.get("superpoint+superglue")
-api = ImageMatchingAPI(conf=conf, device=DEVICE)
+
+# Initialize API instances for each model
+api_instances = {}
+for model_name, conf in matcher_zoo_restored.items():
+    api_instances[model_name] = ImageMatchingAPI(conf=conf, device=DEVICE)
 
 # Set up logging
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
-def match_images(img_path1, img_path2):
-    logger.info(f"Matching images with {DEVICE}")
+def match_images(img_path1, img_path2, api_instance):
+    logger.info(f"Matching images with {DEVICE} using provided API instance")
     try:
         # Read the images using OpenCV
         image0 = cv2.imread(img_path1)
@@ -40,7 +43,7 @@ def match_images(img_path1, img_path2):
         image0 = cv2.cvtColor(image0, cv2.COLOR_BGR2RGB)
         image1 = cv2.cvtColor(image1, cv2.COLOR_BGR2RGB)
 
-        results = api(image0, image1)
+        results = api_instance(image0, image1)
 
         return {
             "num_keypoints0": len(results["keypoints0_orig"]),
@@ -52,7 +55,7 @@ def match_images(img_path1, img_path2):
             "matches0": results["mkeypoints0_orig"].tolist(),
             "matches1": results["mmkeypoints0_orig"].tolist(),
             "inliers0": results["mmkeypoints0_orig"].tolist(),
-            "inliers1": results["mmkeypoints1_orig"].tolist(),
+            "inliers1": results["mmkeypoints0_orig"].tolist(),
             "confidence": results["mconf"].tolist(),
             "inlier_confidence": results["mmconf"].tolist(),
         }
@@ -73,6 +76,7 @@ def match_images_endpoint():
 
     img1_file = request.files['img1']
     img2_file = request.files['img2']
+    model_name = request.form.get('model', 'superpoint+superglue')
 
     # Validate file types
     valid_extensions = {'png', 'jpg', 'jpeg', 'bmp', 'tiff'}
@@ -88,8 +92,13 @@ def match_images_endpoint():
         img1_file.save(img_path1)
         img2_file.save(img_path2)
 
+        # Get the pre-initialized API instance for the selected model
+        api_instance = api_instances.get(model_name)
+        if not api_instance:
+            raise ValueError(f"Model '{model_name}' not found in matcher zoo.")
+
         # Run the matching task synchronously
-        result = match_images(img_path1, img_path2)
+        result = match_images(img_path1, img_path2, api_instance)
     except Exception as e:
         logger.error("Error processing images: %s", str(e))
         return jsonify({"error": str(e)}), 500

common/config.yaml

@@ -27,123 +27,6 @@ matcher_zoo:
       paper: https://arxiv.org/abs/2405.12979
       project: https://hwjiang1510.github.io/OmniGlue
       display: true
-  DUSt3R:
-    # TODO: duster is under development  
-    enable: true
-    matcher: duster
-    dense: true
-    info:
-      name: DUSt3R #dispaly name
-      source: "CVPR 2024"
-      github: https://github.com/naver/dust3r
-      paper: https://arxiv.org/abs/2312.14132
-      project: https://dust3r.europe.naverlabs.com
-      display: true
-  GIM(dkm):
-    enable: true
-    matcher: gim(dkm)
-    dense: true
-    info:
-      name: GIM(DKM) #dispaly name
-      source: "ICLR 2024"
-      github: https://github.com/xuelunshen/gim
-      paper: https://arxiv.org/abs/2402.11095
-      project: https://xuelunshen.com/gim
-      display: true
-  RoMa:
-    matcher: roma
-    dense: true
-    info:
-      name: RoMa #dispaly name
-      source: "CVPR 2024"
-      github: https://github.com/Parskatt/RoMa
-      paper: https://arxiv.org/abs/2305.15404
-      project: https://parskatt.github.io/RoMa
-      display: true
-  dkm:
-    matcher: dkm
-    dense: true
-    info:
-      name: DKM #dispaly name
-      source: "CVPR 2023"
-      github: https://github.com/Parskatt/DKM
-      paper: https://arxiv.org/abs/2202.00667
-      project: https://parskatt.github.io/DKM
-      display: true
-  loftr:
-    matcher: loftr
-    dense: true
-    info:
-      name: LoFTR #dispaly name
-      source: "CVPR 2021"
-      github: https://github.com/zju3dv/LoFTR
-      paper: https://arxiv.org/pdf/2104.00680
-      project: https://zju3dv.github.io/loftr
-      display: true
-  cotr:
-    enable: false
-    skip_ci: true
-    matcher: cotr
-    dense: true
-    info:
-      name: CoTR #dispaly name
-      source: "ICCV 2021"
-      github: https://github.com/ubc-vision/COTR
-      paper: https://arxiv.org/abs/2103.14167
-      project: null
-      display: true
-  topicfm:
-    matcher: topicfm
-    dense: true
-    info:
-      name: TopicFM #dispaly name
-      source: "AAAI 2023"
-      github: https://github.com/TruongKhang/TopicFM
-      paper: https://arxiv.org/abs/2307.00485
-      project: null
-      display: true
-  aspanformer:
-    matcher: aspanformer
-    dense: true
-    info:
-      name: ASpanformer #dispaly name
-      source: "ECCV 2022"
-      github: https://github.com/Vincentqyw/ml-aspanformer
-      paper: https://arxiv.org/abs/2208.14201
-      project: null
-      display: true
-  xfeat(sparse):
-    matcher: NN-mutual
-    feature: xfeat
-    dense: false
-    info:
-      name: XFeat #dispaly name
-      source: "CVPR 2024"
-      github: https://github.com/verlab/accelerated_features
-      paper: https://arxiv.org/abs/2404.19174
-      project: null
-      display: true
-  xfeat(dense):
-    matcher: xfeat_dense
-    dense: true
-    info:
-      name: XFeat #dispaly name
-      source: "CVPR 2024"
-      github: https://github.com/verlab/accelerated_features
-      paper: https://arxiv.org/abs/2404.19174
-      project: null
-      display: false
-  dedode:
-    matcher: Dual-Softmax
-    feature: dedode
-    dense: false
-    info:
-      name: DeDoDe #dispaly name
-      source: "3DV 2024"
-      github: https://github.com/Parskatt/DeDoDe
-      paper: https://arxiv.org/abs/2308.08479
-      project: null
-      display: true
   superpoint+superglue:
     matcher: superglue
     feature: superpoint_max
@@ -154,241 +37,4 @@ matcher_zoo:
       github: https://github.com/magicleap/SuperGluePretrainedNetwork
       paper: https://arxiv.org/abs/1911.11763
       project: null
-      display: true
-  superpoint+lightglue:
-    matcher: superpoint-lightglue
-    feature: superpoint_max
-    dense: false
-    info:
-      name: LightGlue #dispaly name
-      source: "ICCV 2023"
-      github: https://github.com/cvg/LightGlue
-      paper: https://arxiv.org/pdf/2306.13643
-      project: null
-      display: true
-  disk:
-    matcher: NN-mutual
-    feature: disk
-    dense: false
-    info:
-      name: DISK
-      source: "NeurIPS 2020"
-      github: https://github.com/cvlab-epfl/disk
-      paper: https://arxiv.org/abs/2006.13566
-      project: null
-      display: true
-  disk+dualsoftmax:
-    matcher: Dual-Softmax
-    feature: disk
-    dense: false
-    info:
-      name: DISK
-      source: "NeurIPS 2020"
-      github: https://github.com/cvlab-epfl/disk
-      paper: https://arxiv.org/abs/2006.13566
-      project: null
-      display: false
-  superpoint+dualsoftmax:
-    matcher: Dual-Softmax
-    feature: superpoint_max
-    dense: false
-    info:
-      name: SuperPoint
-      source: "CVPRW 2018"
-      github: https://github.com/magicleap/SuperPointPretrainedNetwork
-      paper: https://arxiv.org/abs/1712.07629
-      project: null
-      display: false
-  sift+lightglue:
-    matcher: sift-lightglue
-    feature: sift
-    dense: false
-    info:
-      name: LightGlue #dispaly name
-      source: "ICCV 2023"
-      github: https://github.com/cvg/LightGlue
-      paper: https://arxiv.org/pdf/2306.13643
-      project: null
-      display: true
-  disk+lightglue:
-    matcher: disk-lightglue
-    feature: disk
-    dense: false
-    info:
-      name: LightGlue
-      source: "ICCV 2023"
-      github: https://github.com/cvg/LightGlue
-      paper: https://arxiv.org/pdf/2306.13643
-      project: null
-      display: true
-  superpoint+mnn:
-    matcher: NN-mutual
-    feature: superpoint_max
-    dense: false
-    info:
-      name: SuperPoint #dispaly name
-      source: "CVPRW 2018"
-      github: https://github.com/magicleap/SuperPointPretrainedNetwork
-      paper: https://arxiv.org/abs/1712.07629
-      project: null
-      display: true
-  sift+sgmnet:
-    matcher: sgmnet
-    feature: sift
-    dense: false
-    info:
-      name: SGMNet #dispaly name
-      source: "ICCV 2021"
-      github: https://github.com/vdvchen/SGMNet
-      paper: https://arxiv.org/abs/2108.08771
-      project: null
-      display: true
-  sosnet:
-    matcher: NN-mutual
-    feature: sosnet
-    dense: false
-    info:
-      name: SOSNet #dispaly name
-      source: "CVPR 2019"
-      github: https://github.com/scape-research/SOSNet
-      paper: https://arxiv.org/abs/1904.05019
-      project: https://research.scape.io/sosnet
-      display: true
-  hardnet:
-    matcher: NN-mutual
-    feature: hardnet
-    dense: false
-    info:
-      name: HardNet #dispaly name
-      source: "NeurIPS 2017"
-      github: https://github.com/DagnyT/hardnet
-      paper: https://arxiv.org/abs/1705.10872
-      project: null
-      display: true
-  d2net:
-    matcher: NN-mutual
-    feature: d2net-ss
-    dense: false
-    info:
-      name: D2Net #dispaly name
-      source: "CVPR 2019"
-      github: https://github.com/Vincentqyw/d2-net
-      paper: https://arxiv.org/abs/1905.03561
-      project: https://dusmanu.com/publications/d2-net.html
-      display: true
-  rord:
-    matcher: NN-mutual
-    feature: rord
-    dense: false
-    info:
-      name: RoRD #dispaly name
-      source: "IROS 2021"
-      github: https://github.com/UditSinghParihar/RoRD
-      paper: https://arxiv.org/abs/2103.08573
-      project: https://uditsinghparihar.github.io/RoRD
-      display: true
-  alike:
-    matcher: NN-mutual
-    feature: alike
-    dense: false
-    info:
-      name: ALIKE #dispaly name
-      source: "TMM 2022"
-      github: https://github.com/Shiaoming/ALIKE
-      paper: https://arxiv.org/abs/2112.02906
-      project: null
-      display: true
-  lanet:
-    matcher: NN-mutual
-    feature: lanet
-    dense: false
-    info:
-      name: LANet #dispaly name
-      source: "ACCV 2022"
-      github: https://github.com/wangch-g/lanet
-      paper: https://openaccess.thecvf.com/content/ACCV2022/papers/Wang_Rethinking_Low-level_Features_for_Interest_Point_Detection_and_Description_ACCV_2022_paper.pdf
-      project: null
-      display: true
-  r2d2:
-    matcher: NN-mutual
-    feature: r2d2
-    dense: false
-    info:
-      name: R2D2 #dispaly name
-      source: "NeurIPS 2019"
-      github: https://github.com/naver/r2d2
-      paper: https://arxiv.org/abs/1906.06195
-      project: null
-      display: true
-  darkfeat:
-    matcher: NN-mutual
-    feature: darkfeat
-    dense: false
-    info:
-      name: DarkFeat #dispaly name
-      source: "AAAI 2023"
-      github: https://github.com/THU-LYJ-Lab/DarkFeat
-      paper: null
-      project: null
-      display: true
-  sift:
-    matcher: NN-mutual
-    feature: sift
-    dense: false
-    info:
-      name: SIFT #dispaly name
-      source: "IJCV 2004"
-      github: null
-      paper: https://www.cs.ubc.ca/~lowe/papers/ijcv04.pdf
-      project: null
-      display: true
-  gluestick:
-    enable: false
-    matcher: gluestick
-    dense: true
-    info:
-      name: GlueStick #dispaly name
-      source: "ICCV 2023"
-      github: https://github.com/cvg/GlueStick
-      paper: https://arxiv.org/abs/2304.02008
-      project: https://iago-suarez.com/gluestick
-      display: true
-  sold2:
-    enable: false
-    matcher: sold2
-    dense: true
-    info:
-      name: SOLD2 #dispaly name
-      source: "CVPR 2021"
-      github: https://github.com/cvg/SOLD2
-      paper: https://arxiv.org/abs/2104.03362
-      project: null
-      display: true
-
-  sfd2+imp:
-    matcher: imp
-    feature: sfd2
-    enable: false
-    dense: false
-    skip_ci: true
-    info:
-      name: SFD2+IMP #dispaly name
-      source: "CVPR 2023"
-      github: https://github.com/feixue94/imp-release
-      paper: https://arxiv.org/pdf/2304.14837
-      project: https://feixue94.github.io/
-      display: true
-
-  sfd2+mnn:
-    matcher: NN-mutual
-    feature: sfd2
-    enable: false
-    dense: false
-    skip_ci: true
-    info:
-      name: SFD2+MNN #dispaly name
-      source: "CVPR 2023"
-      github: https://github.com/feixue94/sfd2
-      paper: https://arxiv.org/abs/2304.14845
-      project: https://feixue94.github.io/
-      display: true
+      display: true