streamdown 0.35.0__tar.gz → 0.35.2__tar.gz

{streamdown-0.35.0 → streamdown-0.35.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: streamdown
-Version: 0.35.0
+Version: 0.35.2
 Summary: A streaming markdown renderer for modern terminals with syntax highlighting
 Project-URL: Homepage, https://github.com/day50-dev/Streamdown
 Project-URL: Bug Tracker, https://github.com/day50-dev/Streamdown/issues
@@ -156,6 +156,8 @@ $ sd --exec "llm chat"
 
 And now you have all your readline stuff. It's pretty great. (Also see the DAY50 shellwrap project.)
 
+This relies on "guessing" what a prompt will look like. But don't worry, you can change that with the `--prompt` option if yours is a bit unique. It's a PCRE regex, so you can be a bit flexible.
+
 It's also worth noting that things like the `-c` aren't "broken" with regard to file input. You can do something like this:
 
 ```shell
@@ -188,6 +190,8 @@ optional arguments:
   -w WIDTH, --width WIDTH
                         Set the width WIDTH
   -e EXEC, --exec EXEC  Wrap a program EXEC for more 'proper' i/o handling
+  -p PROMPT, --prompt PROMPT
+                        A PCRE regex prompt to detect (default: ^.*>\s+$)
   -s SCRAPE, --scrape SCRAPE
                         Scrape code snippets to a directory SCRAPE
   -v, --version         Show version information

{streamdown-0.35.0 → streamdown-0.35.2}/README.md

@@ -126,6 +126,8 @@ $ sd --exec "llm chat"
 
 And now you have all your readline stuff. It's pretty great. (Also see the DAY50 shellwrap project.)
 
+This relies on "guessing" what a prompt will look like. But don't worry, you can change that with the `--prompt` option if yours is a bit unique. It's a PCRE regex, so you can be a bit flexible.
+
 It's also worth noting that things like the `-c` aren't "broken" with regard to file input. You can do something like this:
 
 ```shell
@@ -158,6 +160,8 @@ optional arguments:
   -w WIDTH, --width WIDTH
                         Set the width WIDTH
   -e EXEC, --exec EXEC  Wrap a program EXEC for more 'proper' i/o handling
+  -p PROMPT, --prompt PROMPT
+                        A PCRE regex prompt to detect (default: ^.*>\s+$)
   -s SCRAPE, --scrape SCRAPE
                         Scrape code snippets to a directory SCRAPE
   -v, --version         Show version information

{streamdown-0.35.0 → streamdown-0.35.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "streamdown"
-version = "0.35.0"
+version = "0.35.2"
 description = "A streaming markdown renderer for modern terminals with syntax highlighting"
 readme = "README.md"
 requires-python = ">=3.8"

{streamdown-0.35.0 → streamdown-0.35.2}/streamdown/sd.py

@@ -117,6 +117,7 @@ visible = lambda x: re.sub(ANSIESCAPE, "", x)
 # many characters have different widths
 visible_length = lambda x: sum(wcwidth(c) for c in visible(x))
 extract_ansi_codes = lambda text: re.findall(ESCAPE, text)
+strip_ansi = lambda line: re.sub(ANSIESCAPE, '', line)
 remove_ansi = lambda line, codeList: reduce(lambda line, code: line.replace(code, ''), codeList, line)
 split_up = lambda line: re.findall(r'(\x1b[^m]*m|[^\x1b]*)', line)
 
@@ -129,7 +130,10 @@ def gettmpdir():
     else:
         tmp_dir = tmp_dir_all
 
+    prev_mask = os.umask(0)
+    # This is shared among all users
     os.makedirs(tmp_dir, exist_ok=True)
+    os.umask(prev_mask)
     return tmp_dir
 
 def debug_write(text):
@@ -138,6 +142,10 @@ def debug_write(text):
             state.Logging = tempfile.NamedTemporaryFile(dir=gettmpdir(), prefix="dbg", delete=False, mode="wb")
         state.Logging.write(text)
 
+def sub_extract(line, upto):
+    # this takes the line up to the upto string and then returns the ansi codes
+    return ''.join(extract_ansi_codes(line[:line.find(upto)]))
+
 def savebrace():
     if state.Savebrace and state.code_buffer_raw and os.name != 'nt':
         path = os.path.join(gettmpdir(), 'savebrace')
@@ -446,7 +454,7 @@ def text_wrap(text, width = -1, indent = 0, first_line_prefix="", subsequent_lin
                 # that we have closed our hyperlink OSC
                 if LINK[0] in line_content:
                     line_content += LINK[1]
-                lines.append(line_content + resetter + state.bg + ' ' * margin)
+                lines.append(line_content + resetter + sub_extract(line_content, LINK[0]) + state.bg + ' ' * margin)
 
             current_line = (" " * indent) + "".join(current_style) + word
 
@@ -496,6 +504,9 @@ def line_format(line):
 
     # Apply OSC 8 hyperlink formatting after other formatting
     def process_links(match):
+        #import pdb
+        #pdb.set_trace()
+        print(match)
         description = match.group(1)
         url = match.group(2)
         return f'{LINK[0]}{url}\033\\{Style.Link}{description}{UNDERLINE[1]}{LINK[1]}{FGRESET}'
@@ -1026,6 +1037,11 @@ def parse(stream):
             for wrapped_line in wrapped_lines:
                 yield f"{state.space_left()}{wrapped_line}\n"
 
+def terminal_prep(what):
+    if Style.Plaintext:
+        return strip_ansi(what)
+    return what
+
 def emit(inp):
     buffer = []
     flush = False
@@ -1065,10 +1081,10 @@ def emit(inp):
         else:
             chunk = buffer.pop(0)
 
-        print(chunk, end="", file=sys.stdout, flush=True)
+        print(terminal_prep(chunk), end="", file=sys.stdout, flush=True)
 
     if len(buffer):
-        print(buffer.pop(0), file=sys.stdout, end="", flush=True)
+        print(terminal_prep(buffer.pop(0)), file=sys.stdout, end="", flush=True)
 
 def ansi2hex(ansi_code):
     parts = ansi_code.strip('m').split(";")
@@ -1127,6 +1143,7 @@ def main():
     parser.add_argument("-p", "--prompt", default="^.*>\\s+$", help="A PCRE regex prompt to detect (default: %(default)s)")
     parser.add_argument("-s", "--scrape", help="Scrape code snippets to a directory SCRAPE")
     parser.add_argument("-v", "--version", action="store_true", help="Show version information")
+    parser.add_argument("--strip", action="store_true", help="Just strip the markdown and output plaintext")
     args = parser.parse_args()
 
     if args.version:
@@ -1156,7 +1173,7 @@ def main():
 
     for color in ["Dark", "Mid", "Symbol", "Head", "Grey", "Bright"]:
         setattr(Style, color, apply_multipliers(style, color, H, S, V))
-    for attr in ['PrettyPad', 'PrettyBroken', 'Margin', 'ListIndent', 'Syntax']:
+    for attr in ['PrettyPad', 'PrettyBroken', 'Margin', 'ListIndent', 'Syntax', 'Plaintext']:
         setattr(Style, attr, style.get(attr))
     for attr in ['Links', 'Images', 'CodeSpaces', 'Clipboard', 'Logging', 'Timeout', 'Savebrace']:
         setattr(state, attr, features.get(attr))
@@ -1166,6 +1183,7 @@ def main():
         os.makedirs(args.scrape, exist_ok=True)
         state.scrape = args.scrape
 
+    Style.Plaintext = args.strip
     Style.MarginSpaces = " " * Style.Margin
     state.WidthArg = int(args.width) or style.get("Width") or 0
     state.prompt_regex = re.compile(args.prompt)
@@ -1231,7 +1249,7 @@ def main():
         if state.exec_sub:
             state.exec_sub.wait()
 
-    print(RESET, end="")
+    print(terminal_prep(RESET), end="")
     sys.exit(state.exit)
 
 if __name__ == "__main__":

streamdown-0.35.2/tests/color-restore-after-link.md

@@ -0,0 +1 @@
+### Before link. [The Link!](link) Should retain color