update python script

pyclip/gradio_example.py

@@ -1,83 +1,96 @@
-import os
-import gradio as gr
-from pyclip import Clip, enum_devices, sys_init, sys_deinit, ClipDeviceType
-import cv2
-import glob
-from PIL import Image
-import tqdm
-import argparse
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--ienc', type=str, default='cnclip/cnclip_vit_l14_336px_vision_u16u8.axmodel')
-    parser.add_argument('--tenc', type=str, default='cnclip/cnclip_vit_l14_336px_text_u16.axmodel')
-    parser.add_argument('--vocab', type=str, default='cnclip/cn_vocab.txt')
-    parser.add_argument('--isCN', type=int, default=1)
-    parser.add_argument('--db_path', type=str, default='clip_feat_db_coco')
-    parser.add_argument('--image_folder', type=str, default='coco_1000')
-    parser.add_argument('--dev_type', type=str, default='host', help='host or axcl')
-    args = parser.parse_args()
-
-    image_folder = args.image_folder
-    device = ClipDeviceType.host_device if args.dev_type == 'host' else ClipDeviceType.axcl_device
-
-    # 初始化
-    print("可用设备:", enum_devices())
-    sys_init(device, 0)
-
-    clip = Clip({
-        'text_encoder_path': args.tenc,
-        'image_encoder_path': args.ienc,
-        'tokenizer_path': args.vocab,
-        'db_path': args.db_path,
-        'isCN': args.isCN,
-        'dev_type': device,
-    })
-
-
-    # 加载图片数据库（只做一次）
-    image_files = glob.glob(os.path.join(image_folder, '*.jpg'))
-    for image_file in tqdm.tqdm(image_files):
-        filename = os.path.basename(image_file)
-        if clip.contains_image(filename) == 1:
-            continue
-        img = cv2.imread(image_file)
-        cv2.cvtColor(img, cv2.COLOR_BGR2RGB, img)
-        clip.add_image(filename, img)
-
-    # 工具函数：图片转 base64
-    def img_to_pil(img_path):
-        return Image.open(img_path).convert("RGB")
-
-    # 主搜索函数
-    def search_images(query, top_k):
-        results = clip.match_text(query, top_k=top_k)
-        images = []
-        for filename, score in results:
-            img_path = os.path.join(image_folder, filename)
-            if os.path.exists(img_path):
-                img = img_to_pil(img_path)
-                images.append((img, f"{filename}  Score: {score:.4f}"))
-        return images
-
-
-    # Gradio界面
-    with gr.Blocks() as demo:
-        gr.Markdown("# 🔍 文搜图 Demo")
-
-        with gr.Row():
-            query_input = gr.Textbox(label="请输入文本查询")
-            topk_input = gr.Number(value=25, precision=0, label="Top-K")
-        search_btn = gr.Button("搜图")
-
-        gallery = gr.Gallery(label="匹配结果", show_label=True, columns=4)
-
-        search_btn.click(fn=search_images, inputs=[query_input, topk_input], outputs=gallery)
-
-    # 启动
-    ip = "0.0.0.0"
-    demo.launch(server_name=ip, server_port=7860)
-
-    # 关闭系统（你可加信号处理来自动关闭）
-    import atexit
-    atexit.register(lambda: sys_deinit(ClipDeviceType.host_device, 0))
+import os
+import gradio as gr
+from pyclip import Clip
+from pyaxdev import enum_devices, sys_init, sys_deinit, AxDeviceType
+import cv2
+import glob
+from PIL import Image
+import tqdm
+import argparse
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--ienc', type=str, default='cnclip/cnclip_vit_l14_336px_vision_u16u8.axmodel')
+    parser.add_argument('--tenc', type=str, default='cnclip/cnclip_vit_l14_336px_text_u16.axmodel')
+    parser.add_argument('--vocab', type=str, default='cnclip/cn_vocab.txt')
+    parser.add_argument('--isCN', type=int, default=1)
+    parser.add_argument('--db_path', type=str, default='clip_feat_db_coco')
+    parser.add_argument('--image_folder', type=str, default='coco_1000')
+    parser.add_argument('--dev_type', type=str, default='host', choices=['host', 'axcl'])
+    args = parser.parse_args()
+
+    image_folder = args.image_folder
+
+    # 初始化
+    devices_info = enum_devices()
+    print("可用设备:", devices_info)
+    device = AxDeviceType.host_device if args.dev_type == 'host' else AxDeviceType.axcl_device
+
+    if devices_info['host']['available']:
+        print("host device available")
+        sys_init(device, 0)
+    elif devices_info['devices']['count'] > 0:
+        print("axcl device available, use device-0")
+        sys_init(device, 0)
+    else:
+        raise Exception("No available device")
+
+    clip = Clip({
+        'text_encoder_path': args.tenc,
+        'image_encoder_path': args.ienc,
+        'tokenizer_path': args.vocab,
+        'db_path': args.db_path,
+        'isCN': args.isCN,
+        'dev_type': device
+    })
+
+
+    # 加载图片数据库（只做一次）
+    image_files = glob.glob(os.path.join(image_folder, '*.jpg'))
+    for image_file in tqdm.tqdm(image_files):
+        filename = os.path.basename(image_file)
+        if clip.contains_image(filename) == 1:
+            continue
+        img = cv2.imread(image_file)
+        cv2.cvtColor(img, cv2.COLOR_BGR2RGB, img)
+        clip.add_image(filename, img)
+
+    def img_to_pil(img_path):
+        return Image.open(img_path).convert("RGB")
+
+    # 主搜索函数
+    def search_images(query, top_k):
+        results = clip.match_text(query, top_k=top_k)
+        images = []
+        for filename, score in results:
+            img_path = os.path.join(image_folder, filename)
+            if os.path.exists(img_path):
+                img = img_to_pil(img_path)
+                images.append((img, f"{filename}  Score: {score:.4f}"))
+        return images
+
+
+    # Gradio界面
+    with gr.Blocks() as demo:
+        gr.Markdown("# 🔍 文搜图 Demo")
+
+        with gr.Row():
+            query_input = gr.Textbox(label="请输入文本查询")
+            topk_input = gr.Number(value=25, precision=0, label="Top-K")
+        search_btn = gr.Button("搜图")
+
+        gallery = gr.Gallery(label="匹配结果", show_label=True, columns=4)
+
+        search_btn.click(fn=search_images, inputs=[query_input, topk_input], outputs=gallery)
+
+    # 启动
+    ip = "0.0.0.0"
+    demo.launch(server_name=ip, server_port=7860)
+
+    import atexit
+    if devices_info['host']['available']:
+        atexit.register(lambda: sys_deinit(AxDeviceType.host_device, -1))
+    elif devices_info['devices']['count'] > 0:
+        atexit.register(lambda: sys_deinit(AxDeviceType.axcl_device, 0))
+    
+    

