hjxdl 0.2.86__py3-none-any.whl → 0.2.87__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.86'
-__version_tuple__ = version_tuple = (0, 2, 86)
+__version__ = version = '0.2.87'
+__version_tuple__ = version_tuple = (0, 2, 87)

hdl/utils/llm/chat.py

@@ -10,8 +10,8 @@ import re
 from openai import OpenAI
 from ..desc.template import FN_TEMPLATE, COT_TEMPLATE, OD_TEMPLATE
 from ..desc.func_desc import TOOL_DESC
-from .vis import draw_and_plot_boxes_from_json
-import json
+from .vis import draw_and_plot_boxes_from_json, to_img
+# import json
 # import traceback
 
 def parse_fn_markdown(markdown_text, params_key="params"):
@@ -576,7 +576,7 @@ class OpenAI_M():
 
     def od(
         self,
-        image_path,
+        image,
     ):
         """
         Perform object detection on the given image.
@@ -585,15 +585,17 @@ class OpenAI_M():
         Returns:
             str: A JSON string containing the results of the object detection.
         """
+        if isinstance(image, str):
+            image = to_img(image)
         json_str = self.invoke(
             prompt=self.od_desc,
-            images=image_path,
+            images=image,
         )
         return json_str
 
     def od_v(
         self,
-        image_path,
+        image,
         save_path,
     ):
         """
@@ -604,12 +606,11 @@ class OpenAI_M():
         Returns:
             tuple: A tuple containing the processed image and the save path.
         """
-        json_str = self.od(image_path)
-        img = draw_and_plot_boxes_from_json(json_str, image_path, save_path)
+        json_str = self.od(image)
+        img = draw_and_plot_boxes_from_json(json_str, image, save_path)
         return img, save_path
 
 
-
 class MMChatter():
     def __init__(
         self,

hdl/utils/llm/vis.py

@@ -29,6 +29,21 @@ from redis.commands.search.query import Query
 
 HF_HUB_PREFIX = "hf-hub:"
 
+def to_img(img_str):
+    if img_str.startswith("data:image"):
+        img = imgbase64_to_pilimg(img_str)
+    elif img_str.startswith("http"):
+        response = requests.get(img_str)
+        if response.status_code == 200:
+            # Read the image content from the response
+            img_data = response.content
+
+            # Load the image using PIL to determine its format
+            img = Image.open(BytesIO(img_data))
+    elif Path(img_str).is_file():
+        img = Image.open(img_str)
+    return img
+
 
 def imgurl_to_base64(image_url: str):
     """Converts an image from a URL to base64 format.
@@ -127,7 +142,7 @@ def pilimg_to_base64(pilimg):
 
 def draw_and_plot_boxes_from_json(
     json_data,
-    image_path,
+    image,
     save_path=None
 ):
     """
@@ -157,11 +172,12 @@ def draw_and_plot_boxes_from_json(
         data = json_data
 
     # Open the image
-    try:
-        img = Image.open(image_path)
-    except FileNotFoundError:
-        print(f"Image file not found at {image_path}. Please check the path.")
-        return None
+    # try:
+    #     img = Image.open(image_path)
+    # except FileNotFoundError:
+    #     print(f"Image file not found at {image_path}. Please check the path.")
+    #     return None
+    img = image
 
     draw = ImageDraw.Draw(img)
     width, height = img.size

{hjxdl-0.2.86.dist-info → hjxdl-0.2.87.dist-info}/METADATA

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

{hjxdl-0.2.86.dist-info → hjxdl-0.2.87.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=ctuAY4SA6RbniXWB0arHRsoS9WridMkUjxgK51gb0_k,413
+hdl/_version.py,sha256=-EqlO_Q2DeGj4KRTSqXd3-iZhbsh0WnP4M1zMqep9KY,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
@@ -128,18 +128,18 @@ hdl/utils/general/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 hdl/utils/general/glob.py,sha256=Zuf7WHU0UdUPOs9UrhxmrCiMC8GrHxQU6n3mTThv6yc,1120
 hdl/utils/general/runners.py,sha256=x7QBolp3MrqNV6L4rB6Ueybr26bqkRFZTuXhY0SwyLk,3061
 hdl/utils/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hdl/utils/llm/chat.py,sha256=vwUlBWnpFXMkNeFZFhMU2soJMJ2sSYuLBxWdcF7Nwn8,24422
+hdl/utils/llm/chat.py,sha256=1KP3n1idJnbWJ9MscqnepkaX3f1gKfYsnCBdWzACQQE,24475
 hdl/utils/llm/chatgr.py,sha256=5F5PJHe8vz3iCfi4TT54DCLRi1UeJshECdVtgvvvao0,3696
 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=JPil4gJ-n-awv_EjNIjOwG9Gc89lsqTojV58_66U0_A,24204
+hdl/utils/llm/vis.py,sha256=fuXdEFfUpW4KR7TKmIBEuMmo3ZdZxfd79a_qfTM0tPk,24739
 hdl/utils/llm/visrag.py,sha256=0i-VrxqgiV-J7R3VPshu9oc7-rKjFJOldYik3HDXj6M,10176
 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.86.dist-info/METADATA,sha256=gVHFWKNOu3_tkIION0mjlgFKpiaLpIc6ebmVAl7k6R4,836
-hjxdl-0.2.86.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-hjxdl-0.2.86.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.2.86.dist-info/RECORD,,
+hjxdl-0.2.87.dist-info/METADATA,sha256=d5lsVGayR4BQTMLM_P6CBNfm_WP1az1UhZt_CUjkS3Q,836
+hjxdl-0.2.87.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+hjxdl-0.2.87.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.2.87.dist-info/RECORD,,