kash-shell 0.3.20__py3-none-any.whl → 0.3.22__py3-none-any.whl

kash/utils/text_handling/escape_html_tags.py

@@ -1,8 +1,13 @@
 import re
 from collections.abc import Set
 
-HTML_IN_MD_TAGS = frozenset(["div", "span", "sup", "sub", "br", "details", "summary"])
-"""These are tags that have reasonable usage in Markdown so typically would be preserved."""
+HTML_IN_MD_TAGS = frozenset(
+    ["div", "span", "i", "b", "em", "sup", "sub", "br", "details", "summary"]
+)
+"""
+These are tags that have reasonable usage in Markdown so typically would be preserved.
+Note we want `<i>` because it's used for icons like `<i data-feather="list"></i>`.
+"""
 
 ALLOWED_BARE_PROTOS = frozenset(["http://", "https://", "file://"])
 
@@ -68,7 +73,7 @@ def escape_html_tags(
 def test_escape_html_tags():
     """Tests the escape_html_tags function with various cases."""
 
-    # 1. Basic Whitelist Check (Default)
+    # Basic Whitelist Check (Default)
     assert escape_html_tags("<div>Test</div>") == "<div>Test</div>"
     assert escape_html_tags("<span>Test</span>") == "<span>Test</span>"
     assert escape_html_tags("<br>") == "<br>"
@@ -77,21 +82,21 @@ def test_escape_html_tags():
         == "<details><summary>Sum</summary>Det</details>"
     )
 
-    # 2. Basic Escape Check
+    # Basic Escape Check
     assert escape_html_tags("<p>Test</p>") == "&lt;p>Test&lt;/p>"
     assert escape_html_tags("<script>alert('x');</script>") == "&lt;script>alert('x');&lt;/script>"
     assert escape_html_tags("<img>") == "&lt;img>"
 
-    # 3. Case Insensitivity
+    # Case Insensitivity
     assert escape_html_tags("<DiV>Case</DiV>") == "<DiV>Case</DiV>"  # Whitelisted
     assert escape_html_tags("<P>Test</P>") == "&lt;P>Test&lt;/P>"  # Escaped
 
-    # 4. Self-closing tags
+    # Self-closing tags
     assert escape_html_tags("<br/>") == "<br/>"  # Whitelisted
     assert escape_html_tags("<br />") == "<br />"  # Whitelisted
     assert escape_html_tags("<img/>") == "&lt;img/>"  # Escaped
 
-    # 5. Tags with Attributes
+    # Tags with Attributes
     assert (
         escape_html_tags('<div class="foo">Test</div>') == '<div class="foo">Test</div>'
     )  # Whitelisted
@@ -102,7 +107,7 @@ def test_escape_html_tags():
     assert escape_html_tags('<p class="foo">Test</p>') == '&lt;p class="foo">Test&lt;/p>'  # Escaped
     assert escape_html_tags('<img src="a.jpg"/>') == '&lt;img src="a.jpg"/>'  # Escaped
 
-    # 6. Markdown URL Handling
+    # Markdown URL Handling
     url_md = "Check <https://example.com> and <http://test.org/path>"
     assert escape_html_tags(url_md, allow_bare_md_urls=True) == url_md
     assert (
@@ -127,7 +132,7 @@ def test_escape_html_tags():
         == "&lt;/https://example.com>"
     )  # Closing URL-like is escaped
 
-    # 7. Nested/Malformed '<' and Edge Cases
+    # Nested/Malformed '<' and Edge Cases
     assert escape_html_tags("<<script>>") == "&lt;&lt;script>>"  # Escaped non-tag <
     assert escape_html_tags("<div><p>nested</p></div>") == "<div>&lt;p>nested&lt;/p></div>"
     assert escape_html_tags("<div<span") == "&lt;div&lt;span"  # Incomplete tags are escaped
@@ -140,7 +145,7 @@ def test_escape_html_tags():
     assert escape_html_tags("< >") == "&lt; >"
     assert escape_html_tags("< / div >") == "< / div >"  # Whitelisted closing tag with spaces
 