pyclip/pyaxdev.py

@@ -0,0 +1,147 @@
+import ctypes
+import os
+import platform
+
+def check_error(code: int) -> None:
+    if code != 0:
+        raise Exception(f"API错误: {code}")
+
+base_dir = os.path.dirname(__file__)
+arch = platform.machine()
+
+if arch == 'x86_64':
+    arch_dir = 'x86_64'
+elif arch in ('aarch64', 'arm64'):
+    arch_dir = 'aarch64'
+else:
+    raise RuntimeError(f"Unsupported architecture: {arch}")
+
+lib_paths = [
+    os.path.join(base_dir, arch_dir, 'libclip.so'),
+    os.path.join(base_dir, 'libclip.so')
+]
+
+last_error = None
+diagnostic_shown = set()
+
+for lib_path in lib_paths:
+    try:
+        print(f"Trying to load: {lib_path}")
+        _lib = ctypes.CDLL(lib_path)
+        print(f"✅ Successfully loaded: {lib_path}")
+        break
+    except OSError as e:
+        last_error = e
+        err_str = str(e)
+        print(f"\n❌ Failed to load: {lib_path}")
+        print(f"   {err_str}")
+
+        # Only show GLIBCXX tip once
+        if "GLIBCXX" in err_str and "not found" in err_str:
+            if "missing_glibcxx" not in diagnostic_shown:
+                diagnostic_shown.add("missing_glibcxx")
+                print("🔍 Detected missing GLIBCXX version in libstdc++.so.6")
+                print("💡 This usually happens when your environment (like Conda) uses an older libstdc++")
+                print(f"👉 Try running with system libstdc++ preloaded:")
+                print(f"   export LD_PRELOAD=/usr/lib/{arch_dir}-linux-gnu/libstdc++.so.6\n")
+        elif "No such file" in err_str:
+            if "file_not_found" not in diagnostic_shown:
+                diagnostic_shown.add("file_not_found")
+                print("🔍 File not found. Please verify that libclip.so exists and the path is correct.\n")
+        elif "wrong ELF class" in err_str:
+            if "elf_mismatch" not in diagnostic_shown:
+                diagnostic_shown.add("elf_mismatch")
+                print("🔍 ELF class mismatch — likely due to architecture conflict (e.g., loading x86_64 .so on aarch64).")
+                print(f"👉 Run `file {lib_path}` to verify the binary architecture.\n")
+        else:
+            if "generic_error" not in diagnostic_shown:
+                diagnostic_shown.add("generic_error")
+                print("📎 Tip: Use `ldd` to inspect missing dependencies:")
+                print(f"   ldd {lib_path}\n")
+else:
+    raise RuntimeError(f"\n❗ Failed to load libclip.so.\nLast error:\n{last_error}")
+
+
+# 定义枚举类型
+class AxDeviceType(ctypes.c_int):
+    unknown_device = 0
+    host_device = 1
+    axcl_device = 2
+
+# 定义结构体
+class AxMemInfo(ctypes.Structure):
+    _fields_ = [
+        ('remain', ctypes.c_int),
+        ('total', ctypes.c_int)
+    ]
+
+class AxHostInfo(ctypes.Structure):
+    _fields_ = [
+        ('available', ctypes.c_char),
+        ('version', ctypes.c_char * 32),
+        ('mem_info', AxMemInfo)
+    ]
+
+class AxDeviceInfo(ctypes.Structure):
+    _fields_ = [
+        ('temp', ctypes.c_int),
+        ('cpu_usage', ctypes.c_int),
+        ('npu_usage', ctypes.c_int),
+        ('mem_info', AxMemInfo)
+    ]
+
+class AxDevices(ctypes.Structure):
+    _fields_ = [
+        ('host', AxHostInfo),
+        ('host_version', ctypes.c_char * 32),
+        ('dev_version', ctypes.c_char * 32),
+        ('count', ctypes.c_ubyte),
+        ('devices_info', AxDeviceInfo * 16)
+    ]
+
+
+_lib.ax_dev_enum_devices.argtypes = [ctypes.POINTER(AxDevices)]
+_lib.ax_dev_enum_devices.restype = ctypes.c_int
+
+_lib.ax_dev_sys_init.argtypes = [AxDeviceType, ctypes.c_char]
+_lib.ax_dev_sys_init.restype = ctypes.c_int
+
+_lib.ax_dev_sys_deinit.argtypes = [AxDeviceType, ctypes.c_char]
+_lib.ax_dev_sys_deinit.restype = ctypes.c_int
+
+def enum_devices() -> dict:
+    devices = AxDevices()
+    check_error(_lib.ax_dev_enum_devices(ctypes.byref(devices)))
+    
+    return {
+        'host': {
+            'available': bool(devices.host.available[0]),
+            'version': devices.host.version.decode('utf-8'),
+            'mem_info': {
+                'remain': devices.host.mem_info.remain,
+                'total': devices.host.mem_info.total
+            }
+        },
+        'devices': {
+            'host_version': devices.host_version.decode('utf-8'),
+            'dev_version': devices.dev_version.decode('utf-8'),
+            'count': devices.count,
+            'devices_info': [{
+                'temp': dev.temp,
+                'cpu_usage': dev.cpu_usage,
+                'npu_usage': dev.npu_usage,
+                'mem_info': {
+                    'remain': dev.mem_info.remain,
+                    'total': dev.mem_info.total
+                }
+            } for dev in devices.devices_info[:devices.count]]
+        }
+    }
+
+
+def sys_init(dev_type: AxDeviceType = AxDeviceType.axcl_device, devid: int = 0) -> None:
+    check_error(_lib.ax_dev_sys_init(dev_type, devid))
+
+
+def sys_deinit(dev_type: AxDeviceType = AxDeviceType.axcl_device, devid: int = 0) -> None:
+    check_error(_lib.ax_dev_sys_deinit(dev_type, devid))

