hjxdl 0.2.58__py3-none-any.whl → 0.2.60__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.58'
-__version_tuple__ = version_tuple = (0, 2, 58)
+__version__ = version = '0.2.60'
+__version_tuple__ = version_tuple = (0, 2, 60)

hdl/utils/llm/chat.py

@@ -183,15 +183,12 @@ class OpenAI_M():
 
         # 进入思考循环，直到找到答案或达到最大步数
         while True:
-            print(f"调式信息：\nStep {n_steps}, current_info: {current_info}, steps: {steps}\n\n")
-            # if steps is None:
-            #     steps = []
-            # 增加步数计数
             n_steps += 1
             # 检查是否达到最大步数，如果是，则退出循环并返回默认答案
             if n_steps > max_step:
                 print("Max step reached!")
-                return n_steps, current_info, steps
+                yield n_steps, current_info, steps
+                return
 
             # 调用思考函数，传入当前信息和用户问题，获取下一步思考的结果
             resp = self.invoke(
@@ -209,24 +206,25 @@ class OpenAI_M():
                 # 将当前思考步骤添加到步骤列表中
                 steps.append(step_json)
                 # 如果思考步骤中标记为停止思考，则打印所有步骤并返回最终答案
+
+                # 如果思考步骤中包含使用工具的指示，则构造工具提示并调用agent_response方法
+                if 'tool' in step_json:
+                    tool_prompt = step_json["tool"] + step_json["title"] + step_json["content"]
+                    tool_resp = self.agent_response(
+                        tool_prompt,
+                        stream=False,
+                        **kwargs
+                    )
+                    # 将工具返回的信息累积到当前信息中
+                    current_info += f"\n{tool_resp}"
+                else:
+                    # 如果不使用工具，将当前思考步骤的标题累积到当前信息中
+                    current_info += f"\n{step_json["title"]}"
+
                 if step_json.get("stop_thinking", False):
                     current_info += f"\n{step_json['content']}"
                     yield n_steps, current_info, steps
                     return
-                else:
-                    # 如果思考步骤中包含使用工具的指示，则构造工具提示并调用agent_response方法
-                    if 'tool' in step_json:
-                        tool_prompt = step_json["tool"] + step_json["title"] + step_json["content"]
-                        tool_resp = self.agent_response(
-                            tool_prompt,
-                            stream=False,
-                            **kwargs
-                        )
-                        # 将工具返回的信息累积到当前信息中
-                        current_info += f"\n{tool_resp}"
-                    else:
-                        # 如果不使用工具，将当前思考步骤的标题累积到当前信息中
-                        current_info += f"\n{step_json["title"]}"
                 yield n_steps, current_info, steps
             except Exception as e:
                 # 捕获异常并打印，然后继续下一轮思考

{hjxdl-0.2.58.dist-info → hjxdl-0.2.60.dist-info}/METADATA

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

{hjxdl-0.2.58.dist-info → hjxdl-0.2.60.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=VR3LDVMMZz0QyJ4-aelbZjal7qv5JgRaOWv5NTok7Z8,413
+hdl/_version.py,sha256=kAmnI7Zl9q6BAbIEHfYc3JQ828dgSsqxMMxia4OrTlo,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,7 +128,7 @@ hdl/utils/general/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 hdl/utils/general/glob.py,sha256=8-RCnt6L297wMIfn34ZAMCsGCZUjHG3MGglGZI1cX0g,491
 hdl/utils/general/runners.py,sha256=aWvEXYeuIF_F0AwucHIrrOOeeTM89goEFwW1rM35x1U,2231
 hdl/utils/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hdl/utils/llm/chat.py,sha256=8j8g0pXGhrpFm16_XN7aNh2LqC0tqv-VlFLoNFDRzds,19639
+hdl/utils/llm/chat.py,sha256=9gVS-8mOk1DkV1wh7oJ0tghGwRmbDhOKCUqS-0_0ri4,19391
 hdl/utils/llm/chatgr.py,sha256=A9SCWAvQulgO2x0ArIqcmgd_iVWVbSi1Oj15Diwb3Ok,3743
 hdl/utils/llm/embs.py,sha256=Tf0FOYrOFZp7qQpEPiSCXzlgyHH0X9HVTUtsup74a9E,7174
 hdl/utils/llm/extract.py,sha256=2sK_WJzmYIc8iuWaM9DA6Nw3_6q1O4lJ5pKpcZo-bBA,6512
@@ -139,7 +139,7 @@ hdl/utils/schedulers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 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.58.dist-info/METADATA,sha256=-WN-hJT4OXfcJMDYFU9jeM0yddm58RWoInA-3siUjYk,836
-hjxdl-0.2.58.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-hjxdl-0.2.58.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.2.58.dist-info/RECORD,,
+hjxdl-0.2.60.dist-info/METADATA,sha256=EZGDifbUAx8In5vGxhs_Da-lT8AOYLe8COfaYDIB1R4,836
+hjxdl-0.2.60.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+hjxdl-0.2.60.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.2.60.dist-info/RECORD,,