Update and trim dependencies, isort imports

app.py

@@ -1,31 +1,38 @@
 import json
 import os
 from collections import defaultdict
-from typing import List, Dict
+from typing import Dict, List
 
 import faiss
 import gradio as gr
 import numpy as np
-from PIL import Image
-from cheesechaser.datapool import YandeWebpDataPool, ZerochanWebpDataPool, GelbooruWebpDataPool, \
-    KonachanWebpDataPool, AnimePicturesWebpDataPool, DanbooruNewestWebpDataPool, Rule34WebpDataPool
-from hfutils.operate import get_hf_fs, get_hf_client
+from cheesechaser.datapool import (
+    AnimePicturesWebpDataPool,
+    DanbooruNewestWebpDataPool,
+    GelbooruWebpDataPool,
+    KonachanWebpDataPool,
+    Rule34WebpDataPool,
+    YandeWebpDataPool,
+    ZerochanWebpDataPool,
+)
+from hfutils.operate import get_hf_client, get_hf_fs
 from hfutils.utils import TemporaryDirectory
-from realutils.metrics import siglip
+from imgutils.generic import siglip
 from imgutils.utils import ts_lru_cache
+from PIL import Image
 
 from pools import quick_webp_pool
 
-siglip._REPO_ID = "deepghs/siglip_beta"
-_REPO_ID = 'deepghs/anime_sites_indices'
+_SIGLIP_REPO_ID = "deepghs/siglip_beta"
+_INDEX_REPO_ID = 'deepghs/anime_sites_indices'
 
 hf_fs = get_hf_fs()
 hf_client = get_hf_client()
 
 _DEFAULT_MODEL_NAME = 'SwinV2_v3_danbooru_8005009_4GB'
 _ALL_MODEL_NAMES = [
-    os.path.dirname(os.path.relpath(path, _REPO_ID))
-    for path in hf_fs.glob(f'{_REPO_ID}/*/knn.index')
+    os.path.dirname(os.path.relpath(path, _INDEX_REPO_ID))
+    for path in hf_fs.glob(f'{_INDEX_REPO_ID}/*/knn.index')
 ]
 
 _SITE_CLS = {
@@ -97,17 +104,19 @@ def _get_index_info(repo_id: str, model_name: str):
 
 
 def search(model_name: str, img_input, str_input: str, n_neighbours: int):
-    images_ids, knn_index = _get_index_info(_REPO_ID, model_name)
+    images_ids, knn_index = _get_index_info(_INDEX_REPO_ID, model_name)
 
     if str_input == "":
-        embeddings = siglip.get_siglip_image_embedding(
+        embeddings = siglip.siglip_image_encode(
             img_input,
+            repo_id=_SIGLIP_REPO_ID,
             model_name="smilingwolf/siglip_swinv2_base_2025_02_22_18h56m54s",
             fmt="embeddings",
         )
     else:
-        embeddings = siglip.get_siglip_text_embedding(
+        embeddings = siglip.siglip_text_encode(
             str_input,
+            repo_id=_SIGLIP_REPO_ID,
             model_name="smilingwolf/siglip_swinv2_base_2025_02_22_18h56m54s",
             fmt="embeddings",
         )

requirements.txt

@@ -3,5 +3,4 @@ faiss-cpu
 dghs-imgutils
 onnxruntime
 cheesechaser>=0.1.6
-dghs-realutils>=0.1.0
 gradio