streamdown 0.25.0__py3-none-any.whl → 0.27.0__py3-none-any.whl

streamdown/sd.py

@@ -206,7 +206,8 @@ class ParseState:
         return offset + (state.current_width(listwidth = True) if Style.PrettyBroken else self.WidthFull)
 
     def current_width(self, listwidth = False):
-        return self.Width - (len(visible(self.space_left(listwidth))))
+        # this will double count the left margin
+        return self.Width - (len(visible(self.space_left(listwidth)))) + Style.Margin
 
     def space_left(self, listwidth = False):
         pre = ' ' * (len(state.list_item_stack)) * Style.ListIndent if listwidth else ''
@@ -235,7 +236,7 @@ def format_table(rowList):
 
     # Calculate max width per column (integer division)
     # Subtract num_cols + 1 for the vertical borders '│'
-    available_width = state.current_width() - (num_cols + 1)
+    available_width = state.current_width() - (num_cols * 2)
 
     width_base = available_width // num_cols
     width_mod  = available_width % num_cols
@@ -285,17 +286,23 @@ def format_table(rowList):
 
 def emit_h(level, text):
     text = line_format(text)
-    spaces_to_center = (state.current_width() -  visible_length(text)) / 2
-    if level == 1:      #
-        return f"{state.space_left()}\n{state.space_left()}{BOLD[1]}{' ' * math.floor(spaces_to_center)}{text}{BOLD[1]}"
-    elif level == 2:    ##
-        return f"{state.space_left()}\n{state.space_left()}{BOLD[0]}{FG}{Style.Bright}{' ' * math.floor(spaces_to_center)}{text}{' ' * math.ceil(spaces_to_center)}{BOLD[1]}{FGRESET}"
-    elif level == 3:    ###
-        return f"{state.space_left()}{FG}{Style.Head}{BOLD[0]}{text}{RESET}"
-    elif level == 4:    ####
-        return f"{state.space_left()}{FG}{Style.Symbol}{text}{RESET}"
-    else:  # level 5 or 6
-        return f"{state.space_left()}{text}{RESET}"
+    lineList = text_wrap(text)
+    res = []
+    for text in lineList:
+        spaces_to_center = (state.current_width() -  visible_length(text)) / 2
+        if level == 1:      #
+            res.append(f"{state.space_left()}\n{state.space_left()}{BOLD[1]}{' ' * math.floor(spaces_to_center)}{text}{BOLD[1]}")
+        elif level == 2:    ##
+            res.append(f"{state.space_left()}\n{state.space_left()}{BOLD[0]}{FG}{Style.Bright}{' ' * math.floor(spaces_to_center)}{text}{' ' * math.ceil(spaces_to_center)}{BOLD[1]}{FGRESET}")
+        elif level == 3:    ###
+            res.append(f"{state.space_left()}{FG}{Style.Head}{BOLD[0]}{text}{RESET}")
+        elif level == 4:    ####
+            res.append(f"{state.space_left()}{FG}{Style.Symbol}{text}{RESET}")
+        elif level == 5:    #####
+            res.append(f"{state.space_left()}{text}{RESET}")
+        else: 
+            res.append(f"{state.space_left()}{FG}{Style.Grey}{text}{RESET}")
+    return "\n".join(res)
 
 def code_wrap(text_in):
     if not Style.PrettyBroken and state.WidthWrap and len(text_in) > state.full_width():
