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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oocana-python-executor
-Version: 0.16.1
+Version: 0.16.3
 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.1 → oocana_python_executor-0.16.3}/pyproject.toml

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

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

@@ -82,12 +82,12 @@ def output_return_object(obj, context: Context):
 
 logger = logging.getLogger(EXECUTOR_NAME)
 
-async def run_block(message, mainframe: Mainframe, session_dir: str, tmp_dir: str):
+async def run_block(message, mainframe: Mainframe, session_dir: str, tmp_dir: str, package_name: str):
 
     logger.info(f"block {message.get('job_id')} start")
     try:
         payload = ExecutePayload(**message)
-        context = createContext(mainframe, payload.session_id, payload.job_id, store, payload.outputs, session_dir, tmp_dir = tmp_dir)
+        context = createContext(mainframe, payload.session_id, payload.job_id, store, payload.outputs, session_dir, tmp_dir = tmp_dir, package_name=package_name)
     except Exception:
         traceback_str = traceback.format_exc()
         # rust 那边会保证传过来的 message 一定是符合格式的，所以这里不应该出现异常。这里主要是防止 rust 修改错误。

{oocana_python_executor-0.16.1 → oocana_python_executor-0.16.3}/python_executor/context.py

@@ -9,7 +9,7 @@ from .data import EXECUTOR_NAME
 logger = logging.getLogger(EXECUTOR_NAME)
 
 def createContext(
-    mainframe: Mainframe, session_id: str, job_id: str, store, output, session_dir: str, tmp_dir: str
+    mainframe: Mainframe, session_id: str, job_id: str, store, output, session_dir: str, tmp_dir: str, package_name: str
 ) -> Context:
 
     node_props = mainframe.notify_block_ready(session_id, job_id)
