dataface 0.1.6.dev62__py3-none-any.whl → 0.1.6.dev82__py3-none-any.whl

dataface/agent_api/_paths.py

@@ -65,7 +65,7 @@ class FaceRenderContext:
     """
 
     face_file: Path
-    scoped_path: Path | None
+    scoped_path: Path
     scoped_base: Path
     project_root: Path
     output_dir: Path
@@ -74,37 +74,34 @@ class FaceRenderContext:
 
 def build_face_render_context(
     face_path: Path,
-    project_dir: Path | None = None,
+    project_dir: Path,
 ) -> FaceRenderContext:
     """Resolve a face path and walk for dbt context.
 
-    ``project_dir=None`` means "walk freely from the face's parent" — used by
-    the CLI when ``--project-dir`` is omitted so a face under a dbt sub-project
-    still anchors on that sub-project's root. A given ``project_dir`` is
-    authoritative; the walk only contributes the dbt project path.
+    ``project_dir`` is authoritative; the walk only contributes the dbt project
+    path. Callers must resolve their project dir first (e.g. via
+    ``resolve_project_dir(raw_dir)`` at the CLI boundary).
     """
     if face_path.is_absolute():
         face_file = face_path.resolve()
     elif ".." in face_path.parts:
         face_file = (Path.cwd() / face_path).resolve()
     else:
-        anchor = (
-            project_dir.resolve()
-            if project_dir is not None
-            else resolve_project_dir(None)
-        )
-        face_file = (anchor / face_path).resolve()
-
-    walk_root, dbt_project_path = discover_render_context(
+        face_file = (project_dir / face_path).resolve()
+
+    _, dbt_project_path = discover_render_context(
         face_file.parent,
         discovery_boundary_for_face(face_file.parent, project_dir),
     )
-    project_root = project_dir.resolve() if project_dir is not None else walk_root
+    project_root = project_dir
 
     try:
-        scoped_path: Path | None = face_file.relative_to(project_root)
+        scoped_path: Path = face_file.relative_to(project_root)
     except ValueError:
-        scoped_path = face_file
+        raise ValueError(
+            f"Face file {face_file} is outside project_dir {project_root}. "
+            f"Pass an explicit --project-dir that contains the face file."
+        ) from None
 
     return FaceRenderContext(
         face_file=face_file,
@@ -129,18 +126,15 @@ class YamlRenderContext:
 
 
 def build_yaml_render_context(
-    project_dir: Path | None = None,
+    project_dir: Path,
 ) -> YamlRenderContext:
     """Walk for dbt context anchored at the given project root.
 
-    ``project_dir=None`` walks from cwd to discover the project root; a given
-    ``project_dir`` is authoritative.
+    ``project_dir`` is authoritative. Callers must resolve their project dir
+    first (e.g. via ``resolve_project_dir(raw_dir)`` at the CLI boundary).
     """
-    anchor = (
-        project_dir.resolve() if project_dir is not None else resolve_project_dir(None)
-    )
-    walk_root, dbt_project_path = discover_render_context(anchor, None)
-    project_root = anchor if project_dir is not None else walk_root
+    project_root = project_dir.resolve()
+    _, dbt_project_path = discover_render_context(project_root, None)
     return YamlRenderContext(
         project_root=project_root,
         output_dir=project_root,

dataface/agent_api/data_paths.py

@@ -25,6 +25,7 @@ from dataface.core.registered_views.data_urls import (
 
 if TYPE_CHECKING:
     from dataface.agent_api.schema import SchemaResponse
+    from dataface.core.project import Project
     from dataface.core.serve.alias_index import AliasIndex
 
 
@@ -186,22 +187,15 @@ def data_paths_list(
     return result
 
 
-def build_alias_index_for_project(project_dir: Path) -> AliasIndex:
-    """Build an AliasIndex from a project directory.
+def build_alias_index_for_project(project: Project) -> AliasIndex:
+    """Build an AliasIndex from a project.
 
-    Uses the same faces_at_root detection logic as the server. Intended for
-    CLI commands (dft schema --data-paths) that need alias lookup without
-    starting a server.
+    Intended for CLI commands (dft schema --data-paths) that need alias lookup
+    without starting a server.
     """
     from dataface.core.serve.alias_index import AliasIndex
 
