@plumbus/core 0.8.0-beta.0 → 0.8.0-beta.10
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 +197 -0
- package/README.md +8 -1
- package/dist/.tsbuildinfo +1 -1
- package/dist/ai/ai/cost-tracker.d.ts +22 -2
- package/dist/ai/ai/model-pricing.d.ts +8 -2
- package/dist/ai/ai/openai-strict-schema.d.ts +84 -0
- package/dist/ai/ai/provider.d.ts +90 -6
- package/dist/ai/ai-service.d.ts +53 -1
- package/dist/ai/ai-service.d.ts.map +1 -1
- package/dist/ai/ai-service.js +550 -119
- package/dist/ai/ai-service.js.map +1 -1
- package/dist/ai/cost-tracker.d.ts +22 -2
- package/dist/ai/cost-tracker.d.ts.map +1 -1
- package/dist/ai/cost-tracker.js +59 -20
- package/dist/ai/cost-tracker.js.map +1 -1
- package/dist/ai/explainability.d.ts +2 -1
- package/dist/ai/explainability.d.ts.map +1 -1
- package/dist/ai/explainability.js +1 -0
- package/dist/ai/explainability.js.map +1 -1
- package/dist/ai/index.d.ts +2 -2
- package/dist/ai/index.d.ts.map +1 -1
- package/dist/ai/index.js +1 -1
- package/dist/ai/index.js.map +1 -1
- package/dist/ai/model-pricing.d.ts +8 -2
- package/dist/ai/model-pricing.d.ts.map +1 -1
- package/dist/ai/model-pricing.js +113 -15
- package/dist/ai/model-pricing.js.map +1 -1
- package/dist/ai/openai-strict-schema.d.ts +85 -0
- package/dist/ai/openai-strict-schema.d.ts.map +1 -0
- package/dist/ai/openai-strict-schema.js +730 -0
- package/dist/ai/openai-strict-schema.js.map +1 -0
- package/dist/ai/prompt-overrides.d.ts +19 -0
- package/dist/ai/prompt-overrides.d.ts.map +1 -0
- package/dist/ai/prompt-overrides.js +60 -0
- package/dist/ai/prompt-overrides.js.map +1 -0
- package/dist/ai/provider-failure.d.ts +9 -0
- package/dist/ai/provider-failure.d.ts.map +1 -0
- package/dist/ai/provider-failure.js +112 -0
- package/dist/ai/provider-failure.js.map +1 -0
- package/dist/ai/provider.d.ts +90 -6
- package/dist/ai/provider.d.ts.map +1 -1
- package/dist/ai/provider.js +546 -97
- package/dist/ai/provider.js.map +1 -1
- package/dist/ai/rag/pipeline.d.ts +21 -1
- package/dist/ai/rag/pipeline.d.ts.map +1 -1
- package/dist/ai/rag/pipeline.js +17 -1
- package/dist/ai/rag/pipeline.js.map +1 -1
- package/dist/ai/tool-loop.d.ts +8 -1
- package/dist/ai/tool-loop.d.ts.map +1 -1
- package/dist/ai/tool-loop.js +7 -0
- package/dist/ai/tool-loop.js.map +1 -1
- package/dist/ai/types/config.d.ts +13 -0
- package/dist/ai/types/fields.d.ts +6 -0
- package/dist/ai/types/prompt.d.ts +9 -0
- package/dist/ai/usage-validation.d.ts.map +1 -1
- package/dist/ai/usage-validation.js +6 -1
- package/dist/ai/usage-validation.js.map +1 -1
- package/dist/ai/validation.d.ts +7 -3
- package/dist/ai/validation.d.ts.map +1 -1
- package/dist/ai/validation.js +38 -25
- package/dist/ai/validation.js.map +1 -1
- package/dist/ai/zod-to-provider-schema.d.ts.map +1 -1
- package/dist/ai/zod-to-provider-schema.js +246 -16
- package/dist/ai/zod-to-provider-schema.js.map +1 -1
- package/dist/api/route-generator.d.ts +2 -12
- package/dist/api/route-generator.d.ts.map +1 -1
- package/dist/api/route-generator.js +33 -41
- package/dist/api/route-generator.js.map +1 -1
- package/dist/approvals/index.d.ts +1 -1
- package/dist/approvals/index.d.ts.map +1 -1
- package/dist/approvals/index.js.map +1 -1
- package/dist/approvals/memory-store.d.ts.map +1 -1
- package/dist/approvals/memory-store.js +22 -0
- package/dist/approvals/memory-store.js.map +1 -1
- package/dist/approvals/schema.d.ts +34 -0
- package/dist/approvals/schema.d.ts.map +1 -1
- package/dist/approvals/schema.js +2 -0
- package/dist/approvals/schema.js.map +1 -1
- package/dist/approvals/service.d.ts.map +1 -1
- package/dist/approvals/service.js +36 -0
- package/dist/approvals/service.js.map +1 -1
- package/dist/approvals/sql-store.d.ts.map +1 -1
- package/dist/approvals/sql-store.js +42 -1
- package/dist/approvals/sql-store.js.map +1 -1
- package/dist/approvals/types.d.ts +11 -0
- package/dist/approvals/types.d.ts.map +1 -1
- package/dist/approvals/types.js +1 -0
- package/dist/approvals/types.js.map +1 -1
- package/dist/audit/service.d.ts.map +1 -1
- package/dist/audit/service.js +22 -2
- package/dist/audit/service.js.map +1 -1
- package/dist/cli/cli.d.ts.map +1 -1
- package/dist/cli/cli.js +2 -1
- package/dist/cli/cli.js.map +1 -1
- package/dist/cli/commands/browser-extension.d.ts +16 -0
- package/dist/cli/commands/browser-extension.d.ts.map +1 -1
- package/dist/cli/commands/browser-extension.js +16 -5
- package/dist/cli/commands/browser-extension.js.map +1 -1
- package/dist/cli/commands/dev.d.ts.map +1 -1
- package/dist/cli/commands/dev.js +7 -1
- package/dist/cli/commands/dev.js.map +1 -1
- package/dist/cli/commands/e2e.d.ts +12 -0
- package/dist/cli/commands/e2e.d.ts.map +1 -1
- package/dist/cli/commands/e2e.js +11 -0
- package/dist/cli/commands/e2e.js.map +1 -1
- package/dist/cli/commands/generate-openapi-from-zod.d.ts.map +1 -1
- package/dist/cli/commands/generate-openapi-from-zod.js +9 -1
- package/dist/cli/commands/generate-openapi-from-zod.js.map +1 -1
- package/dist/cli/commands/index.d.ts +1 -0
- package/dist/cli/commands/index.d.ts.map +1 -1
- package/dist/cli/commands/index.js +1 -0
- package/dist/cli/commands/index.js.map +1 -1
- package/dist/cli/commands/init.d.ts +1 -1
- package/dist/cli/commands/init.d.ts.map +1 -1
- package/dist/cli/commands/init.js +63 -3
- package/dist/cli/commands/init.js.map +1 -1
- package/dist/cli/commands/migrate.d.ts.map +1 -1
- package/dist/cli/commands/migrate.js +8 -14
- package/dist/cli/commands/migrate.js.map +1 -1
- package/dist/cli/commands/payments.d.ts +56 -0
- package/dist/cli/commands/payments.d.ts.map +1 -0
- package/dist/cli/commands/payments.js +184 -0
- package/dist/cli/commands/payments.js.map +1 -0
- package/dist/cli/commands/run.d.ts.map +1 -1
- package/dist/cli/commands/run.js +2 -7
- package/dist/cli/commands/run.js.map +1 -1
- package/dist/cli/commands/seed.d.ts.map +1 -1
- package/dist/cli/commands/seed.js +2 -7
- package/dist/cli/commands/seed.js.map +1 -1
- package/dist/cli/commands/start.d.ts.map +1 -1
- package/dist/cli/commands/start.js +9 -1
- package/dist/cli/commands/start.js.map +1 -1
- package/dist/cli/commands/worker.js +1 -1
- package/dist/cli/commands/worker.js.map +1 -1
- package/dist/cli/discover.d.ts +2 -0
- package/dist/cli/discover.d.ts.map +1 -1
- package/dist/cli/discover.js +39 -5
- package/dist/cli/discover.js.map +1 -1
- package/dist/config/loader.d.ts +4 -1
- package/dist/config/loader.d.ts.map +1 -1
- package/dist/config/loader.js +112 -24
- package/dist/config/loader.js.map +1 -1
- package/dist/data/connection.d.ts +23 -0
- package/dist/data/connection.d.ts.map +1 -1
- package/dist/data/connection.js +23 -6
- package/dist/data/connection.js.map +1 -1
- package/dist/data/schema-generator.d.ts.map +1 -1
- package/dist/data/schema-generator.js +2 -2
- package/dist/data/schema-generator.js.map +1 -1
- package/dist/define/definePrompt.d.ts.map +1 -1
- package/dist/define/definePrompt.js +6 -0
- package/dist/define/definePrompt.js.map +1 -1
- package/dist/durable/index.d.ts +2 -2
- package/dist/durable/index.d.ts.map +1 -1
- package/dist/durable/index.js +2 -2
- package/dist/durable/index.js.map +1 -1
- package/dist/durable/postgres-persist.d.ts +47 -2
- package/dist/durable/postgres-persist.d.ts.map +1 -1
- package/dist/durable/postgres-persist.js +152 -6
- package/dist/durable/postgres-persist.js.map +1 -1
- package/dist/durable/spine-claim.d.ts +22 -1
- package/dist/durable/spine-claim.d.ts.map +1 -1
- package/dist/durable/spine-claim.js +54 -3
- package/dist/durable/spine-claim.js.map +1 -1
- package/dist/errors/http.d.ts.map +1 -1
- package/dist/errors/http.js +9 -1
- package/dist/errors/http.js.map +1 -1
- package/dist/events/dispatcher.d.ts +20 -0
- package/dist/events/dispatcher.d.ts.map +1 -1
- package/dist/events/dispatcher.js +61 -26
- package/dist/events/dispatcher.js.map +1 -1
- package/dist/events/pipeline-audit.d.ts +14 -0
- package/dist/events/pipeline-audit.d.ts.map +1 -0
- package/dist/events/pipeline-audit.js +29 -0
- package/dist/events/pipeline-audit.js.map +1 -0
- package/dist/events/worker.d.ts +3 -0
- package/dist/events/worker.d.ts.map +1 -1
- package/dist/events/worker.js +14 -14
- package/dist/events/worker.js.map +1 -1
- package/dist/execution/capability-error-hook.d.ts +24 -0
- package/dist/execution/capability-error-hook.d.ts.map +1 -0
- package/dist/execution/capability-error-hook.js +17 -0
- package/dist/execution/capability-error-hook.js.map +1 -0
- package/dist/execution/capability-executor.d.ts +2 -2
- package/dist/execution/capability-executor.d.ts.map +1 -1
- package/dist/execution/capability-executor.js +45 -7
- package/dist/execution/capability-executor.js.map +1 -1
- package/dist/execution/context-factory.d.ts.map +1 -1
- package/dist/execution/context-factory.js +9 -1
- package/dist/execution/context-factory.js.map +1 -1
- package/dist/execution/deferred-flow-service.d.ts.map +1 -1
- package/dist/execution/deferred-flow-service.js +7 -0
- package/dist/execution/deferred-flow-service.js.map +1 -1
- package/dist/execution/index.d.ts +1 -0
- package/dist/execution/index.d.ts.map +1 -1
- package/dist/execution/index.js.map +1 -1
- package/dist/fields/index.d.ts +7 -0
- package/dist/fields/index.d.ts.map +1 -1
- package/dist/fields/index.js +10 -1
- package/dist/fields/index.js.map +1 -1
- package/dist/flows/dead-letter.d.ts +18 -1
- package/dist/flows/dead-letter.d.ts.map +1 -1
- package/dist/flows/dead-letter.js +17 -1
- package/dist/flows/dead-letter.js.map +1 -1
- package/dist/flows/engine.d.ts +16 -1
- package/dist/flows/engine.d.ts.map +1 -1
- package/dist/flows/engine.js +218 -29
- package/dist/flows/engine.js.map +1 -1
- package/dist/flows/flow-service.d.ts.map +1 -1
- package/dist/flows/flow-service.js +3 -0
- package/dist/flows/flow-service.js.map +1 -1
- package/dist/flows/step-executor.d.ts +8 -0
- package/dist/flows/step-executor.d.ts.map +1 -1
- package/dist/flows/step-executor.js.map +1 -1
- package/dist/index.d.ts +4 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/runtime/bootstrap.d.ts +18 -1
- package/dist/runtime/bootstrap.d.ts.map +1 -1
- package/dist/runtime/bootstrap.js +36 -5
- package/dist/runtime/bootstrap.js.map +1 -1
- package/dist/runtime/load-extensions.d.ts +2 -1
- package/dist/runtime/load-extensions.d.ts.map +1 -1
- package/dist/runtime/load-extensions.js +49 -1
- package/dist/runtime/load-extensions.js.map +1 -1
- package/dist/runtime/register-consumers.d.ts +3 -0
- package/dist/runtime/register-consumers.d.ts.map +1 -1
- package/dist/runtime/register-consumers.js +27 -6
- package/dist/runtime/register-consumers.js.map +1 -1
- package/dist/runtime/start-worker-pool.d.ts.map +1 -1
- package/dist/runtime/start-worker-pool.js +36 -15
- package/dist/runtime/start-worker-pool.js.map +1 -1
- package/dist/server/bootstrap.d.ts +42 -16
- package/dist/server/bootstrap.d.ts.map +1 -1
- package/dist/server/bootstrap.js +91 -21
- package/dist/server/bootstrap.js.map +1 -1
- package/dist/testing/context.d.ts +2 -0
- package/dist/testing/context.d.ts.map +1 -1
- package/dist/testing/context.js +8 -3
- package/dist/testing/context.js.map +1 -1
- package/dist/testing/field-validation.d.ts.map +1 -1
- package/dist/testing/field-validation.js +3 -0
- package/dist/testing/field-validation.js.map +1 -1
- package/dist/types/config.d.ts +13 -0
- package/dist/types/config.d.ts.map +1 -1
- package/dist/types/context.d.ts +70 -4
- package/dist/types/context.d.ts.map +1 -1
- package/dist/types/fields.d.ts +6 -0
- package/dist/types/fields.d.ts.map +1 -1
- package/dist/types/index.d.ts +1 -1
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/index.js.map +1 -1
- package/dist/types/prompt.d.ts +9 -0
- package/dist/types/prompt.d.ts.map +1 -1
- package/dist/worker/bootstrap.d.ts +19 -0
- package/dist/worker/bootstrap.d.ts.map +1 -1
- package/dist/worker/bootstrap.js +156 -84
- package/dist/worker/bootstrap.js.map +1 -1
- package/instructions/README.md +4 -1
- package/instructions/ai-classification.md +132 -0
- package/instructions/ai.md +94 -15
- package/instructions/cli.md +19 -1
- package/instructions/entities.md +3 -1
- package/instructions/flows.md +6 -0
- package/instructions/framework.md +13 -3
- package/instructions/peer-dependencies.md +2 -1
- package/instructions/prompts.md +2 -1
- package/migrations/durable-tenant/0002_approval_cancellation.sql +3 -0
- package/migrations/durable-tenant/meta/_journal.json +7 -0
- package/package.json +5 -4
- package/dist/ai/__typecheck-fixtures__/legacy-cost-api.d.ts +0 -5
- package/dist/ai/__typecheck-fixtures__/legacy-cost-api.d.ts.map +0 -1
- package/dist/ai/__typecheck-fixtures__/legacy-cost-api.js +0 -15
- package/dist/ai/__typecheck-fixtures__/legacy-cost-api.js.map +0 -1
package/dist/ai/validation.d.ts
CHANGED
|
@@ -9,9 +9,10 @@ export interface ValidatedResponse<T> {
|
|
|
9
9
|
attempts: number;
|
|
10
10
|
usage: TokenUsage;
|
|
11
11
|
/**
|
|
12
|
-
* Sum of
|
|
13
|
-
*
|
|
14
|
-
* to
|
|
12
|
+
* Sum of per-attempt costs: each attempt's `ProviderResponse.cost`, else the
|
|
13
|
+
* catalog price of that attempt's own usage, so long-context tiers apply per
|
|
14
|
+
* request. Omitted when an attempt's cost is unknown so callers fall back to
|
|
15
|
+
* `calculateModelCost`.
|
|
15
16
|
*/
|
|
16
17
|
cost?: number;
|
|
17
18
|
}
|
|
@@ -31,6 +32,8 @@ export declare class AIValidationError extends Error {
|
|
|
31
32
|
readonly model: string;
|
|
32
33
|
/** Resolved provider name when the error was thrown (empty string if unknown). */
|
|
33
34
|
readonly provider: string;
|
|
35
|
+
/** Cost of the attempts in `usage`, priced per attempt like `ValidatedResponse.cost`. */
|
|
36
|
+
readonly cost?: number;
|
|
34
37
|
constructor(input: {
|
|
35
38
|
attempts: number;
|
|
36
39
|
rawOutput: string | null;
|
|
@@ -38,6 +41,7 @@ export declare class AIValidationError extends Error {
|
|
|
38
41
|
usage?: TokenUsage;
|
|
39
42
|
model?: string;
|
|
40
43
|
provider?: string;
|
|
44
|
+
cost?: number;
|
|
41
45
|
});
|
|
42
46
|
}
|
|
43
47
|
export declare function generateWithValidation<T>(provider: AIProviderAdapter, request: ProviderRequest, schema: z.ZodType<T>, config?: ValidationRetryConfig & {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/ai/validation.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/ai/validation.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAG/D,OAAO,KAAK,EACV,iBAAiB,EACjB,eAAe,EAEf,UAAU,EACX,MAAM,eAAe,CAAC;AAGvB,MAAM,WAAW,qBAAsB,SAAQ,mBAAmB;CAAG;AAErE,MAAM,WAAW,iBAAiB,CAAC,CAAC;IAClC,IAAI,EAAE,CAAC,CAAC;IACR,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,UAAU,CAAC;IAClB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1C;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,+EAA+E;IAC/E,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,kFAAkF;IAClF,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,yFAAyF;IACzF,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;gBAEX,KAAK,EAAE;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;QACzB,SAAS,EAAE,KAAK,GAAG,IAAI,CAAC;QACxB,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,IAAI,CAAC,EAAE,MAAM,CAAC;KACf;CAaF;AAoMD,wBAAsB,sBAAsB,CAAC,CAAC,EAC5C,QAAQ,EAAE,iBAAiB,EAC3B,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EACpB,MAAM,CAAC,EAAE,qBAAqB,GAAG;IAC/B;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GACA,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAiG/B"}
|
package/dist/ai/validation.js
CHANGED
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
// Validates AI responses against Zod schemas, retries on mismatch
|
|
3
3
|
import { parse as parseJsonc } from 'jsonc-parser';
|
|
4
4
|
import { z } from 'zod';
|
|
5
|
+
import { restoreOmittedOptionalProperties } from './openai-strict-schema.js';
|
|
6
|
+
import { estimateModelCost } from './model-pricing.js';
|
|
5
7
|
import { AIIncompleteOutputError } from './refusal.js';
|
|
6
8
|
export class AIValidationError extends Error {
|
|
7
9
|
attempts;
|
|
@@ -19,6 +21,8 @@ export class AIValidationError extends Error {
|
|
|
19
21
|
model;
|
|
20
22
|
/** Resolved provider name when the error was thrown (empty string if unknown). */
|
|
21
23
|
provider;
|
|
24
|
+
/** Cost of the attempts in `usage`, priced per attempt like `ValidatedResponse.cost`. */
|
|
25
|
+
cost;
|
|
22
26
|
constructor(input) {
|
|
23
27
|
super(`AI output validation failed after ${input.attempts} attempts: ${input.lastError?.message}`);
|
|
24
28
|
this.name = 'AIValidationError';
|
|
@@ -28,6 +32,7 @@ export class AIValidationError extends Error {
|
|
|
28
32
|
this.usage = input.usage ?? { inputTokens: 0, outputTokens: 0, totalTokens: 0 };
|
|
29
33
|
this.model = input.model ?? '';
|
|
30
34
|
this.provider = input.provider ?? '';
|
|
35
|
+
this.cost = input.cost;
|
|
31
36
|
}
|
|
32
37
|
}
|
|
33
38
|
function stripMarkdownCodeFence(content) {
|
|
@@ -179,6 +184,23 @@ function parseStructuredResponse(content) {
|
|
|
179
184
|
throw lastError;
|
|
180
185
|
}
|
|
181
186
|
}
|
|
187
|
+
/**
|
|
188
|
+
* The usage of the attempts so far plus one more. `reasoningTokens` is summed once any attempt
|
|
189
|
+
* reports it (OpenAI reasoning models), and left out when none does.
|
|
190
|
+
*/
|
|
191
|
+
function addAttemptUsage(total, next) {
|
|
192
|
+
const reasoning = total.reasoningTokens === undefined && next.reasoningTokens === undefined
|
|
193
|
+
? undefined
|
|
194
|
+
: (total.reasoningTokens ?? 0) + (next.reasoningTokens ?? 0);
|
|
195
|
+
return {
|
|
196
|
+
inputTokens: total.inputTokens + next.inputTokens,
|
|
197
|
+
outputTokens: total.outputTokens + next.outputTokens,
|
|
198
|
+
totalTokens: total.totalTokens + next.totalTokens,
|
|
199
|
+
cachedInputTokens: (total.cachedInputTokens ?? 0) + (next.cachedInputTokens ?? 0),
|
|
200
|
+
cacheWriteTokens: (total.cacheWriteTokens ?? 0) + (next.cacheWriteTokens ?? 0),
|
|
201
|
+
...(reasoning === undefined ? {} : { reasoningTokens: reasoning }),
|
|
202
|
+
};
|
|
203
|
+
}
|
|
182
204
|
export async function generateWithValidation(provider, request, schema, config) {
|
|
183
205
|
const maxRetries = config?.maxRetries ?? 2;
|
|
184
206
|
const feedbackOnError = config?.feedbackOnError ?? true;
|
|
@@ -188,7 +210,7 @@ export async function generateWithValidation(provider, request, schema, config)
|
|
|
188
210
|
// schema validation, so we switch to text mode and skip JSON parsing.
|
|
189
211
|
const textOutput = isStringOutputSchema(schema);
|
|
190
212
|
let totalUsage = { inputTokens: 0, outputTokens: 0, totalTokens: 0 };
|
|
191
|
-
let
|
|
213
|
+
let totalCost = 0;
|
|
192
214
|
let lastError = null;
|
|
193
215
|
let lastRawOutput = null;
|
|
194
216
|
let currentPrompt = request.prompt;
|
|
@@ -217,41 +239,31 @@ export async function generateWithValidation(provider, request, schema, config)
|
|
|
217
239
|
provider: config?.provider ?? provider.name,
|
|
218
240
|
model: config?.model ?? response.model,
|
|
219
241
|
partialText: response.content,
|
|
220
|
-
usage:
|
|
221
|
-
inputTokens: totalUsage.inputTokens + response.usage.inputTokens,
|
|
222
|
-
outputTokens: totalUsage.outputTokens + response.usage.outputTokens,
|
|
223
|
-
totalTokens: totalUsage.totalTokens + response.usage.totalTokens,
|
|
224
|
-
cachedInputTokens: (totalUsage.cachedInputTokens ?? 0) + (response.usage.cachedInputTokens ?? 0),
|
|
225
|
-
cacheWriteTokens: (totalUsage.cacheWriteTokens ?? 0) + (response.usage.cacheWriteTokens ?? 0),
|
|
226
|
-
},
|
|
242
|
+
usage: addAttemptUsage(totalUsage, response.usage),
|
|
227
243
|
finishReason: response.finishReason,
|
|
228
244
|
});
|
|
229
245
|
}
|
|
230
|
-
totalUsage =
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
};
|
|
237
|
-
if (response.cost != null) {
|
|
238
|
-
totalProviderCost = (totalProviderCost ?? 0) + response.cost;
|
|
239
|
-
}
|
|
240
|
-
else {
|
|
241
|
-
// Mixed / missing adapter costs → force catalog fallback at the service layer.
|
|
242
|
-
totalProviderCost = undefined;
|
|
243
|
-
}
|
|
246
|
+
totalUsage = addAttemptUsage(totalUsage, response.usage);
|
|
247
|
+
// Price each attempt on its own usage: a long-context threshold applies per
|
|
248
|
+
// request, so pricing the summed usage once could cross one no request crossed.
|
|
249
|
+
const attemptCost = response.cost ??
|
|
250
|
+
estimateModelCost(response.usage.inputTokens, response.usage.outputTokens, config?.model ?? response.model, response.usage);
|
|
251
|
+
totalCost = totalCost == null || attemptCost == null ? undefined : totalCost + attemptCost;
|
|
244
252
|
try {
|
|
245
253
|
const parsed = textOutput ? response.content : parseStructuredResponse(response.content);
|
|
246
|
-
|
|
254
|
+
// OpenAI strict mode answers an omitted optional property with null; drop those nulls so
|
|
255
|
+
// `.optional()` fields validate (identity for answers that already fit the schema).
|
|
256
|
+
const result = schema.parse(request.responseSchema && !textOutput
|
|
257
|
+
? restoreOmittedOptionalProperties(parsed, request.responseSchema)
|
|
258
|
+
: parsed);
|
|
247
259
|
const validated = {
|
|
248
260
|
data: result,
|
|
249
261
|
raw: response.content,
|
|
250
262
|
attempts: attempt,
|
|
251
263
|
usage: totalUsage,
|
|
252
264
|
};
|
|
253
|
-
if (
|
|
254
|
-
validated.cost =
|
|
265
|
+
if (totalCost != null)
|
|
266
|
+
validated.cost = totalCost;
|
|
255
267
|
return validated;
|
|
256
268
|
}
|
|
257
269
|
catch (err) {
|
|
@@ -268,6 +280,7 @@ export async function generateWithValidation(provider, request, schema, config)
|
|
|
268
280
|
usage: totalUsage,
|
|
269
281
|
model: config?.model ?? '',
|
|
270
282
|
provider: config?.provider ?? provider.name,
|
|
283
|
+
cost: totalCost,
|
|
271
284
|
});
|
|
272
285
|
}
|
|
273
286
|
//# sourceMappingURL=validation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/ai/validation.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,kEAAkE;AAElE,OAAO,EAAmB,KAAK,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/ai/validation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zod-to-provider-schema.d.ts","sourceRoot":"","sources":["../../src/ai/zod-to-provider-schema.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"zod-to-provider-schema.d.ts","sourceRoot":"","sources":["../../src/ai/zod-to-provider-schema.ts"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAiB7B,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,mBAAmB,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,yBAAyB;IACxC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,uBAAwB,SAAQ,KAAK;IAChD,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;gBAEjB,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;CAKjD;AAsaD,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,CAAC,CAAC,UAAU,EACvB,OAAO,GAAE,yBAA8B,GACtC,wBAAwB,CAkC1B"}
|
|
@@ -1,4 +1,30 @@
|
|
|
1
|
-
|
|
1
|
+
// ── Provider-neutral structured-output schema ──
|
|
2
|
+
// `zodToProviderJsonSchema` turns a Zod schema into the JSON Schema subset Anthropic and Bedrock
|
|
3
|
+
// document for structured outputs (Anthropic "JSON Schema limitations", Bedrock "Supported JSON
|
|
4
|
+
// Schema features"): basic types, `enum`, `const`, `anyOf`, `allOf`, `default`, `required`,
|
|
5
|
+
// `additionalProperties: false`, ten string formats, `minItems` 0 or 1, and simple patterns.
|
|
6
|
+
// Anthropic and Bedrock receive it as it is; the OpenAI adapter projects it onto strict mode
|
|
7
|
+
// (`toOpenAIStrictOutputSchema`). Where zod-to-json-schema emits something outside that subset or
|
|
8
|
+
// something no answer can satisfy, the schema is rewritten here, once, for every provider:
|
|
9
|
+
//
|
|
10
|
+
// - An intersection of objects (`a.and(b)`) is merged into one object (`structuralSchema`): as
|
|
11
|
+
// `allOf`, each member would carry `additionalProperties: false` and refuse the other's keys.
|
|
12
|
+
// Union branches the intersection rules out (the `{ not: {} }` of `b.optional()`, the null of
|
|
13
|
+
// `b.nullable()`) are dropped.
|
|
14
|
+
// - `z.string().cidr()` lists its IPv4 and IPv6 patterns in `allOf` (both would have to match);
|
|
15
|
+
// they become an `anyOf` of the two.
|
|
16
|
+
// - A non-capturing group `(?:…)` in a pattern is sent as a plain group, which matches the same.
|
|
17
|
+
// - The `{ not: {} }` branch of a `.optional()` that is not an object property (the root, an array
|
|
18
|
+
// item, a union member) is dropped: no JSON value is "absent".
|
|
19
|
+
// - A union's sibling keywords (the `type` of `z.string().ip()`) go into each branch, and a
|
|
20
|
+
// string's `type` into each member of its patterns' `allOf`, so every branch and member is a
|
|
21
|
+
// whole schema.
|
|
22
|
+
// - A tuple (`prefixItems`, which neither provider lists) becomes an array of its item schemas,
|
|
23
|
+
// with the order and length named in the description.
|
|
24
|
+
//
|
|
25
|
+
// The Zod output schema still validates the original.
|
|
26
|
+
import { zodPatterns, zodToJsonSchema } from 'zod-to-json-schema';
|
|
27
|
+
import { mergeTwoSchemas, structuralSchema } from './openai-strict-schema.js';
|
|
2
28
|
const allowedStringFormats = new Set([
|
|
3
29
|
'date-time',
|
|
4
30
|
'time',
|
|
@@ -48,6 +74,161 @@ function hasUnsupportedRegex(pattern) {
|
|
|
48
74
|
/\{\d{4,}(?:,\d*)?\}/.test(pattern) ||
|
|
49
75
|
/\{\d+,\d{4,}\}/.test(pattern));
|
|
50
76
|
}
|
|
77
|
+
/**
|
|
78
|
+
* `pattern` with each non-capturing group `(?:…)` written as a plain group `(…)`, which matches
|
|
79
|
+
* the same strings. Anthropic documents groups `(...)` and not `(?:`, which `hasUnsupportedRegex`
|
|
80
|
+
* therefore refuses, and zod-to-json-schema's own patterns use it (the IPv4 half of
|
|
81
|
+
* `z.string().cidr()`, `.base64()`), so without this those patterns were only described. A pattern
|
|
82
|
+
* with a backreference is left as it is: numbering its groups differently would change it.
|
|
83
|
+
*/
|
|
84
|
+
function withPlainGroups(pattern) {
|
|
85
|
+
if (/\\[1-9]|\\k</.test(pattern))
|
|
86
|
+
return pattern;
|
|
87
|
+
let result = '';
|
|
88
|
+
let inClass = false;
|
|
89
|
+
for (let index = 0; index < pattern.length; index += 1) {
|
|
90
|
+
const char = pattern[index];
|
|
91
|
+
if (char === '\\') {
|
|
92
|
+
result += pattern.slice(index, index + 2);
|
|
93
|
+
index += 1;
|
|
94
|
+
}
|
|
95
|
+
else if (inClass) {
|
|
96
|
+
if (char === ']')
|
|
97
|
+
inClass = false;
|
|
98
|
+
result += char;
|
|
99
|
+
}
|
|
100
|
+
else if (char === '[') {
|
|
101
|
+
inClass = true;
|
|
102
|
+
result += char;
|
|
103
|
+
}
|
|
104
|
+
else if (char === '(' && pattern.startsWith('?:', index + 1)) {
|
|
105
|
+
result += '(';
|
|
106
|
+
index += 2;
|
|
107
|
+
}
|
|
108
|
+
else {
|
|
109
|
+
result += char;
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
return result;
|
|
113
|
+
}
|
|
114
|
+
/** `{ not: {} }`: the branch zod-to-json-schema gives `.optional()` outside an object property. */
|
|
115
|
+
function isUnmatchable(schema) {
|
|
116
|
+
return (isRecord(schema) &&
|
|
117
|
+
Object.keys(schema).length === 1 &&
|
|
118
|
+
isRecord(schema.not) &&
|
|
119
|
+
Object.keys(schema.not).length === 0);
|
|
120
|
+
}
|
|
121
|
+
/** An object schema, or a union or intersection with one among its members. */
|
|
122
|
+
function isObjectLike(schema) {
|
|
123
|
+
if (!isRecord(schema))
|
|
124
|
+
return false;
|
|
125
|
+
if (schema.type === 'object' || isRecord(schema.properties))
|
|
126
|
+
return true;
|
|
127
|
+
return ['anyOf', 'allOf'].some((key) => {
|
|
128
|
+
const members = schema[key];
|
|
129
|
+
return Array.isArray(members) && members.some(isObjectLike);
|
|
130
|
+
});
|
|
131
|
+
}
|
|
132
|
+
/** Keys a union node may carry beside `anyOf` without them constraining its branches. */
|
|
133
|
+
const unionAnnotationKeys = new Set(['anyOf', 'description', 'title', 'default']);
|
|
134
|
+
const ipv4CidrPattern = zodPatterns.ipv4Cidr.source;
|
|
135
|
+
const ipv6CidrPattern = zodPatterns.ipv6Cidr.source;
|
|
136
|
+
function isOnlyPattern(schema, pattern) {
|
|
137
|
+
return isRecord(schema) && Object.keys(schema).length === 1 && schema.pattern === pattern;
|
|
138
|
+
}
|
|
139
|
+
/**
|
|
140
|
+
* `allOf` members with the IPv4 and IPv6 patterns zod-to-json-schema lists, one after the other,
|
|
141
|
+
* for `z.string().cidr()` replaced by one `anyOf` of the two: Zod accepts either version, and an
|
|
142
|
+
* `allOf` would require both, which no string does.
|
|
143
|
+
*/
|
|
144
|
+
function joinCidrAlternatives(members) {
|
|
145
|
+
const joined = [];
|
|
146
|
+
for (let index = 0; index < members.length; index += 1) {
|
|
147
|
+
const member = members[index];
|
|
148
|
+
const next = members[index + 1];
|
|
149
|
+
if (isOnlyPattern(member, ipv4CidrPattern) && isOnlyPattern(next, ipv6CidrPattern)) {
|
|
150
|
+
joined.push({ anyOf: [member, next] });
|
|
151
|
+
index += 1;
|
|
152
|
+
}
|
|
153
|
+
else {
|
|
154
|
+
joined.push(member);
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
return joined;
|
|
158
|
+
}
|
|
159
|
+
/** A short name for a tuple item's schema, for the tuple's description. */
|
|
160
|
+
function describeItem(schema) {
|
|
161
|
+
if (!isRecord(schema))
|
|
162
|
+
return 'any value';
|
|
163
|
+
if (Object.hasOwn(schema, 'const'))
|
|
164
|
+
return JSON.stringify(schema.const);
|
|
165
|
+
if (Array.isArray(schema.enum))
|
|
166
|
+
return schema.enum.map((value) => JSON.stringify(value)).join(' | ');
|
|
167
|
+
if (Array.isArray(schema.anyOf))
|
|
168
|
+
return schema.anyOf.map(describeItem).join(' | ');
|
|
169
|
+
const types = Array.isArray(schema.type) ? schema.type : [schema.type];
|
|
170
|
+
const names = types.filter((type) => typeof type === 'string');
|
|
171
|
+
if (names.length === 0)
|
|
172
|
+
return 'any value';
|
|
173
|
+
return names
|
|
174
|
+
.map((type) => type === 'object' && isRecord(schema.properties) && Object.keys(schema.properties).length > 0
|
|
175
|
+
? `object with ${Object.keys(schema.properties).join(', ')}`
|
|
176
|
+
: type)
|
|
177
|
+
.join(' | ');
|
|
178
|
+
}
|
|
179
|
+
/**
|
|
180
|
+
* Rewrite a tuple (draft-7 `items: [...]` with `additionalItems`, or `prefixItems` with `items`)
|
|
181
|
+
* as an array whose `items` is its item schemas (an `anyOf` when they differ), and name the order
|
|
182
|
+
* and length in the description (mutates `schema`). Neither Anthropic nor Bedrock lists
|
|
183
|
+
* `prefixItems` among the supported keywords (Anthropic: "Array constraints beyond `minItems` of 0
|
|
184
|
+
* or 1" are not supported), nor does OpenAI strict mode. The Zod output schema still checks each
|
|
185
|
+
* position and the length.
|
|
186
|
+
*/
|
|
187
|
+
function projectTuple(schema, path, state) {
|
|
188
|
+
const positional = (Array.isArray(schema.prefixItems) ? schema.prefixItems : schema.items);
|
|
189
|
+
const rawRest = Array.isArray(schema.prefixItems) ? schema.items : schema.additionalItems;
|
|
190
|
+
delete schema.prefixItems;
|
|
191
|
+
delete schema.items;
|
|
192
|
+
delete schema.additionalItems;
|
|
193
|
+
delete schema.maxItems;
|
|
194
|
+
const elements = normalizeArray(positional ?? [], `${path}.items`, state);
|
|
195
|
+
const rest = rawRest === undefined || rawRest === false
|
|
196
|
+
? undefined
|
|
197
|
+
: normalizeSchemaNode(rawRest, `${path}.additionalItems`, state);
|
|
198
|
+
const options = [];
|
|
199
|
+
const seen = new Set();
|
|
200
|
+
for (const option of rest === undefined ? elements : [...elements, rest]) {
|
|
201
|
+
const key = JSON.stringify(option);
|
|
202
|
+
if (seen.has(key))
|
|
203
|
+
continue;
|
|
204
|
+
seen.add(key);
|
|
205
|
+
options.push(option);
|
|
206
|
+
}
|
|
207
|
+
if (options.length === 1) {
|
|
208
|
+
schema.items = options[0];
|
|
209
|
+
}
|
|
210
|
+
else if (options.length > 1) {
|
|
211
|
+
state.unionParameterCount += 1;
|
|
212
|
+
schema.items = { anyOf: options };
|
|
213
|
+
}
|
|
214
|
+
const count = elements.length;
|
|
215
|
+
if (count > 0)
|
|
216
|
+
schema.minItems = 1;
|
|
217
|
+
else
|
|
218
|
+
delete schema.minItems;
|
|
219
|
+
const order = elements
|
|
220
|
+
.map((element, index) => `(${index + 1}) ${describeItem(element)}`)
|
|
221
|
+
.join('; ');
|
|
222
|
+
const noun = count === 1 ? 'item' : 'items';
|
|
223
|
+
if (rest === undefined) {
|
|
224
|
+
appendDescription(schema, count === 0
|
|
225
|
+
? 'Must be empty.'
|
|
226
|
+
: `Must hold exactly ${count} ${noun}, in this order: ${order}.`);
|
|
227
|
+
}
|
|
228
|
+
else if (count > 0) {
|
|
229
|
+
appendDescription(schema, `Must start with ${count} ${noun}, in this order: ${order}; then any number of: ${describeItem(rest)}.`);
|
|
230
|
+
}
|
|
231
|
+
}
|
|
51
232
|
function normalizeArray(value, path, state) {
|
|
52
233
|
return value.map((item, index) => normalizeSchemaNode(item, `${path}[${index}]`, state));
|
|
53
234
|
}
|
|
@@ -61,12 +242,47 @@ function normalizeSchemaNode(value, path, state) {
|
|
|
61
242
|
if (!isRecord(value)) {
|
|
62
243
|
return value;
|
|
63
244
|
}
|
|
64
|
-
|
|
245
|
+
let schema = {};
|
|
65
246
|
for (const [key, child] of Object.entries(value)) {
|
|
66
247
|
if (key === '$schema')
|
|
67
248
|
continue;
|
|
68
249
|
schema[key] = child;
|
|
69
250
|
}
|
|
251
|
+
if (Array.isArray(schema.allOf)) {
|
|
252
|
+
for (const child of schema.allOf) {
|
|
253
|
+
if (isRecord(child) && '$ref' in child) {
|
|
254
|
+
fail(`allOf with $ref is not supported at ${path}`, state);
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
const members = joinCidrAlternatives(schema.allOf);
|
|
258
|
+
if (members.some(isObjectLike)) {
|
|
259
|
+
// An intersection of objects: one object (or one union of objects) with every member's
|
|
260
|
+
// properties and `required` keys, normalized as such below.
|
|
261
|
+
const merged = structuralSchema({ ...schema, allOf: members });
|
|
262
|
+
if (!Array.isArray(merged.allOf))
|
|
263
|
+
return normalizeSchemaNode(merged, path, state);
|
|
264
|
+
}
|
|
265
|
+
const [only] = members;
|
|
266
|
+
if (members.length === 1 &&
|
|
267
|
+
isRecord(only) &&
|
|
268
|
+
Array.isArray(only.anyOf) &&
|
|
269
|
+
Object.keys(only).length === 1 &&
|
|
270
|
+
!('anyOf' in schema)) {
|
|
271
|
+
// `z.string().cidr()` alone: its two patterns are the node's union.
|
|
272
|
+
delete schema.allOf;
|
|
273
|
+
schema.anyOf = only.anyOf;
|
|
274
|
+
}
|
|
275
|
+
else {
|
|
276
|
+
// A string's patterns (`.regex(a).regex(b)`, `.cidr().startsWith(…)`): each member gets the
|
|
277
|
+
// node's `type`, as each union branch does below, so every member is a whole schema (the
|
|
278
|
+
// cidr alternatives inside one pass it on to their branches).
|
|
279
|
+
const { type } = schema;
|
|
280
|
+
schema.allOf =
|
|
281
|
+
type === undefined
|
|
282
|
+
? members
|
|
283
|
+
: members.map((member) => isRecord(member) && !('type' in member) ? { type, ...member } : member);
|
|
284
|
+
}
|
|
285
|
+
}
|
|
70
286
|
if (Array.isArray(schema.enum)) {
|
|
71
287
|
if (schema.enum.length === 0)
|
|
72
288
|
fail(`empty enum is not supported at ${path}`, state);
|
|
@@ -77,6 +293,23 @@ function normalizeSchemaNode(value, path, state) {
|
|
|
77
293
|
if (Array.isArray(schema.anyOf)) {
|
|
78
294
|
if (schema.anyOf.length === 0)
|
|
79
295
|
fail(`empty anyOf is not supported at ${path}`, state);
|
|
296
|
+
const reachable = schema.anyOf.filter((branch) => !isUnmatchable(branch));
|
|
297
|
+
if (reachable.length === 0) {
|
|
298
|
+
fail(`anyOf has no branch a JSON value can match at ${path}`, state);
|
|
299
|
+
}
|
|
300
|
+
if (reachable.length === 1 && reachable.length < schema.anyOf.length) {
|
|
301
|
+
// `.optional()` outside an object property: the value itself.
|
|
302
|
+
const { anyOf: _optional, ...siblings } = schema;
|
|
303
|
+
const [branch] = reachable;
|
|
304
|
+
return normalizeSchemaNode(isRecord(branch) ? mergeTwoSchemas(siblings, branch) : branch, path, state);
|
|
305
|
+
}
|
|
306
|
+
schema.anyOf = reachable;
|
|
307
|
+
// A keyword next to the union constrains every branch (the `type` of `z.string().ip()` or of
|
|
308
|
+
// `z.string().cidr()`): each branch gets it, so every branch is a whole schema.
|
|
309
|
+
if (!Array.isArray(schema.allOf) &&
|
|
310
|
+
Object.keys(schema).some((key) => !unionAnnotationKeys.has(key))) {
|
|
311
|
+
schema = structuralSchema(schema);
|
|
312
|
+
}
|
|
80
313
|
state.unionParameterCount += 1;
|
|
81
314
|
schema.anyOf = normalizeArray(schema.anyOf, `${path}.anyOf`, state);
|
|
82
315
|
}
|
|
@@ -88,11 +321,6 @@ function normalizeSchemaNode(value, path, state) {
|
|
|
88
321
|
delete schema.oneOf;
|
|
89
322
|
}
|
|
90
323
|
if (Array.isArray(schema.allOf)) {
|
|
91
|
-
for (const child of schema.allOf) {
|
|
92
|
-
if (isRecord(child) && '$ref' in child) {
|
|
93
|
-
fail(`allOf with $ref is not supported at ${path}`, state);
|
|
94
|
-
}
|
|
95
|
-
}
|
|
96
324
|
schema.allOf = normalizeArray(schema.allOf, `${path}.allOf`, state);
|
|
97
325
|
}
|
|
98
326
|
if (Array.isArray(schema.type)) {
|
|
@@ -124,16 +352,12 @@ function normalizeSchemaNode(value, path, state) {
|
|
|
124
352
|
}
|
|
125
353
|
}
|
|
126
354
|
if (schema.type === 'array' || 'items' in schema || 'prefixItems' in schema) {
|
|
127
|
-
if (Array.isArray(schema.items)) {
|
|
128
|
-
|
|
129
|
-
delete schema.items;
|
|
355
|
+
if (Array.isArray(schema.items) || Array.isArray(schema.prefixItems)) {
|
|
356
|
+
projectTuple(schema, path, state);
|
|
130
357
|
}
|
|
131
358
|
else if ('items' in schema) {
|
|
132
359
|
schema.items = normalizeSchemaNode(schema.items, `${path}.items`, state);
|
|
133
360
|
}
|
|
134
|
-
if (Array.isArray(schema.prefixItems)) {
|
|
135
|
-
schema.prefixItems = normalizeArray(schema.prefixItems, `${path}.prefixItems`, state);
|
|
136
|
-
}
|
|
137
361
|
if (typeof schema.minItems === 'number' && schema.minItems > 1) {
|
|
138
362
|
appendDescription(schema, `Must contain at least ${schema.minItems} items.`);
|
|
139
363
|
schema.minItems = 1;
|
|
@@ -146,9 +370,15 @@ function normalizeSchemaNode(value, path, state) {
|
|
|
146
370
|
appendDescription(schema, `Expected string format: ${schema.format}.`);
|
|
147
371
|
delete schema.format;
|
|
148
372
|
}
|
|
149
|
-
if (typeof schema.pattern === 'string'
|
|
150
|
-
|
|
151
|
-
|
|
373
|
+
if (typeof schema.pattern === 'string') {
|
|
374
|
+
const pattern = withPlainGroups(schema.pattern);
|
|
375
|
+
if (hasUnsupportedRegex(pattern)) {
|
|
376
|
+
appendDescription(schema, `Must match pattern: ${schema.pattern}.`);
|
|
377
|
+
delete schema.pattern;
|
|
378
|
+
}
|
|
379
|
+
else {
|
|
380
|
+
schema.pattern = pattern;
|
|
381
|
+
}
|
|
152
382
|
}
|
|
153
383
|
stripConstraint(schema, 'minimum', (constraint) => `Must be at least ${constraint}.`);
|
|
154
384
|
stripConstraint(schema, 'maximum', (constraint) => `Must be at most ${constraint}.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zod-to-provider-schema.js","sourceRoot":"","sources":["../../src/ai/zod-to-provider-schema.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"zod-to-provider-schema.js","sourceRoot":"","sources":["../../src/ai/zod-to-provider-schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import type { AuthAdapter } from '../auth/adapter.js';
|
|
|
4
4
|
import type { RequestAuthenticator } from '../auth/http-authentication.js';
|
|
5
5
|
import type { EventQueue } from '../events/queue.js';
|
|
6
6
|
import { type IdempotencyStore } from './idempotency.js';
|
|
7
|
+
import { type CapabilityErrorInfo } from '../execution/capability-error-hook.js';
|
|
7
8
|
import type { ContextDependencies } from '../execution/context-factory.js';
|
|
8
9
|
import type { CapabilityContract } from '../types/capability.js';
|
|
9
10
|
import type { ExecutionContext } from '../types/context.js';
|
|
@@ -77,18 +78,7 @@ export interface RouteGeneratorConfig {
|
|
|
77
78
|
/** Locales supported by registered translation definitions */
|
|
78
79
|
supportedLocales?: string[];
|
|
79
80
|
/** Called when a capability execution fails */
|
|
80
|
-
onCapabilityError?: (info:
|
|
81
|
-
capabilityName: string;
|
|
82
|
-
domain: string;
|
|
83
|
-
errorCode: string;
|
|
84
|
-
errorMessage: string;
|
|
85
|
-
metadata?: Record<string, unknown>;
|
|
86
|
-
userId?: string;
|
|
87
|
-
tenantId?: string;
|
|
88
|
-
sourceIp?: string;
|
|
89
|
-
userAgent?: string;
|
|
90
|
-
db?: PostgresJsDatabase;
|
|
91
|
-
}) => void | Promise<void>;
|
|
81
|
+
onCapabilityError?: (info: CapabilityErrorInfo) => void | Promise<void>;
|
|
92
82
|
}
|
|
93
83
|
export declare function registerCapabilityRoute(app: FastifyInstance, capability: CapabilityContract, config: RouteGeneratorConfig): void;
|
|
94
84
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route-generator.d.ts","sourceRoot":"","sources":["../../src/api/route-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAgC,MAAM,SAAS,CAAC;AAE7E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"route-generator.d.ts","sourceRoot":"","sources":["../../src/api/route-generator.ts"],"names":[],"mappings":"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"}
|