oocana-python-executor 0.16.10__tar.gz → 0.16.12__tar.gz

{oocana_python_executor-0.16.10 → oocana_python_executor-0.16.12}/PKG-INFO

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

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

{oocana_python_executor-0.16.10 → oocana_python_executor-0.16.12}/python_executor/executor.py

@@ -91,7 +91,6 @@ async def run_executor(address: str, session_id: str, tmp_dir: str, package: str
     # 目前的 mqtt 库，在 subscribe 回调里 publish 消息会导致死锁无法工作，参考 https://github.com/eclipse/paho.mqtt.python/issues/527 或者 https://stackoverflow.com/a/36964192/4770006
     # 通过这种方式来绕过，所有需要 callback 后 publish message 的情况，都需要使用 future 类似方式来绕过。
     fs = queue.Queue()
-    loop = asyncio.get_event_loop()
 
     def execute_block(message):
         if not_current_session(message):
@@ -108,9 +107,7 @@ async def run_executor(address: str, session_id: str, tmp_dir: str, package: str
         job_set.add(job_id)
 
         nonlocal fs
-        f = loop.create_future()
-        fs.put(f)
-        f.set_result(message)
+        fs.put(message)
     
     def execute_service_block(message):
         if not_current_session(message):
@@ -119,10 +116,7 @@ async def run_executor(address: str, session_id: str, tmp_dir: str, package: str
         if not_current_job(message):
             return
 
-        nonlocal fs
-        f = loop.create_future()
-        fs.put(f)
-        f.set_result(message)
+        fs.put(message)
 
     def service_exit(message: ReportStatusPayload):
         service_hash = message.get("service_hash")
@@ -149,7 +143,7 @@ async def run_executor(address: str, session_id: str, tmp_dir: str, package: str
 
     mainframe.subscribe(f"executor/{EXECUTOR_NAME}/run_block", execute_block)
     mainframe.subscribe(f"executor/{EXECUTOR_NAME}/run_service_block", execute_service_block)
-    mainframe.subscribe('report', report_message)
+    mainframe.add_report_callback(report_message)
     mainframe.subscribe(exit_report_topic(), service_exit)
     mainframe.subscribe(status_report_topic(), service_status)
 
@@ -185,7 +179,6 @@ async def run_executor(address: str, session_id: str, tmp_dir: str, package: str
                 service_store[service_hash] = "running"
             run_in_new_thread(run)
 
-        # FIXME: mqtt 不能在 subscribe 后立即 publish，需要修复。
         mainframe.subscribe(prepare_report_topic(params), lambda _: send_service_config(params, message))
 
         await process.wait()
@@ -203,24 +196,21 @@ async def run_executor(address: str, session_id: str, tmp_dir: str, package: str
         mainframe.publish(run_action_topic(params), message)
 
     while True:
-        await asyncio.sleep(0.1)  # Avoid busy waiting
-        if not fs.empty():
-            f = fs.get()
-            message = await f
-            if message.get("service_executor") is not None:
-                service_hash = message.get("service_hash")
-                status = service_store.get(service_hash)
-                if status is None:
-                    asyncio.create_task(spawn_service(message, service_hash))
-                elif status == "running":
-                    run_service_block(message)
-                elif status == "launching":
-                    logger.info(f"service {service_hash} is launching, set message back to fs to wait next time")
-                    fs.put(f)
-            else:
-                if not_current_session(message):
-                    continue
-                run_block_in_new_thread(message, mainframe, session_dir=session_dir, tmp_dir=tmp_dir, package_name=package_name, pkg_dir=pkg_dir)
+        message = fs.get()
+        if message.get("service_executor") is not None:
+            service_hash = message.get("service_hash")
+            status = service_store.get(service_hash)
+            if status is None:
+                await spawn_service(message, service_hash)
+            elif status == "running":
+                run_service_block(message)
+            elif status == "launching":
+                logger.info(f"service {service_hash} is launching, set message back to fs to wait next time")
+                fs.put(message)  
+        else:
+            if not_current_session(message):
+                continue
+            run_block_in_new_thread(message, mainframe, session_dir=session_dir, tmp_dir=tmp_dir, package_name=package_name, pkg_dir=pkg_dir)
 
 def run_block_in_new_thread(message, mainframe: Mainframe, session_dir: str, tmp_dir: str, package_name: str, pkg_dir: str):