oocana-python-executor 0.16.0__tar.gz → 0.16.1__tar.gz

{oocana_python_executor-0.16.0 → oocana_python_executor-0.16.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oocana-python-executor
-Version: 0.16.0
+Version: 0.16.1
 Summary: a client subscribe mqtt topic to execute oocana's block
 Author-Email: l1shen <lishen1635@gmail.com>, yleaf <11785335+leavesster@users.noreply.github.com>
 License: MIT

{oocana_python_executor-0.16.0 → oocana_python_executor-0.16.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "oocana-python-executor"
-version = "0.16.0"
+version = "0.16.1"
 authors = [
     { name = "l1shen", email = "lishen1635@gmail.com" },
     { name = "yleaf", email = "11785335+leavesster@users.noreply.github.com" },

{oocana_python_executor-0.16.0 → oocana_python_executor-0.16.1}/python_executor/block.py

@@ -4,7 +4,7 @@ from typing import Optional, TypedDict
 import inspect
 import traceback
 import logging
-from .data import store, vars, EXECUTOR_NAME
+from .data import store, block_var, EXECUTOR_NAME
 from .context import createContext
 from .hook import ExitFunctionException
 import os
@@ -103,7 +103,7 @@ async def run_block(message, mainframe: Mainframe, session_dir: str, tmp_dir: st
         })
         return
 
-    vars.set(context)
+    block_var.set(context)
 
     load_dir = payload.dir
 

oocana_python_executor-0.16.1/python_executor/data.py

@@ -0,0 +1,5 @@
+from contextvars import ContextVar
+from oocana import Context, EXECUTOR_NAME  # noqa: F401
+
+block_var: ContextVar[Context] = ContextVar('block-context')
+store = {}

{oocana_python_executor-0.16.0 → oocana_python_executor-0.16.1}/python_executor/executor.py

@@ -234,29 +234,32 @@ def main():
     parser.add_argument("--wait-for-client", help="wait for client to connect", default=False, action="store_true")
 
     try:
-        args = parser.parse_args()
+        namespace, unknown_args = parser.parse_known_args()
     except Exception as e:
-        print(f"parse args error: {e}")
+        hook.original_print(f"parse args error: {e}")
         # because we hook sys.exit in hook.py and raise a exception, the exit will be reset to 1.
         # parser origin exit code is 2. so we use 2 here.
-        sys.exit(2)
+        hook.original_exit(2)
 
-    address: str = args.address
-    session_id: str = str(args.session_id)
-    output: Literal["console", "file"] = args.output
-    package: str | None = args.package
-    session_dir: str = args.session_dir
-    tmp_dir: str = args.tmp_dir
-    identifier: str | None = args.identifier
+    address: str = namespace.address
+    session_id: str = str(namespace.session_id)
+    output: Literal["console", "file"] = namespace.output
+    package: str | None = namespace.package
+    session_dir: str = namespace.session_dir
+    tmp_dir: str = namespace.tmp_dir
+    identifier: str | None = namespace.identifier
 
     config_logger(session_id, identifier, output)
 
-    if args.debug_port is not None and args.debug_port.isdigit():
+    if len(unknown_args) > 0:
+        logger.warning(f"receive unknown args: {unknown_args}")
+
+    if namespace.debug_port is not None and namespace.debug_port.isdigit():
         try:
             import debugpy
-            debugpy.listen(int(args.debug_port))
-            logger.info(f"debugpy listen on port {args.debug_port}")
-            if args.wait_for_client:
+            debugpy.listen(int(namespace.debug_port))
+            logger.info(f"debugpy listen on port {namespace.debug_port}")
+            if namespace.wait_for_client:
                 logger.info("wait for client to connect")
                 debugpy.wait_for_client()
                 logger.info("client connected")

{oocana_python_executor-0.16.0 → oocana_python_executor-0.16.1}/python_executor/hook.py

@@ -3,7 +3,7 @@ from builtins import exit as global_exit
 from typing import TypeAlias, Any
 import sys
 import builtins
-from .data import vars, EXECUTOR_NAME
+from .data import block_var, EXECUTOR_NAME
 import logging
 
 logger = logging.getLogger(EXECUTOR_NAME)
@@ -18,27 +18,25 @@ original_print = print
 _ExitCode: TypeAlias = str | int | None
 
 def sys_exit(status: _ExitCode = None) -> None:
-    raise ExitFunctionException(status)
+    if block_var.get(None) is not None:
+        raise ExitFunctionException(status)
+    else:
+        original_exit(status)
 
 def sys_global_exit(status: _ExitCode = None) -> None:
-    raise ExitFunctionException(status)
+    if block_var.get(None) is not None:
+        raise ExitFunctionException(status)
+    else:
+        original_global_exit(status)
 
 def global_print(*values: object, sep: str | None = " ", end: str | None = "\n", file: Any | None = None, flush: bool = False) -> None:
-    
-    context = None  # 初始化 context 变量
-    try:
-        context = vars.get()
-    except LookupError:
-        # 这个 logger 不会上报到 root handle 中，所以即使 root logger 的 Handler 里面有 print 函数，也不会导致递归调用
-        logger.warning("print called outside of block")
-    except Exception as e:
-        logger.error(f"print error: {e}")
-
-    if context is not None:
+
+    block_ctx = block_var.get(None)
+    if block_ctx is not None:
         try:
             msg_sep = sep or " "
             msg = msg_sep.join(map(str, values))
-            context.report_log(msg)
+            block_ctx.report_log(msg)
         except Exception as e:
             logger.error(f"transform print message to context log error: {e}")
 

{oocana_python_executor-0.16.0 → oocana_python_executor-0.16.1}/python_executor/matplot/matplotlib_oomol/oomol.py

@@ -2,7 +2,7 @@
 
 from matplotlib.backend_bases import Gcf # type: ignore
 from matplotlib.backends.backend_agg import FigureCanvasAgg # type: ignore
-from python_executor.data import vars
+from python_executor.data import block_var
 
 FigureCanvas = FigureCanvasAgg
 
@@ -10,8 +10,8 @@ def show(*args, **kwargs):
     import sys
     from io import BytesIO
     from base64 import b64encode
-    if vars is not None:
-        context = vars.get()
+    context = block_var.get(None)
+    if context is not None:
         images = []
         for figmanager in Gcf.get_all_fig_managers():
                 buffer = BytesIO()

{oocana_python_executor-0.16.0 → oocana_python_executor-0.16.1}/python_executor/matplot/oomol_matplot_helper.py

@@ -1,4 +1,4 @@
-from python_executor.data import vars
+from python_executor.data import block_var
 
 def add_matplot_module():
     import sys
@@ -13,6 +13,7 @@ def import_helper(logger):
         matplotlib.use('module://matplotlib_oomol') # matplotlib_oomol.py 文件所在目录加入 PYTHONPATH
     except:
         logger.error("import matplotlib failed")
+        return
 
     # matplotlib 主题替换
     try:
@@ -34,8 +35,8 @@ def import_helper(logger):
 
         class OomolRenderer(ExternalRenderer):
             def render(self, fig_dict):
-                if vars:
-                    context = vars.get()
+                context = block_var.get(None)
+                if context is not None:
 
                     import re
                     from plotly.io import to_html # type: ignore

{oocana_python_executor-0.16.0 → oocana_python_executor-0.16.1}/tests/test_cli.py

@@ -35,6 +35,23 @@ class TestExecutorCLI(unittest.TestCase):
         process.send_signal(signal.SIGINT)
 
         process.wait()
+
+    def test_cli_addition_args(self):
+        cli_command = [sys.executable, "-u", "-m", "python_executor.executor", "--session-id", "test-session", "--session-dir", "/tmp", "--tmp-dir", "/tmp", "--echo", "Hello World!"]
+
+        print("Starting CLI tool... in", executor_parent_dir)
+
+        process = subprocess.Popen(cli_command, cwd=executor_parent_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+        time.sleep(3)
+
+        code = process.poll()
+
+        self.assertIsNone(code, f"CLI tool failed to start or exit with code {code}")
+
+        process.send_signal(signal.SIGINT)
+
+        process.wait()
     
     def test_cli_fail(self):
         cli_command = [sys.executable, "-u", "-m", "python_executor.executor"]

oocana_python_executor-0.16.0/python_executor/data.py

@@ -1,5 +0,0 @@
-from contextvars import ContextVar
-from oocana import Context, EXECUTOR_NAME
-
-vars: ContextVar[Context] = ContextVar('context')
-store = {}