hjxdl 0.3.18__py3-none-any.whl → 0.3.20__py3-none-any.whl

hdl/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.18'
-__version_tuple__ = version_tuple = (0, 3, 18)
+__version__ = version = '0.3.20'
+__version_tuple__ = version_tuple = (0, 3, 20)

hdl/utils/llm/llm_wrapper.py

@@ -169,31 +169,43 @@ class OpenAIWrapper(object):
             answer_dict["contents"] = resp.choices[0].message.content
         elif resp.choices[0].finish_reason == "tool_calls":
             answer_dict["type"] = "tool_calls"
-            answer_dict["tool_parmas"] = resp.choices[0].message.tool_calls[0].function
+            answer_dict["tool_params"] = resp.choices[0].message.tool_calls[0].function
 
         return answer_dict
 
-    def stream(
-        self,
-        prompt,
-        **kwargs
-    ):
-        resp = self.get_resp(
-            prompt=prompt,
-            stream=True,
-            **kwargs
-        )
+    def stream(self, prompt, **kwargs):
+        resp = self.get_resp(prompt=prompt, stream=True, **kwargs)
+
         for chunk in resp:
-            if chunk.choices[0].finish_reason == 'tool_calls':
-                answer_dict = {}
-                answer_dict["type"] = "tool_calls"
-                answer_dict["tool_parmas"] = chunk.choices[0].delta.tool_calls[0].function
-                return answer_dict
-            else:
+            try:
+                choice = chunk.choices[0]
+
+                # 如果返回了 tool_calls
+                if hasattr(choice.delta, 'tool_calls') and choice.finish_reason == 'tool_calls':
+                    tool_calls = choice.delta.tool_calls
+                    if tool_calls:  # 防止为空
+                        yield {
+                            "type": "tool_calls",
+                            "tool_params": tool_calls[0].function
+                        }
+                    return  # 直接返回，结束流式输出
+
+                # 返回文本内容
+                if hasattr(choice.delta, 'content'):
+                    yield {
+                        "type": "text",
+                        "content": choice.delta.content
+                    }
+
+            except (AttributeError, IndexError) as e:
+                # 防止意外的结构异常
                 yield {
-                    "type": "text",
-                    "content": chunk.choices[0].delta.content
+                    "type": "error",
+                    "message": f"Stream chunk error: {str(e)}"
                 }
+                return
+
+        return
 
 
 

{hjxdl-0.3.18.dist-info → hjxdl-0.3.20.dist-info}/METADATA

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

{hjxdl-0.3.18.dist-info → hjxdl-0.3.20.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=QAzjzlQ8v3ZqOKXdT0jblmkqebjcDj2MPKGBvc_ei_4,413
+hdl/_version.py,sha256=0XAfq64E2h3BqosuCJunl1ENlgUhVRN79F4E0l9nrdU,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
@@ -134,15 +134,15 @@ 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=Wk-ejwooxB6SRKuHW-UYxoBxgpYr9j-7ttKtFAaWFXw,5859
+hdl/utils/llm/llm_wrapper.py,sha256=94xfPIR_eP7_S8FMCmRDvYpMnKpv9qVR9eDs2F7Nq-Y,6420
 hdl/utils/llm/vis.py,sha256=SSP6tOwKLq0hWcpM3twI9TitqzBmKjlcGrnXEWYlCzM,26055
 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.3.18.dist-info/LICENSE,sha256=lkMiSbeZHBQLB9LJEkS9-L3Z-LBC4yGnKrzHSG8RkPM,2599
-hjxdl-0.3.18.dist-info/METADATA,sha256=X1nGN-ixCM4ltZjIrxPGCzkOGUXy-aIpeRhrNmaCWIQ,1336
-hjxdl-0.3.18.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-hjxdl-0.3.18.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.3.18.dist-info/RECORD,,
+hjxdl-0.3.20.dist-info/LICENSE,sha256=lkMiSbeZHBQLB9LJEkS9-L3Z-LBC4yGnKrzHSG8RkPM,2599
+hjxdl-0.3.20.dist-info/METADATA,sha256=BJx8IbACYa8koyo5VGzB4q9R348FSz5U03Z_gLcHaXA,1336
+hjxdl-0.3.20.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+hjxdl-0.3.20.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.3.20.dist-info/RECORD,,