-    faces_dir = project_dir / "faces"
-    faces_at_root = faces_dir.is_dir()
-    return AliasIndex.build(
-        project_dir=project_dir,
-        faces_dir=faces_dir,
-        faces_at_root=faces_at_root,
-    )
+    return AliasIndex.build(project, faces_at_root=project.faces_dir.is_dir())
 
 
 def data_alias_errors_for_file(

dataface/agent_api/docs/yaml-reference.md

@@ -1081,7 +1081,7 @@ Authored overlay for TitleStyle. Board and face titles.
 | Field | Type | Optional | Description |
 |-------|------|:--------:|-------------|
 | `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 (~1.1-1.25 vs the body 1.5-1.6). |
+| `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. |
 | `min_height` | float | ✓ | Minimum title row height in pixels. |

dataface/agent_api/files.py

@@ -16,6 +16,8 @@ from pathlib import Path
 
 from pydantic import BaseModel, Field
 
+from dataface.core.project import Project
+
 # Cap grep/glob payloads — read_file returns full content (model must handle size).
 _MAX_GREP_MATCHES = 200
 _MAX_GLOB_MATCHES = 500
@@ -146,9 +148,9 @@ def _walk_project(root: Path) -> list[Path]:
     return result
 
 
-def read_file(path: str, project_dir: Path) -> ReadFileResult:
+def read_file(path: str, project: Project) -> ReadFileResult:
     try:
-        target = _resolve_within(project_dir, path)
+        target = _resolve_within(project.root, path)
     except ValueError as exc:
         return ReadFileResult(success=False, path=path, error=str(exc))
     if not target.is_file():
@@ -157,12 +159,14 @@ def read_file(path: str, project_dir: Path) -> ReadFileResult:
         content = target.read_text(encoding="utf-8")
     except (OSError, UnicodeDecodeError) as exc:
         return ReadFileResult(success=False, path=path, error=str(exc))
-    return ReadFileResult(success=True, path=_rel(project_dir, target), content=content)
+    return ReadFileResult(
+        success=True, path=_rel(project.root, target), content=content
+    )
 
 
-def write_file(path: str, content: str, project_dir: Path) -> WriteFileResult:
+def write_file(path: str, content: str, project: Project) -> WriteFileResult:
     try:
-        target = _resolve_within(project_dir, path)
+        target = _resolve_within(project.root, path)
     except ValueError as exc:
         return WriteFileResult(success=False, path=path, error=str(exc))
     try:
@@ -172,16 +176,16 @@ def write_file(path: str, content: str, project_dir: Path) -> WriteFileResult:
         return WriteFileResult(success=False, path=path, error=str(exc))
     return WriteFileResult(
         success=True,
-        path=_rel(project_dir, target),
+        path=_rel(project.root, target),
         bytes_written=len(content.encode("utf-8")),
     )
 
 
 def edit_file(
-    path: str, old_string: str, new_string: str, project_dir: Path
+    path: str, old_string: str, new_string: str, project: Project
 ) -> EditFileResult:
     try:
-        target = _resolve_within(project_dir, path)
+        target = _resolve_within(project.root, path)
     except ValueError as exc:
         return EditFileResult(success=False, path=path, error=str(exc))
     if not target.is_file():
@@ -205,11 +209,11 @@ def edit_file(
         target.write_text(original.replace(old_string, new_string), encoding="utf-8")
     except OSError as exc:
         return EditFileResult(success=False, path=path, error=str(exc))
-    return EditFileResult(success=True, path=_rel(project_dir, target), replacements=1)
+    return EditFileResult(success=True, path=_rel(project.root, target), replacements=1)
 
 
-def glob_files(pattern: str, project_dir: Path) -> GlobResult:
-    root = project_dir.resolve()
+def glob_files(pattern: str, project: Project) -> GlobResult:
+    root = project.root.resolve()
     matches: list[str] = []
     try:
         candidates = root.glob(pattern)
@@ -228,8 +232,8 @@ def glob_files(pattern: str, project_dir: Path) -> GlobResult:
     return GlobResult(success=True, matches=matches)
 
 
-def grep_files(pattern: str, project_dir: Path, glob: str | None = None) -> GrepResult:
-    root = project_dir.resolve()
+def grep_files(pattern: str, project: Project, glob: str | None = None) -> GrepResult:
+    root = project.root.resolve()
     matches: list[GrepMatch] = []
     try:
         candidates: list[Path] = (

dataface/agent_api/pack.py

@@ -446,8 +446,8 @@ def apply_proposal(
     )
 
     # Ensure base dirs exist
-    (project.root / "faces").mkdir(exist_ok=True)
-    (project.root / "faces" / "partials").mkdir(exist_ok=True)
+    project.faces_dir.mkdir(exist_ok=True)
+    (project.faces_dir / "partials").mkdir(exist_ok=True)
 
     # Write partials — skipped by validate_paths (_*.yml convention)
     for partial_filename, partial_path, rel in partial_targets:

dataface/agent_api/project_session.py

@@ -253,6 +253,10 @@ class ProjectSession:
     def warnings_ignore(self) -> frozenset[str]:
         return self.project.warnings_ignore
 
+    @property
+    def faces_dir(self) -> Path:
+        return self.project.faces_dir
+
     @cached_property
     def _relationship_context(self) -> RelationshipContext | None:
         """Load relationship context from the super-schema cache (lazy, per-instance).

dataface/agent_api/validate.py

@@ -90,7 +90,7 @@ def _validate_one_path(
     # detectors. Keep this lazy so `dft --help` doesn't pay that startup cost.
     from dataface.core.inspect.manifest_utils import INSPECT_TEMPLATE_MANIFEST
 
-    raw_path = path if path is not None else project.root / "faces"
+    raw_path = path if path is not None else project.faces_dir
 
     try:
         resolved = resolve_scoped_path(raw_path, project.root)

dataface/ai/context.py

@@ -31,7 +31,7 @@ class DatafaceAIContext:
         if path.is_absolute():
             raise ValueError(f"Dashboard path must be relative: {path}")
         if self.dashboards_directory is None:
-            base_dir = (self.project_session.project.root / "faces").resolve()
+            base_dir = self.project_session.faces_dir.resolve()
         else:
             base_dir = self.dashboards_directory.resolve()
         resolved = (base_dir / path).resolve()

dataface/ai/llm.py

@@ -50,7 +50,8 @@ def _resolve_model(
 def _normalize_openai_tools(
     tools: list[dict[str, Any]] | None,
 ) -> list[dict[str, Any]]:
-    source_tools = tools or ALL_TOOLS
+    # None means "use default agent tools"; [] means "no tools, text-only completion".
+    source_tools = ALL_TOOLS if tools is None else tools
     if not source_tools:
         return []
     if "input_schema" in source_tools[0]:
@@ -69,7 +70,8 @@ def _normalize_openai_tools(
 def _normalize_anthropic_tools(
     tools: list[dict[str, Any]] | None,
 ) -> list[dict[str, Any]]:
-    source_tools = tools or ALL_TOOLS
+    # None means "use default agent tools"; [] means "no tools, text-only completion".
+    source_tools = ALL_TOOLS if tools is None else tools
     if not source_tools:
         return []
     if "input_schema" in source_tools[0]:
@@ -120,8 +122,14 @@ def _is_anthropic_api_error(exc: Exception) -> bool:
 # -- Provider stream adapter ------------------------------------------------
 
 
-def _iter_anthropic_stream(stream_ctx: Any) -> Iterator[StreamEvent]:
-    """Parse Anthropic Messages API stream context manager into typed events."""
+def _iter_anthropic_stream(
+    stream_ctx: Any, usage_sink: Any = None
+) -> Iterator[StreamEvent]:
+    """Parse Anthropic Messages API stream context manager into typed events.
+
+    ``usage_sink``, when given, is called once with the final message's usage
+    payload so the client can accumulate token totals.
+    """
     with stream_ctx as stream:
         for event in stream:
             if event.type == "content_block_delta" and event.delta.type == "text_delta":
@@ -129,6 +137,9 @@ def _iter_anthropic_stream(stream_ctx: Any) -> Iterator[StreamEvent]:
 
         final_message = stream.get_final_message()
 
+    if usage_sink is not None:
+        usage_sink(final_message.usage)
+
     for block in final_message.content:
         if block.type == "tool_use":
             yield ToolCallEvent(
@@ -144,6 +155,13 @@ class LLMClient(Protocol):
 
     provider: str
     model: str
+    # Cumulative usage across this client's lifetime. Every implementation must
+    # maintain these honestly — eval solvers read them to attribute per-case
+    # cost/calls. Declared here so callers access them directly (no getattr
+    # defaults, which would silently fabricate zeros for a client that forgot them).
+    total_input_tokens: int
+    total_output_tokens: int
+    llm_calls: int
 
     def stream_with_tools(
         self,
@@ -332,6 +350,17 @@ class AnthropicClient:
         )
         self.api_key = api_key or os.getenv("ANTHROPIC_API_KEY")
         self._client: Any = None
+        # Cumulative token usage + call count (see LLMClient protocol).
+        self.total_input_tokens = 0
+        self.total_output_tokens = 0
+        self.llm_calls = 0
+
+    def _accumulate_usage(self, usage: Any) -> None:
+        """Add an Anthropic Messages usage payload to the running token totals."""
+        if usage is None:
+            return
+        self.total_input_tokens += getattr(usage, "input_tokens", 0) or 0
+        self.total_output_tokens += getattr(usage, "output_tokens", 0) or 0
 
     @property
     def client(self) -> Any:
@@ -404,6 +433,7 @@ class AnthropicClient:
         system_prompt: str,
         tools: list[dict[str, Any]] | None = None,
     ) -> Iterator[StreamEvent]:
+        self.llm_calls += 1
         try:
             yield from _iter_anthropic_stream(
                 self.client.messages.stream(
@@ -412,7 +442,8 @@ class AnthropicClient:
                     messages=self._messages_to_input(messages),
                     tools=_normalize_anthropic_tools(tools),
                     max_tokens=4096,
-                )
+                ),
+                usage_sink=self._accumulate_usage,
             )
         except Exception as exc:
             if _is_anthropic_api_error(exc):

dataface/ai/tools/__init__.py

@@ -293,14 +293,14 @@ def _handle_get_warning_code(
 def _handle_read_file(args: dict[str, Any], ctx: DatafaceAIContext) -> dict[str, Any]:
     parsed = _files.ReadFileArgs.model_validate(args)
     return _files.read_file(
-        parsed.path, project_dir=_render_project_dir(args, ctx)
+        parsed.path, project=Project(_render_project_dir(args, ctx))
     ).model_dump(mode="json", exclude_none=True)
 
 
 def _handle_write_file(args: dict[str, Any], ctx: DatafaceAIContext) -> dict[str, Any]:
     parsed = _files.WriteFileArgs.model_validate(args)
     return _files.write_file(
-        parsed.path, parsed.content, project_dir=_render_project_dir(args, ctx)
+        parsed.path, parsed.content, project=Project(_render_project_dir(args, ctx))
     ).model_dump(mode="json", exclude_none=True)
 
 
@@ -310,14 +310,14 @@ def _handle_edit_file(args: dict[str, Any], ctx: DatafaceAIContext) -> dict[str,
         parsed.path,
         parsed.old_string,
         parsed.new_string,
-        project_dir=_render_project_dir(args, ctx),
+        project=Project(_render_project_dir(args, ctx)),
     ).model_dump(mode="json", exclude_none=True)
 
 
 def _handle_glob_files(args: dict[str, Any], ctx: DatafaceAIContext) -> dict[str, Any]:
     parsed = _files.GlobFilesArgs.model_validate(args)
     return _files.glob_files(
-        parsed.pattern, project_dir=_render_project_dir(args, ctx)
+        parsed.pattern, project=Project(_render_project_dir(args, ctx))
     ).model_dump(mode="json", exclude_none=True)
 
 
@@ -325,7 +325,7 @@ def _handle_grep_files(args: dict[str, Any], ctx: DatafaceAIContext) -> dict[str
     parsed = _files.GrepFilesArgs.model_validate(args)
     return _files.grep_files(
         parsed.pattern,
-        project_dir=_render_project_dir(args, ctx),
+        project=Project(_render_project_dir(args, ctx)),
         glob=parsed.glob,
     ).model_dump(mode="json", exclude_none=True)
 

dataface/cli/commands/render.py

@@ -8,6 +8,8 @@ from dataface.agent_api import ProjectSession
 from dataface.agent_api._paths import (
     build_face_render_context,
     build_yaml_render_context,
+    resolve_project_dir,
+    resolve_project_dir_from_paths,
 )
 from dataface.agent_api.cache import cache_from_env
 from dataface.agent_api.dashboards import RenderedDashboard
@@ -119,7 +121,10 @@ def render_command(
     if ignore_codes:
         _emit_unknown_code_notices(ignore_codes)
 
-    ctx = build_face_render_context(face_path, project_dir)
+    resolved_project_dir = resolve_project_dir_from_paths(
+        [face_path.resolve()], project_dir
+    )
+    ctx = build_face_render_context(face_path, resolved_project_dir)
     output_dir = ctx.output_dir
 
     with (
@@ -208,7 +213,8 @@ def render_command_from_yaml(
     if ignore_codes:
         _emit_unknown_code_notices(ignore_codes)
 
-    ctx = build_yaml_render_context(project_dir)
+    resolved_project_dir = resolve_project_dir(project_dir)
+    ctx = build_yaml_render_context(resolved_project_dir)
     output_dir = ctx.output_dir
 
     with (

dataface/cli/commands/schema.py

@@ -193,32 +193,31 @@ def schema_command(
             lineage_depth=lineage_depth,
             surface="cli",
         )
-
-    if data_paths:
-        if not drill_result.success:
-            print_structured_errors(
-                drill_result.structured_errors
-                or [
-                    StructuredError(
-                        code=DF_UNKNOWN_INTERNAL.code,
-                        domain=DF_UNKNOWN_INTERNAL.domain,
-                        doc_url=DF_UNKNOWN_INTERNAL.doc_url,
-                        docs_topic=DF_UNKNOWN_INTERNAL.docs_topic,
-                        message="; ".join(drill_result.errors),
-                    )
-                ]
+        if data_paths:
+            if not drill_result.success:
+                print_structured_errors(
+                    drill_result.structured_errors
+                    or [
+                        StructuredError(
+                            code=DF_UNKNOWN_INTERNAL.code,
+                            domain=DF_UNKNOWN_INTERNAL.domain,
+                            doc_url=DF_UNKNOWN_INTERNAL.doc_url,
+                            docs_topic=DF_UNKNOWN_INTERNAL.docs_topic,
+                            message="; ".join(drill_result.errors),
+                        )
+                    ]
+                )
+                raise typer.Exit(1)
+            from dataface.agent_api.data_paths import (
+                build_alias_index_for_project,
+                data_paths_list,
             )
-            raise typer.Exit(1)
-        from dataface.agent_api.data_paths import (
-            build_alias_index_for_project,
-            data_paths_list,
-        )
 
-        alias_index = build_alias_index_for_project(project_root)
-        ep_list = data_paths_list(drill_result, alias_index=alias_index)
-        wire = [p.to_dict() for p in ep_list]
-        typer.echo(json.dumps(wire, indent=2))
-        return
+            alias_index = build_alias_index_for_project(project_session.project)
+            ep_list = data_paths_list(drill_result, alias_index=alias_index)
+            wire = [p.to_dict() for p in ep_list]
+            typer.echo(json.dumps(wire, indent=2))
+            return
 
     if json_output:
         typer.echo(

dataface/core/compile/models/style/theme.py

@@ -332,8 +332,7 @@ class TitleStyle(BaseModel):
     line_height: float = Field(
         description=(
             "Line height multiplier for titles and markdown headings. Headings "
-            "typically want a tighter multiplier than body prose (~1.1-1.25 vs "
-            "the body 1.5-1.6)."
+            "typically want a tighter multiplier than body prose."
         )
     )
     sizes: list[float] = Field(