@@ -379,9 +386,7 @@ def text_wrap(text, width = -1, indent = 0, first_line_prefix="", subsequent_lin
 
     # The empty word clears the buffer at the end.
     formatted = line_format(text)
-    #print(bytes(formatted, 'utf-8'), formatted)
     words = split_text(formatted) + [""]
-    #print([bytes(i, 'utf-8') for i in words])
 
     lines = []
     current_line = ""
@@ -432,11 +437,15 @@ def text_wrap(text, width = -1, indent = 0, first_line_prefix="", subsequent_lin
     if len(lines) < 1:
         return []
 
+    if len(lines) == 1:
+        lines[0] = lines[0].rstrip()
+
     return lines
 
 def dbl_count(s):
     dbl_re = re.compile(
         r'[\u2e80-\u2eff\u3000-\u303f\u3400-\u4dbf'
+        r'\uFF00-\uFFEF'       # CJK Compatibility Punctuation
         r'\U00004e00-\U00009fff\U0001f300-\U0001f6ff'
         r'\U0001f900-\U0001f9ff\U0001fa70-\U0001faff]',
         re.UNICODE
@@ -448,7 +457,7 @@ def cjk_count(s):
         r'[\u4E00-\u9FFF'      # CJK Unified Ideographs
         r'\u3400-\u4DBF'       # CJK Unified Ideographs Extension A
         r'\uF900-\uFAFF'       # CJK Compatibility Ideographs
-		r'\uFF00-\uFFEF'       # CJK Compatibility Punctuation
+        r'\uFF00-\uFFEF'       # CJK Compatibility Punctuation
         r'\u3000-\u303F'      # CJK Symbols and Punctuation
         r'\U0002F800-\U0002FA1F]' # CJK Compatibility Ideographs Supplement
     )
@@ -456,7 +465,7 @@ def cjk_count(s):
     return len(cjk_re.findall(visible(s)))
 
 def line_format(line):
-    not_text = lambda token: not (token.isalnum() or token == '\\') or cjk_count(token)
+    not_text = lambda token: not (token.isalnum() or token in ['\\','"']) or cjk_count(token)
     footnotes = lambda match: ''.join([chr(SUPER[int(i)]) for i in match.group(1)])
 
     def process_images(match):
@@ -686,7 +695,7 @@ def parse(stream):
 
         # <code><pre>
         if not state.in_code:
-            code_match = re.match(r"^\s*```\s*([^\s]+|$)\s*$", line)
+            code_match = re.match(r"^\s*(```|<pre>)\s*([^\s]+|$)\s*$", line)
             if code_match:
                 state.in_code = Code.Backtick
                 state.code_indent = len(line) - len(line.lstrip())
@@ -720,10 +729,8 @@ def parse(stream):
         if state.in_code:
             try:
                 # This is turning it OFF
-                if not state.code_first_line and (
-                        (                     state.in_code == Code.Backtick and     line.strip() == "```"  ) or
-                        (state.CodeSpaces and state.in_code == Code.Spaces   and not line.startswith('    '))
-                    ):
+                if ( (                     state.in_code == Code.Backtick and     line.strip() in ["</pre>", "```"]  ) or 
+                     (state.CodeSpaces and state.in_code == Code.Spaces   and not line.startswith('    ')) ):
                     if state.scrape:
                         ext = "sh"
                         try:
@@ -914,7 +921,7 @@ def parse(stream):
         # a weird thing
         if state.in_list:
             indent = (len(state.list_item_stack) - 1) * Style.ListIndent #+ (len(bullet) - 1)
-            wrap_width = state.current_width() - indent - (2 * Style.ListIndent) 
+            wrap_width = state.current_width(listwidth = True) - Style.ListIndent
             
             wrapped_lineList = text_wrap(content, wrap_width, Style.ListIndent,
                 first_line_prefix = f"{(' ' * indent)}{FG}{Style.Symbol}{bullet}{RESET} ",
@@ -946,6 +953,11 @@ def parse(stream):
             continue
 
         state.where_from = "emit_normal"
+
+        # if we've gotten to an emit normal then we can assert that our list stack should
+        # be empty. This is a hack.
+        state.list_item_stack = []
+
         if len(line) == 0: yield ""
         if len(line) < state.Width:
             # we want to prevent word wrap
@@ -1010,19 +1022,23 @@ def apply_multipliers(style, name, H, S, V):
     return ';'.join([str(int(x * 256)) for x in [r, g, b]]) + "m"
 
 def width_calc():
-    if not state.WidthFull or not state.WidthArg:
-        if state.WidthArg:
-            state.WidthFull = state.WidthArg
-        else:
-            width = 80
+    if state.WidthArg:
+       width = state.WidthArg
+    else:
+       try:
+           width = shutil.get_terminal_size().columns
+           state.WidthWrap = True
+       except (AttributeError, OSError):
+           width = 80
+           pass
 
-            try:
-                width = shutil.get_terminal_size().columns
-                state.WidthWrap = True
-            except (AttributeError, OSError):
-                pass
 
-            state.WidthFull = width
+    # This can't be done because our list item stack can change as well so
+    # unless we want to track that too, we're SOL
+    #if state.WidthFull == width:
+    #    return
+
+    state.WidthFull = width
 
     state.Width = state.WidthFull - 2 * Style.Margin
     pre = state.space_left(listwidth=True) if Style.PrettyBroken else ''
@@ -1041,8 +1057,24 @@ def main():
     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")
+    parser.add_argument("-v", "--version", action="store_true", help="Show version information")
     args = parser.parse_args()
 
+    if args.version:
+        try:
+            import importlib.metadata
+            print(importlib.metadata.version("streamdown"))
+        except importlib.metadata.PackageNotFoundError:
+            import subprocess
+            print(subprocess.run(
+                ['git', 'describe', '--always', '--dirty', '--tags'],
+                cwd=os.path.dirname(os.path.abspath(__file__)),
+                stdout=subprocess.PIPE,
+                text=True
+            ).stdout.strip())
+
+        sys.exit(0)
+
     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", {})

streamdown/ss

@@ -0,0 +1 @@
+*   **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

@@ -0,0 +1,42 @@
+    *   `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.25.0.dist-info → streamdown-0.27.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: streamdown
-Version: 0.25.0
+Version: 0.27.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
@@ -188,7 +188,3 @@ After the git clone least one of these should work, hopefully. it's using the mo
     $ pip install -e .
     $ uv pip install -e . 
 
-### Future work
-
-#### Glow styles
-I'm going to try to be compatible with other popular markdown styles to help for a smoother transition. Glow compatible json sheets is on my radar. There's also mdless and frogmouth. Might be others

streamdown-0.27.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+streamdown/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+streamdown/sd.py,sha256=hk9h-gZz9OJw88iHowC6mWk0-ETRMmKmdr3063c8e74,43469
+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.27.0.dist-info/METADATA,sha256=_5zd5q0T0LSEk9kJK2CZitv7HfboKIhLrEsWjUfdmx8,9425
+streamdown-0.27.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+streamdown-0.27.0.dist-info/entry_points.txt,sha256=HroKFsFMGf_h9PRTE96NjvjJQWupMW5TGP5RGUr1O_Q,74
+streamdown-0.27.0.dist-info/licenses/LICENSE.MIT,sha256=SnY46EPirUsF20dZDR8HpyVgS2_4Tjxuc6f-4OdqO7U,1070
+streamdown-0.27.0.dist-info/RECORD,,

streamdown-0.25.0.dist-info/RECORD

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