hjxdl 0.3.53__py3-none-any.whl → 0.3.55__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.53'
-__version_tuple__ = version_tuple = (0, 3, 53)
+__version__ = version = '0.3.55'
+__version_tuple__ = version_tuple = (0, 3, 55)
+
+__commit_id__ = commit_id = 'g9915d44d3'

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/llm_wrapper.py

@@ -150,6 +150,214 @@ class OpenAIWrapper(object):
         stream: bool = True,
         response_model = None,
         **kwargs: t.Any,
+    ):
+        """
+        与上层保持完全兼容：内部改用 responses.create，
+        但返回值/流式 chunk 仍然伪装成 chat.completions 的结构。
+        """
+        if not model:
+            model = self.client_conf[client_id]['model']
+
+        client = self.client_conf[client_id]['client']
+        if response_model:
+            import instructor
+            client = instructor.from_openai(client)
+
+        # ===== 构造 messages（保持你原有逻辑）=====
+        messages = []
+        if sys_info:
+            messages.append({"role": "system", "content": sys_info})
+        if history:
+            messages.extend(history)
+
+        # 规范化 media key（三元组）
+        def _triple_keys(keys):
+            if isinstance(keys, str):
+                return (keys,)*3
+            if len(keys) == 2:
+                return (keys[0],) + tuple(keys)
+            if len(keys) == 1:
+                return (keys[0],)*3
+            return keys
+
+        image_keys = _triple_keys(image_keys)
+        video_keys = _triple_keys(video_keys)
+
+        content = [{"type": "text", "text": prompt}]
+        if videos:
+            if isinstance(videos, str):
+                videos = [videos]
+            for v in videos:
+                content.append({
+                    "type": video_keys[0],
+                    video_keys[1]: {video_keys[2]: v}
+                })
+
+        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}
+                })
+
+        if (not images) and (not videos):
+            content = prompt
+
+        messages.append({"role": "user", "content": content})
+        if assis_info:
+            messages.append({"role": "assistant", "content": assis_info})
+
+        # ===== Responses API 调用 =====
+        # 注意：Responses 同时支持 messages 形状；tools 也直接传 tools / tool_choice。
+        if stream:
+            # --- 流式：返回一个生成器，伪装成 chat.completions 的 chunk 结构 ---
+            #   你的上层 `for chunk in resp:` 会收到具有
+            #   chunk.choices[0].delta.content / .tool_calls 的对象
+            resp_stream = client.responses.create(
+                model=model,
+                messages=messages,
+                tools=tools if tools else None,
+                tool_choice=tool_choice if tools else None,
+                stream=True,
+                **kwargs
+            )
+
+            # 适配层：把 Responses 的事件流，转成 Chat Completions 风格的 chunk
+            from types import SimpleNamespace
+            def _wrap_delta_text(text):
+                # -> chunk.choices[0].delta.content
+                delta = SimpleNamespace(content=text)
+                choice = SimpleNamespace(delta=delta)
+                return SimpleNamespace(choices=[choice])
+
+            def _wrap_delta_tool_call(name, arguments_fragment):
+                # -> chunk.choices[0].delta.tool_calls[0].function.{name, arguments}
+                func = SimpleNamespace(name=name, arguments=arguments_fragment)
+                tool_call = SimpleNamespace(function=func)
+                delta = SimpleNamespace(content=None, tool_calls=[tool_call])
+                choice = SimpleNamespace(delta=delta)
+                return SimpleNamespace(choices=[choice])
+
+            def _generator():
+                # SDK 的 Responses 流每个 event 有 event.type
+                # 我们尽量覆盖主流事件名；未知事件直接忽略
+                tool_args_acc = {}  # 累积每个工具参数（按 id 聚合）
+                tool_name_cache = {}
+
+                for event in resp_stream:
+                    et = getattr(event, "type", None)
+
+                    # 文本增量
+                    if et == "response.output_text.delta":
+                        delta_text = getattr(event, "delta", None)
+                        if delta_text:
+                            yield _wrap_delta_text(delta_text)
+
+                    # 文本结束（可忽略，上层会基于yield的终止判断）
+                    elif et == "response.output_text.done":
+                        pass
+
+                    # 工具调用参数增量
+                    elif et in ("response.tool_call.delta", "response.function_call.delta"):
+                        # 常见字段：event.id, event.name, event.delta / event.arguments_delta
+                        call_id = getattr(event, "id", None)
+                        name = getattr(event, "name", None) or tool_name_cache.get(call_id)
+                        args_delta = getattr(event, "arguments_delta", None) or getattr(event, "delta", "")
+
+                        if call_id:
+                            tool_name_cache.setdefault(call_id, name or "")
+                            tool_args_acc.setdefault(call_id, "")
+                            tool_args_acc[call_id] += (args_delta or "")
+
+                        # 也把这一小段增量向上抛（让你上层能尽快看到 tool_calls）
+                        yield _wrap_delta_tool_call(name or "", args_delta or "")
+
+                    # 工具调用完成（把完整参数再抛一次，便于上层一次性拿到）
+                    elif et in ("response.tool_call.done", "response.function_call.done"):
+                        call_id = getattr(event, "id", None)
+                        full_name = tool_name_cache.get(call_id, "")
+                        full_args = tool_args_acc.get(call_id, "")
+                        yield _wrap_delta_tool_call(full_name, full_args)
+
+                    # 其它事件（如 response.completed / response.error 等）
+                    else:
+                        # 可以按需扩展，这里静默忽略
+                        pass
+
+            return _generator()
+
+        else:
+            # --- 非流式：把 Responses 同步结果适配成 chat.completions 风格 ---
+            resp = client.responses.create(
+                model=model,
+                messages=messages,
+                tools=tools if tools else None,
+                tool_choice=tool_choice if tools else None,
+                stream=False,
+                **kwargs
+            )
+
+            # 从 Responses 里抽取文本 & 工具调用
+            # 尽量兼容：优先用 output_text；否则从 output 列表里聚合
+            text_out = getattr(resp, "output_text", None)
+            outputs = getattr(resp, "output", None)
+
+            if text_out is None and outputs:
+                # 聚合 message/output_text
+                parts = []
+                for item in outputs:
+                    if getattr(item, "type", "") in ("message",):
+                        # item.content 里通常还有若干块（output_text 等）
+                        content_parts = getattr(item, "content", []) or []
+                        for c in content_parts:
+                            if getattr(c, "type", "") in ("output_text",):
+                                parts.append(getattr(c, "text", ""))
+                text_out = "".join(parts) if parts else None
+
+            # 抽取工具调用（如果有）
+            tool_calls_wrapped = []
+            if outputs:
+                for item in outputs:
+                    if getattr(item, "type", "") in ("tool_call", "function_call"):
+                        name = getattr(item, "name", "")
+                        arguments = getattr(item, "arguments", "")
+                        from types import SimpleNamespace
+                        func = SimpleNamespace(name=name, arguments=arguments)
+                        tool_calls_wrapped.append(SimpleNamespace(function=func))
+
+            # 伪造 chat.completions 的返回结构
+            from types import SimpleNamespace
+            finish_reason = "tool_calls" if tool_calls_wrapped else "stop"
+            message = SimpleNamespace(
+                content=text_out or "",
+                tool_calls=tool_calls_wrapped if tool_calls_wrapped else None
+            )
+            choice = SimpleNamespace(
+                message=message,
+                finish_reason=finish_reason
+            )
+            fake_resp = SimpleNamespace(choices=[choice])
+            return fake_resp
+
+    def get_resp_legacy(
+        self,
+        prompt,
+        client_id: str = None,
+        history: list = None,
+        sys_info: str = None,
+        assis_info: str = None,
+        images: list = None,
+        image_keys: tuple = ("image_url", "url"),
+        videos: list = None,
+        video_keys: tuple = ("video_url", "url"),
+        model: str=None,
+        tools: list = None,
+        tool_choice: str = "auto",
+        stream: bool = True,
+        response_model = None,
+        **kwargs: t.Any,
     ):
         """
         Generates a response from a chat model based on the given prompt and additional context.

{hjxdl-0.3.53.dist-info → hjxdl-0.3.55.dist-info}/METADATA

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

{hjxdl-0.3.53.dist-info → hjxdl-0.3.55.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=LOve7Xwof5gkJfudmo-x9g-m045QiE3PXKDH73-tpKM,513
+hdl/_version.py,sha256=J32R-NeGJqzLh_7eUPBcs_wpve_PO9WxTbxII1hs3gE,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,12 +131,12 @@ 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/llm_wrapper.py,sha256=QTe27eJRNjoUdvQva6RQm5XSQEY5WNf3PkvJsEKa-yE,24817
 hdl/utils/llm/ollama.py,sha256=uEdLsNAc6b56r37hNiE3nrd6oZ2lmQ0gYbVvOc9YVIM,1389
 hdl/utils/llm/vis.py,sha256=jRa5l1LHaWtohtdIKVpOH_I4yyXWTbyaLGglFHsV_0Q,28826
 hdl/utils/llm/visrag.py,sha256=0i-VrxqgiV-J7R3VPshu9oc7-rKjFJOldYik3HDXj6M,10176
@@ -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.53.dist-info/licenses/LICENSE,sha256=lkMiSbeZHBQLB9LJEkS9-L3Z-LBC4yGnKrzHSG8RkPM,2599
-hjxdl-0.3.53.dist-info/METADATA,sha256=GaZIJEtbT7dvyOtdU8jpbs-Ryx3Y3hmBmm3GYdrUGc8,1332
-hjxdl-0.3.53.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-hjxdl-0.3.53.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.3.53.dist-info/RECORD,,
+hjxdl-0.3.55.dist-info/licenses/LICENSE,sha256=lkMiSbeZHBQLB9LJEkS9-L3Z-LBC4yGnKrzHSG8RkPM,2599
+hjxdl-0.3.55.dist-info/METADATA,sha256=RZpIrw445VbIpV_I1RWc5RFZR6mrC9g4LaQm0jEpMp4,1332
+hjxdl-0.3.55.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+hjxdl-0.3.55.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.3.55.dist-info/RECORD,,

{hjxdl-0.3.53.dist-info → hjxdl-0.3.55.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