pycoze 0.1.446__py3-none-any.whl → 0.1.448__py3-none-any.whl

pycoze/reference/lib.py

@@ -9,6 +9,10 @@ import nest_asyncio
 nest_asyncio.apply() 
 
 def call_func(func, args=None, kwargs=None):
+    """
+        args:是一个元组
+        kwargs:是一个字典
+    """
     if args is None:
         args = ()
     if kwargs is None:

pycoze/utils/__init__.py

@@ -2,8 +2,12 @@ from .arg import read_arg
 from .env import read_params_file, params, read_json_file
 from .socket import TcpSocket, socket, socket_subscribe
 from .text_or_file import to_text
+from .process import better_kill, execute_script, execute_script_and_block, execute_script_no_block
 
-__all__ = [read_arg, 
-           read_params_file, params, read_json_file, 
-           TcpSocket, socket, socket_subscribe,
-           to_text]
+__all__ = [
+    read_arg, 
+    read_params_file, params, read_json_file, 
+    TcpSocket, socket, socket_subscribe,
+    to_text,
+    better_kill, execute_script, execute_script_and_block, execute_script_no_block
+]

pycoze/utils/process.py

@@ -0,0 +1,133 @@
+import asyncio
+import os
+import sys
+import atexit
+import time
+import chardet
+
+
+def better_kill(process, raiseError: bool):
+    """优雅地终止进程，如果超时则强制终止"""
+    try:
+        process.terminate()  # 先尝试优雅终止
+        time.sleep(5)  # 等待5秒
+    except asyncio.TimeoutError:
+        try:
+            process.kill()  # 如果超时，强制终止
+        except:
+            if raiseError:
+                raise
+            else:
+                pass
+    except Exception as e:
+        # print(f"Error while terminating process: {e}")
+        if raiseError:
+            raise
+        else:
+            pass
+
+
+
+async def read_stream(stream, log, separator=b'\n'):
+    def log_func(data):
+        try:
+            data = data.decode().strip()
+            log(data)
+        except:
+            try:
+                encoding = chardet.detect(data)['encoding']
+                data = data.decode(encoding).strip()
+            finally:
+                log(data)
+
+    while True:
+        try:
+            line = await stream.readuntil(separator)
+            log_func(line)
+        except asyncio.IncompleteReadError as e:
+            # If the stream ends without a separator, output the remaining content
+            if e.partial:
+                log_func(e.partial)
+            break
+        except asyncio.LimitOverrunError as e:
+            # If the separator is found but not within the limit, read the chunk
+            chunk = await stream.read(e.consumed)
+            log_func(chunk)
+
+
+
+
+async def execute_script(script_path, *args, cwd=None, env=None):
+    cwd = cwd or os.path.dirname(script_path)
+    process = await asyncio.create_subprocess_exec(
+        sys.executable,
+        "-u",
+        script_path,
+        *args,
+        cwd=cwd,
+        env=env,
+        stdout=asyncio.subprocess.PIPE,
+        stderr=asyncio.subprocess.PIPE,
+    )
+    return process
+
+
+async def execute_script_and_block(script_path, log, *args, cwd=None, env=None):
+    try:
+        # 执行脚本
+        process = await execute_script(script_path, *args, cwd=cwd, env=env)
+    except Exception as e:
+        better_kill(process, False)
+        raise Exception(f"Failed to execute script: {e}")
+
+    try:
+        # 开始并行读取 stdout 和 stderr
+        stdout_task = asyncio.create_task(read_stream(process.stdout, log))
+        stderr_task = asyncio.create_task(read_stream(process.stderr, log))
+
+        # 注册atexit处理程序
+        async def cleanup():
+            better_kill(process, False)
+            stdout_task.cancel()
+            stderr_task.cancel()
+        atexit.register(cleanup)
+
+        # 等待进程完成
+        return_code = await process.wait()
+
+        # 等待读取任务完成
+        await stdout_task
+        await stderr_task
+
+    except Exception as e:
+        better_kill(process, False)
+        stdout_task.cancel()
+        stderr_task.cancel()
+        raise Exception(f"Error during script execution or stream reading: {e}")
+
+    # 检查返回码
+    if return_code != 0:
+        better_kill(process, False)
+        raise Exception("Error executing script, return code: {}".format(return_code))
+
+    # 如果一切正常，返回成功
+    return "success"
+
+
+
+async def execute_script_no_block(script_path, log, *args, cwd=None, env=None):
+    process = await execute_script(script_path, *args, cwd=cwd, env=env)
+
+    # Start reading stdout and stderr in parallel
+    stdout_task = asyncio.create_task(read_stream(process.stdout, log))
+    stderr_task = asyncio.create_task(read_stream(process.stderr, log))
+
+    # Register atexit handler to ensure process cleanup
+    def cleanup():
+        better_kill(process, False)
+        stdout_task.cancel()
+        stderr_task.cancel()
+
+    atexit.register(cleanup)
+
+    return process, stdout_task, stderr_task

