hjxdl 0.1.65__py3-none-any.whl → 0.1.67__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.65'
-__version_tuple__ = version_tuple = (0, 1, 65)
+__version__ = version = '0.1.67'
+__version_tuple__ = version_tuple = (0, 1, 67)

hdl/utils/llm/vis.py

@@ -1,11 +1,14 @@
 from pathlib import Path
 import json
+import base64
+from io import BytesIO
 
 import torch
 import numpy as np
 from PIL import Image
 # from transformers import ChineseCLIPProcessor, ChineseCLIPModel
 import open_clip
+import natsort
 
 from ..database_tools.connect import conn_redis
 
@@ -16,6 +19,40 @@ __all__ = [
 
 HF_HUB_PREFIX = "hf-hub:"
 
+
+def imgfile_to_base64(img_dir: str):
+    """Converts an image file to base64 format.
+
+    Args:
+        img_dir (str): The directory path of the image file.
+
+    Returns:
+        str: The image file converted to base64 format.
+    """
+    with open(img_dir, 'rb') as file:
+        img_base64 = "data:image/jpeg;base64," + base64.b64encode(
+            file.read()
+        ).decode('utf-8')
+    return img_base64
+
+
+def imgbase64_to_pilimg(img_base64: str):
+    """Converts a base64 encoded image to a PIL image.
+
+    Args:
+        img_base64 (str): Base64 encoded image string.
+
+    Returns:
+        PIL.Image: A PIL image object.
+    """
+    img_pil = Image.open(
+        BytesIO(
+            base64.b64decode(img_base64.split(",")[-1])
+        )
+    )
+    return img_pil
+
+
 class ImgHandler:
     def __init__(
         self,
@@ -203,4 +240,31 @@ class ImgHandler:
             # > 0.9 很相似
             return sims
 
+    def vec_pics_todb(self, images):
+        """Save image features to a Redis database.
+
+        Args:
+            images (list): A list of image file paths.
+
+        Returns:
+            None
+
+        Example:
+            vec_pics_todb(images=['image1.jpg', 'image2.jpg'])
+        """
+        sorted_imgs = natsort.natsorted(images)
+        img_feats = self.get_img_features(sorted_imgs, to_numpy=True)
+        pipeline = self.ih.db_conn.pipeline()
+        for img_file, emb in zip(sorted_imgs, img_feats):
+            # 初始化 Redis，先使用 img 文件名作为 Key 和 Value，后续再更新为图片特征向量
+            # pipeline.json().set(img_file, "$", img_file)
+            emb = emb.astype(np.float32).tolist()
+            emb_json = {
+                "emb": emb,
+                "data": imgfile_to_base64(img_file)
+            }
+            pipeline.json().set(img_file, "$", emb_json)
+            res = pipeline.execute()
+            print('redis set:', res)
+
 

{hjxdl-0.1.65.dist-info → hjxdl-0.1.67.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hjxdl
-Version: 0.1.65
+Version: 0.1.67
 Summary: A collection of functions for Jupyter notebooks
 Home-page: https://github.com/huluxiaohuowa/hdl
 Author: Jianxing Hu
@@ -23,6 +23,7 @@ Requires-Dist: redis[hiredis]
 Requires-Dist: psycopg[binary]
 Requires-Dist: Pillow
 Requires-Dist: open-clip-torch
+Requires-Dist: natsort
 
 # DL framework by Jianxing
 

{hjxdl-0.1.65.dist-info → hjxdl-0.1.67.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=dWes_pejilDszHY1ei6MxbFy7H_tVhepnPnoJG50ueY,413
+hdl/_version.py,sha256=FcaV_ACOb2e682h3wmnM4BoU2t4Y9YegpmtQ5bKxxNg,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=4bIzsCAOlkIscc_u6j2NkyV30_uGb6hMEhs3QGSUvj0,6736
+hdl/utils/llm/vis.py,sha256=dkrSWZJcnLFy5ZmT8aDTy2EdvfzWbYOwDjUL47BbmxI,8547
 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.65.dist-info/METADATA,sha256=lXWFTci94OQLioRQkmta01nK-cK_zZBsqPxFBr2Aa6E,880
-hjxdl-0.1.65.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-hjxdl-0.1.65.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.1.65.dist-info/RECORD,,
+hjxdl-0.1.67.dist-info/METADATA,sha256=dxyZsd_-4xjvQ6k6WZcaxsxYI6gJzQ38iO2CAFZf2OY,903
+hjxdl-0.1.67.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+hjxdl-0.1.67.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.1.67.dist-info/RECORD,,