datacom-device-api 0.1.9__tar.gz → 0.1.11__tar.gz

{datacom_device_api-0.1.9 → datacom_device_api-0.1.11}/PKG-INFO

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

{datacom_device_api-0.1.9 → datacom_device_api-0.1.11}/pyproject.toml

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

{datacom_device_api-0.1.9 → datacom_device_api-0.1.11}/src/datacom_device_api/process/terminal_process.py

@@ -7,6 +7,8 @@
 from concurrent.futures import Future, ProcessPoolExecutor
 from dataclasses import dataclass
 from functools import partial
+import logging
+from logging.handlers import QueueHandler, QueueListener
 from multiprocessing import Manager
 import os
 import queue
@@ -49,6 +51,22 @@ class ProgressMessage:
 __PROGRESS_UPDATE_FN_TYPE = Callable[[ProgressMessage], None]
 
 
+class _ConsoleLogHandler(logging.Handler):
+    """将日志输出到 Rich Console，确保日志显示在进度条上方。"""
+
+    def __init__(self, console: Console):
+        super().__init__()
+        self.__console = console
+        self.setFormatter(logging.Formatter('[%(asctime)s-%(levelname)s](%(name)s): %(message)s'))
+
+    def emit(self, record: logging.LogRecord) -> None:
+        try:
+            msg = self.format(record)
+            self.__console.print(msg)
+        except Exception:
+            self.handleError(record)
+
+
 class TerminalProcess:
     """多进程任务执行器，支持进度展示与监听器机制。
 
@@ -71,6 +89,7 @@ class TerminalProcess:
         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]] = {}
@@ -87,6 +106,10 @@ class TerminalProcess:
             'main', total=self.__task_future_count
         )
 
+        # 日志队列监听器：从 log_queue 消费 LogRecord 并输出到 Console
+        self.__log_handler = _ConsoleLogHandler(self.__console)
+        self.__log_listener = QueueListener(self.__log_queue, self.__log_handler)
+
     def trigger_progress(self, task_id: UUID, message: ProgressMessage) -> None:
         """触发指定任务的所有进度监听器。
 
@@ -135,6 +158,7 @@ class TerminalProcess:
     def _warrper_fn(
         fn: EXECUTE_FUNC_TYPE,
         progress_queue: queue.Queue[ProgressMessage],
+        log_queue: queue.Queue[str],
         task_id: UUID,
         *args,
         **kwargs,
@@ -143,7 +167,13 @@ class TerminalProcess:
 
         封装进度上报、完成标记和异常处理，通过队列将进度消息
         发送回主进程。任务正常结束或异常均会发送对应类型的消息。
+        同时配置根 logger 使用 QueueHandler 将子进程日志转发到主进程。
         """
+        root_logger = logging.getLogger()
+        queue_handler = QueueHandler(log_queue)
+        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'):
@@ -185,6 +215,7 @@ class TerminalProcess:
 
         持续从队列中取出进度消息，依次更新内置进度条并触发监听器。
         使用带超时的轮询避免阻塞，确保停止事件触发后能及时退出。
+        日志消息由 QueueListener 在后台线程中消费并输出到终端。
         """
         while not self.__progress_thread_stop_event.is_set() or not self.__progress_queue.empty():
             try:
@@ -192,11 +223,14 @@ class TerminalProcess:
                 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())
-                ):
-                    break
+                pass
+
+            if (
+                self.__progress_thread_stop_event.is_set()
+                and all(futrue.done() for futrue in self.__tasks.values())
+                and self.__progress_queue.empty()
+            ):
+                break
 
     def submit(
         self,
@@ -217,7 +251,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] = []
@@ -233,6 +267,7 @@ class TerminalProcess:
     def start(self) -> None:
         """启动进度条显示与消息消费线程。"""
         self.__progress.start()
+        self.__log_listener.start()
         self.__progress_thread_stop_event.clear()
         self.__progress_thread = threading.Thread(target=self.run_display_progress)
         self.__progress_thread.start()
@@ -240,8 +275,8 @@ class TerminalProcess:
     def shutdown(self) -> None:
         """停止任务执行并释放资源。
 
-        按顺序执行：等待所有任务完成 → 消费完剩余进度消息 →
-        关闭进程池 → 停止进度条。确保不会因消息未消费完而丢失进度。
+        按顺序执行：等待所有任务完成 → 设置停止事件 → 消费线程退出并消费剩余消息 →
+        关闭进程池 → 停止进度条。确保不会因消息未消费完而丢失进度或日志。
         """
         for future in self.__tasks.values():
             try:
@@ -254,6 +289,7 @@ class TerminalProcess:
             self.__progress_thread.join()
             self.__progress_thread = None
 
+        self.__log_listener.stop()
         self.__pool.shutdown(wait=True)
         self.__progress.stop()
 

{datacom_device_api-0.1.9 → datacom_device_api-0.1.11}/src/datacom_device_api.egg-info/PKG-INFO

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