hjxdl 0.2.78__py3-none-any.whl → 0.2.80__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.78'
-__version_tuple__ = version_tuple = (0, 2, 78)
+__version__ = version = '0.2.80'
+__version_tuple__ = version_tuple = (0, 2, 80)

hdl/utils/llm/chat.py

@@ -53,16 +53,20 @@ def parse_fn_markdown(markdown_text, params_key="params"):
     return result
 
 def parse_cot_markdown(markdown_text):
-    # 使用正则提取各部分内容，支持跨行提取
-    title_match = re.search(r"##\s*(.+?)(?:\n|$)", markdown_text, re.DOTALL)
-    tool_match = re.search(r"-\s*tool\s*[:：]\s*(.+?)(?:\n|$)", markdown_text, re.DOTALL)
-    content_match = re.search(r"-\s*content\s*[:：]\s*(.+?)(?:\n|$)", markdown_text, re.DOTALL)
-    stop_thinking_match = re.search(r"-\s*stop_thinking\s*[:：]\s*(.+?)(?:\n|$)", markdown_text, re.DOTALL)
-
-    # 提取匹配结果并清理多余的空白字符
+    # 提取标题（支持跨行）
+    title_match = re.search(r"##\s*(.+?)(?=\n-|\Z)", markdown_text, re.DOTALL)
     title = title_match.group(1).strip() if title_match else ""
+
+    # 提取工具
+    tool_match = re.search(r"-\s*tool\s*[:：]\s*(.+?)(?=\n-|\Z)", markdown_text, re.DOTALL)
     tool = tool_match.group(1).strip() if tool_match else ""
+
+    # 提取内容（支持跨行）
+    content_match = re.search(r"-\s*content\s*[:：]\s*(.+?)(?=\n-|\Z)", markdown_text, re.DOTALL)
     content = content_match.group(1).strip() if content_match else ""
+
+    # 提取停止思考
+    stop_thinking_match = re.search(r"-\s*stop_thinking\s*[:：]\s*(.+?)(?=\n-|\Z)", markdown_text, re.DOTALL)
     stop_thinking = stop_thinking_match.group(1).strip().lower() in ["true"] if stop_thinking_match else False
 
     # 返回解析结果的字典
@@ -392,9 +396,9 @@ class OpenAI_M():
         decision_dict = self.get_decision(prompt, **kwargs)
         decision_dict = parse_fn_markdown(decision_dict)
         if decision_dict.get("function_name", None) is None:
-            return self.stream(prompt, **kwargs)
+            return self.chat(prompt=prompt, stream=stream, **kwargs)
         else:
-            tool_result = str(self.get_tool_result(prompt, **kwargs))
+            tool_result = str(self.get_tool_result(decision_dict))
             prompt_final = "根据上下文回答最后的用户问题：\n上下文信息：\n"
             prompt_final += tool_result
             # prompt_final += f"\n用户的问题：\n{prompt}"
@@ -441,8 +445,7 @@ class OpenAI_M():
 
     def get_tool_result(
         self,
-        prompt: str,
-        **kwargs: t.Any
+        decision_dict: dict,
     ):
         """Get the result of a tool based on the decision made.
 
@@ -453,16 +456,16 @@ class OpenAI_M():
         Returns:
             str: The result of the tool.
         """
-        decision_dict_str = self.get_decision(
-            prompt,
-            **kwargs
-        )
-        try:
-            decision_dict = parse_fn_markdown(decision_dict_str)
-            # decision_dict = json.loads(decision_dict_str)
-        except Exception as e:
-            print(e)
-            return ""
+        # decision_dict_str = self.get_decision(
+        #     prompt,
+        #     **kwargs
+        # )
+        # try:
+        #     decision_dict = parse_fn_markdown(decision_dict_str)
+        #     # decision_dict = json.loads(decision_dict_str)
+        # except Exception as e:
+        #     print(e)
+        #     return ""
         func_name = decision_dict.get("function_name", None)
         if func_name is None:
             return ""

{hjxdl-0.2.78.dist-info → hjxdl-0.2.80.dist-info}/METADATA

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

{hjxdl-0.2.78.dist-info → hjxdl-0.2.80.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=bBGZMi5qwggklJx8aXckT7-LP59P2VUgjfcbOu4H75E,413
+hdl/_version.py,sha256=dMhu6bTZ2DnK2Ao7umsywyrYd1I_j8b4qEG947KjLAc,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=rb9SOTDUuXPtXN0_mA7e9ihc_2UbvjrXOKqM5-rSfJU,20425
+hdl/utils/llm/chat.py,sha256=MoOI80SPQUkgGob09XLKuPV5DwDJ0yG8e8wgBsYWmXA,20458
 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.78.dist-info/METADATA,sha256=R7TNNU-_VYPgM5TfV7Uq4c3iBI0pqNGXNlA_BPdyf2c,836
-hjxdl-0.2.78.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-hjxdl-0.2.78.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.2.78.dist-info/RECORD,,
+hjxdl-0.2.80.dist-info/METADATA,sha256=AzpsfvWDd8RKp3inYLv7qZt_qJueTUPAiaBCqlQO2aw,836
+hjxdl-0.2.80.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+hjxdl-0.2.80.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.2.80.dist-info/RECORD,,