hjxdl 0.2.89__py3-none-any.whl → 0.2.91__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.89'
-__version_tuple__ = version_tuple = (0, 2, 89)
+__version__ = version = '0.2.91'
+__version_tuple__ = version_tuple = (0, 2, 91)

hdl/utils/llm/chat.py

@@ -6,14 +6,16 @@ import subprocess
 from typing import Generator
 import re
 
-
 from openai import OpenAI
+from PIL import Image
+
 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, to_img
+from .vis import draw_and_plot_boxes_from_json, to_img, to_base64
 # import json
 # import traceback
 
+
 def parse_fn_markdown(markdown_text, params_key="params"):
     """
     Parses a markdown text to extract function name and parameters.
@@ -585,8 +587,7 @@ class OpenAI_M():
         Returns:
             str: A JSON string containing the results of the object detection.
         """
-        if isinstance(image, str):
-            image = to_img(image)
+        image = to_base64(image)
         json_str = self.invoke(
             prompt=self.od_desc,
             images=[image]
@@ -681,10 +682,16 @@ class MMChatter():
             text=True
         )
 
-        # Only capture stdout (ignoring verbose logging)
+        # Process the output
         output = result.stdout
 
-        # Process the model's response by parsing the output
-        response = output.splitlines()[-1].strip('<assistant>')  # Assuming the last line is the model's response
+        # Extract the relevant part of the output
+        # Locate the response starting from '<assistant>' and capture everything afterwards
+        start_marker = "<assistant>"
+        if start_marker in output:
+            response_start = output.index(start_marker) + len(start_marker)
+            response = output[response_start:].strip()
+        else:
+            response = output.strip()
 
-        return response
+        return response

hdl/utils/llm/vis.py

@@ -45,6 +45,30 @@ def to_img(img_str):
     return img
 
 
+def to_base64(img):
+    """
+    Convert an image to its base64 representation.
+    Parameters:
+    img (PIL.Image.Image or str): The image to convert. This can be a PIL Image object,
+                                  a base64 string starting with "data:image", a URL starting
+                                  with "http", or a file path to an image.
+    Returns:
+    str: The base64 representation of the image.
+    Raises:
+    TypeError: If the input is not a PIL Image object or a string.
+    """
+    if isinstance(img, Image.Image):
+        img_base64 = pilimg_to_base64(img)
+    elif isinstance(img, str):
+        if img.startswith("data:image"):
+            img_base64 = img
+        elif img.startswith("http"):
+            img_base64 = imgurl_to_base64(img)
+        elif Path(img).is_file():
+            img_base64 = imgfile_to_base64(img)
+    return img_base64
+
+
 def imgurl_to_base64(image_url: str):
     """Converts an image from a URL to base64 format.
 
@@ -177,6 +201,8 @@ def draw_and_plot_boxes_from_json(
     # except FileNotFoundError:
     #     print(f"Image file not found at {image_path}. Please check the path.")
     #     return None
+    if not isinstance(image, Image.Image):
+        image = to_img(image)
     img = image
 
     draw = ImageDraw.Draw(img)

{hjxdl-0.2.89.dist-info → hjxdl-0.2.91.dist-info}/METADATA

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

{hjxdl-0.2.89.dist-info → hjxdl-0.2.91.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=T4uFqSpd445gDAMK7t2Cd8f3g3HJ-xiBRBi26D-0agQ,413
+hdl/_version.py,sha256=LbTtiYJHXfOXk868cTsLjgvV-tgQLnj4fofYnABLP2c,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=y3GgpnBNrFoQghUXGQe-onfJ9GvxH2ATiuO6DCG024k,24657
+hdl/utils/llm/chat.py,sha256=_yqgWFhsxtYfNNm8pb5b-HIl950ZHL841JM5qm7zd0Y,24848
 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=fuXdEFfUpW4KR7TKmIBEuMmo3ZdZxfd79a_qfTM0tPk,24739
+hdl/utils/llm/vis.py,sha256=zKCKwhWCPxV1SYlfWGYIylgYbAnEGm8vkPqIiClb7JU,25683
 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.89.dist-info/METADATA,sha256=x7Ytfsf8Y1a6rPJTU431yH8BBth-02CEjFVVZ1a9sh0,836
-hjxdl-0.2.89.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-hjxdl-0.2.89.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.2.89.dist-info/RECORD,,
+hjxdl-0.2.91.dist-info/METADATA,sha256=ne16d4ucj4MA9ocl9J2XseM6z1KgxK0B4qE-wku7YBU,836
+hjxdl-0.2.91.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+hjxdl-0.2.91.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.2.91.dist-info/RECORD,,