hjxdl 0.1.16__py3-none-any.whl → 0.1.17__py3-none-any.whl

hdl/__init__.py

@@ -1,2 +1,2 @@
 from ._version import *
-from ._version import __version__ as __version
+# from ._version import __version__ as __version

hdl/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.16'
-__version_tuple__ = version_tuple = (0, 1, 16)
+__version__ = version = '0.1.17'
+__version_tuple__ = version_tuple = (0, 1, 17)

hdl/datasets/city_embs.npy

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b85aa7ade957da8f6dd546671bea47226a5427a0908b4588a186bac5d66654e3
+size 5267584

hdl/utils/desc/func_desc.py

@@ -0,0 +1,18 @@
+FN_DESC = {
+    "get_weather": """
+## 函数名：get_weather
+描述：获得一个城市的天气信息
+参数：
+# city (str): 城市名
+返回值：天气信息
+需要返回的json
+{
+    "function_name": "get_weather",
+    "params":
+        {
+            "city": <city_name>
+        }
+}
+""",
+    "default": None
+}

hdl/utils/desc/template.py

@@ -0,0 +1,18 @@
+FN_TEMPLATE = """
+
+你是一个可以调用函数来执行任务的人工智能助手，根据用户最后的问题来决定是否调用函数
+
+若要调用函数，需要使用包含两个字段的JSON对象进行响应，并且不应包含其他多余文字，避免出现格式化问题：
+
+"function_name"：需要要调用的函数的名称。
+"params"：函数所需的参数。执行函数调用后，您将收到一个包含函数调用返回值的响应。
+
+若不需要调用函数，则返回如下字典，并且不应包含其他多余文字，避免出现格式化问题：
+{
+    "function_name": null
+}
+
+### 函数：
+以下是可用于与系统交互的函数列表，每个函数以 “##” 作为标记开始，每个参数会以 “#” 作为标记。
+每个功能都有特定的参数和要求。确保仔细遵循每个功能的说明。根据您想要执行的任务选择合适的功能。以JSON格式提供函数调用，其中参数的具体值从用户的提问中获取，并且不能带“<>”符号：
+"""

hdl/utils/llm/chat.py

@@ -2,6 +2,9 @@ import typing as t
 
 from llama_cpp import Llama
 from openai import OpenAI
+from ..desc.template import FN_TEMPLATE
+from ..desc.func_desc import FN_DESC
+import json
 # import traceback
 
 
@@ -14,16 +17,16 @@ def chat_oai_stream(
     **kwargs
 ):
     """Chat with OpenAI's GPT-3 model using the specified parameters.
-    
+
     Args:
         base_url (str): The base URL for the OpenAI API. Default is "http://127.0.0.1:8000/v1".
         api_key (str): The API key for accessing the OpenAI API. Default is "dummy_key".
         model (str): The model ID to use for the chat. Default is "/data/models/Qwen-7B-Chat-Int4".
         prompt (str): The initial prompt for the chat conversation.
-    
+
     Yields:
         str: The generated content from the chat conversation.
-    
+
     """
     client = OpenAI(
         base_url=base_url,
@@ -39,7 +42,7 @@ def chat_oai_stream(
         *args,
         **kwargs
     )
-    
+
     for chunk in response:
         content = chunk.choices[0].delta.content
         yield content
@@ -54,13 +57,13 @@ def chat_oai_invoke(
     **kwargs
 ):
     """Invoke OpenAI chat API to generate a response based on the given prompt.
-    
+
     Args:
         base_url (str): The base URL of the OpenAI API. Default is "http://127.0.0.1:8000/v1".
         api_key (str): The API key for accessing the OpenAI API. Default is "dummy_key".
         model (str): The model to use for generating the response. Default is "/data/models/Qwen-7B-Chat-Int4".
         prompt (str): The prompt message to start the conversation. Default is "Who are you?".
-    
+
     Returns:
         str: The response generated by the OpenAI chat API based on the prompt.
     """
@@ -78,7 +81,7 @@ def chat_oai_invoke(
         *args,
         **kwargs
     )
-    
+
     return response.choices[0].message.content
 
 
@@ -94,7 +97,7 @@ class GGUF_M(Llama):
         **kwargs
     ):
         """Initialize the model with the specified parameters.
-        
+
         Args:
             model_path (str): The path to the model.
             device (str, optional): The device to use, either 'gpu' or 'cpu'. Defaults to 'gpu'.
@@ -103,12 +106,12 @@ class GGUF_M(Llama):
             server_port (int, optional): The port of the server. Defaults to 8000.
             *args: Variable length argument list.
             **kwargs: Arbitrary keyword arguments.
-        
+
         Raises:
             KeyError: If 'num_threads' or 'max_context_length' is missing in generation_kwargs.
         """
         print("正在从本地加载模型...")
