hjxdl 0.1.74__py3-none-any.whl → 0.1.76__py3-none-any.whl

hdl/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.74'
-__version_tuple__ = version_tuple = (0, 1, 74)
+__version__ = version = '0.1.76'
+__version_tuple__ = version_tuple = (0, 1, 76)

hdl/utils/llm/vis.py

@@ -280,7 +280,8 @@ class ImgHandler:
     def vec_pics_todb(
         self,
         images: list[str],
-        print_idx_info: bool = False
+        conn=None,
+        print_idx_info: bool = False,
     ):
         """Save image features to a Redis database.
 
@@ -293,9 +294,12 @@ class ImgHandler:
         Example:
             vec_pics_todb(images=['image1.jpg', 'image2.jpg'])
         """
-        sorted_imgs = natsort.natsorted(images)
+        # sorted_imgs = natsort.natsorted(images)
+        sorted_imgs = images
         img_feats = self.get_img_features(sorted_imgs, to_numpy=True)
-        pipeline = self.db_conn.pipeline()
+        if conn is None:
+            conn = self.db_conn
+        pipeline = conn.pipeline()
         for img_file, emb in tqdm(zip(sorted_imgs, img_feats)):
             # 初始化 Redis，先使用 img 文件名作为 Key 和 Value，后续再更新为图片特征向量
             # pipeline.json().set(img_file, "$", img_file)
@@ -325,7 +329,7 @@ class ImgHandler:
             prefix=["pic-"],
             index_type=IndexType.JSON
         )
-        res = self.db_conn.ft(
+        res = conn.ft(
             self.pic_idx_name
         ).create_index(
             fields=schema,
@@ -336,12 +340,17 @@ class ImgHandler:
             print(self.pic_idx_info)
 
     @property
-    def pic_idx_info(self):
-        res = self.db_conn.ping()
+    def pic_idx_info(
+        self,
+        conn=None
+    ):
+        if conn is None:
+            conn = self.db_conn
+        res = conn.ping()
         print("redis connected:", res)
         # vector_idx_name = "idx:pic_idx"
         # 从 Redis 数据库中读取索引状态
-        info = self.db_conn.ft(self.pic_idx_name).info()
+        info = conn.ft(self.pic_idx_name).info()
         # 获取索引状态中的 num_docs 和 hash_indexing_failures
         num_docs = info["num_docs"]
         indexing_failures = info["hash_indexing_failures"]
@@ -354,6 +363,7 @@ class ImgHandler:
         emb_query,
         num_max: int = 3,
         extra_params: dict = None,
+        conn=None
     ):
         """Search for similar embeddings in the database.
 
@@ -375,8 +385,10 @@ class ImgHandler:
         )
         if extra_params is None:
             extra_params = {}
+        if conn is None:
+            conn = self.db_conn
         result_docs = (
-            self.db_conn.ft("idx:pic_idx")
+            conn.ft("idx:pic_idx")
             .search(
                 query,
                 {
@@ -396,7 +408,8 @@ class ImgHandler:
         self,
         img,
         num_max: int = 3,
-        extra_params: dict = None
+        extra_params: dict = None,
+        conn=None
     ):
         """Search for similar images in the database based on the input image.
 
@@ -411,10 +424,13 @@ class ImgHandler:
         emb_query = self.get_img_features(
             [img], to_numpy=True
         ).astype(np.float32)[0].tobytes()
+        if conn is None:
+            conn = self.db_conn
         results = self.emb_search(
             emb_query=emb_query,
             num_max=num_max,
-            extra_params=extra_params
+            extra_params=extra_params,
+            conn=conn
         )
         return results
 

{hjxdl-0.1.74.dist-info → hjxdl-0.1.76.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hjxdl
-Version: 0.1.74
+Version: 0.1.76
 Summary: A collection of functions for Jupyter notebooks
 Home-page: https://github.com/huluxiaohuowa/hdl
 Author: Jianxing Hu

{hjxdl-0.1.74.dist-info → hjxdl-0.1.76.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=-t0AZR56uxJOb8xSWfgDLdEI4i6HDB73ojeu3zxxCCw,413
+hdl/_version.py,sha256=XDO16ALCEfcHVQNkdeFRVlrPkVueFpt5S-psvPJP1Sc,413
 hdl/args/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/args/loss_args.py,sha256=s7YzSdd7IjD24rZvvOrxLLFqMZQb9YylxKeyelSdrTk,70
 hdl/controllers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -131,12 +131,12 @@ hdl/utils/llm/chat.py,sha256=sk7Lw5Oa30k-l2fnJknkMmTc5zkBeEKsR981aeFhH5s,11907
 hdl/utils/llm/embs.py,sha256=Tf0FOYrOFZp7qQpEPiSCXzlgyHH0X9HVTUtsup74a9E,7174
 hdl/utils/llm/extract.py,sha256=2sK_WJzmYIc8iuWaM9DA6Nw3_6q1O4lJ5pKpcZo-bBA,6512
 hdl/utils/llm/llama_chat.py,sha256=watcHGOaz-bv3x-yDucYlGk5f8FiqfFhwWogrl334fk,4387
-hdl/utils/llm/vis.py,sha256=z7zQ7cxYRbIqgrmm1NupgmdiMA0iIZiuXwhhrUnQ6no,13773
+hdl/utils/llm/vis.py,sha256=2s0U9wR9K1jSS8jtLGUliA4C_NGULoy5aayAxU6MN_o,14105
 hdl/utils/schedulers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/utils/schedulers/norm_lr.py,sha256=bDwCmdEK-WkgxQMFBiMuchv8Mm7C0-GZJ6usm-PQk14,4461
 hdl/utils/weather/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/utils/weather/weather.py,sha256=k11o6wM15kF8b9NMlEfrg68ak-SfSYLN3nOOflFUv-I,4381
-hjxdl-0.1.74.dist-info/METADATA,sha256=YrlEhZwbgaHZFnhkBM_3bqT8uHpRUxzcpG1tO0Zd-gA,903
-hjxdl-0.1.74.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-hjxdl-0.1.74.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.1.74.dist-info/RECORD,,
+hjxdl-0.1.76.dist-info/METADATA,sha256=ff40qi9oE0kcWS2gSj0I3aHbaQZOEp64U3hCAZoekQs,903
+hjxdl-0.1.76.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+hjxdl-0.1.76.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.1.76.dist-info/RECORD,,