-    # 8. Mixed Content Combination
+    # Mixed Content Combination
     complex_html = "<DiV class='A'>Hello <Br/> <p>World</p> <https://link.com> </DiV>"
     expected_complex_allowed = (
         "<DiV class='A'>Hello <Br/> &lt;p>World&lt;/p> <https://link.com> </DiV>"
@@ -151,6 +156,6 @@ def test_escape_html_tags():
     assert escape_html_tags(complex_html, allow_bare_md_urls=True) == expected_complex_allowed
     assert escape_html_tags(complex_html, allow_bare_md_urls=False) == expected_complex_disallowed
 
-    # 9. Empty/No Tags
+    # Empty/No Tags
     assert escape_html_tags("") == ""
     assert escape_html_tags("Just plain text, no tags.") == "Just plain text, no tags."

kash/utils/text_handling/markdown_render.py

@@ -33,6 +33,7 @@ MARKO_GFM = marko.Markdown(
 
 
 FOOTNOTE_UP_ARROW = " ↑ "
+FOOTNOTE_DOWN_ARROW = " ↓ "
 
 
 def html_postprocess(html: str) -> str:

kash/utils/text_handling/markdown_utils.py

@@ -6,7 +6,7 @@ from typing import Any, TypeAlias
 import marko
 import regex
 from marko.block import Heading, ListItem
-from marko.inline import Link
+from marko.inline import AutoLink, Link
 
 from kash.utils.common.url import Url
 
@@ -64,6 +64,9 @@ def _tree_links(element, include_internal=False):
             case Link():
                 if include_internal or not element.dest.startswith("#"):
                     links.append(element.dest)
+            case AutoLink():
+                if include_internal or not element.dest.startswith("#"):
+                    links.append(element.dest)
             case _:
                 if hasattr(element, "children"):
                     for child in element.children:
@@ -710,3 +713,157 @@ def test_markdown_utils_exceptions() -> None:
     result_with_internal = extract_links(content, include_internal=True)
     assert "https://example.com" in result_with_internal
     assert "#section" in result_with_internal
+
+
+def test_extract_links_comprehensive() -> None:
+    """Test extract_links with various link formats including bare links and footnotes."""
+
+    # Test regular markdown links
+    regular_links = "Check out [this link](https://example.com) and [another](https://test.com)"
+    result = extract_links(regular_links)
+    assert "https://example.com" in result
+    assert "https://test.com" in result
+    assert len(result) == 2
+
+    # Test bare/autolinks in angle brackets
+    bare_links = "Visit <https://google.com> and also <https://github.com>"
+    result_bare = extract_links(bare_links)
+    assert "https://google.com" in result_bare
+    assert "https://github.com" in result_bare
+    assert len(result_bare) == 2
+
+    # Test autolinks without brackets (expected to not work with standard markdown)
+    auto_links = "Visit https://stackoverflow.com or http://reddit.com"
+    result_auto = extract_links(auto_links)
+    assert (
+        result_auto == []
+    )  # Plain URLs without brackets aren't parsed as links in standard markdown
+
+    # Test GFM footnotes (the original issue)
+    footnote_content = """
+[^109]: What Is The Future Of Ketamine Therapy For Mental Health Treatment?
+    - The Ko-Op, accessed June 28, 2025,
+      <https://psychedelictherapists.co/blog/the-future-of-ketamine-assisted-psychotherapy/>
+"""
+    result_footnote = extract_links(footnote_content)
+    assert (
+        "https://psychedelictherapists.co/blog/the-future-of-ketamine-assisted-psychotherapy/"
+        in result_footnote
+    )
+    assert len(result_footnote) == 1
+
+    # Test mixed content with all types (excluding reference-style which has parsing conflicts with footnotes)
+    mixed_content = """
+# Header
+
+Regular link: [Example](https://example.com)
+Bare link: <https://bare-link.com>
+Auto link: https://auto-link.com
+
+[^1]: Footnote with [regular link](https://footnote-regular.com)
+[^2]: Footnote with bare link <https://footnote-bare.com>
+"""
+    result_mixed = extract_links(mixed_content)
+    expected_links = [
+        "https://example.com",  # Regular link
+        "https://bare-link.com",  # Bare link
+        "https://footnote-regular.com",  # Link in footnote
+        "https://footnote-bare.com",  # Bare link in footnote
+    ]
+    for link in expected_links:
+        assert link in result_mixed, f"Missing expected link: {link}"
+    # Should not include plain auto link (https://auto-link.com) as it's not in angle brackets
+    assert "https://auto-link.com" not in result_mixed
+    assert len(result_mixed) == len(expected_links)
+
+
+def test_extract_bare_links() -> None:
+    """Test extraction of bare links in angle brackets."""
+    content = "Visit <https://example.com> and <https://github.com/user/repo> for more info"
+    result = extract_links(content)
+    assert "https://example.com" in result
+    assert "https://github.com/user/repo" in result
+    assert len(result) == 2
+
+
+def test_extract_footnote_links() -> None:
+    """Test extraction of links within footnotes."""
+    content = dedent("""
+        Main text with reference[^1].
+        
+        [^1]: This footnote has a [regular link](https://example.com) and <https://bare-link.com>
+        """)
+    result = extract_links(content)
+    assert "https://example.com" in result
+    assert "https://bare-link.com" in result
+    assert len(result) == 2
+
+
+def test_extract_reference_style_links() -> None:
+    """Test extraction of reference-style links."""
+    content = dedent("""
+        Check out [this article][ref1] and [this other one][ref2].
+        
+        [ref1]: https://example.com/article1
+        [ref2]: https://example.com/article2
+        """)
+    result = extract_links(content)
+    assert "https://example.com/article1" in result
+    assert "https://example.com/article2" in result
+    assert len(result) == 2
+
+
+def test_extract_links_with_internal_fragments() -> None:
+    """Test that internal fragment links are excluded by default but included when requested."""
+    content = dedent("""
+        See [this section](#introduction) and [external link](https://example.com).
+        Also check [another section](#conclusion) here.
+        """)
+
+    # Default behavior: exclude internal links
+    result = extract_links(content)
+    assert "https://example.com" in result
+    assert "#introduction" not in result
+    assert "#conclusion" not in result
+    assert len(result) == 1
+
+    # Include internal links
+    result_with_internal = extract_links(content, include_internal=True)
+    assert "https://example.com" in result_with_internal
+    assert "#introduction" in result_with_internal
+    assert "#conclusion" in result_with_internal
+    assert len(result_with_internal) == 3
+
+
+def test_extract_links_mixed_real_world() -> None:
+    """Test with a realistic mixed document containing various link types."""
+    content = dedent("""
+        # Research Article
+        
+        This study examines ketamine therapy[^109] and references multiple sources.
+        
+        ## Methods
+        
+        We reviewed literature from [PubMed](https://pubmed.ncbi.nlm.nih.gov) 
+        and other databases <https://scholar.google.com>.
+        
+        For protocol details, see [our methodology][methodology].
+        
+        [methodology]: https://research.example.com/protocol
+        
+        [^109]: What Is The Future Of Ketamine Therapy For Mental Health Treatment?
+            - The Ko-Op, accessed June 28, 2025,
+              <https://psychedelictherapists.co/blog/the-future-of-ketamine-assisted-psychotherapy/>
+        """)
+
+    result = extract_links(content)
+    expected_links = [
+        "https://pubmed.ncbi.nlm.nih.gov",
+        "https://scholar.google.com",
+        "https://research.example.com/protocol",
+        "https://psychedelictherapists.co/blog/the-future-of-ketamine-assisted-psychotherapy/",
+    ]
+
+    for link in expected_links:
+        assert link in result, f"Missing expected link: {link}"
+    assert len(result) == len(expected_links)

kash/web_gen/tabbed_webpage.py

@@ -82,7 +82,7 @@ def tabbed_webpage_config(
 
     config_item = Item(
         title=f"{title} (config)",
-        type=ItemType.config,
+        type=ItemType.data,
         format=Format.yaml,
         body=to_yaml_string(asdict(config)),
     )
@@ -108,7 +108,7 @@ def tabbed_webpage_generate(
     """
     Generate a web page using the supplied config.
     """
-    config = config_item.read_as_config()
+    config = config_item.read_as_data()
     tabbed_webpage = as_dataclass(config, TabbedWebpage)  # Checks the format.
 
     _load_tab_content(tabbed_webpage)

kash/web_gen/templates/base_styles.css.jinja

@@ -5,7 +5,7 @@
   --font-sans: "Source Sans 3 Variable", sans-serif, "Hack Nerd Font";
   --font-serif: "PT Serif", serif, "Hack Nerd Font";
   /* Source Sans 3 Variable better at these weights. */
-  --font-weight-sans-medium: 565;
+  --font-weight-sans-medium: 550;
   --font-weight-sans-bold: 650;
   --font-mono: "Hack Nerd Font", "Menlo", "DejaVu Sans Mono", Consolas, "Lucida Console", monospace;
 
@@ -156,7 +156,13 @@ h4 {
   margin-bottom: 0.7rem;
 }
 
-h5, h6 {
+h5 {
+  font-size: 1rem;
+  margin-top: 0.7rem;
+  margin-bottom: 0.5rem;
+}
+
+h6 {
   font-size: 1rem;
   margin-top: 0.7rem;
   margin-bottom: 0.5rem;
@@ -368,15 +374,15 @@ hr:before {
 
 .long-text h3 {
   font-family: var(--font-sans);
-  font-weight: 565;
+  font-weight: 550;
   text-transform: uppercase;
   letter-spacing: 0.025em;
 }
 
 .long-text h4 {
-  font-family: var(--font-sans);
-  font-weight: 650;
-  letter-spacing: 0.02em;
+  font-family: var(--font-serif);
+  font-weight: 400;
+  font-style: italic;
 }
 
 .long-text h5 {
@@ -435,6 +441,10 @@ hr:before {
 {% endblock long_text_styles %}
 
 {% block table_styles %}
+table, th, td, tbody tr {
+  transition: background-color 0.4s ease-in-out, border-color 0.4s ease-in-out;
+}
+
 table {
   font-family: var(--font-sans);
   font-size: var(--font-size-small);
@@ -453,6 +463,7 @@ th {
   letter-spacing: 0.03em;
   border-bottom: 1px solid var(--color-border-hint);
   line-height: 1.2;
+  background-color: var(--color-bg-alt-solid);
 }
 
 th, td {
@@ -461,10 +472,6 @@ th, td {
   min-width: 6rem;
 }
 
-th {
-  background-color: var(--color-bg-alt-solid);
-}
-
 tbody tr:nth-child(even) {
   background-color: var(--color-bg-alt-solid); 
 }
@@ -480,7 +487,12 @@ tbody tr:nth-child(even) {
   transform: translateX(-50%);
   /* Prevent container from expanding beyond its content area */
   overflow-x: auto;
-  overflow-y: visible;
+  overflow-y: hidden; /* Whole height of table shown, no vertical scrolling. */
+}
+
+.table-container table {
+  /* Tricky: Need this to prevent bogus extra horizontal scroll while keeping normal sizing */
+  contain: content;
 }
 
 /* When TOC is present, simplify table container positioning */
@@ -540,7 +552,6 @@ sup {
     width: calc(100vw - 6rem);
     /* Ensure container doesn't expand beyond its width */
     max-width: calc(100vw - 6rem);
-    contain: layout inline-size;
   }
   
   /* Apply shadow to long-text containers on larger screens */
@@ -590,8 +601,6 @@ sup {
     
     /* Ensure horizontal scroll works properly without expanding container */
     overflow-x: auto;
-    overflow-y: visible;
-    contain: layout inline-size;
   }
   
   .content-with-toc.has-toc table {
@@ -634,20 +643,17 @@ sup {
   
   /* Make table containers scrollable without affecting page layout */
   .table-container {
-    width: calc(100vw - 3rem);  /* Fixed width instead of max-width */
-    max-width: calc(100vw - 3rem);
     overflow-x: auto;
-    overflow-y: visible;  /* Ensure vertical overflow is not hidden */
     transform: none;
     left: 0;
     position: relative;
     margin-left: auto;
-    margin-right: auto;
+    margin-right: 0; /* Extend to right edge */
     /* Prevent container from expanding beyond its width */
     box-sizing: border-box;
-    contain: layout inline-size;  /* CSS containment to prevent width expansion */
+    width: calc(100vw - 1.5rem); /* Full width minus left margin */
   }
-  
+
   table {
     font-size: var(--font-size-smaller);
     /* Tables can be wider than container on mobile */

kash/web_gen/templates/components/toc_styles.css.jinja

@@ -6,7 +6,7 @@
 
 @media (min-width: 1536px) {
   :root {
-    --toc-width: min(21vw, 30rem);
+    --toc-width: min(21vw, 26rem);
   }
 }