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

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

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

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

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

{datacom_device_api-0.1.7 → datacom_device_api-0.1.9}/src/datacom_device_api/ext/ext_meta.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import Callable
+from typing import Any, Callable
 
 from datacom_device_api.event.event import Event
 
@@ -15,6 +15,7 @@ class ExtEntry(object):
     menu_name: str
     menu_index: int
     
+    ext_meta: dict[str, Any]
     run: Callable[[Event], None]
 
 @dataclass

{datacom_device_api-0.1.7 → datacom_device_api-0.1.9}/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,11 +61,12 @@ 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()
@@ -76,7 +78,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,6 +118,19 @@ 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,

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

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