hjxdl 0.2.32__py3-none-any.whl → 0.2.34__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.32'
-__version_tuple__ = version_tuple = (0, 2, 32)
+__version__ = version = '0.2.34'
+__version_tuple__ = version_tuple = (0, 2, 34)

hdl/utils/desc/func_desc.py

@@ -51,6 +51,22 @@ FN_DESC = {
         }
 }
 
+""",
+    "execute_code(code)": """
+## 函数名：execute_code,
+描述：当用户明确要求执行一段代码时，调用此工具，执行这段代码，返回执行结果。
+触发条件：用户要求执行一段代码
+参数：
+# code (str): 用户要求执行的代码
+返回值 (str): 执行结果
+需要返回的json
+{
+    "function_name": "execute_code",
+    "params":
+        {
+            "code": <code>
+        }
+}
 """,
     "default": None
 }

hdl/utils/general/runners.py

@@ -0,0 +1,40 @@
+import subprocess
+import sys
+import os
+
+def execute_code(code):
+    """
+    Executes the given Python code string in a subprocess.
+
+    This function uses the subprocess to execute Python code strings, limiting the execution time to prevent infinite loops,
+    and captures the execution output and errors for returning results.
+
+    Parameters:
+    code (str): The Python code string to be executed.
+
+    Returns:
+    str: The output result of executing the code or an error message.
+    """
+    try:
+        # Execute the code in a subprocess for safety
+        print(code)
+        python_path = sys.executable  # 获取当前 Python 解释器路径
+        result = subprocess.run(
+            [
+                python_path,  # 使用当前 conda 环境中的 Python
+                '-c',
+                code
+            ],
+            capture_output=True,
+            text=True,
+            timeout=5,
+            env={"PYTHONPATH": os.getcwd()}
+        )
+        # Return the execution result based on the subprocess return code
+        return result.stdout if result.returncode == 0 else f"Error: {result.stderr}"
+    except subprocess.TimeoutExpired:
+        # Return a timeout error message if the code execution exceeds the limit
+        return "Error: Code execution timed out"
+    except Exception as e:
+        # Return the exception information for other exceptions
+        return f"Error: {str(e)}"

hdl/utils/llm/visrag.py

@@ -22,8 +22,20 @@ def get_image_md5(img: Image.Image):
     return hex_digest
 
 def calculate_md5_from_binary(binary_data):
+    """
+    计算给定二进制数据的MD5哈希值。
+
+    参数:
+    binary_data (bytes): 需要计算MD5的二进制数据。
+
+    返回:
+    str: 二进制数据的MD5哈希值的十六进制表示。
+    """
+    # 初始化MD5哈希对象
     hash_md5 = hashlib.md5()
+    # 更新哈希对象以计算二进制数据的MD5
     hash_md5.update(binary_data)
+    # 返回计算出的MD5哈希值的十六进制表示
     return hash_md5.hexdigest()
 
 def add_pdf_gradio(pdf_file_binary, progress=gr.Progress(), cache_dir=None, model=None, tokenizer=None):

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hjxdl
-Version: 0.2.32
+Version: 0.2.34
 Summary: A collection of functions for Jupyter notebooks
 Home-page: https://github.com/huluxiaohuowa/hdl
 Author: Jianxing Hu
@@ -15,12 +15,12 @@ Requires-Dist: openai
 Requires-Dist: tqdm
 Requires-Dist: geopy
 Requires-Dist: pytz
-Requires-Dist: duckduckgo-search[lxml]
+Requires-Dist: duckduckgo_search[lxml]
 Requires-Dist: opencv-python
 Requires-Dist: redis[hiredis]
 Requires-Dist: psycopg[binary]
 Requires-Dist: Pillow
-Requires-Dist: open-clip-torch
+Requires-Dist: open_clip_torch
 Requires-Dist: natsort
 
 # DL framework by Jianxing

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

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=jSnpQjxfX4ZsfrMFFxLeBiF7_cxq8o44X1E_cpi4UPE,413
+hdl/_version.py,sha256=p0KyMPbK4UjHdk55CM8u0WRgTg4ZEwuArtOrGaope7E,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
@@ -122,10 +122,11 @@ hdl/utils/database_tools/connect.py,sha256=xCacGucKxlQUXs6AsNddpeECvdqT1180V1ZWq
 hdl/utils/database_tools/datetime.py,sha256=xqE2xNiOpADzX-R8_bM0bioJRF3Ay9Jp1CAG6dy6uVI,1202
 hdl/utils/database_tools/web.py,sha256=vZJYWA02QbyUUMGLDX710cexn7RlfWeHa8YwK3UsDZ0,1934
 hdl/utils/desc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hdl/utils/desc/func_desc.py,sha256=uFU61nZHE0TQce1YtpJWldXnH_CdskYmW2fDDQpToOA,1917
+hdl/utils/desc/func_desc.py,sha256=ykqYBpGHQnXm6pJUFmrRMZBGIpbwrERfGrt3anyc5aU,2346
 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/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/utils/llm/chat.py,sha256=OzyY9xACOOocx9zZigtq9YAPvHtDUo8v2fvf1Tyjg_U,14891
 hdl/utils/llm/chatgr.py,sha256=lKaDeimYz-Bw32QXYtde51xjf7gbfS2CEYt5R0ODunM,4075
@@ -133,12 +134,12 @@ hdl/utils/llm/embs.py,sha256=Tf0FOYrOFZp7qQpEPiSCXzlgyHH0X9HVTUtsup74a9E,7174
 hdl/utils/llm/extract.py,sha256=2sK_WJzmYIc8iuWaM9DA6Nw3_6q1O4lJ5pKpcZo-bBA,6512
 hdl/utils/llm/llama_chat.py,sha256=watcHGOaz-bv3x-yDucYlGk5f8FiqfFhwWogrl334fk,4387
 hdl/utils/llm/vis.py,sha256=BsGAfy5X8sMFnX5A3vHpTPDRe_-IDdhs6YVQ-efvyQ0,21424
-hdl/utils/llm/visrag.py,sha256=_PuKtmQIXD5bnmXwDWhTLdzOhgC42JiqdMNb1uKA7n8,9190
+hdl/utils/llm/visrag.py,sha256=ZH7Z63taj3hgGAVvDyrMIA_V0tqconCobcfYAAElYmU,9552
 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.2.32.dist-info/METADATA,sha256=DLlf5Bv3kIdC3Zs-a9iKvjQsCzN5e7QL_BXvVa9IywA,836
-hjxdl-0.2.32.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-hjxdl-0.2.32.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.2.32.dist-info/RECORD,,
+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.32.dist-info → hjxdl-0.2.34.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any