hjxdl 0.2.10__py3-none-any.whl → 0.2.12__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.10'
-__version_tuple__ = version_tuple = (0, 2, 10)
+__version__ = version = '0.2.12'
+__version_tuple__ = version_tuple = (0, 2, 12)

hdl/utils/llm/visrag.py

@@ -7,6 +7,8 @@ import gradio as gr
 import os
 import numpy as np
 import json
+import base64
+import io
 from transformers import AutoModel, AutoTokenizer
 from hdl.utils.llm.chat import OpenAI_M
 
@@ -104,11 +106,21 @@ def retrieve_gradio(knowledge_base, query, topk, cache_dir=None, model=None, tok
 
     return images_topk
 
+def convert_image_to_base64(image):
+    """Convert a PIL Image to a base64 encoded string."""
+    buffered = io.BytesIO()
+    image.save(buffered, format="PNG")
+    image_base64 = base64.b64encode(buffered.getvalue()).decode("utf-8")
+    return image_base64
+
 def answer_question(images, question, gen_model):
-    images_ = [Image.open(image[0]).convert('RGB') for image in images]
+    # Convert images to base64
+    images_base64 = [convert_image_to_base64(Image.open(image[0]).convert('RGB')) for image in images]
+
+    # Pass base64-encoded images to gen_model.chat
     answer = gen_model.chat(
         prompt=question,
-        images=images_,
+        images=images_base64,  # Use the base64 images
         stream=False
     )
     return answer
@@ -142,7 +154,7 @@ if __name__ == '__main__':
     parser.add_argument('--cache-dir', dest='cache_dir', type=str, required=True, help='Cache directory path')
     parser.add_argument('--device', dest='device', type=str, default='cuda:0', help='Device for model inference')
     parser.add_argument('--model-path', dest='model_path', type=str, required=True, help='Path to the embedding model')
-    parser.add_argument('--llm-host', dest='llm_host', type=str, default='127.0.0.0', help='LLM server IP address')
+    parser.add_argument('--llm-host', dest='llm_host', type=str, default='127.0.0.1', help='LLM server IP address')
     parser.add_argument('--llm-port', dest='llm_port', type=int, default=22299, help='LLM server port')
     parser.add_argument('--server-name', dest='server_name', type=str, default='0.0.0.0', help='Gradio server name')
     parser.add_argument('--server-port', dest='server_port', type=int, default=10077, help='Gradio server port')
@@ -168,8 +180,8 @@ if __name__ == '__main__':
         file_result = gr.Text(label="Knowledge Base ID")
         process_button = gr.Button("Process PDF")
 
-        process_button.click(add_pdf_gradio, inputs=[file_input], outputs=file_result,
-                             _kwargs={'cache_dir': args.cache_dir, 'model': model, 'tokenizer': tokenizer})
+        process_button.click(lambda pdf: add_pdf_gradio(pdf, cache_dir=args.cache_dir, model=model, tokenizer=tokenizer),
+                             inputs=file_input, outputs=file_result)
 
         kb_id_input = gr.Text(label="Knowledge Base ID")
         query_input = gr.Text(label="Your Question")
@@ -177,18 +189,21 @@ if __name__ == '__main__':
         retrieve_button = gr.Button("Retrieve Pages")
         images_output = gr.Gallery(label="Retrieved Pages")
 
-        retrieve_button.click(retrieve_gradio, inputs=[kb_id_input, query_input, topk_input], outputs=images_output,
-                              _kwargs={'cache_dir': args.cache_dir, 'model': model, 'tokenizer': tokenizer})
+        retrieve_button.click(lambda kb, query, topk: retrieve_gradio(kb, query, topk, cache_dir=args.cache_dir, model=model, tokenizer=tokenizer),
+                              inputs=[kb_id_input, query_input, topk_input], outputs=images_output)
 
         button = gr.Button("Answer Question")
         gen_model_response = gr.Textbox(label="MiniCPM-V-2.6's Answer")
 
-        button.click(answer_question, inputs=[images_output, query_input], outputs=gen_model_response, _kwargs={'gen_model': gen_model})
+        button.click(lambda images, question: answer_question(images, question, gen_model),
+                     inputs=[images_output, query_input], outputs=gen_model_response)
 
         upvote_button = gr.Button("🤗 Upvote")
         downvote_button = gr.Button("🤣 Downvote")
 
-        upvote_button.click(upvote, inputs=[kb_id_input, query_input], outputs=None, _kwargs={'cache_dir': args.cache_dir})
-        downvote_button.click(downvote, inputs=[kb_id_input, query_input], outputs=None, _kwargs={'cache_dir': args.cache_dir})
+        upvote_button.click(lambda kb, query: upvote(kb, query, cache_dir=args.cache_dir),
+                            inputs=[kb_id_input, query_input], outputs=None)
+        downvote_button.click(lambda kb, query: downvote(kb, query, cache_dir=args.cache_dir),
+                              inputs=[kb_id_input, query_input], outputs=None)
 
     app.launch(server_name=args.server_name, server_port=args.server_port)

{hjxdl-0.2.10.dist-info → hjxdl-0.2.12.dist-info}/METADATA

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

{hjxdl-0.2.10.dist-info → hjxdl-0.2.12.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=YP9diSdvTdaLkQhlynYIFRmW3yUbT-ZgorqIhrsMGf8,413
+hdl/_version.py,sha256=svcGBcBtXuMqAz4h0v_Mst9pNApgzncWOHA1dv0p748,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
@@ -133,12 +133,12 @@ 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=iceouI1OeGyA--zEeHjx7Zx0cfGmIV02A8RzYx7s9ro,7723
+hdl/utils/llm/visrag.py,sha256=jZgo1awEVRq3z0IEXs-soa1scbeHSBk_IUq9c7rS5ZA,8300
 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.10.dist-info/METADATA,sha256=M_Gb9sipw6cV22bS6d7tHBVwc0sYaAaZeP4Mh7vkaf0,836
-hjxdl-0.2.10.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-hjxdl-0.2.10.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.2.10.dist-info/RECORD,,
+hjxdl-0.2.12.dist-info/METADATA,sha256=J68Ist70QStGrBWqWYK2bzoBFV40DI_hYOhOyCu9150,836
+hjxdl-0.2.12.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+hjxdl-0.2.12.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.2.12.dist-info/RECORD,,