New style APP (Tab Changes v1.3)

core/formatters.py

@@ -1,117 +1,95 @@
 """
 🇬🇧 Module: formatters.py
-Purpose: Cleanly format LLM Markdown portfolio comparison output into styled HTML.
+Purpose: Cleanly format comparison output into a Bloomberg-style HTML table + narrative.
 
 🇷🇺 Модуль: formatters.py
-Назначение: форматирует Markdown-ответ LLM в аккуратную HTML-таблицу без дубликатов и пустых столбцов.
+Назначение: отображает сравнение портфелей в виде таблицы и аналитического блока в едином стиле.
 """
-
 import re
 from html import escape
 
 
-def highlight_metrics(text: str) -> str:
-    """Color numeric values depending on sign."""
-    def colorize(match):
-        val = match.group(0)
+def build_comparison_table(metrics: list[dict]) -> str:
+    """Builds a styled HTML table from list of metrics."""
+    rows = []
+    for m in metrics:
+        name = escape(m["metric"])
+        a = escape(m["a"])
+        b = escape(m["b"])
         try:
-            num = float(val.replace("%", ""))
-            if num > 0:
-                color = "#10b981"  # green
-            elif num < 0:
-                color = "#ef4444"  # red
-            else:
-                color = "#e6edf3"
-            return f"<span style='color:{color};font-weight:600;'>{val}</span>"
-        except ValueError:
-            return val
-
-    return re.sub(r"-?\d+\.?\d*%", colorize, text)
-
-
-def clean_table_lines(lines):
-    """Remove invalid / empty Markdown table lines."""
-    result = []
-    for ln in lines:
-        if not ln.strip():
-            continue
-        if ln.strip().startswith("|") and len(ln.split("|")) > 3:
-            result.append(ln)
-    return result
-
-
-def md_table_to_html(md_table: str) -> str:
-    """Convert one Markdown table to HTML safely."""
-    lines = clean_table_lines(md_table.strip().splitlines())
-    if len(lines) < 2:
-        return md_table
-
-    header_line = lines[0]
-    data_lines = lines[2:]  # skip the ---|--- line
-    headers = [escape(c.strip()) for c in header_line.split("|")[1:-1] if c.strip()]
+            fa = float(a.replace("%", ""))
+            fb = float(b.replace("%", ""))
+        except Exception:
+            fa, fb = None, None
+
+        def color(v):
+            if v is None:
+                return "#e6edf3"
+            return "#10b981" if v > 0 else "#ef4444" if v < 0 else "#e6edf3"
+
+        def fmt(val, c):
+            arrow = "▲" if c == "#10b981" else "▼" if c == "#ef4444" else "▪"
+            return f"<span style='color:{c};font-weight:600'>{val} {arrow}</span>"
+
+        ca, cb = color(fa), color(fb)
+        rows.append(
+            f"<tr>"
+            f"<td style='padding:6px 8px;border-bottom:1px solid #30363d;text-align:left;color:#c9d1d9'>{name}</td>"
+            f"<td style='padding:6px 8px;border-bottom:1px solid #30363d;text-align:center'>{fmt(a, ca)}</td>"
+            f"<td style='padding:6px 8px;border-bottom:1px solid #30363d;text-align:center'>{fmt(b, cb)}</td>"
+            f"</tr>"
+        )
 