@@ -59,7 +59,7 @@ def createContext(
     
     blockInfo = BlockInfo(**node_props)
 
-    ctx = Context(inputs, blockInfo, mainframe, store, output, session_dir, tmp_dir)
+    ctx = Context(inputs, blockInfo, mainframe, store, output, session_dir, tmp_dir, package_name=package_name)
     # 跟 executor 日志分开，避免有的库在 logger 里面使用 print，导致 hook 出现递归调用。
     block_logger = logging.getLogger(f"block {job_id}")
     ctx_handler = ContextHandler(ctx)

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

@@ -49,7 +49,7 @@ def config_logger(session_id: str, identifier: str | None, output: Literal["cons
     logger.propagate = False
 
 
-async def run_executor(address: str, session_id: str, tmp_dir: str, package: str | None, session_dir: str, identifier: str | None = None):
+async def run_executor(address: str, session_id: str, tmp_dir: str, package: str | None, session_dir: str, identifier: str | None = None, debug_port: int | None = None):
 
     if identifier is not None:
         mainframe = Mainframe(address, f"python-executor-id-{identifier}", logger)
@@ -72,6 +72,8 @@ async def run_executor(address: str, session_id: str, tmp_dir: str, package: str
     elif os.path.exists("/app/workspace"):
         sys.path.append("/app/workspace")
 
+    package_name = os.path.basename(package) if package is not None else "workspace"
+
 
     def not_current_session(message):
         return message.get("session_id") != session_id
@@ -144,7 +146,7 @@ async def run_executor(address: str, session_id: str, tmp_dir: str, package: str
     mainframe.subscribe(exit_report_topic(), service_exit)
     mainframe.subscribe(status_report_topic(), service_status)
 
-    mainframe.notify_executor_ready(session_id, EXECUTOR_NAME, package, identifier)
+    mainframe.notify_executor_ready(session_id, package, identifier, debug_port)
 
     async def spawn_service(message: ServiceExecutePayload, service_hash: str):
         logger.info(f"create new service {message.get('dir')}")
@@ -211,12 +213,12 @@ async def run_executor(address: str, session_id: str, tmp_dir: str, package: str
             else:
                 if not_current_session(message):
                     continue
-                run_block_in_new_thread(message, mainframe, session_dir=session_dir, tmp_dir=tmp_dir)
+                run_block_in_new_thread(message, mainframe, session_dir=session_dir, tmp_dir=tmp_dir, package_name=package_name)
 
-def run_block_in_new_thread(message, mainframe: Mainframe, session_dir: str, tmp_dir: str):
+def run_block_in_new_thread(message, mainframe: Mainframe, session_dir: str, tmp_dir: str, package_name: str):
 
     async def run():
-        await run_block(message, mainframe, session_dir=session_dir, tmp_dir=tmp_dir)
+        await run_block(message, mainframe, session_dir=session_dir, tmp_dir=tmp_dir, package_name=package_name)
     run_in_new_thread(run)
 
 def main():
@@ -254,6 +256,7 @@ def main():
     if len(unknown_args) > 0:
         logger.warning(f"receive unknown args: {unknown_args}")
 
+    debug_port = None
     if namespace.debug_port is not None and namespace.debug_port.isdigit():
         try:
             import debugpy
@@ -263,12 +266,17 @@ def main():
                 logger.info("wait for client to connect")
                 debugpy.wait_for_client()
                 logger.info("client connected")
+            debug_port = int(namespace.debug_port)
         except ImportError:
             logger.warning("Warning: debugpy not installed, debugging functionality will not be available")
+            debug_port = None
         except Exception as e:
             logger.warning(f"Warning: debugpy listen failed: {e}")
+            debug_port = None
+    else:
+        debug_port = None
 
-    run_async_code(run_executor(address=address, tmp_dir=tmp_dir, session_id=session_id, package=package, session_dir=session_dir, identifier=identifier))
+    run_async_code(run_executor(address=address, tmp_dir=tmp_dir, session_id=session_id, package=package, session_dir=session_dir, identifier=identifier, debug_port=debug_port))
 
 if __name__ == '__main__':
     main()

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

@@ -1,4 +1,7 @@
 from python_executor.data import block_var
+from logging import Logger
+
+__all__ = ["add_matplot_module", "import_helper"]
 
 def add_matplot_module():
     import sys
@@ -6,13 +9,14 @@ def add_matplot_module():
     dir = os.path.dirname(os.path.abspath(__file__))
     sys.path.insert(0, dir)
 
-def import_helper(logger):
+
+def setup_matplot(logger: Logger):
     # matplotlib 的 use() 替换
     try:
         import matplotlib # type: ignore
         matplotlib.use('module://matplotlib_oomol') # matplotlib_oomol.py 文件所在目录加入 PYTHONPATH
-    except:
-        logger.error("import matplotlib failed")
+    except Exception as e:
+        logger.warning("import matplotlib failed", e)
         return
 
     # matplotlib 主题替换
@@ -21,9 +25,11 @@ def import_helper(logger):
         import matplotlib.pyplot as plt # type: ignore
         plt.style.use("classic" if os.getenv("OOMOL_COLOR_SCHEME", "dark") == "light" else "dark_background")
         plt.rcParams['font.sans-serif'] = ['Source Han Sans SC']
-    except:
-        pass
+    except Exception as e:
+        logger.warning("matplotlib theme setup failed", e)
+
 
+def setup_plotly(logger: Logger):
     # plotly 的 show() 替换
     try:
         import os
@@ -65,5 +71,10 @@ def import_helper(logger):
 
         renderers['oomol'] = OomolRenderer()
         renderers.default = 'oomol'
-    except:
-        logger.warning("import plotly failed")
+    except Exception as e:
+        logger.warning("import plotly failed", e)
+
+
+def import_helper(logger: Logger):
+    setup_matplot(logger)
+    setup_plotly(logger)

{oocana_python_executor-0.16.1 → oocana_python_executor-0.16.3}/python_executor/service.py

@@ -179,7 +179,7 @@ class ServiceRuntime(ServiceContextAbstractClass):
         self._runningBlocks.add(job_id)
         self._jobs.add(job_id)
 
-        context = createContext(self._mainframe, payload["session_id"], payload["job_id"], self._store, payload["outputs"], self._session_dir, tmp_dir=self._session_dir) # TODO: tmp_dir need consider global service.
+        context = createContext(self._mainframe, payload["session_id"], payload["job_id"], self._store, payload["outputs"], self._session_dir, tmp_dir=self._session_dir, package_name=service_hash) # TODO: tmp_dir need consider global service.
 
         if isinstance(self.block_handler, dict):
             handler = self.block_handler.get(block_name)