hjxdl 0.2.48__py3-none-any.whl → 0.2.50__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.48'
-__version_tuple__ = version_tuple = (0, 2, 48)
+__version__ = version = '0.2.50'
+__version_tuple__ = version_tuple = (0, 2, 50)

hdl/utils/llm/chat.py

@@ -162,6 +162,7 @@ class OpenAI_M():
         self,
         prompt,
         max_step: int = 30,
+        steps: list = None,
         **kwargs
     ):
         """_summary_
@@ -177,18 +178,19 @@ class OpenAI_M():
         current_info = ""
         # 初始化步数为0，用于控制最大思考次数
         n_steps = 0
-
-        # 初始化步骤列表，用于记录每一步的思考过程
-        steps = []
+        if steps is None:
+            steps = []
 
         # 进入思考循环，直到找到答案或达到最大步数
         while True:
+            # if steps is None:
+            #     steps = []
             # 增加步数计数
             n_steps += 1
             # 检查是否达到最大步数，如果是，则退出循环并返回默认答案
-            if n_steps >= max_step:
+            if n_steps > max_step:
                 print("Max step reached!")
-                return "Sorry, I can't think of a better answer."
+                return n_steps, current_info, steps
 
             # 调用思考函数，传入当前信息和用户问题，获取下一步思考的结果
             resp = self.invoke(
@@ -200,13 +202,12 @@ class OpenAI_M():
             try:
                 # 将思考结果解析为JSON格式，以便后续处理
                 step_json = json.loads(resp)
-                print(step_json)
+                # print(step_json)
                 # 将当前思考步骤添加到步骤列表中
                 steps.append(step_json)
                 # 如果思考步骤中标记为停止思考，则打印所有步骤并返回最终答案
-                if step_json["stop_thinking"]:
-                    # print(steps)
-                    return step_json["content"]
+                if step_json.get("stop_thinking", False):
+                    return n_steps, current_info, steps
                 else:
                     # 如果思考步骤中包含使用工具的指示，则构造工具提示并调用agent_response方法
                     if 'tool' in step_json:
@@ -221,6 +222,7 @@ class OpenAI_M():
                     else:
                         # 如果不使用工具，将当前思考步骤的标题累积到当前信息中
                         current_info += step_json["title"]
+                yield n_steps, current_info, steps
             except Exception as e:
                 # 捕获异常并打印，然后继续下一轮思考
                 print(e)
@@ -433,7 +435,6 @@ class OpenAI_M():
             sys_info=prompt_final,
             **kwargs
         )
-        print(decision_dict_str)
         return decision_dict_str
 
     def get_tool_result(

{hjxdl-0.2.48.dist-info → hjxdl-0.2.50.dist-info}/METADATA

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

{hjxdl-0.2.48.dist-info → hjxdl-0.2.50.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=wR5W_GoLYJj5Ko_OzDFXLOZvCrxuOlk00nAPekKOTz8,413
+hdl/_version.py,sha256=34xWIxw1CcxtrAJOLyXh5qZY-iyKN3yYvn-ykkzRDNo,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=uByk4wxBJWNorZ4Xct8yUBhv0nsgYc4I9UitMxdfOXI,19329
+hdl/utils/llm/chat.py,sha256=jmEe3BeIPhmihxnT14BMBn633qAQmNybiBh7SeqgKmU,19365
 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.48.dist-info/METADATA,sha256=wTP9nANv2SMbdmGAKMazjhx3x118rj0WpzdURZqfx34,836
-hjxdl-0.2.48.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-hjxdl-0.2.48.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.2.48.dist-info/RECORD,,
+hjxdl-0.2.50.dist-info/METADATA,sha256=z_08oieF5lRqIxod4ILHRRHl-7I3Pe_CT8riWct3x5s,836
+hjxdl-0.2.50.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+hjxdl-0.2.50.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.2.50.dist-info/RECORD,,