dataface 0.2.1.dev241__py3-none-any.whl → 0.2.1.dev323__py3-none-any.whl

dataface/DATAFACE_SYNTAX.md

@@ -196,7 +196,7 @@ queries:                       # Named queries
 charts:                        # Named charts
 rows: [ ... ]                  # Or cols:, grid:, tabs: (pick one)
 
-theme: dark                    # Vega-Lite theme; inherited by nested faces
+theme: neon                    # Vega-Lite theme; inherited by nested faces
 
 # Nesting / layout primitives (mostly for nested faces inside rows/cols)
 id: my_face                    # Auto-generated from filename if omitted
@@ -237,7 +237,7 @@ Top-level fields (22 total):
 | `style` | object | Board-style block (see [Board style](#board-style)) |
 | `width` | string \| int | Width when nested (`"50%"` or pixels) |
 | `height` | string \| int | Height when nested |
-| `theme` | string | Vega-Lite theme name (e.g. `dark`, `editorial`, `carbong100`) — inherited by nested faces |
+| `theme` | string | Vega-Lite theme name (e.g. `editorial`, `stark`, `neon`) — inherited by nested faces |
 
 `face:` as a top-level key is rejected. Put face properties (title, rows, queries, …) directly at the YAML root.
 
@@ -385,12 +385,6 @@ queries:
     sql: SELECT region, target FROM targets
     source: ./data/targets.csv   # path (contains "/" or a data extension) = inline file; table name = stem
 
-  # dbt model — read columns directly from a compiled dbt model
-  customers_model:
-    type: dbt_model
-    model: fct_customers
-    columns: [customer_id, arr, region]
-
   # MetricFlow / dbt Semantic Layer
   revenue_by_region:
     type: metricflow             # Optional — also implied by `metrics:` presence
@@ -407,7 +401,7 @@ queries:
       - [Bob, 87.1]
 ```
 
-Query types (`type:` literals): `sql`, `http`, `dbt_model`, `metricflow`, `values`. `schema_resolver` is internal-only and not part of the authored surface.
+Query types (`type:` literals): `sql`, `http`, `metricflow`, `values`. `schema_resolver` is internal-only and not part of the authored surface.
 
 Common fields (all query types):
 
@@ -547,9 +541,9 @@ Set `type:` to one of:
 
 **Geographic** — `geoshape`, `map`, `point_map`, `bubble_map`.
 
-**Marks** (direct Vega-Lite mark passthroughs; used inside `layered` mostly) — `circle`, `square`, `tick`, `rule`, `trail`, `rect`, `arc`, `image`.
+**Marks** (direct Vega-Lite mark passthroughs) — `circle`, `square`, `tick`, `rule`, `trail`, `rect`, `arc`, `image`.
 
-**Composition** — `layered` (see [Composition](#composition)).
+**Overlays** — `bar`, `line`, `area`, and `scatter` accept a `layers:` field for mixed-mark or dual-axis charts (see [Combo charts](#combo-charts-barlinearea-with-layers) and [Composition](#composition)).
 
 **Sparklines** — `spark_bar` (compact horizontal bars used in profiler cards).
 
@@ -587,9 +581,9 @@ All chart types accept the channels and style fields below — but each type rej
 | `background` | string \| object | Background channel — color, `{value}`, `{field, scale/when}`, or map layer |
 | `sort` | object | `{by, order}` — categorical sort. Horizontal bar charts default to value-descending order when omitted. |
 | `link` | string | Click-through URL template for drill-down links |
-| `layers` | list | Layer definitions for `type: layered` (see [Composition](#composition)) |
+| `layers` | list | Overlay layers on cartesian charts (`bar`/`line`/`area`/`scatter`) — see [Combo charts](#combo-charts-barlinearea-with-layers) |
 | `conditional_formatting` | object | Discrete style rules by column (see [Conditional formatting](#conditional-formatting)) |
-| `data_table` | list | Attached mini-table beneath bar/line/area/layered (see [Composition](#composition)) |
+| `data_table` | list | Attached mini-table beneath bar/line/area charts (including those with `layers:`) — see [Composition](#composition) |
 | `height` | int \| float | Exact pixel height. Wins over `aspect_ratio` and theme defaults. Bypasses `min_height`/`max_height`. Not valid on `kpi`, `table`, `callout`, `spark_bar`. |
 | `aspect_ratio` | float | Chart shape: `height = width / aspect_ratio`. Theme default is `1.5`. Not valid on `kpi`, `table`, `callout`, `spark_bar`. |
 | `min_height` | float | Height floor for this chart only; overrides `style.charts.min_height`. Ignored when `height` is set. |
@@ -597,7 +591,7 @@ All chart types accept the channels and style fields below — but each type rej
 
 `height` and `aspect_ratio` live at **chart root** — they are rejected under `style:`. `style:` is paint only (colors, fonts, marks).
 
-KPI-only fields: `value`, `label`, `support`. KPI uses `label:` for the header text — `title:` is rejected on KPI charts. Chart-root `format:` / `formatter:` is rejected on all chart types except `layered`. Use the family slot instead:
+KPI-only fields: `value`, `label`, `support`. KPI uses `label:` for the header text — `title:` is rejected on KPI charts. Chart-root `format:` / `formatter:` is rejected on all chart types. Use the family slot instead:
 
 | Family | Format slot |
 |--------|-------------|
@@ -605,7 +599,6 @@ KPI-only fields: `value`, `label`, `support`. KPI uses `label:` for the header t
 | `kpi` value | `style.value.format` |
 | `kpi` support | `support.format` |
 | `table` column | `style.columns.<col>.format` |
-| `layered` | chart-root `format:` |
 
 `glyph` and `tone` at chart root are also rejected on KPI — use `style.glyph.character`, `style.tone`, and `style.kpi.glyph.font.color` / `style.kpi.value.font.color` for overrides.
 
@@ -750,7 +743,7 @@ type: spark_bar
 x: rank
 y: count
 
-# Pure marks (typically inside layered):
+# Pure marks (advanced use — not accepted as base chart types):
 # circle, square, tick, rule, trail, rect, arc, image
 
 # callout — message card with a style.tone: field (info | negative | warning | positive)
@@ -761,24 +754,22 @@ style:
 
 ```
 
-### Layered charts
+### Combo charts (bar/line/area with layers)
 
 ```yaml
-type: layered
-x: month                           # Chart-level shared x
+type: bar
+x: month
+y: actual
 layers:
-  - type: bar                       # bar | line | area | circle | square | tick | rule | trail | rect | image | scatter
-    y: actual
-    label: Actual
-  - type: line
+  - type: line                      # bar | line | area | scatter
     y: target
     label: Target
     axis_y:
-      position: right            # left | right
+      position: right              # left | right
       title: "Target"
 ```
 
-Each layer accepts: `type`, `query` (optional layer-specific query), `x`, `y`, `label`, `color` (data channel, bare field name), `axis_y`. Vega-Lite `encoding:` is not allowed inside a layer — use the typed channels.
+The base chart (`type: bar`, `type: line`, or `type: area`) sets the primary mark, `x`, `y`, and `query`. Additional marks go in `layers:`. Each layer accepts: `type`, `y`, `label`, `color` (data channel, bare field name), `query` (overrides the base chart query for this layer), `x` (layer x-values extend the base x-scale), `axis_y`, and `style` (marks-only patch). Vega-Lite `encoding:` is not allowed inside a layer — use the typed channels.
 
 ### Conditional formatting
 
@@ -814,9 +805,9 @@ If `default: true` is set, it must be the last rule in the `when` list. Earlier
 
 Dataface composes charts in three ways:
 
-1. **`layers:` on `type: layered`** — multiple marks share one x-axis. Listed under [Layered charts](#layered-charts) above. Each layer can have its own `query:`; otherwise all layers share the chart's `query:` (required for `data_table`).
+1. **`layers:` on a base chart** — multiple marks share one x-axis and frame. The base chart (`type: bar`, `type: line`, `type: area`, or `type: scatter`) owns the x-axis, frame, title, legend container, and `sort`. Each layer defaults to the base `query:` but may declare its own `query:` — layer x-values extend the base x-scale rather than clip it. See [Combo charts](#combo-charts-barlinearea-with-layers) above.
 
-2. **`data_table:` attached to a chart** — a mini cross-tab strip rendered below the chart, columns aligned to the chart's x-axis ticks. Supported on `bar`, `line`, `area`, `layered` only.
+2. **`data_table:` attached to a chart** — a mini cross-tab strip rendered below the chart, columns aligned to the chart's x-axis ticks. Supported on `bar`, `line`, and `area` charts (including those with `layers:`).
 
    ```yaml
    charts:
@@ -847,7 +838,7 @@ Dataface composes charts in three ways:
 
    Constraint: data_table requires a single chart-level `x:`. Layered charts with per-layer `x:` differing from the chart-level x are rejected.
 
-3. **Layout composition** — the `rows`, `cols`, `grid`, `tabs` structure in [Layout](#layout). Layout composes charts into a face; chart-level composition belongs to `layered:` and `data_table:`.
+3. **Layout composition** — the `rows`, `cols`, `grid`, `tabs` structure in [Layout](#layout). Layout composes charts into a face; chart-level composition belongs to `layers:` (overlays) and `data_table:`.
 
 Non-goals (not part of the authored chart surface): Vega-Lite `encoding`, `mark`, `spec`, `config`, `transform`, `params`, `resolve`, `hconcat`, `vconcat`, `concat`, `repeat`. These keys are rejected at compile time. Use the typed channels (`x`, `y`, `color`, …) and `style:` instead; use the layout primitives for visual composition.
 

dataface/agent_api/_init_templates/guide.yaml

@@ -25,7 +25,7 @@ text: |
 
 # ── Queries ───────────────────────────────────────────────────────────────────
 # `type: values` embeds data directly — no database needed.
-# Swap for a `type: sql` query (with a `sources:` entry) or `type: dbt_model` once you're ready.
+# Swap for a `type: sql` query (with a `sources:` entry) once you're ready.
 queries:
   monthly_revenue:
     type: values

dataface/agent_api/describe.py

@@ -12,7 +12,6 @@ from dataface.core.compile.models.chart.normalized import (
 )
 from dataface.core.compile.models.face.normalized import Layout
 from dataface.core.compile.models.query.normalized import (
-    DbtModelQuery,
     HttpQuery,
     Query,
     SqlQuery,
@@ -130,10 +129,6 @@ def _build_query_description(name: str, query: Query) -> QueryDescription:
             return QueryDescription(
                 name=name, type="sql", summary=summary, source=query.source, sql=sql
             )
-        case DbtModelQuery():
-            return QueryDescription(
-                name=name, type="dbt_model", summary=f"dbt model: {query.model}"
-            )
         case HttpQuery():
             return QueryDescription(
                 name=name, type="http", summary=f"HTTP request: {query.url}"