hjxdl 0.2.61__py3-none-any.whl → 0.2.63__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.61'
-__version_tuple__ = version_tuple = (0, 2, 61)
+__version__ = version = '0.2.63'
+__version_tuple__ = version_tuple = (0, 2, 63)

hdl/utils/desc/func_desc.py

@@ -123,6 +123,25 @@ TOOL_DESC = {
         """
     },
 
+    "count_character_occurrences": """
+## 函数名：count_character_occurrences
+描述：当用户要求计算一段文本中某个字符出现的次数时，调用此工具，返回计算结果。
+参数：
+# text (str): 输入的单词或句子
+# char (str): 要统计的字符
+返回值 (str): 字符在文本中出现的次数
+""",
+    "json": """
+需要返回的json
+{
+    "function_name": "count_character_occurrences",
+    "params":
+        {
+            "text": <str>,
+            "char": <str>
+        }
+}
+""",
 
     "default": None
 

hdl/utils/general/runners.py

@@ -57,4 +57,24 @@ def calculate(expression):
         return eval(expression, {"__builtins__": None}, {"math": math})
     except Exception as e:
         # Return the error message if an exception occurs
-        return f"Error: {str(e)}"
+        return f"Error: {str(e)}"
+
+def count_character_occurrences(text, char):
+    """
+    统计文本中某个字符出现的次数
+
+    Args:
+        text (str): 输入的单词或句子
+        char (str): 要统计的字符（仅支持单个字符）
+
+    Returns:
+        int: 字符在文本中出现的次数
+    """
+    if not isinstance(text, str):
+        raise ValueError("输入的文本必须是字符串类型")
+    if not isinstance(char, str) or len(char) != 1:
+        raise ValueError("要统计的字符必须是一个单字符的字符串")
+    text = text.lower()
+    char = char.lower()
+
+    return f"{text} 中 {char} 共出现了 {text.count(char)} 次。"

hdl/utils/llm/chat.py

@@ -209,7 +209,10 @@ class OpenAI_M():
 
                 # 如果思考步骤中包含使用工具的指示，则构造工具提示并调用agent_response方法
                 if 'tool' in step_json:
-                    tool_prompt = step_json["tool"] + step_json["title"] + step_json["content"]
+                    tool_prompt = step_json["tool"] \
+                        + step_json.get("title", "") \
+                        + step_json.get("content", "")
+
                     tool_resp = self.agent_response(
                         tool_prompt,
                         stream=False,
@@ -219,15 +222,17 @@ class OpenAI_M():
                     current_info += f"\n{tool_resp}"
                 else:
                     if step_json.get("stop_thinking", False):
-                        current_info += f"\n{step_json['content']}"
+                        current_info += f"\n{step_json.get("content", "")}"
                         yield n_steps, current_info, steps
                         return
                     # 如果不使用工具，将当前思考步骤的标题累积到当前信息中
                     else:
-                        current_info += f"\n{step_json["title"]}"
+                        current_info += f"\n{step_json.get("title", "")}"
+                        current_info += f"\n{step_json.get("content", "")}"
 
                 if step_json.get("stop_thinking", False):
-                    current_info += f"\n{step_json['content']}"
+                    current_info += f"\n{step_json.get("title", "")}"
+                    current_info += f"\n{step_json.get("content", "")}"
                     yield n_steps, current_info, steps
                     return
                 yield n_steps, current_info, steps

{hjxdl-0.2.61.dist-info → hjxdl-0.2.63.dist-info}/METADATA

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

{hjxdl-0.2.61.dist-info → hjxdl-0.2.63.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=RdvBwcrYbn4XdqxE-4Ejv6N3YN2-sSOk11rLcc7RZz4,413
+hdl/_version.py,sha256=IkEyuoiuKejEh6m8aIcw1J0b15KlDNu6rsujEk85mpQ,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
@@ -122,13 +122,13 @@ hdl/utils/database_tools/connect.py,sha256=xCacGucKxlQUXs6AsNddpeECvdqT1180V1ZWq
 hdl/utils/database_tools/datetime.py,sha256=xqE2xNiOpADzX-R8_bM0bioJRF3Ay9Jp1CAG6dy6uVI,1202
 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=6p4SMubL-sCITepXlvdOVerkwpJ7K3F7mSzsb78Res4,3359
+hdl/utils/desc/func_desc.py,sha256=sgIyOjzoI1aUCM88q8-SefJXcKuhERmsFdZAt7shzjM,3881
 hdl/utils/desc/template.py,sha256=WcoyRDfLzYCwhV9MGnisjdjAeiFr0z8iZ7dSrol7Je0,2121
 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=aWvEXYeuIF_F0AwucHIrrOOeeTM89goEFwW1rM35x1U,2231
+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=uQYZVygaGxKXtKpf6QpEFWHcnKSszNU7FZ4jO3ITXK8,19641
+hdl/utils/llm/chat.py,sha256=_BRXpUWT1du-hHkFJNb9ob-D9_1PEI8DIZsI4-yBl48,19880
 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.61.dist-info/METADATA,sha256=o4wfM6pV8mLLZl4u42y1eDNnZ2U7v1E_489aF7Ph5zo,836
-hjxdl-0.2.61.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-hjxdl-0.2.61.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.2.61.dist-info/RECORD,,
+hjxdl-0.2.63.dist-info/METADATA,sha256=pIzg-5xu-13P4Av5i44p5h-exSFMvgP9iPcaIZpgezk,836
+hjxdl-0.2.63.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+hjxdl-0.2.63.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.2.63.dist-info/RECORD,,