hjxdl 0.3.52__py3-none-any.whl → 0.3.54__py3-none-any.whl

hdl/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '0.3.52'
-__version_tuple__ = version_tuple = (0, 3, 52)
+__version__ = version = '0.3.54'
+__version_tuple__ = version_tuple = (0, 3, 54)
+
+__commit_id__ = commit_id = 'gd7cc5b09f'

hdl/utils/llm/chat.py

@@ -302,6 +302,71 @@ class OpenAI_M:
                 continue
 
     def get_resp(
+        self,
+        prompt: str,
+        client_id: str = None,
+        sys_info: str = None,
+        assis_info: str = None,
+        images: list = None,
+        image_keys: tuple = ("image_url", "url"),
+        stop: list[str] | None = ["USER:", "ASSISTANT:"],
+        model: str = None,
+        stream: bool = True,
+        **kwargs: t.Any,
+    ):
+        """Prepare and send a request to the model, and return the model's response."""
+        if not model:
+            model = self.client_conf[client_id]["model"]
+
+        # === 1️⃣ 准备输入 ===
+        content = [{"type": "text", "text": prompt}]
+        if isinstance(image_keys, str):
+            image_keys = (image_keys,) * 3
+        elif len(image_keys) == 2:
+            image_keys = (image_keys[0],) + tuple(image_keys)
+        elif len(image_keys) == 1:
+            image_keys = (image_keys[0],) * 3
+
+        if images:
+            if isinstance(images, str):
+                images = [images]
+            for img in images:
+                content.append({
+                    "type": image_keys[0],
+                    image_keys[1]: {image_keys[2]: img}
+                })
+        else:
+            content = prompt
+
+        # === 2️⃣ 构造 messages（兼容旧逻辑） ===
+        messages = []
+        if sys_info:
+            messages.append({"role": "system", "content": sys_info})
+        messages.append({"role": "user", "content": content})
+        if assis_info:
+            messages.append({"role": "assistant", "content": assis_info})
+
+        # === 3️⃣ 改成 responses.create ===
+        client = self.client_conf[client_id]["client"]
+
+        if stream:
+            response = client.responses.create(
+                model=model,
+                input=messages,       # 注意：新版 responses 接口直接用 "input"
+                stream=True,
+                **kwargs
+            )
+        else:
+            response = client.responses.create(
+                model=model,
+                input=messages,
+                stream=False,
+                **kwargs
+            )
+
+        return response
+
+    def get_resp_legacy(
         self,
         prompt: str,
         client_id: str = None,

hdl/utils/llm/vis.py

@@ -75,6 +75,7 @@ def to_base64(img):
     Returns:
         str: The image encoded as a base64 string.
     """
+    img_base64=""
 
     if isinstance(img, Image.Image):
         img_base64 = pilimg_to_base64(img)

{hjxdl-0.3.52.dist-info → hjxdl-0.3.54.dist-info}/METADATA

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

{hjxdl-0.3.52.dist-info → hjxdl-0.3.54.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=TTEAfA1bdwKuHjROoE4SBtzNIV89YnQetQ_w7z1XVrU,513
+hdl/_version.py,sha256=_Y5lo8qH4jdRcyRYZCDKbaSN12zS_WhJUDg_HwZG0HU,714
 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
@@ -131,14 +131,14 @@ hdl/utils/general/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 hdl/utils/general/glob.py,sha256=Zuf7WHU0UdUPOs9UrhxmrCiMC8GrHxQU6n3mTThv6yc,1120
 hdl/utils/general/runners.py,sha256=R0lhqABIuT43jEyjFkeio84e_PFfvAkszOP1FBlAnQ8,4927
 hdl/utils/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hdl/utils/llm/chat.py,sha256=q0zQmf-6DeSYOrC2qDn_QFOlILjRHU69eVRUn0eIIbA,26526
+hdl/utils/llm/chat.py,sha256=DUxvnYTPIEhhrdaXOapmSG_-o_gWe_PWla2cJ3MLHeE,28658
 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/llm_wrapper.py,sha256=90kuCEYMUAjJtjRSzwHTcQsprxaVHx8kyrtzl_aw1iY,15931
 hdl/utils/llm/ollama.py,sha256=uEdLsNAc6b56r37hNiE3nrd6oZ2lmQ0gYbVvOc9YVIM,1389
-hdl/utils/llm/vis.py,sha256=KuypafAuU4MEzJ5ywvopI0RcYjnyF_WKM_0oDUKbr8A,28808
+hdl/utils/llm/vis.py,sha256=jRa5l1LHaWtohtdIKVpOH_I4yyXWTbyaLGglFHsV_0Q,28826
 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
@@ -146,8 +146,8 @@ hdl/utils/vis_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 hdl/utils/vis_tools/scene_detect.py,sha256=L6TFMT15QHJuOIFcLFVI_RSSSjyTVZhBEqbeUez2auU,6608
 hdl/utils/weather/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/utils/weather/weather.py,sha256=k11o6wM15kF8b9NMlEfrg68ak-SfSYLN3nOOflFUv-I,4381
-hjxdl-0.3.52.dist-info/licenses/LICENSE,sha256=lkMiSbeZHBQLB9LJEkS9-L3Z-LBC4yGnKrzHSG8RkPM,2599
-hjxdl-0.3.52.dist-info/METADATA,sha256=gx_FF4lACt8rHaXkm_TplQpK_xf9rbZugqEEOZSsM0Q,1332
-hjxdl-0.3.52.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-hjxdl-0.3.52.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.3.52.dist-info/RECORD,,
+hjxdl-0.3.54.dist-info/licenses/LICENSE,sha256=lkMiSbeZHBQLB9LJEkS9-L3Z-LBC4yGnKrzHSG8RkPM,2599
+hjxdl-0.3.54.dist-info/METADATA,sha256=cyCXEGZj5dolhng5yUMe5XN54Ja_N00RLijtq12XELU,1332
+hjxdl-0.3.54.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+hjxdl-0.3.54.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.3.54.dist-info/RECORD,,

{hjxdl-0.3.52.dist-info → hjxdl-0.3.54.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any