chatgpt-md-converter 0.3.11__tar.gz → 0.3.12__tar.gz

{chatgpt_md_converter-0.3.11 → chatgpt_md_converter-0.3.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chatgpt_md_converter
-Version: 0.3.11
+Version: 0.3.12
 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.11 → chatgpt_md_converter-0.3.12}/chatgpt_md_converter/html_markdown/handlers.py

@@ -169,11 +169,12 @@ def _handle_blockquote(node: Node, state: RenderState) -> str:
     expandable = "expandable" in node.attrs
     rendered: list[str] = []
     for index, line in enumerate(lines):
-        prefix = "**>" if expandable and index == 0 else ">"
         stripped = line.rstrip("\r")
         if expandable:
-            rendered.append(prefix + stripped)
+            marker = ">**" if index == 0 else ">"
+            rendered.append(f"{marker} {stripped}" if stripped else marker)
         else:
+            prefix = ">"
             rendered.append(f"{prefix} {stripped}" if stripped else prefix)
     return "\n".join(rendered)
 

{chatgpt_md_converter-0.3.11 → chatgpt_md_converter-0.3.12}/chatgpt_md_converter/telegram_markdown/preprocess.py

@@ -14,6 +14,10 @@ def combine_blockquotes(text: str) -> str:
             in_blockquote = True
             is_expandable = True
             blockquote_lines.append(line[3:].strip())
+        elif line.startswith(">**") and (len(line) == 3 or line[3].isspace()):
+            in_blockquote = True
+            is_expandable = True
+            blockquote_lines.append(line[3:].strip())
         elif line.startswith(">"):
             if not in_blockquote:
                 in_blockquote = True

{chatgpt_md_converter-0.3.11 → chatgpt_md_converter-0.3.12}/chatgpt_md_converter/telegram_markdown/renderer.py

@@ -12,9 +12,8 @@ from .preprocess import combine_blockquotes
 
 
 def telegram_format(text: str) -> str:
-    text = combine_blockquotes(text)
-
     output, block_map = extract_and_convert_code_blocks(text)
+    output = combine_blockquotes(output)
     output, inline_snippets = extract_inline_code_snippets(output)
 
     output = convert_html_chars(output)

{chatgpt_md_converter-0.3.11 → chatgpt_md_converter-0.3.12}/chatgpt_md_converter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chatgpt_md_converter
-Version: 0.3.11
+Version: 0.3.12
 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.11 → chatgpt_md_converter-0.3.12}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name="chatgpt_md_converter",
-    version="0.3.11",
+    version="0.3.12",
     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.11 → chatgpt_md_converter-0.3.12}/tests/test_parser.py

@@ -716,6 +716,41 @@ Continued</blockquote>"""
     assert output == expected_output, "Failed handling spoiler inside blockquote"
 
 
+def test_blockquote_lines_inside_code_block():
+    input_text = """```text
+>** заголовок довгої цитати
+> рядок 2
+> рядок 3
+> рядок 4
+> і ще хоч сто рядків
+```"""
+    expected_output = (
+        '<pre><code class="language-text">&gt;** заголовок довгої цитати\n'
+        '&gt; рядок 2\n'
+        '&gt; рядок 3\n'
+        '&gt; рядок 4\n'
+        '&gt; і ще хоч сто рядків\n'
+        "</code></pre>"
+    )
+    output = telegram_format(input_text)
+    assert output == expected_output, f"Got: {output}"
+
+
+def test_blockquote_double_asterisk_prefix():
+    input_text = """>** заголовок довгої цитати
+> рядок 2
+> рядок 3
+> рядок 4
+> і ще хоч сто рядків"""
+    expected_output = """<blockquote expandable>заголовок довгої цитати
+рядок 2
+рядок 3
+рядок 4
+і ще хоч сто рядків</blockquote>"""
+    output = telegram_format(input_text)
+    assert output == expected_output, f"Got: {output}"
+
+
 def test_multiple_spoilers():
     input_text = "First ||spoiler|| and then another ||spoiler with *italic*||"
     expected_output = 'First <span class="tg-spoiler">spoiler</span> and then another <span class="tg-spoiler">spoiler with <i>italic</i></span>'

{chatgpt_md_converter-0.3.11 → chatgpt_md_converter-0.3.12}/tests/test_roundtrip_markdown.py

@@ -30,3 +30,10 @@ def test_markdown_html_markdown_cycle_is_idempotent(_case, markdown_input, _):
     assert '<br' not in html_first
     assert '<br' not in html_third
     assert html_first == html_third
+
+
+def test_html_to_markdown_expandable_blockquote():
+    html_text = "<blockquote expandable>заголовок\nрядок 2\nрядок 3</blockquote>"
+    expected_markdown = ">** заголовок\n> рядок 2\n> рядок 3"
+    markdown = html_to_telegram_markdown(html_text)
+    assert markdown == expected_markdown