-    html = [
-        "<table style='width:100%;border-collapse:collapse;"
-        "margin:10px 0;font-size:14px;font-family:Inter,sans-serif;'>",
+    html = (
+        "<table style='width:100%;border-collapse:collapse;margin:12px 0;"
+        "font-family:Inter,sans-serif;font-size:14px;'>"
         "<thead><tr>"
-        + "".join(
-            f"<th style='border-bottom:1px solid #30363d;padding:6px;color:#c9d1d9;"
-            f"font-weight:600;text-align:center;'>{h}</th>"
-            for h in headers
-        )
-        + "</tr></thead><tbody>"
-    ]
-
-    for ln in data_lines:
-        cols = [c.strip() for c in ln.split("|")[1:-1] if c.strip()]
-        if len(cols) != len(headers):
-            continue  # skip malformed rows
-        html.append(
-            "<tr>"
-            + "".join(
-                f"<td style='padding:6px 8px;border-bottom:1px solid #30363d;"
-                f"text-align:center;color:#e6edf3;'>"
-                f"{highlight_metrics(escape(c))}</td>"
-                for c in cols
-            )
-            + "</tr>"
-        )
+        "<th style='color:#9da5b4;text-align:left;padding:6px 8px;'>Metric</th>"
+        "<th style='color:#9da5b4;text-align:center;'>Portfolio A</th>"
+        "<th style='color:#9da5b4;text-align:center;'>Portfolio B</th>"
+        "</tr></thead><tbody>"
+        + "".join(rows)
+        + "</tbody></table>"
+    )
+    return html
+
 
-    html.append("</tbody></table>")
-    return "".join(html)
+def extract_metrics_from_text(raw: str) -> list[dict]:
+    """Extracts metric rows like '| Annualized Return | 97.73% | -10.46% |'."""
+    metrics = []
+    for line in raw.splitlines():
+        if "|" not in line:
+            continue
+        cols = [c.strip() for c in line.split("|") if c.strip()]
+        if len(cols) == 3 and re.search(r"\d", cols[1]) and re.search(r"\d", cols[2]):
+            metrics.append({"metric": cols[0], "a": cols[1], "b": cols[2]})
+    return metrics
 
 
 def format_comparison_output(raw: str) -> str:
-    """Transform Markdown to HTML with correct table parsing."""
+    """Transforms LLM comparison text into styled HTML."""
     if not raw:
         return "<i>No comparison data available.</i>"
 
-    text = raw.strip()
-
-    # Section headers
-    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)
+    # Extract metric rows
+    metrics = extract_metrics_from_text(raw)
 
-    # Extract Markdown tables only once
-    table_blocks = re.findall(r"((?:\|[^\n]+\n)+)", text)
-    used_blocks = set()
+    # Remove the original table to avoid duplication
+    cleaned = re.sub(r"(\|.*\|\n)+", "", raw).strip()
 
-    for tbl in table_blocks:
-        tbl_clean = tbl.strip()
-        if tbl_clean in used_blocks:
-            continue
-        used_blocks.add(tbl_clean)
-        html_table = md_table_to_html(tbl_clean)
-        text = text.replace(tbl_clean, html_table)
+    # Section styling
+    cleaned = re.sub(r"###\s*1️⃣.*", "<h3 style='color:#93c5fd;'>1. Summary Table</h3>", cleaned)
+    cleaned = re.sub(r"###\s*2️⃣.*", "<h3 style='color:#a78bfa;'>2. Comparative Analysis</h3>", cleaned)
+    cleaned = re.sub(r"###\s*3️⃣.*", "<h3 style='color:#fbbf24;'>3. Recommendation</h3>", cleaned)
 
-    text = highlight_metrics(text)
-    text = text.replace("**", "")
-    text = text.replace("\n", "<br>")
+    # Build HTML
+    html_table = build_comparison_table(metrics)
+    cleaned = cleaned.replace("**", "").replace("\n", "<br>")
 
     return (
-        "<div style='font-family:Inter,sans-serif;font-size:15px;line-height:1.6;"
-        "color:#e6edf3;'>"
-        + text +
+        "<div style='font-family:Inter,sans-serif;font-size:15px;line-height:1.6;color:#e6edf3;'>"
+        "<h3 style='color:#93c5fd;margin-bottom:4px;'>1. Summary Table</h3>"
+        f"{html_table}"
+        f"<div style='margin-top:12px;'>{cleaned}</div>"
         "</div>"
     )