sdev 0.7.4__tar.gz → 0.7.5__tar.gz

{sdev-0.7.4/sdev.egg-info → sdev-0.7.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sdev
-Version: 0.7.4
+Version: 0.7.5
 Summary: 串口控制器工具包
 Home-page: https://github.com/klrc/sdev
 Author: klrc

{sdev-0.7.4 → sdev-0.7.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sdev"
-version = "0.7.4"
+version = "0.7.5"
 description = "串口控制器工具包"
 readme = "README.md"
 license = {text = "MIT"}

{sdev-0.7.4 → sdev-0.7.5}/sdev/cli/__init__.py

@@ -350,11 +350,13 @@ def _handle_run(args: argparse.Namespace) -> int:
                     response_timeout=response_timeout,
                     stream=False,
                     verbose=False,
+                    keep_type=True,
                 )
                 for line in ret:
                     if line.kind == 'body' or line.kind == 'error':
                         sys.stdout.write(line.text)
                         sys.stdout.flush()
+            print()
         except KeyboardInterrupt:
             # 捕获本地 Ctrl-C：向开发板发送一次中断信号（Ctrl-C），尽量中断远端前台命令。
             nb.send_interrupt()

{sdev-0.7.4 → sdev-0.7.5}/sdev/deprecated/demoboard.py

@@ -105,17 +105,15 @@ class Demoboard:
         response_timeout = None if wait_forever else timeout
 
         def _iter_cmd() -> Generator[str, None, None]:
-            for line in self._nb.run(
+            return self._nb.run(
                 cmd=cmd,
                 end_flag=flag,
                 overall_timeout=timeout,
                 response_timeout=response_timeout,
                 stream=True,
                 verbose=True,
-            ):
-                text = getattr(line, "text", str(line))
-                yield text
-
+            )
+            
         if stream:
             return _iter_cmd()
         return list(_iter_cmd())

{sdev-0.7.4 → sdev-0.7.5}/sdev/modules/mcp_server.py

@@ -102,10 +102,7 @@ def sdev_run(cmd: str, device_id: str = None, timeout: float = 10.0) -> str:
             
         with nb:
             lines = nb.run(cmd, overall_timeout=timeout, stream=False, verbose=False)
-            output = []
-            for line in lines:
-                output.append(line.text)
-            return "".join(output).strip()
+            return "".join(lines).strip()
     except Exception as e:
         return f"执行失败：{e}"
 

{sdev-0.7.4 → sdev-0.7.5}/sdev/modules/serial_notebook.py

@@ -3,7 +3,7 @@ import sys
 import time
 from loguru import logger
 
-from .serial_rw import SerialRW, SerialLine, CTRL_C
+from .serial_rw import SerialLine, CTRL_C
 
 GREY = "\033[90m"
 YELLOW = "\033[33m"
@@ -41,7 +41,7 @@ class SerialNotebook():
     def __exit__(self, exc_type, exc_value, traceback):
         self._core.disconnect()
 
-    def run(self, cmd: str, end_flag=None, allow_fold=True, max_fold_lines=4, strip_echo=True, stream=False, verbose=True, overall_timeout=None, response_timeout=None):
+    def run(self, cmd: str, end_flag=None, allow_fold=True, max_fold_lines=4, strip_echo=True, stream=False, verbose=True, overall_timeout=None, response_timeout=None, keep_type=False):
         # 先清理残留输出，避免前一次命令的尾巴影响本次结果。
         assert cmd is not None
         self._core.drain_buffer()
@@ -79,7 +79,10 @@ class SerialNotebook():
                     # print(line.kind, line.line, show_log, isinstance(line, SerialLine), line.kind == 'body')
                     if show_log and isinstance(line, SerialLine) and line.kind == 'body':
                         self._write_raw(f"{GREY}{line.text}{RESET}")
-                    yield line
+                    if keep_type:
+                        yield line
+                    else:
+                        yield line.text
                 # 整个命令结束后，如启用 display，则额外输出一个空行（两个换行），
                 # 便于与后续命令在视觉上明显隔离。
                 if show_log:
@@ -157,13 +160,8 @@ class SerialNotebook():
                 response_timeout=timeout,
                 verbose=verbose,
             )
-            # lines: [cmd, body, next_prompt]
             if lines and len(lines) >= 2:
-                # 倒数第二行通常是型号内容（因为最后一行是新提示符）
-                for line in reversed(lines[:-1]):
-                    text = line.text.strip()
-                    if text and not text.startswith("cat /proc"):
-                        return text
+                return lines[-2].strip()
         except Exception:
             pass
         return None

{sdev-0.7.4 → sdev-0.7.5/sdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sdev
-Version: 0.7.4
+Version: 0.7.5
 Summary: 串口控制器工具包
 Home-page: https://github.com/klrc/sdev
 Author: klrc

{sdev-0.7.4 → sdev-0.7.5}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="sdev",
-    version="0.7.4",
+    version="0.7.5",
     author="klrc",
     author_email="144069824@qq.com",
     description="串口控制器工具包",