hjxdl 0.2.13__py3-none-any.whl → 0.2.15__py3-none-any.whl

hdl/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.2.13'
-__version_tuple__ = version_tuple = (0, 2, 13)
+__version__ = version = '0.2.15'
+__version_tuple__ = version_tuple = (0, 2, 15)

hdl/utils/llm/vis.py

@@ -15,6 +15,7 @@ from redis.commands.search.indexDefinition import IndexDefinition, IndexType
 from hdl.jupyfuncs.show.pbar import tqdm
 from redis.commands.search.query import Query
 
+
 from ..database_tools.connect import conn_redis
 
 
@@ -89,6 +90,7 @@ def imgfile_to_base64(img_dir: str):
 
     return img_base64
 
+
 def imgbase64_to_pilimg(img_base64: str):
     """Converts a base64 encoded image to a PIL image.
 
@@ -107,6 +109,24 @@ def imgbase64_to_pilimg(img_base64: str):
     return img_pil
 
 
+def pilimg_to_base64(pilimg):
+    """Converts a PIL image to base64 format.
+
+    Args:
+        pilimg (PIL.Image): The PIL image to be converted.
+
+    Returns:
+        str: Base64 encoded image string.
+    """
+    buffered = BytesIO()
+    pilimg.save(buffered, format="PNG")
+    image_base64 = base64.b64encode(buffered.getvalue()).decode("utf-8")
+    img_format = 'png'
+    mime_type = f"image/{img_format}"
+    img_base64 = f"data:{mime_type};base64,{image_base64}"
+    return img_base64
+
+
 class ImgHandler:
     def __init__(
         self,

hdl/utils/llm/visrag.py

@@ -12,7 +12,7 @@ import json
 from transformers import AutoModel, AutoTokenizer
 
 from .chat import OpenAI_M
-from .vis import imgfile_to_base64
+from .vis import pilimg_to_base64
 
 def get_image_md5(img: Image.Image):
     img_byte_array = img.tobytes()
@@ -116,14 +116,35 @@ def retrieve_gradio(knowledge_base, query, topk, cache_dir=None, model=None, tok
 #     return image_base64
 
 def answer_question(images, question, gen_model):
-    # Convert images to base64
-    # images_base64 = [convert_image_to_base64(Image.open(image[0]).convert('RGB')) for image in images]
-    images_base64 = [imgfile_to_base64(image) for image in images]
+    # Load images from the image paths in images[0]
+    pil_images = [Image.open(image[0]).convert('RGB') for image in images]
 
-    # Pass base64-encoded images to gen_model.chat
+    # Calculate the total size of the new image (for vertical concatenation)
+    widths, heights = zip(*(img.size for img in pil_images))
+
+    # Assuming vertical concatenation, so width is the max width, height is the sum of heights
+    total_width = max(widths)
+    total_height = sum(heights)
+
+    # Create a new blank image with the total width and height
+    new_image = Image.new('RGB', (total_width, total_height))
+
+    # Paste each image into the new image
+    y_offset = 0
+    for img in pil_images:
+        new_image.paste(img, (0, y_offset))
+        y_offset += img.height  # Move the offset down by the height of the image
+
+    # Optionally save or display the final concatenated image (for debugging)
+    # new_image.save('concatenated_image.png')
+
+    # Convert the concatenated image to base64
+    new_image_base64 = pilimg_to_base64(new_image)
+
+    # Call the model with the base64-encoded concatenated image
     answer = gen_model.chat(
         prompt=question,
-        images=images_base64,  # Use the base64 images
+        images=[new_image_base64],  # Use the concatenated image
         stream=False
     )
     return answer

{hjxdl-0.2.13.dist-info → hjxdl-0.2.15.dist-info}/METADATA

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

{hjxdl-0.2.13.dist-info → hjxdl-0.2.15.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=_zyE7p8pmjayqCVwnrfAUFK0j2fzgvPDn81vjk9iKCc,413
+hdl/_version.py,sha256=jLEv5wW_x8zLfp1bwdtLZaGYh6V6kSSSoRN6ETWwP6c,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
@@ -132,13 +132,13 @@ hdl/utils/llm/chatgr.py,sha256=GO2G7g6YybduA5VCUuGjvEsJfC_6L7rycSnPeHMcxyM,2820
 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=2pI0439GWi_BEVfQJtY29Y72FkUa8jEvBeqMlwy7xkc,15716
-hdl/utils/llm/visrag.py,sha256=diOO5eOeIwVQ5lIAgWTSHF70wqhyOVTpGahGEEQaLc4,8408
+hdl/utils/llm/vis.py,sha256=-6QvxSVzKqxLh_l0aYg2wN2G5HOiQvCpfp-jn9twXw0,16210
+hdl/utils/llm/visrag.py,sha256=vNj4cHsvfC_Vc0eDPKZc-yflLUMGApZGpggjAqAlwS8,9215
 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.2.13.dist-info/METADATA,sha256=2Ljze-IXByM5cSRDYqtjGCVH_Rd4X6eHSQ5CQpP63Is,836
-hjxdl-0.2.13.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-hjxdl-0.2.13.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.2.13.dist-info/RECORD,,
+hjxdl-0.2.15.dist-info/METADATA,sha256=8TpagjCOPvQJbvgS4FPGB6gqHRyvScegPcxhL7ZIwlM,836
+hjxdl-0.2.15.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+hjxdl-0.2.15.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.2.15.dist-info/RECORD,,