@plurnk/plurnk-providers 5.0.2 → 6.0.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/.env.defaults +18 -84
- package/README.md +21 -22
- package/SPEC.md +110 -1190
- package/dist/LeadingReasoning.js +1 -1
- package/dist/LeadingReasoning.js.map +1 -1
- package/dist/Mock.d.ts +2 -2
- package/dist/Mock.d.ts.map +1 -1
- package/dist/Mock.js +2 -2
- package/dist/Mock.js.map +1 -1
- package/dist/{AiSdkProvider.d.ts → ModelProvider.d.ts} +12 -21
- package/dist/ModelProvider.d.ts.map +1 -0
- package/dist/{AiSdkProvider.js → ModelProvider.js} +140 -188
- package/dist/ModelProvider.js.map +1 -0
- package/dist/{AiSdkRequestBody.d.ts → ModelRequestBody.d.ts} +6 -10
- package/dist/ModelRequestBody.d.ts.map +1 -0
- package/dist/{AiSdkRequestBody.js → ModelRequestBody.js} +17 -63
- package/dist/ModelRequestBody.js.map +1 -0
- package/dist/Pool.js +24 -24
- package/dist/Pool.js.map +1 -1
- package/dist/ProviderRegistry.d.ts.map +1 -1
- package/dist/ProviderRegistry.js +15 -15
- package/dist/ProviderRegistry.js.map +1 -1
- package/dist/RequestCapture.d.ts +1 -0
- package/dist/RequestCapture.d.ts.map +1 -1
- package/dist/RequestCapture.js +9 -6
- package/dist/RequestCapture.js.map +1 -1
- package/dist/accounting.d.ts +1 -1
- package/dist/accounting.d.ts.map +1 -1
- package/dist/accounting.js +4 -4
- package/dist/accounting.js.map +1 -1
- package/dist/capacity.js +4 -4
- package/dist/capacity.js.map +1 -1
- package/dist/catalogProvider.d.ts +5 -8
- package/dist/catalogProvider.d.ts.map +1 -1
- package/dist/catalogProvider.js +218 -68
- package/dist/catalogProvider.js.map +1 -1
- package/dist/compatibleProvider.d.ts.map +1 -1
- package/dist/compatibleProvider.js +19 -8
- package/dist/compatibleProvider.js.map +1 -1
- package/dist/discover.d.ts +1 -1
- package/dist/discover.d.ts.map +1 -1
- package/dist/discover.js +1 -8
- package/dist/discover.js.map +1 -1
- package/dist/env.d.ts +4 -4
- package/dist/env.d.ts.map +1 -1
- package/dist/env.js +43 -80
- package/dist/env.js.map +1 -1
- package/dist/errors.d.ts +48 -0
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +61 -4
- package/dist/errors.js.map +1 -1
- package/dist/index.d.ts +5 -6
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +6 -7
- package/dist/index.js.map +1 -1
- package/dist/{sdkModels.d.ts → modelAdapters.d.ts} +7 -9
- package/dist/modelAdapters.d.ts.map +1 -0
- package/dist/{sdkModels.js → modelAdapters.js} +194 -87
- package/dist/modelAdapters.js.map +1 -0
- package/dist/native-tools.d.ts +1 -2
- package/dist/native-tools.d.ts.map +1 -1
- package/dist/native-tools.js +9 -11
- package/dist/native-tools.js.map +1 -1
- package/dist/ollama.d.ts.map +1 -1
- package/dist/ollama.js +26 -12
- package/dist/ollama.js.map +1 -1
- package/dist/openai.d.ts +3 -3
- package/dist/openai.d.ts.map +1 -1
- package/dist/openai.js +1 -1
- package/dist/pi-transport.d.ts +69 -0
- package/dist/pi-transport.d.ts.map +1 -0
- package/dist/pi-transport.js +697 -0
- package/dist/pi-transport.js.map +1 -0
- package/dist/providerError.js +1 -1
- package/dist/providerError.js.map +1 -1
- package/dist/retry-deadline.d.ts +3 -0
- package/dist/retry-deadline.d.ts.map +1 -0
- package/dist/retry-deadline.js +96 -0
- package/dist/retry-deadline.js.map +1 -0
- package/dist/stream-forensics.d.ts +51 -0
- package/dist/stream-forensics.d.ts.map +1 -0
- package/dist/stream-forensics.js +466 -0
- package/dist/stream-forensics.js.map +1 -0
- package/dist/types.d.ts +29 -4
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js.map +1 -1
- package/dist/usage.js +2 -2
- package/dist/usage.js.map +1 -1
- package/docs/models.md +3 -3
- package/package.json +8 -21
- package/dist/AiSdkProvider.d.ts.map +0 -1
- package/dist/AiSdkProvider.js.map +0 -1
- package/dist/AiSdkRequestBody.d.ts.map +0 -1
- package/dist/AiSdkRequestBody.js.map +0 -1
- package/dist/RequestFields.d.ts +0 -24
- package/dist/RequestFields.d.ts.map +0 -1
- package/dist/RequestFields.js +0 -237
- package/dist/RequestFields.js.map +0 -1
- package/dist/aiSdkTransport.d.ts +0 -84
- package/dist/aiSdkTransport.d.ts.map +0 -1
- package/dist/aiSdkTransport.js +0 -651
- package/dist/aiSdkTransport.js.map +0 -1
- package/dist/model-options.d.ts +0 -3
- package/dist/model-options.d.ts.map +0 -1
- package/dist/model-options.js +0 -26
- package/dist/model-options.js.map +0 -1
- package/dist/sdkModels.d.ts.map +0 -1
- package/dist/sdkModels.js.map +0 -1
package/dist/RequestCapture.js
CHANGED
|
@@ -1,13 +1,16 @@
|
|
|
1
|
-
// {§provider-
|
|
1
|
+
// {§provider-interface}: one fetch closure per physical request,
|
|
2
2
|
// without global interception or a second request identity.
|
|
3
3
|
export default class RequestCapture {
|
|
4
4
|
#request;
|
|
5
5
|
get request() { return this.#request; }
|
|
6
|
+
record(request) {
|
|
7
|
+
if (this.#request !== undefined) {
|
|
8
|
+
throw new TypeError("A physical provider request dispatched more than once");
|
|
9
|
+
}
|
|
10
|
+
this.#request = request;
|
|
11
|
+
}
|
|
6
12
|
fetch(next) {
|
|
7
13
|
return async (input, init) => {
|
|
8
|
-
if (this.#request !== undefined) {
|
|
9
|
-
throw new TypeError("A physical provider request dispatched more than once");
|
|
10
|
-
}
|
|
11
14
|
const body = typeof init?.body === "string"
|
|
12
15
|
? init.body
|
|
13
16
|
: init?.body == null && input instanceof Request
|
|
@@ -15,11 +18,11 @@ export default class RequestCapture {
|
|
|
15
18
|
: undefined;
|
|
16
19
|
if (body === undefined)
|
|
17
20
|
throw new TypeError("Provider request capture requires a serialized text body");
|
|
18
|
-
this
|
|
21
|
+
this.record({
|
|
19
22
|
method: init?.method ?? (input instanceof Request ? input.method : "GET"),
|
|
20
23
|
origin: new URL(input instanceof Request ? input.url : String(input)).origin,
|
|
21
24
|
body,
|
|
22
|
-
};
|
|
25
|
+
});
|
|
23
26
|
return next(input, init);
|
|
24
27
|
};
|
|
25
28
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestCapture.js","sourceRoot":"","sources":["../src/RequestCapture.ts"],"names":[],"mappings":"AAEA,
|
|
1
|
+
{"version":3,"file":"RequestCapture.js","sourceRoot":"","sources":["../src/RequestCapture.ts"],"names":[],"mappings":"AAEA,iEAAiE;AACjE,4DAA4D;AAC5D,MAAM,CAAC,OAAO,OAAO,cAAc;IAC/B,QAAQ,CAAqC;IAE7C,IAAI,OAAO,KAAyC,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE3E,MAAM,CAAC,OAA+B;QAClC,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC9B,MAAM,IAAI,SAAS,CAAC,uDAAuD,CAAC,CAAC;QACjF,CAAC;QACD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,IAA6B;QAC/B,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACzB,MAAM,IAAI,GAAG,OAAO,IAAI,EAAE,IAAI,KAAK,QAAQ;gBACvC,CAAC,CAAC,IAAI,CAAC,IAAI;gBACX,CAAC,CAAC,IAAI,EAAE,IAAI,IAAI,IAAI,IAAI,KAAK,YAAY,OAAO;oBAC5C,CAAC,CAAC,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE;oBAC5B,CAAC,CAAC,SAAS,CAAC;YACpB,IAAI,IAAI,KAAK,SAAS;gBAAE,MAAM,IAAI,SAAS,CAAC,0DAA0D,CAAC,CAAC;YACxG,IAAI,CAAC,MAAM,CAAC;gBACR,MAAM,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC,KAAK,YAAY,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;gBACzE,MAAM,EAAE,IAAI,GAAG,CAAC,KAAK,YAAY,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM;gBAC5E,IAAI;aACP,CAAC,CAAC;YACH,OAAO,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAC7B,CAAC,CAAC;IACN,CAAC;CACJ"}
|
package/dist/accounting.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { ProviderAccounting, ProviderCostNormalizer, ProviderRequestAccounting } from "./types.ts";
|
|
2
|
-
export declare const providerCostNormalizer: (
|
|
2
|
+
export declare const providerCostNormalizer: (adapter: string) => ProviderCostNormalizer | undefined;
|
|
3
3
|
export declare const validateProviderRequestAccounting: (value: unknown) => ProviderRequestAccounting;
|
|
4
4
|
export declare const aggregateProviderAccounting: (values: readonly ProviderRequestAccounting[]) => ProviderAccounting;
|
|
5
5
|
//# sourceMappingURL=accounting.d.ts.map
|
package/dist/accounting.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accounting.d.ts","sourceRoot":"","sources":["../src/accounting.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACR,kBAAkB,EAClB,sBAAsB,EACtB,yBAAyB,EAE5B,MAAM,YAAY,CAAC;AAgFpB,eAAO,MAAM,sBAAsB,
|
|
1
|
+
{"version":3,"file":"accounting.d.ts","sourceRoot":"","sources":["../src/accounting.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACR,kBAAkB,EAClB,sBAAsB,EACtB,yBAAyB,EAE5B,MAAM,YAAY,CAAC;AAgFpB,eAAO,MAAM,sBAAsB,YACtB,MAAM,KAChB,sBAAsB,GAAG,SAM3B,CAAC;AAuBF,eAAO,MAAM,iCAAiC,UAAW,OAAO,KAAG,yBAGlE,CAAC;AA6DF,eAAO,MAAM,2BAA2B,WAC5B,SAAS,yBAAyB,EAAE,KAC7C,kBAWF,CAAC"}
|
package/dist/accounting.js
CHANGED
|
@@ -77,10 +77,10 @@ const deepInfraCost = ({ usage }) => {
|
|
|
77
77
|
source: "DeepInfra response usage.estimated_cost",
|
|
78
78
|
};
|
|
79
79
|
};
|
|
80
|
-
export const providerCostNormalizer = (
|
|
81
|
-
switch (
|
|
82
|
-
case "
|
|
83
|
-
case "
|
|
80
|
+
export const providerCostNormalizer = (adapter) => {
|
|
81
|
+
switch (adapter) {
|
|
82
|
+
case "deepinfra": return deepInfraCost;
|
|
83
|
+
case "openrouter": return openRouterCost;
|
|
84
84
|
default: return undefined;
|
|
85
85
|
}
|
|
86
86
|
};
|
package/dist/accounting.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accounting.js","sourceRoot":"","sources":["../src/accounting.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"accounting.js","sourceRoot":"","sources":["../src/accounting.ts"],"names":[],"mappings":"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"}
|
package/dist/capacity.js
CHANGED
|
@@ -33,7 +33,7 @@ export const effectiveReasoningBudget = ({ configured, outputBudget, }) => {
|
|
|
33
33
|
}
|
|
34
34
|
return Math.min(configured, outputBudget - 1);
|
|
35
35
|
};
|
|
36
|
-
// {§provider-
|
|
36
|
+
// {§provider-capacity-admission}: the floor is never above the output budget, so a
|
|
37
37
|
// call that tightens the budget below the configured floor tightens the floor
|
|
38
38
|
// with it.
|
|
39
39
|
export const effectiveOutputFloor = ({ configured, outputBudget, }) => {
|
|
@@ -59,7 +59,7 @@ export const effectiveInputCapacity = ({ contextWindow, maxInputTokens, outputBu
|
|
|
59
59
|
].filter((value) => value !== null);
|
|
60
60
|
return capacities.length === 0 ? null : Math.min(...capacities);
|
|
61
61
|
};
|
|
62
|
-
// {§provider-
|
|
62
|
+
// {§provider-capacity-admission}: the input wall is every known physical input
|
|
63
63
|
// constraint intersected — independent maxInputTokens and the window less the
|
|
64
64
|
// output floor. Null when neither is known.
|
|
65
65
|
export const effectiveInputWall = ({ contextWindow, maxInputTokens, outputFloor, }) => {
|
|
@@ -78,9 +78,9 @@ export const effectiveInputWall = ({ contextWindow, maxInputTokens, outputFloor,
|
|
|
78
78
|
].filter((value) => value !== null);
|
|
79
79
|
return walls.length === 0 ? null : Math.min(...walls);
|
|
80
80
|
};
|
|
81
|
-
// {§provider-
|
|
81
|
+
// {§provider-capacity-admission}: the wire margin kept between the measured prompt and the grant.
|
|
82
82
|
export const WIRE_FLEX_MARGIN = 256;
|
|
83
|
-
// {§provider-
|
|
83
|
+
// {§provider-capacity-admission}: the grant is the window's remainder after the
|
|
84
84
|
// prompt and the margin. An exact prompt takes the remainder itself, clamped
|
|
85
85
|
// between the floor and the model's own output limit — above the reservation
|
|
86
86
|
// when the prompt left room, down to the floor when it ate into the
|
package/dist/capacity.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capacity.js","sourceRoot":"","sources":["../src/capacity.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAC;AAEjE,MAAM,cAAc,GAAG,CAAC,KAAoB,EAAE,IAAY,EAAiB,EAAE;IACzE,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAChC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;QAC7C,MAAM,IAAI,SAAS,CAAC,GAAG,IAAI,0CAA0C,CAAC,CAAC;IAC3E,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,EAClC,SAAS,EACT,UAAU,EACV,eAAe,EACf,aAAa,GAMhB,EAAiB,EAAE;IAChB,IAAI,SAAS,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,SAAS,IAAI,CAAC,CAAC,EAAE,CAAC;QAClF,MAAM,IAAI,SAAS,CAAC,iDAAiD,CAAC,CAAC;IAC3E,CAAC;IACD,MAAM,QAAQ,GAAG,CAAC,SAAS,IAAI,IAAI,EAAE,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAmB,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC;IACpG,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACvC,MAAM,QAAQ,GAAG;QACb,cAAc,CAAC,eAAe,EAAE,iBAAiB,CAAC;QAClD,cAAc,CAAC,aAAa,EAAE,eAAe,CAAC;KACjD,CAAC,MAAM,CAAC,CAAC,KAAK,EAAmB,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC;IACrD,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,QAAQ,EAAE,GAAG,QAAQ,CAAC,CAAC;AAC9C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,EACrC,UAAU,EACV,YAAY,GAIf,EAAiB,EAAE;IAChB,cAAc,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;IAC9C,cAAc,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IAC7C,IAAI,UAAU,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IACrC,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;QACxB,MAAM,IAAI,SAAS,CAAC,4DAA4D,CAAC,CAAC;IACtF,CAAC;IACD,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;QACnB,MAAM,IAAI,SAAS,CAAC,4EAA4E,CAAC,CAAC;IACtG,CAAC;IACD,OAAO,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,YAAY,GAAG,CAAC,CAAC,CAAC;AAClD,CAAC,CAAC;AAEF,
|
|
1
|
+
{"version":3,"file":"capacity.js","sourceRoot":"","sources":["../src/capacity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,15 @@
|
|
|
1
1
|
import { type ModelInfo, type ProviderInfo } from "@plurnk/plurnk-models";
|
|
2
|
-
import { type GrammarStyle, type
|
|
3
|
-
import type { InputModality, Provider, ProviderCostNormalizer } from "./types.ts";
|
|
2
|
+
import { type GrammarStyle, type CacheAffinity, type NativeRequestControls } from "./ModelProvider.ts";
|
|
3
|
+
import type { InputModality, Provider, ProviderCostNormalizer, ProviderModel } from "./types.ts";
|
|
4
4
|
import { type Effort } from "@plurnk/plurnk-contracts";
|
|
5
|
-
import type { LanguageModelSource } from "./aiSdkTransport.ts";
|
|
6
5
|
import type { ExtensionAttribution, ExtensionAttributionContext } from "@plurnk/plurnk-meta";
|
|
7
6
|
export declare const inputModalitiesOf: (input: readonly string[] | undefined) => ReadonlySet<InputModality>;
|
|
8
7
|
export declare const catalogEfforts: (provider: ProviderInfo, info: ModelInfo, env: NodeJS.ProcessEnv) => readonly [Effort, ...Effort[]];
|
|
9
|
-
export declare const
|
|
8
|
+
export declare const providerFromModelAdapter: ({ name, env, model, providerModel, normalizeCost, url, headers, contextWindow, info, attributions, cacheAffinity, systemCacheBreakpoint, additiveReasoningProvider, requestControls, grammarStyle, endpoint, }: {
|
|
10
9
|
name: string;
|
|
11
10
|
env: NodeJS.ProcessEnv;
|
|
12
11
|
model: string;
|
|
13
|
-
|
|
12
|
+
providerModel?: ProviderModel;
|
|
14
13
|
normalizeCost?: ProviderCostNormalizer;
|
|
15
14
|
url?: string;
|
|
16
15
|
headers?: Readonly<Record<string, string>>;
|
|
@@ -19,11 +18,9 @@ export declare const providerFromSdkModel: ({ name, env, model, languageModel, n
|
|
|
19
18
|
attributions?: (context: ExtensionAttributionContext) => ExtensionAttribution;
|
|
20
19
|
grammarStyle?: GrammarStyle;
|
|
21
20
|
cacheAffinity?: CacheAffinity;
|
|
22
|
-
|
|
23
|
-
reasoningResponseProviderOptions?: AiSdkProviderOptions;
|
|
21
|
+
systemCacheBreakpoint?: boolean;
|
|
24
22
|
additiveReasoningProvider?: "anthropic" | "bedrock";
|
|
25
23
|
requestControls?: NativeRequestControls;
|
|
26
|
-
sdkPackage?: string;
|
|
27
24
|
endpoint?: string;
|
|
28
25
|
}) => Provider;
|
|
29
26
|
export declare const catalogProviderFromEnv: (name: string, env: NodeJS.ProcessEnv, model: string, baseUrlOverride?: string) => Provider | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalogProvider.d.ts","sourceRoot":"","sources":["../src/catalogProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,KAAK,SAAS,EAEd,KAAK,YAAY,EACpB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"catalogProvider.d.ts","sourceRoot":"","sources":["../src/catalogProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,KAAK,SAAS,EAEd,KAAK,YAAY,EACpB,MAAM,uBAAuB,CAAC;AAkB/B,OAAsB,EAElB,KAAK,YAAY,EAEjB,KAAK,aAAa,EAClB,KAAK,qBAAqB,EAC7B,MAAM,oBAAoB,CAAC;AAG5B,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEjG,OAAO,EAAW,KAAK,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAKhE,OAAO,KAAK,EAAE,oBAAoB,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAI7F,eAAO,MAAM,iBAAiB,UAAW,SAAS,MAAM,EAAE,GAAG,SAAS,KAAG,WAAW,CAAC,aAAa,CACoC,CAAC;AA4NvI,eAAO,MAAM,cAAc,aACb,YAAY,QAChB,SAAS,OACV,MAAM,CAAC,UAAU,KACvB,SAAS,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAEvB,CAAC;AAuCV,eAAO,MAAM,wBAAwB,mNAiBlC;IACC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,aAAa,CAAC,EAAE,sBAAsB,CAAC;IACvC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC3C,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,2BAA2B,KAAK,oBAAoB,CAAC;IAG9E,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,yBAAyB,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IACpD,eAAe,CAAC,EAAE,qBAAqB,CAAC;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB,KAAG,QAgHH,CAAC;AAaF,eAAO,MAAM,sBAAsB,SACzB,MAAM,OACP,MAAM,CAAC,UAAU,SACf,MAAM,oBACK,MAAM,KACzB,QAAQ,GAAG,IAiCb,CAAC"}
|
package/dist/catalogProvider.js
CHANGED
|
@@ -1,17 +1,15 @@
|
|
|
1
1
|
import { catalogSnapshot, lookupProvider, resolveModel, } from "@plurnk/plurnk-models";
|
|
2
|
-
import { costOverrideFromEnv, contextWindowFromEnv, effectiveContextWindow, dataCaptureFromEnv, generationEnvelopeFromEnv, parseOptionalFloat, samplingFromEnv, parseRequiredInt, parseTimeoutMs, cacheAffinityFromEnv, cacheWritePolicyFromEnv, effortFromEnv, reasoningResponseStyleFromEnv, inferenceAdmissionFromEnv, } from "./env.js";
|
|
3
|
-
import
|
|
4
|
-
import { configuredProviderInfo,
|
|
2
|
+
import { costOverrideFromEnv, contextWindowFromEnv, declaredReasoningEfforts, effectiveContextWindow, dataCaptureFromEnv, generationEnvelopeFromEnv, parseOptionalFloat, samplingFromEnv, parseRequiredInt, parseTimeoutMs, cacheAffinityFromEnv, cacheWritePolicyFromEnv, effortFromEnv, reasoningResponseStyleFromEnv, inferenceAdmissionFromEnv, } from "./env.js";
|
|
3
|
+
import ModelProvider, {} from "./ModelProvider.js";
|
|
4
|
+
import { configuredProviderInfo, createProviderModel } from "./modelAdapters.js";
|
|
5
5
|
import { providerSource } from "./notices.js";
|
|
6
|
-
import { INPUT_MODALITIES
|
|
6
|
+
import { INPUT_MODALITIES } from "./types.js";
|
|
7
7
|
import { EFFORTS } from "@plurnk/plurnk-contracts";
|
|
8
8
|
import { estimateProviderCost } from "./cost.js";
|
|
9
9
|
import { emitWarningOnce } from "./warnings.js";
|
|
10
|
-
import RequestFields from "./RequestFields.js";
|
|
11
10
|
import { adaptiveEffortFromEnv } from "./reasoning-effort.js";
|
|
12
|
-
import { providerModelOptions } from "./model-options.js";
|
|
13
11
|
import { withProviderDefaults } from "./defaults.js";
|
|
14
|
-
// {§provider-
|
|
12
|
+
// {§provider-interface} — the catalog's input modalities, kept to the vocabulary the wire
|
|
15
13
|
// can carry; an unknown model declares none.
|
|
16
14
|
export const inputModalitiesOf = (input) => new Set((input ?? []).filter((modality) => INPUT_MODALITIES.includes(modality)));
|
|
17
15
|
const activationPolicies = Object.freeze(["off", "adaptive"]);
|
|
@@ -22,48 +20,211 @@ const catalogWireEfforts = (info, declared = []) => [
|
|
|
22
20
|
...new Set([
|
|
23
21
|
...(info.reasoningOptions
|
|
24
22
|
?.filter((option) => option.type === "effort")
|
|
25
|
-
.flatMap((option) => option.values) ?? []),
|
|
23
|
+
.flatMap((option) => option.values.flatMap((value) => value === null ? [] : [value])) ?? []),
|
|
26
24
|
...declared,
|
|
27
25
|
]),
|
|
28
26
|
];
|
|
29
27
|
const catalogSupportsToggle = (info) => info.reasoningOptions?.some((option) => option.type === "toggle") === true;
|
|
30
|
-
const
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
28
|
+
const assertCatalogReasoningBudget = (name, info, budget) => {
|
|
29
|
+
for (const option of info?.reasoningOptions ?? []) {
|
|
30
|
+
if (option.type !== "budget_tokens")
|
|
31
|
+
continue;
|
|
32
|
+
if (option.min !== undefined && budget < option.min) {
|
|
33
|
+
throw new TypeError(`${name} provider: reasoning budget ${budget} is below catalog minimum ${option.min}`);
|
|
34
|
+
}
|
|
35
|
+
if (option.max !== undefined && budget > option.max) {
|
|
36
|
+
throw new TypeError(`${name} provider: reasoning budget ${budget} exceeds catalog maximum ${option.max}`);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
40
39
|
};
|
|
41
|
-
const
|
|
42
|
-
|
|
43
|
-
if (
|
|
44
|
-
|
|
45
|
-
|
|
40
|
+
const usesProviderReasoningProjection = (name, native) => !native || name === "openrouter" || name === "deepinfra" || name === "togetherai";
|
|
41
|
+
const supportsReasoningOff = (name, info, wireEfforts, declaredEfforts) => {
|
|
42
|
+
if (info?.reasoning === false)
|
|
43
|
+
return true;
|
|
44
|
+
if (name === "cloudflare-workers-ai") {
|
|
45
|
+
return info === undefined || wireEfforts.has("none");
|
|
46
|
+
}
|
|
47
|
+
if (name === "openrouter"
|
|
48
|
+
|| name === "deepinfra"
|
|
49
|
+
|| name === "togetherai"
|
|
50
|
+
|| name === "deepseek"
|
|
51
|
+
|| name === "alibaba"
|
|
52
|
+
|| name === "fireworks-ai") {
|
|
53
|
+
return info === undefined || wireEfforts.has("none") || catalogSupportsToggle(info);
|
|
46
54
|
}
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
55
|
+
return info === undefined && declaredEfforts.length === 0
|
|
56
|
+
|| wireEfforts.has("none")
|
|
57
|
+
|| info !== undefined && catalogSupportsToggle(info);
|
|
58
|
+
};
|
|
59
|
+
const supportsFixedEfforts = (name, native, declaredEfforts) => native
|
|
60
|
+
|| name === "deepseek"
|
|
61
|
+
|| name === "alibaba"
|
|
62
|
+
|| name === "fireworks-ai"
|
|
63
|
+
|| name === "cloudflare-workers-ai"
|
|
64
|
+
|| declaredEfforts.length > 0;
|
|
65
|
+
const reasoningCapabilities = (name, env, info, native) => {
|
|
66
|
+
const declaredEfforts = declaredReasoningEfforts(name, env);
|
|
67
|
+
const wireEfforts = info === undefined ? [...declaredEfforts] : catalogWireEfforts(info, declaredEfforts);
|
|
68
|
+
const wireEffortSet = new Set(wireEfforts);
|
|
69
|
+
const needsAdaptiveWireEffort = info?.reasoning !== false && (name === "openrouter"
|
|
70
|
+
|| name === "deepinfra"
|
|
71
|
+
|| name === "togetherai"
|
|
72
|
+
|| name === "deepseek"
|
|
73
|
+
|| name === "alibaba"
|
|
74
|
+
|| name === "cloudflare-workers-ai" && (info !== undefined || declaredEfforts.length > 0)
|
|
75
|
+
|| !native && declaredEfforts.length > 0);
|
|
76
|
+
const adaptiveWireEffort = needsAdaptiveWireEffort ? adaptiveEffortFromEnv(env, wireEfforts) : undefined;
|
|
77
|
+
const customProjection = usesProviderReasoningProjection(name, native);
|
|
78
|
+
const allowFixed = supportsFixedEfforts(name, native, declaredEfforts);
|
|
79
|
+
const allowOff = supportsReasoningOff(name, info, wireEffortSet, declaredEfforts);
|
|
80
|
+
const supported = info?.reasoning === false || info === undefined && declaredEfforts.length === 0
|
|
81
|
+
? activationPolicies
|
|
82
|
+
: EFFORTS.filter((policy) => policy === "adaptive"
|
|
83
|
+
|| policy === "off" && allowOff
|
|
84
|
+
|| allowFixed
|
|
85
|
+
&& (policy === "low" || policy === "medium" || policy === "high" || policy === "xhigh"
|
|
86
|
+
|| policy === "max" && customProjection)
|
|
87
|
+
&& wireEffortSet.has(policy));
|
|
88
|
+
const [first, ...rest] = supported;
|
|
50
89
|
if (first === undefined)
|
|
51
90
|
throw new TypeError(`${name} provider: no portable effort is representable`);
|
|
91
|
+
const efforts = [first, ...rest];
|
|
92
|
+
if (native) {
|
|
93
|
+
if (name === "openrouter" && info?.reasoning !== false) {
|
|
94
|
+
return {
|
|
95
|
+
declaredEfforts,
|
|
96
|
+
efforts,
|
|
97
|
+
reasoningRequestBody: (mode, budget) => {
|
|
98
|
+
if (mode === "off")
|
|
99
|
+
return { reasoning: { effort: "none" } };
|
|
100
|
+
if (budget !== null) {
|
|
101
|
+
if (mode !== "adaptive") {
|
|
102
|
+
throw new TypeError(`${name} provider: reasoning effort and budget are exclusive; choose one control`);
|
|
103
|
+
}
|
|
104
|
+
assertCatalogReasoningBudget(name, info, budget);
|
|
105
|
+
return { reasoning: { enabled: true, max_tokens: budget } };
|
|
106
|
+
}
|
|
107
|
+
if (mode !== "adaptive") {
|
|
108
|
+
return { reasoning: { enabled: true, effort: mode } };
|
|
109
|
+
}
|
|
110
|
+
return {
|
|
111
|
+
reasoning: adaptiveWireEffort === undefined
|
|
112
|
+
? { enabled: true }
|
|
113
|
+
: { enabled: true, effort: adaptiveWireEffort },
|
|
114
|
+
};
|
|
115
|
+
},
|
|
116
|
+
};
|
|
117
|
+
}
|
|
118
|
+
if ((name === "deepinfra" || name === "togetherai") && info?.reasoning !== false) {
|
|
119
|
+
return {
|
|
120
|
+
declaredEfforts,
|
|
121
|
+
efforts,
|
|
122
|
+
reasoningRequestBody: (mode, budget) => {
|
|
123
|
+
if (budget !== null) {
|
|
124
|
+
throw new TypeError(`${name} provider: reasoning budget is unsupported on this route`);
|
|
125
|
+
}
|
|
126
|
+
if (mode === "off")
|
|
127
|
+
return { reasoning_effort: "none" };
|
|
128
|
+
if (mode !== "adaptive")
|
|
129
|
+
return { reasoning_effort: mode };
|
|
130
|
+
return adaptiveWireEffort === undefined ? {} : { reasoning_effort: adaptiveWireEffort };
|
|
131
|
+
},
|
|
132
|
+
};
|
|
133
|
+
}
|
|
134
|
+
return { declaredEfforts, efforts };
|
|
135
|
+
}
|
|
52
136
|
return {
|
|
53
137
|
declaredEfforts,
|
|
54
|
-
efforts
|
|
138
|
+
efforts,
|
|
139
|
+
...(name === "alibaba" ? { outputTokenField: "max_completion_tokens" } : {}),
|
|
140
|
+
reasoningRequestBody: (mode, budget) => {
|
|
141
|
+
if (info?.reasoning === false) {
|
|
142
|
+
if (budget !== null)
|
|
143
|
+
throw new TypeError(`${name} model does not support reasoning`);
|
|
144
|
+
return {};
|
|
145
|
+
}
|
|
146
|
+
switch (name) {
|
|
147
|
+
case "deepseek":
|
|
148
|
+
if (budget !== null)
|
|
149
|
+
throw new TypeError(`${name} provider: reasoning budget is unsupported on this route`);
|
|
150
|
+
if (mode === "off")
|
|
151
|
+
return { thinking: { type: "disabled" } };
|
|
152
|
+
if (mode !== "adaptive")
|
|
153
|
+
return { thinking: { type: "enabled" }, reasoning_effort: mode };
|
|
154
|
+
return {
|
|
155
|
+
thinking: { type: "enabled" },
|
|
156
|
+
...(adaptiveWireEffort === undefined ? {} : { reasoning_effort: adaptiveWireEffort }),
|
|
157
|
+
};
|
|
158
|
+
case "alibaba":
|
|
159
|
+
if (mode === "off")
|
|
160
|
+
return { enable_thinking: false };
|
|
161
|
+
if (budget !== null) {
|
|
162
|
+
if (mode !== "adaptive") {
|
|
163
|
+
throw new TypeError(`${name} provider: reasoning effort and budget are exclusive; choose one control`);
|
|
164
|
+
}
|
|
165
|
+
assertCatalogReasoningBudget(name, info, budget);
|
|
166
|
+
return { enable_thinking: true, thinking_budget: budget };
|
|
167
|
+
}
|
|
168
|
+
if (mode !== "adaptive")
|
|
169
|
+
return { enable_thinking: true, reasoning_effort: mode };
|
|
170
|
+
return {
|
|
171
|
+
enable_thinking: true,
|
|
172
|
+
...(adaptiveWireEffort === undefined ? {} : { reasoning_effort: adaptiveWireEffort }),
|
|
173
|
+
};
|
|
174
|
+
case "fireworks-ai":
|
|
175
|
+
if (budget !== null)
|
|
176
|
+
throw new TypeError(`${name} provider: reasoning budget is unsupported on this route`);
|
|
177
|
+
if (mode === "off")
|
|
178
|
+
return { reasoning_effort: "none" };
|
|
179
|
+
if (mode !== "adaptive")
|
|
180
|
+
return { reasoning_effort: mode };
|
|
181
|
+
if (adaptiveWireEffort !== undefined)
|
|
182
|
+
return { reasoning_effort: adaptiveWireEffort };
|
|
183
|
+
if (info !== undefined && catalogSupportsToggle(info))
|
|
184
|
+
return { reasoning_effort: true };
|
|
185
|
+
return {};
|
|
186
|
+
case "cloudflare-workers-ai":
|
|
187
|
+
if (budget !== null)
|
|
188
|
+
throw new TypeError(`${name} provider: reasoning budget is unsupported on this route`);
|
|
189
|
+
if (info === undefined && declaredEfforts.length === 0)
|
|
190
|
+
return {};
|
|
191
|
+
if (mode === "off")
|
|
192
|
+
return { reasoning_effort: "none" };
|
|
193
|
+
if (mode !== "adaptive")
|
|
194
|
+
return { reasoning_effort: mode };
|
|
195
|
+
return adaptiveWireEffort === undefined ? {} : { reasoning_effort: adaptiveWireEffort };
|
|
196
|
+
default:
|
|
197
|
+
if (budget !== null)
|
|
198
|
+
throw new TypeError(`${name} provider: reasoning budget is unsupported on this route`);
|
|
199
|
+
if (mode === "off")
|
|
200
|
+
return wireEffortSet.has("none") ? { reasoning_effort: "none" } : {};
|
|
201
|
+
if (mode !== "adaptive")
|
|
202
|
+
return { reasoning_effort: mode };
|
|
203
|
+
return declaredEfforts.length > 0 && adaptiveWireEffort !== undefined
|
|
204
|
+
? { reasoning_effort: adaptiveWireEffort }
|
|
205
|
+
: {};
|
|
206
|
+
}
|
|
207
|
+
},
|
|
55
208
|
};
|
|
56
209
|
};
|
|
57
210
|
// {§provider-effort} Read-only discovery and construction share admission;
|
|
58
|
-
// the compatible
|
|
59
|
-
export const catalogEfforts = (provider, info, env) => reasoningCapabilities(provider.id, withProviderDefaults(env), info, provider.
|
|
211
|
+
// the compatible adapter is the only catalog transport without a native model.
|
|
212
|
+
export const catalogEfforts = (provider, info, env) => reasoningCapabilities(provider.id, withProviderDefaults(env), info, provider.adapter !== "openai-compatible").efforts;
|
|
60
213
|
const adaptiveEffortProjection = ({ name, env, model, reasoningCapable, info, declared, }) => {
|
|
61
214
|
if (!reasoningCapable)
|
|
62
215
|
return { adaptiveEffort: "provider-default" };
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
216
|
+
if (name === "anthropic" && model.includes("claude-")) {
|
|
217
|
+
return {
|
|
218
|
+
adaptiveEffort: "provider-default",
|
|
219
|
+
nativeAdaptiveThinking: true,
|
|
220
|
+
};
|
|
221
|
+
}
|
|
222
|
+
if (name === "amazon-bedrock" && model.includes("claude-")) {
|
|
223
|
+
return {
|
|
224
|
+
adaptiveEffort: "provider-default",
|
|
225
|
+
nativeAdaptiveThinking: true,
|
|
226
|
+
};
|
|
227
|
+
}
|
|
67
228
|
if (info !== undefined) {
|
|
68
229
|
return {
|
|
69
230
|
adaptiveEffort: adaptiveEffortFromEnv(env, catalogWireEfforts(info, declared)
|
|
@@ -72,7 +233,7 @@ const adaptiveEffortProjection = ({ name, env, model, reasoningCapable, info, de
|
|
|
72
233
|
}
|
|
73
234
|
return { adaptiveEffort: "provider-default" };
|
|
74
235
|
};
|
|
75
|
-
export const
|
|
236
|
+
export const providerFromModelAdapter = ({ name, env, model, providerModel, normalizeCost, url, headers, contextWindow, info, attributions, cacheAffinity, systemCacheBreakpoint, additiveReasoningProvider, requestControls, grammarStyle, endpoint, }) => {
|
|
76
237
|
emitWarningOnce(`${name} provider: request-level prompt counting is a chars/2 estimate; capacity is deferred to the provider`, "PLURNK_PROMPT_COUNT_ESTIMATE");
|
|
77
238
|
const maxInputTokens = info?.maxInputTokens ?? null;
|
|
78
239
|
const maxOutputTokens = info?.maxOutputTokens === undefined
|
|
@@ -81,14 +242,7 @@ export const providerFromSdkModel = ({ name, env, model, languageModel, normaliz
|
|
|
81
242
|
const envelope = generationEnvelopeFromEnv(env, name, contextWindow, maxOutputTokens);
|
|
82
243
|
const effort = effortFromEnv(env, name, envelope.reasoningBudget);
|
|
83
244
|
const reasoningCapable = info?.reasoning === true;
|
|
84
|
-
const { declaredEfforts, efforts,
|
|
85
|
-
// The AI SDK's portable reasoning setting has no `max`; a native route whose catalog documents it needs the
|
|
86
|
-
// provider's own option declared ({§provider-wire-declaration}), not a wider effort list.
|
|
87
|
-
if (effort.mode === "max" && !efforts.includes("max") && requestFields === undefined && info !== undefined
|
|
88
|
-
&& catalogSupportedEfforts({ info, declared: declaredEfforts }).includes("max")) {
|
|
89
|
-
const prefix = `PLURNK_PROVIDERS_PROVIDER_${name.replaceAll(/[^a-zA-Z0-9]/g, "_").toUpperCase()}`;
|
|
90
|
-
throw new UnsupportedEffortError(`provider:${name}`, "max", efforts, `The catalog documents 'max' for this route, but the native SDK's portable reasoning setting cannot express it; declare the SDK's own effort option: ${prefix}_OPTIONS_NAMESPACE and ${prefix}_REASONING_EFFORT_PATH.`);
|
|
91
|
-
}
|
|
245
|
+
const { declaredEfforts, efforts, outputTokenField, reasoningRequestBody, } = reasoningCapabilities(name, env, info, providerModel !== undefined);
|
|
92
246
|
const adaptiveEffort = adaptiveEffortProjection({
|
|
93
247
|
name,
|
|
94
248
|
env,
|
|
@@ -111,33 +265,33 @@ export const providerFromSdkModel = ({ name, env, model, languageModel, normaliz
|
|
|
111
265
|
? {}
|
|
112
266
|
: { cacheWrite: catalogCost.cacheWritePer1M }),
|
|
113
267
|
};
|
|
114
|
-
// {§
|
|
268
|
+
// {§provider-monetary-evidence} (#1357): the catalog is the starting point; a declared
|
|
115
269
|
// override merges over it, and the estimate's source names the overlay.
|
|
116
270
|
const costOverride = costOverrideFromEnv(env, name);
|
|
117
271
|
let rates = catalogRates;
|
|
118
272
|
if (costOverride !== null) {
|
|
119
273
|
const merged = { ...catalogRates, ...costOverride };
|
|
120
274
|
if (merged.input === undefined || merged.output === undefined) {
|
|
121
|
-
throw new Error(`${name} provider:
|
|
275
|
+
throw new Error(`${name} provider: PLURNK_PROVIDERS_COST_INPUT and PLURNK_PROVIDERS_COST_OUTPUT must both be set when catalog rates are absent`);
|
|
122
276
|
}
|
|
123
277
|
rates = { ...merged, input: merged.input, output: merged.output };
|
|
124
278
|
}
|
|
125
279
|
const rateSource = costOverride === null
|
|
126
280
|
? "Models.dev catalog rates"
|
|
127
|
-
: "operator
|
|
281
|
+
: "operator PLURNK_PROVIDERS_COST_* override over Models.dev catalog rates";
|
|
128
282
|
const estimateCost = (usage) => estimateProviderCost(usage, rates, rateSource);
|
|
129
283
|
const affinityEnabled = cacheAffinityFromEnv(env, name);
|
|
130
284
|
const cacheWritePolicy = cacheWritePolicyFromEnv(env, name);
|
|
131
|
-
return new
|
|
285
|
+
return new ModelProvider({
|
|
132
286
|
inferenceAdmission: inferenceAdmissionFromEnv(env, endpoint ?? url?.replace(/\/chat\/completions$/, "") ?? `sdk:${name}`),
|
|
133
287
|
model,
|
|
134
288
|
...(attributions === undefined ? {} : { attributions }),
|
|
135
|
-
...(
|
|
289
|
+
...(providerModel === undefined ? {} : { providerModel }),
|
|
136
290
|
...(normalizeCost === undefined ? {} : { normalizeCost }),
|
|
137
291
|
...(url === undefined ? {} : { url }),
|
|
138
292
|
...(headers === undefined ? {} : { headers: { ...headers } }),
|
|
139
293
|
contextWindow,
|
|
140
|
-
// {§provider-
|
|
294
|
+
// {§provider-interface} — the catalog's input modalities decide which native parts ride.
|
|
141
295
|
inputModalities: inputModalitiesOf(info?.modalities.input),
|
|
142
296
|
maxInputTokens,
|
|
143
297
|
maxOutputTokens,
|
|
@@ -157,14 +311,12 @@ export const providerFromSdkModel = ({ name, env, model, languageModel, normaliz
|
|
|
157
311
|
repeatPenalty: parseOptionalFloat(env.PLURNK_PROVIDERS_REPEAT_PENALTY, "PLURNK_PROVIDERS_REPEAT_PENALTY", name, 0),
|
|
158
312
|
retryAttempts: parseRequiredInt(env.PLURNK_PROVIDERS_RETRY_ATTEMPTS, "PLURNK_PROVIDERS_RETRY_ATTEMPTS", name),
|
|
159
313
|
errorDetailLimit: parseRequiredInt(env.PLURNK_PROVIDERS_ERROR_DETAIL_LIMIT, "PLURNK_PROVIDERS_ERROR_DETAIL_LIMIT", name),
|
|
160
|
-
...(
|
|
314
|
+
...(outputTokenField === undefined ? {} : { outputTokenField }),
|
|
315
|
+
...(reasoningRequestBody === undefined ? {} : { reasoningRequestBody }),
|
|
161
316
|
...(affinityEnabled && cacheAffinity !== undefined ? { cacheAffinity } : {}),
|
|
162
|
-
...(cacheWritePolicy === "stable-system" &&
|
|
163
|
-
? {
|
|
317
|
+
...(cacheWritePolicy === "stable-system" && systemCacheBreakpoint === true
|
|
318
|
+
? { systemCacheBreakpoint: true }
|
|
164
319
|
: {}),
|
|
165
|
-
...(reasoningResponseProviderOptions === undefined
|
|
166
|
-
? {}
|
|
167
|
-
: { reasoningResponseProviderOptions }),
|
|
168
320
|
serviceTier: env.PLURNK_PROVIDERS_SERVICE_TIER,
|
|
169
321
|
...(requestControls === undefined ? {} : { requestControls }),
|
|
170
322
|
estimateCost,
|
|
@@ -198,24 +350,22 @@ export const catalogProviderFromEnv = (name, env, model, baseUrlOverride) => {
|
|
|
198
350
|
if (contextWindow === null) {
|
|
199
351
|
throw new Error(`${name} provider: context window unresolved for "${wireModel}" — set PLURNK_PROVIDERS_CONTEXT_WINDOW or update the Models.dev snapshot`);
|
|
200
352
|
}
|
|
201
|
-
const
|
|
202
|
-
if (
|
|
353
|
+
const adapted = createProviderModel(name, wireModel, env, baseUrlOverride);
|
|
354
|
+
if (adapted === null)
|
|
203
355
|
return null;
|
|
204
|
-
return
|
|
356
|
+
return providerFromModelAdapter({
|
|
205
357
|
name,
|
|
206
358
|
env,
|
|
207
359
|
model: wireModel,
|
|
208
|
-
|
|
209
|
-
normalizeCost:
|
|
210
|
-
url:
|
|
211
|
-
endpoint:
|
|
212
|
-
headers:
|
|
213
|
-
cacheAffinity:
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
...(sdk.requestControls === undefined ? {} : { requestControls: sdk.requestControls }),
|
|
218
|
-
sdkPackage: sdk.catalog?.npm,
|
|
360
|
+
providerModel: adapted.providerModel,
|
|
361
|
+
normalizeCost: adapted.normalizeCost,
|
|
362
|
+
url: adapted.compatible?.url,
|
|
363
|
+
endpoint: adapted.endpoint,
|
|
364
|
+
headers: adapted.compatible?.headers,
|
|
365
|
+
cacheAffinity: adapted.cacheAffinity,
|
|
366
|
+
systemCacheBreakpoint: adapted.systemCacheBreakpoint,
|
|
367
|
+
additiveReasoningProvider: adapted.additiveReasoningProvider,
|
|
368
|
+
...(adapted.requestControls === undefined ? {} : { requestControls: adapted.requestControls }),
|
|
219
369
|
contextWindow,
|
|
220
370
|
info,
|
|
221
371
|
});
|