quickdbd-cli 0.3.2__py3-none-any.whl → 0.3.3__py3-none-any.whl

quickdbd_cli/__init__.py

@@ -1 +1 @@
-__version__ = "0.3.2"
+__version__ = "0.3.3"

quickdbd_cli/agent.py

@@ -638,12 +638,6 @@ def diff_schema(ws: Workspace, args: dict) -> Result:
     return Result("\n".join(clip(_header(c) + text.splitlines(), "lines")))
 
 
-def _svg_size(svg: str) -> tuple[float, float]:
-    w = re.search(r'\bwidth="([\d.]+)', svg)
-    h = re.search(r'\bheight="([\d.]+)', svg)
-    return (float(w.group(1)) if w else 1000.0, float(h.group(1)) if h else 1000.0)
-
-
 def render_diagram(ws: Workspace, args: dict) -> Result:
     c = ws.compile(ws.target(args.get("project")))
     tables = selected(c, args.get("select"))
@@ -679,7 +673,7 @@ def render_diagram(ws: Workspace, args: dict) -> Result:
             raise ToolError("the layout took too long; narrow with `select` or `focus`") from None
         pos = {k: [v[0], v[1]] for k, v in laid.items()}
         svg = export.render_svg(c.model, pos, only=ids, mode=mode, embed_font=False)
-        scale = min(2.0, IMAGE_SIDE / max(_svg_size(svg)))
+        scale = min(2.0, IMAGE_SIDE / max(export.svg_size(svg)))
         if scale >= MIN_SCALE[mode]:
             png = export.svg_to_png(svg, scale)
             names = ", ".join(t["name"] for t in tables[:40]) + (", …" if n > 40 else "")

quickdbd_cli/assets/style.css

@@ -82,6 +82,7 @@ html, body { margin: 0; height: 100%; background: var(--bg); color: var(--ink);
 #stage { position: relative; flex: 1; overflow: hidden; }
 #canvas { width: 100%; height: 100%; display: block; cursor: grab; touch-action: none; user-select: none; }
 #canvas.panning { cursor: grabbing; }
+#canvas.lod .t text { display: none; } /* big diagram, zoomed out: see LOD_TABLES in viewer.js */
 
 /* diagram colours: CSS beats the SVG presentation attributes, so the page can theme them */
 .tb { fill: var(--t-body); stroke: var(--t-border); }

quickdbd_cli/assets/viewer.js

@@ -40,9 +40,13 @@
     applyFocus();
   }
 
