Update app.py

app.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import os
 import re
+import html as html_lib
 from typing import List, Tuple, Union
 
 import requests
@@ -32,7 +33,8 @@ class ParseRequest(BaseModel):
 
 
 class ParseResponse(BaseModel):
-    markdown: str
+    html: str
+    text: str
     telegram_total: int
     vk_total: int
     errors: List[str]
@@ -42,9 +44,17 @@ class ParseResponse(BaseModel):
 
 def human_format_views(num: int) -> str:
     if num >= 1_000_000:
-        formatted = f"{num / 1_000_000:.1f}M"
+        value = num / 1_000_000
+        suffix = "M"
     else:
-        formatted = f"{num / 1000:.1f}K"
+        value = num / 1000
+        suffix = "K"
+
+    if value.is_integer():
+        formatted = f"{int(value)}{suffix}"
+    else:
+        formatted = f"{value:.1f}{suffix}"
+
     return formatted.replace(".", ",")
 
 
@@ -160,7 +170,7 @@ def process_telegram_link(channel_username: str, message_id: str, canonical_link
         return title, views
 
     except Exception as exc:
-        return f"**Ошибка (TG)** при обработке [{canonical_link}]({canonical_link}): {exc}", 0
+        return f"Ошибка (TG) при обработке {canonical_link}: {exc}", 0
 
 
 def process_vk_link(owner_id: int, post_id: str, canonical_link: str) -> Tuple[str, int]:
@@ -228,7 +238,11 @@ def normalize_links(links: Union[List[str], str]) -> List[str]:
     return [line.strip() for line in raw if line.strip()]
 
 
-def build_markdown(lines: List[Tuple[str, str, object, object]]) -> Tuple[str, int, int, List[str]]:
+def _escape(text: str) -> str:
+    return html_lib.escape(text, quote=True)
+
+
+def build_output(lines: List[Tuple[str, str, object, object]]) -> Tuple[str, str, int, int, List[str]]:
     errors: List[str] = []
 
     tg_groups = {}
@@ -281,50 +295,90 @@ def build_markdown(lines: List[Tuple[str, str, object, object]]) -> Tuple[str, i
         reverse=True,
     )
 
-    md_lines: List[str] = []
+    html_lines: List[str] = []
+    text_lines: List[str] = []
 
-    md_lines.append("## Telegram")
-    md_lines.append(f"**Суммарный охват постов — {human_format_views(tg_total_views)} просмотров**")
+    # --- Telegram ---
+    html_lines.append("<h2>Telegram</h2>")
+    html_lines.append(f"<b>Суммарный охват постов — {human_format_views(tg_total_views)} просмотров</b>")
+    text_lines.append("Telegram")
+    text_lines.append(f"Суммарный охват постов — {human_format_views(tg_total_views)} просмотров")
     if tg_sorted:
+        html_lines.append("<ol>")
         for idx, (_, data) in enumerate(tg_sorted, start=1):
             title = data["title"] or "Telegram"
             items = data["items"]
             first_link, _first_views = items[0]
-            line = f"{idx}. [{title}]({first_link})"
+
+            title_html = _escape(title)
+            first_link_html = _escape(first_link)
+            line_html = f'<li><a href="{first_link_html}">{title_html}</a>'
             if len(items) > 1:
                 for link2, _v in items[1:]:
-                    line += f" + [ещё]({link2})"
+                    line_html += f' + <a href="{_escape(link2)}">ещё</a>'
             views_str = " + ".join(human_format_views(v) for _, v in items)
-            line += f" — {views_str}"
-            md_lines.append(line)
-    else:
-        md_lines.append("_Нет ссылок на Telegram_")
-    md_lines.append("")
+            line_html += f" — {views_str}</li>"
+            html_lines.append(line_html)
 
-    md_lines.append("## ВКонтакте")
-    md_lines.append(f"**Суммарный охват постов — {human_format_views(vk_total_views)} просмотров**")
+            line_text = f"{idx}. {title} ({first_link})"
+            if len(items) > 1:
+                extra_links = ", ".join(link2 for link2, _v in items[1:])
+                line_text += f" + ещё: {extra_links}"
+            line_text += f" — {views_str}"
+            text_lines.append(line_text)
+        html_lines.append("</ol>")
+    else:
+        html_lines.append("<i>Нет ссылок на Telegram</i>")
+        text_lines.append("Нет ссылок на Telegram")
+    html_lines.append("<br/>")
+    text_lines.append("")
+
+    # --- VK ---
+    html_lines.append("<h2>ВКонтакте</h2>")
+    html_lines.append(f"<b>Суммарный охват постов — {human_format_views(vk_total_views)} просмотров</b>")
+    text_lines.append("ВКонтакте")
+    text_lines.append(f"Суммарный охват постов — {human_format_views(vk_total_views)} просмотров")
     if vk_sorted:
+        html_lines.append("<ol>")
         for idx, (_, data) in enumerate(vk_sorted, start=1):
             title = data["title"] or "VK пост"
             items = data["items"]
             first_link, _first_views = items[0]
-            line = f"{idx}. [{title}]({first_link})"
+
+            title_html = _escape(title)
+            first_link_html = _escape(first_link)
+            line_html = f'<li><a href="{first_link_html}">{title_html}</a>'
             if len(items) > 1:
                 for link2, _v in items[1:]:
-                    line += f" + [ещё]({link2})"
+                    line_html += f' + <a href="{_escape(link2)}">ещё</a>'
             views_str = " + ".join(human_format_views(v) for _, v in items)
-            line += f" — {views_str}"
-            md_lines.append(line)
+            line_html += f" — {views_str}</li>"
+            html_lines.append(line_html)
+
+            line_text = f"{idx}. {title} ({first_link})"
+            if len(items) > 1:
+                extra_links = ", ".join(link2 for link2, _v in items[1:])
+                line_text += f" + ещё: {extra_links}"
+            line_text += f" — {views_str}"
+            text_lines.append(line_text)
+        html_lines.append("</ol>")
     else:
-        md_lines.append("_Нет ссылок на ВКонтакте_")
-    md_lines.append("")
+        html_lines.append("<i>Нет ссылок на ВКонтакте</i>")
+        text_lines.append("Нет ссылок на ВКонтакте")
+    html_lines.append("<br/>")
+    text_lines.append("")
 
     if errors:
-        md_lines.append("## Ошибки")
-        md_lines.extend(f"- {err}" for err in errors)
-        md_lines.append("")
+        html_lines.append("<h2>Ошибки</h2>")
+        html_lines.append("<ul>")
+        for err in errors:
+            html_lines.append(f"<li>{_escape(err)}</li>")
+            text_lines.append(f"- {err}")
+        html_lines.append("</ul>")
+        html_lines.append("<br/>")
+        text_lines.append("")
 
-    return "\n".join(md_lines), tg_total_views, vk_total_views, errors
+    return "\n".join(html_lines), "\n".join(text_lines), tg_total_views, vk_total_views, errors
 
 
 @app.get("/health")
@@ -336,7 +390,7 @@ def health_check():
 def parse_links(payload: ParseRequest):
     raw_lines = normalize_links(payload.links)
     if not raw_lines:
-        return ParseResponse(markdown="", telegram_total=0, vk_total=0, errors=["Нет ссылок для обработки."])
+        return ParseResponse(html="", text="", telegram_total=0, vk_total=0, errors=["Нет ссылок для обработки."])
 
     seen = set()
     lines: List[Tuple[str, str, object, object]] = []
@@ -363,10 +417,11 @@ def parse_links(payload: ParseRequest):
         else:
             lines.append(("unknown", link, None, None))
 
-    markdown, tg_total, vk_total, errors = build_markdown(lines)
+    html, text, tg_total, vk_total, errors = build_output(lines)
     return ParseResponse(
-        markdown=markdown,
+        html=html,
+        text=text,
         telegram_total=tg_total,
         vk_total=vk_total,
         errors=errors,
-    )
+    )