hjxdl 0.2.9__py3-none-any.whl → 0.2.11__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.9'
-__version_tuple__ = version_tuple = (0, 2, 9)
+__version__ = version = '0.2.11'
+__version_tuple__ = version_tuple = (0, 2, 11)

hdl/utils/llm/visrag.py

@@ -138,14 +138,14 @@ def downvote(knowledge_base, query, cache_dir):
         f.write(json.dumps(data, indent=4, ensure_ascii=False))
 
 if __name__ == '__main__':
-    parser = argparse.ArgumentParser(description="RAG-PDFQA Script")
-    parser.add_argument('--cache_dir', type=str, required=True, help='Cache directory path')
-    parser.add_argument('--device', type=str, default='cuda:0', help='Device for model inference')
-    parser.add_argument('--model_path', type=str, required=True, help='Path to the embedding model')
-    parser.add_argument('--llm_host', type=str, default='127.0.0.0', help='LLM server IP address')
-    parser.add_argument('--llm_port', type=int, default=22299, help='LLM server port')
-    parser.add_argument('--server_name', type=str, default='0.0.0.0', help='Gradio server name')
-    parser.add_argument('--server_port', type=int, default=10077, help='Gradio server port')
+    parser = argparse.ArgumentParser(description="MiniCPMV-RAG-PDFQA Script")
+    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.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')
 
     args = parser.parse_args()
 
@@ -162,14 +162,14 @@ if __name__ == '__main__':
     )
 
     with gr.Blocks() as app:
-        gr.Markdown("# Vision Language Models Enable End-to-End RAG")
+        gr.Markdown("# MiniCPMV-RAG-PDFQA: Two Vision Language Models Enable End-to-End RAG")
 
         file_input = gr.File(type="binary", label="Step 1: Upload PDF")
         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 +177,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="Model's Answer")
+        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.9.dist-info → hjxdl-0.2.11.dist-info}/METADATA

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

{hjxdl-0.2.9.dist-info → hjxdl-0.2.11.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=3Wn5WgE4hQ0wW5cv50DvKHFoeoZaIrtStGD1O5cZq04,411
+hdl/_version.py,sha256=zHgAwrkDTK_-ggjmpfUbyN4DWYMgD-GquJ0wB1j66Z4,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=BBWmYI8p9e9ZclWBP8nC3kuv7LzvYlg-7gyw_JTZ7K0,7556
+hdl/utils/llm/visrag.py,sha256=Nkt39OvltWvrYrHBw2eNgCMkArYtJI_RPttMi2se-Ns,7872
 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.9.dist-info/METADATA,sha256=1T0y4ijcXd1dnb9E3LmS6dKK3Jr-GLenT2lB11h7l54,835
-hjxdl-0.2.9.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-hjxdl-0.2.9.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.2.9.dist-info/RECORD,,
+hjxdl-0.2.11.dist-info/METADATA,sha256=Vllm_K5eqawd7WpTCegnb3KWBEKV1igVAj3FALI1-K0,836
+hjxdl-0.2.11.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+hjxdl-0.2.11.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.2.11.dist-info/RECORD,,