update: api

api/__init__.py

@@ -0,0 +1,42 @@
+import sys
+from typing import List
+from pydantic import BaseModel
+import base64
+import io
+import numpy as np
+from fastapi.exceptions import HTTPException
+from PIL import Image
+from pathlib import Path
+
+sys.path.append(str(Path(__file__).parents[1]))
+from hloc import logger
+
+
+class ImagesInput(BaseModel):
+    data: List[str] = []
+    max_keypoints: List[int] = []
+    timestamps: List[str] = []
+    grayscale: bool = False
+    image_hw: List[List[int]] = [[], []]
+    feature_type: int = 0
+    rotates: List[float] = []
+    scales: List[float] = []
+    reference_points: List[List[float]] = []
+    binarize: bool = False
+
+
+def decode_base64_to_image(encoding):
+    if encoding.startswith("data:image/"):
+        encoding = encoding.split(";")[1].split(",")[1]
+    try:
+        image = Image.open(io.BytesIO(base64.b64decode(encoding)))
+        return image
+    except Exception as e:
+        logger.warning(f"API cannot decode image: {e}")
+        raise HTTPException(
+            status_code=500, detail="Invalid encoded image"
+        ) from e
+
+
+def to_base64_nparray(encoding: str) -> np.ndarray:
+    return np.array(decode_base64_to_image(encoding)).astype("uint8")

api/client.py

@@ -9,7 +9,7 @@
 import numpy as np
 import requests
 
-ENDPOINT = "http://127.0.0.1:8001"
+ENDPOINT = "http://127.0.0.1:8000"
 if "REMOTE_URL_RAILWAY" in os.environ:
     ENDPOINT = os.environ["REMOTE_URL_RAILWAY"]
 
@@ -152,7 +152,8 @@ def send_request_extract(
         url=API_URL_EXTRACT,
         **inputs,
     )
-    print("Keypoints detected: {}".format(len(response[0]["keypoints"])))
+    # breakpoint()
+    # print("Keypoints detected: {}".format(len(response[0]["keypoints"])))
 
     # draw matching, debug only
     if viz:
@@ -214,7 +215,7 @@ def get_api_version():
     #     )
 
     # request extract
-    for i in range(10):
+    for i in range(1000):
         t1 = time.time()
         preds = send_request_extract(args.image0)
         t2 = time.time()

api/config/api.yaml

@@ -0,0 +1,51 @@
+# This file was generated using the `serve build` command on Ray v2.38.0.
+
+proxy_location: EveryNode
+http_options:
+  host: 0.0.0.0
+  port: 8000
+
+grpc_options:
+  port: 9000
+  grpc_servicer_functions: []
+
+logging_config:
+  encoding: TEXT
+  log_level: INFO
+  logs_dir: null
+  enable_access_log: true
+
+applications:
+- name: app1
+  route_prefix: /
+  import_path: api.server:service
+  runtime_env: {}
+  deployments:
+  - name: ImageMatchingService
+    num_replicas: 4
+    ray_actor_options:
+      num_cpus: 2.0
+      num_gpus: 1.0
+
+api:
+  feature:
+    output: feats-superpoint-n4096-rmax1600
+    model:
+      name: superpoint
+      nms_radius: 3
+      max_keypoints: 4096
+      keypoint_threshold: 0.005
+    preprocessing:
+      grayscale: True
+      force_resize: True
+      resize_max: 1600
+      width: 640
+      height: 480
+      dfactor: 8
+  matcher:
+    output: matches-NN-mutual
+    model:
+      name: nearest_neighbor
+      do_mutual_check: True
+      match_threshold: 0.2
+  dense: False