hjxdl 0.2.44__py3-none-any.whl → 0.2.46__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.44'
-__version_tuple__ = version_tuple = (0, 2, 44)
+__version__ = version = '0.2.46'
+__version_tuple__ = version_tuple = (0, 2, 46)

hdl/utils/desc/func_desc.py

@@ -109,4 +109,135 @@ FN_DESC = {
 """,
 
     "default": None
+}
+
+
+TOOL_DESC = {
+
+    "get_weather":{
+        "desc": """
+## 函数名：get_weather
+描述：只有在用户询问一个城市的天气时，调用此工具获得此城市的天气信息
+参数：
+# city (str): 城市名
+返回值 (str)：天气信息
+        """,
+        "json": """
+需要返回的json
+{
+    "function_name": "get_weather",
+    "params":
+        {
+            "city": <city_name>
+        }
+}
+
+        """
+    },
+
+    "get_datetime_by_cityname": {
+        "desc": """
+## 函数名：get_datetime_by_cityname
+描述：只有在用户询问一个城市当前的日期或时间时，调用此工具可以获得此城市当前的日期和时间
+参数：
+# city (str): 城市名
+返回值 (str):这个城市当前所在时区的日期和时间
+        """,
+        "json": """
+需要给出的json
+{
+    "function_name": "get_datetime_by_cityname",
+    "params":
+        {
+            "city": <city_name>
+        }
+}
+        """
+    },
+
+    "execute_code": {
+        "desc": """
+## 函数名：execute_code,
+描述：当用户明确要求执行一段代码时，调用此工具，执行这段代码，返回执行结果。
+参数：
+# code (str): 用户要求执行的代码
+返回值 (str): 执行结果
+        """,
+        "json": """
+需要返回的json
+{
+    "function_name": "execute_code",
+    "params":
+        {
+            "code": <code>
+        }
+}
+        """
+    },
+
+    "calculate": {
+        "desc": """
+## 函数名：calculate，
+描述：当需要计算一个数学表达式时，调用此工具，计算这个表达式，返回计算结果。
+参数：
+# expression (str): 用户要求的数学表达式
+返回值 (str): 计算结果
+        """,
+        "json": """
+需要返回的json
+{
+    "function_name": "calculate",
+    "params":
+        {
+            "expression": <expression>
+        }
+}
+        """
+    },
+
+    "fetch_baidu_results": {
+        "desc": """
+## 函数名：fetch_baidu_results,
+描述：在用户明确要求查询网络上相关信息时，调用此工具，返回查询结果。
+参数：
+# query (str): 用户要求的查询内容
+# max_n_links (int, optional): 搜索条目的最大数目，若用户指定了数目，则使用用户指定的数目，若用户提问中没有指定，你需要在下面的json中"max_n_links"这一项指定为数值3。
+返回值 (str): 联网搜索到的信息
+        """,
+        "json": """
+需要返回的json
+{
+    "function_name": "fetch_baidu_results",
+        "params":
+        {
+            "query": <query from user question>,
+            "max_n_links": <num of max results, 如果用户没有要求，这一项则指定为3>
+        }
+}
+        """
+    },
+
+    "wolfram_alpha_calculate": {
+        "desc": """
+## 函数名：wolfram_alpha_calculate
+描述：当用户要求计算一个数学表达式时，调用此工具，计算这个表达式，返回计算结果。
+参数：
+# query (str): 用户要求的数学表达式，需要转换为英文，比如"integrate sin(x)"
+返回值 (str): 计算结果
+        """,
+        "json": """
+需要返回的json
+{
+    "function_name": "wolfram_alpha_calculate",
+    "params":
+        {
+            "query": <expression>
+        }
+}
+        """
+    },
+
+
+    "default": None
+
 }

hdl/utils/llm/chat.py

@@ -7,7 +7,7 @@ import subprocess
 
 from openai import OpenAI
 from ..desc.template import FN_TEMPLATE, COT_TEMPLATE
-from ..desc.func_desc import FN_DESC
+from ..desc.func_desc import TOOL_DESC
 import json
 # import traceback
 
@@ -114,6 +114,7 @@ class OpenAI_M():
         groq_api_key: str = None,
         tools: list = None,
         tool_desc: dict = None,
+        cot_desc: str = None,
         *args,
         **kwargs
     ):
@@ -136,13 +137,26 @@ class OpenAI_M():
                 **kwargs
             )
         self.tools: list = tools
-        self.tool_desc: dict = FN_DESC
+        self.tool_desc: dict = TOOL_DESC
         if tool_desc is not None:
             self.tool_desc = self.tool_desc | tool_desc
 
-        self.tool_desc_str = "\n".join(
-            [self.tool_desc.get(tool.__name__, "") for tool in self.tools]
-        )
+        self.tool_descs = [
+            self.tool_desc[tool.__name__]['desc']
+            for tool in self.tools
+        ]
+        self.tool_descs_verbose = [
+            self.tool_desc[tool.__name__]['desc']
+            + self.tool_desc[tool.__name__]['json']
+            for tool in self.tools
+        ]
+
+        self.tool_info = "\n".join(self.tool_descs)
+        self.tool_desc_str = "\n".join(self.tool_descs_verbose)
+
+        self.cot_desc = cot_desc
+        if not self.cot_desc:
+            self.cot_desc = COT_TEMPLATE
 
     def get_thought_chain(
         self,

{hjxdl-0.2.44.dist-info → hjxdl-0.2.46.dist-info}/METADATA

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

{hjxdl-0.2.44.dist-info → hjxdl-0.2.46.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=HXw408cvze-TyvbbtlhRTPChKWOXHhYwJR9ejOvpmLE,413
+hdl/_version.py,sha256=FJ1FAK3elIMCAdZny85iRWTGI-xB736Y-r-Yr7pOWg4,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=nQdFV-b_xCwlgD6RVPLzh0jowRqmlJ1RaJZd_7ACi30,3192
+hdl/utils/desc/func_desc.py,sha256=Y8Aj3vR2aU-SXVS-UC4w7yDTAw8AbkkPWwNA8vpHMJ8,6423
 hdl/utils/desc/template.py,sha256=09wnkMgg4Kxtl7zbsvQe61DilRDRUb-In5Qbi3809DY,2216
 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/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hdl/utils/llm/chat.py,sha256=GyHyQpFx5PbV9tjo3nJYhfB3tpx9Jl8m7IF4neQdLfQ,16313
+hdl/utils/llm/chat.py,sha256=KaXWFB1FddtpMwhSdPrdNJLsmHC9xc6wQU8NOR07DmM,16750
 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.44.dist-info/METADATA,sha256=0T4y6S76GoXy25uu5O8QHmAgZX3NoEzlVFR_oLgQVoc,836
-hjxdl-0.2.44.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-hjxdl-0.2.44.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.2.44.dist-info/RECORD,,
+hjxdl-0.2.46.dist-info/METADATA,sha256=uvPbmQ4GOw2FqSbRtguOClwJgwKB8Akfu10-kORtKr0,836
+hjxdl-0.2.46.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+hjxdl-0.2.46.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.2.46.dist-info/RECORD,,