hjxdl 0.1.26__py3-none-any.whl → 0.1.28__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.26'
-__version_tuple__ = version_tuple = (0, 1, 26)
+__version__ = version = '0.1.28'
+__version_tuple__ = version_tuple = (0, 1, 28)

hdl/utils/database_tools/datetime.py

@@ -0,0 +1,34 @@
+from geopy.geocoders import Nominatim
+from timezonefinder import TimezoneFinder
+from datetime import datetime
+import pytz
+
+def get_datetime_by_cityname(city):
+    """Get current date and time of a city based on its name.
+
+    Args:
+        city_name (str): The name of the city to get date and time for.
+
+    Returns:
+        str: Formatted date and time string in the format '%Y年%m月%d日 %H:%M:%S'.
+    """
+    # 使用 Nominatim API 通过城市名称获取地理坐标
+    geolocator = Nominatim(user_agent="city_time_locator")
+    location = geolocator.geocode(city)
+
+    if not location:
+        return f"无法找到城市 '{city}'，请检查输入的城市名称。"
+
+    # 使用地理坐标获取时区
+    tf = TimezoneFinder()
+    timezone_name = tf.timezone_at(lng=location.longitude, lat=location.latitude)
+
+    if not timezone_name:
+        return f"无法找到城市 '{city}' 的时区。"
+
+    # 获取当前时间
+    timezone = pytz.timezone(timezone_name)
+    city_time = datetime.now(timezone)
+
+    # 返回格式化的日期时间字符串
+    return city_time.strftime('%Y年%m月%d日 %H:%M:%S')

hdl/utils/desc/func_desc.py

@@ -1,10 +1,10 @@
 FN_DESC = {
     "get_weather": """
 ## 函数名：get_weather
-描述：在用户询问天气时，获得一个城市的天气信息
+描述：在用户询问一个城市的天气时，调用此工具获得此城市的天气信息
 参数：
 # city (str): 城市名
-返回值：天气信息
+返回值 (str)：天气信息
 需要返回的json
 {
     "function_name": "get_weather",
@@ -13,6 +13,23 @@ FN_DESC = {
             "city": <city_name>
         }
 }
+
+""",
+    "get_datetime_by_cityname": """
+## 函数名：get_datetime_by_cityname
+描述：在用户询问一个城市当前的日期或时间时，调用此工具可以获得此城市当前的日期和时间
+参数：
+# city (str): 城市名
+返回值 (str):这个城市当前所在时区的日期和时间
+需要返回的json
+{
+    "function_name": "get_datetime_by_cityname",
+    "params":
+        {
+            "city": <city_name>
+        }
+}
+
 """,
     "default": None
 }

hdl/utils/desc/template.py

@@ -12,7 +12,7 @@ FN_TEMPLATE = """
 }
 
 ### 函数：
-以下是可用于与系统交互的函数列表，每个函数以 “##” 作为标记开始，每个参数会以 “#” 作为标记。
-每个函数都有特定的参数和要求说明，确保仔细遵循每个功能的说明。根据最后用户的问题判断要执行的任务选择合适的一个函数。以JSON格式提供函数调用，其中参数的具体值从用户的提问中获取，并且不能带“<>”符号：
+以下是可用于与系统交互的函数列表，每个函数以 “##” 作为标记开始，每个参数名会以 “#” 作为标记。
+每个函数都有特定的参数和要求说明，确保仔细遵循每个功能的说明。根据最后用户的问题判断要执行的任务选择合适的一个函数。以说明中的JSON格式提供函数调用所需要的参数，其中参数的具体值从用户的提问中获取，并且不能带“<>”符号：
 
 """

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.26.dist-info → hjxdl-0.1.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hjxdl
-Version: 0.1.26
+Version: 0.1.28
 Summary: A collection of functions for Jupyter notebooks
 Home-page: https://github.com/huluxiaohuowa/hdl
 Author: Jianxing Hu
@@ -14,6 +14,9 @@ Requires-Dist: beautifulsoup4
 Requires-Dist: openai
 Requires-Dist: tqdm
 Requires-Dist: sentence-transformers
+Requires-Dist: geopy
+Requires-Dist: timezonefinder
+Requires-Dist: pytz
 
 # DL framework by Jianxing
 

{hjxdl-0.1.26.dist-info → hjxdl-0.1.28.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=pHptU6h1OxA8-tsynXa5Rz3N6XELevZ_27Ye-N1R-ds,413
+hdl/_version.py,sha256=czamedKDPdID6jwrfoRJ6f0nNLIJgtaG2Cva3WfGB5Q,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,20 +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/desc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hdl/utils/desc/func_desc.py,sha256=XIFKjemokulEU6C347vNCuelrrEXu7E4dEeD8tsC8sc,343
-hdl/utils/desc/template.py,sha256=uKPGIgYFgSY4uBvfsbh5fZN7s39NdGQ2XSVH3pIpsuc,1088
+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.26.dist-info/METADATA,sha256=mG6nvKosLF2q7cuIYTDmGvQ1PZMXTgJTzr9NB4PvpD0,627
-hjxdl-0.1.26.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-hjxdl-0.1.26.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.1.26.dist-info/RECORD,,
+hjxdl-0.1.28.dist-info/METADATA,sha256=3bN0Gxfv6mZINQV35KqRw0y2Hn5aR4RdsAqlRDRIH5o,698
+hjxdl-0.1.28.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+hjxdl-0.1.28.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.1.28.dist-info/RECORD,,