streamdown 0.34.0__tar.gz → 0.35.1__tar.gz

{streamdown-0.34.0 → streamdown-0.35.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: streamdown
-Version: 0.34.0
+Version: 0.35.1
 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
@@ -70,7 +70,7 @@ The optional `Clipboard` feature puts the final codeblock into your clipboard. S
 [links.webm](https://github.com/user-attachments/assets/a5f71791-7c58-4183-ad3b-309f470c08a3)
 
 ### As well as everything else...
-Here's the `Savebrace` feature with `screen-query` and `sq-picker` from [llmehelp](https://github.com/kristopolous/llmehelp). You can have an ongoing conversation in tmux with your terminal session. Then use popups and fzf to insert command or coding blocks all with a keystroke.
+Here's the `Savebrace` feature with [`sidechat` and `sc-picker`](https://github.com/day50-dev/sidechat). You can have an ongoing conversation in tmux with your terminal session. Then use popups and fzf to insert command or coding blocks all with a keystroke.
 
 This allows you to interactively debug  in a way that the agent doesn't just wander off doing silly things.
 
@@ -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.34.0 → streamdown-0.35.1}/README.md

@@ -40,7 +40,7 @@ The optional `Clipboard` feature puts the final codeblock into your clipboard. S
 [links.webm](https://github.com/user-attachments/assets/a5f71791-7c58-4183-ad3b-309f470c08a3)
 
 ### As well as everything else...
-Here's the `Savebrace` feature with `screen-query` and `sq-picker` from [llmehelp](https://github.com/kristopolous/llmehelp). You can have an ongoing conversation in tmux with your terminal session. Then use popups and fzf to insert command or coding blocks all with a keystroke.
+Here's the `Savebrace` feature with [`sidechat` and `sc-picker`](https://github.com/day50-dev/sidechat). You can have an ongoing conversation in tmux with your terminal session. Then use popups and fzf to insert command or coding blocks all with a keystroke.
 
 This allows you to interactively debug  in a way that the agent doesn't just wander off doing silly things.
 
@@ -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.34.0 → streamdown-0.35.1}/pyproject.toml

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

{streamdown-0.34.0 → streamdown-0.35.1}/streamdown/sd.py

@@ -57,6 +57,8 @@ Clipboard  = true
 Logging    = false
 Timeout    = 0.1
 Savebrace  = true
+Images     = true
+Links      = true
 
 [style]
 Margin          = 2 
@@ -115,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)
 
@@ -127,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):
@@ -136,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')
@@ -165,6 +175,7 @@ class ParseState:
         self.is_pty = False
         self.is_exec = False
         self.maybe_prompt = False
+        self.prompt_regex = None
         self.emit_flag = None
         self.scrape = None
         self.scrape_ix = 0
@@ -204,6 +215,7 @@ class ParseState:
         self.in_underline = False
         self.in_strikeout = False
         self.block_depth = 0
+        self.block_type = None
 
         self.exec_sub = None
         self.exec_master = None
@@ -442,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
 
@@ -492,12 +504,19 @@ 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}'
 
-    line = re.sub(r"\!\[([^\]]*)\]\(([^\)]+)\)", process_images, line)
-    line = re.sub(r"\[([^\]]+)\]\(([^\)]+)\)", process_links, line)
+    if state.Images:
+        line = re.sub(r"\!\[([^\]]*)\]\(([^\)]+)\)", process_images, line)
+
+    if state.Links:
+        line = re.sub(r"\[([^\]]+)\]\(([^\)]+)\)", process_links, line)
+
     line = re.sub(r"\[\^(\d+)\]:?", footnotes, line)
 
     tokenList = re.finditer(r"((~~|\*\*_|_\*\*|\*{1,3}|_{1,3}|`+)|[^~_*`]+)", line)
@@ -630,8 +649,7 @@ def parse(stream):
         line = state.buffer.decode('utf-8').replace('\t','  ')
         state.has_newline = line.endswith('\n')
 
-        # I hate this. There should be better ways.
-        state.maybe_prompt = not state.has_newline and state.current()['none'] and re.match(r'^.*>\s+$', visible(line))
+        state.maybe_prompt = not state.has_newline and state.current()['none'] and re.match(state.prompt_regex, visible(line))
 
         # let's wait for a newline
         if state.maybe_prompt:
@@ -658,19 +676,27 @@ def parse(stream):
         """
         
         # running this here avoids stray |
-        block_match = re.match(r"^\s*((>\s*)+|<.?think>)", line)
+        # So kimi doesn't newline after the <think> token and it uses some unicode triangle?. They'll 
+        # newline at the end of it, but not the beginning.
+        block_match = re.match(r"^\s*((>\s*)+|[◁<].?think[>▷])(.*)", line)
         if not state.in_code and block_match:
-            if block_match.group(1) == '</think>':
+            # wtf is this you might ask! Not all thinking models use < and > ...
+            # because why make life easy?
+            if block_match.group(1)[1:7] == '/think':
+                line = ''
                 state.block_depth = 0
                 yield RESET
-            elif block_match.group(1) == '<think>':
+            elif block_match.group(1)[1:6] == 'think':
+                line = block_match.group(3)
                 state.block_depth = 1
+                state.block_type = 'think'
             else:
-                state.block_depth = block_match.group(0).count('>')
+                state.block_depth = block_match.group(1).count('>')
+                state.block_type = '>'
                 # we also need to consume those tokens
-                line = line[len(block_match.group(0)):]
+                line = line[len(block_match.group(1)):]
         else:
-            if state.block_depth > 0:
+            if state.block_type == '>' and state.block_depth > 0:
                 yield FGRESET
                 state.block_depth = 0
 
@@ -839,7 +865,7 @@ def parse(stream):
                     while parts[-1] in [FGRESET, FORMATRESET]:
                         parts.pop()
 
-                    tline_len = visible_length(tline)
+                    tline_len = visible_length(tline.rstrip('\r\n'))
 
                     # now we find the new stuff:
                     ttl = 0
@@ -850,7 +876,7 @@ def parse(stream):
 
                         ttl += len(idx) if idx[0] != '\x1b' else 0
 
-                        if ttl > 1+tline_len:
+                        if ttl > tline_len:
                             break
 
 
@@ -1011,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
@@ -1050,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(";")
@@ -1109,8 +1140,10 @@ def main():
     parser.add_argument("-c", "--config", default=None, help="Use a custom config override")
     parser.add_argument("-w", "--width", default="0", help="Set the width WIDTH")
     parser.add_argument("-e", "--exec", help="Wrap a program EXEC for more 'proper' i/o handling")
+    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:
@@ -1140,9 +1173,9 @@ 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 ['CodeSpaces', 'Clipboard', 'Logging', 'Timeout', 'Savebrace']:
+    for attr in ['Links', 'Images', 'CodeSpaces', 'Clipboard', 'Logging', 'Timeout', 'Savebrace']:
         setattr(state, attr, features.get(attr))
 
 
@@ -1150,8 +1183,10 @@ 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)
     Style.Blockquote = f"{FG}{Style.Grey}│ "
     width_calc()
 

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

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