hjxdl 0.2.34__py3-none-any.whl → 0.2.36__py3-none-any.whl

hdl/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.2.34'
-__version_tuple__ = version_tuple = (0, 2, 34)
+__version__ = version = '0.2.36'
+__version_tuple__ = version_tuple = (0, 2, 36)

hdl/utils/database_tools/web.py

@@ -51,4 +51,46 @@ def web_search_text(
                     result_str += "\n"
             except Exception as e:
                 print(f"{str(e)}: 从{result['href']}未搜索（获取）到相关内容。")
-    return result_str
+    return result_str
+
+
+def fetch_baidu_results(query, max_n_links=3):
+    """
+    模拟百度搜索，提取前三个搜索结果的网页文字内容并拼接返回。
+
+    :param query: str 要搜索的文本
+    :return: str 提取的网页内容拼接字符串
+    """
+    headers = {
+        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36'
+    }
+    # 百度搜索 URL
+    search_url = 'https://www.baidu.com/s'
+    params = {'wd': query}
+
+    # 发送搜索请求
+    response = requests.get(search_url, headers=headers, params=params)
+    response.raise_for_status()
+    soup = BeautifulSoup(response.text, 'html.parser')
+
+    # 提取前三个搜索结果链接
+    links = []
+    for link_tag in soup.select('.t a')[:max_n_links]:
+        link = link_tag.get('href')
+        if link:
+            links.append(link)
+
+    # 抓取每个链接的网页内容
+    text_content = []
+    for link in links:
+        try:
+            page_response = requests.get(link, headers=headers, timeout=10)
+            page_response.raise_for_status()
+            page_soup = BeautifulSoup(page_response.text, 'html.parser')
+            text = page_soup.get_text(separator='\n', strip=True)
+            text_content.append(text)
+        except requests.RequestException as e:
+            print(f"Failed to fetch {link}: {e}")
+
+    # 返回拼接的文本内容
+    return '\n'.join(text_content)

hdl/utils/desc/func_desc.py

@@ -1,4 +1,5 @@
 FN_DESC = {
+
     "get_weather": """
 ## 函数名：get_weather
 描述：只有在用户询问一个城市的天气时，调用此工具获得此城市的天气信息
@@ -16,6 +17,7 @@ FN_DESC = {
 }
 
 """,
+
     "get_datetime_by_cityname": """
 ## 函数名：get_datetime_by_cityname
 描述：只有在用户询问一个城市当前的日期或时间时，调用此工具可以获得此城市当前的日期和时间
@@ -33,40 +35,62 @@ FN_DESC = {
 }
 
 """,
-    "web_search_text": """
-## 函数名：web_search_text
-描述：在用户明确说要“联网查询”回答他的问题时，调用此工具可以获得该问题联网搜索的相关内容
-触发条件：用户的问题中有显式的“联网查询”字样，用户若没有提到“联网查询”，则不要调用此函数
+
+    "execute_code": """
+## 函数名：execute_code,
+描述：当用户明确要求执行一段代码时，调用此工具，执行这段代码，返回执行结果。
+触发条件：用户要求执行一段代码
 参数：
-# query_text (str): 从用户提的问题中获取，用于在网络中搜索信息
-# max_results (int, optional): 搜索条目的最大数目，若用户指定了数目，则使用用户指定的数目，若用户提问中没有指定，你需要在下面的json中"max_results"这一项指定为数值3。
-返回值 (str): 联网搜索到的信息
+# code (str): 用户要求执行的代码
+返回值 (str): 执行结果
 需要返回的json
 {
-    "function_name": "web_search_text",
+    "function_name": "execute_code",
     "params":
         {
-            "query_text": <query from user question>,
-            "max_results": <num of max results, 如果用户没有要求，这一项则指定为3>
+            "code": <code>
         }
 }
 
 """,
-    "execute_code(code)": """
-## 函数名：execute_code,
-描述：当用户明确要求执行一段代码时，调用此工具，执行这段代码，返回执行结果。
-触发条件：用户要求执行一段代码
+
+    "calculate": """
+## 函数名：calculate，
+描述：当用户要求计算一个数学表达式时，调用此工具，计算这个表达式，返回计算结果。
+触发条件：用户要求计算一个数学表达式
 参数：
-# code (str): 用户要求执行的代码
-返回值 (str): 执行结果
+# expression (str): 用户要求的数学表达式
+返回值 (str): 计算结果
 需要返回的json
 {
-    "function_name": "execute_code",
+    "function_name": "calculate",
     "params":
         {
-            "code": <code>
+            "expression": <expression>
         }
 }
+
 """,
+
+    "fetch_baidu_results": """
+## 函数名：fetch_baidu_results,
+描述：在用户明确要求查询网络上相关信息时，调用此工具，返回查询结果。
+触发条件：用户明确要求查询网络上相关信息
+参数：
+# query (str): 用户要求的查询内容
+# max_n_links (int, optional): 搜索条目的最大数目，若用户指定了数目，则使用用户指定的数目，若用户提问中没有指定，你需要在下面的json中"max_n_links"这一项指定为数值3。
+返回值 (str): 联网搜索到的信息
+需要返回的json
+{
+    "function_name": "fetch_baidu_results",
+        "params":
+        {
+            "query": <query from user question>,
+            "max_n_links": <num of max results, 如果用户没有要求，这一项则指定为3>
+        }
+}
+
+""",
+
     "default": None
 }

hdl/utils/general/runners.py

@@ -1,6 +1,7 @@
 import subprocess
 import sys
 import os
+import math
 
 def execute_code(code):
     """
@@ -37,4 +38,27 @@ def execute_code(code):
         return "Error: Code execution timed out"
     except Exception as e:
         # Return the exception information for other exceptions
+        return f"Error: {str(e)}"
+
+
+def calculate(expression):
+    """
+    Calculates the result of a mathematical expression.
+
+    This function evaluates a mathematical expression string passed as an argument and returns the result.
+    In order to prevent security risks, the use of built-in functions is restricted during evaluation,
+    allowing only the 'math' module to be accessed. If an exception occurs during evaluation,
+    it returns the corresponding error message.
+
+    Parameters:
+    expression (str): The mathematical expression to calculate.
+
+    Returns:
+    The result of the calculation or an error message if an exception occurs.
+    """
+    try:
+        # Evaluate the expression with restricted built-in functions and access to the math module
+        return eval(expression, {"__builtins__": None}, {"math": math})
+    except Exception as e:
+        # Return the error message if an exception occurs
         return f"Error: {str(e)}"

hdl/utils/llm/chat.py

@@ -1,5 +1,6 @@
 import typing as t
 import asyncio
+import os
 from concurrent.futures import ProcessPoolExecutor
 import subprocess
 
@@ -109,37 +110,31 @@ class OpenAI_M():
         server_ip: str = "172.28.1.2",
         server_port: int = 8000,
         api_key: str = "dummy_key",
+        use_groq: bool = False,
+        groq_api_key: str = None,
         tools: list = None,
         tool_desc: dict = None,
         *args,
         **kwargs
     ):
-        """Initialize the OpenAI client with the specified parameters.
-
-        Args:
-            model_path (str): Path to the model (default is "default_model").
-            device (str): Device to use (default is 'gpu').
-            generation_kwargs (dict): Additional generation arguments (default is an empty dictionary).
-            server_ip (str): IP address of the server (default is "172.28.1.2").
-            server_port (int): Port of the server (default is 8000).
-            api_key (str): API key for authentication (default is "dummy_key").
-            tools (list): List of tools.
-            tool_desc (dict): Description of tools.
-
-        Raises:
-            ValueError: If an invalid argument is provided.
-        """
         # self.model_path = model_path
         self.server_ip = server_ip
         self.server_port = server_port
         self.base_url = f"http://{self.server_ip}:{str(self.server_port)}/v1"
         self.api_key = api_key
-        self.client = OpenAI(
-            base_url=self.base_url,
-            api_key=self.api_key,
-            *args,
-            **kwargs
-        )
+        self.use_groq = use_groq
+        if use_groq:
+            import groq
+            self.client = groq.Groq(
+                api_key=os.getenv("GROQ_API_KEY", groq_api_key)
+            )
+        else:
+            self.client = OpenAI(
+                base_url=self.base_url,
+                api_key=self.api_key,
+                *args,
+                **kwargs
+            )
         self.tools = tools
         self.tool_desc = FN_DESC
         if tool_desc is not None:
@@ -148,6 +143,7 @@ class OpenAI_M():
     def get_resp(
         self,
         prompt : str,
+        sys_info: str = None,
         images: list = None,
         image_keys: tuple = ("image_url", "url"),
         stop: list[str] | None = ["USER:", "ASSISTANT:"],
@@ -169,6 +165,7 @@ class OpenAI_M():
         Returns:
             dict: The response from the chatbot.
         """
+
         content = [
             {"type": "text", "text": prompt},
         ]
@@ -191,11 +188,19 @@ class OpenAI_M():
         else:
             content = prompt
 
+        messages = []
+        if sys_info:
+            messages.append({
+                "role": "system",
+                "content": sys_info
+            })
+        messages.append({
+            "role": "user",
+            "content": content
+        })
+
         response = self.client.chat.completions.create(
-            messages=[{
-                "role": "user",
-                "content": content
-            }],
+            messages=messages,
             stream=stream,
             model=model,
             **kwargs

{hjxdl-0.2.34.dist-info → hjxdl-0.2.36.dist-info}/METADATA

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

{hjxdl-0.2.34.dist-info → hjxdl-0.2.36.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=p0KyMPbK4UjHdk55CM8u0WRgTg4ZEwuArtOrGaope7E,413
+hdl/_version.py,sha256=lyCfIDEPFC5Me7JK9UYDQkfgyTpQxlULFu59ekOiSFA,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,15 +120,15 @@ 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=xCacGucKxlQUXs6AsNddpeECvdqT1180V1ZWqHrUdNA,875
 hdl/utils/database_tools/datetime.py,sha256=xqE2xNiOpADzX-R8_bM0bioJRF3Ay9Jp1CAG6dy6uVI,1202
-hdl/utils/database_tools/web.py,sha256=vZJYWA02QbyUUMGLDX710cexn7RlfWeHa8YwK3UsDZ0,1934
+hdl/utils/database_tools/web.py,sha256=HvU7BtODTRSgrO9Bho5Nj0ImtlAOJ9nrOfDPWPp7qE8,3386
 hdl/utils/desc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hdl/utils/desc/func_desc.py,sha256=ykqYBpGHQnXm6pJUFmrRMZBGIpbwrERfGrt3anyc5aU,2346
+hdl/utils/desc/func_desc.py,sha256=tDGEuUuqg6LnBVpmWQIxYZPvrcb0N70A9i20PbujCks,2660
 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/general/runners.py,sha256=-xGCkRKKqSEFUtDy0o8JkXpfFVrXPCU0C-ISfv-pNis,1413
+hdl/utils/general/runners.py,sha256=w9kgR9UgGug0s6NR27hpfPQbbFvRtmtqz5IfwyMTC1E,2351
 hdl/utils/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hdl/utils/llm/chat.py,sha256=OzyY9xACOOocx9zZigtq9YAPvHtDUo8v2fvf1Tyjg_U,14891
+hdl/utils/llm/chat.py,sha256=YEBr2-6mBMf5uaY9Rpcc8iWSBB6pJeefWcD0JuBTuTk,14668
 hdl/utils/llm/chatgr.py,sha256=lKaDeimYz-Bw32QXYtde51xjf7gbfS2CEYt5R0ODunM,4075
 hdl/utils/llm/embs.py,sha256=Tf0FOYrOFZp7qQpEPiSCXzlgyHH0X9HVTUtsup74a9E,7174
 hdl/utils/llm/extract.py,sha256=2sK_WJzmYIc8iuWaM9DA6Nw3_6q1O4lJ5pKpcZo-bBA,6512
@@ -139,7 +139,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.2.34.dist-info/METADATA,sha256=0pypdynugK_HBW9sYnKj3L-kywu8o2Zt7H36gI-dOwg,836
-hjxdl-0.2.34.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-hjxdl-0.2.34.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.2.34.dist-info/RECORD,,
+hjxdl-0.2.36.dist-info/METADATA,sha256=YeGojS09qKg1ukjhX_RI0o7FBft1kaW_m0EutpopDsQ,836
+hjxdl-0.2.36.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+hjxdl-0.2.36.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.2.36.dist-info/RECORD,,