+  // Zoomed out on a big diagram, table text is unreadable but repainting it made every zoom step take ~150 ms
+  // at 1000 tables, so it is hidden there. Smaller diagrams always show it.
+  var LOD_TABLES = 300, LOD_ZOOM = 0.3;
   function applyView() {
     var v = S.view;
     vp.setAttribute("transform", "translate(" + v.x + "," + v.y + ") scale(" + v.k + ")");
+    svg.classList.toggle("lod", v.k < LOD_ZOOM && S.vm.tables.length > LOD_TABLES);
     zoomval.textContent = Math.round(v.k * 100) + "%";
     drawViewportRect();
     scheduleHash();
@@ -806,7 +810,7 @@
     try {
       if (p.has("m")) setMode(p.get("m"));
       if (p.has("r")) setRegions(p.get("r") === "1");
-      applyFilter(p.get("f") || "", true);
+      if ((p.get("f") || "") !== S.filter) applyFilter(p.get("f") || "", true); // else already rendered
       var name = p.get("t"), id = null;
       if (name) S.model.tables.forEach(function (t) { if (t.name === name) id = t.id; });
       select(id && S.shown[id] ? id : null);

quickdbd_cli/cli.py

@@ -216,7 +216,11 @@ def cmd_export(args) -> int:
     if fmt == "svg":
         out.write_text(svg, encoding="utf-8")
     else:
-        out.write_bytes(export.svg_to_png(svg, args.scale))
+        scale = export.png_scale(svg, args.scale)
+        if scale < args.scale:
+            note = f"--scale lowered to {scale:.2f} to keep the PNG within {export.MAX_PNG_SIDE} px"
+            print(f"note: {note}", file=sys.stderr)
+        out.write_bytes(export.svg_to_png(svg, scale))
     print(f"Wrote {out} ({len(only) if only else len(model['tables'])} tables)")
     return 0
 
@@ -532,7 +536,7 @@ def build_parser() -> argparse.ArgumentParser:
             action="append",
             metavar="SELECTOR",
             help="dbt-style: name glob, +name (and what it references), name+ (and what references it), "
-            "N+name+N (hops), group:/file:/col: methods, a,b intersects (repeatable)",
+            "N+name+N (hops), group:/file:/col:/tag: methods, a,b intersects (repeatable)",
         )
         sp.add_argument("--exclude", action="append", metavar="SELECTOR", help="drop tables matching (repeatable)")
 

quickdbd_cli/export.py

@@ -3,12 +3,16 @@
 from __future__ import annotations
 
 import base64
+import re
 from functools import cache
 from importlib import resources
 
 from . import layout
 from .jsrt import runtime
 
+# A 200-table diagram at scale 2 is 17506x15274 px: 15 s to encode, and too big for many image viewers.
+MAX_PNG_SIDE = 16384
+
 
 def _asset_bytes(name: str) -> bytes:
     return resources.files("quickdbd_cli").joinpath(f"assets/{name}").read_bytes()
@@ -85,6 +89,17 @@ def focus_positions(model: dict, positions: dict, ids: list[str]) -> dict:
     return {k: [v[0], v[1]] for k, v in pos.items()}
 
 
+def svg_size(svg: str) -> tuple[float, float]:
+    w = re.search(r'\bwidth="([\d.]+)', svg)
+    h = re.search(r'\bheight="([\d.]+)', svg)
+    return (float(w.group(1)) if w else 1000.0, float(h.group(1)) if h else 1000.0)
+
+
+def png_scale(svg: str, scale: float) -> float:
+    """``scale``, lowered so the PNG's longest side stays within MAX_PNG_SIDE pixels."""
+    return min(scale, MAX_PNG_SIDE / max(svg_size(svg)))
+
+
 def svg_to_png(svg: str, scale: float = 2.0) -> bytes:
     import resvg_py
 

quickdbd_cli/layout.py

@@ -32,6 +32,10 @@ OVERLAP_OPTIONS = {
     "elk.spacing.nodeNode": "40",
     "elk.randomSeed": "1",
 }
+# Overlap removal takes most of a big layout (25 of 37 s at 1000 tables). Above BIG_LAYOUT tables its
+# iterations are capped, and the few tables it leaves overlapping are moved by `_separate`.
+BIG_LAYOUT = 300
+BIG_OVERLAP_OPTIONS = {**OVERLAP_OPTIONS, "org.eclipse.elk.overlapRemoval.maxIterations": "8"}
 
 MARGIN = 30
 Positions = dict[str, tuple[int, int]]
@@ -64,9 +68,10 @@ def elk_layout(tables: list[dict], rels: list[dict], timeout_sec: float | None =
     }
     first = rt.call_async("qdbdElkLayout", graph, timeout_sec=timeout_sec)
     first = _landscape(tables, {k: (v[0], v[1]) for k, v in first.items()})
+    big = len(tables) > BIG_LAYOUT
     graph = {
         "id": "root",
-        "layoutOptions": OVERLAP_OPTIONS,
+        "layoutOptions": BIG_OVERLAP_OPTIONS if big else OVERLAP_OPTIONS,
         "children": [
             {"id": t["id"], "width": t["w"], "height": t["h"], "x": first[t["id"]][0], "y": first[t["id"]][1]}
             for t in tables
@@ -74,6 +79,8 @@ def elk_layout(tables: list[dict], rels: list[dict], timeout_sec: float | None =
         "edges": [],
     }
     raw = rt.call_async("qdbdElkLayout", graph, timeout_sec=timeout_sec)
+    if big:
+        raw = _separate(tables, raw)
     min_x = min(v[0] for v in raw.values())
     min_y = min(v[1] for v in raw.values())
     return {k: (int(v[0] - min_x), int(v[1] - min_y)) for k, v in raw.items()}
@@ -155,6 +162,18 @@ def _free_spot(cx: float, cy: float, w: float, h: float, rects, step: int = 30)
     return int(round(x0)), int(round(y0))
 
 
+def _separate(tables: list[dict], pos: dict) -> dict:
+    """Move each table that overlaps an earlier one to the nearest free spot."""
+    out, rects = {}, []
+    for t in tables:
+        x, y = pos[t["id"]]
+        if _overlaps(x, y, t["w"], t["h"], rects):
+            x, y = _free_spot(x + t["w"] / 2, y + t["h"] / 2, t["w"], t["h"], rects)
+        out[t["id"]] = (x, y)
+        rects.append((x, y, t["w"], t["h"]))
+    return out
+
+
 def place_missing(tables: list[dict], rels: list[dict], positions: Positions) -> Positions:
     """Positions for every table. Existing positions never move.
 

{quickdbd_cli-0.3.2.dist-info → quickdbd_cli-0.3.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: quickdbd-cli
-Version: 0.3.2
+Version: 0.3.3
 Summary: Compile QuickDBD-syntax schema files into interactive HTML ER diagrams, with no table limit.
 Project-URL: Homepage, https://qdbd.dev/
 Project-URL: Documentation, https://qdbd.dev/guide/
@@ -43,7 +43,7 @@ Description-Content-Type: text/markdown
   </picture>
 </p>
 
-<p align="center"><b>Interactive ER diagrams from QuickDBD text or a dbt project, readable at 200+ tables</b></p>
+<p align="center"><b>Interactive ER diagrams from QuickDBD text, DBML or a dbt project, readable at 200+ tables</b></p>
 
 <p align="center">
   <a href="https://pypi.org/project/quickdbd-cli/"><img src="https://img.shields.io/pypi/v/quickdbd-cli?label=PyPI" alt="PyPI version"></a>
@@ -89,7 +89,7 @@ qdbd is not affiliated with QuickDBD or dbdiagram.io. It reads the same text syn
 - **QuickDBD-compatible**: the parser mirrors QuickDBD's own, error messages included. A file that passes `qdbd check --strict` pastes into QuickDBD unchanged.
 - **dbt import**: `qdbd import dbt` reads `manifest.json`. Primary keys come from `unique` + `not_null` tests or constraints, relationships from `relationships` tests, and `--infer-fks` fills the gaps from column names.
 - **Readable at 200+ tables**: automatic layout, search, dbt-style selectors (`+orders+1`, `group:marts`, `tag:fact`), shaded regions per file, collapsed views and a minimap.
-- **Review changes in pull requests**: `qdbd diff` reports what a branch changed, the GitHub Action posts it as a PR comment, and `--diff-base` colours the changes in the diagram.
+- **Review changes in pull requests**: `qdbd diff` reports what a branch changed, the GitHub Action posts it as a PR comment, and `--diff-base` colours the changes in the diagram. To propose a column change, tag the column `# @tag: added` or `# @tag: removed` and it's drawn green or red ([column tags](https://qdbd.dev/tags/#columns)).
 - **VS Code extension**: highlighting, errors as you type, outline, F12 across files, and the diagram beside the editor, following your cursor, or in your browser on localhost. Export, share, compare with git, convert to and from DBML, and dbt import from the sidebar or the Command Palette, with no terminal: it installs the CLI itself. Get it from the [VS Code Marketplace](https://marketplace.visualstudio.com/items?itemName=MarkPhamm.quickdbd) or, for Cursor, Windsurf and VSCodium, [Open VSX](https://open-vsx.org/extension/MarkPhamm/quickdbd) ([docs](https://qdbd.dev/vscode/)).
 - **AI agents**: `qdbd mcp` gives Claude, Copilot and Cursor your schema as tools: tables and columns, join paths as SQL (composite keys included), checks for their edits and diffs against `main` ([docs](https://qdbd.dev/mcp/)).
 - **One schema, many outputs**: an HTML page, PNG, SVG, editable draw.io, or a shareable link. Installs with pip: no Node, Graphviz or browser needed.
@@ -186,7 +186,7 @@ jobs:
     permissions: { contents: read, pull-requests: write }
     steps:
       - uses: actions/checkout@v4
-      - uses: MarkPhamm/quickdbd-cli@v0.1.11
+      - uses: MarkPhamm/quickdbd-cli@v0.3.3
         with:
           path: erd/                  # schema file(s) or folder(s)
           output: site/index.html
@@ -198,7 +198,7 @@ dbt projects, GitHub Pages, pre-commit and GitLab CI are covered in [CI and Auto
 
 ```text
 dbt project ──qdbd import dbt──┐
-                               ├──▶ schema/*.txt   (QuickDBD syntax, in git)
+                               ├──▶ schema/*.txt, *.dbml   (QuickDBD syntax or DBML, in git)
 hand-written / pasted ─────────┘           │
                                            ├──▶ qdbd check   validation, QuickDBD's error messages  ──▶ CI gate
                                            ├──▶ qdbd serve   live editor, drag to arrange           ──▶ schema.layout.json
@@ -240,7 +240,7 @@ qdbd build schema/ -o erd.html
 
 | | qdbd | QuickDBD |
 |---|---|---|
-| Text syntax | QuickDBD's | QuickDBD's |
+| Text syntax | QuickDBD's or DBML | QuickDBD's |
 | Tables per diagram | no limit | 10 on the free plan |
 | Where it runs | your terminal and CI; the result is a static HTML file | the QuickDBD web app |
 | Where the schema lives | `.txt` / `.dbml` files in your git repo | the web app |

{quickdbd_cli-0.3.2.dist-info → quickdbd_cli-0.3.3.dist-info}/RECORD

@@ -1,15 +1,15 @@
-quickdbd_cli/__init__.py,sha256=vNiWJ14r_cw5t_7UDqDQIVZvladKFGyHH2avsLpN7Vg,22
+quickdbd_cli/__init__.py,sha256=8KcCYTXH99C2-gCLuPILJvtT9YftRWJsartIx6TQ2ZY,22
 quickdbd_cli/__main__.py,sha256=E6Gls0DNz8GQK2K-kOUIx8cYhgANW_CH54VKrfCfs14,52
-quickdbd_cli/agent.py,sha256=pZzKc9DMqN6pX1ZzXgcb11ZqX91wuJZW1f6xO2uGc2M,37421
-quickdbd_cli/cli.py,sha256=GJnOpXVwEpJHUQkagGrMc27x5vt1N6Ybj1-tX-TLPzE,29288
+quickdbd_cli/agent.py,sha256=LEuReTkwWDlRLs-GfQQMpMosHDFWbin0EAXRo73j-dA,37202
+quickdbd_cli/cli.py,sha256=h9pTnGnprYOhyuEpjdd32QyAqR-skJRTBvoipIyCZS0,29522
 quickdbd_cli/convert.py,sha256=1AYFm4YmEav_wZp7xCAcL7TsD3qC17Y1I5g6V_fyAU0,16682
 quickdbd_cli/dbml.py,sha256=tHJOtMm1PHx4-yqs6rncPqdDfbwPcW8F54j_kKlWkx0,59413
 quickdbd_cli/dbt.py,sha256=AMHzERmc8WfL1tBLX4bJdPVghIHrqrfx8nMDbZMrueY,23100
 quickdbd_cli/diff.py,sha256=UBiCE3dk_cN-xSRZFQoLiIIFh_FAVZUpLwsdtHG9eBo,9986
-quickdbd_cli/export.py,sha256=pjWe3oloaxVkV2b96GllQR4faB9OMtbNuTscxwjQhsk,2983
+quickdbd_cli/export.py,sha256=XbSvWqFmhQHPcBtPHPit1SmhJ6qXrPyGlHYt7FpIMyo,3539
 quickdbd_cli/html.py,sha256=fiMsBPkBiCpxz-8x4_SFaeejdnHCAAK0IVlrimbpS5I,7950
 quickdbd_cli/jsrt.py,sha256=_sRkmUbgHDTwK272jeTNUwojfjUKAkv4UeD2E2u3H1A,3464
-quickdbd_cli/layout.py,sha256=ajzJCJQ8ofnYj8dhz8aWq-LV2tmW5BHwJQ2LRoeSWaM,9998
+quickdbd_cli/layout.py,sha256=2wrryJ-SSJbMlOdxmtCTzC2_zkTtvRVs-OuOBS1bGEQ,10856
 quickdbd_cli/mcp.py,sha256=ibUg1a50BBco-hZABdxTexGZi_gclFCdcBDalTvFar8,12350
 quickdbd_cli/measure.py,sha256=Nyk47FiJokPvTStKz23mgXkO0HnXKWOts90kp1gCjng,5969
 quickdbd_cli/model.py,sha256=lQcj89gDg2y4v_xhJX0_PWoWKGx0rg2emREVL_LA6uQ,3352
@@ -29,14 +29,14 @@ quickdbd_cli/assets/elk-LICENSE.md,sha256=Y36B9KG2tAeVNcSZ_KBeI4z3YFwf9bdtYNfafO
 quickdbd_cli/assets/elk.bundled.js,sha256=EiLkT5U853Rq8jgB5yNwj45vQ2uLN3pqX8dVLzSjB7M,1609707
 quickdbd_cli/assets/font-metrics.json,sha256=sXSiElxQSK8md8IEePLwh16TTdAqKt9rV140pvMlVS8,8654
 quickdbd_cli/assets/render.js,sha256=3Jv7On2X9MghnP-GInfkkfsBFgMC1vg6VkpYfOzgjwM,28944
-quickdbd_cli/assets/style.css,sha256=HDF9tWXoQ0DRhSCiSmMDaXysK0Wd0VWW4_iwKgQdLFg,16185
+quickdbd_cli/assets/style.css,sha256=aKIzW8z2V_khDSH7gJ42jisNxnFOKQTKBOuN1YiPt28,16283
 quickdbd_cli/assets/syntax-reference.md,sha256=WERcsWjyrfeHQPgxQriWKBsqFJnmWTQ2oRZjKYAHhKc,5322
-quickdbd_cli/assets/viewer.js,sha256=T7AD6qQ3GmHN4iL8MX19GZ_kQO46hfPsJp7AsMYyRYU,39683
-quickdbd_cli-0.3.2.dist-info/METADATA,sha256=3Qc1utZqKyjVciyy0ZvUH-0ADh_OlH817rA9ZK9TbZw,17009
-quickdbd_cli-0.3.2.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-quickdbd_cli-0.3.2.dist-info/entry_points.txt,sha256=nRhiYYug-XOY95nWUmi4oanico3Zjkfqk2OHtIE6SQ0,47
-quickdbd_cli-0.3.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-quickdbd_cli-0.3.2.dist-info/licenses/NOTICE,sha256=pyv3BfIYiGzKLU4w-GcBe7GXoXxHqZ97Mf6Zpx_3_i0,2067
-quickdbd_cli-0.3.2.dist-info/licenses/src/quickdbd_cli/assets/Inter-LICENSE.txt,sha256=JiSB6ERSGzJvXs0FPlm5jIstp4yO4b27boF0MF5Uk1o,4380
-quickdbd_cli-0.3.2.dist-info/licenses/src/quickdbd_cli/assets/elk-LICENSE.md,sha256=Y36B9KG2tAeVNcSZ_KBeI4z3YFwf9bdtYNfafOlnAMk,14443
-quickdbd_cli-0.3.2.dist-info/RECORD,,
+quickdbd_cli/assets/viewer.js,sha256=iKZBevQusb--Ysm3VPO3zaNAtesYOGjFWbevQ1JwBGU,40057
+quickdbd_cli-0.3.3.dist-info/METADATA,sha256=SgSNj1SP_ZSB2LAQFWN4P01B2cGYPKJ8SDouUAZtsnA,17195
+quickdbd_cli-0.3.3.dist-info/WHEEL,sha256=2iZrJkDIkeDh0k9SikKMqFuRP-ua6mb4Ir1AsER4BEw,87
+quickdbd_cli-0.3.3.dist-info/entry_points.txt,sha256=nRhiYYug-XOY95nWUmi4oanico3Zjkfqk2OHtIE6SQ0,47
+quickdbd_cli-0.3.3.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+quickdbd_cli-0.3.3.dist-info/licenses/NOTICE,sha256=pyv3BfIYiGzKLU4w-GcBe7GXoXxHqZ97Mf6Zpx_3_i0,2067
+quickdbd_cli-0.3.3.dist-info/licenses/src/quickdbd_cli/assets/Inter-LICENSE.txt,sha256=JiSB6ERSGzJvXs0FPlm5jIstp4yO4b27boF0MF5Uk1o,4380
+quickdbd_cli-0.3.3.dist-info/licenses/src/quickdbd_cli/assets/elk-LICENSE.md,sha256=Y36B9KG2tAeVNcSZ_KBeI4z3YFwf9bdtYNfafOlnAMk,14443
+quickdbd_cli-0.3.3.dist-info/RECORD,,

{quickdbd_cli-0.3.2.dist-info → quickdbd_cli-0.3.3.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.32.4
+Generator: hatchling 1.33.0
 Root-Is-Purelib: true
 Tag: py3-none-any