dataface 0.1.6.dev321__py3-none-any.whl → 0.1.6.dev360__py3-none-any.whl

dataface/agent_api/describe_query.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+from typing import Any
+
 from pydantic import BaseModel, Field
 
 from dataface.core.execute.adapters import AdapterRegistry
@@ -38,7 +40,7 @@ class DescribeQueryColumn(BaseModel):
 class DescribeQueryResult(BaseModel):
     success: bool
     columns: list[DescribeQueryColumn] | None = None
-    diagnostics: list[dict] = Field(
+    diagnostics: list[dict[str, Any]] = Field(
         default_factory=list,
         description="Dialect-specific diagnostic messages from the query runner.",
     )

dataface/agent_api/docs/yaml-reference.md

@@ -31,6 +31,7 @@ AuthoredFace (dataface) definition from YAML.
 | `height` | str \| int | ✓ | Height when nested (e.g., '300px' or an integer in pixels). |
 | `visible` | bool \| str \| [SingleRowBoolProbe](#singlerowboolprobe) | ✓ | Controls whether this layout item is rendered. Accepts a bool, variable name, Jinja expression, or {query, column} probe. |
 | `theme` | str | ✓ | Theme name (e.g., 'editorial', 'cream', 'stark'). |
+| `auto_link` | bool | ✓ | When True, table charts with no explicit link: automatically link each row to its canonical /data/<source>/<schema>/<table>/detail/ page. Default off. Explicit link: always wins; set link: ~ to suppress per chart. |
 
 <a id="sourcessection"></a>
 ## SourcesSection
@@ -1390,7 +1391,7 @@ Authored overlay for AxisStyle.
 | `band_position` | float | ✓ | Band position within the step (0–1); None uses Vega-Lite's default. |
 | `offset` | float | ✓ | Pixel offset of the axis from its default position; None means no offset. |
 | `format` | str | ✓ | Tick value format string; None uses auto-format. |
-| `values` | list | ✓ | Explicit tick values; None uses Vega-Lite's auto tick values. |
+| `values` | list[Any] | ✓ | Explicit tick values; None uses Vega-Lite's auto tick values. |
 | `time_unit` | enum: "auto", "year", "yearquarter", "yearmonth", "yearweek", "yearmonthdate", "monthofyear", "dayofweek", "dayofmonth", "dayofyear", "hourofday", "none" | ✓ | Time-unit bucketing for temporal x-axes; None or 'auto' auto-detects from data. |
 | `scale` | [ScaleStyle](#scalestyle) | ✓ | Per-axis scale overrides; None means no override. |
 | `type` | enum: "auto", "ordinal", "temporal" | ✓ | Scale type for bucketed-time x-axes; None/'auto' infers from time_unit grain. |
@@ -1416,7 +1417,7 @@ Authored overlay for ScaleStyle. Scale configuration primitive.
 | `use_unaggregated_domain` | bool | ✓ | Use unaggregated domain for scale extent; None uses Vega-Lite's default. |
 | `x_reverse` | bool | ✓ | Reverse the x-axis scale direction; None means no reversal. |
 | `type` | str | ✓ | Scale type override; None lets Vega-Lite infer from field type. |
-| `domain` | list | ✓ | Explicit scale domain values; None lets Vega-Lite auto-determine from data. |
+| `domain` | list[Any] | ✓ | Explicit scale domain values; None lets Vega-Lite auto-determine from data. |
 | `nice` | bool | ✓ | Round scale domain to nice values; None uses Vega-Lite's default. |
 | `padding` | float | ✓ | Unified scale padding shortcut; dispatches to band, point, or continuous padding per scale type. |
 
@@ -2608,6 +2609,7 @@ Postgres source configuration.
 | `password` | str |  | Database password. |
 | `port` | int | ✓ | Database port number. |
 | `schema` | str | ✓ | Default schema for queries. |
+| `sslmode` | enum: "disable", "allow", "prefer", "require", "verify-ca", "verify-full" | ✓ | libpq SSL mode forwarded to psycopg2. None lets libpq decide its default. |
 
 <a id="snowflakesourceconfig"></a>
 ## SnowflakeSourceConfig

dataface/agent_api/inspect.py

@@ -11,6 +11,7 @@ from __future__ import annotations
 from datetime import datetime, timezone
 from hashlib import sha256
 from pathlib import Path
+from typing import Any
 
 from pydantic import BaseModel
 
@@ -109,7 +110,7 @@ def validate_ejected_templates(target_dir: Path) -> ValidateTemplatesResult:
         )
 
     manifest = load_manifest(target_dir, dataface_version=__version__)
-    manifest_templates: dict[str, dict] = manifest.get("templates", {})
+    manifest_templates: dict[str, dict[str, Any]] = manifest.get("templates", {})
     templates_pkg = _pkg_files("dataface.core.inspect.templates")
 
     missing, upstream_changed, custom_safe, unchanged = compare_templates(

dataface/agent_api/pack.py

@@ -14,6 +14,7 @@ from __future__ import annotations
 
 import re
 from pathlib import Path
+from typing import Any
 
 import yaml
 from pydantic import BaseModel
@@ -254,7 +255,7 @@ def propose_pack(
     return proposal, out_path
 
 
-def _build_face_dict(dashboard: ProposedDashboard) -> dict:
+def _build_face_dict(dashboard: ProposedDashboard) -> dict[str, Any]:
     """Build a minimal valid face dict from a ProposedDashboard.
 
     Sparse + valid + no TODO placeholders. Emits title + description + text only.
@@ -266,7 +267,7 @@ def _build_face_dict(dashboard: ProposedDashboard) -> dict:
     is included so the data URL redirects to this authored face. The alias
     lives on the face file — no central mapping needed.
     """
-    face: dict = {
+    face: dict[str, Any] = {
         "title": dashboard.title,
         "description": dashboard.purpose,
         "text": (
@@ -278,7 +279,9 @@ def _build_face_dict(dashboard: ProposedDashboard) -> dict:
     return face
 
 
-def _build_index_dict(folder_path: str, dashboards: list[ProposedDashboard]) -> dict:
+def _build_index_dict(
+    folder_path: str, dashboards: list[ProposedDashboard]
+) -> dict[str, Any]:
     """Build the index.yml landing face for a folder.
 
     Generates a simple text-only landing that lists the dashboards in the folder.
@@ -302,7 +305,7 @@ def _build_index_dict(folder_path: str, dashboards: list[ProposedDashboard]) ->
     }
 
 
-def _write_face(path: Path, face_dict: dict) -> None:
+def _write_face(path: Path, face_dict: dict[str, Any]) -> None:
     """Write a face dict to a YAML file in block style."""
     path.parent.mkdir(parents=True, exist_ok=True)
     path.write_text(

dataface/agent_api/query.py

@@ -102,7 +102,7 @@ class ExecuteQueryResult(BaseModel):
     errors: list[str]
     row_count: int
     truncated: bool
-    diagnostics: list[dict] = Field(
+    diagnostics: list[dict[str, Any]] = Field(
         default_factory=list,
         description=(
             "Deterministic validate_query findings (fanout_risk, "
@@ -114,7 +114,7 @@ class ExecuteQueryResult(BaseModel):
 
 def _query_diagnostics(
     sql: str, source: str | None, adapter_registry: AdapterRegistry
-) -> list[dict]:
+) -> list[dict[str, Any]]:
     """Run the structural validator over *sql*; never raise on a real query.
 
     Resolves the source dialect when possible so dialect-specific parsing is

dataface/agent_api/render_face.py

@@ -24,7 +24,6 @@ def render_face(
     warnings_ignore: frozenset[str] | None = None,
     format: str = "svg",
     project: Project | None = None,
-    base_dir: str | Path | None = None,
     variables: dict[str, str] | None = None,
     use_cache: bool = True,
     cache: DuckDBCache | None = None,
@@ -40,8 +39,6 @@ def render_face(
         format: Output format — "svg", "html", "png", "pdf", etc.
         project: Explicit project. When omitted, auto-discovered upward from
             the face file's directory via ``ProjectSession.from_face``.
-        base_dir: Base directory for resolving relative paths in the face.
-            Defaults to the face file's parent directory.
         variables: Runtime variable overrides.
         use_cache: Whether to use the in-memory Executor result cache.
         cache: Optional DuckDB query-result cache. When provided, the caller
@@ -63,8 +60,6 @@ def render_face(
     else:
         yaml_content = raw
 
-    resolved_base_dir = Path(base_dir).resolve() if base_dir else face_file.parent
-
     if project is not None:
         if warnings_ignore is None:
             warnings_ignore = project.warnings_ignore
@@ -74,13 +69,16 @@ def render_face(
             warnings_ignore = frozenset()
         project_session = ProjectSession.from_face(face_file, cache=cache)
     try:
+        p = project_session.project
+        base_file = p.file_for_path(face_file)
         return compile_and_render(
             yaml_content,
-            project_session.project,
+            p,
             adapter_registry=project_session.adapter_registry,
             cache=cache,
             warnings_ignore=warnings_ignore,
-            base_dir=resolved_base_dir,
+            base_file=base_file,
+            face_dir=face_file.parent,
             format=format,
             variables=variables,
             use_cache=use_cache,

dataface/ai/prompts/sql-guidance.md

@@ -4,11 +4,11 @@ Before writing SQL, write a short query plan:
 
 - **OUTPUT**: the columns to return, with clear aliases that describe the value
 - **FROM/JOIN**: the tables and the join keys between them
-- **GRAIN**: what one row represents after the joins; guard against fan-out / double-counting on the non-unique side of a join — if a join multiplies rows, aggregate before joining or add a GROUP BY
+- **GRAIN**: what one row represents after the joins; guard against fan-out / double-counting on the non-unique side of a join — if a join multiplies rows, aggregate before joining or add a GROUP BY. If the schema context already states a join's multiplicity (e.g. one-to-many) or a column's uniqueness, use that to decide grain — don't spend a query probing for what the schema already tells you
 - **FILTERS**: each WHERE condition; verify the exact stored value before filtering (stored values may differ from display labels — e.g. `'LA'` not `'Los Angeles'`)
 - **SORT/LIMIT**: include if the question asks to rank, sort, or return a top-N
 
-Then translate the plan faithfully into SQL. Verify by executing the query and checking that shape and values match the plan.
+Then translate the plan faithfully into SQL. Verify by executing the query and checking that shape and values match the plan. When you run a query, heed any diagnostics it returns — a `fanout_risk`, `missing_join_predicate`, or `reaggregation` warning means the join or aggregate is probably double-counting even though the query ran; fix the grain before trusting the numbers.
 
 Additional rules:
 

dataface/cli/commands/_agent_input.py

@@ -147,7 +147,7 @@ class PromptToolkitInput:
         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(
+        self._session: PromptSession[str] = PromptSession(
             history=FileHistory(str(hist_path)),
             # DftCompleter is duck-typed against the Completer protocol; we
             # don't inherit because prompt_toolkit imports are deferred to

dataface/cli/commands/docs.py

@@ -6,7 +6,7 @@ from rich.padding import Padding
 from rich.table import Table
 
 from dataface._docs_site import docs_site_url
-from dataface.agent_api.docs import docs as _docs
+from dataface.agent_api.docs import TopicEntry, docs as _docs
 from dataface.agent_api.docs.warnings import get_warning_code, list_warning_codes
 from dataface.cli._console import dft_console, is_plain_output
 from dataface.cli._json_output import print_json_result
@@ -119,7 +119,7 @@ def docs_command(
         _emit_markdown(result.topic.content)
 
 
-def _emit_topic_index(topics: list) -> None:
+def _emit_topic_index(topics: list[TopicEntry]) -> None:
     if not topics:
         typer.echo("No topics found.")
         return
@@ -131,7 +131,7 @@ def _emit_topic_index(topics: list) -> None:
         _emit_topic_index_plain(topics, web_docs)
 
 
-def _emit_topic_index_rich(topics: list, web_docs: str) -> None:
+def _emit_topic_index_rich(topics: list[TopicEntry], web_docs: str) -> None:
     typer.echo(
         "Dataface (`dft`) is a dbt-native dashboard layer. You author dashboards as "
         'YAML "faces" — queries, charts, variables, and layout — and `dft` compiles '
@@ -158,7 +158,7 @@ def _emit_topic_index_rich(topics: list, web_docs: str) -> None:
     typer.echo("  dft skills             Agent workflows and layout patterns")
 
 
-def _emit_topic_index_plain(topics: list, web_docs: str) -> None:
+def _emit_topic_index_plain(topics: list[TopicEntry], web_docs: str) -> None:
     typer.echo(
         "Dataface (`dft`) is a dbt-native dashboard layer. You author dashboards as "
         'YAML "faces" — queries, charts, variables, and layout — and `dft` compiles '
@@ -185,7 +185,7 @@ def _emit_topic_index_plain(topics: list, web_docs: str) -> None:
     typer.echo("  dft skills             Agent workflows and layout patterns")
 
 
-def _topic_table(topics: list) -> Table:
+def _topic_table(topics: list[TopicEntry]) -> Table:
     name_width = max(len(entry.id) for entry in topics)
     table = Table(show_header=False, box=None, padding=(0, 2, 0, 0))
     table.add_column("Topic", style="bold", no_wrap=True, width=name_width)

dataface/core/compile/compiler.py

@@ -68,7 +68,7 @@ from dataface.core.compile.yaml_error_formatter import (
     format_validation_errors_structured,
 )
 from dataface.core.errors.structured import StructuredError
-from dataface.core.project import Project
+from dataface.core.project import Project, ProjectFile
 from dataface.core.render.warnings import unreferenced_chart
 from dataface.core.render.warnings.base import RenderWarning
 from dataface.core.render.warnings.from_query_diagnostic import from_query_diagnostic
@@ -140,7 +140,7 @@ class CompileResult:
 
 def compile_authored_face(
     authored: AuthoredFace,
-    base_dir: Path | None = None,
+    base_file: ProjectFile | None = None,
     project_sources: ProjectSourcesConfig | None = None,
     _yaml_content: str = "",
 ) -> CompileResult:
@@ -152,7 +152,7 @@ def compile_authored_face(
 
     Args:
         authored: Parsed face from the registered-view expander.
-        base_dir: Base directory for resolving file references.
+        base_file: ProjectFile handle for the face file (used to resolve sub-file refs).
         project_sources: Project-level sources config.
         _yaml_content: Original YAML text, used only to produce richer
             ``format_validation_errors_structured`` output on PydanticValidationError.
@@ -188,7 +188,7 @@ def compile_authored_face(
     # ════════════════════════════════════════════════════════════════════
     try:
         query_registry = build_query_registry(
-            authored, base_dir, default_source=default_source
+            authored, base_file, default_source=default_source
         )
     except CompilationError as e:
         return CompileResult(errors=[e.to_structured()])
@@ -206,7 +206,7 @@ def compile_authored_face(
     # STEP 5b: Build Chart Registry
     # ════════════════════════════════════════════════════════════════════
     try:
-        chart_registry = build_chart_registry(authored, base_dir=base_dir)
+        chart_registry = build_chart_registry(authored, base_file=base_file)
     except CompilationError as e:
         return CompileResult(errors=[e.to_structured()])
 
@@ -218,7 +218,7 @@ def compile_authored_face(
             authored,
             query_registry=query_registry,
             chart_registry=chart_registry,
-            base_path=base_dir,
+            base_file=base_file,
         )
     except ReferenceError as e:
         return CompileResult(errors=[e.to_structured()])
@@ -262,7 +262,7 @@ def compile_authored_face(
 def compile(
     yaml_content: str,
     options: dict[str, Any] | None = None,
-    base_dir: Path | None = None,
+    base_file: ProjectFile | None = None,
     project_sources: ProjectSourcesConfig | None = None,
 ) -> CompileResult:
     """Compile YAML content to a Face.
@@ -278,7 +278,7 @@ def compile(
     Args:
         yaml_content: YAML string to compile
         options: Optional compilation options
-        base_dir: Base directory for resolving file references
+        base_file: ProjectFile handle for the face file (used to resolve sub-file refs).
         project_sources: Project-level sources.
 
     Returns:
@@ -319,7 +319,7 @@ def compile(
     return _compile_with_text(
         face,
         yaml_content,
-        base_dir=base_dir,
+        base_file=base_file,
         project_sources=project_sources,
         meta_lint=options.get("meta_lint"),
     )
@@ -342,7 +342,7 @@ def _parse_error_to_structured(
 def _compile_with_text(
     face: AuthoredFace,
     yaml_content: str,
-    base_dir: Path | None,
+    base_file: ProjectFile | None,
     project_sources: ProjectSourcesConfig | None,
     meta_lint: MetaLintConfig | None,
 ) -> CompileResult:
@@ -355,7 +355,7 @@ def _compile_with_text(
     authoring_warnings = detect_authoring_warnings(yaml_content)
     result = compile_authored_face(
         face,
-        base_dir=base_dir,
+        base_file=base_file,
         project_sources=project_sources,
         _yaml_content=yaml_content,
     )
@@ -498,7 +498,10 @@ def compile_file(
             errors=[CompilationError(f"File not found: {file_path}").to_structured()]
         )
 
-    # Markdown report files: translate to YAML before compiling
+    face_file = project.file_for_path(file_path)
+
+    # Markdown report files: translate to YAML before compiling.
+    # is_markdown_face stays path-based (upward directory walk, out of scope).
     from dataface.core.compile.markdown import (
         MARKDOWN_NOT_FACE_MESSAGE,
         MARKDOWN_SUFFIXES,
@@ -523,7 +526,7 @@ def compile_file(
             )
     else:
         try:
-            yaml_content = file_path.read_text(encoding="utf-8")
+            yaml_content = face_file.read_text()
         except OSError as e:
             return CompileResult(
                 errors=[CompilationError(f"Failed to read file: {e}").to_structured()]
@@ -556,7 +559,7 @@ def compile_file(
     result = _compile_with_text(
         face,
         yaml_content,
-        base_dir=file_path.parent,
+        base_file=face_file,
         project_sources=project.sources,
         meta_lint=meta_lint,
     )
@@ -654,8 +657,8 @@ def _build_registry(
         registry_type: Type of registry to build ("queries" or "charts")
         registry: Existing registry to add to (will be created if None)
         **kwargs: Additional arguments specific to registry type:
-            - For "queries": base_dir, default_source
-            - For "charts": base_dir
+            - For "queries": base_file, default_source
+            - For "charts": base_file
 
     Returns:
         Complete registry dictionary
@@ -685,7 +688,7 @@ def _build_registry(
 def _process_queries_for_registry(
     face: AuthoredFace,
     registry: dict[str, AnyQuery],
-    base_dir: Path | None = None,
+    base_file: ProjectFile | None = None,
     default_source: str | None = None,
 ) -> None:
     """Process queries from a face and add to registry.
@@ -693,7 +696,7 @@ def _process_queries_for_registry(
     Args:
         face: AuthoredFace to process queries from
         registry: Registry to add queries to
-        base_dir: Base directory for cross-file references
+        base_file: ProjectFile handle for the face file (used to resolve sub-file refs).
         default_source: Default source to apply to queries without explicit source
 
     Raises:
@@ -713,7 +716,7 @@ def _process_queries_for_registry(
 
         # Handle cross-file references
         if isinstance(query_def, QueryRef):
-            registry[name] = load_from_reference(query_def, base_dir=base_dir)
+            registry[name] = load_from_reference(query_def, base_file=base_file)
         else:
             registry[name] = normalize_query(
                 name, query_def, default_source=effective_default_source
@@ -723,7 +726,7 @@ def _process_queries_for_registry(
 def _process_charts_for_registry(
     face: AuthoredFace,
     registry: dict[str, Any],
-    base_dir: Path | None = None,
+    base_file: ProjectFile | None = None,
     **kwargs: Any,
 ) -> None:
     """Process charts from a face and add to registry.
@@ -731,7 +734,7 @@ def _process_charts_for_registry(
     Args:
         face: AuthoredFace to process charts from
         registry: Registry to add charts to
-        base_dir: Base directory for cross-file references
+        base_file: ProjectFile handle for the face file (used to resolve sub-file refs).
         **kwargs: Additional arguments (e.g., query_registry for future use)
 
     Raises:
@@ -747,14 +750,14 @@ def _process_charts_for_registry(
 
         # Handle cross-file references
         if isinstance(chart_def, ChartRef):
-            registry[name] = load_from_reference(chart_def, base_dir=base_dir)
+            registry[name] = load_from_reference(chart_def, base_file=base_file)
         else:
             registry[name] = chart_def
 
 
 def build_query_registry(
     face: AuthoredFace,
-    base_dir: Path | None = None,
+    base_file: ProjectFile | None = None,
     registry: dict[str, AnyQuery] | None = None,
     default_source: str | None = None,
 ) -> dict[str, AnyQuery]:
@@ -765,7 +768,7 @@ def build_query_registry(
 
     Args:
         face: AuthoredFace to process
-        base_dir: Base directory for cross-file references
+        base_file: ProjectFile handle for the face file (used to resolve sub-file refs).
         registry: Existing registry to add to
         default_source: Default source to apply to queries without explicit source
 
@@ -779,14 +782,14 @@ def build_query_registry(
         face,
         "queries",
         registry=registry,
-        base_dir=base_dir,
+        base_file=base_file,
         default_source=default_source,
     )
 
 
 def build_chart_registry(
     face: AuthoredFace,
-    base_dir: Path | None = None,
+    base_file: ProjectFile | None = None,
     registry: dict[str, Any] | None = None,
 ) -> dict[str, Any]:
     """Build complete chart registry from face and nested faces.
@@ -796,7 +799,7 @@ def build_chart_registry(
 
     Args:
         face: AuthoredFace to process
-        base_dir: Base directory for cross-file references
+        base_file: ProjectFile handle for the face file (used to resolve sub-file refs).
         registry: Existing registry to add to
 
     Returns:
@@ -805,19 +808,20 @@ def build_chart_registry(
     Raises:
         CompilationError: If duplicate chart names found
     """
-    return _build_registry(face, "charts", registry=registry, base_dir=base_dir)
+    return _build_registry(face, "charts", registry=registry, base_file=base_file)
 
 
 def load_from_reference(
     reference: VariableRef | QueryRef | ChartRef,
-    base_dir: Path | None = None,
+    base_file: ProjectFile | None = None,
 ) -> Any:
     """Load an item from a typed cross-file reference.
 
     Args:
         reference: A typed ref model (VariableRef, QueryRef, or ChartRef).
             The grammar has already been validated by the Pydantic model.
-        base_dir: Base directory for resolving paths
+        base_file: ProjectFile handle for the face file (used to resolve paths).
+            If None and a sub-file ref is encountered, raises CompilationError.
 
     Returns:
         - QueryRef → AnyQuery
@@ -841,14 +845,22 @@ def load_from_reference(
     if not (file_path_str.endswith(".yml") or file_path_str.endswith(".yaml")):
         file_path_str += ".yml"
 
-    full_path = base_dir / file_path_str if base_dir else Path(file_path_str)
+    if base_file is None:
+        raise CompilationError(
+            f"Cannot resolve cross-file reference '{reference.ref}': "
+            "no base file context (face was compiled without a ProjectFile)"
+        )
+
+    try:
+        ref_file = base_file.sibling(file_path_str)
+    except ValueError as e:
+        raise CompilationError(str(e)) from e
 
-    if not full_path.exists():
+    if not ref_file.exists():
         raise CompilationError(f"Referenced file not found: {file_path_str}")
 
     try:
-        with open(full_path) as f:
-            content = yaml.safe_load(f)
+        content = ref_file.read_yaml()
     except (OSError, yaml.YAMLError) as e:
         raise CompilationError(f"Failed to load {file_path_str}: {e}") from e
 
@@ -881,7 +893,7 @@ def load_from_reference(
     )
 
 
-def _extract_sources(face: AuthoredFace) -> dict[str, dict]:
+def _extract_sources(face: AuthoredFace) -> dict[str, dict[str, Any]]:
     """Extract named source configurations from AuthoredFace.
 
     Extracts named source definitions (excluding 'default') into a dict.

dataface/core/compile/errors.py

@@ -213,7 +213,7 @@ class ValidationError(CompilationError):
 
     field_path: str | None = None
     invalid_value: str | None = None
-    valid_values: list | None = None
+    valid_values: list[str] | None = None
 
     def __init__(
         self,
@@ -224,7 +224,7 @@ class ValidationError(CompilationError):
         suggestion: str | None = None,
         field_path: str | None = None,
         invalid_value: str | None = None,
-        valid_values: list | None = None,
+        valid_values: list[str] | None = None,
     ):
         self.field_path = field_path
         self.invalid_value = invalid_value

dataface/core/compile/filter_injection.py

@@ -178,7 +178,7 @@ def inject_filters(
     return tree.sql(dialect=sg_dialect), all_params
 
 
-def _is_operator_dict(d: dict) -> bool:
+def _is_operator_dict(d: dict[str, Any]) -> bool:
     """Check if a dict's keys are all recognized filter operators."""
     operators = set(_OP_MAP) | {"in", "not_in", "between"}
     return all(k in operators for k in d)

dataface/core/compile/jinja.py

@@ -267,8 +267,8 @@ def _detect_circular(dependencies: dict[str, list[str]]) -> None:
     Raises:
         JinjaError: If circular dependency found
     """
-    visited: set = set()
-    rec_stack: set = set()
+    visited: set[str] = set()
+    rec_stack: set[str] = set()
 
     def dfs(node: str, path: list[str]) -> None:
         if node in rec_stack:
@@ -340,7 +340,7 @@ def _substitute_query_refs(sql: str, resolved: dict[str, str]) -> str:
     """
     _QUERY_REF = re.compile(r"\{\{\s*queries\.(\w+)\s*\}\}")
 
-    def _replacer(m: re.Match) -> str:
+    def _replacer(m: re.Match[str]) -> str:
         name = m.group(1)
         if name in resolved:
             return resolved[name]

dataface/core/compile/markdown.py

@@ -19,6 +19,7 @@ validator.
 
 import re
 from pathlib import Path
+from typing import Any
 
 import yaml
 
@@ -66,7 +67,7 @@ def parse_chart_embeds(body: str) -> list[tuple[str, str]]:
     return blocks
 
 
-def _extract_frontmatter(md_text: str) -> tuple[dict, str]:
+def _extract_frontmatter(md_text: str) -> tuple[dict[str, Any], str]:
     """Extract optional YAML frontmatter and markdown body from text."""
     lines = md_text.splitlines(keepends=True)
     if not lines or lines[0].strip() != "---":
@@ -95,7 +96,7 @@ def _extract_frontmatter(md_text: str) -> tuple[dict, str]:
     return fm, body
 
 
-def _metadata_to_markdown_table(metadata: dict) -> str:
+def _metadata_to_markdown_table(metadata: dict[str, Any]) -> str:
     """Render a flat metadata dict as a two-column markdown table.
 
     Produces:
@@ -116,7 +117,7 @@ def _metadata_to_markdown_table(metadata: dict) -> str:
     return "\n".join(lines)
 
 
-def parse_markdown_face(md_text: str) -> tuple[str, dict]:
+def parse_markdown_face(md_text: str) -> tuple[str, dict[str, Any]]:
     """Parse a markdown face file and return (yaml_str, metadata_dict).
 
     ``yaml_str`` is the YAML string ready to feed to compile().
@@ -131,8 +132,8 @@ def parse_markdown_face(md_text: str) -> tuple[str, dict]:
     """
     fm, body = _extract_frontmatter(md_text)
 
-    face_config: dict = {}
-    metadata: dict = {}
+    face_config: dict[str, Any] = {}
+    metadata: dict[str, Any] = {}
 
     if "face" in fm:
         face_cfg = fm["face"]
@@ -146,7 +147,7 @@ def parse_markdown_face(md_text: str) -> tuple[str, dict]:
 
     # Build rows from markdown body
     blocks = parse_chart_embeds(body)
-    rows: list = []
+    rows: list[dict[str, Any] | str] = []
     for block_type, value in blocks:
         if block_type == "text":
             rows.append({"text": value})

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

@@ -252,7 +252,7 @@ CHART_TYPE_DISPLAY: dict[ChartType, dict[str, str]] = {
 _INTERNAL_CHART_TYPES: set[ChartType] = {ChartType.DONUT}
 
 
-def get_chart_type_options(include_internal: bool = False) -> list[dict]:
+def get_chart_type_options(include_internal: bool = False) -> list[dict[str, Any]]:
     """Get chart types for UI dropdowns. Single source of truth.
 
     Args: