modelrig 0.11.0 → 0.12.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +82 -0
- package/dist/adapters/anthropic.d.ts +4 -4
- package/dist/adapters/anthropic.d.ts.map +1 -1
- package/dist/adapters/anthropic.js +8 -1
- package/dist/adapters/deepseek.d.ts +2 -4
- package/dist/adapters/deepseek.d.ts.map +1 -1
- package/dist/adapters/deepseek.js +9 -5
- package/dist/adapters/gemini.d.ts +4 -1
- package/dist/adapters/gemini.d.ts.map +1 -1
- package/dist/adapters/gemini.js +16 -1
- package/dist/adapters/grok.d.ts +2 -4
- package/dist/adapters/grok.d.ts.map +1 -1
- package/dist/adapters/grok.js +8 -4
- package/dist/adapters/history-mapping.d.ts +126 -0
- package/dist/adapters/history-mapping.d.ts.map +1 -0
- package/dist/adapters/history-mapping.js +230 -0
- package/dist/adapters/openai-compat.d.ts +2 -4
- package/dist/adapters/openai-compat.d.ts.map +1 -1
- package/dist/adapters/openai-compat.js +9 -5
- package/dist/adapters/openai.d.ts +2 -4
- package/dist/adapters/openai.d.ts.map +1 -1
- package/dist/adapters/openai.js +8 -4
- package/dist/adapters/responses-api.d.ts.map +1 -1
- package/dist/adapters/responses-api.js +9 -4
- package/dist/artifacts/artifact.d.ts.map +1 -1
- package/dist/artifacts/artifact.js +79 -0
- package/dist/artifacts/conversation.d.ts +128 -0
- package/dist/artifacts/conversation.d.ts.map +1 -0
- package/dist/artifacts/conversation.js +172 -0
- package/dist/artifacts/index.d.ts +1 -1
- package/dist/artifacts/index.d.ts.map +1 -1
- package/dist/artifacts/media.d.ts +46 -0
- package/dist/artifacts/media.d.ts.map +1 -0
- package/dist/artifacts/media.js +88 -0
- package/dist/artifacts/run-context.d.ts +61 -2
- package/dist/artifacts/run-context.d.ts.map +1 -1
- package/dist/artifacts/run-context.js +183 -12
- package/dist/artifacts/scrub.d.ts +3 -0
- package/dist/artifacts/scrub.d.ts.map +1 -1
- package/dist/bakeoff/engine.d.ts.map +1 -1
- package/dist/bakeoff/engine.js +34 -7
- package/dist/bakeoff/eval-cases.d.ts +5 -0
- package/dist/bakeoff/eval-cases.d.ts.map +1 -1
- package/dist/bakeoff/eval-cases.js +10 -1
- package/dist/bakeoff/replay.d.ts +15 -0
- package/dist/bakeoff/replay.d.ts.map +1 -1
- package/dist/bakeoff/replay.js +19 -1
- package/dist/bakeoff/report.d.ts.map +1 -1
- package/dist/bakeoff/report.js +9 -2
- package/dist/bakeoff/turn-replay.d.ts +93 -0
- package/dist/bakeoff/turn-replay.d.ts.map +1 -0
- package/dist/bakeoff/turn-replay.js +150 -0
- package/dist/bakeoff/types.d.ts +12 -0
- package/dist/bakeoff/types.d.ts.map +1 -1
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +1 -0
- package/dist/config.d.ts +18 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +23 -3
- package/dist/doctor-preflight.d.ts.map +1 -1
- package/dist/doctor-preflight.js +6 -1
- package/dist/feedback/grade.d.ts +7 -2
- package/dist/feedback/grade.d.ts.map +1 -1
- package/dist/feedback/grade.js +14 -0
- package/dist/feedback/outcome.d.ts +103 -0
- package/dist/feedback/outcome.d.ts.map +1 -0
- package/dist/feedback/outcome.js +175 -0
- package/dist/gateway/history-bridge.d.ts +32 -0
- package/dist/gateway/history-bridge.d.ts.map +1 -0
- package/dist/gateway/history-bridge.js +64 -0
- package/dist/gateway/serve-client.d.ts.map +1 -1
- package/dist/gateway/serve-client.js +6 -0
- package/dist/index.d.ts +44 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +110 -9
- package/dist/init/init-cli.d.ts.map +1 -1
- package/dist/init/init-cli.js +21 -4
- package/dist/init/observe-cli.js +1 -1
- package/dist/init/observe.d.ts +7 -1
- package/dist/init/observe.d.ts.map +1 -1
- package/dist/init/observe.js +74 -22
- package/dist/init/starter.d.ts +36 -0
- package/dist/init/starter.d.ts.map +1 -0
- package/dist/init/starter.js +85 -0
- package/dist/registry/build.d.ts +4 -0
- package/dist/registry/build.d.ts.map +1 -1
- package/dist/registry/generation-models.d.ts +68 -0
- package/dist/registry/generation-models.d.ts.map +1 -0
- package/dist/registry/generation-models.js +168 -0
- package/dist/registry/model-kind.d.ts +34 -0
- package/dist/registry/model-kind.d.ts.map +1 -0
- package/dist/registry/model-kind.js +40 -0
- package/dist/registry/pricing-shape.d.ts +29 -1
- package/dist/registry/pricing-shape.d.ts.map +1 -1
- package/dist/registry/pricing-shape.js +9 -0
- package/dist/registry/pricing.d.ts +26 -0
- package/dist/registry/pricing.d.ts.map +1 -1
- package/dist/registry/pricing.js +29 -0
- package/dist/registry/rows.d.ts.map +1 -1
- package/dist/registry/rows.js +3 -1
- package/dist/registry/unit-pricing.d.ts +32 -0
- package/dist/registry/unit-pricing.d.ts.map +1 -0
- package/dist/registry/unit-pricing.js +62 -0
- package/dist/routes/input-loader.d.ts +38 -0
- package/dist/routes/input-loader.d.ts.map +1 -0
- package/dist/routes/input-loader.js +80 -0
- package/dist/routes/loader.d.ts.map +1 -1
- package/dist/routes/loader.js +3 -0
- package/dist/routes/resolved-bundle.d.ts +2 -0
- package/dist/routes/resolved-bundle.d.ts.map +1 -1
- package/dist/routes/resolved-bundle.js +3 -0
- package/dist/run/cost.d.ts +28 -0
- package/dist/run/cost.d.ts.map +1 -1
- package/dist/run/cost.js +74 -0
- package/dist/run/dispatch.d.ts +4 -1
- package/dist/run/dispatch.d.ts.map +1 -1
- package/dist/run/dispatch.js +3 -0
- package/dist/run/limits.d.ts +88 -0
- package/dist/run/limits.d.ts.map +1 -0
- package/dist/run/limits.js +155 -0
- package/dist/run/messages.d.ts +199 -0
- package/dist/run/messages.d.ts.map +1 -0
- package/dist/run/messages.js +430 -0
- package/dist/run/raw-finalize.d.ts +5 -2
- package/dist/run/raw-finalize.d.ts.map +1 -1
- package/dist/run/raw-finalize.js +8 -5
- package/dist/run/raw-request.d.ts.map +1 -1
- package/dist/run/raw-request.js +2 -1
- package/dist/run/raw.d.ts +10 -4
- package/dist/run/raw.d.ts.map +1 -1
- package/dist/run/raw.js +11 -3
- package/dist/run/rawonly.d.ts +29 -5
- package/dist/run/rawonly.d.ts.map +1 -1
- package/dist/run/rawonly.js +54 -19
- package/dist/run/record-attempt.d.ts.map +1 -1
- package/dist/run/record-attempt.js +16 -6
- package/dist/run/record-call.d.ts +13 -2
- package/dist/run/record-call.d.ts.map +1 -1
- package/dist/run/record-call.js +50 -7
- package/dist/run/run.d.ts.map +1 -1
- package/dist/run/run.js +12 -8
- package/dist/telemetry/attempt-meta.d.ts +49 -1
- package/dist/telemetry/attempt-meta.d.ts.map +1 -1
- package/dist/telemetry/attempt-meta.js +45 -1
- package/dist/telemetry/exporter.d.ts.map +1 -1
- package/dist/telemetry/exporter.js +2 -1
- package/dist/telemetry/grade-mappers.d.ts +1 -1
- package/dist/telemetry/grade-mappers.d.ts.map +1 -1
- package/dist/telemetry/grade-mappers.js +7 -1
- package/dist/telemetry/grade-task.d.ts +49 -0
- package/dist/telemetry/grade-task.d.ts.map +1 -0
- package/dist/telemetry/grade-task.js +85 -0
- package/dist/telemetry/grades-sql.d.ts +16 -1
- package/dist/telemetry/grades-sql.d.ts.map +1 -1
- package/dist/telemetry/grades-sql.js +64 -4
- package/dist/telemetry/ingest-protocol.d.ts +24 -1
- package/dist/telemetry/ingest-protocol.d.ts.map +1 -1
- package/dist/telemetry/ingest-protocol.js +72 -43
- package/dist/telemetry/otel-content.d.ts +31 -0
- package/dist/telemetry/otel-content.d.ts.map +1 -0
- package/dist/telemetry/otel-content.js +106 -0
- package/dist/telemetry/otel-hierarchy.d.ts +57 -0
- package/dist/telemetry/otel-hierarchy.d.ts.map +1 -0
- package/dist/telemetry/otel-hierarchy.js +155 -0
- package/dist/telemetry/otel-normalize.d.ts +15 -1
- package/dist/telemetry/otel-normalize.d.ts.map +1 -1
- package/dist/telemetry/otel-normalize.js +24 -39
- package/dist/telemetry/sinks.d.ts +4 -1
- package/dist/telemetry/sinks.d.ts.map +1 -1
- package/dist/telemetry/sinks.js +53 -34
- package/dist/telemetry/store-migrations.d.ts.map +1 -1
- package/dist/telemetry/store-migrations.js +8 -0
- package/dist/telemetry/store.d.ts +9 -0
- package/dist/telemetry/store.d.ts.map +1 -1
- package/dist/telemetry/store.js +10 -0
- package/dist/telemetry/uniform-rows.d.ts +43 -0
- package/dist/telemetry/uniform-rows.d.ts.map +1 -0
- package/dist/telemetry/uniform-rows.js +139 -0
- package/dist/types/failures-teaching.d.ts.map +1 -1
- package/dist/types/failures-teaching.js +11 -0
- package/dist/types/failures.d.ts +1 -1
- package/dist/types/failures.d.ts.map +1 -1
- package/dist/types/failures.js +2 -0
- package/dist/types/provider.d.ts +12 -0
- package/dist/types/provider.d.ts.map +1 -1
- package/dist/types/route.d.ts +13 -0
- package/dist/types/route.d.ts.map +1 -1
- package/dist/types/telemetry.d.ts +14 -1
- package/dist/types/telemetry.d.ts.map +1 -1
- package/docs/agent-skill/SKILL.md +122 -12
- package/docs/how-it-fits.md +4 -4
- package/docs/instrumentation.md +148 -44
- package/docs/llms.txt +143 -13
- package/docs/mcp-oracle.md +15 -4
- package/docs/quickstart.md +129 -16
- package/package.json +4 -2
- package/registry/registry.json +456 -0
- package/templates/creative-approval.json +81 -0
- package/templates/support-conversation.json +82 -0
|
@@ -13,7 +13,8 @@
|
|
|
13
13
|
* enum/identifier/hash (length > 128 or containing whitespace).
|
|
14
14
|
*/
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
-
exports.RESERVED_TAG_KEYS = exports.OUTPUT_KINDS = exports.PROMPT_DELIVERIES = void 0;
|
|
16
|
+
exports.RESERVED_TAG_KEYS = exports.LIMIT_FAILURE_REASONS = exports.RUN_TRIGGERS = exports.UNIT_KEYS = exports.OUTPUT_KINDS = exports.PROMPT_DELIVERIES = void 0;
|
|
17
|
+
exports.cleanUnits = cleanUnits;
|
|
17
18
|
exports.renderRequestForHash = renderRequestForHash;
|
|
18
19
|
exports.isMetaSafeString = isMetaSafeString;
|
|
19
20
|
exports.sanitizeMetaForWire = sanitizeMetaForWire;
|
|
@@ -33,6 +34,37 @@ exports.PROMPT_DELIVERIES = new Set(["system", "user", "user+cache"]);
|
|
|
33
34
|
* `inferences.meta.output_kind` for every dispatched route-lane row, absent on
|
|
34
35
|
* raw-lane rows (the raw lane has no route contract). */
|
|
35
36
|
exports.OUTPUT_KINDS = new Set(["json", "text"]);
|
|
37
|
+
/** ARC-4 (ARC-γ): the non-token units a generation call is billed in — the ONE
|
|
38
|
+
* list. `rig.recordCall({ units })` validates against it, `meta.units` carries
|
|
39
|
+
* exactly these keys, and unit pricing (run/cost.ts) prices from it (the drift
|
|
40
|
+
* test pins all three). `steps` is recorded but never priced: no source we
|
|
41
|
+
* vendor publishes a per-step rate (L5). */
|
|
42
|
+
exports.UNIT_KEYS = ["images", "seconds", "characters", "steps"];
|
|
43
|
+
/** The units envelope, cleaned: only {@link UNIT_KEYS}, only finite numbers
|
|
44
|
+
* ≥ 0. Returns undefined when nothing survives (absent ⇒ no `units` key). */
|
|
45
|
+
function cleanUnits(raw) {
|
|
46
|
+
if (typeof raw !== "object" || raw === null || Array.isArray(raw))
|
|
47
|
+
return undefined;
|
|
48
|
+
const out = {};
|
|
49
|
+
for (const key of exports.UNIT_KEYS) {
|
|
50
|
+
const v = raw[key];
|
|
51
|
+
if (typeof v === "number" && Number.isFinite(v) && v >= 0)
|
|
52
|
+
out[key] = v;
|
|
53
|
+
}
|
|
54
|
+
return Object.keys(out).length > 0 ? out : undefined;
|
|
55
|
+
}
|
|
56
|
+
/** The `RunMeta.trigger` vocabulary (WI-1 + ARC-1 `conversation`, set by
|
|
57
|
+
* `rig.conversation`). The ONE list — the type and its drift test read it. */
|
|
58
|
+
exports.RUN_TRIGGERS = ["cron", "api", "manual", "replay", "other", "conversation"];
|
|
59
|
+
/** ARC-5: the `RunMeta.failure_reason` values a run-limit breach writes —
|
|
60
|
+
* `limit:<which>`, one per `RunLimits` field (run/limits.ts). Other reasons are
|
|
61
|
+
* caller-supplied identifiers (R9). */
|
|
62
|
+
exports.LIMIT_FAILURE_REASONS = [
|
|
63
|
+
"limit:max_usd",
|
|
64
|
+
"limit:max_calls",
|
|
65
|
+
"limit:max_wall_ms",
|
|
66
|
+
"limit:max_repeat_tool_call",
|
|
67
|
+
];
|
|
36
68
|
/** Canonicalize the RENDERED request for `input_hash` (spec §2) — system + user
|
|
37
69
|
* + schema, joined the SAME way in both lanes so a routed and a raw call with
|
|
38
70
|
* the identical prompt+schema hash identically (lane parity, spec §6.3). The
|
|
@@ -273,6 +305,10 @@ function summarizeAttemptMeta(inputs) {
|
|
|
273
305
|
// OBS-1: caller-reported provenance — an enum; anything else is dropped.
|
|
274
306
|
if (inputs.provenance === "caller-reported")
|
|
275
307
|
meta.provenance = inputs.provenance;
|
|
308
|
+
// ARC-4: non-token units — numbers only, known keys only.
|
|
309
|
+
const units = cleanUnits(inputs.units);
|
|
310
|
+
if (units !== undefined)
|
|
311
|
+
meta.units = units;
|
|
276
312
|
// Externally-sourced identifiers — gated by the classification rule.
|
|
277
313
|
if (isMetaSafeString(a.model_snapshot))
|
|
278
314
|
meta.model_snapshot = a.model_snapshot;
|
|
@@ -346,6 +382,14 @@ function summarizeAttemptMeta(inputs) {
|
|
|
346
382
|
if (cost !== null)
|
|
347
383
|
meta.cost = cost;
|
|
348
384
|
}
|
|
385
|
+
// ARC-4: a priced unit cost rides `other` (reserved for it), so the
|
|
386
|
+
// components sum to the recorded row. A unit-only call (no token price)
|
|
387
|
+
// gets an all-zero token block plus `other`.
|
|
388
|
+
const unitCost = num(inputs.unitCostUsd);
|
|
389
|
+
if (unitCost !== undefined && unitCost > 0) {
|
|
390
|
+
const base = meta.cost ?? { in: 0, out: 0, cache_read: 0, cache_write: 0, other: 0 };
|
|
391
|
+
meta.cost = { ...base, other: (base.other ?? 0) + unitCost };
|
|
392
|
+
}
|
|
349
393
|
return meta;
|
|
350
394
|
}
|
|
351
395
|
catch {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exporter.d.ts","sourceRoot":"","sources":["../../src/telemetry/exporter.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"exporter.d.ts","sourceRoot":"","sources":["../../src/telemetry/exporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -301,8 +301,9 @@ function createTelemetryExporter(store, config) {
|
|
|
301
301
|
poisonState.delete(stream);
|
|
302
302
|
poisonSkipped[stream] = (poisonSkipped[stream] ?? 0) + rowCount;
|
|
303
303
|
const status = err instanceof sinks_1.SinkSendError ? err.status : undefined;
|
|
304
|
+
const reason = err instanceof sinks_1.SinkSendError && err.reasonCode !== null ? `, reason ${err.reasonCode}` : "";
|
|
304
305
|
console.warn(`[modelrig exporter] POISON-SKIP: stream "${stream}" batch at watermark ${watermark} ` +
|
|
305
|
-
`(${rowCount} row(s), status ${status ?? "network"}) was rejected deterministically ` +
|
|
306
|
+
`(${rowCount} row(s), status ${status ?? "network"}${reason}) was rejected deterministically ` +
|
|
306
307
|
`${POISON_SKIP_THRESHOLD}× running — advancing the watermark PAST it WITHOUT writing. ` +
|
|
307
308
|
`These rows are dropped and will NOT be retried; investigate the rejection and backfill.`);
|
|
308
309
|
return "skip";
|
|
@@ -15,7 +15,7 @@ export declare function toWireGrade(row: GradeRow): WireGrade;
|
|
|
15
15
|
* (F4) is deliberately destructured OUT here: `public.grades` has no criteria
|
|
16
16
|
* column — the per-criterion breakdown fans out to `grade_criteria` in a
|
|
17
17
|
* separate best-effort write at the ingest boundary, keyed to this grade's id. */
|
|
18
|
-
export declare function gradeToRow({ org_id, criteria: _criteria, ...g }: WireGrade, tenancy: Tenancy): Record<string, unknown>;
|
|
18
|
+
export declare function gradeToRow({ org_id, criteria: _criteria, idempotency_key: _idem, ...g }: WireGrade, tenancy: Tenancy): Record<string, unknown>;
|
|
19
19
|
/**
|
|
20
20
|
* Grades naming an org other than the presented key's. The ingest endpoint drops
|
|
21
21
|
* and COUNTS these so a caller cannot file a judgment into another tenant's corpus
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grade-mappers.d.ts","sourceRoot":"","sources":["../../src/telemetry/grade-mappers.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD;2EAC2E;AAC3E,wBAAgB,WAAW,CAAC,GAAG,EAAE,QAAQ,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"grade-mappers.d.ts","sourceRoot":"","sources":["../../src/telemetry/grade-mappers.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD;2EAC2E;AAC3E,wBAAgB,WAAW,CAAC,GAAG,EAAE,QAAQ,GAAG,SAAS,CAsBpD;AAED;;;kFAGkF;AAClF,wBAAgB,UAAU,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,eAAe,EAAE,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAoB9I;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,SAAS,SAAS,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAEhG"}
|
|
@@ -30,13 +30,16 @@ function toWireGrade(row) {
|
|
|
30
30
|
// F4: mirror the per-criterion breakdown iff present (spread-iff — a
|
|
31
31
|
// single-score grade's wire shape is byte-identical to pre-F4).
|
|
32
32
|
...(row.criteria !== undefined ? { criteria: row.criteria } : {}),
|
|
33
|
+
// ARC-3: the outcome's raw value rides iff set (non-outcome wire unchanged).
|
|
34
|
+
...(row.value !== undefined && row.value !== null ? { value: row.value } : {}),
|
|
35
|
+
...(row.idempotencyKey !== undefined ? { idempotency_key: row.idempotencyKey } : {}),
|
|
33
36
|
};
|
|
34
37
|
}
|
|
35
38
|
/** WireGrade → a grades row (the SDK's sole judgment write path). `criteria`
|
|
36
39
|
* (F4) is deliberately destructured OUT here: `public.grades` has no criteria
|
|
37
40
|
* column — the per-criterion breakdown fans out to `grade_criteria` in a
|
|
38
41
|
* separate best-effort write at the ingest boundary, keyed to this grade's id. */
|
|
39
|
-
function gradeToRow({ org_id, criteria: _criteria, ...g }, tenancy) {
|
|
42
|
+
function gradeToRow({ org_id, criteria: _criteria, idempotency_key: _idem, ...g }, tenancy) {
|
|
40
43
|
return {
|
|
41
44
|
org_id: org_id ?? tenancy.org_id,
|
|
42
45
|
project_id: tenancy.project_id,
|
|
@@ -52,6 +55,9 @@ function gradeToRow({ org_id, criteria: _criteria, ...g }, tenancy) {
|
|
|
52
55
|
source: g.source,
|
|
53
56
|
created_by: g.created_by,
|
|
54
57
|
ts: g.ts,
|
|
58
|
+
// ARC-3 (00089): `value` is written ONLY when present, so a non-outcome row
|
|
59
|
+
// never names the column (it would 42703 on a pre-00089 plane).
|
|
60
|
+
...(g.value !== undefined && g.value !== null ? { value: g.value } : {}),
|
|
55
61
|
};
|
|
56
62
|
}
|
|
57
63
|
/**
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* THE grade-task key (GRADE-RAW, grade-ux-plan.md §1 item 2) — which TASK a
|
|
3
|
+
* telemetry row is graded under. ONE helper; every grading surface (teaching
|
|
4
|
+
* feed, auto-grade enqueue, calibration subject attribution, the /grades
|
|
5
|
+
* rollup, the grader's subject loader and the ingest-side task registration)
|
|
6
|
+
* keys through it, so they can never disagree about where a call belongs.
|
|
7
|
+
*
|
|
8
|
+
* • A ROUTED call is graded under its route (`inferences.route`).
|
|
9
|
+
* • A raw-lane (`rig.runRaw`) or recorded (`rig.recordCall`) call stores
|
|
10
|
+
* `provider/model` in `inferences.route` — not a task anyone would write a
|
|
11
|
+
* grading guide for. Its task is the customer's step name, `tags.step`,
|
|
12
|
+
* when present and a valid task name. Otherwise it falls back to the route
|
|
13
|
+
* (honest: an unnamed raw call has no task of its own).
|
|
14
|
+
*
|
|
15
|
+
* The SDK's auto step key inside a run (`<provider>/<model>#<n>`) contains a
|
|
16
|
+
* `/`, so it is never a valid task name and never becomes a task — a grader is
|
|
17
|
+
* for a step the customer named.
|
|
18
|
+
*
|
|
19
|
+
* Pure, dependency-free (the server, the console and stampBatch import it).
|
|
20
|
+
*/
|
|
21
|
+
/** A task name is one URL path segment (`/v1/tasks/<task>/settings`): starts
|
|
22
|
+
* with a letter or digit, then letters, digits, `.`, `_`, `:` or `-`; at most
|
|
23
|
+
* 128 characters. No `/`, no spaces. */
|
|
24
|
+
export declare const TASK_NAME_PATTERN: RegExp;
|
|
25
|
+
/** The teaching copy every bad-name refusal uses (one wording, everywhere). */
|
|
26
|
+
export declare const TASK_NAME_RULE = "a task name starts with a letter or digit and then uses only letters, digits, '.', '_', ':' or '-' (max 128 chars, no '/' or spaces)";
|
|
27
|
+
/** At most this many NEW step tasks are registered per ingest batch (abuse
|
|
28
|
+
* cap: a batch cannot mint an unbounded number of task rows). Excess steps are
|
|
29
|
+
* not lost — they register on a later batch that carries them. */
|
|
30
|
+
export declare const MAX_REGISTERED_STEPS_PER_BATCH = 50;
|
|
31
|
+
export declare function isValidTaskName(value: unknown): value is string;
|
|
32
|
+
/** The minimal row shape the helper needs. `tags` may be the parsed object (wire
|
|
33
|
+
* rows, PostgREST reads) or the JSON text the local store keeps (`tagsJson`). */
|
|
34
|
+
export interface GradeTaskRow {
|
|
35
|
+
readonly route: string;
|
|
36
|
+
readonly tags?: unknown;
|
|
37
|
+
readonly tagsJson?: string;
|
|
38
|
+
}
|
|
39
|
+
/** The step a raw/recorded row names, or null (routed row, no step, or a step
|
|
40
|
+
* that is not a valid task name). */
|
|
41
|
+
export declare function stepTaskOf(row: GradeTaskRow): string | null;
|
|
42
|
+
/** The task a row is graded under: `tags.step` for a raw/recorded row that names
|
|
43
|
+
* a valid step, else `route`. */
|
|
44
|
+
export declare function gradeTaskOf(row: GradeTaskRow): string;
|
|
45
|
+
/** The distinct step tasks a batch of rows names, first-seen order, capped at
|
|
46
|
+
* {@link MAX_REGISTERED_STEPS_PER_BATCH}. Routed rows contribute nothing (route
|
|
47
|
+
* sync owns their task rows). */
|
|
48
|
+
export declare function registrableStepTasks(rows: readonly GradeTaskRow[], cap?: number): string[];
|
|
49
|
+
//# sourceMappingURL=grade-task.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"grade-task.d.ts","sourceRoot":"","sources":["../../src/telemetry/grade-task.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAIH;;wCAEwC;AACxC,eAAO,MAAM,iBAAiB,QAAwC,CAAC;AAEvE,+EAA+E;AAC/E,eAAO,MAAM,cAAc,yIAC6G,CAAC;AAEzI;;kEAEkE;AAClE,eAAO,MAAM,8BAA8B,KAAK,CAAC;AAEjD,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAE/D;AAED;iFACiF;AACjF,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B;AAeD;qCACqC;AACrC,wBAAgB,UAAU,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,GAAG,IAAI,CAI3D;AAED;iCACiC;AACjC,wBAAgB,WAAW,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAErD;AAED;;iCAEiC;AACjC,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,YAAY,EAAE,EAC7B,GAAG,GAAE,MAAuC,GAC3C,MAAM,EAAE,CAWV"}
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* THE grade-task key (GRADE-RAW, grade-ux-plan.md §1 item 2) — which TASK a
|
|
4
|
+
* telemetry row is graded under. ONE helper; every grading surface (teaching
|
|
5
|
+
* feed, auto-grade enqueue, calibration subject attribution, the /grades
|
|
6
|
+
* rollup, the grader's subject loader and the ingest-side task registration)
|
|
7
|
+
* keys through it, so they can never disagree about where a call belongs.
|
|
8
|
+
*
|
|
9
|
+
* • A ROUTED call is graded under its route (`inferences.route`).
|
|
10
|
+
* • A raw-lane (`rig.runRaw`) or recorded (`rig.recordCall`) call stores
|
|
11
|
+
* `provider/model` in `inferences.route` — not a task anyone would write a
|
|
12
|
+
* grading guide for. Its task is the customer's step name, `tags.step`,
|
|
13
|
+
* when present and a valid task name. Otherwise it falls back to the route
|
|
14
|
+
* (honest: an unnamed raw call has no task of its own).
|
|
15
|
+
*
|
|
16
|
+
* The SDK's auto step key inside a run (`<provider>/<model>#<n>`) contains a
|
|
17
|
+
* `/`, so it is never a valid task name and never becomes a task — a grader is
|
|
18
|
+
* for a step the customer named.
|
|
19
|
+
*
|
|
20
|
+
* Pure, dependency-free (the server, the console and stampBatch import it).
|
|
21
|
+
*/
|
|
22
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
23
|
+
exports.MAX_REGISTERED_STEPS_PER_BATCH = exports.TASK_NAME_RULE = exports.TASK_NAME_PATTERN = void 0;
|
|
24
|
+
exports.isValidTaskName = isValidTaskName;
|
|
25
|
+
exports.stepTaskOf = stepTaskOf;
|
|
26
|
+
exports.gradeTaskOf = gradeTaskOf;
|
|
27
|
+
exports.registrableStepTasks = registrableStepTasks;
|
|
28
|
+
const lanes_1 = require("./lanes");
|
|
29
|
+
/** A task name is one URL path segment (`/v1/tasks/<task>/settings`): starts
|
|
30
|
+
* with a letter or digit, then letters, digits, `.`, `_`, `:` or `-`; at most
|
|
31
|
+
* 128 characters. No `/`, no spaces. */
|
|
32
|
+
exports.TASK_NAME_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._:-]{0,127}$/;
|
|
33
|
+
/** The teaching copy every bad-name refusal uses (one wording, everywhere). */
|
|
34
|
+
exports.TASK_NAME_RULE = "a task name starts with a letter or digit and then uses only letters, digits, '.', '_', ':' or '-' (max 128 chars, no '/' or spaces)";
|
|
35
|
+
/** At most this many NEW step tasks are registered per ingest batch (abuse
|
|
36
|
+
* cap: a batch cannot mint an unbounded number of task rows). Excess steps are
|
|
37
|
+
* not lost — they register on a later batch that carries them. */
|
|
38
|
+
exports.MAX_REGISTERED_STEPS_PER_BATCH = 50;
|
|
39
|
+
function isValidTaskName(value) {
|
|
40
|
+
return typeof value === "string" && exports.TASK_NAME_PATTERN.test(value);
|
|
41
|
+
}
|
|
42
|
+
function tagsOf(row) {
|
|
43
|
+
let raw = row.tags;
|
|
44
|
+
if (raw === undefined && typeof row.tagsJson === "string")
|
|
45
|
+
raw = row.tagsJson;
|
|
46
|
+
if (typeof raw === "string") {
|
|
47
|
+
try {
|
|
48
|
+
raw = JSON.parse(raw);
|
|
49
|
+
}
|
|
50
|
+
catch {
|
|
51
|
+
return {};
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
return typeof raw === "object" && raw !== null && !Array.isArray(raw) ? raw : {};
|
|
55
|
+
}
|
|
56
|
+
/** The step a raw/recorded row names, or null (routed row, no step, or a step
|
|
57
|
+
* that is not a valid task name). */
|
|
58
|
+
function stepTaskOf(row) {
|
|
59
|
+
const tags = tagsOf(row);
|
|
60
|
+
if ((0, lanes_1.isRoutedLane)(tags.lane))
|
|
61
|
+
return null;
|
|
62
|
+
return isValidTaskName(tags.step) ? tags.step : null;
|
|
63
|
+
}
|
|
64
|
+
/** The task a row is graded under: `tags.step` for a raw/recorded row that names
|
|
65
|
+
* a valid step, else `route`. */
|
|
66
|
+
function gradeTaskOf(row) {
|
|
67
|
+
return stepTaskOf(row) ?? row.route;
|
|
68
|
+
}
|
|
69
|
+
/** The distinct step tasks a batch of rows names, first-seen order, capped at
|
|
70
|
+
* {@link MAX_REGISTERED_STEPS_PER_BATCH}. Routed rows contribute nothing (route
|
|
71
|
+
* sync owns their task rows). */
|
|
72
|
+
function registrableStepTasks(rows, cap = exports.MAX_REGISTERED_STEPS_PER_BATCH) {
|
|
73
|
+
const out = [];
|
|
74
|
+
const seen = new Set();
|
|
75
|
+
for (const row of rows) {
|
|
76
|
+
if (out.length >= cap)
|
|
77
|
+
break;
|
|
78
|
+
const step = stepTaskOf(row);
|
|
79
|
+
if (step === null || seen.has(step))
|
|
80
|
+
continue;
|
|
81
|
+
seen.add(step);
|
|
82
|
+
out.push(step);
|
|
83
|
+
}
|
|
84
|
+
return out;
|
|
85
|
+
}
|
|
@@ -16,7 +16,7 @@ import type Database from "better-sqlite3";
|
|
|
16
16
|
import type { GradeRow } from "../types/telemetry";
|
|
17
17
|
/** `CREATE TABLE IF NOT EXISTS grades …` — safe to run on every open. Mirrors
|
|
18
18
|
* `public.grades` minus the export-stamped columns (org handling below). */
|
|
19
|
-
export declare const GRADES_TABLE_SQL = "\nCREATE TABLE IF NOT EXISTS grades (\n id TEXT PRIMARY KEY,\n ts TEXT,\n subject_kind TEXT NOT NULL CHECK (subject_kind IN ('inference','run','artifact')),\n subject_id TEXT NOT NULL,\n score REAL NOT NULL,\n scale_max REAL,\n scale_label TEXT,\n comment TEXT,\n kind TEXT NOT NULL CHECK (kind IN ('human','model-judge','deterministic')),\n grader TEXT,\n source TEXT,\n org_id TEXT,\n created_by TEXT,\n criteria TEXT\n);\nCREATE INDEX IF NOT EXISTS idx_grades_subject ON grades (subject_kind, subject_id);\n";
|
|
19
|
+
export declare const GRADES_TABLE_SQL = "\nCREATE TABLE IF NOT EXISTS grades (\n id TEXT PRIMARY KEY,\n ts TEXT,\n subject_kind TEXT NOT NULL CHECK (subject_kind IN ('inference','run','artifact')),\n subject_id TEXT NOT NULL,\n score REAL NOT NULL,\n scale_max REAL,\n scale_label TEXT,\n comment TEXT,\n kind TEXT NOT NULL CHECK (kind IN ('human','model-judge','deterministic','outcome')),\n grader TEXT,\n source TEXT,\n org_id TEXT,\n created_by TEXT,\n criteria TEXT,\n value REAL,\n idempotency_key TEXT\n);\nCREATE INDEX IF NOT EXISTS idx_grades_subject ON grades (subject_kind, subject_id);\n";
|
|
20
20
|
/** The row shape as it sits in SQLite (snake_case, nullable columns as read back). */
|
|
21
21
|
export interface GradeDbRow {
|
|
22
22
|
id: string;
|
|
@@ -35,6 +35,11 @@ export interface GradeDbRow {
|
|
|
35
35
|
/** JSON-encoded per-criterion breakdown (call-qa F4), or null for a
|
|
36
36
|
* single-score grade / a row written before the v16 rung. */
|
|
37
37
|
criteria: string | null;
|
|
38
|
+
/** ARC-3 (v17): the raw outcome value, or null (every non-outcome grade, and
|
|
39
|
+
* any row written before the v17 rung). */
|
|
40
|
+
value: number | null;
|
|
41
|
+
/** ARC-3 L3 (v17): an outcome's idempotency key, or null. */
|
|
42
|
+
idempotency_key: string | null;
|
|
38
43
|
}
|
|
39
44
|
/** Prepare the grade insert statement against an open handle. INSERT OR IGNORE:
|
|
40
45
|
* a grade id is unique, and a re-inserted id (e.g. the backfill racing a live
|
|
@@ -53,4 +58,14 @@ export declare function backfillGradesFromFeedback(db: Database.Database): void;
|
|
|
53
58
|
* (grade primitive, GP-1). Same mapping as migration 00070's evaluation leg.
|
|
54
59
|
* Idempotent. Runs when the artifact store opens (it owns that table). */
|
|
55
60
|
export declare function backfillGradesFromEvaluations(db: Database.Database): void;
|
|
61
|
+
/** v17 (ARC-3, mirrors 00089): widen the local `grades.kind` CHECK with
|
|
62
|
+
* `'outcome'` and add the nullable `value` column. SQLite cannot ALTER a CHECK,
|
|
63
|
+
* so a table whose stored DDL lacks `'outcome'` is REBUILT into the current
|
|
64
|
+
* shape (= GRADES_TABLE_SQL) with every column AND the rowid copied (the v15
|
|
65
|
+
* pattern, plus rowid preservation so the exporter's `:grades` rowid watermark
|
|
66
|
+
* neither re-exports nor skips a row); a table
|
|
67
|
+
* that already allows it only gains `value` if absent. Idempotent: guarded on
|
|
68
|
+
* the stored DDL + `table_info`, so a re-open no-ops. No grades table ⇒ no-op
|
|
69
|
+
* (SCHEMA_SQL creates the current shape). */
|
|
70
|
+
export declare function migrateGradesToV17(db: Database.Database): void;
|
|
56
71
|
//# sourceMappingURL=grades-sql.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grades-sql.d.ts","sourceRoot":"","sources":["../../src/telemetry/grades-sql.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAkB,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnE;4EAC4E;AAC5E,eAAO,MAAM,gBAAgB,
|
|
1
|
+
{"version":3,"file":"grades-sql.d.ts","sourceRoot":"","sources":["../../src/telemetry/grades-sql.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAkB,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnE;4EAC4E;AAC5E,eAAO,MAAM,gBAAgB,gpBAoB5B,CAAC;AAEF,sFAAsF;AACtF,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B;iEAC6D;IAC7D,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB;+CAC2C;IAC3C,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,6DAA6D;IAC7D,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC;AAWD;;iCAEiC;AACjC,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAE5E;AAED,8DAA8D;AAC9D,wBAAgB,eAAe,CAAC,GAAG,EAAE,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAsBtE;AAED,sDAAsD;AACtD,wBAAgB,UAAU,CAAC,CAAC,EAAE,UAAU,GAAG,QAAQ,CAyBlD;AAcD;;;yCAGyC;AACzC,wBAAgB,0BAA0B,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAetE;AAED;;0EAE0E;AAC1E,wBAAgB,6BAA6B,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAgBzE;AAED;;;;;;;;6CAQ6C;AAC7C,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAwC9D"}
|
|
@@ -20,6 +20,7 @@ exports.gradeBindParams = gradeBindParams;
|
|
|
20
20
|
exports.toGradeRow = toGradeRow;
|
|
21
21
|
exports.backfillGradesFromFeedback = backfillGradesFromFeedback;
|
|
22
22
|
exports.backfillGradesFromEvaluations = backfillGradesFromEvaluations;
|
|
23
|
+
exports.migrateGradesToV17 = migrateGradesToV17;
|
|
23
24
|
/** `CREATE TABLE IF NOT EXISTS grades …` — safe to run on every open. Mirrors
|
|
24
25
|
* `public.grades` minus the export-stamped columns (org handling below). */
|
|
25
26
|
exports.GRADES_TABLE_SQL = `
|
|
@@ -32,22 +33,24 @@ CREATE TABLE IF NOT EXISTS grades (
|
|
|
32
33
|
scale_max REAL,
|
|
33
34
|
scale_label TEXT,
|
|
34
35
|
comment TEXT,
|
|
35
|
-
kind TEXT NOT NULL CHECK (kind IN ('human','model-judge','deterministic')),
|
|
36
|
+
kind TEXT NOT NULL CHECK (kind IN ('human','model-judge','deterministic','outcome')),
|
|
36
37
|
grader TEXT,
|
|
37
38
|
source TEXT,
|
|
38
39
|
org_id TEXT,
|
|
39
40
|
created_by TEXT,
|
|
40
|
-
criteria TEXT
|
|
41
|
+
criteria TEXT,
|
|
42
|
+
value REAL,
|
|
43
|
+
idempotency_key TEXT
|
|
41
44
|
);
|
|
42
45
|
CREATE INDEX IF NOT EXISTS idx_grades_subject ON grades (subject_kind, subject_id);
|
|
43
46
|
`;
|
|
44
47
|
const INSERT_GRADE_SQL = `
|
|
45
48
|
INSERT OR IGNORE INTO grades (
|
|
46
49
|
id, ts, subject_kind, subject_id, score, scale_max, scale_label, comment,
|
|
47
|
-
kind, grader, source, org_id, created_by, criteria
|
|
50
|
+
kind, grader, source, org_id, created_by, criteria, value, idempotency_key
|
|
48
51
|
) VALUES (
|
|
49
52
|
@id, @ts, @subject_kind, @subject_id, @score, @scale_max, @scale_label, @comment,
|
|
50
|
-
@kind, @grader, @source, @org_id, @created_by, @criteria
|
|
53
|
+
@kind, @grader, @source, @org_id, @created_by, @criteria, @value, @idempotency_key
|
|
51
54
|
)`;
|
|
52
55
|
/** Prepare the grade insert statement against an open handle. INSERT OR IGNORE:
|
|
53
56
|
* a grade id is unique, and a re-inserted id (e.g. the backfill racing a live
|
|
@@ -75,6 +78,8 @@ function gradeBindParams(row) {
|
|
|
75
78
|
// single-score grade). One column, no sidecar table locally — the server is
|
|
76
79
|
// where it fans out to `grade_criteria`.
|
|
77
80
|
criteria: row.criteria !== undefined ? JSON.stringify(row.criteria) : null,
|
|
81
|
+
value: row.value ?? null,
|
|
82
|
+
idempotency_key: row.idempotencyKey ?? null,
|
|
78
83
|
};
|
|
79
84
|
}
|
|
80
85
|
/** Read one SQLite grade row back into a GradeRow. */
|
|
@@ -98,6 +103,10 @@ function toGradeRow(r) {
|
|
|
98
103
|
// byte-identical for a plain grade. A malformed value degrades to absent
|
|
99
104
|
// rather than throwing on the export read.
|
|
100
105
|
...parseCriteriaColumn(r.criteria),
|
|
106
|
+
// ARC-3: spread-iff — a null value (every non-outcome grade) leaves the field
|
|
107
|
+
// ABSENT so the exported wire stays byte-identical for a plain grade.
|
|
108
|
+
...(r.value !== null && r.value !== undefined ? { value: r.value } : {}),
|
|
109
|
+
...(typeof r.idempotency_key === "string" ? { idempotencyKey: r.idempotency_key } : {}),
|
|
101
110
|
};
|
|
102
111
|
}
|
|
103
112
|
/** Narrow the stored JSON `criteria` column to a spread-iff-present GradeRow
|
|
@@ -154,3 +163,54 @@ function backfillGradesFromEvaluations(db) {
|
|
|
154
163
|
WHERE COALESCE(e.artifact_id, e.run_id) IS NOT NULL
|
|
155
164
|
`);
|
|
156
165
|
}
|
|
166
|
+
/** v17 (ARC-3, mirrors 00089): widen the local `grades.kind` CHECK with
|
|
167
|
+
* `'outcome'` and add the nullable `value` column. SQLite cannot ALTER a CHECK,
|
|
168
|
+
* so a table whose stored DDL lacks `'outcome'` is REBUILT into the current
|
|
169
|
+
* shape (= GRADES_TABLE_SQL) with every column AND the rowid copied (the v15
|
|
170
|
+
* pattern, plus rowid preservation so the exporter's `:grades` rowid watermark
|
|
171
|
+
* neither re-exports nor skips a row); a table
|
|
172
|
+
* that already allows it only gains `value` if absent. Idempotent: guarded on
|
|
173
|
+
* the stored DDL + `table_info`, so a re-open no-ops. No grades table ⇒ no-op
|
|
174
|
+
* (SCHEMA_SQL creates the current shape). */
|
|
175
|
+
function migrateGradesToV17(db) {
|
|
176
|
+
const cols = db.prepare("PRAGMA table_info(grades)").all();
|
|
177
|
+
if (cols.length === 0)
|
|
178
|
+
return;
|
|
179
|
+
const ddl = db.prepare("SELECT sql FROM sqlite_master WHERE type = 'table' AND name = 'grades'").get()?.sql ?? "";
|
|
180
|
+
if (ddl.includes("'outcome'")) {
|
|
181
|
+
if (!cols.some((c) => c.name === "value"))
|
|
182
|
+
db.exec("ALTER TABLE grades ADD COLUMN value REAL");
|
|
183
|
+
if (!cols.some((c) => c.name === "idempotency_key"))
|
|
184
|
+
db.exec("ALTER TABLE grades ADD COLUMN idempotency_key TEXT");
|
|
185
|
+
return;
|
|
186
|
+
}
|
|
187
|
+
const hasCriteria = cols.some((c) => c.name === "criteria");
|
|
188
|
+
const copied = "id, ts, subject_kind, subject_id, score, scale_max, scale_label, comment, kind, grader, source, org_id, created_by";
|
|
189
|
+
// L7: ONE transaction — a crash mid-rebuild rolls back to the intact v16 table
|
|
190
|
+
// (never a dropped `grades` with the rows stranded in grades_v17).
|
|
191
|
+
db.transaction(() => db.exec(`
|
|
192
|
+
CREATE TABLE grades_v17 (
|
|
193
|
+
id TEXT PRIMARY KEY,
|
|
194
|
+
ts TEXT,
|
|
195
|
+
subject_kind TEXT NOT NULL CHECK (subject_kind IN ('inference','run','artifact')),
|
|
196
|
+
subject_id TEXT NOT NULL,
|
|
197
|
+
score REAL NOT NULL,
|
|
198
|
+
scale_max REAL,
|
|
199
|
+
scale_label TEXT,
|
|
200
|
+
comment TEXT,
|
|
201
|
+
kind TEXT NOT NULL CHECK (kind IN ('human','model-judge','deterministic','outcome')),
|
|
202
|
+
grader TEXT,
|
|
203
|
+
source TEXT,
|
|
204
|
+
org_id TEXT,
|
|
205
|
+
created_by TEXT,
|
|
206
|
+
criteria TEXT,
|
|
207
|
+
value REAL,
|
|
208
|
+
idempotency_key TEXT
|
|
209
|
+
);
|
|
210
|
+
INSERT OR IGNORE INTO grades_v17 (rowid, ${copied}${hasCriteria ? ", criteria" : ""})
|
|
211
|
+
SELECT rowid, ${copied}${hasCriteria ? ", criteria" : ""} FROM grades ORDER BY rowid;
|
|
212
|
+
DROP TABLE grades;
|
|
213
|
+
ALTER TABLE grades_v17 RENAME TO grades;
|
|
214
|
+
CREATE INDEX IF NOT EXISTS idx_grades_subject ON grades (subject_kind, subject_id);
|
|
215
|
+
`))();
|
|
216
|
+
}
|
|
@@ -123,7 +123,7 @@ export interface WireGrade {
|
|
|
123
123
|
readonly scale_max: number | null;
|
|
124
124
|
readonly scale_label: string | null;
|
|
125
125
|
readonly comment: string | null;
|
|
126
|
-
readonly kind: "human" | "model-judge" | "deterministic";
|
|
126
|
+
readonly kind: "human" | "model-judge" | "deterministic" | "outcome";
|
|
127
127
|
readonly grader: string | null;
|
|
128
128
|
readonly source: string | null;
|
|
129
129
|
readonly created_by: string | null;
|
|
@@ -144,6 +144,14 @@ export interface WireGrade {
|
|
|
144
144
|
}[];
|
|
145
145
|
readonly comment?: string;
|
|
146
146
|
}[];
|
|
147
|
+
/** ARC-3 (00089): the raw business value of an OUTCOME grade. Carried
|
|
148
|
+
* spread-iff-present (only `kind: "outcome"` rows), so every other grade's
|
|
149
|
+
* wire shape is byte-identical to pre-ARC; the server refuses it on any other
|
|
150
|
+
* kind and refuses outcome rows entirely until 00089 is applied (503). */
|
|
151
|
+
readonly value?: number | null;
|
|
152
|
+
/** ARC-3 L3: an outcome's idempotency key — the server re-derives the grade id
|
|
153
|
+
* as outcomeGradeId(key org, name, idempotency_key). Never written to a column. */
|
|
154
|
+
readonly idempotency_key?: string;
|
|
147
155
|
}
|
|
148
156
|
export interface WireEnvelope {
|
|
149
157
|
readonly envelope_key: string;
|
|
@@ -330,6 +338,21 @@ export interface StampOptions {
|
|
|
330
338
|
readonly declaredBundles?: boolean;
|
|
331
339
|
}
|
|
332
340
|
export declare function stampBatch(batch: IngestBatch, tenancy: Tenancy, opts?: StampOptions): TableWrite[];
|
|
341
|
+
/**
|
|
342
|
+
* GRADE-RAW (grade-ux-plan §1 item 1): the step-task registration write for a
|
|
343
|
+
* batch — a raw-lane or recorded call that names a step (`tags.step`) registers
|
|
344
|
+
* that step as a task, so a grading guide can be written for it. Or null when
|
|
345
|
+
* the batch names no step.
|
|
346
|
+
*
|
|
347
|
+
* DELIBERATELY NOT part of `stampBatch` (architect S2-1): it is a BEST-EFFORT
|
|
348
|
+
* write both sinks issue only AFTER the batch's rows are confirmed, with any
|
|
349
|
+
* error swallowed — a refused registration must never turn a batch of
|
|
350
|
+
* inferences into a poison-skipped 422. merge=false (ignore-duplicates on the
|
|
351
|
+
* PK): it never rewrites an existing row (a route-synced task, or a step's
|
|
352
|
+
* settings/guide); a retry is a no-op. Tenant from the PRINCIPAL only (T3).
|
|
353
|
+
* Capped per batch (registrableStepTasks).
|
|
354
|
+
*/
|
|
355
|
+
export declare function stepTaskRegistration(batch: IngestBatch, tenancy: Tenancy): TableWrite | null;
|
|
333
356
|
/** What `/v1/ingest` answers. Counts only — a per-row error list on a
|
|
334
357
|
* fire-and-forget telemetry path is a payload nobody reads and a leak surface
|
|
335
358
|
* nobody audits. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ingest-protocol.d.ts","sourceRoot":"","sources":["../../src/telemetry/ingest-protocol.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"ingest-protocol.d.ts","sourceRoot":"","sources":["../../src/telemetry/ingest-protocol.ts"],"names":[],"mappings":"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"}
|