cellarbrain 0.3.4__tar.gz → 0.3.6__tar.gz

{cellarbrain-0.3.4/src/cellarbrain.egg-info → cellarbrain-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cellarbrain
-Version: 0.3.4
+Version: 0.3.6
 Summary: AI sommelier for your wine cellar — ETL pipeline, DuckDB query layer, Markdown dossiers, and MCP server for wine cellar CSV exports
 Author-email: Urban Busslinger <urbanb@me.com>
 License-Expression: MIT

{cellarbrain-0.3.4 → cellarbrain-0.3.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cellarbrain"
-version = "0.3.4"
+version = "0.3.6"
 description = "AI sommelier for your wine cellar — ETL pipeline, DuckDB query layer, Markdown dossiers, and MCP server for wine cellar CSV exports"
 requires-python = ">=3.11"
 license = "MIT"

{cellarbrain-0.3.4 → cellarbrain-0.3.6}/src/cellarbrain/_query_base.py

@@ -12,6 +12,31 @@ def _to_md(df: pd.DataFrame) -> str:
     return df.astype(object).where(df.notna(), "").to_markdown(index=False)
 
 
+def _to_aligned(df: pd.DataFrame) -> str:
+    """Render a DataFrame as a space-aligned monospace code block."""
+    if df.empty:
+        return "*No results.*"
+
+    clean = df.astype(object).where(df.notna(), "")
+    cols = list(clean.columns)
+
+    # Compute column widths
+    widths = [len(c) for c in cols]
+    for _, row in clean.iterrows():
+        for i, c in enumerate(cols):
+            widths[i] = max(widths[i], len(str(row[c])))
+
+    # Build header + rows
+    lines: list[str] = []
+    header = "  ".join(str(c).ljust(widths[i]) for i, c in enumerate(cols))
+    lines.append(header)
+    for _, row in clean.iterrows():
+        line = "  ".join(str(row[c]).ljust(widths[i]) for i, c in enumerate(cols))
+        lines.append(line)
+
+    return "```text\n" + "\n".join(lines) + "\n```"
+
+
 def _to_plain(df: pd.DataFrame, style: str = "list") -> str:
     """Render a DataFrame as plain text (no Markdown) for iMessage delivery.
 
@@ -19,10 +44,26 @@ def _to_plain(df: pd.DataFrame, style: str = "list") -> str:
         list — numbered list, one row per item with key columns on one line
         kv — key-value pairs, one per line for each row
         compact — single line per row with middle-dot separators
+        aligned — space-aligned monospace code block
+        auto — pick style based on row/column count (iMessage heuristic)
     """
     if df.empty:
         return "*No results.*"
 
+    if style == "auto":
+        nrows = len(df)
+        ncols = len(df.columns)
+        if nrows <= 5:
+            style = "kv"
+        elif nrows <= 15 and ncols <= 4:
+            style = "aligned"
+        else:
+            # Large table: summary + first rows
+            return _to_plain_summary(df)
+
+    if style == "aligned":
+        return _to_aligned(df)
+
     clean = df.astype(object).where(df.notna(), "")
     cols = list(clean.columns)
 
@@ -51,6 +92,17 @@ def _to_plain(df: pd.DataFrame, style: str = "list") -> str:
     return "\n".join(lines)
 
 
+def _to_plain_summary(df: pd.DataFrame, max_rows: int = 10) -> str:
+    """Summarise a large DataFrame: show first N rows + count."""
+    total = len(df)
+    shown = min(max_rows, total)
+    head = df.head(shown)
+    body = _to_aligned(head)
+    if total > shown:
+        body += f"\n\n…and {total - shown} more rows."
+    return body
+
+
 def _format_df(df: pd.DataFrame, fmt: str = "markdown", style: str = "list") -> str:
     """Dispatch DataFrame formatting based on format preference."""
     if fmt == "plain":

{cellarbrain-0.3.4 → cellarbrain-0.3.6}/src/cellarbrain/dossier_ops.py

@@ -769,11 +769,12 @@ def pending_research(
     section: str | None = None,
     include_stale: bool = False,
     stale_months: int = 6,
+    fmt: str = "markdown",
 ) -> str:
     """List wines with pending agent sections, sorted by priority.
 
     Priority: favorites first, then by bottles_in_cellar descending.
-    Returns a Markdown table.
+    Returns a Markdown table or plain text depending on *fmt*.
 
     Args:
         data_dir: Path to the data directory.
@@ -784,6 +785,7 @@ def pending_research(
             sections (research older than *stale_months*). These appear after
             genuinely pending wines.
         stale_months: Threshold for stale research (default 6 months).
+        fmt: Output format ("markdown" or "plain").
     """
     d = pathlib.Path(data_dir)
     wines_dir = d / "wines"
@@ -875,28 +877,42 @@ def pending_research(
     # Truncate
     pending_data = pending_data[:limit]
 
-    # Format as Markdown table
-    lines = [
-        "| wine_id | Name | Vintage | Bottles | Favorite | Pending |",
-        "|---|---|---|---|---|---|",
-    ]
-    for item in pending_data:
-        fav = "⭐" if item["is_favorite"] else ""
-        lines.append(
-            f"| {item['wine_id']} "
-            f"| {item['wine_name'] or '—'} "
-            f"| {item['vintage'] or 'NV'} "
-            f"| {item['bottles']} "
-            f"| {fav} "
-            f"| {item['pending_count']} |"
-        )
+    # Format output
+    if fmt == "plain":
+        lines: list[str] = []
+        for item in pending_data:
+            fav = " ⭐" if item["is_favorite"] else ""
+            lines.append(
+                f"{item['wine_id']}. {item['wine_name'] or '—'}"
+                f" ({item['vintage'] or 'NV'}){fav}"
+                f" — {item['bottles']} btl, {item['pending_count']} pending"
+            )
+    else:
+        lines = [
+            "| wine_id | Name | Vintage | Bottles | Favorite | Pending |",
+            "|---|---|---|---|---|---|",
+        ]
+        for item in pending_data:
+            fav = "⭐" if item["is_favorite"] else ""
+            lines.append(
+                f"| {item['wine_id']} "
+                f"| {item['wine_name'] or '—'} "
+                f"| {item['vintage'] or 'NV'} "
+                f"| {item['bottles']} "
+                f"| {fav} "
+                f"| {item['pending_count']} |"
+            )
 
     # Optionally append stale research items
     if include_stale:
-        stale_result = stale_research(data_dir, months=stale_months, limit=limit, section=section)
+        stale_result = stale_research(data_dir, months=stale_months, limit=limit, section=section, fmt=fmt)
         if "*No stale research found.*" not in stale_result:
-            lines.append("")
-            lines.append("### Stale Research (>" + str(stale_months) + " months)")
+            if fmt == "plain":
+                lines.append("")
+                lines.append(f"STALE RESEARCH (>{stale_months} months)")
+            else:
+                lines.append("")
+                lines.append("### Stale Research (>" + str(stale_months) + " months)")
             lines.append("")
             lines.append(stale_result)
 
@@ -909,6 +925,7 @@ def stale_research(
     limit: int = 20,
     section: str | None = None,
     settings: Settings | None = None,
+    fmt: str = "markdown",
 ) -> str:
     """Find wine dossier sections where research metadata is older than *months*.
 
@@ -916,7 +933,7 @@ def stale_research(
     with a parseable date. Sections without metadata are ignored (use
     ``pending_research`` for those).
 
-    Returns a Markdown table sorted by oldest-first.
+    Returns a table sorted by oldest-first.
     """
     d = pathlib.Path(data_dir)
     wines_dir = d / "wines"
@@ -981,20 +998,29 @@ def stale_research(
 
     stale_items = stale_items[:limit]
 
-    lines = [
-        "| wine_id | Name | Section | Date | Age | Agent |",
-        "|---|---|---|---|---|---|",
-    ]
-    for item in stale_items:
-        name = wine_meta.get(item["wine_id"], "")
-        lines.append(
-            f"| {item['wine_id']} "
-            f"| {name} "
-            f"| {item['section']} "
-            f"| {item['date']} "
-            f"| {item['months_ago']}mo "
-            f"| {item['agent']} |"
-        )
+    if fmt == "plain":
+        lines: list[str] = []
+        for item in stale_items:
+            name = wine_meta.get(item["wine_id"], "")
+            lines.append(
+                f"{item['wine_id']}. {name} — {item['section']}"
+                f" ({item['date']}, {item['months_ago']}mo ago, agent: {item['agent']})"
+            )
+    else:
+        lines = [
+            "| wine_id | Name | Section | Date | Age | Agent |",
+            "|---|---|---|---|---|---|",
+        ]
+        for item in stale_items:
+            name = wine_meta.get(item["wine_id"], "")
+            lines.append(
+                f"| {item['wine_id']} "
+                f"| {name} "
+                f"| {item['section']} "
+                f"| {item['date']} "
+                f"| {item['months_ago']}mo "
+                f"| {item['agent']} |"
+            )
 
     return "\n".join(lines)
 
@@ -1361,11 +1387,12 @@ def update_companion_dossier(
 def pending_companion_research(
     data_dir: str | pathlib.Path,
     limit: int = 20,
+    fmt: str = "markdown",
 ) -> str:
     """List tracked wines with pending companion sections.
 
     Scans companion dossier frontmatter for ``agent_sections_pending`` entries.
-    Returns a Markdown table sorted by tracked_wine_id.
+    Returns a table sorted by tracked_wine_id.
     """
     d = pathlib.Path(data_dir)
     wishlist_dir = d / "wines" / "tracked"
@@ -1432,16 +1459,25 @@ def pending_companion_research(
     pending_data.sort(key=lambda x: x["tracked_wine_id"])
     pending_data = pending_data[:limit]
 
-    lines = [
-        "| tracked_wine_id | Winery | Wine | Pending |",
-        "|---|---|---|---|",
-    ]
-    for item in pending_data:
-        lines.append(
-            f"| {item['tracked_wine_id']} "
-            f"| {item['winery'] or '—'} "
-            f"| {item['wine_name'] or '—'} "
-            f"| {item['pending_count']} |"
-        )
+    if fmt == "plain":
+        lines: list[str] = []
+        for item in pending_data:
+            lines.append(
+                f"{item['tracked_wine_id']}. {item['winery'] or '—'}"
+                f" — {item['wine_name'] or '—'}"
+                f" ({item['pending_count']} pending)"
+            )
+    else:
+        lines = [
+            "| tracked_wine_id | Winery | Wine | Pending |",
+            "|---|---|---|---|",
+        ]
+        for item in pending_data:
+            lines.append(
+                f"| {item['tracked_wine_id']} "
+                f"| {item['winery'] or '—'} "
+                f"| {item['wine_name'] or '—'} "
+                f"| {item['pending_count']} |"
+            )
 
     return "\n".join(lines)