datacom-device-api 0.1.8__tar.gz → 0.1.10__tar.gz

{datacom_device_api-0.1.8 → datacom_device_api-0.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datacom-device-api
-Version: 0.1.8
+Version: 0.1.10
 Summary: Add your description here
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown

{datacom_device_api-0.1.8 → datacom_device_api-0.1.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "datacom-device-api"
-version = "0.1.8"
+version = "0.1.10"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.14"

{datacom_device_api-0.1.8 → datacom_device_api-0.1.10}/src/datacom_device_api/process/terminal_process.py

@@ -15,6 +15,7 @@ from typing import Any, Callable, Optional, ParamSpec, Protocol, TypeVar, runtim
 from uuid import UUID
 import uuid
 
+from rich.console import Console
 from rich.progress import Progress, TaskID
 
 
@@ -60,15 +61,17 @@ class TerminalProcess:
             process.submit(task2)
     """
 
-    def __init__(self, max_workers: Optional[int] = None):
+    def __init__(self, max_workers: Optional[int] = None, console: Optional[Console] = None):
         """初始化终端进程执行器。
 
         Args:
             max_workers: 进程池最大并发数，默认为 CPU 核心数
+            console: 共享的 Rich Console 实例，用于日志输出与进度条保持同一终端
         """
         self.__pool = ProcessPoolExecutor(max_workers=max_workers or os.cpu_count())
         self.__manager = Manager()
         self.__progress_queue: queue.Queue[ProgressMessage] = self.__manager.Queue()
+        self.__log_queue: queue.Queue[str] = self.__manager.Queue()
 
         self.__task_future_count = 0
         self.__tasks: dict[UUID, Future[Any]] = {}
@@ -76,7 +79,10 @@ class TerminalProcess:
 
         self.__progress_thread_stop_event = threading.Event()
         self.__progress_tasks: dict[UUID, TaskID] = {}
-        self.__progress = Progress()
+        self.__console = console if console is not None else Console()
+        # 让 Progress 固定在终端底部，使用同一个 Console 输出日志时，
+        # 日志会显示在进度条之上，进度条始终保持在终端底部
+        self.__progress = Progress(console=self.__console)
         self.__progress_thread: Optional[threading.Thread] = None
         self.__progress_main_task: TaskID = self.__progress.add_task(
             'main', total=self.__task_future_count
@@ -113,10 +119,24 @@ class TerminalProcess:
         if message.type == 'done':
             self.__progress.update(self.__progress_main_task, advance=1)
 
+    def print(self, *args, **kwargs) -> None:
+        """在进度条之上输出日志信息。
+
+        使用与 Progress 共享的 Console 输出，日志会显示在终端上方，
+        进度条始终保持在终端底部。
+        """
+        self.__console.print(*args, **kwargs)
+
+    @property
+    def console(self) -> Console:
+        """返回与 Progress 共享的 Console 实例。"""
+        return self.__console
+
     @staticmethod
     def _warrper_fn(
         fn: EXECUTE_FUNC_TYPE,
         progress_queue: queue.Queue[ProgressMessage],
+        log_queue: queue.Queue[str],
         task_id: UUID,
         *args,
         **kwargs,
@@ -125,7 +145,19 @@ class TerminalProcess:
 
         封装进度上报、完成标记和异常处理，通过队列将进度消息
         发送回主进程。任务正常结束或异常均会发送对应类型的消息。
+        同时配置根 logger 使用 QueueHandler 将子进程日志转发到主进程。
         """
+        import logging
+        import logging.handlers
+
+        root_logger = logging.getLogger()
+        queue_handler = logging.handlers.QueueHandler(log_queue)
+        queue_handler.setLevel(logging.INFO)
+        formatter = logging.Formatter('[%(asctime)s-%(levelname)s](%(name)s): %(message)s')
+        queue_handler.setFormatter(formatter)
+        root_logger.addHandler(queue_handler)
+        root_logger.setLevel(logging.INFO)
+
         done_send = False
 
         def report(progress: float, total: float, message: str, msg_type: str = 'progress'):
@@ -165,21 +197,33 @@ class TerminalProcess:
     def run_display_progress(self) -> None:
         """进度消费线程主循环。
 
-        持续从队列中取出进度消息，依次更新内置进度条并触发监听器。
+        持续从队列中取出进度消息和日志消息，进度消息依次更新内置进度条并触发监听器，
+        日志消息通过共享 Console 输出到终端（显示在进度条上方）。
         使用带超时的轮询避免阻塞，确保停止事件触发后能及时退出。
         """
-        while not self.__progress_thread_stop_event.is_set() or not self.__progress_queue.empty():
+        while not self.__progress_thread_stop_event.is_set() or not self.__progress_queue.empty() or not self.__log_queue.empty():
             try:
                 message = self.__progress_queue.get(timeout=0.1)
                 self.update_progress(message)
                 self.trigger_progress(message.task_id, message)
             except queue.Empty:
-                if (
-                    self.__progress_thread_stop_event.is_set()
-                    and all(futrue.done() for futrue in self.__tasks.values())
-                ):
+                pass
+
+            while not self.__log_queue.empty():
+                try:
+                    log_msg = self.__log_queue.get_nowait()
+                    self.__console.print(log_msg)
+                except queue.Empty:
                     break
 
+            if (
+                self.__progress_thread_stop_event.is_set()
+                and all(futrue.done() for futrue in self.__tasks.values())
+                and self.__progress_queue.empty()
+                and self.__log_queue.empty()
+            ):
+                break
+
     def submit(
         self,
         fn: EXECUTE_FUNC_TYPE,
@@ -199,7 +243,7 @@ class TerminalProcess:
             任务的 Future 对象，可用于获取结果或异常
         """
         task_id = uuid.uuid4()
-        task_fn = partial(TerminalProcess._warrper_fn, fn, self.__progress_queue, task_id)
+        task_fn = partial(TerminalProcess._warrper_fn, fn, self.__progress_queue, self.__log_queue, task_id)
         future = self.__pool.submit(task_fn, *args, **kwargs)
         self.__tasks[task_id] = future
         self.__task_update_lisening_fn_dict[task_id] = []
@@ -222,8 +266,8 @@ class TerminalProcess:
     def shutdown(self) -> None:
         """停止任务执行并释放资源。
 
-        按顺序执行：等待所有任务完成 → 消费完剩余进度消息 →
-        关闭进程池 → 停止进度条。确保不会因消息未消费完而丢失进度。
+        按顺序执行：等待所有任务完成 → 设置停止事件 → 消费线程退出并消费剩余消息 →
+        关闭进程池 → 停止进度条。确保不会因消息未消费完而丢失进度或日志。
         """
         for future in self.__tasks.values():
             try:
@@ -236,6 +280,13 @@ class TerminalProcess:
             self.__progress_thread.join()
             self.__progress_thread = None
 
+        while not self.__log_queue.empty():
+            try:
+                log_msg = self.__log_queue.get_nowait()
+                self.__console.print(log_msg)
+            except queue.Empty:
+                break
+
         self.__pool.shutdown(wait=True)
         self.__progress.stop()
 

{datacom_device_api-0.1.8 → datacom_device_api-0.1.10}/src/datacom_device_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datacom-device-api
-Version: 0.1.8
+Version: 0.1.10
 Summary: Add your description here
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown