chatgpt-md-converter 0.3.9__tar.gz → 0.3.10__tar.gz

{chatgpt_md_converter-0.3.9 → chatgpt_md_converter-0.3.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chatgpt_md_converter
-Version: 0.3.9
+Version: 0.3.10
 Summary: A package for converting markdown to HTML for chat Telegram bots
 Home-page: https://github.com/botfather-dev/formatter-chatgpt-telegram
 Author: Kostiantyn Kriuchkov

{chatgpt_md_converter-0.3.9 → chatgpt_md_converter-0.3.10}/chatgpt_md_converter/html_markdown/handlers.py

@@ -35,30 +35,91 @@ def render_node(node: Node, state: RenderState) -> str:
     return render_nodes(node.children, state)
 
 
+def _split_surrounding_whitespace(text: str) -> tuple[str, str, str]:
+    """Return leading whitespace, core text, and trailing whitespace."""
+
+    start = 0
+    end = len(text)
+
+    while start < end and text[start].isspace():
+        start += 1
+
+    while end > start and text[end - 1].isspace():
+        end -= 1
+
+    return text[:start], text[start:end], text[end:]
+
+
+def _italic_boundary_conflict(marker: str, core: str) -> bool:
+    if marker == "*":
+        return core.startswith("*") or core.endswith("*")
+
+    if marker == "_":
+        starts = core.startswith("_")
+        if starts and len(core) > 1 and core[1] == "_":
+            starts = False
+
+        ends = core.endswith("_")
+        if ends and len(core) > 1 and core[-2] == "_":
+            ends = False
+
+        return starts or ends
+
+    return False
+
+
+def _choose_italic_marker(state: RenderState, core: str) -> str:
+    depth = state.italic_depth
+
+    if state.bold_depth > 0 and depth == 0:
+        candidates = ["_", "*"]
+    elif depth % 2 == 0:
+        candidates = ["*", "_"]
+    else:
+        candidates = ["_", "*"]
+
+    for marker in candidates:
+        if not _italic_boundary_conflict(marker, core):
+            return marker
+
+    return candidates[0]
+
+
 def _handle_bold(node: Node, state: RenderState) -> str:
     inner_state = state.child(bold_depth=state.bold_depth + 1)
     inner = render_nodes(node.children, inner_state)
-    return f"**{inner}**"
+    leading, core, trailing = _split_surrounding_whitespace(inner)
+    if not core:
+        return leading + trailing
+    return f"{leading}**{core}**{trailing}"
 
 
 def _handle_italic(node: Node, state: RenderState) -> str:
     depth = state.italic_depth
-    in_bold = state.bold_depth > 0 and depth == 0
-    marker = "_" if in_bold else ("*" if depth % 2 == 0 else "_")
     inner_state = state.child(italic_depth=depth + 1)
     inner = render_nodes(node.children, inner_state)
-    return f"{marker}{inner}{marker}"
+    leading, core, trailing = _split_surrounding_whitespace(inner)
+    if not core:
+        return leading + trailing
+    marker = _choose_italic_marker(state, core)
+    return f"{leading}{marker}{core}{marker}{trailing}"
 
 
 def _handle_inline_marker(node: Node, state: RenderState) -> str:
     marker_open, marker_close = _INLINE_MARKERS[node.tag.lower()]
     inner = render_nodes(node.children, state)
-    return f"{marker_open}{inner}{marker_close}"
+    leading, core, trailing = _split_surrounding_whitespace(inner)
+    if not core:
+        return leading + trailing
+    return f"{leading}{marker_open}{core}{marker_close}{trailing}"
 
 
 def _handle_spoiler(node: Node, state: RenderState) -> str:
     inner = render_nodes(node.children, state)
-    return f"||{inner}||"
+    leading, core, trailing = _split_surrounding_whitespace(inner)
+    if not core:
+        return leading + trailing
+    return f"{leading}||{core}||{trailing}"
 
 
 def _handle_code(node: Node, state: RenderState) -> str:

{chatgpt_md_converter-0.3.9 → chatgpt_md_converter-0.3.10}/chatgpt_md_converter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chatgpt_md_converter
-Version: 0.3.9
+Version: 0.3.10
 Summary: A package for converting markdown to HTML for chat Telegram bots
 Home-page: https://github.com/botfather-dev/formatter-chatgpt-telegram
 Author: Kostiantyn Kriuchkov

{chatgpt_md_converter-0.3.9 → chatgpt_md_converter-0.3.10}/chatgpt_md_converter.egg-info/SOURCES.txt

@@ -20,6 +20,7 @@ chatgpt_md_converter/telegram_markdown/inline.py
 chatgpt_md_converter/telegram_markdown/postprocess.py
 chatgpt_md_converter/telegram_markdown/preprocess.py
 chatgpt_md_converter/telegram_markdown/renderer.py
+tests/test_html_to_markdown_inline_spacing.py
 tests/test_parser.py
 tests/test_roundtrip_markdown.py
 tests/test_splitter.py

{chatgpt_md_converter-0.3.9 → chatgpt_md_converter-0.3.10}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name="chatgpt_md_converter",
-    version="0.3.9",
+    version="0.3.10",
     author="Kostiantyn Kriuchkov",
     author_email="latand666@gmail.com",
     description="A package for converting markdown to HTML for chat Telegram bots",

chatgpt_md_converter-0.3.10/tests/test_html_to_markdown_inline_spacing.py

@@ -0,0 +1,25 @@
+import pytest
+
+from chatgpt_md_converter import html_to_telegram_markdown
+
+
+@pytest.mark.parametrize(
+    ("html", "expected"),
+    [
+        ("Start <b>bold </b>finish", "Start **bold** finish"),
+        ("Start <b> bold</b> finish", "Start  **bold** finish"),
+        ("Start <i> italics </i>finish", "Start  _italics_ finish"),
+        ("Start <i>value_</i>end", "Start *value_*end"),
+        ("Start <u> underline </u>finish", "Start  __underline__ finish"),
+        (
+            "Start <span class=\"tg-spoiler\"> secret </span>end",
+            "Start  ||secret|| end",
+        ),
+        (
+            "Intro <b>bold <i> inner </i> block</b> outro",
+            "Intro **bold  _inner_  block** outro",
+        ),
+    ],
+)
+def test_html_to_markdown_strips_inline_whitespace(html: str, expected: str) -> None:
+    assert html_to_telegram_markdown(html) == expected