pyclip/pyclip.py

@@ -1,260 +1,147 @@
-import ctypes
-import os
-from typing import List, Tuple, Optional
-import numpy as np
-import platform
-
-base_dir = os.path.dirname(__file__)
-arch = platform.machine()
-
-if arch == 'x86_64':
-    arch_dir = 'x86_64'
-elif arch in ('aarch64', 'arm64'):
-    arch_dir = 'aarch64'
-else:
-    raise RuntimeError(f"Unsupported architecture: {arch}")
-
-lib_paths = [
-    os.path.join(base_dir, arch_dir, 'libclip.so'),
-    os.path.join(base_dir, 'libclip.so')
-]
-
-last_error = None
-diagnostic_shown = set()
-
-for lib_path in lib_paths:
-    try:
-        print(f"Trying to load: {lib_path}")
-        _lib = ctypes.CDLL(lib_path)
-        print(f"✅ Successfully loaded: {lib_path}")
-        break
-    except OSError as e:
-        last_error = e
-        err_str = str(e)
-        print(f"\n❌ Failed to load: {lib_path}")
-        print(f"   {err_str}")
-
-        # Only show GLIBCXX tip once
-        if "GLIBCXX" in err_str and "not found" in err_str:
-            if "missing_glibcxx" not in diagnostic_shown:
-                diagnostic_shown.add("missing_glibcxx")
-                print("🔍 Detected missing GLIBCXX version in libstdc++.so.6")
-                print("💡 This usually happens when your environment (like Conda) uses an older libstdc++")
-                print(f"👉 Try running with system libstdc++ preloaded:")
-                print(f"   export LD_PRELOAD=/usr/lib/{arch_dir}-linux-gnu/libstdc++.so.6\n")
-        elif "No such file" in err_str:
-            if "file_not_found" not in diagnostic_shown:
-                diagnostic_shown.add("file_not_found")
-                print("🔍 File not found. Please verify that libclip.so exists and the path is correct.\n")
-        elif "wrong ELF class" in err_str:
-            if "elf_mismatch" not in diagnostic_shown:
-                diagnostic_shown.add("elf_mismatch")
-                print("🔍 ELF class mismatch — likely due to architecture conflict (e.g., loading x86_64 .so on aarch64).")
-                print(f"👉 Run `file {lib_path}` to verify the binary architecture.\n")
-        else:
-            if "generic_error" not in diagnostic_shown:
-                diagnostic_shown.add("generic_error")
-                print("📎 Tip: Use `ldd` to inspect missing dependencies:")
-                print(f"   ldd {lib_path}\n")
-else:
-    raise RuntimeError(f"\n❗ Failed to load libclip.so.\nLast error:\n{last_error}")
-
-
-# 定义枚举类型
-class ClipDeviceType(ctypes.c_int):
-    unknown_device = 0
-    host_device = 1
-    axcl_device = 2
-
-# 定义结构体
-class ClipMemInfo(ctypes.Structure):
-    _fields_ = [
-        ('remain', ctypes.c_int),
-        ('total', ctypes.c_int)
-    ]
-
-class ClipHostInfo(ctypes.Structure):
-    _fields_ = [
-        ('available', ctypes.c_char),
-        ('version', ctypes.c_char * 32),
-        ('mem_info', ClipMemInfo)
-    ]
-
-class ClipDeviceInfo(ctypes.Structure):
-    _fields_ = [
-        ('temp', ctypes.c_int),
-        ('cpu_usage', ctypes.c_int),
-        ('npu_usage', ctypes.c_int),
-        ('mem_info', ClipMemInfo)
-    ]
-
-class ClipDevices(ctypes.Structure):
-    _fields_ = [
-        ('host', ClipHostInfo),
-        ('host_version', ctypes.c_char * 32),
-        ('dev_version', ctypes.c_char * 32),
-        ('count', ctypes.c_ubyte),
-        ('devices_info', ClipDeviceInfo * 16)
-    ]
-
-class ClipInit(ctypes.Structure):
-    _fields_ = [
-        ('dev_type', ClipDeviceType),
-        ('devid', ctypes.c_char),
-        ('text_encoder_path', ctypes.c_char * 128),
-        ('image_encoder_path', ctypes.c_char * 128),
-        ('tokenizer_path', ctypes.c_char * 128),
-        ('isCN', ctypes.c_char),
-        ('db_path', ctypes.c_char * 128)
-    ]
-
-class ClipImage(ctypes.Structure):
-    _fields_ = [
-        ('data', ctypes.POINTER(ctypes.c_ubyte)),
-        ('width', ctypes.c_int),
-        ('height', ctypes.c_int),
-        ('channels', ctypes.c_int),
-        ('stride', ctypes.c_int)
-    ]
-
-class ClipResultItem(ctypes.Structure):
-    _fields_ = [
-        ('key', ctypes.c_char * 64),
-        ('score', ctypes.c_float)
-    ]
-
-# 设置函数参数和返回类型
-_lib.clip_enum_devices.argtypes = [ctypes.POINTER(ClipDevices)]
-_lib.clip_enum_devices.restype = ctypes.c_int
-
-_lib.clip_sys_init.argtypes = [ClipDeviceType, ctypes.c_char]
-_lib.clip_sys_init.restype = ctypes.c_int
-
-_lib.clip_sys_deinit.argtypes = [ClipDeviceType, ctypes.c_char]
-_lib.clip_sys_deinit.restype = ctypes.c_int
-
-_lib.clip_create.argtypes = [ctypes.POINTER(ClipInit), ctypes.POINTER(ctypes.c_void_p)]
-_lib.clip_create.restype = ctypes.c_int
-
-_lib.clip_destroy.argtypes = [ctypes.c_void_p]
-_lib.clip_destroy.restype = ctypes.c_int
-
-_lib.clip_add.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.POINTER(ClipImage), ctypes.c_char]
-_lib.clip_add.restype = ctypes.c_int
-
-_lib.clip_remove.argtypes = [ctypes.c_void_p, ctypes.c_char_p]
-_lib.clip_remove.restype = ctypes.c_int
-
-_lib.clip_contain.argtypes = [ctypes.c_void_p, ctypes.c_char_p]
-_lib.clip_contain.restype = ctypes.c_int
-
-_lib.clip_match_text.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.POINTER(ClipResultItem), ctypes.c_int]
-_lib.clip_match_text.restype = ctypes.c_int
-
-_lib.clip_match_image.argtypes = [ctypes.c_void_p, ctypes.POINTER(ClipImage), ctypes.POINTER(ClipResultItem), ctypes.c_int]
-_lib.clip_match_image.restype = ctypes.c_int
-
-class ClipError(Exception):
-    pass
-
-def check_error(code: int) -> None:
-    if code != 0:
-        raise ClipError(f"CLIP API错误: {code}")
-
-class Clip:
-    def __init__(self, init_info: dict):
-        self.handle = None
-        self.init_info = ClipInit()
-        
-        # 设置初始化参数
-        self.init_info.dev_type = init_info.get('dev_type', ClipDeviceType.axcl_device)
-        self.init_info.devid = init_info.get('devid', 0)
-        self.init_info.isCN = init_info.get('isCN', 1)
-        
-        # 设置路径
-        for path_name in ['text_encoder_path', 'image_encoder_path', 'tokenizer_path', 'db_path']:
-            if path_name in init_info:
-                setattr(self.init_info, path_name, init_info[path_name].encode('utf-8'))
-        
-        # 创建CLIP实例
-        handle = ctypes.c_void_p()
-        check_error(_lib.clip_create(ctypes.byref(self.init_info), ctypes.byref(handle)))
-        self.handle = handle
-
-    def __del__(self):
-        if self.handle:
-            _lib.clip_destroy(self.handle)
-
-    def add_image(self, key: str, image_data: np.ndarray) -> None:
-        if self.contains_image(key):
-            return
-        image = ClipImage()
-        image.data = ctypes.cast(image_data.ctypes.data, ctypes.POINTER(ctypes.c_ubyte))
-        image.width = image_data.shape[1]
-        image.height = image_data.shape[0]
-        image.channels = image_data.shape[2]
-        image.stride = image_data.shape[1] * image_data.shape[2]
-        
-        check_error(_lib.clip_add(self.handle, key.encode('utf-8'), ctypes.byref(image), 0))
-
-    def remove_image(self, key: str) -> None:
-        check_error(_lib.clip_remove(self.handle, key.encode('utf-8')))
-
-    def contains_image(self, key: str) -> bool:
-        return _lib.clip_contain(self.handle, key.encode('utf-8')) == 1
-
-    def match_text(self, text: str, top_k: int = 10) -> List[Tuple[str, float]]:
-        results = (ClipResultItem * top_k)()
-        check_error(_lib.clip_match_text(self.handle, text.encode('utf-8'), results, top_k))
-        
-        return [(item.key.decode('utf-8'), item.score) for item in results]
-
-    def match_image(self, image_data: bytes, width: int, height: int, channels: int = 3, top_k: int = 10) -> List[Tuple[str, float]]:
-        image = ClipImage()
-        image.data = ctypes.cast(ctypes.create_string_buffer(image_data), ctypes.POINTER(ctypes.c_ubyte))
-        image.width = width
-        image.height = height
-        image.channels = channels
-        image.stride = width * channels
-        
-        results = (ClipResultItem * top_k)()
-        check_error(_lib.clip_match_image(self.handle, ctypes.byref(image), ctypes.byref(results), top_k))
-        
-        return [(item.key.decode('utf-8'), item.score) for item in results]
-
-def enum_devices() -> dict:
-    devices = ClipDevices()
-    check_error(_lib.clip_enum_devices(ctypes.byref(devices)))
-    
-    return {
-        'host': {
-            'available': bool(devices.host.available),
-            'version': devices.host.version.decode('utf-8'),
-            'mem_info': {
-                'remain': devices.host.mem_info.remain,
-                'total': devices.host.mem_info.total
-            }
-        },
-        'devices': {
-            'host_version': devices.host_version.decode('utf-8'),
-            'dev_version': devices.dev_version.decode('utf-8'),
-            'count': devices.count,
-            'devices_info': [{
-                'temp': dev.temp,
-                'cpu_usage': dev.cpu_usage,
-                'npu_usage': dev.npu_usage,
-                'mem_info': {
-                    'remain': dev.mem_info.remain,
-                    'total': dev.mem_info.total
-                }
-            } for dev in devices.devices_info[:devices.count]]
-        }
-    }
-
-
-def sys_init(dev_type: ClipDeviceType = ClipDeviceType.axcl_device, devid: int = 0) -> None:
-    check_error(_lib.clip_sys_init(dev_type, devid))
-
-
-def sys_deinit(dev_type: ClipDeviceType = ClipDeviceType.axcl_device, devid: int = 0) -> None:
-    check_error(_lib.clip_sys_deinit(dev_type, devid))
+import ctypes
+import os
+from typing import List, Tuple
+import numpy as np
+import platform
+from pyaxdev import _lib, AxDeviceType, AxDevices, check_error
+
+
+class ClipInit(ctypes.Structure):
+    _fields_ = [
+        ('dev_type', AxDeviceType),
+        ('devid', ctypes.c_char),
+        ('text_encoder_path', ctypes.c_char * 128),
+        ('image_encoder_path', ctypes.c_char * 128),
+        ('tokenizer_path', ctypes.c_char * 128),
+        ('isCN', ctypes.c_char),
+        ('db_path', ctypes.c_char * 128)
+    ]
+
+class ClipImage(ctypes.Structure):
+    _fields_ = [
+        ('data', ctypes.POINTER(ctypes.c_ubyte)),
+        ('width', ctypes.c_int),
+        ('height', ctypes.c_int),
+        ('channels', ctypes.c_int),
+        ('stride', ctypes.c_int)
+    ]
+
+class ClipFeatureItem(ctypes.Structure):
+    _fields_ = [
+        ('feat', ctypes.c_float * 768),
+        ('len', ctypes.c_int)
+    ]
+
+
+class ClipResultItem(ctypes.Structure):
+    _fields_ = [
+        ('key', ctypes.c_char * 64),
+        ('score', ctypes.c_float)
+    ]
+
+_lib.clip_create.argtypes = [ctypes.POINTER(ClipInit), ctypes.POINTER(ctypes.c_void_p)]
+_lib.clip_create.restype = ctypes.c_int
+
+_lib.clip_destroy.argtypes = [ctypes.c_void_p]
+_lib.clip_destroy.restype = ctypes.c_int
+
+_lib.clip_add.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.POINTER(ClipImage), ctypes.c_char]
+_lib.clip_add.restype = ctypes.c_int
+
+_lib.clip_remove.argtypes = [ctypes.c_void_p, ctypes.c_char_p]
+_lib.clip_remove.restype = ctypes.c_int
+
+_lib.clip_contain.argtypes = [ctypes.c_void_p, ctypes.c_char_p]
+_lib.clip_contain.restype = ctypes.c_int
+
+_lib.clip_get_text_feat.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.POINTER(ClipFeatureItem)]
+_lib.clip_get_text_feat.restype = ctypes.c_int
+
+_lib.clip_match_feat.argtypes = [ctypes.c_void_p, ctypes.POINTER(ClipFeatureItem), ctypes.POINTER(ClipResultItem), ctypes.c_int]
+_lib.clip_match_feat.restype = ctypes.c_int
+
+_lib.clip_match_text.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.POINTER(ClipResultItem), ctypes.c_int]
+_lib.clip_match_text.restype = ctypes.c_int
+
+_lib.clip_match_image.argtypes = [ctypes.c_void_p, ctypes.POINTER(ClipImage), ctypes.POINTER(ClipResultItem), ctypes.c_int]
+_lib.clip_match_image.restype = ctypes.c_int
+
+
+class Clip:
+    def __init__(self, init_info: dict):
+        self.handle = None
+        self.init_info = ClipInit()
+        
+        # 设置初始化参数
+        self.init_info.dev_type = init_info.get('dev_type', AxDeviceType.axcl_device)
+        self.init_info.devid = init_info.get('devid', 0)
+        self.init_info.isCN = init_info.get('isCN', 1)
+        
+        # 设置路径
+        for path_name in ['text_encoder_path', 'image_encoder_path', 'tokenizer_path', 'db_path']:
+            if path_name in init_info:
+                setattr(self.init_info, path_name, init_info[path_name].encode('utf-8'))
+        
+        # 创建CLIP实例
+        handle = ctypes.c_void_p()
+        check_error(_lib.clip_create(ctypes.byref(self.init_info), ctypes.byref(handle)))
+        self.handle = handle
+
+    def __del__(self):
+        if self.handle:
+            _lib.clip_destroy(self.handle)
+
+    def add_image(self, key: str, image_data: np.ndarray) -> None:
+        if self.contains_image(key):
+            return
+        image = ClipImage()
+        image.data = ctypes.cast(image_data.ctypes.data, ctypes.POINTER(ctypes.c_ubyte))
+        image.width = image_data.shape[1]
+        image.height = image_data.shape[0]
+        image.channels = image_data.shape[2]
+        image.stride = image_data.shape[1] * image_data.shape[2]
+        
+        check_error(_lib.clip_add(self.handle, key.encode('utf-8'), ctypes.byref(image), 0))
+
+    def remove_image(self, key: str) -> None:
+        check_error(_lib.clip_remove(self.handle, key.encode('utf-8')))
+
+    def contains_image(self, key: str) -> bool:
+        return _lib.clip_contain(self.handle, key.encode('utf-8')) == 1
+
+    def get_text_feat(self, text: str) -> np.ndarray:
+        feat = ClipFeatureItem()
+        check_error(_lib.clip_get_text_feat(self.handle, text.encode('utf-8'), ctypes.byref(feat)))
+        return np.array(feat.feat[:feat.len])
+
+    def match_feat(self, feat: np.ndarray, top_k: int = 10) -> List[Tuple[str, float]]:
+        feat_item = ClipFeatureItem()
+        # feat_item.feat = feat.astype(np.float32).tolist()
+        arr = feat.astype(np.float32)
+        for i in range(len(arr)):
+            feat_item.feat[i] = arr[i]
+        feat_item.len = len(feat)
+        
+        results = (ClipResultItem * top_k)()
+        check_error(_lib.clip_match_feat(self.handle, ctypes.byref(feat_item), results, top_k))
+        
+        return [(item.key.decode('utf-8'), item.score) for item in results]
+    
+    def match_text(self, text: str, top_k: int = 10) -> List[Tuple[str, float]]:
+        results = (ClipResultItem * top_k)()
+        check_error(_lib.clip_match_text(self.handle, text.encode('utf-8'), results, top_k))
+        
+        return [(item.key.decode('utf-8'), item.score) for item in results]
+
+    def match_image(self, image_data: bytes, width: int, height: int, channels: int = 3, top_k: int = 10) -> List[Tuple[str, float]]:
+        image = ClipImage()
+        image.data = ctypes.cast(ctypes.create_string_buffer(image_data), ctypes.POINTER(ctypes.c_ubyte))
+        image.width = width
+        image.height = height
+        image.channels = channels
+        image.stride = width * channels
+        
+        results = (ClipResultItem * top_k)()
+        check_error(_lib.clip_match_image(self.handle, ctypes.byref(image), ctypes.byref(results), top_k))
+        
+        return [(item.key.decode('utf-8'), item.score) for item in results]