streamdown 0.21.0__py3-none-any.whl → 0.22.0__py3-none-any.whl

streamdown/sd.py

@@ -55,7 +55,7 @@ Savebrace  = true
 [style]
 Margin          = 2 
 ListIndent      = 2
-PrettyPad       = false
+PrettyPad       = true
 PrettyBroken    = true
 Width           = 0
 HSV     = [0.8, 0.5, 0.5]
@@ -68,19 +68,18 @@ Bright  = { H = 1.00, S = 2.00, V = 2.00 }
 Syntax  = "dracula"
 """
 
-def ensure_config_file():
-    config_dir = appdirs.user_config_dir("streamdown")
-    os.makedirs(config_dir, exist_ok=True)
-    config_path = os.path.join(config_dir, "config.toml")
-    if not os.path.exists(config_path):
-        open(config_path, 'w').write(default_toml)
+def ensure_config_file(config):
+    if config:
+        config_path = config
+    else:
+        config_dir = appdirs.user_config_dir("streamdown")
+        os.makedirs(config_dir, exist_ok=True)
+        config_path = os.path.join(config_dir, "config.toml")
+        if not os.path.exists(config_path):
+            open(config_path, 'w').write(default_toml)
+
     return config_path, open(config_path).read()
 
-config_toml_path, config_toml_content = ensure_config_file()
-config = toml.loads(config_toml_content)
-_style = toml.loads(default_toml).get('style') | config.get("style", {})
-_features = toml.loads(default_toml).get('features') | config.get("features", {})
-H, S, V = _style.get("HSV")
 
 FG = "\033[38;2;"
 BG = "\033[48;2;"
@@ -115,8 +114,6 @@ def debug_write(text):
 
 def savebrace():
     if state.Savebrace and state.code_buffer_raw:
-        tmp_dir = os.path.join(tempfile.gettempdir(), "sd")
-        os.makedirs(tmp_dir, exist_ok=True)
         path = os.path.join(tempfile.gettempdir(), "sd", 'savebrace')
         with open(path, "a") as f:
             f.write(state.code_buffer_raw + "\x00")
@@ -126,7 +123,6 @@ class Goto(Exception):
     pass
 
 class Style:
-    PrettyPad = _style.get("PrettyPad")
     pass
 
 class Code:
@@ -150,12 +146,6 @@ class ParseState:
         self.scrape_ix = 0
         self.terminal = None
 
-        self.CodeSpaces = _features.get("CodeSpaces")
-        self.Clipboard = _features.get("Clipboard")
-        self.Logging = _features.get("Logging")
-        self.Timeout = _features.get("Timeout")
-        self.Savebrace = _features.get("Savebrace")
-
         self.WidthArg = None
         self.WidthFull = None
         self.WidthWrap = False
@@ -319,6 +309,10 @@ def code_wrap(text_in):
     for i in range(mywidth, len(text), mywidth):
         res.append(text[i : i + mywidth])
 
+    # sometimes just a newline wraps ... this isn't what we want actually
+    if res[-1].strip() == '':
+        res.pop()
+
     return (indent, res)
 
 
@@ -700,8 +694,13 @@ def parse(stream):
                 state.code_first_line = True
                 state.bg = f"{BG}{Style.Dark}"
                 state.where_from = "code pad"
-                if Style.PrettyPad:
+                if Style.PrettyPad or Style.PrettyBroken:
+                    if not Style.PrettyPad:
+                        yield ""
+
                     yield Style.Codepad[0]
+                else:
+                    yield ""
 
                 logging.debug(f"In code: ({state.in_code})")
 
@@ -734,8 +733,13 @@ def parse(stream):
                     state.bg = BGRESET
 
                     state.where_from = "code pad"
-                    if Style.PrettyPad:
-                        yield Style.Codepad[1]
+                    if Style.PrettyPad or Style.PrettyBroken:
+                        yield Style.Codepad[1] 
+                        if not Style.PrettyPad:
+                            yield ""
+
+                    else:
+                        yield RESET
 
                     logging.debug(f"code: {state.in_code}")
                     state.emit_flush = True
@@ -798,12 +802,10 @@ def parse(stream):
                     if highlighted_code.endswith(FGRESET + "\n"):
                         highlighted_code = highlighted_code[: -(1 + len(FGRESET))]
 
-                    #print(bytes(highlighted_code, 'utf-8'))
-
                     # turns out highlight will eat leading newlines on empty lines
                     vislen = visible_length(state.code_buffer.lstrip())
 
-                    delta = 0
+                    delta = -2 
                     while visible_length(highlighted_code[:(state.code_gen-delta)]) > vislen:
                         delta += 1
 
@@ -992,8 +994,8 @@ def ansi2hex(ansi_code):
     r, g, b = map(int, parts)
     return f"#{r:02x}{g:02x}{b:02x}"
 
-def apply_multipliers(name, H, S, V):
-    m = _style.get(name)
+def apply_multipliers(style, name, H, S, V):
+    m = style.get(name)
     r, g, b = colorsys.hsv_to_rgb(min(1.0, H * m["H"]), min(1.0, S * m["S"]), min(1.0, V * m["V"]))
     return ';'.join([str(int(x * 256)) for x in [r, g, b]]) + "m"
 
@@ -1014,40 +1016,49 @@ def width_calc():
 
     state.Width = state.WidthFull - 2 * Style.Margin
     pre = state.space_left(listwidth=True) if Style.PrettyBroken else ''
+    design  = [FG, '▄','▀'] if Style.PrettyPad else [BG, ' ',' ']
     Style.Codepad = [
-        f"{pre}{RESET}{FG}{Style.Dark}{'▄' * state.full_width()}{RESET}\n",
-        f"{pre}{RESET}{FG}{Style.Dark}{'▀' * state.full_width()}{RESET}"
+        f"{pre}{RESET}{design[0]}{Style.Dark}{design[1] * state.full_width()}{RESET}\n",
+        f"{pre}{RESET}{design[0]}{Style.Dark}{design[2] * state.full_width()}{RESET}"
     ]
 
 def main():
-    global H, S, V
-
     parser = ArgumentParser(description="Streamdown - A Streaming markdown renderer for modern terminals")
     parser.add_argument("filenameList", nargs="*", help="Input file to process (also takes stdin)")
     parser.add_argument("-l", "--loglevel", default="INFO", help="Set the logging level")
-    parser.add_argument("-c", "--color", default=None, help="Set the hsv base: h,s,v")
+    parser.add_argument("-b", "--base", default=None, help="Set the hsv base: h,s,v")
+    parser.add_argument("-c", "--config", default=None, help="Use a custom config")
     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("-s", "--scrape", help="Scrape code snippets to a directory SCRAPE")
     args = parser.parse_args()
 
-    if args.color:
-        env_colors = args.color.split(",")
+    config_toml_path, config_toml_content = ensure_config_file(args.config)
+    config = toml.loads(config_toml_content)
+    style = toml.loads(default_toml).get('style') | config.get("style", {})
+    features = toml.loads(default_toml).get('features') | config.get("features", {})
+    H, S, V = style.get("HSV")
+
+    if args.base:
+        env_colors = args.base.split(",")
         if len(env_colors) > 0: H = float(env_colors[0])
         if len(env_colors) > 1: S = float(env_colors[1])
         if len(env_colors) > 2: V = float(env_colors[2])
 
     for color in ["Dark", "Mid", "Symbol", "Head", "Grey", "Bright"]:
-        setattr(Style, color, apply_multipliers(color, H, S, V))
-    for attr in ['PrettyBroken', 'Margin', 'ListIndent', 'Syntax']:
-        setattr(Style, attr, _style.get(attr))
+        setattr(Style, color, apply_multipliers(style, color, H, S, V))
+    for attr in ['PrettyPad', 'PrettyBroken', 'Margin', 'ListIndent', 'Syntax']:
+        setattr(Style, attr, style.get(attr))
+    for attr in ['CodeSpaces', 'Clipboard', 'Logging', 'Timeout', 'Savebrace']:
+        setattr(state, attr, features.get(attr))
+
 
     if args.scrape:
         os.makedirs(args.scrape, exist_ok=True)
         state.scrape = args.scrape
 
     Style.MarginSpaces = " " * Style.Margin
-    state.WidthArg = int(args.width) or _style.get("Width") or 0
+    state.WidthArg = int(args.width) or style.get("Width") or 0
     Style.Blockquote = f"{FG}{Style.Grey}│ "
     width_calc()
 

{streamdown-0.21.0.dist-info → streamdown-0.22.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: streamdown
-Version: 0.21.0
+Version: 0.22.0
 Summary: A streaming markdown renderer for modern terminals with syntax highlighting
 Project-URL: Homepage, https://github.com/kristopolous/Streamdown
 Project-URL: Bug Tracker, https://github.com/kristopolous/Streamdown/issues
@@ -38,6 +38,10 @@ Description-Content-Type: text/markdown
 
 Streamdown works with any streaming markdown such as [simonw's llm](https://github.com/simonw/llm) or even something basic like curl. 
 
+It is designed for AI and can be used to do parser based sophisticated pipelines and routing, cracking open various monolithic AI solutions to permit them to integrate. Think of it as output level routing at the semantic level.
+
+You can also just use it like a normal person.
+
 It supports standard piping and files as arguments like any normal pager but can also run as a wrapper so you retain full keyboard interactivity. Arrow keys, control, alt, all still work.
 ```bash
 $ pip install streamdown
@@ -59,7 +63,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 `sd-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 `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.
 
 This allows you to interactively debug  in a way that the agent doesn't just wander off doing silly things.
 
@@ -135,26 +139,41 @@ Clipboard = false
 ## Command Line
 The most exciting feature here is `--exec` with it you can do full readline support like this:
 
-     $ sd --exec "llm chat"
+```shell
+$ sd --exec "llm chat"
+```
+
+And now you have all your readline stuff. It's pretty great. (Also see the Day50 shellwrap project.)
 
-And now you have all your readline stuff. It's pretty great.
+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
-Streamdown - A markdown renderer for modern terminals
+$ sd -c <(echo "[style]\nMargin=10") 
+```
+
+To override the margin.
+
+```shell
+usage: sd [-h] [-l LOGLEVEL] [-b BASE] [-c CONFIG] [-w WIDTH] [-e EXEC]
+          [-s SCRAPE] [filenameList ...]
+
+Streamdown - A Streaming markdown renderer for modern terminals
 
 positional arguments:
   filenameList          Input file to process (also takes stdin)
 
-options:
+optional arguments:
   -h, --help            show this help message and exit
   -l LOGLEVEL, --loglevel LOGLEVEL
                         Set the logging level
-  -c COLOR, --color COLOR
-                        Set the hsv base: h,s,v
+  -b BASE, --base BASE  Set the hsv base: h,s,v
+  -c CONFIG, --config CONFIG
+                        Use a custom config
   -w WIDTH, --width WIDTH
-                        Set the width
-  -e EXEC, --exec EXEC  Wrap a program for more 'proper' i/o handling
-
+                        Set the width WIDTH
+  -e EXEC, --exec EXEC  Wrap a program EXEC for more 'proper' i/o handling
+  -s SCRAPE, --scrape SCRAPE
+                        Scrape code snippets to a directory SCRAPE
 ```
 
 ## Demo

streamdown-0.22.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+streamdown/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+streamdown/sd.py,sha256=unpjFxiUkjHw9XNZ8ziaOaka4s9qPpV5lwaeGz6pzlo,41981
+streamdown/plugins/README.md,sha256=KWqYELs9WkKJmuDzYv3cvPlZMkArsNCBUe4XDoTLjLA,1143
+streamdown/plugins/latex.py,sha256=xZMGMdx_Sw4X1piZejXFHfEG9qazU4fGeceiMI0h13Y,648
+streamdown-0.22.0.dist-info/METADATA,sha256=jN3R2SE6M7UWfpb9a2IdNGDMfKNL5CBAEj0UaunowKg,9658
+streamdown-0.22.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+streamdown-0.22.0.dist-info/entry_points.txt,sha256=HroKFsFMGf_h9PRTE96NjvjJQWupMW5TGP5RGUr1O_Q,74
+streamdown-0.22.0.dist-info/licenses/LICENSE.MIT,sha256=SnY46EPirUsF20dZDR8HpyVgS2_4Tjxuc6f-4OdqO7U,1070
+streamdown-0.22.0.dist-info/RECORD,,

streamdown/ss

@@ -1 +0,0 @@
-*   **Model Card:**  Always read the model card on the Hugging Face Hub ([https://huggingface.co/microsoft/bitnet-b1.58-2B-4T](https://huggingface.co/microsoft/bitnet-b1.58-2B-4T)) for important information about the model, its intended use, limitations, and potential biases.

streamdown/ss1

@@ -1,42 +0,0 @@
-    *   `model.safetensors`: The name of the file you want to download.  You'll need to know the exact filename.  You can find the files in the model repository on the Hugging Face Hub website ([https://huggingface.co/microsoft/bitnet-b1.58-2B-4T](https://huggingface.co/microsoft/bitnet-b1.58-2B-4T)).  Look under the "Files and versions" tab.  `safetensors` is the preferred format for model weights now.  If it's a `.bin` file, you can download that instead.
-    *   `--local-dir ./bitnet-b1.58-2B-4T`:  The directory to save the file to.
-
-*   **Download using `transformers` library (recommended for most use cases):**
-
-    The `transformers` library provides a convenient way to download and cache models.  This is often the easiest approach if you're using the model with `transformers`.  You don't *directly* use the `huggingface-cli` for this, but it's worth knowing.
-
-    ```python
-    from transformers import AutoModelForCausalLM, AutoTokenizer
-
-    model_name = "microsoft/bitnet-b1.58-2B-4T"
-
-    tokenizer = AutoTokenizer.from_pretrained(model_name)
-    model = AutoModelForCausalLM.from_pretrained(model_name)
-
-    # The model and tokenizer will be downloaded and cached in your
-    # transformers cache directory (usually ~/.cache/huggingface/transformers).
-    ```
-
-    This approach automatically handles downloading the necessary files and caching them for future use.  It also handles the correct file formats and configurations.
-
-**4.  Checking the Download**
-
-After the download completes, verify that the files are in the specified directory.  You can use `ls` (Linux/macOS) or `dir` (Windows) to list the contents of the directory.
-
-**Important Considerations:**
-
-*   **Disk Space:**  The `bitnet-b1.58-2B-4T` model is quite large (several gigabytes).  Make sure you have enough free disk space before downloading.
-*   **Network Connection:**  A stable and fast internet connection is essential for a smooth download.
-*   **Caching:** The Hugging Face Hub and `transformers` library use caching to avoid re-downloading models unnecessarily.  The default cache directory is usually `~/.cache/huggingface/transformers`.
-*   **File Formats:**  Models are often stored in `safetensors` or `.bin` formats.  `safetensors` is generally preferred for security and performance.
-*   **Model Card:**  Always read the model card on the Hugging Face Hub ([https://huggingface.co/microsoft/bitnet-b1.58-2B-4T](https://huggingface.co/microsoft/bitnet-b1.58-2B-4T)) for important information about the model, its intended use, limitations, and potential biases.
-*   **Gated Models:** Some models require you to accept terms of use before you can download them.  The `huggingface-cli login` command will guide you through this process if necessary.
-
-**Example Workflow (Recommended):**
-
-1.  `huggingface-cli login` (if not already logged in)
-2.  Use the `transformers` library in a Python script to download and load the model (as shown in the example above).  This is the most convenient and reliable method for most use cases.
-
-Let me know if you have any other questions or if you'd like help with a specific task related to this model!
-
-> 

streamdown-0.21.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-streamdown/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-streamdown/sd.py,sha256=GmxttpBmMR3yJU2UGM9ESOYqFQMU28HYhVwAKcsMERM,41579
-streamdown/ss,sha256=sel_phpaecrw6WGIHRLROsD7BFShf0rSDHheflwdUn8,277
-streamdown/ss1,sha256=CUVf86_2zeAle2oQCeTfWYqtHBrAFR_UgvptuYMQzFU,3151
-streamdown/plugins/README.md,sha256=KWqYELs9WkKJmuDzYv3cvPlZMkArsNCBUe4XDoTLjLA,1143
-streamdown/plugins/latex.py,sha256=xZMGMdx_Sw4X1piZejXFHfEG9qazU4fGeceiMI0h13Y,648
-streamdown-0.21.0.dist-info/METADATA,sha256=AcCbhBJvkAvdcB-4_1qDhXkrAp02-4vsKWPaoLW2jXg,8843
-streamdown-0.21.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-streamdown-0.21.0.dist-info/entry_points.txt,sha256=HroKFsFMGf_h9PRTE96NjvjJQWupMW5TGP5RGUr1O_Q,74
-streamdown-0.21.0.dist-info/licenses/LICENSE.MIT,sha256=SnY46EPirUsF20dZDR8HpyVgS2_4Tjxuc6f-4OdqO7U,1070
-streamdown-0.21.0.dist-info/RECORD,,