dataface 0.1.6.dev129__py3-none-any.whl → 0.1.6.dev183__py3-none-any.whl

dataface/agent_api/docs/yaml-reference.md

@@ -1082,8 +1082,8 @@ Authored overlay for TitleStyle. Board and face titles.
 |-------|------|:--------:|-------------|
 | `font` | [FontStyle](#fontstyle) | ✓ | Title font style overrides. |
 | `line_height` | float | ✓ | Line height multiplier for titles and markdown headings. Headings typically want a tighter multiplier than body prose. |
-| `sizes` | list[float] | ✓ | Font sizes for the H1–H6 heading ramp, indexed by ``face.level - 1``. Combined with ``width_offsets`` at render time to size titles responsively by card width. |
-| `width_offsets` | [TitleWidthOffsetsStyle](#titlewidthoffsetsstyle) | ✓ | Additive level offsets by card width (tiny/narrow/medium/wide). Added to the title's base level before indexing ``sizes``. Consumed by chart_title_spec / face_title_spec. |
+| `sizes` | list[float] | ✓ | Font sizes for the H1–H6 heading ramp, indexed by ``face.level - 1``. Face/prose titles index this ramp directly (no width input). Object titles (chart/table/spark) combine ``width_offsets`` with a fixed object-title anchor to pick a slot. |
+| `width_offsets` | [TitleWidthOffsetsStyle](#titlewidthoffsetsstyle) | ✓ | Additive level offsets by card width (tiny/narrow/medium/wide). Consumed by ``chart_title_spec`` only — object titles add the tier offset to a fixed anchor to pick an H slot from ``sizes``. Face/prose titles are level-only and do not consult these. |
 | `min_height` | float | ✓ | Minimum title row height in pixels. |
 | `overflow` | str | ✓ | Text overflow mode (clip, truncate, wrap-two, wrap). |
 | `position` | [TitlePositionStyle](#titlepositionstyle) | ✓ | Vega-Lite title positioning: anchor, angle, offset, baseline. |

dataface/agent_api/project_session.py

@@ -360,6 +360,7 @@ class ProjectSession:
         variables: dict[str, Any] | None = None,
         source: str | None = None,
         limit: int = 50,
+        lenient_variables: bool = False,
     ) -> _query.ExecuteQueryResult:
         return _query.execute_query(
             sql,
@@ -367,6 +368,7 @@ class ProjectSession:
             source=source,
             limit=limit,
             adapter_registry=self.adapter_registry,
+            lenient_variables=lenient_variables,
         )
 
     def describe_query(

dataface/agent_api/query.py

@@ -88,6 +88,10 @@ class ExecuteQueryArgs(BaseModel):
     )
     source: str | None = Field(None, description="Data source name to execute against")
     limit: int | None = Field(None, description="Maximum rows to return (default 50)")
+    lenient_variables: bool = Field(
+        False,
+        description="When True, undefined Jinja variables degrade gracefully (useful for iterative chart editing where not all variables are set).",
+    )
 
 
 class ExecuteQueryResult(BaseModel):
@@ -135,6 +139,7 @@ def execute_query(
     limit: int = 50,
     *,
     adapter_registry: AdapterRegistry,
+    lenient_variables: bool = False,
 ) -> ExecuteQueryResult:
     """Execute a SQL query and return the results.
 
@@ -155,6 +160,7 @@ def execute_query(
             sql=sql,
             source=source,
             limit=fetch_limit,
+            lenient_variables=lenient_variables,
         )
 
         result = adapter_registry.execute(query, variables=variables)

dataface/ai/mcp/server.py

@@ -180,14 +180,14 @@ def create_server(context: DatafaceAIContext) -> Any:
         return TypeAdapter(AnyUrl).validate_python(value)
 
     @server.list_resources()  # type: ignore[no-untyped-call]
-    async def handle_list_resources() -> list[Resource]:
+    async def handle_list_resources() -> list[Resource]:  # pyright: ignore[reportUnusedFunction]  # decorator-registered — pyright cannot model runtime registration  # fmt: skip
         return [
             Resource(uri=_uri(u), mimeType=m, name=n, description=d)
             for u, m, n, d in (*_BASE_RESOURCES, *_docs_topic_resources())
         ]
 
     @server.list_resource_templates()  # type: ignore[no-untyped-call]
-    async def handle_list_resource_templates() -> list[ResourceTemplate]:
+    async def handle_list_resource_templates() -> list[ResourceTemplate]:  # pyright: ignore[reportUnusedFunction]  # decorator-registered — pyright cannot model runtime registration  # fmt: skip
         return [
             ResourceTemplate(
                 uriTemplate="dataface://dashboard/{path}",
@@ -204,11 +204,11 @@ def create_server(context: DatafaceAIContext) -> Any:
         ]
 
     @server.read_resource()  # type: ignore[no-untyped-call]
-    async def handle_read_resource(uri: AnyUrl) -> str:
+    async def handle_read_resource(uri: AnyUrl) -> str:  # pyright: ignore[reportUnusedFunction]  # decorator-registered — pyright cannot model runtime registration  # fmt: skip
         return _read_resource_content(str(uri), context=context)
 
     @server.list_tools()  # type: ignore[no-untyped-call]
-    async def handle_list_tools() -> list[Tool]:
+    async def handle_list_tools() -> list[Tool]:  # pyright: ignore[reportUnusedFunction]  # decorator-registered — pyright cannot model runtime registration  # fmt: skip
         return [
             Tool(
                 name=cast(str, t["name"]),
@@ -234,7 +234,7 @@ def create_server(context: DatafaceAIContext) -> Any:
         ]
 
     @server.call_tool()
-    async def handle_call_tool(
+    async def handle_call_tool(  # pyright: ignore[reportUnusedFunction]  # decorator-registered — pyright cannot model runtime registration
         name: str, arguments: dict[str, Any] | None
     ) -> CallToolResult:
         arguments = arguments or {}

dataface/ai/skills/dashboard-build/SKILL.md

@@ -19,6 +19,13 @@ metadata:
 
 **`{{ s_render_dashboard }}` is how you deliver a dashboard** — call it and return its output. Do not skip it.
 
+## Delivery discipline
+
+- `{{ s_render_dashboard }}` delivers the dashboard — call it and let the result stand. Do not also paste the rendered output or the full YAML back as prose; that just duplicates the deliverable as an unreadable dump.
+- Act, don't ask. Apply edits and render directly — do not ask for permission or offer optional follow-ups ("if you want, I can save this", "would you like me to…").
+- Fail loud. If a tool returns an error, report it and either fix the input and call the tool again, or stop and say what's blocking. Never route around a failed tool by fabricating output, dumping query rows as a text table in place of a chart, or improvising a different format. A failed render is a failure to report, not to paper over.
+- Never claim a render, query, or save succeeded unless the tool returned success. Never invent columns, tables, or data — if a schema or query call fails, fix it against the real schema.
+
 Build dashboards and reports **incrementally** — one chart at a time, validating at every step. Never one-shot an entire dashboard.
 
 ## Companion Skills

dataface/cli/commands/_agent_input.py

@@ -140,11 +140,11 @@ class PromptToolkitInput:
         kb = KeyBindings()
 
         @kb.add("enter")
-        def _submit(event: Any) -> None:
+        def _submit(event: Any) -> None:  # pyright: ignore[reportUnusedFunction]  # decorator-registered — pyright cannot model runtime registration  # fmt: skip
             event.current_buffer.validate_and_handle()
 
         @kb.add("escape", "enter")
-        def _newline_meta(event: Any) -> None:
+        def _newline_meta(event: Any) -> None:  # pyright: ignore[reportUnusedFunction]  # decorator-registered — pyright cannot model runtime registration  # fmt: skip
             event.current_buffer.insert_text("\n")
 
         self._session: PromptSession = PromptSession(
@@ -205,7 +205,7 @@ def select_input_layer(
         return StdlibInput(hist_path)
 
     try:
-        import prompt_toolkit  # noqa: PLC0415, F401
+        import prompt_toolkit  # noqa: PLC0415, F401  # pyright: ignore[reportUnusedImport] — availability probe; ImportError selects StdlibInput
     except ImportError:
         return StdlibInput(hist_path)
 

dataface/core/compile/__init__.py

@@ -120,7 +120,6 @@ from dataface.core.compile.models.source import (
     is_database_source,
     is_file_source,
     parse_source_config,
-    resolve_env_var,
 )
 from dataface.core.compile.models.variable.authored import (
     Variable,
@@ -201,7 +200,6 @@ __all__ = [
     "is_database_source",
     "is_file_source",
     "is_api_source",
-    "resolve_env_var",
     # Config
     "ProjectSourcesConfig",
     "get_config",

dataface/core/compile/channel.py

@@ -52,11 +52,6 @@ def parse_style_channel(
     if isinstance(raw, str):
         return ResolvedStyleChannel(channel=channel_name, mode="series", data_field=raw)
 
-    if not isinstance(raw, dict):
-        raise ValueError(
-            f"Channel '{channel_name}' must be a string or dict, got {type(raw).__name__}"
-        )
-
     has_column = "column" in raw
     has_value = "value" in raw
     has_scale = "scale" in raw
@@ -188,7 +183,7 @@ def normalize_chart_channels(
         channels["color"] = parse_style_channel(color_raw, "color")
 
     # Upgrade series channel to gradient when style.color carries a scale.
-    if isinstance(style_color, StyleColorConfig) and style_color.scale is not None:
+    if isinstance(style_color, StyleColorConfig):
         if "color" not in channels:
             raise ValueError(
                 "style.color: {scale: ...} requires chart.color to name a data field.\n"

dataface/core/compile/colors.py

@@ -43,7 +43,7 @@ def sanitize_color(color: str | None, fallback: str | None = None) -> str | None
     immediately — authored colors that are not valid are a configuration error,
     not a case for silent defaulting.
     """
-    if not color or not isinstance(color, str):
+    if not color:
         return fallback
     if _CSS_HEX_COLOR_PATTERN.match(color):
         return color

dataface/core/compile/compiler.py

@@ -824,10 +824,8 @@ def load_from_reference(
         section_name = "variables"
     elif isinstance(reference, QueryRef):
         section_name = "queries"
-    elif isinstance(reference, ChartRef):
-        section_name = "charts"
     else:
-        raise CompilationError(f"Unexpected reference type: {type(reference)!r}")
+        section_name = "charts"
 
     # Grammar already validated by the typed model; split is deterministic.
     file_path_str, item_name = reference.ref.rsplit(f".{section_name}.", 1)

dataface/core/compile/config.py

@@ -32,6 +32,7 @@ from typing import Any
 
 import yaml
 
+from dataface.core.compile.dbt_jinja import render_dbt_jinja_in_dict
 from dataface.core.compile.models.config import (
     Config,
     ConfigNode,
@@ -43,7 +44,6 @@ from dataface.core.compile.models.config import (
     as_plain_mapping,
     is_mapping_like,
 )
-from dataface.core.compile.models.source import resolve_env_vars_in_dict
 from dataface.core.project import Project
 
 # ============================================================================
@@ -101,7 +101,7 @@ def _dataface_yml_mapping_section(
     return filename, _as_mapping(value, f"{filename} {key} section")
 
 
-def _dataface_yml_string_value(project: Project, key: str) -> str | None:
+def dataface_yml_string_value(project: Project, key: str) -> str | None:
     filename, file_data = _load_dataface_yml(project)
     if key not in file_data:
         return None
@@ -781,4 +781,4 @@ class ProjectSourcesConfig:
 def _normalize_project_sources(
     sources: dict[str, dict[str, Any]],
 ) -> dict[str, dict[str, Any]]:
-    return {name: resolve_env_vars_in_dict(config) for name, config in sources.items()}
+    return {name: render_dbt_jinja_in_dict(config) for name, config in sources.items()}

dataface/core/compile/dbt_jinja.py

@@ -0,0 +1,66 @@
+"""Render dbt Jinja in source/profile config values.
+
+dataface resolves `{{ env_var(...) }}` — and the rest of dbt's profile-rendering
+Jinja — through dbt's own ``ProfileRenderer`` rather than a hand-rolled regex, so
+these values resolve *exactly* as dbt would: env_var defaults, the
+``DBT_ENV_SECRET_``-prefixed secret form, and non-string value preservation
+(`port: 5432` stays an int) all come for free.
+
+Behaviour matches dbt's, deliberately:
+- A missing ``env_var()`` with no default raises (surfaced as ``ValueError`` —
+  see :func:`_render`) for normal fields.
+- dbt's ``SecretRenderer`` *defers* rendering for ``password`` keypaths (real
+  passwords may contain ``{{``/``%`` characters), so a missing password env_var
+  is left as a literal and fails at connect time rather than at parse. We accept
+  dbt's contract here rather than re-deriving a stricter one.
+
+dbt reads env vars from a process-global *invocation context* (a ``ContextVar``
+it sets at CLI startup). dataface embeds dbt as a library, so we establish that
+context from the live environment per render.
+"""
+
+from __future__ import annotations
+
+import os
+from typing import Any
+
+
+def _refresh_invocation_context() -> None:
+    """(Re)build dbt's invocation context from the live ``os.environ``.
+
+    dbt's ``env_var()`` reads a process-global ``ContextVar``, not ``os.environ``
+    directly. The context holds nothing but env-derived state (public/private env
+    split + a secret cache), so rebuilding it per render is cheap, loses nothing,
+    and keeps ``env_var()`` reading the *current* environment — matching a direct
+    ``os.environ.get`` and keeping renders independent across env changes.
+
+    This is a compile-stage, single-threaded path. If dataface ever rendered
+    source configs concurrently with an active *embedded* dbt invocation, this
+    overwrite would clobber that invocation's context — not a concern today.
+    """
+    from dbt_common.context import set_invocation_context
+
+    # noqa rationale: dbt env_var() resolves YAML macros from the live process
+    # environment by contract — this is the composition root for that read.
+    set_invocation_context(dict(os.environ))  # noqa: TID251 — env_var() YAML macro
+
+
+def render_dbt_jinja_in_dict(data: dict[str, Any]) -> dict[str, Any]:
+    """Render dbt Jinja in every (recursively nested) string value of a dict.
+
+    Non-string values pass through unchanged. ``password`` keypaths follow dbt's
+    secret-deferral (see module docstring); other fields raise ``ValueError`` on
+    an unset env var with no default or on malformed/unresolvable Jinja.
+
+    dbt raises its own hierarchy (``EnvVarMissingError`` / ``CompilationError``);
+    we adapt it to ``ValueError`` at this boundary so Pydantic field/model
+    validators surface a ``ValidationError``. The dbt message is preserved.
+    """
+    from dbt.config.renderer import ProfileRenderer
+    from dbt_common.exceptions.base import DbtBaseException
+
+    _refresh_invocation_context()
+    try:
+        return ProfileRenderer({}).render_data(data)
+    except DbtBaseException as e:
+        raise ValueError(str(e)) from e

dataface/core/compile/inherit_graph.py

@@ -125,14 +125,41 @@ def _build_graph(
 
         if nested is not None:
             if skip_marker is not None:
-                # Recurse with slots suppressed; discard any inherited slot context.
+                # SkipInheritSlots suppresses slot expansion for this field.
+                # cascade=True: emit a container-level link so apply_inherit can
+                # copy the whole object when the child is None.  Leaf writes
+                # through a None intermediate are not viable (_set skips them).
+                if (
+                    skip_marker.cascade
+                    and slot_at is not None
+                    and slot_from is not None
+                    and not skip_slots
+                ):
+                    suffix: StylePath = current[len(slot_at) :]
+                    fallback_path = _path_str(slot_from + suffix)
+                    graph[_path_str(current)] = fallback_path
+                # Recurse into subtree.
+                # cascade=True inside a slot: keep the outer slot context so
+                # that individual leaf fields inside the subtree also get
+                # slot-derived links (e.g. charts.line.marks.line.stroke.width
+                # → charts.marks.line.stroke.width).  The container link above
+                # handles the stroke=None case; leaf links handle the case where
+                # the container is set but individual fields are None.  Inner
+                # InheritSlot markers with an absolute from_path still fire
+                # because skip_slots=False.
+                # cascade=True outside a slot (canonical path): both slot args
+                # are None already, so this is equivalent to clearing them.
+                # cascade=False: set skip_slots=True to fully suppress inner
+                # slot expansion (original SkipInheritSlots semantics).
                 _build_graph(
                     nested,
                     current,
                     seen,
                     valid_paths,
                     graph,
-                    skip_slots=True,
+                    slot_at=slot_at if skip_marker.cascade else None,
+                    slot_from=slot_from if skip_marker.cascade else None,
+                    skip_slots=not skip_marker.cascade,
                 )
             elif slot_marker is not None and not skip_slots:
                 if slot_at is not None:
@@ -197,8 +224,8 @@ def _build_graph(
                 else:
                     graph[current_path] = p
             elif slot_at is not None and slot_from is not None and skip_marker is None:
-                suffix: StylePath = current[len(slot_at) :]
-                fallback_path = _path_str(slot_from + suffix)
+                leaf_suffix: StylePath = current[len(slot_at) :]
+                fallback_path = _path_str(slot_from + leaf_suffix)
                 if fallback_path not in valid_paths:
                     raise ValueError(
                         f"InheritSlot expansion {fallback_path!r} not found in model paths"

dataface/core/compile/inherit_resolver.py

@@ -1,8 +1,8 @@
 """Inherit resolver: fill style leaf fields from single-link InheritGraph chains.
 
-apply_inherit is the replacement for _apply_cascade's hard-coded push loops.
-It runs after deep_merge and fills None-sentinel leaves by walking the single-link
+apply_inherit fills None-sentinel leaves by walking the single-link
 parent chains declared via Inherit/InheritSlot markers on the compiled Style.
+It runs after deep_merge, replacing the former hard-coded push loop approach.
 
 Not in scope: _apply_token_cascade, _build_resolved_style, resolved_axis_style.
 """
@@ -68,8 +68,17 @@ def apply_inherit(merged: Style, links: InheritGraph) -> Style:
     if not updates:
         return merged
 
-    for path, value in updates.items():
-        _set(d, _obj_path(path), value)
+    # Write shorter paths before longer ones so container-level updates (from
+    # cascade=True SkipInheritSlots links) land before leaf writes into those
+    # containers.  _set skips writes through a None intermediate, so the
+    # container dict must exist first.
+    # Re-read from d before each write: a container update may have already
+    # populated a field that a leaf link also targets (e.g. container copies
+    # marks.slice.labels.font.size=14 from the canonical path, while a separate
+    # leaf link would overwrite with the fallback charts.font.size=11).
+    for path in sorted(updates, key=lambda p: p.count(".")):
+        if _get(d, _obj_path(path)) is None:
+            _set(d, _obj_path(path), updates[path])
 
     return Style.model_validate(d)
 

dataface/core/compile/jinja.py

@@ -87,7 +87,7 @@ def extract_variable_dependencies(template_str: str) -> set[str]:
         ... )
         {'region'}
     """
-    if not template_str or not isinstance(template_str, str):
+    if not template_str:
         return set()
 
     # Quick check - no Jinja syntax
@@ -142,7 +142,7 @@ def resolve_jinja_template(
         ... )
         "SELECT * FROM users WHERE status = 'active'"
     """
-    if not template or not isinstance(template, str):
+    if not template:
         return template
 
     # Quick check for Jinja syntax

dataface/core/compile/models/chart/authored.py

@@ -29,16 +29,16 @@ from pydantic import (
 from dataface.core.compile.models.primitives import (
     FontStyle,
     FormatConfig,
-    ScaleTargetConfig,  # noqa: F401 — re-exported for external callers
+    ScaleTargetConfig as ScaleTargetConfig,  # re-exported for external callers
 )
 from dataface.core.compile.models.query.authored import AuthoredQuery
 from dataface.core.compile.models.refs import QueryRef, normalize_query_value
 from dataface.core.compile.models.style.authored import (
-    _SPARK_RENAMED_AWAY,  # noqa: F401 — re-exported for external callers
+    _SPARK_RENAMED_AWAY as _SPARK_RENAMED_AWAY,  # re-exported for external callers
     AreaChartStylePatch,
     BarChartStylePatch,
     CalloutChartStylePatch,
-    ColumnScaleConfig,  # noqa: F401 — re-exported for external callers
+    ColumnScaleConfig as ColumnScaleConfig,  # re-exported for external callers
     GeoshapeChartStylePatch,
     HeatmapChartStylePatch,
     KpiChartStylePatch,
@@ -48,10 +48,10 @@ from dataface.core.compile.models.style.authored import (
     PointMapChartStylePatch,
     ScatterChartStylePatch,
     SparkBarChartStylePatch,
-    SparkConfig,  # noqa: F401 — re-exported for external callers
-    SparkTypeLiteral,  # noqa: F401 — re-exported for external callers
+    SparkConfig as SparkConfig,  # re-exported for external callers
+    SparkTypeLiteral as SparkTypeLiteral,  # re-exported for external callers
     TableChartStylePatch,
-    TableColumnConfig,  # noqa: F401 — re-exported for external callers
+    TableColumnConfig as TableColumnConfig,  # re-exported for external callers
     _validate_glyph_pair,
 )
 from dataface.core.compile.models.style.theme import (
@@ -1554,10 +1554,10 @@ class KpiChart(_BaseChartFields):
                 )
             if data.get("subtitle"):
                 from dataface.core.compile.normalize_charts import (  # noqa: PLC0415
-                    _kpi_subtitle_error,
+                    kpi_subtitle_error,
                 )
 
-                raise ValueError(_kpi_subtitle_error(data.get("id")))
+                raise ValueError(kpi_subtitle_error(data.get("id")))
         return data
 
     @model_validator(mode="before")

dataface/core/compile/models/face/resolved.py

@@ -6,7 +6,7 @@
 from dataclasses import dataclass
 from typing import Any
 
-from dataface.core.compile.models.chart.normalized import Chart
+from dataface.core.compile.models.chart.resolved import ResolvedChart
 from dataface.core.compile.models.face.normalized import VariableValues
 from dataface.core.compile.models.query.normalized import AnyQuery
 from dataface.core.compile.models.style.resolved import ResolvedStyle
@@ -18,7 +18,7 @@ class ResolvedLayoutItem:
     """Layout item with static dimension estimates — no executor, no data access."""
 
     type: str  # "chart" | "face" | "text" | "markdown" | ...
-    chart: Chart | None
+    chart: ResolvedChart | None
     # nested face is a forward reference — resolved recursively
     face: "ResolvedFace | None"
     x: float
@@ -101,7 +101,7 @@ class ResolvedFace:
     layout: ResolvedLayout
 
     # Data (unchanged from Face)
-    charts: dict[str, Chart]
+    charts: dict[str, ResolvedChart]
     variables: dict[str, Variable]
     queries: dict[str, AnyQuery]
     variable_defaults: VariableValues

dataface/core/compile/models/markers.py

@@ -92,7 +92,18 @@ class SkipInheritSlots:
     ``_ChartStyleBase`` must not inherit from the root cascade.
 
     **On a leaf scalar field**: prevents the leaf from being added to the graph
-    via slot expansion.  Use on ``AxisStyle`` fields that ``_fill_axis`` does not
-    cascade — e.g. ``grid.dash``, ``ticks.count``, ``scale``, ``position`` — so
-    the inherit graph only declares what ``_apply_cascade`` actually does.
+    via slot expansion.  Use on ``AxisStyle`` fields that the style resolver does
+    not cascade — e.g. ``grid.dash``, ``ticks.count``, ``scale``, ``position`` —
+    so the inherit graph only declares what the resolver actually does.
+
+    ``cascade=True`` — for optional nested-model fields that the resolver
+    cascades at container granularity (copies the whole object when the child is
+    None, rather than filling individual leaf fields).  When set, the graph
+    emits a *container-level* link ``child_path → parent_path`` instead of
+    suppressing the field entirely.  Leaf writes through a ``None`` intermediate
+    are not viable (``_set`` skips them), so container links are the only
+    mechanism.  Only applicable on ``T | None`` nested-model fields inside an
+    active slot context.
     """
+
+    cascade: bool = False

dataface/core/compile/models/query/normalized.py

@@ -188,6 +188,10 @@ class SqlQuery(Query):
         default=None,
         description="dbt target name (defaults to 'dev' if not specified).",
     )
+    lenient_variables: bool = Field(
+        default=False,
+        description="When True, undefined Jinja variables degrade gracefully (empty string) instead of raising. Intended for the iterative chart-editor flow where not all variables are set yet.",
+    )
 
     @field_validator("source", mode="before")
     @classmethod

dataface/core/compile/models/source.py

@@ -44,12 +44,13 @@ See also:
 
 from __future__ import annotations
 
-import os
 import re
 from typing import Any, ClassVar, Literal, get_args, get_type_hints
 
 from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
 
+from dataface.core.compile.dbt_jinja import render_dbt_jinja_in_dict
+
 # ============================================================================
 # BIGQUERY AUTH HELPERS
 # ============================================================================
@@ -66,65 +67,6 @@ def infer_bq_method(
     return "oauth"
 
 
-# ============================================================================
-# ENVIRONMENT VARIABLE RESOLUTION
-# ============================================================================
-
-
-def resolve_env_var(value: str) -> str:
-    """Resolve {{ env_var('VAR') }} or {{ env_var('VAR', 'default') }} syntax.
-
-    Matches dbt's env_var() function behavior.
-
-    Args:
-        value: String that may contain env_var() expressions
-
-    Returns:
-        String with env_var() resolved to actual values
-
-    Raises:
-        ValueError: If required env var is not set
-    """
-    # Pattern: {{ env_var('VAR') }} or {{ env_var('VAR', 'default') }}
-    pattern = r"\{\{\s*env_var\(\s*['\"]([^'\"]+)['\"]\s*(?:,\s*['\"]([^'\"]*)['\"])?\s*\)\s*\}\}"
-
-    def replace_env_var(match: re.Match[str]) -> str:
-        var_name = match.group(1)
-        default_value = match.group(2)
-
-        env_value = os.environ.get(var_name)  # noqa: TID251 — env_var() YAML macro
-        if env_value is not None:
-            return env_value
-        elif default_value is not None:
-            return default_value
-        else:
-            raise ValueError(
-                f"Environment variable '{var_name}' is not set and no default provided"
-            )
-
-    return re.sub(pattern, replace_env_var, value)
-
-
-def resolve_env_vars_in_dict(data: dict[str, Any]) -> dict[str, Any]:
-    """Recursively resolve env_var() expressions in a dictionary.
-
-    Args:
-        data: Dictionary that may contain env_var() expressions
-
-    Returns:
-        Dictionary with all env_var() expressions resolved
-    """
-    result: dict[str, Any] = {}
-    for key, value in data.items():
-        if isinstance(value, str):
-            result[key] = resolve_env_var(value)
-        elif isinstance(value, dict):
-            result[key] = resolve_env_vars_in_dict(value)
-        else:
-            result[key] = value
-    return result
-
-
 # ============================================================================
 # BASE SOURCE CONFIG
 # ============================================================================
@@ -143,9 +85,9 @@ class BaseSourceConfig(BaseModel):
     @model_validator(mode="before")
     @classmethod
     def _resolve_all_env_vars(cls, data: Any) -> Any:
-        """Resolve {{ env_var('VAR') }} in all string fields before Pydantic validates."""
+        """Render dbt Jinja (env_var etc.) in all fields before Pydantic validates."""
         if isinstance(data, dict):
-            return resolve_env_vars_in_dict(data)
+            return render_dbt_jinja_in_dict(data)
         return data
 
 
@@ -406,14 +348,6 @@ class CsvSourceConfig(BaseSourceConfig):
             raise ValueError("CsvSourceConfig requires either 'file' or 'url'")
         return self
 
-    @field_validator("file", "url", mode="before")
-    @classmethod
-    def resolve_env_vars(cls, v: Any) -> Any:
-        """Resolve env_var() syntax in string fields."""
-        if isinstance(v, str):
-            return resolve_env_var(v)
-        return v
-
 
 class ParquetSourceConfig(BaseSourceConfig):
     """Parquet file source configuration."""
@@ -473,22 +407,6 @@ class HttpSourceConfig(BaseSourceConfig):
         default=None, description="Default HTTP headers (e.g. Authorization)."
     )
 
-    @field_validator("url", mode="before")
-    @classmethod
-    def resolve_url_env_var(cls, v: Any) -> Any:
-        """Resolve env_var() syntax in URL."""
-        if isinstance(v, str):
-            return resolve_env_var(v)
-        return v
-
-    @field_validator("headers", mode="before")
-    @classmethod
-    def resolve_headers_env_vars(cls, v: Any) -> Any:
-        """Resolve env_var() syntax in headers."""
-        if isinstance(v, dict):
-            return resolve_env_vars_in_dict(v)
-        return v
-
 
 # ============================================================================
 # DBT PROFILE SOURCE CONFIG