hjxdl 0.2.73__py3-none-any.whl → 0.2.74__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.73'
-__version_tuple__ = version_tuple = (0, 2, 73)
+__version__ = version = '0.2.74'
+__version_tuple__ = version_tuple = (0, 2, 74)

hdl/utils/llm/chat.py

@@ -32,25 +32,26 @@ def parse_fn_markdown(markdown_text, params_key="params"):
     result[params_key] = params
     return result
 
+import re
 def parse_cot_markdown(markdown_text):
     # 提取标题
     title_match = re.search(r"##\s*(.+)", markdown_text)
-    title = title_match.group(1) if title_match else None
-    title = title.replace("：", "").replace(":", "").replace(" ", "")
+    title = title_match.group(1) if title_match else ""
+    # title = title.replace("：", "").replace(":", "").replace(" ", "")
 
     # 提取工具
-    tool_match = re.search(r"tool\s*(.+)", markdown_text)
-    tool = tool_match.group(1) if tool_match else None
-    tool = tool.replace("：", "").replace(":", "").replace(" ", "")
+    tool_match = re.search(r"tool:\s*(.+)", markdown_text)
+    tool = tool_match.group(1).strip() if tool_match else ""
+    # tool = tool.replace("：", "").replace(":", "").replace(" ", "")
 
     # 提取内容
-    content_match = re.search(r"content\s*(.+)", markdown_text)
-    content = content_match.group(1) if content_match else None
-    content = content.replace("：", "").replace(":", "").replace(" ", "")
+    content_match = re.search(r"content:\s*(.+)", markdown_text)
+    content = content_match.group(1) if content_match else ""
+    # content = content.replace("：", "").replace(":", "").replace(" ", "")
 
     # 提取停止思考
-    stop_thinking_match = re.search(r"stop_thinking\s*(.+)", markdown_text)
-    stop_thinking = stop_thinking_match.group(1) == "true" or stop_thinking_match.group(1) == "True" if stop_thinking_match else None
+    stop_thinking_match = re.search(r"stop_thinking:\s*(.+)", markdown_text)
+    stop_thinking = stop_thinking_match.group(1) == "true" or stop_thinking_match.group(1) == "True" if stop_thinking_match else False
 
 
     # 组装为字典
@@ -257,7 +258,7 @@ class OpenAI_M():
                 # 如果思考步骤中标记为停止思考，则打印所有步骤并返回最终答案
 
                 # 如果思考步骤中包含使用工具的指示，则构造工具提示并调用agent_response方法
-                if 'tool' in step_json:
+                if 'tool' in step_json and step_json['tool']:
                     tool_prompt = step_json["tool"] \
                         + step_json.get("title", "") \
                         + step_json.get("content", "") \

{hjxdl-0.2.73.dist-info → hjxdl-0.2.74.dist-info}/METADATA

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

{hjxdl-0.2.73.dist-info → hjxdl-0.2.74.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=MBiORHoHoHj4L3NWGEoOFxRBCln52z6JTqGqERegVOU,413
+hdl/_version.py,sha256=7zvd2bmfCTUam4lXjgAH-RejI6fcPMX97tTWvBIxj3U,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=EFTk9PeVnqc51yU4b-HxsLwJyMA7dFMZBsdAa-VZ-sQ,2880
 hdl/utils/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hdl/utils/llm/chat.py,sha256=WukA2RgxR4IgJayrMQ1T1TlpD_Jhh8Ae9PjcNaVNTkY,21914
+hdl/utils/llm/chat.py,sha256=7_1JYsK7kKPkNacF0r3z_AKzQKvCveRsgTZFYKX1cMc,21958
 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.73.dist-info/METADATA,sha256=fgblAp6cPU81GpwXKojtZ-9e8juxH1ofGAmcYTjIYO0,836
-hjxdl-0.2.73.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-hjxdl-0.2.73.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.2.73.dist-info/RECORD,,
+hjxdl-0.2.74.dist-info/METADATA,sha256=Z7IBy74fwEm-3FRUbd3jyN9o2LJ_sRaWT29oVdFouFg,836
+hjxdl-0.2.74.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+hjxdl-0.2.74.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.2.74.dist-info/RECORD,,