dataface 0.3.2.dev22__py3-none-any.whl → 0.3.2.dev111__py3-none-any.whl

dataface/core/compile/models/style/authored/_base.py

@@ -4,12 +4,13 @@ Includes the top-level ``StylePatch`` (the all-encompassing authored overlay)
 and the cross-cutting axis/scale/title/padding/tooltip/legend/mark patches
 that chart-family patch files import.
 
-Some patches here (``AxisStylePatch``, ``DataTableStylePatch``,
-``PaddingStylePatch``, ``TooltipStylePatch``, ``TableChartStylePatch``) are
-built early and injected back into ``style.theme``'s module globals so that
-Pydantic can resolve forward references in theme chart-style classes — see
-the injection block below. ``theme.py`` must not import from this package,
-so injection is the only DAG-safe path.
+Some patches here (``BaseAxisStylePatch``, ``AxisXStylePatch``,
+``AxisYStylePatch``, ``DataTableStylePatch``, ``PaddingStylePatch``,
+``TooltipStylePatch``, ``TableChartStylePatch``) are built early and injected
+back into ``style.theme``'s module globals so that Pydantic can resolve forward
+references in theme chart-style classes — see the injection block below.
+``theme.py`` must not import from this package, so injection is the only
+DAG-safe path.
 """
 
 from __future__ import annotations
@@ -34,16 +35,23 @@ from dataface.core.compile.models.style.theme import (
     AreaChartStyle,
     AreaLayerStyle,
     AreaMarkStyle,
-    AxisDomainStyle,
-    AxisElementStyle,
-    AxisGridStyle,
-    AxisStyle,
+    AxisLabelStyle,
+    AxisLineStyle,
     AxisTicksStyle,
+    AxisTitleStyle,
+    AxisXStyle,
+    AxisYStyle,
+    BandAxisStyle,
     BarChartStyle,
     BarLayerStyle,
     BarMarkStyle,
+    BaseAxisGridStyle,
+    BaseAxisStyle,
+    BaseScaleStyle,
     ChartsStyle,
     DataTableStyle as DataTableStyle,
+    DimensionLabelStyle,
+    DimensionTicksStyle,
     GeoshapeChartStyle,
     GlobalMarksStyle,
     HeatmapChartStyle,
@@ -53,11 +61,13 @@ from dataface.core.compile.models.style.theme import (
     LineChartStyle,
     LineLayerStyle,
     LineMarkStyle,
+    MeasureGridStyle,
     PaddingStyle,
     PieChartStyle,
     PointMapChartStyle,
     PointMarkStyle,
-    ScaleStyle,
+    QuantitativeAxisStyle,
+    ScaleContinuousStyle,
     ScatterChartStyle,
     ScatterLayerStyle,
     Style,
@@ -65,73 +75,104 @@ from dataface.core.compile.models.style.theme import (
     TitleStyle,
     TooltipStyle,
     TotalStyle,
+    XScaleStyle,
     _CartesianChartStyle,
     _GeoChartStyle,
     _RadialChartStyle,
     coerce_gap,
 )
 
-# Patch type for scale style — generated (and registered) BEFORE AxisStylePatch
-# so the recursive AxisStyle build reuses this exact class for its ``scale``
-# field (identity matters: tests and AxisStylePatch.scale must agree).
-# The custom base carries ScaleDomainValidationMixin so chart-local authored
-# patches enforce the same domain shape/type-consistency rules as theme-stage
-# ScaleStyle — build_patch_model_ext only carries over validators that live
-# on the patch model's base class.
+# ── Scale group patches ───────────────────────────────────────────────────────
+# Generated first (continuous is embedded in BaseScaleStyle, which is
+# embedded in BaseAxisStyle). Order: leaf group → BaseScaleStyle → XScaleStyle.
+
+# ScaleContinuousStylePatch carries ScaleDomainValidationMixin (domain shape
+# check) via build_patch_model_ext, but NOT _validate_log_pow_symlog_params —
+# that validator is defined directly on ScaleContinuousStyle (not on a mixin),
+# so build_patch_model_ext naturally excludes it from the patch. A theme layer
+# can set type:log and a chart-local patch can set only log.base; the
+# cross-field check fires once, on the fully-merged result via
+# ScaleContinuousStyle.model_validate.
 if TYPE_CHECKING:
 
-    class ScaleStylePatch(ScaleStyle):
+    class ScaleContinuousStylePatch(ScaleContinuousStyle):
         pass
 
 else:
     from dataface.core.compile.models.style.theme import ScaleDomainValidationMixin
 
-    class _ScaleStylePatchBase(_PatchBase, ScaleDomainValidationMixin):
-        """Base for ScaleStylePatch: extra="forbid" from _PatchBase plus the
-        authored scale.domain validation from ScaleDomainValidationMixin."""
+    class _ScaleContinuousStylePatchBase(_PatchBase, ScaleDomainValidationMixin):
+        """Base for ScaleContinuousStylePatch: extra="forbid" from _PatchBase
+        plus the authored scale.domain validation from ScaleDomainValidationMixin."""
 
-    ScaleStylePatch = register_patch(ScaleStyle)(
-        build_patch_model_ext(ScaleStyle, base_cls=_ScaleStylePatchBase)
+    ScaleContinuousStylePatch = register_patch(ScaleContinuousStyle)(
+        build_patch_model_ext(
+            ScaleContinuousStyle, base_cls=_ScaleContinuousStylePatchBase
+        )
     )
 
+BaseScaleStylePatch = build_patch_model(BaseScaleStyle)
+XScaleStylePatch = build_patch_model(XScaleStyle)
+
+# ── Axis ticks patches ─────────────────────────────────────────────────────────
+# Generated (and registered) BEFORE axis variant patches so the recursive
+# axis-variant build reuses these exact classes for their ``ticks`` field.
+# Neither patch carries the step/time_unit cadence validator — same
+# ScaleContinuousStyle convention above: the check is defined directly on
+# DimensionTicksStyle (mode="after"), not a mixin, and build_patch_model_ext
+# only carries over validators living on the patch's own base_cls, so it does
+# NOT leak into either generated patch. It fires once, on the fully-merged
+# theme-tier result, since a theme may set time_unit and a chart-local patch
+# layer may set only step.
+AxisTicksStylePatch = build_patch_model(AxisTicksStyle)
+DimensionTicksStylePatch = build_patch_model(DimensionTicksStyle)
+
+
+# ── Axis leaf patches ─────────────────────────────────────────────────────────
+# Generated before axis variant patches so the recursive variant builds reuse
+# these exact classes for their sub-object fields.
+AxisGridZeroStylePatch: type  # declared for forward reference clarity
+from dataface.core.compile.models.style.theme.axis import (
+    AxisGridZeroStyle,  # noqa: PLC0415, E402
+)
 
-# Patch type for axis ticks style — generated (and registered) BEFORE
-# AxisStylePatch so the recursive AxisStyle build reuses this exact class for
-# its ``ticks`` field. The custom base carries
-# AxisTicksCadenceValidationMixin so chart-local authored patches enforce the
-# same step/interval/count cadence rules as theme-stage AxisTicksStyle —
-# build_patch_model_ext only carries over validators that live on the patch
-# model's base class.
-if TYPE_CHECKING:
+AxisGridZeroStylePatch = build_patch_model(AxisGridZeroStyle)
+BaseAxisGridStylePatch = build_patch_model(BaseAxisGridStyle)
+MeasureGridStylePatch = build_patch_model(MeasureGridStyle)
+AxisLineStylePatch = build_patch_model(AxisLineStyle)
+AxisTitleStylePatch = build_patch_model(AxisTitleStyle)
+AxisLabelStylePatch = build_patch_model(AxisLabelStyle)
+DimensionLabelStylePatch = build_patch_model(DimensionLabelStyle)
 
-    class AxisTicksStylePatch(AxisTicksStyle):
-        pass
 
-else:
-    from dataface.core.compile.models.style.theme import (
-        AxisTicksCadenceValidationMixin,
-    )
+# ── Axis variant patches ──────────────────────────────────────────────────────
+# Five axis-variant patches, each typed to the matching authored slot so extra
+# fields on the wrong variant raise at validation time.
+# TYPE_CHECKING stubs give mypy proper class definitions — at runtime
+# build_patch_model generates the actual Pydantic model.
+if TYPE_CHECKING:
 
-    class _AxisTicksStylePatchBase(_PatchBase, AxisTicksCadenceValidationMixin):
-        """Base for AxisTicksStylePatch: extra="forbid" from _PatchBase plus
-        the step/interval/count cadence validation from
-        AxisTicksCadenceValidationMixin."""
+    class BaseAxisStylePatch(BaseAxisStyle):
+        pass
 
-    AxisTicksStylePatch = register_patch(AxisTicksStyle)(
-        build_patch_model_ext(AxisTicksStyle, base_cls=_AxisTicksStylePatchBase)
-    )
+    class AxisXStylePatch(AxisXStyle):
+        pass
 
+    class AxisYStylePatch(AxisYStyle):
+        pass
 
-# Patch type for axis style — generated before theme chart-type classes
-# so _CartesianChartStyle can reference it as a forward-ref field.
-if TYPE_CHECKING:
+    class QuantitativeAxisStylePatch(QuantitativeAxisStyle):
+        pass
 
-    class AxisStylePatch(AxisStyle):
+    class BandAxisStylePatch(BandAxisStyle):
         pass
 
 else:
-    AxisStylePatch = build_patch_model(AxisStyle)
-
+    BaseAxisStylePatch = build_patch_model(BaseAxisStyle)
+    AxisXStylePatch = build_patch_model(AxisXStyle)
+    AxisYStylePatch = build_patch_model(AxisYStyle)
+    QuantitativeAxisStylePatch = build_patch_model(QuantitativeAxisStyle)
+    BandAxisStylePatch = build_patch_model(BandAxisStyle)
 
 if TYPE_CHECKING:
 
@@ -200,19 +241,29 @@ class EndpointLabelsConfig(BaseModel):
 # can resolve forward references in _CartesianChartStyle, BarChartStyle, etc.
 # when build_patch_model(Style) triggers schema building for those classes.
 # theme.py must not import from authored/, so injection is the only DAG-safe path.
+# setattr avoids type: ignore[attr-defined] on a dynamically-typed module object.
 import sys as _sys
 
 _theme_mod = _sys.modules["dataface.core.compile.models.style.theme"]
-_theme_mod.AxisStylePatch = AxisStylePatch  # type: ignore[attr-defined]
-_theme_mod.DataTableStylePatch = DataTableStylePatch  # type: ignore[attr-defined]
-_theme_mod.PaddingStylePatch = PaddingStylePatch  # type: ignore[attr-defined]
-_theme_mod.TableChartStylePatch = TableChartStylePatch  # type: ignore[attr-defined]
-_theme_mod.TooltipStylePatch = TooltipStylePatch  # type: ignore[attr-defined]
-_theme_mod.EndpointLabelsConfig = EndpointLabelsConfig  # type: ignore[attr-defined]
-_theme_mod.PaginationConfig = PaginationConfig  # type: ignore[attr-defined]
-_theme_mod.TableColumnDefaultsConfig = TableColumnDefaultsConfig  # type: ignore[attr-defined]
-_theme_mod.TableColumnConfig = TableColumnConfig  # type: ignore[attr-defined]
-del _theme_mod
+for _name, _obj in (
+    ("BaseAxisStylePatch", BaseAxisStylePatch),
+    ("AxisXStylePatch", AxisXStylePatch),
+    ("AxisYStylePatch", AxisYStylePatch),
+    ("QuantitativeAxisStylePatch", QuantitativeAxisStylePatch),
+    ("BandAxisStylePatch", BandAxisStylePatch),
+    ("BaseScaleStylePatch", BaseScaleStylePatch),
+    ("XScaleStylePatch", XScaleStylePatch),
+    ("DataTableStylePatch", DataTableStylePatch),
+    ("PaddingStylePatch", PaddingStylePatch),
+    ("TableChartStylePatch", TableChartStylePatch),
+    ("TooltipStylePatch", TooltipStylePatch),
+    ("EndpointLabelsConfig", EndpointLabelsConfig),
+    ("PaginationConfig", PaginationConfig),
+    ("TableColumnDefaultsConfig", TableColumnDefaultsConfig),
+    ("TableColumnConfig", TableColumnConfig),
+):
+    setattr(_theme_mod, _name, _obj)
+del _theme_mod, _name, _obj
 
 # Rebuild theme chart classes that forward-ref authored types.
 # Must run BEFORE build_patch_model(BarChartStyle) etc. so that model_fields
@@ -220,7 +271,13 @@ del _theme_mod
 # ForwardRefs. The patch factory uses field annotations to determine recursive
 # types; a ForwardRef for EndpointLabelsConfig produces the wrong patch.
 _authored_ns: dict[str, object] = {
-    "AxisStylePatch": AxisStylePatch,
+    "BaseAxisStylePatch": BaseAxisStylePatch,
+    "AxisXStylePatch": AxisXStylePatch,
+    "AxisYStylePatch": AxisYStylePatch,
+    "QuantitativeAxisStylePatch": QuantitativeAxisStylePatch,
+    "BandAxisStylePatch": BandAxisStylePatch,
+    "BaseScaleStylePatch": BaseScaleStylePatch,
+    "XScaleStylePatch": XScaleStylePatch,
     "DataTableStylePatch": DataTableStylePatch,
     "PaddingStylePatch": PaddingStylePatch,
     "TableChartStylePatch": TableChartStylePatch,
@@ -270,11 +327,11 @@ class StylePatch(_StylePatchBase):  # type: ignore[misc,valid-type]
         return coerce_gap(v)
 
 
-AxisGridStylePatch = build_patch_model(AxisGridStyle)
-AxisDomainStylePatch = build_patch_model(AxisDomainStyle)
+# AxisGridStylePatch / AxisDomainStylePatch / AxisElementStylePatch are built
+# earlier (before the axis variant patches); they are not rebuilt here.
 # AxisTicksStylePatch is built explicitly above (with the cadence validator
 # base_cls) — not rebuilt here.
-AxisElementStylePatch = build_patch_model(AxisElementStyle)
+AxisGridStylePatch = BaseAxisGridStylePatch  # backwards-compat alias
 if TYPE_CHECKING:
 
     class PointMarkStylePatch(PointMarkStyle):
@@ -286,9 +343,9 @@ else:
 TotalStylePatch = build_patch_model(TotalStyle)
 GlobalMarksStylePatch = build_patch_model(GlobalMarksStyle)
 
-# TYPE_CHECKING stub mirrors the AxisStylePatch pattern — gives mypy a proper
-# class (with accurate field names from LegendStyle) while the runtime uses
-# the dynamically created patch model from build_patch_model().
+# TYPE_CHECKING stub mirrors the variant-axis-patch pattern — gives mypy a
+# proper class (with accurate field names from LegendStyle) while the runtime
+# uses the dynamically created patch model from build_patch_model().
 if TYPE_CHECKING:
 
     class LegendStylePatch(LegendStyle):
@@ -322,7 +379,7 @@ else:
 # Per-family layer style patches — generated from thin required wrappers in style/theme/.
 # build_patch_model recurses: LineLayerStyle{marks: LineChartMarksStyle} →
 # LineLayerStylePatch{marks: LineChartMarksStylePatch | None}.
-# TYPE_CHECKING stubs mirror the AxisStylePatch / LegendStylePatch pattern so
+# TYPE_CHECKING stubs mirror the axis-variant-patch / LegendStylePatch pattern so
 # mypy sees a valid class while the runtime uses the dynamically-created model.
 if TYPE_CHECKING:
 

dataface/core/compile/models/style/authored/table.py

@@ -322,9 +322,16 @@ class TableColumnConfig(BaseModel):
 
     @field_validator("spark", mode="before")
     @classmethod
-    def _reject_renamed_away_spark_shorthand(cls, value: Any) -> Any:
-        if isinstance(value, str) and value in _SPARK_RENAMED_AWAY:
-            raise ValueError(_SPARK_RENAMED_AWAY[value])
+    def _normalize_spark_shorthand(cls, value: Any) -> Any:
+        """Normalize ``spark: <type>`` string shorthand to ``{"type": <type>}``.
+
+        Runs before union validation so ``.spark`` is always ``SparkConfig | None``
+        after construction — resolve and render never branch on the raw string form.
+        """
+        if isinstance(value, str):
+            if value in _SPARK_RENAMED_AWAY:
+                raise ValueError(_SPARK_RENAMED_AWAY[value])
+            return {"type": value}
         return value
 
     @model_validator(mode="after")
@@ -351,6 +358,57 @@ class TableColumnConfig(BaseModel):
         )
 
 
+_SIZING_FIELDS = frozenset({"width", "max_width"})
+
+
+def fill_table_column_defaults(
+    source: TableColumnConfig | None,
+    defaults: TableColumnDefaultsConfig | None,
+    *,
+    fallback_label: str | None = None,
+    link_override: str | None = None,
+) -> TableColumnConfig:
+    """Build one final ``TableColumnConfig`` from an optional explicit source
+    and table-level ``column_defaults``, constructed once (never
+    ``model_copy(update=...)``).
+
+    Precedence per field: ``source``'s own value > ``defaults`` (fills only
+    ``None`` fields) > ``fallback_label`` for ``label`` / ``link_override``
+    for ``link``, each used only when neither of the above set one.
+    ``width``/``max_width`` are one sizing slot — a source that claims either
+    is never filled from the other by ``defaults``.
+
+    The single constructor this repo uses both for a resolved chart's own
+    columns (``compile/resolve/_table.py``) and for a table renderer's two
+    render-native column key spaces — pivot leaf columns and transpose's
+    ``__metric__``/``__value__`` pair — whose key space doesn't exist until
+    a render-time data transform runs, so ``column_defaults`` reaches them
+    here instead of at resolve.
+    """
+    sizing_claimed = source is not None and (
+        source.width is not None or source.max_width is not None
+    )
+    defaults_fields = (
+        frozenset(type(defaults).model_fields) if defaults is not None else frozenset()
+    )
+    fields: dict[str, Any] = {}
+    for name in TableColumnConfig.model_fields:
+        value = getattr(source, name) if source is not None else None
+        if (
+            defaults is not None
+            and value is None
+            and name in defaults_fields
+            and not (name in _SIZING_FIELDS and sizing_claimed)
+        ):
+            value = getattr(defaults, name)
+        fields[name] = value
+    if fields["label"] is None and fallback_label is not None:
+        fields["label"] = fallback_label
+    if fields["link"] is None and link_override is not None:
+        fields["link"] = link_override
+    return TableColumnConfig(**fields)
+
+
 if TYPE_CHECKING:
 
     class SparkStylePatch(SparkStyle):

dataface/core/compile/models/style/resolved/__init__.py

@@ -35,16 +35,21 @@ logic, not a model definition — it lives at
 """
 
 from dataface.core.compile.models.style.resolved._base import (
-    ResolvedAxisDomainStyle,
     ResolvedAxisElementStyle,
     ResolvedAxisGridStyle,
     ResolvedAxisGridZeroStyle,
     ResolvedAxisLabelOverlapConfig,
+    ResolvedAxisLineStyle,
     ResolvedAxisStyle,
     ResolvedAxisTicksStyle,
     ResolvedChartsStyle,
     ResolvedLegendElementStyle,
     ResolvedLegendStyle,
+    ResolvedScaleContinuousStyle,
+    ResolvedScaleLogStyle,
+    ResolvedScalePowStyle,
+    ResolvedScaleStyle,
+    ResolvedScaleSymlogStyle,
     ResolvedStyle,
     _VLConfig,
     effective_padding,
@@ -95,11 +100,11 @@ from dataface.core.compile.models.style.resolved.table import ResolvedTableStyle
 
 __all__ = [
     # _base
-    "ResolvedAxisDomainStyle",
     "ResolvedAxisElementStyle",
     "ResolvedAxisGridStyle",
     "ResolvedAxisGridZeroStyle",
     "ResolvedAxisLabelOverlapConfig",
+    "ResolvedAxisLineStyle",
     "ResolvedAxisStyle",
     "ResolvedAxisTicksStyle",
     "ResolvedCalloutElementStyle",
@@ -107,6 +112,11 @@ __all__ = [
     "ResolvedChartsStyle",
     "ResolvedLegendElementStyle",
     "ResolvedLegendStyle",
+    "ResolvedScaleContinuousStyle",
+    "ResolvedScaleLogStyle",
+    "ResolvedScalePowStyle",
+    "ResolvedScaleStyle",
+    "ResolvedScaleSymlogStyle",
     "ResolvedStyle",
     "_VLConfig",
     # _base (public function)