add image uploading option

app.py

@@ -5,6 +5,8 @@ import os, requests
 from features import binarize, feat_vec, cosine_sim, stroke_normalize, _ensure_ink_true
 from features_preproc import crop_and_center as crop_ref, LO
 from huggingface_hub import hf_hub_download
+from skimage.color import rgb2gray
+import numpy as np
 ASSET_REPO = "raycosine/detangutify-data"
 FONT_PATH = "data/NotoSerifTangut-Regular.ttf"
 URL = "https://notofonts.github.io/tangut/fonts/NotoSerifTangut/full/ttf/NotoSerifTangut-Regular.ttf"
@@ -63,6 +65,34 @@ def crop_and_center_deprecated(bw, size=64, pad=2):
     arr = np.roll(arr, shift_y, axis=0)
     arr = np.roll(arr, shift_x, axis=1)
     return arr
+def _to_gray_uint8(arr: np.ndarray) -> np.uint8:
+
+    if arr.ndim == 2:
+        if arr.dtype != np.uint8:
+            a = arr.astype(np.float32)
+            if a.max() <= 1.0: a *= 255.0
+            arr = np.clip(a, 0, 255).astype(np.uint8)
+        return arr
+
+    if arr.ndim == 3:
+        a = arr.astype(np.float32)
+        if a.max() > 1.0:
+            a /= 255.0
+
+
+        if a.shape[2] == 4:
+            rgb = a[..., :3]
+            alpha = a[..., 3:4]
+            a = rgb * alpha + (1.0 - alpha) * 1.0
+
+        elif a.shape[2] >= 3:
+            a = a[..., :3] 
+
+        g = rgb2gray(a)
+        return (g * 255.0).astype(np.uint8)
+
+    # 其它奇怪形状：兜底到 uint8
+    return np.clip(arr, 0, 255).astype(np.uint8)
 def infer(img):
     if img is None:
         return [], None
@@ -82,8 +112,7 @@ def infer(img):
         arr = np.array(img)
     else:
         arr = np.asarray(img)
-    if arr.ndim == 3:
-        arr = arr[..., 0]
+    arr = _to_gray_uint8(arr)
 
     if arr.dtype != np.uint8:
         arr = np.clip(arr, 0, 255).astype(np.uint8)
@@ -135,16 +164,28 @@ with gr.Blocks() as demo:
             type="numpy",
         )
 
-        gallery = gr.Gallery(
-            label="Top-10 Results",
-            columns=10,
-            preview=False,
-            height=320
+        upload = gr.Image(
+            label="Upload a character image",
+            type="numpy",   
+            #image_mode="L",  
+            #sources=["upload"],
+            height=192
         )
+    gallery = gr.Gallery(
+        label="Top-10 Results",
+        columns=10,
+        preview=False,
+        height=320
+    )
     preview = gr.Image(label="stroke_normalize result", type="pil")
     jsonout = gr.JSON(label="Top-10 (JSON)", visible=False)
-    btn = gr.Button("Search")
-    btn.click(fn=infer, inputs=canvas, outputs=[gallery, preview, jsonout], api_name="predict")
+    btn_draw = gr.Button("Search (draw)")
+    btn_draw.click(fn=infer, inputs=canvas, outputs=[gallery, preview, jsonout], api_name="predict")
+
+    btn_upload = gr.Button("Search (upload)")
+    btn_upload.click(fn=infer, inputs=upload, outputs=[gallery, preview, jsonout], api_name="predict_upload")
+    upload.change(fn=infer, inputs=upload, outputs=[gallery, preview, jsonout])
+
     #canvas.change(fn=infer, inputs=canvas, outputs=gallery)
     api_img = gr.Image(type="pil", visible=False)
     api_btn = gr.Button(visible=False)