✨ 分离magicoca和croterline

liteyuki/core/manager.py

@@ -14,6 +14,9 @@ import threading
 from multiprocessing import Process
 from typing import Any, Callable, TYPE_CHECKING, TypeAlias
 
+from croterline.context import Context
+from croterline.process import SubProcess, ProcessFuncType
+
 from liteyuki.log import logger
 from liteyuki.utils import IS_MAIN_PROCESS
 
@@ -26,7 +29,10 @@ from liteyuki.comm import Channel
 if IS_MAIN_PROCESS:
     from liteyuki.comm.channel import get_channel, publish_channel, get_channels
     from liteyuki.comm.storage import shared_memory
-    from liteyuki.comm.channel import channel_deliver_active_channel, channel_deliver_passive_channel
+    from liteyuki.comm.channel import (
+        channel_deliver_active_channel,
+        channel_deliver_passive_channel,
+    )
 else:
     from liteyuki.comm import channel
     from liteyuki.comm import storage
@@ -34,20 +40,18 @@ else:
 TARGET_FUNC: TypeAlias = Callable[..., Any]
 TIMEOUT = 10
 
-__all__ = [
-        "ProcessManager"
-]
+__all__ = ["ProcessManager", "sub_process_manager"]
 multiprocessing.set_start_method("spawn", force=True)
 
 
 class ChannelDeliver:
     def __init__(
-            self,
-            active: Channel[Any],
-            passive: Channel[Any],
-            channel_deliver_active: Channel[Channel[Any]],
-            channel_deliver_passive: Channel[tuple[str, dict]],
-            publish: Channel[tuple[str, Any]],
+        self,
+        active: Channel[Any],
+        passive: Channel[Any],
+        channel_deliver_active: Channel[Channel[Any]],
+        channel_deliver_passive: Channel[tuple[str, dict]],
+        publish: Channel[tuple[str, Any]],
     ):
         self.active = active
         self.passive = passive
@@ -57,7 +61,9 @@ class ChannelDeliver:
 
 
 # 函数处理一些跨进程通道的
-def _delivery_channel_wrapper(func: TARGET_FUNC, cd: ChannelDeliver, sm: "KeyValueStore", *args, **kwargs):
+def _delivery_channel_wrapper(
+    func: TARGET_FUNC, cd: ChannelDeliver, sm: "KeyValueStore", *args, **kwargs
+):
     """
     子进程入口函数
     处理一些操作
@@ -68,8 +74,12 @@ def _delivery_channel_wrapper(func: TARGET_FUNC, cd: ChannelDeliver, sm: "KeyVal
 
     channel.active_channel = cd.active  # 子进程主动通道
     channel.passive_channel = cd.passive  # 子进程被动通道
-    channel.channel_deliver_active_channel = cd.channel_deliver_active  # 子进程通道传递主动通道
-    channel.channel_deliver_passive_channel = cd.channel_deliver_passive  # 子进程通道传递被动通道
+    channel.channel_deliver_active_channel = (
+        cd.channel_deliver_active
+    )  # 子进程通道传递主动通道
+    channel.channel_deliver_passive_channel = (
+        cd.channel_deliver_passive
+    )  # 子进程通道传递被动通道
     channel.publish_channel = cd.publish  # 子进程发布通道
 
     # 给子进程创建共享内存实例
@@ -102,8 +112,12 @@ class ProcessManager:
         chan_active = get_channel(f"{name}-active")
 
         def _start_process():
-            process = Process(target=self.targets[name][0], args=self.targets[name][1],
-                              kwargs=self.targets[name][2], daemon=True)
+            process = Process(
+                target=self.targets[name][0],
+                args=self.targets[name][1],
+                kwargs=self.targets[name][2],
+                daemon=True,
+            )
             self.processes[name] = process
             process.start()
 
@@ -133,7 +147,9 @@ class ProcessManager:
 
         for name in self.targets:
             logger.debug(f"Starting process {name}")
-            threading.Thread(target=self._run_process, args=(name, ), daemon=True).start()
+            threading.Thread(
+                target=self._run_process, args=(name,), daemon=True
+            ).start()
 
     def add_target(self, name: str, target: TARGET_FUNC, args: tuple = (), kwargs=None):
         """
@@ -154,10 +170,14 @@ class ProcessManager:
             passive=chan_passive,
             channel_deliver_active=channel_deliver_active_channel,
             channel_deliver_passive=channel_deliver_passive_channel,
-            publish=publish_channel
+            publish=publish_channel,
         )
 
-        self.targets[name] = (_delivery_channel_wrapper, (target, channel_deliver, shared_memory, *args), kwargs)
+        self.targets[name] = (
+            _delivery_channel_wrapper,
+            (target, channel_deliver, shared_memory, *args),
+            kwargs,
+        )
         # 主进程通道
 
     def join_all(self):
@@ -199,3 +219,54 @@ class ProcessManager:
         if name not in self.targets:
             logger.warning(f"Process {name} not found.")
         return self.processes[name].is_alive()
+
+
+# new version
+
+
+class _SubProcessManager:
+
+    def __init__(self):
+        self.processes: dict[str, SubProcess] = {}
+
+    def new_process(
+        self, name: str, *args, **kwargs
+    ) -> Callable[[ProcessFuncType], None]:
+        def decorator(func: ProcessFuncType):
+            self.processes[name] = SubProcess(name, func, *args, **kwargs)
+
+        return decorator
+
+    def add(self, name: str, func: ProcessFuncType, *args, **kwargs):
+        """
+        添加子进程
+        Args:
+            func: 子进程函数
+            name: 子进程名称
+            args: 子进程函数参数
+            kwargs: 子进程函数关键字参数
+        Returns:
+        """
+        self.processes[name] = SubProcess(name, func, *args, **kwargs)
+
+    def start(self, name: str):
+        """
+        启动指定子进程
+        Args:
+            name: 子进程名称
+        Returns:
+        """
+        if name not in self.processes:
+            raise KeyError(f"Process {name} not found.")
+        self.processes[name].start()
+
+    def start_all(self):
+        """
+        启动所有子进程
+        """
+        for name, process in self.processes.items():
+            process.start()
+            logger.debug(f"Starting process {name}")
+
+
+sub_process_manager = _SubProcessManager()