@open-everywhere/adapters 0.7.0 → 0.8.1
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/agent/aws/sso.ts +0 -2
- package/agent/instrumentation.ts +67 -4
- package/agent/model/approval-judge.ts +3 -3
- package/agent/model/dream-judge.ts +8 -6
- package/agent/model/gateway-probe.ts +97 -11
- package/agent/model/gateway-vision.ts +10 -6
- package/agent/model/gateway.ts +448 -34
- package/agent/model/meeting-gateway.ts +37 -7
- package/agent/model/model-config-check.ts +243 -0
- package/agent/model/target-url.ts +38 -0
- package/agent/model/transcription-routes.ts +18 -4
- package/agent/oe-oauth/errors.ts +1 -1
- package/agent/oe-oauth/token-vault.ts +99 -29
- package/agent/oe-oauth/user-auth-flow.ts +4 -3
- package/agent/operator-holders.ts +47 -0
- package/agent/postgres/neon.ts +1 -1
- package/dist/agent/aws/sso.d.ts +1 -2
- package/dist/agent/aws/sso.d.ts.map +1 -1
- package/dist/agent/aws/sso.js +0 -2
- package/dist/agent/aws/sso.js.map +1 -1
- package/dist/agent/instrumentation.d.ts +23 -1
- package/dist/agent/instrumentation.d.ts.map +1 -1
- package/dist/agent/instrumentation.js +59 -3
- package/dist/agent/instrumentation.js.map +1 -1
- package/dist/agent/model/approval-judge.d.ts.map +1 -1
- package/dist/agent/model/approval-judge.js +3 -3
- package/dist/agent/model/approval-judge.js.map +1 -1
- package/dist/agent/model/dream-judge.d.ts +2 -0
- package/dist/agent/model/dream-judge.d.ts.map +1 -1
- package/dist/agent/model/dream-judge.js +6 -4
- package/dist/agent/model/dream-judge.js.map +1 -1
- package/dist/agent/model/gateway-probe.d.ts +22 -4
- package/dist/agent/model/gateway-probe.d.ts.map +1 -1
- package/dist/agent/model/gateway-probe.js +78 -11
- package/dist/agent/model/gateway-probe.js.map +1 -1
- package/dist/agent/model/gateway-vision.d.ts +4 -2
- package/dist/agent/model/gateway-vision.d.ts.map +1 -1
- package/dist/agent/model/gateway-vision.js +6 -4
- package/dist/agent/model/gateway-vision.js.map +1 -1
- package/dist/agent/model/gateway.d.ts +85 -12
- package/dist/agent/model/gateway.d.ts.map +1 -1
- package/dist/agent/model/gateway.js +418 -30
- package/dist/agent/model/gateway.js.map +1 -1
- package/dist/agent/model/meeting-gateway.d.ts +8 -2
- package/dist/agent/model/meeting-gateway.d.ts.map +1 -1
- package/dist/agent/model/meeting-gateway.js +29 -7
- package/dist/agent/model/meeting-gateway.js.map +1 -1
- package/dist/agent/model/model-config-check.d.ts +57 -0
- package/dist/agent/model/model-config-check.d.ts.map +1 -0
- package/dist/agent/model/model-config-check.js +207 -0
- package/dist/agent/model/model-config-check.js.map +1 -0
- package/dist/agent/model/target-url.d.ts +10 -0
- package/dist/agent/model/target-url.d.ts.map +1 -0
- package/dist/agent/model/target-url.js +32 -0
- package/dist/agent/model/target-url.js.map +1 -0
- package/dist/agent/model/transcription-routes.d.ts +3 -0
- package/dist/agent/model/transcription-routes.d.ts.map +1 -1
- package/dist/agent/model/transcription-routes.js +16 -4
- package/dist/agent/model/transcription-routes.js.map +1 -1
- package/dist/agent/oe-oauth/errors.d.ts +0 -7
- package/dist/agent/oe-oauth/errors.d.ts.map +1 -1
- package/dist/agent/oe-oauth/errors.js +1 -1
- package/dist/agent/oe-oauth/errors.js.map +1 -1
- package/dist/agent/oe-oauth/token-vault.d.ts +4 -3
- package/dist/agent/oe-oauth/token-vault.d.ts.map +1 -1
- package/dist/agent/oe-oauth/token-vault.js +88 -24
- package/dist/agent/oe-oauth/token-vault.js.map +1 -1
- package/dist/agent/oe-oauth/user-auth-flow.d.ts.map +1 -1
- package/dist/agent/oe-oauth/user-auth-flow.js +3 -2
- package/dist/agent/oe-oauth/user-auth-flow.js.map +1 -1
- package/dist/agent/operator-holders.d.ts +13 -0
- package/dist/agent/operator-holders.d.ts.map +1 -0
- package/dist/agent/operator-holders.js +40 -0
- package/dist/agent/operator-holders.js.map +1 -0
- package/dist/agent/postgres/neon.d.ts +0 -15
- package/dist/agent/postgres/neon.d.ts.map +1 -1
- package/dist/agent/postgres/neon.js +1 -1
- package/dist/agent/postgres/neon.js.map +1 -1
- package/package.json +19 -2
package/dist/agent/aws/sso.js
CHANGED
|
@@ -2,8 +2,6 @@
|
|
|
2
2
|
// `sso:GetRoleCredentials`, so the portal bounds the call by that person's own entitlement. Zero npm deps.
|
|
3
3
|
import { warmCredential, encryptedKvVault, requireAwsSsoLinkStore, checkAwsSsoIdentityBinding, OE_AWS_SSO_CALLBACK_PATH, } from "@open-everywhere/core/agent/adapter-api.js";
|
|
4
4
|
import { makePkce, makeState } from "../oe-oauth/pkce.js";
|
|
5
|
-
// Core owns the canonical const; re-exported here so this module's existing consumers keep resolving it.
|
|
6
|
-
export { OE_AWS_SSO_CALLBACK_PATH };
|
|
7
5
|
/** Default OAuth scopes for the Identity Center link. `openid` is LOAD-BEARING, not decoration: it is
|
|
8
6
|
* what makes the token response carry an id-token, and the id-token's `sub` is the only statement of
|
|
9
7
|
* WHO completed the sign-in the callback can observe. Without it {@link AwsSsoMinter.completeLink}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sso.js","sourceRoot":"","sources":["../../../agent/aws/sso.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sso.js","sourceRoot":"","sources":["../../../agent/aws/sso.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,28 @@ export declare function parseOtlpHeaders(raw: string | undefined): Record<string
|
|
|
20
20
|
* here; `grpc` or an unknown value falls back to `http/protobuf` with a warning.
|
|
21
21
|
*/
|
|
22
22
|
export declare function resolveOtlpTarget(env?: NodeJS.ProcessEnv): OtlpTarget | undefined;
|
|
23
|
-
/**
|
|
23
|
+
/**
|
|
24
|
+
* Vercel's OTel collector (OPE-2358). On Vercel, an OpenTelemetry integration from the Vercel
|
|
25
|
+
* Marketplace receives spans through a collector on the function's own host. The platform names it
|
|
26
|
+
* with `VERCEL_OTEL_ENDPOINTS`, `VERCEL_OTEL_ENDPOINTS_PORT` and `VERCEL_OTEL_ENDPOINTS_PROTOCOL`.
|
|
27
|
+
* `registerOTel`'s `"auto"` span processor exported to it; eve's pipeline passes no `"auto"`, so
|
|
28
|
+
* this destination replaces it. The URL shape, the port default and the protocol rule are
|
|
29
|
+
* `@vercel/otel`'s own: `http/protobuf` selects protobuf and every other value selects JSON.
|
|
30
|
+
* `undefined` when the platform set no collector.
|
|
31
|
+
*/
|
|
32
|
+
export declare function resolveVercelCollectorTarget(env?: NodeJS.ProcessEnv): OtlpTarget | undefined;
|
|
33
|
+
/**
|
|
34
|
+
* True when the current Vercel request reports trace drains. The runtime then delivers spans to
|
|
35
|
+
* those drains itself, from eve's Agent Runs export (`telemetry.reportSpans`), so the collector
|
|
36
|
+
* would deliver every span a second time. `@vercel/otel` skips its collector on the same signal.
|
|
37
|
+
* An app that turns Agent Runs off then sends nothing to its trace drains; this destination does not
|
|
38
|
+
* cover that case.
|
|
39
|
+
*/
|
|
40
|
+
export declare function vercelTraceDrainsConfigured(): boolean;
|
|
41
|
+
/**
|
|
42
|
+
* The consumer's OTLP collector and Vercel's OTel collector, as ONE eve destination: the `otlp` slot
|
|
43
|
+
* file every app already has carries both, so a scaffolded app needs no new file. Disabled when
|
|
44
|
+
* neither is configured. Both obey the `otel` slot's trace policy.
|
|
45
|
+
*/
|
|
24
46
|
export declare const otlpDestination: import("eve/instrumentation").InstrumentationDisabled | import("eve/instrumentation/otel").OtelIntegration;
|
|
25
47
|
//# sourceMappingURL=instrumentation.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../agent/instrumentation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../agent/instrumentation.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAyB,KAAK,eAAe,EAAyC,MAAM,0BAA0B,CAAC;AAqB9H,QAAA,MAAM,WAAW,EAAE,eAA0E,CAAC;eAC/E,WAAW;AAE1B,kEAAkE;AAClE,KAAK,YAAY,GAAG,eAAe,GAAG,WAAW,CAAC;AAElD,0FAA0F;AAC1F,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CACpD;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAehF;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,UAAU,GAAG,SAAS,CAa9F;AAOD;;;;;;;;GAQG;AACH,wBAAgB,4BAA4B,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,UAAU,GAAG,SAAS,CAKzG;AASD;;;;;;GAMG;AACH,wBAAgB,2BAA2B,IAAI,OAAO,CAGrD;AAmBD;;;;GAIG;AACH,eAAO,MAAM,eAAe,4GAOpB,CAAC"}
|
|
@@ -10,13 +10,15 @@
|
|
|
10
10
|
// every environment. Without it, eve records content for public conversations and in
|
|
11
11
|
// development. A destination cannot restore what this ceiling removes.
|
|
12
12
|
// - `otlpDestination` (the app's `otlp` slot): the consumer's OTLP collector, from the standard
|
|
13
|
-
// `OTEL_EXPORTER_OTLP_*` variables,
|
|
13
|
+
// `OTEL_EXPORTER_OTLP_*` variables, and Vercel's OTel collector, from the `VERCEL_OTEL_ENDPOINTS*`
|
|
14
|
+
// variables the platform sets, as one eve destination. With neither, it is disabled.
|
|
14
15
|
//
|
|
15
16
|
// `scripts/instrumentation-hosted-boot-test.ts` boots both slots through eve's registration path
|
|
16
17
|
// with the env Vercel creates.
|
|
17
18
|
import { disableInstrumentation } from "eve/instrumentation";
|
|
18
19
|
import { otel, otelIntegration } from "eve/instrumentation/otel";
|
|
19
20
|
import { OTLPHttpJsonTraceExporter, OTLPHttpProtoTraceExporter } from "@vercel/otel";
|
|
21
|
+
import { BatchSpanProcessor } from "@opentelemetry/sdk-trace-base";
|
|
20
22
|
import { installLogShipping, initTelemetry } from "@open-everywhere/core/agent/adapter-api.js";
|
|
21
23
|
/** Metadata only: emit the span, record neither content direction. */
|
|
22
24
|
const METADATA_ONLY = { emit: true, recordInputs: false, recordOutputs: false };
|
|
@@ -82,7 +84,61 @@ function otlpExporter(target) {
|
|
|
82
84
|
const config = { url: target.url, headers: { ...target.headers } };
|
|
83
85
|
return target.protocol === "http/json" ? new OTLPHttpJsonTraceExporter(config) : new OTLPHttpProtoTraceExporter(config);
|
|
84
86
|
}
|
|
87
|
+
/**
|
|
88
|
+
* Vercel's OTel collector (OPE-2358). On Vercel, an OpenTelemetry integration from the Vercel
|
|
89
|
+
* Marketplace receives spans through a collector on the function's own host. The platform names it
|
|
90
|
+
* with `VERCEL_OTEL_ENDPOINTS`, `VERCEL_OTEL_ENDPOINTS_PORT` and `VERCEL_OTEL_ENDPOINTS_PROTOCOL`.
|
|
91
|
+
* `registerOTel`'s `"auto"` span processor exported to it; eve's pipeline passes no `"auto"`, so
|
|
92
|
+
* this destination replaces it. The URL shape, the port default and the protocol rule are
|
|
93
|
+
* `@vercel/otel`'s own: `http/protobuf` selects protobuf and every other value selects JSON.
|
|
94
|
+
* `undefined` when the platform set no collector.
|
|
95
|
+
*/
|
|
96
|
+
export function resolveVercelCollectorTarget(env = process.env) {
|
|
97
|
+
if (!env.VERCEL_OTEL_ENDPOINTS)
|
|
98
|
+
return undefined;
|
|
99
|
+
const port = env.VERCEL_OTEL_ENDPOINTS_PORT || "4318";
|
|
100
|
+
const protocol = (env.VERCEL_OTEL_ENDPOINTS_PROTOCOL || "http/protobuf") === "http/protobuf" ? "http/protobuf" : "http/json";
|
|
101
|
+
return { url: `http://localhost:${port}/v1/traces`, protocol, headers: {} };
|
|
102
|
+
}
|
|
103
|
+
/** The key under which the Vercel runtime publishes the current request's context. */
|
|
104
|
+
const VERCEL_REQUEST_CONTEXT = Symbol.for("@vercel/request-context");
|
|
105
|
+
/**
|
|
106
|
+
* True when the current Vercel request reports trace drains. The runtime then delivers spans to
|
|
107
|
+
* those drains itself, from eve's Agent Runs export (`telemetry.reportSpans`), so the collector
|
|
108
|
+
* would deliver every span a second time. `@vercel/otel` skips its collector on the same signal.
|
|
109
|
+
* An app that turns Agent Runs off then sends nothing to its trace drains; this destination does not
|
|
110
|
+
* cover that case.
|
|
111
|
+
*/
|
|
112
|
+
export function vercelTraceDrainsConfigured() {
|
|
113
|
+
const store = globalThis[VERCEL_REQUEST_CONTEXT];
|
|
114
|
+
return (store?.get?.()?.telemetry?.traceDrains?.length ?? 0) > 0;
|
|
115
|
+
}
|
|
116
|
+
/** Wrap the collector's processor so that it skips every span while trace drains are configured. */
|
|
117
|
+
function skipWhenTraceDrains(inner) {
|
|
118
|
+
return {
|
|
119
|
+
onStart: (span, context) => {
|
|
120
|
+
if (!vercelTraceDrainsConfigured())
|
|
121
|
+
inner.onStart(span, context);
|
|
122
|
+
},
|
|
123
|
+
onEnd: (span) => {
|
|
124
|
+
if (!vercelTraceDrainsConfigured())
|
|
125
|
+
inner.onEnd(span);
|
|
126
|
+
},
|
|
127
|
+
forceFlush: () => inner.forceFlush(),
|
|
128
|
+
shutdown: () => inner.shutdown(),
|
|
129
|
+
};
|
|
130
|
+
}
|
|
85
131
|
const OTLP_TARGET = resolveOtlpTarget();
|
|
86
|
-
|
|
87
|
-
|
|
132
|
+
const VERCEL_COLLECTOR_TARGET = resolveVercelCollectorTarget();
|
|
133
|
+
/**
|
|
134
|
+
* The consumer's OTLP collector and Vercel's OTel collector, as ONE eve destination: the `otlp` slot
|
|
135
|
+
* file every app already has carries both, so a scaffolded app needs no new file. Disabled when
|
|
136
|
+
* neither is configured. Both obey the `otel` slot's trace policy.
|
|
137
|
+
*/
|
|
138
|
+
export const otlpDestination = OTLP_TARGET === undefined && VERCEL_COLLECTOR_TARGET === undefined
|
|
139
|
+
? disableInstrumentation()
|
|
140
|
+
: otelIntegration({
|
|
141
|
+
...(OTLP_TARGET === undefined ? {} : { traceExporter: otlpExporter(OTLP_TARGET) }),
|
|
142
|
+
spanProcessors: VERCEL_COLLECTOR_TARGET === undefined ? [] : [skipWhenTraceDrains(new BatchSpanProcessor(otlpExporter(VERCEL_COLLECTOR_TARGET)))],
|
|
143
|
+
});
|
|
88
144
|
//# sourceMappingURL=instrumentation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrumentation.js","sourceRoot":"","sources":["../../agent/instrumentation.ts"],"names":[],"mappings":"AAAA,qHAAqH;AACrH,EAAE;AACF,oGAAoG;AACpG,sGAAsG;AACtG,mGAAmG;AACnG,mGAAmG;AACnG,EAAE;AACF,+FAA+F;AAC/F,kGAAkG;AAClG,yFAAyF;AACzF,2EAA2E;AAC3E,kGAAkG;AAClG,
|
|
1
|
+
{"version":3,"file":"instrumentation.js","sourceRoot":"","sources":["../../agent/instrumentation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"approval-judge.d.ts","sourceRoot":"","sources":["../../../agent/model/approval-judge.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,KAAK,SAAS,EAEf,MAAM,4CAA4C,CAAC;AACpD,OAAO,
|
|
1
|
+
{"version":3,"file":"approval-judge.d.ts","sourceRoot":"","sources":["../../../agent/model/approval-judge.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,KAAK,SAAS,EAEf,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAA6C,KAAK,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAQrG;2DAC2D;AAC3D,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,SAAS,EACf,QAAQ,EAAE,qBAAqB,GAC9B;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAOrF;AAqBD;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI,CAElF"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
// Gateway transport for the approval judge — core owns the seam; this owns the vendor call on the fixed
|
|
2
2
|
// `judge` model role. NO scope routing: the judge must not inherit whatever a domain routed its seat onto.
|
|
3
|
-
import {
|
|
3
|
+
import { generateText } from "ai";
|
|
4
4
|
import { registerApprovalJudgeCompletion, } from "@open-everywhere/core/agent/adapter-api.js";
|
|
5
|
-
import { applyGatewayOptions } from "./gateway.js";
|
|
5
|
+
import { applyGatewayOptions, gatewayLanguageModel } from "./gateway.js";
|
|
6
6
|
/**
|
|
7
7
|
* Output budget for the scrutiny pass. A reasoning model spends reasoning tokens INSIDE the budget, so a
|
|
8
8
|
* tight cap truncates to empty text (live 2026-08-08: 16 produced empty completions). 512 costs ~nothing.
|
|
@@ -26,7 +26,7 @@ function gatewayApprovalJudgeCompletion(defaults) {
|
|
|
26
26
|
return async (prompt, pass) => {
|
|
27
27
|
const s = approvalJudgeCallSettings(pass, defaults);
|
|
28
28
|
const { text } = await generateText({
|
|
29
|
-
model:
|
|
29
|
+
model: gatewayLanguageModel(s.id, defaults.via),
|
|
30
30
|
prompt,
|
|
31
31
|
...(s.maxOutputTokens !== undefined ? { maxOutputTokens: s.maxOutputTokens } : {}),
|
|
32
32
|
...(s.providerOptions !== undefined
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"approval-judge.js","sourceRoot":"","sources":["../../../agent/model/approval-judge.ts"],"names":[],"mappings":"AAAA,wGAAwG;AACxG,2GAA2G;AAE3G,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"approval-judge.js","sourceRoot":"","sources":["../../../agent/model/approval-judge.ts"],"names":[],"mappings":"AAAA,wGAAwG;AACxG,2GAA2G;AAE3G,OAAO,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAClC,OAAO,EAGL,+BAA+B,GAChC,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAA8B,MAAM,cAAc,CAAC;AAErG;;;GAGG;AACH,MAAM,0BAA0B,GAAG,GAAG,CAAC;AAEvC;2DAC2D;AAC3D,MAAM,UAAU,yBAAyB,CACvC,IAAe,EACf,QAA+B;IAE/B,MAAM,OAAO,GAAG,mBAAmB,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,EAAE,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC3G,OAAO;QACL,EAAE,EAAE,QAAQ,CAAC,EAAE;QACf,GAAG,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,0BAA0B,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/E,GAAG,CAAC,OAAO,CAAC,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC/F,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,SAAS,8BAA8B,CAAC,QAA+B;IACrE,OAAO,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;QAC5B,MAAM,CAAC,GAAG,yBAAyB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACpD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,YAAY,CAAC;YAClC,KAAK,EAAE,oBAAoB,CAAC,CAAC,CAAC,EAAE,EAAE,QAAQ,CAAC,GAAG,CAAC;YAC/C,MAAM;YACN,GAAG,CAAC,CAAC,CAAC,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAClF,GAAG,CAAC,CAAC,CAAC,eAAe,KAAK,SAAS;gBACjC,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC,eAAwE,EAAE;gBACjG,CAAC,CAAC,EAAE,CAAC;SACR,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,4BAA4B,CAAC,QAA+B;IAC1E,+BAA+B,CAAC,8BAA8B,CAAC,QAAQ,CAAC,CAAC,CAAC;AAC5E,CAAC"}
|
|
@@ -13,6 +13,7 @@ export declare function utilityRouteForScope(scope: string): ModelRoute;
|
|
|
13
13
|
*/
|
|
14
14
|
export declare function dreamCallSettings(route: ModelRoute, defaults: GatewayRoutedDefaults): {
|
|
15
15
|
id: string;
|
|
16
|
+
via?: string;
|
|
16
17
|
reasoning?: ModelRoute["reasoning"];
|
|
17
18
|
providerOptions?: Record<string, unknown>;
|
|
18
19
|
};
|
|
@@ -22,6 +23,7 @@ export declare function dreamCallSettings(route: ModelRoute, defaults: GatewayRo
|
|
|
22
23
|
*/
|
|
23
24
|
export declare function resolvedDreamCallSettings(scope: string, defaults: GatewayRoutedDefaults): {
|
|
24
25
|
id: string;
|
|
26
|
+
via?: string;
|
|
25
27
|
reasoning?: ModelRoute["reasoning"];
|
|
26
28
|
providerOptions?: Record<string, unknown>;
|
|
27
29
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dream-judge.d.ts","sourceRoot":"","sources":["../../../agent/model/dream-judge.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,KAAK,UAAU,EAMf,KAAK,UAAU,EAMhB,MAAM,4CAA4C,CAAC;AACpD,OAAO,
|
|
1
|
+
{"version":3,"file":"dream-judge.d.ts","sourceRoot":"","sources":["../../../agent/model/dream-judge.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,KAAK,UAAU,EAMf,KAAK,UAAU,EAMhB,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAA6C,KAAK,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAErG;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAc9D;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,qBAAqB,GAC9B;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAM9G;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,qBAAqB,GAC9B;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAI9G;AAkBD,4FAA4F;AAC5F,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,UAAU,CAE7E;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI,CAE/E;AAED;;;GAGG;AACH,wBAAgB,gCAAgC,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI,CAEtF"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
// Gateway transport for the dream judge — core owns the seam; this owns one completion on the `utility`
|
|
2
2
|
// role. The SCOPE locates the route: a channel key, a silo's owning domain, else `org`. It FAILS QUIET.
|
|
3
|
-
import {
|
|
3
|
+
import { generateText } from "ai";
|
|
4
4
|
import { modelRouteFor, memoryRefs, domainRoster, getConfig, judgeFromCompletion, registerDreamJudge, facetJudgeFromCompletion, registerFailureFacetJudge, stampModelCall, } from "@open-everywhere/core/agent/adapter-api.js";
|
|
5
|
-
import { applyGatewayOptions } from "./gateway.js";
|
|
5
|
+
import { applyGatewayOptions, gatewayLanguageModel } from "./gateway.js";
|
|
6
6
|
/**
|
|
7
7
|
* The effective `utility` route for a dream scope (channel key | silo name | other).
|
|
8
8
|
* Pure given the registered config; {} (→ static defaults) when config isn't registered
|
|
@@ -33,7 +33,9 @@ export function utilityRouteForScope(scope) {
|
|
|
33
33
|
export function dreamCallSettings(route, defaults) {
|
|
34
34
|
const id = route.id ?? defaults.id;
|
|
35
35
|
const options = applyGatewayOptions(route, {}, { id, defaultId: defaults.id }, defaults.gateway);
|
|
36
|
-
|
|
36
|
+
// The route's `via` wins over the role's (OPE-2556); absent both, the adapter uses the `gateway` target.
|
|
37
|
+
const via = route.via ?? defaults.via;
|
|
38
|
+
return { id, ...(via !== undefined ? { via } : {}), reasoning: route.reasoning, providerOptions: options.providerOptions };
|
|
37
39
|
}
|
|
38
40
|
/**
|
|
39
41
|
* dreamCallSettings plus the model-stamp side effect, split out so a test exercises the stamp with no network.
|
|
@@ -49,7 +51,7 @@ function gatewayDreamCompletion(defaults) {
|
|
|
49
51
|
return async (scope, prompt) => {
|
|
50
52
|
const s = resolvedDreamCallSettings(scope, defaults);
|
|
51
53
|
const { text } = await generateText({
|
|
52
|
-
model:
|
|
54
|
+
model: gatewayLanguageModel(s.id, s.via),
|
|
53
55
|
prompt,
|
|
54
56
|
...(s.reasoning !== undefined ? { reasoning: s.reasoning } : {}),
|
|
55
57
|
...(s.providerOptions !== undefined
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dream-judge.js","sourceRoot":"","sources":["../../../agent/model/dream-judge.ts"],"names":[],"mappings":"AAAA,wGAAwG;AACxG,wGAAwG;AAExG,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"dream-judge.js","sourceRoot":"","sources":["../../../agent/model/dream-judge.ts"],"names":[],"mappings":"AAAA,wGAAwG;AACxG,wGAAwG;AAExG,OAAO,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAClC,OAAO,EAEL,aAAa,EACb,UAAU,EACV,YAAY,EACZ,SAAS,EAGT,mBAAmB,EACnB,kBAAkB,EAClB,wBAAwB,EACxB,yBAAyB,EACzB,cAAc,GACf,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAA8B,MAAM,cAAc,CAAC;AAErG;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAAC,KAAa;IAChD,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,SAAS,EAAE,CAAC,WAAW,EAAE,CAAC;QAC1C,iFAAiF;QACjF,qFAAqF;QACrF,MAAM,KAAK,GAAG,SAAS,EAAE,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC;QAC9C,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAAE,OAAO,aAAa,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QACjH,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC/F,mFAAmF;QACnF,qEAAqE;QACrE,OAAO,aAAa,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IACrG,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC,CAAC,0EAA0E;IACvF,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAC/B,KAAiB,EACjB,QAA+B;IAE/B,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,IAAI,QAAQ,CAAC,EAAE,CAAC;IACnC,MAAM,OAAO,GAAG,mBAAmB,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,EAAE,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;IACjG,yGAAyG;IACzG,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,IAAI,QAAQ,CAAC,GAAG,CAAC;IACtC,OAAO,EAAE,EAAE,EAAE,GAAG,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE,CAAC;AAC7H,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,yBAAyB,CACvC,KAAa,EACb,QAA+B;IAE/B,MAAM,CAAC,GAAG,iBAAiB,CAAC,oBAAoB,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,CAAC;IACnE,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACrB,OAAO,CAAC,CAAC;AACX,CAAC;AAED,iEAAiE;AACjE,SAAS,sBAAsB,CAAC,QAA+B;IAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAC7B,MAAM,CAAC,GAAG,yBAAyB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACrD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,YAAY,CAAC;YAClC,KAAK,EAAE,oBAAoB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC;YACxC,MAAM;YACN,GAAG,CAAC,CAAC,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAChE,GAAG,CAAC,CAAC,CAAC,eAAe,KAAK,SAAS;gBACjC,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC,eAAwE,EAAE;gBACjG,CAAC,CAAC,EAAE,CAAC;SACR,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAED,4FAA4F;AAC5F,MAAM,UAAU,iBAAiB,CAAC,QAA+B;IAC/D,OAAO,mBAAmB,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,CAAC;AAC/D,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,yBAAyB,CAAC,QAA+B;IACvE,kBAAkB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC;AAClD,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,gCAAgC,CAAC,QAA+B;IAC9E,yBAAyB,CAAC,wBAAwB,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AACxF,CAAC"}
|
|
@@ -1,19 +1,37 @@
|
|
|
1
|
-
import { type ProbeAnswer } from "@open-everywhere/core/agent/adapter-api.js";
|
|
1
|
+
import { type ProbeAnswer, type ResolvableModel } from "@open-everywhere/core/agent/adapter-api.js";
|
|
2
|
+
import { type ConfigCheckResult } from "./model-config-check.js";
|
|
2
3
|
/** The gateway's PUBLIC, unauthenticated model catalog — eve's own `AI_GATEWAY_MODELS_CATALOG_URL`. */
|
|
3
4
|
export declare const GATEWAY_CATALOG_URL = "https://ai-gateway.vercel.sh/v1/models/catalog";
|
|
4
5
|
/** How long the probe waits before it calls the gateway unreachable. */
|
|
5
6
|
export declare const GATEWAY_PROBE_TIMEOUT_MS = 2000;
|
|
6
7
|
/**
|
|
7
|
-
* The catalog URL this deployment probes. `
|
|
8
|
-
* an on-prem proxy, a fixture), and it names the CHAT base (`…/v4/ai`), so the
|
|
9
|
-
* from its ORIGIN rather than appended to it.
|
|
8
|
+
* The catalog URL this deployment probes. The `gateway` target's url (or the deprecated `OE_AI_GATEWAY_URL`)
|
|
9
|
+
* retargets the whole gateway (a relay, an on-prem proxy, a fixture), and it names the CHAT base (`…/v4/ai`), so the
|
|
10
|
+
* catalog is taken from its ORIGIN rather than appended to it.
|
|
10
11
|
*/
|
|
11
12
|
export declare function gatewayCatalogUrl(env?: NodeJS.ProcessEnv): string;
|
|
12
13
|
export interface GatewayProbeDeps {
|
|
13
14
|
readonly env?: NodeJS.ProcessEnv;
|
|
14
15
|
readonly fetchImpl?: typeof globalThis.fetch;
|
|
15
16
|
readonly vercel?: boolean;
|
|
17
|
+
/** The models to run the config check on. Absent: the registered list, else no config check. */
|
|
18
|
+
readonly models?: () => readonly ResolvableModel[];
|
|
19
|
+
/** The config-check cache. Absent: the module's own. */
|
|
20
|
+
readonly cache?: ConfigCheckCache;
|
|
21
|
+
readonly now?: () => number;
|
|
16
22
|
}
|
|
23
|
+
/** A one-entry cache of the last config-check answer. */
|
|
24
|
+
export interface ConfigCheckCache {
|
|
25
|
+
value?: {
|
|
26
|
+
readonly at: number;
|
|
27
|
+
readonly result: ConfigCheckResult;
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* Register the models the deployment can resolve, so the `model-route` probe also runs the live config check.
|
|
32
|
+
* Called once from the app's boot wiring, beside the other registrations.
|
|
33
|
+
*/
|
|
34
|
+
export declare function registerModelConfigCheck(models: () => readonly ResolvableModel[]): void;
|
|
17
35
|
/** Run the probe once. Exported so a test drives every arm with no network. */
|
|
18
36
|
export declare function probeGatewayRoute(deps?: GatewayProbeDeps): Promise<ProbeAnswer>;
|
|
19
37
|
/** Wire the probe into the deployment-status surface. Called once, from the app's boot wiring. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway-probe.d.ts","sourceRoot":"","sources":["../../../agent/model/gateway-probe.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"gateway-probe.d.ts","sourceRoot":"","sources":["../../../agent/model/gateway-probe.ts"],"names":[],"mappings":"AA4BA,OAAO,EAML,KAAK,WAAW,EAChB,KAAK,eAAe,EACrB,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAoB,KAAK,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAGnF,uGAAuG;AACvG,eAAO,MAAM,mBAAmB,mDAAmD,CAAC;AAEpF,wEAAwE;AACxE,eAAO,MAAM,wBAAwB,OAAQ,CAAC;AAQ9C;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAU9E;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACjC,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IAC7C,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,gGAAgG;IAChG,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,SAAS,eAAe,EAAE,CAAC;IACnD,wDAAwD;IACxD,QAAQ,CAAC,KAAK,CAAC,EAAE,gBAAgB,CAAC;IAClC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CAC7B;AAKD,yDAAyD;AACzD,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAA;KAAE,CAAC;CACrE;AAKD;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,SAAS,eAAe,EAAE,GAAG,IAAI,CAEvF;AAqCD,+EAA+E;AAC/E,wBAAsB,iBAAiB,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,WAAW,CAAC,CA6CzF;AAED,kGAAkG;AAClG,wBAAgB,yBAAyB,IAAI,IAAI,CAEhD"}
|
|
@@ -12,6 +12,12 @@
|
|
|
12
12
|
// ② REACHABILITY, from one GET of the gateway's PUBLIC model catalog — the same unauthenticated
|
|
13
13
|
// endpoint `scripts/seed-model-catalog-cache.ts` reads.
|
|
14
14
|
//
|
|
15
|
+
// ③ THE MODEL CONFIG (OPE-2556), when the app registered its models: one GET of the public
|
|
16
|
+
// `/v1/models/<id>/endpoints` read per model, judged against `models.targets` and `models.dataPolicy`
|
|
17
|
+
// (model-config-check.ts). A demand no provider can meet turns the row "no". The route is public, so the
|
|
18
|
+
// detail names no model, provider or target, and counts nothing. The answer is cached for ten minutes, so an
|
|
19
|
+
// anonymous caller cannot make the route fan out a read per request.
|
|
20
|
+
//
|
|
15
21
|
// It does NOT prove the deployment's credential is ACCEPTED: the only call that proves that is an
|
|
16
22
|
// inference call, which is neither cheap nor free, and a status route an unbounded caller can poke
|
|
17
23
|
// must not be able to spend money. The detail string says so in as many words, because a status
|
|
@@ -19,18 +25,25 @@
|
|
|
19
25
|
//
|
|
20
26
|
// FAIL-SOFT and BOUNDED: a 2-second abort, and any throw answers "no" with no vendor error text
|
|
21
27
|
// forwarded (a fetch failure's message carries the host, and the status route is public).
|
|
22
|
-
import { registerStatusProbe, onVercel } from "@open-everywhere/core/agent/adapter-api.js";
|
|
28
|
+
import { DEFAULT_MODEL_VIA, getSettings, modelTargetFor, registerStatusProbe, onVercel, } from "@open-everywhere/core/agent/adapter-api.js";
|
|
29
|
+
import { checkModelConfig } from "./model-config-check.js";
|
|
30
|
+
import { targetBaseUrl } from "./target-url.js";
|
|
23
31
|
/** The gateway's PUBLIC, unauthenticated model catalog — eve's own `AI_GATEWAY_MODELS_CATALOG_URL`. */
|
|
24
32
|
export const GATEWAY_CATALOG_URL = "https://ai-gateway.vercel.sh/v1/models/catalog";
|
|
25
33
|
/** How long the probe waits before it calls the gateway unreachable. */
|
|
26
34
|
export const GATEWAY_PROBE_TIMEOUT_MS = 2_000;
|
|
35
|
+
/** The `gateway` target's base URL: `models.targets.gateway.url`, else the deprecated `OE_AI_GATEWAY_URL` in `env`. */
|
|
36
|
+
function gatewayBaseUrl(env = process.env) {
|
|
37
|
+
const targets = getSettings().models.targets;
|
|
38
|
+
return targetBaseUrl(DEFAULT_MODEL_VIA, modelTargetFor(DEFAULT_MODEL_VIA, targets), env);
|
|
39
|
+
}
|
|
27
40
|
/**
|
|
28
|
-
* The catalog URL this deployment probes. `
|
|
29
|
-
* an on-prem proxy, a fixture), and it names the CHAT base (`…/v4/ai`), so the
|
|
30
|
-
* from its ORIGIN rather than appended to it.
|
|
41
|
+
* The catalog URL this deployment probes. The `gateway` target's url (or the deprecated `OE_AI_GATEWAY_URL`)
|
|
42
|
+
* retargets the whole gateway (a relay, an on-prem proxy, a fixture), and it names the CHAT base (`…/v4/ai`), so the
|
|
43
|
+
* catalog is taken from its ORIGIN rather than appended to it.
|
|
31
44
|
*/
|
|
32
45
|
export function gatewayCatalogUrl(env = process.env) {
|
|
33
|
-
const override = env
|
|
46
|
+
const override = gatewayBaseUrl(env);
|
|
34
47
|
if (!override)
|
|
35
48
|
return GATEWAY_CATALOG_URL;
|
|
36
49
|
try {
|
|
@@ -42,6 +55,54 @@ export function gatewayCatalogUrl(env = process.env) {
|
|
|
42
55
|
return GATEWAY_CATALOG_URL;
|
|
43
56
|
}
|
|
44
57
|
}
|
|
58
|
+
/** How long one config-check answer is reused. */
|
|
59
|
+
const MODEL_CONFIG_CHECK_TTL_MS = 10 * 60_000;
|
|
60
|
+
const CONFIG_CHECK_CACHE = {};
|
|
61
|
+
let registeredModels;
|
|
62
|
+
/**
|
|
63
|
+
* Register the models the deployment can resolve, so the `model-route` probe also runs the live config check.
|
|
64
|
+
* Called once from the app's boot wiring, beside the other registrations.
|
|
65
|
+
*/
|
|
66
|
+
export function registerModelConfigCheck(models) {
|
|
67
|
+
registeredModels = models;
|
|
68
|
+
}
|
|
69
|
+
/** The config-check answer in closed-vocabulary words, for the PUBLIC status route. Pure. */
|
|
70
|
+
function publicConfigWords(r) {
|
|
71
|
+
if (r.met === "no")
|
|
72
|
+
return "the model config has a models.dataPolicy, providers.only or target dataPolicy demand that no provider can serve for at least one model — run `npm run check:model-config` for the names";
|
|
73
|
+
// An unused `providers.only` name is a warning on a config that was fully measured: say so, not "not measured".
|
|
74
|
+
if (r.met === "unknown" && r.findings.every((f) => f.row.endsWith(".providers.only"))) {
|
|
75
|
+
return "the model config can be served; a providers.only name serves none of the checked models — run `npm run check:model-config` for the names";
|
|
76
|
+
}
|
|
77
|
+
if (r.met === "unknown")
|
|
78
|
+
return "the model config was not fully measured — run `npm run check:model-config` for the details";
|
|
79
|
+
return "the model config can be served";
|
|
80
|
+
}
|
|
81
|
+
/** Run the config check, or reuse an answer younger than {@link MODEL_CONFIG_CHECK_TTL_MS}. Never throws. */
|
|
82
|
+
async function cachedConfigCheck(deps, models) {
|
|
83
|
+
const cache = deps.cache ?? CONFIG_CHECK_CACHE;
|
|
84
|
+
const now = (deps.now ?? Date.now)();
|
|
85
|
+
if (cache.value !== undefined && now - cache.value.at < MODEL_CONFIG_CHECK_TTL_MS)
|
|
86
|
+
return cache.value.result;
|
|
87
|
+
const env = deps.env ?? process.env;
|
|
88
|
+
let result;
|
|
89
|
+
try {
|
|
90
|
+
const settings = getSettings().models;
|
|
91
|
+
result = await checkModelConfig({
|
|
92
|
+
models: models(),
|
|
93
|
+
targets: settings.targets,
|
|
94
|
+
policy: settings.dataPolicy,
|
|
95
|
+
baseUrlFor: (via) => targetBaseUrl(via, modelTargetFor(via, settings.targets), env),
|
|
96
|
+
timeoutMs: GATEWAY_PROBE_TIMEOUT_MS,
|
|
97
|
+
...(deps.fetchImpl !== undefined ? { fetchImpl: deps.fetchImpl } : {}),
|
|
98
|
+
});
|
|
99
|
+
}
|
|
100
|
+
catch {
|
|
101
|
+
result = { met: "unknown", findings: [{ met: "unknown", row: "config", detail: "the model config could not be read" }], checked: 0 };
|
|
102
|
+
}
|
|
103
|
+
cache.value = { at: now, result };
|
|
104
|
+
return result;
|
|
105
|
+
}
|
|
45
106
|
/** Run the probe once. Exported so a test drives every arm with no network. */
|
|
46
107
|
export async function probeGatewayRoute(deps = {}) {
|
|
47
108
|
const env = deps.env ?? process.env;
|
|
@@ -52,10 +113,10 @@ export async function probeGatewayRoute(deps = {}) {
|
|
|
52
113
|
// owes nobody a model catalog and may need no key of ours. Both of this probe's facts are then
|
|
53
114
|
// about the shipped Vercel gateway, not about the route the deployment actually uses — and
|
|
54
115
|
// "measured, and it does not hold" would be false for a deployment whose models route fine.
|
|
55
|
-
const retargeted = (env
|
|
116
|
+
const retargeted = gatewayBaseUrl(env) !== undefined;
|
|
56
117
|
if (!vercel && !keySet) {
|
|
57
118
|
if (retargeted) {
|
|
58
|
-
return { met: "unknown", detail: "the model route is retargeted
|
|
119
|
+
return { met: "unknown", detail: "the model route is retargeted (models.targets.gateway.url) and holds no AI_GATEWAY_API_KEY — a relay may need neither, so this was not measured" };
|
|
59
120
|
}
|
|
60
121
|
return { met: "no", detail: "no gateway credential: off Vercel the deployment needs AI_GATEWAY_API_KEY (on Vercel, OIDC authenticates it)" };
|
|
61
122
|
}
|
|
@@ -74,10 +135,16 @@ export async function probeGatewayRoute(deps = {}) {
|
|
|
74
135
|
}
|
|
75
136
|
return { met: "no", detail: `the model gateway answered HTTP ${res.status} to a catalog read; the credential posture is ${credential}` };
|
|
76
137
|
}
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
138
|
+
const reached = `the model gateway answered a catalog read and the credential posture is ${credential} — this does not prove an inference call is authorised`;
|
|
139
|
+
const models = deps.models ?? registeredModels;
|
|
140
|
+
if (models === undefined)
|
|
141
|
+
return { met: "yes", detail: reached };
|
|
142
|
+
// ③ The config check. A demand no provider can meet makes the row "no": every call of that model would fail closed.
|
|
143
|
+
// An unknown part keeps "yes", because the route itself was measured, and the detail says what was not.
|
|
144
|
+
// 🔴 THE STATUS ROUTE IS PUBLIC, so the detail is closed-vocabulary prose: no model id, no provider slug, no target
|
|
145
|
+
// name and no count. `npm run check:model-config` names them, from the app.
|
|
146
|
+
const check = await cachedConfigCheck(deps, models);
|
|
147
|
+
return { met: check.met === "no" ? "no" : "yes", detail: `${reached}; ${publicConfigWords(check)}` };
|
|
81
148
|
}
|
|
82
149
|
catch {
|
|
83
150
|
return { met: "no", detail: `the model gateway did not answer within ${GATEWAY_PROBE_TIMEOUT_MS} ms; the credential posture is ${credential}` };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway-probe.js","sourceRoot":"","sources":["../../../agent/model/gateway-probe.ts"],"names":[],"mappings":"AAAA,sFAAsF;AACtF,2EAA2E;AAC3E,EAAE;AACF,mGAAmG;AACnG,+FAA+F;AAC/F,EAAE;AACF,8DAA8D;AAC9D,EAAE;AACF,4FAA4F;AAC5F,mGAAmG;AACnG,iDAAiD;AACjD,kGAAkG;AAClG,6DAA6D;AAC7D,EAAE;AACF,kGAAkG;AAClG,mGAAmG;AACnG,gGAAgG;AAChG,sEAAsE;AACtE,EAAE;AACF,gGAAgG;AAChG,0FAA0F;AAE1F,OAAO,
|
|
1
|
+
{"version":3,"file":"gateway-probe.js","sourceRoot":"","sources":["../../../agent/model/gateway-probe.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,11 @@ import { type ImageDescribeResult, type ImageDescribeUsage, type ImageDescriber
|
|
|
3
3
|
export interface GatewayVisionDefaults {
|
|
4
4
|
/** Gateway vision model id, e.g. "alibaba/qwen3-vl-instruct". */
|
|
5
5
|
readonly id: string;
|
|
6
|
+
/** The `models.targets` entry the call goes through (OPE-2556). Absent: `gateway`. */
|
|
7
|
+
readonly via?: string;
|
|
6
8
|
/**
|
|
7
|
-
* providerOptions.gateway for the call, forwarded verbatim. Absent in the reference config
|
|
8
|
-
*
|
|
9
|
+
* providerOptions.gateway for the call, forwarded verbatim. Absent in the reference config. The deployment's
|
|
10
|
+
* `models.dataPolicy` rows ride the call whatever this holds, and win over it.
|
|
9
11
|
*/
|
|
10
12
|
readonly gateway?: Record<string, unknown>;
|
|
11
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway-vision.d.ts","sourceRoot":"","sources":["../../../agent/model/gateway-vision.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"gateway-vision.d.ts","sourceRoot":"","sources":["../../../agent/model/gateway-vision.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,cAAc,EAEpB,MAAM,4CAA4C,CAAC;AAEpD,sDAAsD;AACtD,MAAM,WAAW,qBAAqB;IACpC,iEAAiE;IACjE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,sFAAsF;IACtF,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC5C;AAWD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,mBAAmB,CAiBnE;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,KAAK,CAE/D;AAED;;0DAE0D;AAC1D,UAAU,mBAAmB;IAC3B,QAAQ,CAAC,KAAK,CAAC,EAAE;QACf,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAC9B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;QAC/B,QAAQ,CAAC,iBAAiB,CAAC,EAAE;YAAE,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QACvG,QAAQ,CAAC,kBAAkB,CAAC,EAAE;YAAE,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;KACrE,CAAC;IACF,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrD;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,mBAAmB,GAAG,kBAAkB,CAuCxF;AAED;;yEAEyE;AACzE,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,cAAc,CA8BrF;AAED;;mFAEmF;AACnF,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI,CAEnF"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
-
// Gateway transport for the image describer — core owns the seam.
|
|
2
|
-
//
|
|
3
|
-
|
|
1
|
+
// Gateway transport for the image describer — core owns the seam. The model comes from gateway.ts, so the call
|
|
2
|
+
// carries `models.dataPolicy` (OPE-2535); a gateway's own org policy applies on top. The call is fail-closed,
|
|
3
|
+
// reports its own spend, and must NOT stamp the model.
|
|
4
|
+
import { generateText } from "ai";
|
|
5
|
+
import { gatewayLanguageModel } from "./gateway.js";
|
|
4
6
|
import { registerImageDescriber, } from "@open-everywhere/core/agent/adapter-api.js";
|
|
5
7
|
// The instruction: describe, transcribe on-image text, reply STRICT JSON. Kept here rather than in core
|
|
6
8
|
// because it is paired with THIS transport's message shape.
|
|
@@ -94,7 +96,7 @@ export function gatewayImageDescriber(defaults) {
|
|
|
94
96
|
let res;
|
|
95
97
|
try {
|
|
96
98
|
res = await generateText({
|
|
97
|
-
model:
|
|
99
|
+
model: gatewayLanguageModel(defaults.id, defaults.via),
|
|
98
100
|
messages: [
|
|
99
101
|
{
|
|
100
102
|
role: "user",
|