toolkits 0.2.7__tar.gz → 0.2.9__tar.gz

{toolkits-0.2.7 → toolkits-0.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: toolkits
-Version: 0.2.7
+Version: 0.2.9
 Summary: toolkits for quickly reference
 Author-Email: li_jia_yue <59727816@qq.com>
 License: MIT

{toolkits-0.2.7 → toolkits-0.2.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "toolkits"
-version = "0.2.7"
+version = "0.2.9"
 description = "toolkits for quickly reference"
 authors = [
     { name = "li_jia_yue", email = "59727816@qq.com" },

{toolkits-0.2.7/src/toolkits/libs_core → toolkits-0.2.9/src/toolkits/config_parser}/config_helper.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from .load_module import LoadModule
+from toolkits.libs_core.load_module import LoadModule
 
 
 class ConfigHelpers:

{toolkits-0.2.7/src/toolkits/libs_core → toolkits-0.2.9/src/toolkits/config_parser}/env_prepare.py

@@ -12,7 +12,7 @@ from toolkits.system.shell_helper import exec_shell
 from unipath import Path
 
 from .config_helper import ConfigHelpers
-from .mysql_helper import MysqlHelper
+from toolkits.databases.mysql_helper import MysqlHelper
 
 logger = log("EnvPrepare")
 

{toolkits-0.2.7 → toolkits-0.2.9}/src/toolkits/db_query_demo.py

@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-
-import json
 import traceback
 
 import fire
 from log4python.Log4python import log
 from toolkits.system.basic_utils import get_script_directory
 
-from toolkits.libs_core.env_prepare import EnvPrepare
-from toolkits.libs_core.mysql_helper import MysqlHelper
+from toolkits.config_parser.env_prepare import EnvPrepare
+from toolkits.databases.mysql_helper import MysqlHelper
 
 logger = log("DbQueryDemo")
 

{toolkits-0.2.7 → toolkits-0.2.9}/src/toolkits/system/shell_helper.py

@@ -121,20 +121,22 @@ return-val
     return result
 
 
-async def run_command_async(command, timeout=5):
+async def run_command_async(command, timeout=5, encoding="utf-8", shell=False, cwd=None, env=None):
     process = None
     try:
         process = await asyncio.create_subprocess_shell(
             command,
-
             stdout=asyncio.subprocess.PIPE,
-            stderr=asyncio.subprocess.PIPE
+            stderr=asyncio.subprocess.PIPE,
+            shell=shell,
+            cwd=cwd,
+            env=env
         )
         stdout, stderr = await asyncio.wait_for(process.communicate(), timeout=timeout)
         ret = {
             "exit_code": process.returncode,
-            "stdout": stdout,
-            "stderr": stderr
+            "stdout": str(stdout.decode(encoding)).splitlines(False),
+            "stderr": str(stderr.decode(encoding)).splitlines(False)
         }
         return ret
     except asyncio.TimeoutError:
@@ -148,15 +150,47 @@ async def run_command_async(command, timeout=5):
         return ret
 
 
-def exec_shell_async(command, timeout=5):
-    loop = asyncio.get_event_loop()
-    return loop.run_until_complete(run_command_async(command, timeout=timeout))
+def get_loop_obj():
+    try:
+        # 尝试获取当前线程的事件循环（可能会失败）
+        loop = asyncio.get_event_loop()
+    except RuntimeError as e:
+        # 如果报错 "There is no current event loop..."，则创建新的事件循环
+        if "There is no current event loop" in str(e):
+            loop = asyncio.new_event_loop()
+            asyncio.set_event_loop(loop)
+        else:
+            # 其他 RuntimeError 直接抛出
+            raise
+    return loop
+
+
+def exec_shell_async(command, timeout=60 * 10, encoding="utf-8", cwd=None, env=None):
+    """
+    异常执行命令，检测执行时间超时
+    :param command:  要执行的命令
+    :param timeout:  等待的超时时间，超时后，返回: exit_code=-1
+    :param encoding: 解析命令行返回数据的编码格式，默认为：utf-8, 中文Windows环境可指定为：GBK
+    :param env:
+    :param cwd:
+    :param shell:
+    :return: {'exit_code': 0, 'stdout': '\r\n正在 Ping 127.0.0.1 具有 32 字节的数据:\r\n来自 127.0.0.1 的回复: 字节=32 时间<1ms TTL=128\r\n\r\n', 'stderr': ''}
+    """
+    if command == "" or command is None:
+        ret = {
+            "exit_code": -1,
+            "stdout": "",
+            "stderr": "No cmd was found"
+        }
+        return ret
+
+    # asyncio.get_event_loop()
+    loop = get_loop_obj()
+    return loop.run_until_complete(run_command_async(command, timeout=timeout, encoding=encoding, cwd=cwd, env=env))
 
 
-def exec_shell(cmd, timeout=0, bufsize=0, executable=None,
-               stdin=None, stdout=None, stderr=None,
-               preexec_fn=None, close_fds=False, shell=False,
-               cwd=None, env=None, universal_newlines=False,
+def exec_shell(cmd, timeout=0, bufsize=0, executable=None, stdin=None, stdout=None, stderr=None,
+               preexec_fn=None, close_fds=False, shell=False, cwd=None, env=None, universal_newlines=False,
                startupinfo=None, creationflags=0):
     """exec_shell("grep 'processor' /proc/cpuinfo | sort -u | wc -l")
 
@@ -170,17 +204,22 @@ return-code::
     }
 code-end
 
+    :param cmd:  exec command
     :param preexec_fn:
     :type stdin: object
     :param executable:
     :param cwd:
     :param timeout:
-    :param cmd:  exec command
     :return: return a dict to caller
 
     """
     if cmd == "" or cmd is None:
-        return "No Cmd Input"
+        ret = {
+            "exit_code": -1,
+            "stdout": "",
+            "stderr": "No cmd was found"
+        }
+        return ret
 
     fp_out = subprocess.PIPE
     fp_err = subprocess.PIPE

{toolkits-0.2.7 → toolkits-0.2.9}/src/toolkits/tookits_cli.py

@@ -1,12 +1,11 @@
 # -*- coding: utf-8 -*-
-import sys
 import traceback
 
 import fire
 from log4python.Log4python import log
 from toolkits.system.basic_utils import get_script_directory
 
-from libs_core.env_prepare import EnvPrepare
+from toolkits.config_parser.env_prepare import EnvPrepare
 from tookits_app import tookitsApp
 from libs_core.process_admin import ProcessAdmin
 from db_query_demo import DbQueryDemo

toolkits-0.2.9/tests/test_shell_helper.py

@@ -0,0 +1,6 @@
+from toolkits.system.shell_helper import exec_shell_async
+
+
+def test_exec_shell_async():
+    ret = exec_shell_async("ping -n 11 127.0.0.1", 5, encoding='GBK', cwd="C:\\")
+    assert ret['exit_code'] != 0

{toolkits-0.2.7 → toolkits-0.2.9}/tests/test_tookits.py

@@ -2,7 +2,7 @@
 Tests for `tookits` module.
 """
 import pytest
-from toolkits import tookits
+from toolkits import toolkits
 
 
 class TestTookits(object):