New style APP (Tab Changes v1.1)

app.py

@@ -104,7 +104,6 @@ h2, h3, .gr-markdown {
 
 
             def run_comparison(p1, p2):
-                """Wrapper: LLM comparison + HTML formatting."""
                 raw_text = "".join(comparer.run(p1, p2))
                 return format_comparison_output(raw_text)
 

core/formatters.py

@@ -1,9 +1,9 @@
 """
 🇬🇧 Module: formatters.py
-Purpose: Converts Markdown-style LLM comparison outputs into styled HTML.
+Purpose: Converts LLM Markdown output (comparison/analysis) into styled HTML tables.
 
 🇷🇺 Модуль: formatters.py
-Назначение: форматирует текстовый Markdown-ответ LLM в таблицу и визуально читаемый отчёт.
+Назначение: преобразует Markdown-таблицы и текст отчёта LLM в аккуратное HTML-представление.
 """
 
 import re
@@ -11,58 +11,74 @@ from html import escape
 
 
 def highlight_metrics(text: str) -> str:
-    """Highlight positive/negative numeric values."""
+    """Highlight numeric percentage values in green/red."""
     def colorize(match):
         val = match.group(0)
         try:
             num = float(val.replace("%", ""))
-            if num > 0:
-                return f"<span style='color:#10b981;font-weight:600;'>{val}</span>"
-            elif num < 0:
-                return f"<span style='color:#ef4444;font-weight:600;'>{val}</span>"
+            color = "#10b981" if num > 0 else "#ef4444" if num < 0 else "#e6edf3"
+            return f"<span style='color:{color};font-weight:600;'>{val}</span>"
         except ValueError:
-            pass
-        return val
-
+            return val
     return re.sub(r"-?\d+\.?\d*%", colorize, text)
 
 
+def md_table_to_html(md_table: str) -> str:
+    """Convert a single Markdown table block into HTML."""
+    lines = [ln.strip() for ln in md_table.strip().splitlines() if "|" in ln]
+    if len(lines) < 2:
+        return md_table
+
+    # remove the Markdown alignment line (---|---)
+    header_line = lines[0]
+    body_lines = [ln for ln in lines[2:]]
+
+    headers = [escape(c.strip()) for c in header_line.split("|")[1:-1]]
+    html = (
+        "<table style='width:100%;border-collapse:collapse;"
+        "margin:10px 0;font-size:14px;font-family:Inter,sans-serif;'>"
+        "<thead><tr>"
+        + "".join(
+            f"<th style='border-bottom:1px solid #30363d;padding:6px;color:#c9d1d9;font-weight:600;text-align:center;'>"
+            f"{h}</th>" for h in headers
+        )
+        + "</tr></thead><tbody>"
+    )
+    for ln in body_lines:
+        cols = [highlight_metrics(escape(c.strip())) for c in ln.split("|")[1:-1]]
+        html += "<tr>" + "".join(
+            f"<td style='padding:6px 8px;border-bottom:1px solid #30363d;text-align:center;color:#e6edf3;'>"
+            f"{c}</td>" for c in cols
+        ) + "</tr>"
+    html += "</tbody></table>"
+    return html
+
+
 def format_comparison_output(raw: str) -> str:
-    """Convert LLM Markdown table into styled HTML."""
+    """Format LLM Markdown response into rich HTML."""
     if not raw:
-        return "<i>No data received.</i>"
+        return "<i>No comparison data available.</i>"
 
-    # Format headers
-    formatted = raw
-    formatted = re.sub(r"### ?1️⃣", "<h3 style='color:#93c5fd;'>1. Summary Table</h3>", formatted)
-    formatted = re.sub(r"### ?2️⃣", "<h3 style='color:#a78bfa;'>2. Comparative Analysis</h3>", formatted)
-    formatted = re.sub(r"### ?3️⃣", "<h3 style='color:#fbbf24;'>3. Recommendation</h3>", formatted)
+    text = raw.strip()
 
-    # Convert Markdown tables to HTML tables
-    def md_table_to_html(md_table):
-        rows = [r.strip() for r in md_table.strip().splitlines() if "|" in r]
-        if len(rows) < 2:
-            return md_table
-        headers = [escape(c.strip()) for c in rows[0].split("|")[1:-1]]
-        html = "<table style='width:100%;border-collapse:collapse;margin-top:6px;'>"
-        html += "<thead><tr>" + "".join(
-            f"<th style='border-bottom:1px solid #30363d;text-align:center;padding:6px;color:#c9d1d9;font-weight:600;'>{h}</th>"
-            for h in headers
-        ) + "</tr></thead><tbody>"
-        for row in rows[2:]:
-            cols = [highlight_metrics(c.strip()) for c in row.split("|")[1:-1]]
-            html += "<tr>" + "".join(
-                f"<td style='padding:5px 6px;text-align:center;border-bottom:1px solid #30363d;color:#e6edf3;'>{c}</td>"
-                for c in cols
-            ) + "</tr>"
-        html += "</tbody></table>"
-        return html
+    # Section titles
+    text = re.sub(r"###\s*1️⃣.*", "<h3 style='color:#93c5fd;margin-top:12px;'>1. Summary Table</h3>", text)
+    text = re.sub(r"###\s*2️⃣.*", "<h3 style='color:#a78bfa;margin-top:12px;'>2. Comparative Analysis</h3>", text)
+    text = re.sub(r"###\s*3️⃣.*", "<h3 style='color:#fbbf24;margin-top:12px;'>3. Recommendation</h3>", text)
 
-    formatted = re.sub(r"(\|.*\|[\r\n\|\-\.\w\s%]+)", lambda m: md_table_to_html(m.group(0)), formatted)
+    # Extract and replace Markdown tables
+    tables = re.findall(r"(\|[^\n]+\|\n(\|[^\n]+\|\n)+)", text)
+    for tbl, _ in tables:
+        html_table = md_table_to_html(tbl)
+        text = text.replace(tbl, html_table)
 
-    # Final cleanup and minor formatting
-    formatted = highlight_metrics(formatted)
-    formatted = formatted.replace("**", "")
-    formatted = formatted.replace("\n", "<br>")
+    text = highlight_metrics(text)
+    text = text.replace("**", "")
+    text = text.replace("\n", "<br>")
 
-    return f"<div style='font-family:Inter, sans-serif;font-size:15px;line-height:1.5;color:#e6edf3;'>{formatted}</div>"
+    return (
+        "<div style='font-family:Inter,sans-serif;font-size:15px;line-height:1.6;"
+        "color:#e6edf3;'>"
+        + text +
+        "</div>"
+    )