hjxdl 0.2.41__py3-none-any.whl → 0.2.42__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.41'
-__version_tuple__ = version_tuple = (0, 2, 41)
+__version__ = version = '0.2.42'
+__version_tuple__ = version_tuple = (0, 2, 42)

hdl/utils/database_tools/web.py

@@ -1,4 +1,5 @@
-from duckduckgo_search import DDGS
+import os
+
 import requests
 from bs4 import BeautifulSoup
 
@@ -15,6 +16,7 @@ def web_search_text(
     Returns:
         str: Text retrieved from the web search results.
     """
+    from duckduckgo_search import DDGS
     if max_results < 3:
         max_results = 3
     elif max_results > 5:
@@ -93,4 +95,53 @@ def fetch_baidu_results(query, max_n_links=3):
             print(f"Failed to fetch {link}: {e}")
 
     # 返回拼接的文本内容
-    return '\n'.join(text_content)
+    return '\n'.join(text_content)
+
+
+def wolfram_alpha_calculate(query):
+    """
+    This function sends a query to Wolfram Alpha and returns the calculation result.
+
+    Parameters:
+    query (str): The query string to send to Wolfram Alpha.
+
+    Returns:
+    str: The calculation result from Wolfram Alpha, or an error message if the request fails.
+    """
+    # Get the Wolfram Alpha App ID from environment variables
+    app_id = os.getenv('WOLFRAM_APP_ID', None)
+    if not app_id:
+        return "Error: Wolfram Alpha App ID is not set in environment variables."
+
+    # Define the API endpoint for Wolfram Alpha
+    url = 'https://api.wolframalpha.com/v2/query'
+    # Prepare the request parameters
+    params = {
+        'appid': app_id,
+        'input': query,
+        'output': 'json',
+    }
+
+    try:
+        # Send a GET request to Wolfram Alpha
+        response = requests.get(url, params=params, timeout=20)
+        # Parse the returned data as JSON
+        data = response.json()
+
+        # Check if the query was successful
+        if data['queryresult']['success']:
+            result = ''
+            # Iterate through the returned data to extract and accumulate the plaintext results
+            for pod in data['queryresult']['pods']:
+                for subpod in pod.get('subpods', []):
+                    plaintext = subpod.get('plaintext')
+                    if plaintext:
+                        result += f"{plaintext}\n"
+            # Return the accumulated result, or a message if no plaintext result is available
+            return result.strip() if result else "No plaintext result available."
+        else:
+            return "No results found for the query."
+    except requests.Timeout:
+        return "Error: The request to Wolfram Alpha timed out."
+    except Exception as e:
+        return f"An error occurred: {str(e)}"

hdl/utils/llm/chat.py

@@ -140,10 +140,33 @@ class OpenAI_M():
         if tool_desc is not None:
             self.tool_desc = self.tool_desc | tool_desc
 
+    def get_thought_chain(
+        self,
+        prompt,
+        **kwargs
+    ):
+        steps = []
+        total_thinking_time = 0
+        is_final: bool = False
+        while True:
+            yield {
+                "type": "step",
+                "data": steps,
+                "extra": None
+            }
+            if is_final:
+                break
+        yield {
+            "type": "final",
+            "data": steps,
+            "total_time": total_thinking_time
+        }
+
     def get_resp(
         self,
         prompt : str,
         sys_info: str = None,
+        assis_info: str = None,
         images: list = None,
         image_keys: tuple = ("image_url", "url"),
         stop: list[str] | None = ["USER:", "ASSISTANT:"],
@@ -198,6 +221,11 @@ class OpenAI_M():
             "role": "user",
             "content": content
         })
+        if assis_info:
+            messages.append({
+                "role": "assistant",
+                "content": assis_info
+            })
 
         response = self.client.chat.completions.create(
             messages=messages,

{hjxdl-0.2.41.dist-info → hjxdl-0.2.42.dist-info}/METADATA

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

{hjxdl-0.2.41.dist-info → hjxdl-0.2.42.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=FZD5xt7drsHzEbxaZBE2pcXfvoVqAqneusIHzB-dFnI,413
+hdl/_version.py,sha256=ErCkM0K6ix4_v_PL5flvrXq2XQXCxsWfoy3q3rTAsOY,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,7 +120,7 @@ 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=HvU7BtODTRSgrO9Bho5Nj0ImtlAOJ9nrOfDPWPp7qE8,3386
+hdl/utils/database_tools/web.py,sha256=PJ7R1chUD-vz-Up0orfFqdrZq3CFOlwiO9gIjFSb-R8,5224
 hdl/utils/desc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/utils/desc/func_desc.py,sha256=tDGEuUuqg6LnBVpmWQIxYZPvrcb0N70A9i20PbujCks,2660
 hdl/utils/desc/template.py,sha256=a0UAkkKctt_EHY9UECsIIAwVkGPcM1Hr01HSkRMeIuw,1272
@@ -128,7 +128,7 @@ hdl/utils/general/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 hdl/utils/general/glob.py,sha256=8-RCnt6L297wMIfn34ZAMCsGCZUjHG3MGglGZI1cX0g,491
 hdl/utils/general/runners.py,sha256=w9kgR9UgGug0s6NR27hpfPQbbFvRtmtqz5IfwyMTC1E,2351
 hdl/utils/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hdl/utils/llm/chat.py,sha256=RUOtdVvEfxpQqnxGcWJrYxooQWYM3TfdPekFCJgS4XM,14997
+hdl/utils/llm/chat.py,sha256=tSIg5FcMutcsmEnjOJI-ZP0OkQeB8csuUu2cwsapsAg,15658
 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.41.dist-info/METADATA,sha256=-gfo5xuAzllJZVl5SkgE8IGzpDKTLPh-WzwDKOqJK_U,836
-hjxdl-0.2.41.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-hjxdl-0.2.41.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.2.41.dist-info/RECORD,,
+hjxdl-0.2.42.dist-info/METADATA,sha256=6uQ_KhJW8cYaF0ufn0n4RpyZeYby0vKwTzvQ15JCIas,836
+hjxdl-0.2.42.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+hjxdl-0.2.42.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.2.42.dist-info/RECORD,,