pycoze/utils/socket.py

@@ -12,7 +12,8 @@ class TcpSocket:
         self.is_connected = True
         self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         if params is not None:
-            self.socket.connect(("localhost", int(params["tcpPort"])))
+            if "tcpPort" in params:
+                self.socket.connect(("localhost", int(params["tcpPort"])))
 
     def post(self, subject, message):
         subject = "python-event:" + subject

{pycoze-0.1.446.dist-info → pycoze-0.1.448.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pycoze
-Version: 0.1.446
+Version: 0.1.448
 Summary: Package for pycoze only!
 Author: Yuan Jie Xiong
 Author-email: aiqqqqqqq@qq.com

{pycoze-0.1.446.dist-info → pycoze-0.1.448.dist-info}/RECORD

@@ -19,7 +19,7 @@ pycoze/bot/tools.py,sha256=BWMdwvqLzvcyaW38lzxUWtc0K1V-C_qPSEZ3OKlAQvU,11108
 pycoze/reference/__init__.py,sha256=u25FWJnOBWsDRoL8_O4jzW4tkJrHT3Sqp9EGCxUhS3E,211
 pycoze/reference/bot.py,sha256=UZK24Qm8kpqpwXJy_zNZeTEEDee05luXdSBeUm0NCt0,2029
 pycoze/reference/fn.py,sha256=ZXnG2ctbHMgr3quQp-4bpnErIkuT-t2_ToSET5LTLbc,750
-pycoze/reference/lib.py,sha256=T-oBOKxkus5dTouc0oDgfRzUyi6aTyY-FF4yX7SzF5M,3755
+pycoze/reference/lib.py,sha256=R-0T2QjxCUSF7K7XQtKaGm2n7uVptW4BnGu8s1QjMe0,3835
 pycoze/reference/tool.py,sha256=kv5Ww8fZVECNJfE7Ku5M88jqHgSO0yTF0S6eijQu9KE,1104
 pycoze/reference/workflow.py,sha256=59teXvIM_kOa-rJMLudJaJb9FBumYEmOzMT5jifKqDY,1337
 pycoze/ui/__init__.py,sha256=uaXet23wUk64TcZjpBX8qOx4aUhwA_ucrmcxy7Q4Qr4,929
@@ -27,13 +27,14 @@ pycoze/ui/base.py,sha256=7drlRZ40zF1nwGIRwLTC3EuZOSENz2qhQEWUM5yd9cg,1081
 pycoze/ui/color.py,sha256=cT9Ib8uNzkOKxyW0IwVj46o4LwdB1xgNCj1_Rou9d_4,854
 pycoze/ui/typ.py,sha256=NpT0FrbHvByOszBZMFtroRp7I7pN-38tYz_zPOPejF4,1723
 pycoze/ui/ui_def.py,sha256=lGWZGpzRoegP34D562PvK0EJHrmVZrlHW1JjsIG9A9Q,4521
-pycoze/utils/__init__.py,sha256=H-2KRUsUG47owL0sbD1KwDOuRm-j_0K4RkeNhzr7ISo,319
+pycoze/utils/__init__.py,sha256=yj1LLPIRL7EhYuMzO1-NghW_6OMQgef3ofOeyLMksiA,488
 pycoze/utils/arg.py,sha256=jop1tBfe5hYkHW1NSpCeaZBEznkgguBscj_7M2dWfrs,503
 pycoze/utils/env.py,sha256=5pWlXfM1F5ZU9hhv1rHlDEanjEW5wf0nbyez9bNRqqA,559
-pycoze/utils/socket.py,sha256=bZbFFRH4mfThzRqt55BAAGQ6eICx_ja4x8UGGrUdAm8,2428
+pycoze/utils/process.py,sha256=U2MURGmxfyWBqdbKfy5UvyV17M40B6HHlNELgWfgrTE,3824
+pycoze/utils/socket.py,sha256=4Wm4LlwdWXC_kAV0NnZbUc0Y3Kc6KRMyFRqSw79u-9w,2468
 pycoze/utils/text_or_file.py,sha256=gpxZVWt2DW6YiEg_MnMuwg36VNf3TX383QD_1oZNB0Y,551
-pycoze-0.1.446.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.446.dist-info/METADATA,sha256=UNb3t7Jo4EnpV95u0f7UDObcUMxJoOIUs0Oj-tdiGbM,854
-pycoze-0.1.446.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pycoze-0.1.446.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.446.dist-info/RECORD,,
+pycoze-0.1.448.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.448.dist-info/METADATA,sha256=pHNdV3nv2i-cfQkJhgLjtD4PYruxtsHYebtkKM-vSgI,854
+pycoze-0.1.448.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pycoze-0.1.448.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.448.dist-info/RECORD,,