hjxdl 0.1.45__py3-none-any.whl → 0.1.47__py3-none-any.whl

hdl/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.45'
-__version_tuple__ = version_tuple = (0, 1, 45)
+__version__ = version = '0.1.47'
+__version_tuple__ = version_tuple = (0, 1, 47)

hdl/utils/desc/func_desc.py

@@ -35,8 +35,8 @@ FN_DESC = {
 """,
     "web_search_text": """
 ## 函数名：web_search_text
-描述：在用户明确要联网查询回答他的问题时，调用此工具可以获得该问题联网搜索的相关内容
-触发条件：用户明确说明要“联网查询”他的问题，用户若没有提到“联网查询”，则不要调用此函数
+描述：在用户明确说要“联网查询”回答他的问题时，调用此工具可以获得该问题联网搜索的相关内容
+触发条件：用户的问题中有显式的“联网查询”字样，用户若没有提到“联网查询”，则不要调用此函数
 参数：
 # query_text (str): 从用户提的问题中获取，用于在网络中搜索信息
 # max_results (int, optional): 搜索条目的最大数目，若用户指定了数目，则使用用户指定的数目，若用户提问中没有指定，你需要在下面的json中"max_results"这一项指定为数值3。

hdl/utils/llm/chat.py

@@ -239,7 +239,11 @@ class OpenAI_M():
             else:
                 return self.invoke(prompt_final, **kwargs)
 
-    def get_decision(self, prompt: str, **kwargs: t.Any):
+    def get_decision(
+        self, prompt: str,
+        fn_template: str = FN_TEMPLATE,
+        **kwargs: t.Any,
+    ):
         """Get decision based on the given prompt.
 
         Args:
@@ -249,7 +253,7 @@ class OpenAI_M():
         Returns:
             str: The decision dictionary string.
         """
-        prompt_final = FN_TEMPLATE
+        prompt_final = fn_template
         for tool in self.tools:
             prompt_final += self.tool_desc.get(tool.__name__, "")
         prompt_final += f"\n用户的问题：\n{prompt}"
@@ -257,7 +261,12 @@ class OpenAI_M():
         print(decision_dict_str)
         return decision_dict_str
 
-    def get_tool_result(self, prompt: str, **kwargs: t.Any):
+    def get_tool_result(
+        self,
+        prompt: str,
+        fn_template: str = FN_TEMPLATE,
+        **kwargs: t.Any
+    ):
         """Get the result of a tool based on the decision made.
 
         Args:
@@ -267,7 +276,11 @@ class OpenAI_M():
         Returns:
             str: The result of the tool.
         """
-        decision_dict_str = self.get_decision(prompt, **kwargs)
+        decision_dict_str = self.get_decision(
+            prompt,
+            fn_template=fn_template,
+            **kwargs
+        )
         try:
             decision_dict = json.loads(decision_dict_str)
         except Exception as e:

{hjxdl-0.1.45.dist-info → hjxdl-0.1.47.dist-info}/METADATA

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

{hjxdl-0.1.45.dist-info → hjxdl-0.1.47.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=Wq8gp1wAPvML9GmilfTHL-8rajxUsgPqJsno4i1faiE,413
+hdl/_version.py,sha256=xX7fVpWWTim-wyb57fhTptOsrz9flE8OFM2w3qS96Q8,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,12 +122,12 @@ hdl/utils/database_tools/connect.py,sha256=KUnVG-8raifEJ_N0b3c8LkTTIfn9NIyw8LX6q
 hdl/utils/database_tools/datetime.py,sha256=xqE2xNiOpADzX-R8_bM0bioJRF3Ay9Jp1CAG6dy6uVI,1202
 hdl/utils/database_tools/web.py,sha256=vZJYWA02QbyUUMGLDX710cexn7RlfWeHa8YwK3UsDZ0,1934
 hdl/utils/desc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hdl/utils/desc/func_desc.py,sha256=7K9MlMExMh-GOLYnD_nTU69csWDkjR9D82UWqAp0zx8,1905
+hdl/utils/desc/func_desc.py,sha256=uFU61nZHE0TQce1YtpJWldXnH_CdskYmW2fDDQpToOA,1917
 hdl/utils/desc/template.py,sha256=a0UAkkKctt_EHY9UECsIIAwVkGPcM1Hr01HSkRMeIuw,1272
 hdl/utils/general/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/utils/general/glob.py,sha256=8-RCnt6L297wMIfn34ZAMCsGCZUjHG3MGglGZI1cX0g,491
 hdl/utils/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hdl/utils/llm/chat.py,sha256=Yo4moFbRk0y4XN7GkLvoQD9p-8XgR-mVj9LcYFGv-PE,10749
+hdl/utils/llm/chat.py,sha256=vz2lwPOPQKU83ckV6FixKHMen2OKpbJ5LJ2a8t2gt5Y,10953
 hdl/utils/llm/embs.py,sha256=Tf0FOYrOFZp7qQpEPiSCXzlgyHH0X9HVTUtsup74a9E,7174
 hdl/utils/llm/extract.py,sha256=2sK_WJzmYIc8iuWaM9DA6Nw3_6q1O4lJ5pKpcZo-bBA,6512
 hdl/utils/llm/llama_chat.py,sha256=watcHGOaz-bv3x-yDucYlGk5f8FiqfFhwWogrl334fk,4387
@@ -135,7 +135,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.1.45.dist-info/METADATA,sha256=ZpZIo5FOnlQBpjIbdc3Ea70YG_Tt_6l3Ubcyw_lTNfc,737
-hjxdl-0.1.45.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-hjxdl-0.1.45.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.1.45.dist-info/RECORD,,
+hjxdl-0.1.47.dist-info/METADATA,sha256=pUOZLYSfR0KYtX0T-6dUx4uigKMwTOc44Nf8XenyEys,737
+hjxdl-0.1.47.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+hjxdl-0.1.47.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.1.47.dist-info/RECORD,,