-        if device.lower() == 'cpu': 
+        if device.lower() == 'cpu':
             super().__init__(
                 model_path=model_path,
                 n_threads=generation_kwargs['num_threads'],
@@ -129,23 +132,23 @@ class GGUF_M(Llama):
         self.generation_kwargs = generation_kwargs
 
     def invoke(
-        self, 
+        self,
         prompt : str,
         stop: list[str] | None = ["USER:", "ASSISTANT:"],
         # history: list = [],
         **kwargs: t.Any,
     ) -> str:
         """Invoke the model to generate a response based on the given prompt.
-        
+
         Args:
             prompt (str): The prompt to be used for generating the response.
             stop (list[str], optional): List of strings that indicate when the model should stop generating the response. Defaults to ["USER:", "ASSISTANT:"].
             **kwargs: Additional keyword arguments to be passed to the model.
-        
+
         Returns:
             str: The generated response based on the prompt.
         """
-        prompt_final = f"USER:\n{prompt}\nASSISTANT:\n" 
+        prompt_final = f"USER:\n{prompt}\nASSISTANT:\n"
 
         result = self.create_completion(
             prompt_final,
@@ -172,20 +175,20 @@ class GGUF_M(Llama):
         **kwargs: t.Any,
     ):
         """Generate text responses based on the given prompt using the model.
-        
+
         Args:
             prompt (str): The prompt to generate text responses.
             stop (list[str], optional): List of strings to stop the generation. Defaults to ["USER:", "ASSISTANT:"].
             **kwargs: Additional keyword arguments for the model.
-        
+
         Yields:
             str: Text responses generated by the model based on the prompt.
         """
-        prompt = f"USER:\n{prompt}\nASSISTANT:\n" 
+        prompt = f"USER:\n{prompt}\nASSISTANT:\n"
         output = self.create_completion(
             prompt,
             stream=True,
-            repeat_penalty=self.generation_kwargs["repetition_penalty"], 
+            repeat_penalty=self.generation_kwargs["repetition_penalty"],
             max_tokens=self.generation_kwargs["max_new_tokens"],
             stop=stop,
             echo=False,
@@ -212,14 +215,14 @@ class GGUF_M(Llama):
 #         server_port: int = 8000,
 #     ):
 #         """Initialize the model with the provided model path and optional parameters.
-        
+
 #         Args:
 #             model_path (str): The path to the model.
 #             device (str, optional): The device to use for model initialization. Defaults to 'gpu'.
 #             generation_kwargs (dict, optional): Additional keyword arguments for model generation. Defaults to {}.
 #             server_ip (str, optional): The IP address of the server. Defaults to "127.0.0.1".
 #             server_port (int, optional): The port of the server. Defaults to 8000.
-#         """ 
+#         """
 #         # 从本地初始化模型
 #         # super().__init__()
 #         self.generation_kwargs = generation_kwargs
@@ -238,27 +241,27 @@ class GGUF_M(Llama):
 #                 n_gpu_layers=-1,
 #                 flash_attn=True
 #             )
-            
+
 #         print("完成本地模型的加载")
 
 #     def invoke(
-#         self, 
+#         self,
 #         prompt : str,
 #         stop: list[str] | None = ["USER:", "ASSISTANT:"],
 #         # history: list = [],
 #         **kwargs: t.Any,
 #     ) -> str:
 #         """Invoke the model to generate a response based on the given prompt.
-        
+
 #         Args:
 #             prompt (str): The prompt to be used for generating the response.
 #             stop (list[str], optional): List of strings that indicate when the model should stop generating the response. Defaults to ["USER:", "ASSISTANT:"].
 #             **kwargs: Additional keyword arguments to be passed to the model.
-        
+
 #         Returns:
 #             str: The generated response based on the prompt.
 #         """
-#         prompt_final = f"USER:\n{prompt}\nASSISTANT:\n" 
+#         prompt_final = f"USER:\n{prompt}\nASSISTANT:\n"
 
 #         result = self.model.create_completion(
 #             prompt_final,
@@ -276,7 +279,7 @@ class GGUF_M(Llama):
 #         #     [prompt, resp]
 #         # )
 #         return resp
- 
+
 #     def stream(
 #         self,
 #         prompt: str,
@@ -285,20 +288,20 @@ class GGUF_M(Llama):
 #         **kwargs: t.Any,
 #     ):
 #         """Generate text responses based on the given prompt using the model.
-        
+
 #         Args:
 #             prompt (str): The prompt to generate text responses.
 #             stop (list[str], optional): List of strings to stop the generation. Defaults to ["USER:", "ASSISTANT:"].
 #             **kwargs: Additional keyword arguments for the model.
-        
+
 #         Yields:
 #             str: Text responses generated by the model based on the prompt.
 #         """
-#         prompt = f"USER:\n{prompt}\nASSISTANT:\n" 
+#         prompt = f"USER:\n{prompt}\nASSISTANT:\n"
 #         output = self.model.create_completion(
 #             prompt,
 #             stream=True,
-#             repeat_penalty=self.generation_kwargs["repetition_penalty"], 
+#             repeat_penalty=self.generation_kwargs["repetition_penalty"],
 #             max_tokens=self.generation_kwargs["max_new_tokens"],
 #             stop=stop,
 #             echo=False,
@@ -324,11 +327,13 @@ class OpenAI_M():
         server_ip: str = "172.28.1.2",
         server_port: int = 8000,
         api_key: str = "dummy_key",
+        tools: list = None,
+        tool_desc: dict = None,
         *args,
         **kwargs
     ):
         """Initialize the OpenAI client.
-        
+
         Args:
             model_path (str): Path to the model file. Defaults to "default_model".
             device (str): Device to use for model inference. Defaults to 'gpu'.
@@ -338,7 +343,7 @@ class OpenAI_M():
             api_key (str): API key for authentication. Defaults to "dummy_key".
             *args: Variable length argument list.
             **kwargs: Arbitrary keyword arguments.
-        
+
         Attributes:
             model_path (str): Path to the model file.
             server_ip (str): IP address of the server.
@@ -358,9 +363,13 @@ class OpenAI_M():
             *args,
             **kwargs
         )
-        
+        self.tools = tools
+        self.tool_desc = FN_DESC
+        if tool_desc is not None:
+            self.tool_desc = self.tool_desc | tool_desc
+
     def invoke(
-        self, 
+        self,
         prompt : str,
         stop: list[str] | None = ["USER:", "ASSISTANT:"],
         # history: list = [],
@@ -368,12 +377,12 @@ class OpenAI_M():
         **kwargs: t.Any,
     ) -> str:
         """Invoke the chatbot with the given prompt and return the response.
-        
+
         Args:
             prompt (str): The prompt to provide to the chatbot.
             stop (list[str], optional): List of strings that indicate the end of the conversation. Defaults to ["USER:", "ASSISTANT:"].
             **kwargs: Additional keyword arguments to pass to the chatbot.
-        
+
         Returns:
             str: The response generated by the chatbot.
         """
@@ -391,7 +400,7 @@ class OpenAI_M():
         return response.choices[0].message.content
 
     def stream(
-        self, 
+        self,
         prompt : str,
         stop: list[str] | None = ["USER:", "ASSISTANT:"],
         # history: list = [],
@@ -399,12 +408,12 @@ class OpenAI_M():
         **kwargs: t.Any,
     ):
         """Generate text completion in a streaming fashion.
-        
+
         Args:
             prompt (str): The text prompt to generate completion for.
             stop (list[str], optional): List of strings to stop streaming at. Defaults to ["USER:", "ASSISTANT:"].
             **kwargs: Additional keyword arguments to pass to the completion API.
-        
+
         Yields:
             str: The generated text completion in a streaming fashion.
         """
@@ -419,8 +428,59 @@ class OpenAI_M():
             # model=kwargs.get("model", "default_model")
             **kwargs
         )
-        
+
         for chunk in response:
             content = chunk.choices[0].delta.content
             if content:
-                yield content 
+                yield content
+
+    def get_decision(
+        self,
+        prompt: str,
+        **kwargs: t.Any
+    ):
+        prompt_final = FN_TEMPLATE
+        for tool in self.tools:
+            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)
+
+    def get_tool_result(
+        self,
+        prompt: str,
+        **kwargs: t.Any
+    ):
+        decision_dict = self.get_decision(prompt, **kwargs)
+        if decision_dict.get("function_name", None) is None:
+            return ""
+        else:
+            func_name = decision_dict.get("function_name")
+            for tool in self.tools:
+                if tool.__name__ == func_name:
+                    tool_final = tool
+            func_kwargs = decision_dict.get("params")
+            return tool_final(**func_kwargs)
+
+
+    def agent_response(
+        self,
+        prompt : str,
+        stream = True,
+        **kwargs: t.Any
+    ):
+
+        decision_dict = self.get_decision(prompt, **kwargs)
+        if decision_dict.get("function_name", None) is None:
+            return self.stream(prompt, **kwargs)
+        else:
+            tool_result = str(self.get_tool_result(prompt, **kwargs))
+            prompt_final = "根据上下文回答最后的用户问题：\n上下文信息：\n"
+            prompt_final += tool_result
+            prompt_final += f"\n用户的问题：\n{prompt}"
+            if stream:
+                return self.stream(prompt_final, **kwargs)
+            else:
+                return self.invoke(prompt_final, **kwargs)

hdl/utils/weather/weather.py

@@ -2,7 +2,11 @@ import requests
 from pathlib import Path
 import os
 import json
+
 from bs4 import BeautifulSoup
+import numpy as np
+
+from ..llm.embs import HFEmbedder
 
 
 def get_city_codes():
@@ -32,37 +36,75 @@ def get_page_data(html):
     weather_info = soup.find('div', id='7d')
     seven_weather = weather_info.find('ul')
     weather_list = seven_weather.find_all('li')
+
+    weather_str = ""
+
     for weather in weather_list:
-        print('=' * 60)
-        print(weather.find('h1').get_text())
-        print('天气状况：', weather.find('p', class_='wea').get_text())
+        # print("\n")
+        weather_str += (weather.find('h1').get_text() + "\n") # 日期
+        weather_str += ('天气状况：' + weather.find('p', class_='wea').get_text() + "\n")
         # 判断标签'p','tem'下是否有标签'span'，以此判断是否有最高温
         if weather.find('p', class_='tem').find('span'):
             temp_high = weather.find('p', class_='tem').find('span').get_text()
         else:
             temp_high = ''  # 最高温
         temp_low = weather.find('p', class_='tem').find('i').get_text()  # 最低温
-        print(f'天气温度：{temp_low}/{temp_high}')
+        weather_str += (f'天气温度：{temp_low}/{temp_high}' + "\n")
         win_list_tag = weather.find('p', class_='win').find('em').find_all('span')
         win_list = []
         for win in win_list_tag:
             win_list.append(win.get('title'))
-        print('风向：', '-'.join(win_list))
-        print('风力：', weather.find('p', class_='win').find('i').get_text())
+        weather_str += ('风向：' + '-'.join(win_list) + "\n")
+        weather_str += ('风力：' + weather.find('p', class_='win').find('i').get_text() + "\n")
+        weather_str += "\n"
+
+    return weather_str
+
+
+def get_weather(city):
+    code_dic = get_city_codes()
+    city_name = city
+    weather_str = ""
+    if city not in code_dic:
+        city_name = get_standard_cityname(city)
+        weather_str += f"{city}识别为{city_name}，若识别错误，请提供更为准确的城市名\n"
+    html = get_html(code_dic[city_name])
+    result = get_page_data(html)
+    weather_str += f"\n{city}的天气信息如下：\n\n"
+    weather_str += result
+    return weather_str
 
 
-def main():
+def main(city):
     code_dic = get_city_codes()
-    print('=' * 60)
-    print('\t' * 5, '天气预报查询系统')
-    print('=' * 60)
-    city = input("请输入您要查询的城市：")
+    city = city
     if city in code_dic:
-        html = get_html(code_dic[city]['AREAID'])
+        html = get_html(code_dic[city])
         get_page_data(html)
     else:
         print('你要查询的地方不存在')
 
 
-if __name__ == '__main__':
-    main()
+def get_standard_cityname(
+    city,
+    emb_dir: str = os.getenv(
+        'EMB_MODEL_DIR',
+        '/home/jhu/dev/models/bge-m3'
+    )
+):
+    code_dic = get_city_codes()
+    city_list = list(code_dic.keys())
+
+    city_embs = np.load(
+        Path(__file__).resolve().parent.parent.parent \
+            / "datasets" \
+            / "city_embs.npy"
+    )
+
+    emb = HFEmbedder(
+        emb_dir=emb_dir,
+    )
+    query_emb = emb.encode(city)
+    sims = city_embs @ query_emb.T
+
+    return city_list[np.argmax(sims)]

{hjxdl-0.1.16.dist-info → hjxdl-0.1.17.dist-info}/METADATA

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

{hjxdl-0.1.16.dist-info → hjxdl-0.1.17.dist-info}/RECORD

@@ -1,5 +1,5 @@
-hdl/__init__.py,sha256=5sZZNySv08wwfzJcSDssGTqUn9wlmDsR6R4XB8J8mFM,70
-hdl/_version.py,sha256=rA1LdDxj-8LJmPkCOu32O_el1jpvxISCr8X4yOogHgc,413
+hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
+hdl/_version.py,sha256=U6sY9_fIsSw5WZCknnMPWLcgRhj8eWXLoDeffP6UUFA,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
@@ -39,6 +39,7 @@ hdl/data/dataset/samplers/chiral.py,sha256=ZS83kg5e2gdHVGgIuCjCepDwk2SKqWDgJawH3
 hdl/data/dataset/seq/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/data/dataset/seq/rxn_dataset.py,sha256=jfXFlR3ITAf0KwUfIevzUZHnLBnFYrL69Cc81EMv0x0,1668
 hdl/datasets/city_code.json,sha256=qnTL6ldpGnQanDXN3oitx12E6oiayaCHTh2Zi9RyQjM,60816
+hdl/datasets/city_embs.npy,sha256=jrkUZ_Dz6lwZAiNZpHcldbe7TzelvV7QgLhNZa1Fen0,132
 hdl/datasets/defined_BaseFeatures.fdef,sha256=5QhCEcu6fjSTXaTcZZ8-LSgf72_aJj_ykoDk82ZwVBI,7383
 hdl/datasets/las.tsv,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/datasets/route_template.json,sha256=2qhkbtEZUrUod6PXCWXxAgQmU-jAC0yLcWGBBk2IwgE,3757
@@ -50,8 +51,6 @@ hdl/features/graph/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 hdl/features/graph/featurization.py,sha256=QLbj33JsgO-OWarIC2HXQP7eMu8pd-GWmppZQj_tQ_k,10902
 hdl/features/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/features/utils/utils.py,sha256=aL4UAALblaw1w0AjK7MX8nSj9zwTmrp9CTLwJUX8ZtE,4225
-hdl/ju/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hdl/ju/setup.py,sha256=MB3rndQYt9QC-bdyGt81HYR0Rdr0l8DbAHktIuFMYU0,1725
 hdl/jupyfuncs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/jupyfuncs/chem/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/jupyfuncs/chem/mol.py,sha256=FDb2L61JL6xkNK7bxXWVjAT-r-st7iMyQNoFezBvTUE,15294
@@ -120,17 +119,20 @@ 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/desc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+hdl/utils/desc/func_desc.py,sha256=Vw7GWhnPvr-WxMkU2P5lch8bnlsW6a0NEaJDtI4mFPw,316
+hdl/utils/desc/template.py,sha256=yhXtuNV474zbCD7SP_iZHR3cnGJQYozkb0Ro3V_UkaM,1039
 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=Xypu7KlnTeI9oep02tuw04GooAfysZEgY2T_P29xZuU,15086
+hdl/utils/llm/chat.py,sha256=RJgiDTW16Ah-bYDySW9QWhkD_VZf9Q3uBZcO7vXZuvA,16877
 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=LiIgEX-XPZxltGWgrwJNXSvBuinF-VaBT3ohRWYDjPI,2315
-hjxdl-0.1.16.dist-info/METADATA,sha256=8yEQaClAH1z9xw77MfSaZtEWhOjdW7NDRKAfbePA2lA,590
-hjxdl-0.1.16.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-hjxdl-0.1.16.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.1.16.dist-info/RECORD,,
+hdl/utils/weather/weather.py,sha256=xGWkqGoDAM2N4Gkv5lDyHb_Xa5RmFlWTWhfZxDbB9T8,3353
+hjxdl-0.1.17.dist-info/METADATA,sha256=36AqD_SB3KKRsuELmon7XDlKYw2OEMw_lwAAp-a4I1g,590
+hjxdl-0.1.17.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+hjxdl-0.1.17.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.1.17.dist-info/RECORD,,

hdl/ju/setup.py

@@ -1,55 +0,0 @@
-from setuptools import setup, find_packages
-import setuptools_scm
-
-def read_requirements():
-    """读取 requirements.txt 文件并返回依赖列表"""
-    with open('requirements.txt', 'r', encoding='utf-8') as file:
-        return [
-            line.strip()
-            for line in file
-            if line.strip() and not line.startswith('#')
-        ]
-
-
-def custom_version_scheme(version):
-    """自定义版本号方案，确保没有 .dev 后缀"""
-    if version.exact:
-        return version.format_with("{tag}")
-    elif version.distance:
-        return f"{version.format_next_version()}.post{version.distance}"
-    else:
-        return version.format_with("0.0.0")
-
-def custom_local_scheme(version):
-    """自定义本地版本方案，确保没有本地版本后缀"""
-    return ""
-
-setup(
-    name="jupyfuncs",
-    use_scm_version={
-        "version_scheme": custom_version_scheme,
-        "local_scheme": custom_local_scheme,
-        "write_to": "jupyfuncs/_version.py"
-    },
-    author="Jianxing Hu",
-    author_email="j.hu@pku.edu.cn",
-    description="A collection of functions for Jupyter notebooks",
-    long_description=open('README.md', 'r', encoding='utf-8').read(),
-    long_description_content_type='text/markdown',
-    url="https://github.com/huluxiaohuowa/jupyfuncs",
-    packages=find_packages(),
-    package_data={
-        'jupyfuncs': [
-            'datasets/*.*',
-            'datasets/*/*.*',
-        ]
-    },
-    classifiers=[
-        "Programming Language :: Python :: 3",
-        "License :: OSI Approved :: MIT License",
-        "Operating System :: OS Independent",
-    ],
-    python_requires='>=3.6',
-    setup_requires=['setuptools_scm'],
-    install_requires=read_requirements()
-)