ktx/packages/context/src/sl/schemas.ts
Andrey Avtomonov cb8902f1e5
fix(context): merge overlay columns onto manifest columns by name (#94)
* fix(context): merge overlay columns onto manifest columns by name

composeOverlay was appending overlay columns to the manifest column list,
producing duplicate entries when dbt/metabase overlays declared a column
just to attach descriptions. The duplicates carried no `type`, so the
pydantic SourceDefinition rejected them at semantic-query time and broke
`ktx sl query` for every overlay-backed measure. Now overlay columns
match base columns by name (case-insensitive): same-name entries merge
onto the manifest (overlay fields win, type/role fall back to the base,
descriptions merge per source key) and only new names append.

* refactor(sl): split overlay columns from column_overrides and enforce TS/Python wire contract

Overlay sources now have two distinct collections: `columns:` for computed
columns (requiring `expr` + `type`) and `column_overrides:` for metadata
patches to inherited manifest columns. Composing or loading an overlay that
mixes the two — or references an unknown column — fails with a typed error.

Introduce `ResolvedSemanticLayerSource` / `resolvedSourceSchema` /
`toResolvedWire` as the strict shape sent to the Python engine, and add a
schema contract test that diffs Zod against the Pydantic JSON schema dumped
by `python -m semantic_layer dump-schema`. `SourceDefinition` is now
`extra="forbid"` on the Python side.

`loadAllSources` surfaces per-file load errors instead of swallowing them,
so validation/query paths can report manifest shard parse failures.

* fix(context): make scan description generation resilient and quiet

A transient sampleTable failure during ingest used to take out every
table in a connection: generateTableDescription returned a hardcoded
'Table not found' string into descriptions.ai, and KtxDescriptionGenerator
was constructed without a logger, so the failure left no trail anywhere.

- sampleTable / sampleColumn calls retry 3x with 200/400/800ms backoff,
  honouring KtxScanContext.signal via a new KtxAbortedError.
- On retry exhaustion or missing capability, table generation falls back
  to a metadata-only prompt built from column name / native type / comment
  / rawDescriptions. The column path follows the same rule -- call the
  LLM when any of samples or rawDescriptions are available; skip only
  when both are absent.
- Logger is now threaded from KtxScanContext into the generator. Failures
  emit structured KtxScanWarning entries (new description_fallback_used
  code, plus existing sampling_failed / enrichment_failed /
  connector_capability_missing). ktx scan groups warnings by code so a
  batch of identical failures collapses to one summary line plus sample.
- Returns null on failure instead of the 'Table not found' sentinel; the
  manifest writer's existing guard already skips empty descriptions, so
  schema YAML no longer carries misleading text. SCAN_MANAGED_DESCRIPTION_KEYS
  already strips stale 'ai' on merge, so existing YAML clears on next run.

Also suppress AI SDK v6 'system in messages' warning: pull system messages
out of KtxMessageBuilder.wrapSimple's output via a new splitKtxSystemMessages
helper and pass them top-level to generateText (preserves cacheControl
providerOptions on the SystemModelMessage). Agent-runner's local
splitSystemPromptMessages dedupes onto the shared helper.

* test(docs): align examples-docs assertions with revamped docs

PR #103 (setup/guide doc revamp) reworded several CLI examples and
connection labels; the assertions in scripts/examples-docs.test.mjs
still referenced the pre-revamp wording and were failing in CI on main.
Update the regexes to match the post-revamp content:

- drop the `--json` flag from the sl-query example expectation
- move the `Driver:` / `Status: ok` probe to the connection reference,
  which is where that output now lives (driver id is lowercase
  `postgres`, not the display name `PostgreSQL`)
- drop the obsolete `Install \`uv\`...` troubleshooting line
- accept `<connectionId>` everywhere; the docs no longer use the
  hyphenated `<connection-id>` form
- match the `warehouse` connection id used in the quickstart instead of
  the `postgres-warehouse` id only used in the README and setup ref

* fix(sl): skip TS/Python schema contract test when uv is unavailable

The TypeScript checks CI job does not install uv or Python, so the
module-level `execFileSync('uv', ...)` in schemas.contract.test.ts threw
ENOENT and failed the suite. Wrap the schema dump in a try/catch and
guard the describe block with `describe.skipIf` so the test skips in
environments without uv. Local dev and any CI job that has uv on PATH
still runs the cross-language contract assertion.
2026-05-15 02:11:04 +02:00

204 lines
8 KiB
TypeScript

import { z } from 'zod';
import { tableUsageOutputSchema } from '../ingest/adapters/historic-sql/skill-schemas.js';
// Literal vocabularies — kept in lockstep with the Python Pydantic model at
// python/ktx-sl/semantic_layer/models.py (SourceColumn / ColumnRole /
// ColumnVisibility / JoinDeclaration). If these diverge, YAMLs can pass
// TypeScript validation at ingest time but fail Python loading at query time.
const columnTypeValues = ['string', 'number', 'time', 'boolean'] as const;
const columnRoleValues = ['time', 'default'] as const;
const columnVisibilityValues = ['public', 'internal', 'hidden'] as const;
const joinRelationshipValues = ['many_to_one', 'one_to_many', 'one_to_one'] as const;
const slMeasureDefinitionSchema = z.object({
name: z.string().min(1),
expr: z.string().min(1),
filter: z.string().optional(),
segments: z.array(z.string().min(1)).optional(),
description: z.string().optional(),
});
const segmentDefinitionSchema = z.object({
name: z.string().min(1),
expr: z.string().min(1),
description: z.string().optional(),
});
const descriptionsSchema = z.record(z.string(), z.string().min(1));
const defaultTimeDimensionDbtSchema = z.object({
dbt: z.string().optional(),
});
const dbtColumnConstraintsSchema = z.object({
not_null: z.boolean().optional(),
unique: z.boolean().optional(),
});
const dbtDataTestRefSchema = z.object({
name: z.string().min(1),
package: z.string().min(1),
kwargs: z.record(z.string(), z.unknown()).optional(),
});
const dbtColumnTestsSchema = z.object({
dbt: z.array(dbtDataTestRefSchema).optional(),
dbt_by_package: z.record(z.string(), z.array(z.string().min(1))).optional(),
});
const sourceKeyedStringArraySchema = z.object({
dbt: z.array(z.string().min(1)).optional(),
});
const sourceKeyedColumnConstraintsSchema = z.object({
dbt: dbtColumnConstraintsSchema.optional(),
});
const freshnessDbtSchema = z.object({
raw: z.unknown().optional(),
loaded_at_field: z.string().nullable().optional(),
});
const sourceFreshnessSchema = z.object({
dbt: freshnessDbtSchema.optional(),
});
// Identifiers (grain entries, column names) must be unqualified output-column
// names. A dot would mean the agent emitted a table-qualified reference like
// `activity.account_id` — those break SQL generation and grain semantics.
const unqualifiedNameSchema = z
.string()
.min(1)
.regex(/^[^.]+$/, "must be unqualified (no '.') — use the output column name");
const joinDeclarationSchema = z.object({
to: z.string().min(1),
on: z.string().min(1),
relationship: z.enum(joinRelationshipValues),
alias: z.string().optional(),
});
const resolvedJoinDeclarationSchema = joinDeclarationSchema.strict();
const sourceColumnSchema = z.object({
name: unqualifiedNameSchema,
// type/descriptions optional on standalone sources: compose-time enrichment fills them
// from the manifest entry named in `inherits_columns_from`. If the agent does not set
// `inherits_columns_from`, or the column is not in the manifest, type must be present
// — surfaced by sl_validate.
type: z.enum(columnTypeValues).optional(),
role: z.enum(columnRoleValues).optional(),
visibility: z.enum(columnVisibilityValues).optional(),
descriptions: descriptionsSchema.optional(),
expr: z.string().optional(),
natural_granularity: z.string().optional(),
constraints: sourceKeyedColumnConstraintsSchema.optional(),
enum_values: sourceKeyedStringArraySchema.optional(),
tests: dbtColumnTestsSchema.optional(),
});
const resolvedSourceColumnSchema = sourceColumnSchema.extend({
type: z.enum(columnTypeValues),
}).strict();
/** Overlay column: computed columns only. Structural columns live in the manifest. */
const overlayColumnSchema = z
.object({
name: unqualifiedNameSchema,
type: z.enum(columnTypeValues),
role: z.enum(columnRoleValues).optional(),
visibility: z.enum(columnVisibilityValues).optional(),
descriptions: descriptionsSchema.optional(),
expr: z.string().min(1),
})
.strict();
const columnOverrideSchema = z
.object({
name: unqualifiedNameSchema,
role: z.enum(columnRoleValues).optional(),
visibility: z.enum(columnVisibilityValues).optional(),
descriptions: descriptionsSchema.optional(),
constraints: sourceKeyedColumnConstraintsSchema.optional(),
enum_values: sourceKeyedStringArraySchema.optional(),
tests: dbtColumnTestsSchema.optional(),
})
.strict();
/** Standalone source: has `table` or `sql`, requires grain + columns. */
export const sourceDefinitionSchema = z
.object({
name: z.string().min(1),
descriptions: descriptionsSchema.optional(),
// Accepted for documentation parity with the Python spec; behavior is driven
// by the `table` / `sql` fields, not by this discriminator.
source_type: z.enum(['table', 'sql']).optional(),
table: z.string().optional(),
sql: z.string().optional(),
// Manifest key (e.g. "CONSIGNMENTS") whose column metadata fills any blank
// type/descriptions/role on this source's columns at compose time. Lets the
// agent write `columns: [{name: FOO}]` instead of redeclaring known fields.
// Lookup is fuzzy: bare key, fully-qualified table path, or any suffix all match.
inherits_columns_from: z.string().optional(),
grain: z.array(unqualifiedNameSchema).min(1),
// Standalone sources MUST declare columns. An empty columns array means
// there's nothing to query or join against and breaks grain validation
// (the grain must reference declared columns). Inheritance from a manifest
// via `inherits_columns_from` only fills in type/description on declared
// columns — the column names themselves must be listed here.
columns: z.array(sourceColumnSchema).min(1),
joins: z.array(joinDeclarationSchema).default([]),
measures: z.array(slMeasureDefinitionSchema).default([]),
segments: z.array(segmentDefinitionSchema).optional(),
default_time_dimension: defaultTimeDimensionDbtSchema.optional(),
tags: sourceKeyedStringArraySchema.optional(),
freshness: sourceFreshnessSchema.optional(),
usage: tableUsageOutputSchema.optional(),
})
.strict()
.refine((s) => (s.table || s.sql) && !(s.table && s.sql), {
message: "Standalone source must have exactly one of 'table' or 'sql' (not both)",
});
export const resolvedSourceSchema = z
.object({
name: z.string().min(1),
descriptions: descriptionsSchema.optional(),
table: z.string().optional(),
sql: z.string().optional(),
grain: z.array(unqualifiedNameSchema).min(1),
columns: z.array(resolvedSourceColumnSchema).min(1),
joins: z.array(resolvedJoinDeclarationSchema).default([]),
measures: z.array(slMeasureDefinitionSchema).default([]),
segments: z.array(segmentDefinitionSchema).optional(),
default_time_dimension: defaultTimeDimensionDbtSchema.optional(),
tags: sourceKeyedStringArraySchema.optional(),
freshness: sourceFreshnessSchema.optional(),
})
.strict()
.refine((s) => (s.table || s.sql) && !(s.table && s.sql), {
message: "Resolved source must have exactly one of 'table' or 'sql' (not both)",
});
/** Overlay source: no table/sql, all fields optional except name. */
export const sourceOverlaySchema = z
.object({
name: z.string().min(1),
descriptions: z.record(z.string(), z.string()).optional(),
grain: z.array(unqualifiedNameSchema).optional(),
columns: z.array(overlayColumnSchema).optional(),
column_overrides: z.array(columnOverrideSchema).optional(),
joins: z.array(joinDeclarationSchema).optional(),
measures: z.array(slMeasureDefinitionSchema).optional(),
segments: z.array(segmentDefinitionSchema).optional(),
exclude_columns: z.array(z.string()).optional(),
disable_joins: z.array(z.string()).optional(),
default_time_dimension: defaultTimeDimensionDbtSchema.optional(),
usage: tableUsageOutputSchema.optional(),
})
.strict();
/** Returns true if the source data is an overlay (no table/sql field). */
export function isOverlaySource(source: Record<string, unknown>): boolean {
return !source.table && !source.sql;
}