ask-shell 0.9.0__tar.gz → 0.9.1__tar.gz

{ask_shell-0.9.0 → ask_shell-0.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ask-shell
-Version: 0.9.0
+Version: 0.9.1
 Summary: CLIs with prompts, shell runs, and testable flows
 Author-email: EspenAlbert <espen.albert1@gmail.com>
 License-Expression: MIT

{ask_shell-0.9.0 → ask_shell-0.9.1}/ask_shell/__init__.py

@@ -7,7 +7,7 @@ from ask_shell import ask
 from ask_shell.settings import AskShellSettings
 from ask_shell.settings import ShellRunSummary
 
-VERSION = "0.9.0"
+VERSION = "0.9.1"
 __all__ = [
     "shell",
     "console",

{ask_shell-0.9.0 → ask_shell-0.9.1}/ask_shell/_internal/_run.py

@@ -11,6 +11,7 @@
 from __future__ import annotations
 
 import atexit
+import io
 import logging
 import os
 import random
@@ -27,7 +28,6 @@ from typing import IO, Any, Callable
 from model_lib import fields
 from rich.ansi import AnsiDecoder
 from rich.console import Console
-from rich.errors import MarkupError
 from zero_3rdparty.error import as_str_traceback
 from zero_3rdparty.future import add_done_callback, add_error_logging, chain_future
 
@@ -223,6 +223,12 @@ def _stream_one_character_at_a_time(stream: IO[str], on_line: Callable[[str], No
         on_line(buffer)
 
 
+def _log_line(line: str, *, ansi_content: bool, decoder: AnsiDecoder) -> str:
+    if not ansi_content:
+        return line
+    return decoder.decode_line(line).plain
+
+
 def _read_until_complete(
     stream: IO[str],
     output_path: Path,
@@ -231,54 +237,39 @@ def _read_until_complete(
     config: ShellConfig,
     is_stdout: bool,
 ):
-    with output_path.open("w") as f:
-        console = Console(
-            file=f,
-            record=True,
-            log_path=False,
-            soft_wrap=True,
-            log_time=config.include_log_time,
-            width=config.terminal_width,
-            markup=config.ansi_content,
-        )
-        on_console_ready(console)
-        old_write = f.write
-
-        def write_hook(text: str):
-            # choosing to line.strip() as the writing to console will add padding depending on console width
-            text_no_extras = [line.strip() for line in text.splitlines()]
-            return old_write("\n".join(text_no_extras))
+    record_console = Console(
+        file=io.StringIO(),
+        record=True,
+        log_path=False,
+        log_time=config.include_log_time,
+        width=config.terminal_width,
+        markup=config.ansi_content,
+    )
+    on_console_ready(record_console)
+    ansi_decoder = AnsiDecoder()
 
-        decoder = AnsiDecoder()
+    with output_path.open("w") as log_file:
 
-        def write_hook_ansi(text: str):
-            try:
-                plain_text = "\n".join(decoder.decode_line(line).plain.strip() for line in text.splitlines())
-            except MarkupError:
-                return old_write(text)
-            return old_write(plain_text)
+        def emit_line(line: str):
+            log_file.write(_log_line(line, ansi_content=config.ansi_content, decoder=ansi_decoder))
+            record_console.print(line, end="", overflow="ignore", crop=False, soft_wrap=False)
+            on_line(line)
 
-        f.write = write_hook_ansi if config.ansi_content else write_hook
         if config.user_input:
             out_stream = sys.stdout if is_stdout else sys.stderr
 
-            def _on_line(line: str):
-                console.log(line, end="")
-                on_line(line)
-
             def _on_char(char: str):
                 out_stream.write(char)
                 out_stream.flush()
 
             _stream_one_character_at_a_time(
                 stream,
-                on_line=_on_line,
+                on_line=emit_line,
                 on_char=_on_char,
             )
         else:
             for line in iter(stream.readline, ""):
-                console.log(line, end="")
-                on_line(line)
+                emit_line(line)
 
 
 def _run(

{ask_shell-0.9.0 → ask_shell-0.9.1}/ask_shell/_internal/models.py

@@ -443,14 +443,14 @@ class ShellRun:
         stream: Literal["stdout", "stderr"] = "stdout",
     ) -> OutputT:
         """Raises EmptyOutputError if the output is empty."""
-        stream_content = self.stdout_one_line if stream == "stdout" else self.stderr_one_line
-        if not stream_content:
+        content = self.stdout if stream == "stdout" else self.stderr
+        if not content:
             raise EmptyOutputError(self, stream=stream)
-        elif output_t is list:
-            return parse.parse_list(stream_content, output_format)  # type: ignore
-        elif output_t is dict:
-            return parse.parse_dict(stream_content, output_format)  # type: ignore
-        return parse.parse_model(stream_content, t=output_t, format=output_format)
+        if output_t is list:
+            return parse.parse_list(content, output_format)  # type: ignore
+        if output_t is dict:
+            return parse.parse_dict(content, output_format)  # type: ignore
+        return parse.parse_model(content, t=output_t, format=output_format)
 
     @property
     def stderr(self) -> str:

{ask_shell-0.9.0 → ask_shell-0.9.1}/pyproject.toml

@@ -2,7 +2,7 @@
 
 [project]
 name = "ask-shell"
-version = "0.9.0"
+version = "0.9.1"
 description = "CLIs with prompts, shell runs, and testable flows"
 requires-python = ">=3.13"
 license = "MIT"