hjxdl 0.3.32__py3-none-any.whl → 0.3.34__py3-none-any.whl

hdl/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.32'
-__version_tuple__ = version_tuple = (0, 3, 32)
+__version__ = version = '0.3.34'
+__version_tuple__ = version_tuple = (0, 3, 34)

hdl/utils/general/runners.py

@@ -81,3 +81,50 @@ def count_character_occurrences(text, char):
     char = char.lower()
 
     return f"{text} 中 {char} 共出现了 {text.count(char)} 次。"
+
+# import os
+# import pty
+# import subprocess
+# # import sys
+
+# def run_ollama_cmd(cmd: str):
+#     command = cmd.split(" ")
+#     # 定义要执行的命令
+#     # command = ["ollama", "create", ollama_model_name, "-f", ollama_model_file]
+#     # 创建伪终端
+#     master, slave = pty.openpty()
+
+#     # 运行命令
+#     process = subprocess.Popen(command, stdin=slave, stdout=slave, stderr=slave, text=True, close_fds=True)
+
+#     # 关闭 slave 端，让 master 端可以读取
+#     os.close(slave)
+
+#     # 处理动态进度条，避免重复输出
+#     seen_lines = set()
+#     while True:
+#         try:
+#             output = os.read(master, 1024).decode()
+#             if not output:
+#                 break
+
+#             # 过滤重复的进度信息
+#             for line in output.split("\n"):
+#                 if line.strip() and line not in seen_lines:
+#                     seen_lines.add(line)
+#                     print(line, flush=True)  # 逐行打印
+#         except OSError:
+#             break
+
+#     # 等待进程结束
+#     process.wait()
+
+
+def run_cmd(cmd: str):
+    command = cmd.split(" ")
+
+    # 直接执行命令，让 stdout 和 stderr 直接流式输出到终端
+    process = subprocess.Popen(command, stdout=None, stderr=None)
+
+    # 等待进程执行完
+    process.wait()

hdl/utils/llm/llm_wrapper.py

@@ -242,7 +242,7 @@ class OpenAIWrapper(object):
                 model=model,
                 messages=messages,
                 tools=tools,
-                tool_choice=tool_choice
+                tool_choice=tool_choice,
                 stream=stream,
                 **kwargs
             )

hdl/utils/llm/ollama.py

@@ -0,0 +1,49 @@
+# import os
+# import pty
+# import subprocess
+# # import sys
+
+# def run_ollama_cmd(cmd: str):
+#     command = cmd.split(" ")
+#     # 定义要执行的命令
+#     # command = ["ollama", "create", ollama_model_name, "-f", ollama_model_file]
+#     # 创建伪终端
+#     master, slave = pty.openpty()
+
+#     # 运行命令
+#     process = subprocess.Popen(command, stdin=slave, stdout=slave, stderr=slave, text=True, close_fds=True)
+
+#     # 关闭 slave 端，让 master 端可以读取
+#     os.close(slave)
+
+#     # 处理动态进度条，避免重复输出
+#     seen_lines = set()
+#     while True:
+#         try:
+#             output = os.read(master, 1024).decode()
+#             if not output:
+#                 break
+
+#             # 过滤重复的进度信息
+#             for line in output.split("\n"):
+#                 if line.strip() and line not in seen_lines:
+#                     seen_lines.add(line)
+#                     print(line, flush=True)  # 逐行打印
+#         except OSError:
+#             break
+
+#     # 等待进程结束
+#     process.wait()
+
+import subprocess
+
+def run_cmd(cmd: str):
+    command = cmd.split(" ")
+
+    # 直接执行命令，让 stdout 和 stderr 直接流式输出到终端
+    process = subprocess.Popen(command, stdout=None, stderr=None)
+
+    # 等待进程执行完
+    process.wait()
+
+run_cmd("ollama push ictrek/qwen2.5:14b32ft")

{hjxdl-0.3.32.dist-info → hjxdl-0.3.34.dist-info}/METADATA

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

{hjxdl-0.3.32.dist-info → hjxdl-0.3.34.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=0ZB18d5szcsEdhPhxnZ9F0TWwyVk621gLmTn_NaM_sU,513
+hdl/_version.py,sha256=T2mdLFUhRyvIXBcPDpNzBihjoO6UD14Ov9HOFD_vFnU,513
 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
@@ -129,22 +129,23 @@ hdl/utils/desc/template.py,sha256=Kf_tbL-XkDCKNQ3UncbCuYEeUgXEa7kRVCf9TD2b8og,25
 hdl/utils/desc/tools.py,sha256=tovV4sqjMBCHI6PG5YGJYBKpoXRhgYilzt77ZYTL7Jk,673
 hdl/utils/general/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/utils/general/glob.py,sha256=Zuf7WHU0UdUPOs9UrhxmrCiMC8GrHxQU6n3mTThv6yc,1120
-hdl/utils/general/runners.py,sha256=x7QBolp3MrqNV6L4rB6Ueybr26bqkRFZTuXhY0SwyLk,3061
+hdl/utils/general/runners.py,sha256=bOnjpmsAq5Zi4wvIGWgqSEW1gIJpeHiie9e-pmAYX9s,4387
 hdl/utils/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/utils/llm/chat.py,sha256=q0zQmf-6DeSYOrC2qDn_QFOlILjRHU69eVRUn0eIIbA,26526
 hdl/utils/llm/chatgr.py,sha256=5F5PJHe8vz3iCfi4TT54DCLRi1UeJshECdVtgvvvao0,3696
 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/llm_wrapper.py,sha256=luy69LacBzC4b4GVbj7lCWOLZlyCDMiWQv3yFb1qLuM,15308
+hdl/utils/llm/llm_wrapper.py,sha256=ZjmogEM0TrvlM83LG6l5t8CFnMThBWUmUOvA5WY9ODo,15309
+hdl/utils/llm/ollama.py,sha256=uEdLsNAc6b56r37hNiE3nrd6oZ2lmQ0gYbVvOc9YVIM,1389
 hdl/utils/llm/vis.py,sha256=SSP6tOwKLq0hWcpM3twI9TitqzBmKjlcGrnXEWYlCzM,26055
 hdl/utils/llm/visrag.py,sha256=0i-VrxqgiV-J7R3VPshu9oc7-rKjFJOldYik3HDXj6M,10176
 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.3.32.dist-info/LICENSE,sha256=lkMiSbeZHBQLB9LJEkS9-L3Z-LBC4yGnKrzHSG8RkPM,2599
-hjxdl-0.3.32.dist-info/METADATA,sha256=TTnaKqSV-AJs2lIk_6VXnWLTkRiD6VbZbXT2qogP3iw,1336
-hjxdl-0.3.32.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-hjxdl-0.3.32.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.3.32.dist-info/RECORD,,
+hjxdl-0.3.34.dist-info/LICENSE,sha256=lkMiSbeZHBQLB9LJEkS9-L3Z-LBC4yGnKrzHSG8RkPM,2599
+hjxdl-0.3.34.dist-info/METADATA,sha256=t1FMY3kDBsuXDrSrJhDrIW_Fd87vN_RRTxDoq04cH18,1336
+hjxdl-0.3.34.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+hjxdl-0.3.34.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.3.34.dist-info/RECORD,,

{hjxdl-0.3.32.dist-info → hjxdl-0.3.34.dist-info}/WHEEL

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