hjxdl 0.1.30__py3-none-any.whl → 0.1.32__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.30'
-__version_tuple__ = version_tuple = (0, 1, 30)
+__version__ = version = '0.1.32'
+__version_tuple__ = version_tuple = (0, 1, 32)

hdl/utils/database_tools/web.py

@@ -0,0 +1,51 @@
+from duckduckgo_search import DDGS
+import requests
+from bs4 import BeautifulSoup
+
+def web_search_text(
+    query_text: str,
+    max_results=3,
+):
+    """Searches the web for text related to the given query.
+
+    Args:
+        query_text (str): The text to search for.
+        max_results (int, optional): The maximum number of results to retrieve. Defaults to 3.
+
+    Returns:
+        str: Text retrieved from the web search results.
+    """
+    result_str = "联网搜索到的信息如下：\n"
+    try:
+        results = DDGS().text(
+            query_text,
+            max_results=max_results,
+            backend="html"
+        )
+    except Exception as e:
+        return f"{str(e)}: 未搜索（获取）到相关内容，可过一段时间再次尝试。"
+    for result in results:
+        if "wikipedia" not in result['href']:
+
+            headers = {
+                'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36'
+            }
+            try:
+                # 发送请求
+                response = requests.get(result['href'], headers=headers)
+
+                # 检查请求状态码
+                if response.status_code == 200:
+                    # 解析网页内容
+                    soup = BeautifulSoup(response.content, 'html.parser')
+                    text = soup.get_text()
+
+                    # 删除空行
+                    cleaned_text = "\n".join([line.strip() for line in text.splitlines() if line.strip()])
+
+                    print(cleaned_text)
+                    result_str += cleaned_text
+                    result_str += "\n"
+                    return result_str
+            except Exception as e:
+                return f"{str(e)}: 未搜索（获取）到相关内容。"

hdl/utils/desc/func_desc.py

@@ -30,6 +30,24 @@ FN_DESC = {
         }
 }
 
+""",
+    "web_search_text": """
+## 函数名：web_search_text
+描述：在用户明确要联网查询回答他的问题时，调用此工具可以获得该问题联网搜索的相关内容
+参数：
+# query_text (str): 从用户提的问题中获取，用于在网络中搜索信息
+# max_results (int, optional): 搜索条目的最大数目，若用户指定了数目，则使用用户指定的数目，若用户提问中没有指定，则设定此值为 3 。
+返回值 (str):这个城市当前所在时区的日期和时间
+需要返回的json
+{
+    "function_name": "web_search_text",
+    "params":
+        {
+            "query_text": <query from user question>,
+            "max_results": <num of max results, default to 3>
+        }
+}
+
 """,
     "default": None
 }

hdl/utils/desc/template.py

@@ -6,7 +6,7 @@ FN_TEMPLATE = """
 "function_name"：需要要调用的函数的名称。
 "params"：函数所需的参数，一般为字符串，注意字符串要在双引号 "" 之间。
 
-若不需要调用函数，则返回如下字典，并且不应包含其他多余文字，避免出现格式化问题：
+若不需要调用函数，或提供的函数无法解决用户的问题时，则返回如下字典，并且不应包含其他多余文字，避免出现格式化问题：
 {
     "function_name": null
 }

{hjxdl-0.1.30.dist-info → hjxdl-0.1.32.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hjxdl
-Version: 0.1.30
+Version: 0.1.32
 Summary: A collection of functions for Jupyter notebooks
 Home-page: https://github.com/huluxiaohuowa/hdl
 Author: Jianxing Hu
@@ -17,6 +17,7 @@ Requires-Dist: sentence-transformers
 Requires-Dist: geopy
 Requires-Dist: timezonefinder
 Requires-Dist: pytz
+Requires-Dist: duckduckgo-search[lxml]
 
 # DL framework by Jianxing
 

{hjxdl-0.1.30.dist-info → hjxdl-0.1.32.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=OW37XTCHTV7wnaYtVdWp4BtOg1SJgC-uhhyNKXf40bQ,413
+hdl/_version.py,sha256=NA9VwrV1Psl9VgGLwTXusny4jcXqQVe84OBjJLMEnkI,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
@@ -120,9 +120,10 @@ hdl/utils/chemical_tools/sdf.py,sha256=71PEqU0H885L6IeGHEa6n7ZLZThvMsZOVLuFG2wno
 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=xqE2xNiOpADzX-R8_bM0bioJRF3Ay9Jp1CAG6dy6uVI,1202
+hdl/utils/database_tools/web.py,sha256=saGh4gICB8yUylTVhSFBL-SzA9-8xxLln4rUFFHz4Eg,1805
 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/desc/func_desc.py,sha256=pTsqcozGsdO1gVXpN7_IaDv7fNfZ7elyI_ebyXvlsA8,1567
+hdl/utils/desc/template.py,sha256=a3NcSihzZMm9Bk76iDVe54_xBDceGmLebS0XMONE3nk,1172
 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
@@ -133,7 +134,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.30.dist-info/METADATA,sha256=_vUaFjR004nhgd4HyfwP5rylnj4y1U71xvDw_qmvwiI,698
-hjxdl-0.1.30.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-hjxdl-0.1.30.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.1.30.dist-info/RECORD,,
+hjxdl-0.1.32.dist-info/METADATA,sha256=XqDgEezXMtJ7slXIG1n0-2kjoz3jYFUcqO0_0WuYXYs,737
+hjxdl-0.1.32.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+hjxdl-0.1.32.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.1.32.dist-info/RECORD,,