hjxdl 0.2.67__py3-none-any.whl → 0.2.69__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.67'
-__version_tuple__ = version_tuple = (0, 2, 67)
+__version__ = version = '0.2.69'
+__version_tuple__ = version_tuple = (0, 2, 69)

hdl/utils/desc/template.py

@@ -20,7 +20,9 @@ FN_TEMPLATE = """
 COT_TEMPLATE = """
 你是一个专家级AI助手，有能针对一个问题和当前解决到的步骤给出下一步该进行操作的能力。
 以JSON格式回复，该步骤对应的 json 包括'title'、'tool', 'content'和'stop_thinking',
-若已有的信息可以回答用户问题，则'stop_thinking'键的值为 true 并把答案写在'content'键的值中，若还需要下一步操作，'stop_thinking'键的则为 false 并在 'title' 键对应的值中给出该进行的操作；
+若已有的信息不合理或者针对用户的问题提供的信息有错误，则'stop_thinking'键的值为 false 并且继续思考过程。
+若还需要下一步操作，'stop_thinking'键的则为 false 并在 'title' 键对应的值中给出该进行的操作；
+若已有的信息足够回答用户问题，则'stop_thinking'键的值为 true 并把答案写在'content'键的值中。
 若本步骤的操作不需要调用下文中提到的工具或信息足够回答用户问题，而不必包含'tool'键，若需要调用下文中的工具，则必须包含'tool'键，并且其值是工具函数名称。
 你的回答中应只能是 json 格式，且不能包含其他多余文字不能有格式错误。
 

hdl/utils/llm/chat.py

@@ -3,6 +3,7 @@ import asyncio
 import os
 from concurrent.futures import ProcessPoolExecutor
 import subprocess
+from typing import Generator
 
 
 from openai import OpenAI
@@ -219,6 +220,8 @@ class OpenAI_M():
                         stream=False,
                         **kwargs
                     )
+                    if isinstance(tool_resp, Generator):
+                        tool_resp = "".join(tool_resp)
                     # 将工具返回的信息累积到当前信息中
                     current_info += f"\n{tool_resp}"
                 else:

{hjxdl-0.2.67.dist-info → hjxdl-0.2.69.dist-info}/METADATA

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

{hjxdl-0.2.67.dist-info → hjxdl-0.2.69.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=9CvYYsCZPgS_4Fx2UNAnynV41xPAL3ccPB_t-7Zm_04,413
+hdl/_version.py,sha256=0BrVbMbI1qfQT885_gTZtJUc2HKT2Z0Ict98w7gHA8A,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
@@ -123,12 +123,12 @@ hdl/utils/database_tools/datetime.py,sha256=xqE2xNiOpADzX-R8_bM0bioJRF3Ay9Jp1CAG
 hdl/utils/database_tools/web.py,sha256=PJ7R1chUD-vz-Up0orfFqdrZq3CFOlwiO9gIjFSb-R8,5224
 hdl/utils/desc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/utils/desc/func_desc.py,sha256=DDbcLIW-2Hk_WSRg2NO8PF7S338PmbssGcjvMa_P8Dk,3905
-hdl/utils/desc/template.py,sha256=WcoyRDfLzYCwhV9MGnisjdjAeiFr0z8iZ7dSrol7Je0,2121
+hdl/utils/desc/template.py,sha256=sLxKDJmIKytpYLFfGLEjtbrod45MJeTW28KENlOaFmM,2268
 hdl/utils/general/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/utils/general/glob.py,sha256=8-RCnt6L297wMIfn34ZAMCsGCZUjHG3MGglGZI1cX0g,491
 hdl/utils/general/runners.py,sha256=EFTk9PeVnqc51yU4b-HxsLwJyMA7dFMZBsdAa-VZ-sQ,2880
 hdl/utils/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hdl/utils/llm/chat.py,sha256=YsSVioSTArrlsWzUE7CuUouI2O2xrFqgsvUVHugTzY0,19985
+hdl/utils/llm/chat.py,sha256=f4hxeZG9stwO9pmlCW6ki-R3V-NOCJF7dgn0mTHCeCo,20126
 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.67.dist-info/METADATA,sha256=h8Zx5uK0rp8eqNsEzzT5fLZtSOyFnxTs0O78Bt6dwek,836
-hjxdl-0.2.67.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-hjxdl-0.2.67.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.2.67.dist-info/RECORD,,
+hjxdl-0.2.69.dist-info/METADATA,sha256=6FzyJz473la7so77ZHS8QXwnrzLoHKGnlzBhIGPu9l0,836
+hjxdl-0.2.69.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+hjxdl-0.2.69.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.2.69.dist-info/RECORD,,