dataface 0.1.6.dev62__py3-none-any.whl → 0.1.6.dev76__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/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/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-0.1.6.dev62.dist-info → dataface-0.1.6.dev76.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataface
-Version: 0.1.6.dev62
+Version: 0.1.6.dev76
 Summary: Dataface - dbt-native dashboard and visualization layer
 Author: Fivetran, Inc.
 License-Expression: Apache-2.0

{dataface-0.1.6.dev62.dist-info → dataface-0.1.6.dev76.dist-info}/RECORD

@@ -3,7 +3,7 @@ dataface/_docs_site.py,sha256=wREocIbQJ9oUfIpQBMCBpNGKZv-w6R0khOg_tSMQTeA,639
 dataface/_install_hint.py,sha256=mtNmc3xBoe4qtgsZc7UMpiMq_ajOeUyJ3GixCYzPjtE,1162
 dataface/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dataface/agent_api/__init__.py,sha256=aQygBBltbxFjhUErS4fJJTsUF2NYrY-2wHxq42ZR7TQ,3497
-dataface/agent_api/_paths.py,sha256=Y5V28t5faCm6P4LYibAdOmniJymQjiQ_pV5gq4rTdig,4915
+dataface/agent_api/_paths.py,sha256=onfFrfW8MIPzRyE0xazGn7-0g06MfuyAZ2FQ3p1-ZXI,4641
 dataface/agent_api/_session_store.py,sha256=viTnMGWNlT0fIKwXmjz3pb95PR1taIrfRq9NOWEMivg,16932
 dataface/agent_api/_state.py,sha256=mD4JsshDhRANhqb2TrR_NLPXsw-dB3m3bi1UnG2jCF0,723
 dataface/agent_api/cache.py,sha256=m1W8jTkGsaDSnnQB9Yncn8QlBwn4prgutVizL0ymqUM,767
@@ -40,7 +40,7 @@ dataface/ai/context.py,sha256=YxIkDgNYbRzoezC1jiIX3ULVA7ipNh-KrpJzKgvrQAQ,1648
 dataface/ai/events.py,sha256=QJZA_t09AU9BLDB63jKwssODoG5l_I1hyRXi0lXas7Y,1161
 dataface/ai/external_mcp.py,sha256=7uClq0PQjX9KkBIkg5HZg4_Ze4VV49lQE0XEcyIeTek,23130
 dataface/ai/generate_sql.py,sha256=uOtgO5oFMmM8uvsrk2owl9so3DGxdN2QSk6MOstZXhA,2394
-dataface/ai/llm.py,sha256=8JiVx7aBTNyQOjtgMVe-JHxFRmPAULkDf72ok0Mgf9g,15195
+dataface/ai/llm.py,sha256=1taZucoFb_LgdnzqXVk8oHwNxHIgBRKs8rUpw3kitPI,16628
 dataface/ai/memories.py,sha256=fua8IJvkomQAatVFhUeSbS-B421ozd6QOpsiOfhpCWs,2608
 dataface/ai/prompts.py,sha256=jzQYccHbBczA_ahkDbbn0o4PGQtZRlgSWTL7bv-Wk8E,6518
 dataface/ai/schema_context.py,sha256=oH2tnIrvuRHSbJ9RtWTdu7MJ5MGC3N6vXDQomkhDJmI,5807
@@ -68,7 +68,7 @@ dataface/cli/commands/init.py,sha256=H3bf3nE1AcYeMRJtMEEGiCHduBK_1_BllWyn_nJRxU4
 dataface/cli/commands/inspect.py,sha256=eN0AdJksPbsiMAn_GNfnr5rekW88zv8MpCJa3R4OtlA,3624
 dataface/cli/commands/mcp_init.py,sha256=bNPTOJzu2EtHTY0oLdJQ8F9N8aPoR4ZCxa_fZtsqsvE,6815
 dataface/cli/commands/query.py,sha256=4d5Mht1dDh6613U-ZR90Ytrs5UkEoFZHvkHii2Ga9SM,15370
-dataface/cli/commands/render.py,sha256=MuV7Lr2fGPL0QLeV7V45WZbapusGFYBCIIxd-3Q13ys,11635
+dataface/cli/commands/render.py,sha256=gHZ4UiXHrLqgp1tXT6M2fTy8-H3sC3abwp2TFJHoUcM,11882
 dataface/cli/commands/schema.py,sha256=dmHCY3JLpe6pqXM1RF0g83CIomFvhIlk9xknNWVgaWg,16483
 dataface/cli/commands/search.py,sha256=VWty53aifdg1USW7fsjMiE4giXjC4jjfn2NFaoBsdLk,1217
 dataface/cli/commands/serve.py,sha256=-SaYudiPYncijdA52QAhTChQMBB48jyMie5EE7FbnP4,4294
@@ -519,8 +519,8 @@ mdsvg/renderer.py,sha256=RL09P1uXFxEVSsehzzp5QRts5qGeQ5-rMLn1JIrYWl4,61196
 mdsvg/style.py,sha256=RKQATn2C-bymM_5ATZtsNOyyKKakjiVdqLUNrSosTfo,16191
 mdsvg/types.py,sha256=MQlqsUP5y78D8kX0brD-82DkBvaUYdbmkq1U95TnyWA,5093
 mdsvg/utils.py,sha256=CIqFACFaJiM0A_dl-hJXYhRqH-T7ayazP62wgfWGMjw,1866
-dataface-0.1.6.dev62.dist-info/METADATA,sha256=bng4taU9r513uskvHqviRuHMyxFindInd7lauPQZ5mw,11454
-dataface-0.1.6.dev62.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
-dataface-0.1.6.dev62.dist-info/entry_points.txt,sha256=imfZRsAzmIbDRHW7jqhn0nT6EbYWAyOiuHisxmfVgXs,46
-dataface-0.1.6.dev62.dist-info/licenses/LICENSE,sha256=Iy9gBB2gC8WGQEwHxJd4-huwUvxB6OMOoT3no6emeaQ,11345
-dataface-0.1.6.dev62.dist-info/RECORD,,
+dataface-0.1.6.dev76.dist-info/METADATA,sha256=7mxSdfhiakEh_DWtJ-ANtM7hILFWILnS9fu_sOGhiPQ,11454
+dataface-0.1.6.dev76.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+dataface-0.1.6.dev76.dist-info/entry_points.txt,sha256=imfZRsAzmIbDRHW7jqhn0nT6EbYWAyOiuHisxmfVgXs,46
+dataface-0.1.6.dev76.dist-info/licenses/LICENSE,sha256=Iy9gBB2gC8WGQEwHxJd4-huwUvxB6OMOoT3no6emeaQ,11345
+dataface-0.1.6.dev76.dist-info/RECORD,,