hjxdl 0.1.27__py3-none-any.whl → 0.1.29__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.27'
-__version_tuple__ = version_tuple = (0, 1, 27)
+__version__ = version = '0.1.29'
+__version_tuple__ = version_tuple = (0, 1, 29)

hdl/utils/database_tools/datetime.py

@@ -31,4 +31,6 @@ def get_datetime_by_cityname(city):
     city_time = datetime.now(timezone)
 
     # 返回格式化的日期时间字符串
-    return city_time.strftime('%Y年%m月%d日 %H:%M:%S')
+    time_str = city_time.strftime('%Y年%m月%d日 %H:%M:%S')
+    time_str = f"{city}现在的时间为" + time_str
+    return time_str

hdl/utils/llm/chat.py

@@ -338,9 +338,10 @@ class OpenAI_M():
             prompt_final += self.tool_desc.get(tool.__name__, "")
         prompt_final += f"\n用户的问题：\n{prompt}"
         # print(prompt_final)
-        decision_dict = self.invoke(prompt_final ,**kwargs)
-        print(decision_dict)
-        return json.loads(decision_dict)
+        decision_dict_str = self.invoke(prompt_final ,**kwargs)
+        print(decision_dict_str)
+        return decision_dict_str
+        # return json.loads(decision_dict)
 
     def get_tool_result(
         self,
@@ -356,11 +357,16 @@ class OpenAI_M():
             Returns:
                 str: The result from the selected tool based on the decision made.
         """
-        decision_dict = self.get_decision(prompt, **kwargs)
-        if decision_dict.get("function_name", None) is None:
+        decision_dict_str = self.get_decision(prompt, **kwargs)
+        try:
+            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 ""
         else:
-            func_name = decision_dict.get("function_name")
             for tool in self.tools:
                 if tool.__name__ == func_name:
                     tool_final = tool

{hjxdl-0.1.27.dist-info → hjxdl-0.1.29.dist-info}/METADATA

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

{hjxdl-0.1.27.dist-info → hjxdl-0.1.29.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=tHeS3HtGOzmDSunNF55dcMNc08kUUPbj6IDY1JKJNiY,413
+hdl/_version.py,sha256=OHpNA7X_RAuqw1s16eSZavcL1LorjeHfMudO67EF1vU,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
@@ -119,21 +119,21 @@ hdl/utils/chemical_tools/query_info.py,sha256=wyQXwKSY_gBGVUNvYggHpYBtOLAtpYKq3P
 hdl/utils/chemical_tools/sdf.py,sha256=71PEqU0H885L6IeGHEa6n7ZLZThvMsZOVLuFG2wnoyM,542
 hdl/utils/database_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/utils/database_tools/connect.py,sha256=KUnVG-8raifEJ_N0b3c8LkTTIfn9NIyw8LX6qvpA3YU,723
-hdl/utils/database_tools/datetime.py,sha256=DI72G_FZ_iOs4QLSakIwU_K5IviPvn4DR2abUG1rBEA,1124
+hdl/utils/database_tools/datetime.py,sha256=xqE2xNiOpADzX-R8_bM0bioJRF3Ay9Jp1CAG6dy6uVI,1202
 hdl/utils/desc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/utils/desc/func_desc.py,sha256=Bzx0faxgaiNBpzJenPSi98KNGfNTELOHYBQlT-45g0c,824
 hdl/utils/desc/template.py,sha256=9nvsBa8uPsDLrp78ulK_romT30hpGr19cnaoSabBst8,1121
 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=LH595PmR0MfFPD5XKff93FOxdL2aQQSt6VjR9nyksqU,13414
+hdl/utils/llm/chat.py,sha256=t2o4jMNPmhdOPyxjsu5G_HfmIEO5M4ZktHa1gMKy6hE,13577
 hdl/utils/llm/embs.py,sha256=Tf0FOYrOFZp7qQpEPiSCXzlgyHH0X9HVTUtsup74a9E,7174
 hdl/utils/llm/extract.py,sha256=2sK_WJzmYIc8iuWaM9DA6Nw3_6q1O4lJ5pKpcZo-bBA,6512
 hdl/utils/schedulers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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.27.dist-info/METADATA,sha256=QgqnqWz5dj_T1FP9diDT6vC3JDhgjR8-D3X5DBtbuPc,698
-hjxdl-0.1.27.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-hjxdl-0.1.27.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.1.27.dist-info/RECORD,,
+hjxdl-0.1.29.dist-info/METADATA,sha256=edk8O5YjI4t0yDwND9vLi-LyHy-DdQUEqKorkFHX-dw,698
+hjxdl-0.1.29.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+hjxdl-0.1.29.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.1.29.dist-info/RECORD,,