@x12i/ai-profiles 3.2.1 → 3.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +21 -21
- package/dist/buildResolvedProfile.d.ts +2 -2
- package/dist/buildResolvedProfile.d.ts.map +1 -1
- package/dist/buildResolvedProfile.js +5 -5
- package/dist/buildResolvedProfile.js.map +1 -1
- package/dist/ensureConcreteModel.d.ts +2 -2
- package/dist/ensureConcreteModel.d.ts.map +1 -1
- package/dist/ensureConcreteModel.js +2 -2
- package/dist/ensureConcreteModel.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/isReasoningModel.d.ts +2 -2
- package/dist/isReasoningModel.d.ts.map +1 -1
- package/dist/isReasoningModel.js +1 -1
- package/dist/isReasoningModel.js.map +1 -1
- package/dist/modelInputFallback.d.ts +2 -2
- package/dist/modelInputFallback.d.ts.map +1 -1
- package/dist/modelInputFallback.js +3 -3
- package/dist/modelInputFallback.js.map +1 -1
- package/dist/normalizeInvokeModel.d.ts +4 -4
- package/dist/normalizeInvokeModel.d.ts.map +1 -1
- package/dist/normalizeInvokeModel.js +11 -11
- package/dist/normalizeInvokeModel.js.map +1 -1
- package/dist/requireCatalogModel.d.ts +3 -3
- package/dist/requireCatalogModel.d.ts.map +1 -1
- package/dist/requireCatalogModel.js +8 -8
- package/dist/requireCatalogModel.js.map +1 -1
- package/dist/resolveAIProfile.js +2 -2
- package/dist/resolveAIProfile.js.map +1 -1
- package/dist/resolveAIProfileWithCostAlternatives.js +2 -2
- package/dist/resolveAIProfileWithCostAlternatives.js.map +1 -1
- package/dist/resolveBundledCatalogModel.d.ts +2 -2
- package/dist/resolveBundledCatalogModel.d.ts.map +1 -1
- package/dist/resolveBundledCatalogModel.js +11 -11
- package/dist/resolveBundledCatalogModel.js.map +1 -1
- package/dist/resolveCatalogModel.js +1 -1
- package/dist/resolveCatalogModel.js.map +1 -1
- package/dist/resolveModelRouting.d.ts +11 -6
- package/dist/resolveModelRouting.d.ts.map +1 -1
- package/dist/resolveModelRouting.js +37 -19
- package/dist/resolveModelRouting.js.map +1 -1
- package/dist/resolveProfileInputCore.js +1 -1
- package/dist/resolveProfileInputCore.js.map +1 -1
- package/dist/resolveSecondaryModel.d.ts +1 -1
- package/dist/resolveSecondaryModel.d.ts.map +1 -1
- package/dist/resolveSecondaryModel.js +3 -3
- package/dist/resolveSecondaryModel.js.map +1 -1
- package/dist/secondaryModel.d.ts +4 -4
- package/dist/secondaryModel.d.ts.map +1 -1
- package/dist/secondaryModel.js +2 -2
- package/dist/secondaryModel.js.map +1 -1
- package/dist/types.d.ts +6 -4
- package/dist/types.d.ts.map +1 -1
- package/dist/validateProfileCatalogLinkage.js +1 -1
- package/dist/validateProfileCatalogLinkage.js.map +1 -1
- package/package.json +1 -1
|
@@ -4,7 +4,7 @@ import { formatGatewayWireId, isGatewayProvider, normalizeGatewayWireId, } from
|
|
|
4
4
|
import { matchStrictProfileInput } from "./profileChoiceKey.js";
|
|
5
5
|
import { resolveBundledAIProfile } from "./resolveBundledAIProfile.js";
|
|
6
6
|
import { resolveAIProfile } from "./resolveAIProfile.js";
|
|
7
|
-
import {
|
|
7
|
+
import { resolvePreferOpenRouter } from "./resolveModelRouting.js";
|
|
8
8
|
function throwAliasAtGateway(model) {
|
|
9
9
|
throw new AIProfilesError("INVOKE_MODEL_ALIAS_AT_GATEWAY", `Profile/choice alias "${model}" must be resolved with resolveAIProfile before invoke normalization`, { model });
|
|
10
10
|
}
|
|
@@ -17,11 +17,11 @@ function isAliasAtGateway(model, allowAlias) {
|
|
|
17
17
|
}
|
|
18
18
|
return matchStrictProfileInput(getBundledRegistry(), model) !== undefined;
|
|
19
19
|
}
|
|
20
|
-
function resolveRoutingHint(routing,
|
|
20
|
+
function resolveRoutingHint(routing, preferOpenRouter) {
|
|
21
21
|
if (routing === "openrouter" || routing === "direct") {
|
|
22
22
|
return routing;
|
|
23
23
|
}
|
|
24
|
-
return
|
|
24
|
+
return preferOpenRouter ? "openrouter" : "direct";
|
|
25
25
|
}
|
|
26
26
|
function stripGatewayPrefixFromModel(model) {
|
|
27
27
|
const gateway = normalizeGatewayWireId(model);
|
|
@@ -72,8 +72,8 @@ function finalizeNormalized(params) {
|
|
|
72
72
|
}
|
|
73
73
|
function normalizeInvokeModelObject(input) {
|
|
74
74
|
const allowAlias = input.allowAlias === true;
|
|
75
|
-
const
|
|
76
|
-
const routing = resolveRoutingHint(input.routing,
|
|
75
|
+
const preferOpenRouter = resolvePreferOpenRouter(input.preferOpenRouter);
|
|
76
|
+
const routing = resolveRoutingHint(input.routing, preferOpenRouter);
|
|
77
77
|
let model = normalizeModelField(input.model);
|
|
78
78
|
if (!model) {
|
|
79
79
|
throwInvalidShape("Invoke model string is empty", { input });
|
|
@@ -90,7 +90,7 @@ function normalizeInvokeModelObject(input) {
|
|
|
90
90
|
else if (provider && isGatewayProvider(provider)) {
|
|
91
91
|
model = normalizeModelField(model);
|
|
92
92
|
}
|
|
93
|
-
if (!provider && routing === "openrouter" &&
|
|
93
|
+
if (!provider && routing === "openrouter" && preferOpenRouter && model.includes("/")) {
|
|
94
94
|
provider = "openrouter";
|
|
95
95
|
}
|
|
96
96
|
if (!provider && model.includes("/")) {
|
|
@@ -113,7 +113,7 @@ function normalizeInvokeModelObject(input) {
|
|
|
113
113
|
routing,
|
|
114
114
|
});
|
|
115
115
|
}
|
|
116
|
-
if (routing === "openrouter" &&
|
|
116
|
+
if (routing === "openrouter" && preferOpenRouter) {
|
|
117
117
|
if (!isGatewayProvider(provider)) {
|
|
118
118
|
provider = "openrouter";
|
|
119
119
|
}
|
|
@@ -139,13 +139,13 @@ export function normalizeInvokeModel(input, options = {}) {
|
|
|
139
139
|
}
|
|
140
140
|
return normalizeInvokeModelObject({
|
|
141
141
|
model,
|
|
142
|
-
|
|
142
|
+
preferOpenRouter: options.preferOpenRouter,
|
|
143
143
|
allowAlias: options.allowAlias,
|
|
144
144
|
});
|
|
145
145
|
}
|
|
146
146
|
return normalizeInvokeModelObject({
|
|
147
147
|
...input,
|
|
148
|
-
|
|
148
|
+
preferOpenRouter: input.preferOpenRouter ?? options.preferOpenRouter,
|
|
149
149
|
allowAlias: input.allowAlias ?? options.allowAlias,
|
|
150
150
|
});
|
|
151
151
|
}
|
|
@@ -158,7 +158,7 @@ export async function resolveAndNormalizeInvokeModel(alias, options) {
|
|
|
158
158
|
provider: resolved.provider,
|
|
159
159
|
model: resolved.modelId,
|
|
160
160
|
routing: resolved.routing,
|
|
161
|
-
|
|
161
|
+
preferOpenRouter: options.preferOpenRouter,
|
|
162
162
|
});
|
|
163
163
|
}
|
|
164
164
|
/**
|
|
@@ -170,7 +170,7 @@ export function resolveAndNormalizeBundledInvokeModel(alias, options) {
|
|
|
170
170
|
provider: resolved.provider,
|
|
171
171
|
model: resolved.modelId,
|
|
172
172
|
routing: resolved.routing,
|
|
173
|
-
|
|
173
|
+
preferOpenRouter: options.preferOpenRouter,
|
|
174
174
|
});
|
|
175
175
|
}
|
|
176
176
|
//# sourceMappingURL=normalizeInvokeModel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalizeInvokeModel.js","sourceRoot":"","sources":["../src/normalizeInvokeModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,sBAAsB,GACvB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"normalizeInvokeModel.js","sourceRoot":"","sources":["../src/normalizeInvokeModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type CatalogResilienceSource } from "./catalogResilience.js";
|
|
2
|
-
import type { AIProfileWarning, AIProvider, ProfileCatalogLane, RegistrySourceMode } from "./types.js";
|
|
2
|
+
import type { AIProfileWarning, AIProvider, PreferOpenRouterInput, ProfileCatalogLane, RegistrySourceMode } from "./types.js";
|
|
3
3
|
import type { CatalogMatchConfidence } from "./resolveBundledCatalogModel.js";
|
|
4
4
|
export interface RequireCatalogModelOptions {
|
|
5
5
|
/**
|
|
@@ -9,7 +9,7 @@ export interface RequireCatalogModelOptions {
|
|
|
9
9
|
bundledOnly?: boolean;
|
|
10
10
|
source?: RegistrySourceMode;
|
|
11
11
|
refresh?: boolean;
|
|
12
|
-
|
|
12
|
+
preferOpenRouter?: PreferOpenRouterInput;
|
|
13
13
|
catalogLane?: ProfileCatalogLane;
|
|
14
14
|
}
|
|
15
15
|
export interface RequireCatalogModelResult {
|
|
@@ -35,5 +35,5 @@ export declare function requireCatalogModel(input: string, options?: RequireCata
|
|
|
35
35
|
/**
|
|
36
36
|
* Sync bundled variant of {@link requireCatalogModel} (no network).
|
|
37
37
|
*/
|
|
38
|
-
export declare function requireBundledCatalogModel(input: string, options?: Pick<RequireCatalogModelOptions, "
|
|
38
|
+
export declare function requireBundledCatalogModel(input: string, options?: Pick<RequireCatalogModelOptions, "preferOpenRouter">): RequireCatalogModelResult;
|
|
39
39
|
//# sourceMappingURL=requireCatalogModel.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requireCatalogModel.d.ts","sourceRoot":"","sources":["../src/requireCatalogModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,uBAAuB,EAE7B,MAAM,wBAAwB,CAAC;AAIhC,OAAO,KAAK,EACV,gBAAgB,EAChB,UAAU,EACV,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAE9E,MAAM,WAAW,0BAA0B;IACzC;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,
|
|
1
|
+
{"version":3,"file":"requireCatalogModel.d.ts","sourceRoot":"","sources":["../src/requireCatalogModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,uBAAuB,EAE7B,MAAM,wBAAwB,CAAC;AAIhC,OAAO,KAAK,EACV,gBAAgB,EAChB,UAAU,EACV,qBAAqB,EACrB,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAE9E,MAAM,WAAW,0BAA0B;IACzC;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gBAAgB,CAAC,EAAE,qBAAqB,CAAC;IACzC,WAAW,CAAC,EAAE,kBAAkB,CAAC;CAClC;AAED,MAAM,WAAW,yBAAyB;IACxC,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,CAAC,EAAE,UAAU,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,YAAY,GAAG,QAAQ,CAAC;IAClC,eAAe,CAAC,EAAE,sBAAsB,GAAG,QAAQ,CAAC;IACpD,gBAAgB,CAAC,EAAE,uBAAuB,CAAC;IAC3C,aAAa,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACpD,QAAQ,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAC/B;AA8CD;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,MAAM,EACb,OAAO,GAAE,0BAA+B,GACvC,OAAO,CAAC,yBAAyB,CAAC,CA6BpC;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,MAAM,EACb,OAAO,GAAE,IAAI,CAAC,0BAA0B,EAAE,kBAAkB,CAAM,GACjE,yBAAyB,CAO3B"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { isTrustedCatalogMatch, resolveModelFromCatalogResilient, } from "./catalogResilience.js";
|
|
2
2
|
import { loadBundledModelsCatalog } from "./loader/loadBundledModelsCatalog.js";
|
|
3
3
|
import { loadModelsCatalogWithWarnings } from "./loader/loadModelsCatalog.js";
|
|
4
|
-
import {
|
|
4
|
+
import { resolvePreferOpenRouter } from "./resolveModelRouting.js";
|
|
5
5
|
function resilienceWarning(match) {
|
|
6
6
|
if (!match.warning) {
|
|
7
7
|
return undefined;
|
|
@@ -18,8 +18,8 @@ function resilienceWarning(match) {
|
|
|
18
18
|
message: match.warning,
|
|
19
19
|
};
|
|
20
20
|
}
|
|
21
|
-
function toRequireResult(match,
|
|
22
|
-
const endpoint =
|
|
21
|
+
function toRequireResult(match, preferOpenRouter) {
|
|
22
|
+
const endpoint = preferOpenRouter && match.invocation.openrouter
|
|
23
23
|
? match.invocation.openrouter
|
|
24
24
|
: match.invocation.direct;
|
|
25
25
|
const warning = resilienceWarning(match);
|
|
@@ -43,7 +43,7 @@ function toRequireResult(match, useOpenRouter) {
|
|
|
43
43
|
* Falls back to bundled catalog rows, profile registry, and models-registry.json.
|
|
44
44
|
*/
|
|
45
45
|
export async function requireCatalogModel(input, options = {}) {
|
|
46
|
-
const
|
|
46
|
+
const preferOpenRouter = resolvePreferOpenRouter(options.preferOpenRouter);
|
|
47
47
|
const bundledOnly = options.bundledOnly ?? false;
|
|
48
48
|
if (bundledOnly) {
|
|
49
49
|
const catalog = loadBundledModelsCatalog();
|
|
@@ -51,7 +51,7 @@ export async function requireCatalogModel(input, options = {}) {
|
|
|
51
51
|
skipBundledMerge: true,
|
|
52
52
|
});
|
|
53
53
|
return match && isTrustedCatalogMatch(match)
|
|
54
|
-
? toRequireResult(match,
|
|
54
|
+
? toRequireResult(match, preferOpenRouter)
|
|
55
55
|
: { found: false };
|
|
56
56
|
}
|
|
57
57
|
const { catalog, warnings: loaderWarnings } = await loadModelsCatalogWithWarnings({
|
|
@@ -62,7 +62,7 @@ export async function requireCatalogModel(input, options = {}) {
|
|
|
62
62
|
if (!match || !isTrustedCatalogMatch(match)) {
|
|
63
63
|
return { found: false };
|
|
64
64
|
}
|
|
65
|
-
const result = toRequireResult(match,
|
|
65
|
+
const result = toRequireResult(match, preferOpenRouter);
|
|
66
66
|
if (loaderWarnings.length > 0) {
|
|
67
67
|
result.warnings = [...loaderWarnings, ...(result.warnings ?? [])];
|
|
68
68
|
}
|
|
@@ -72,11 +72,11 @@ export async function requireCatalogModel(input, options = {}) {
|
|
|
72
72
|
* Sync bundled variant of {@link requireCatalogModel} (no network).
|
|
73
73
|
*/
|
|
74
74
|
export function requireBundledCatalogModel(input, options = {}) {
|
|
75
|
-
const
|
|
75
|
+
const preferOpenRouter = resolvePreferOpenRouter(options.preferOpenRouter);
|
|
76
76
|
const catalog = loadBundledModelsCatalog();
|
|
77
77
|
const match = resolveModelFromCatalogResilient(input, catalog, {
|
|
78
78
|
skipBundledMerge: true,
|
|
79
79
|
});
|
|
80
|
-
return match ? toRequireResult(match,
|
|
80
|
+
return match ? toRequireResult(match, preferOpenRouter) : { found: false };
|
|
81
81
|
}
|
|
82
82
|
//# sourceMappingURL=requireCatalogModel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requireCatalogModel.js","sourceRoot":"","sources":["../src/requireCatalogModel.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,gCAAgC,GAGjC,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAE,6BAA6B,EAAE,MAAM,+BAA+B,CAAC;AAC9E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"requireCatalogModel.js","sourceRoot":"","sources":["../src/requireCatalogModel.ts"],"names":[],"mappings":"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"}
|
package/dist/resolveAIProfile.js
CHANGED
|
@@ -153,12 +153,12 @@ export async function resolveAIProfile(input, options) {
|
|
|
153
153
|
choiceKey: finalChoiceKey,
|
|
154
154
|
registry,
|
|
155
155
|
loaderWarnings,
|
|
156
|
-
|
|
156
|
+
preferOpenRouter: options.preferOpenRouter,
|
|
157
157
|
catalog: catalogResult.catalog,
|
|
158
158
|
costCapApplied: normalizeCostCap(costCapPer1M),
|
|
159
159
|
});
|
|
160
160
|
if (options.includeSecondary) {
|
|
161
|
-
return attachSecondaryToResolved(resolved, registry, catalogResult.catalog, options.
|
|
161
|
+
return attachSecondaryToResolved(resolved, registry, catalogResult.catalog, options.preferOpenRouter);
|
|
162
162
|
}
|
|
163
163
|
return resolved;
|
|
164
164
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveAIProfile.js","sourceRoot":"","sources":["../src/resolveAIProfile.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"resolveAIProfile.js","sourceRoot":"","sources":["../src/resolveAIProfile.ts"],"names":[],"mappings":"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"}
|
|
@@ -93,12 +93,12 @@ export async function resolveAIProfileWithCostAlternatives(input, options) {
|
|
|
93
93
|
choiceKey: picked.choiceKey,
|
|
94
94
|
registry,
|
|
95
95
|
loaderWarnings,
|
|
96
|
-
|
|
96
|
+
preferOpenRouter: options.preferOpenRouter,
|
|
97
97
|
catalog: catalogResult.catalog,
|
|
98
98
|
costCapApplied: normalizeCostCap(capOverride ?? baseCostCapPer1M),
|
|
99
99
|
});
|
|
100
100
|
return options.includeSecondary
|
|
101
|
-
? attachSecondaryToResolved(resolved, registry, catalogResult.catalog, options.
|
|
101
|
+
? attachSecondaryToResolved(resolved, registry, catalogResult.catalog, options.preferOpenRouter)
|
|
102
102
|
: resolved;
|
|
103
103
|
};
|
|
104
104
|
const primary = pickAndResolve(undefined);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveAIProfileWithCostAlternatives.js","sourceRoot":"","sources":["../src/resolveAIProfileWithCostAlternatives.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"resolveAIProfileWithCostAlternatives.js","sourceRoot":"","sources":["../src/resolveAIProfileWithCostAlternatives.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type { AIProvider, ResolvedAIProfile } from "./types.js";
|
|
1
|
+
import type { AIProvider, PreferOpenRouterInput, ResolvedAIProfile } from "./types.js";
|
|
2
2
|
export interface ResolveBundledCatalogModelOptions {
|
|
3
|
-
|
|
3
|
+
preferOpenRouter?: PreferOpenRouterInput;
|
|
4
4
|
}
|
|
5
5
|
export type BundledCatalogModelInput = string | {
|
|
6
6
|
provider: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveBundledCatalogModel.d.ts","sourceRoot":"","sources":["../src/resolveBundledCatalogModel.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"resolveBundledCatalogModel.d.ts","sourceRoot":"","sources":["../src/resolveBundledCatalogModel.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,UAAU,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAEvF,MAAM,WAAW,iCAAiC;IAChD,gBAAgB,CAAC,EAAE,qBAAqB,CAAC;CAC1C;AAED,MAAM,MAAM,wBAAwB,GAChC,MAAM,GACN;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1C,MAAM,MAAM,sBAAsB,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,CAAC;AAEzE,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,UAAU,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,YAAY,GAAG,QAAQ,CAAC;IACjC,eAAe,EAAE,sBAAsB,CAAC;CACzC;AAqED;;GAEG;AACH,wBAAgB,oCAAoC,CAClD,KAAK,EAAE,wBAAwB,EAC/B,OAAO,GAAE,iCAAsC,GAC9C,wBAAwB,CA2C1B;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,wBAAwB,EAC/B,OAAO,GAAE,iCAAsC,GAC9C,iBAAiB,CAqDnB"}
|
|
@@ -4,7 +4,7 @@ import { AIProfilesError } from "./errors.js";
|
|
|
4
4
|
import { formatGatewayWireId, isGatewayProvider, normalizeGatewayWireId, } from "./gatewayWireId.js";
|
|
5
5
|
import { isTrustedCatalogMatch, resolveModelFromCatalogResilient, } from "./catalogResilience.js";
|
|
6
6
|
import { buildResolvedModelInput, modelLikeFallbackInvocation, } from "./modelInputFallback.js";
|
|
7
|
-
import {
|
|
7
|
+
import { resolvePreferOpenRouter } from "./resolveModelRouting.js";
|
|
8
8
|
function catalogLookupKey(input) {
|
|
9
9
|
if (typeof input === "string") {
|
|
10
10
|
const gateway = normalizeGatewayWireId(input);
|
|
@@ -33,8 +33,8 @@ function catalogLookupKey(input) {
|
|
|
33
33
|
: `${provider}/${modelId}`;
|
|
34
34
|
return { lookupInput: combined, displayInput: combined, gatewayWire: null };
|
|
35
35
|
}
|
|
36
|
-
function endpointFromMatch(match,
|
|
37
|
-
const endpoint =
|
|
36
|
+
function endpointFromMatch(match, preferOpenRouter) {
|
|
37
|
+
const endpoint = preferOpenRouter && match.invocation.openrouter
|
|
38
38
|
? match.invocation.openrouter
|
|
39
39
|
: match.invocation.direct;
|
|
40
40
|
return {
|
|
@@ -43,8 +43,8 @@ function endpointFromMatch(match, useOpenRouter) {
|
|
|
43
43
|
routing: endpoint.provider === "openrouter" ? "openrouter" : "direct",
|
|
44
44
|
};
|
|
45
45
|
}
|
|
46
|
-
function applyGatewayPresentation(routed, gatewayWire,
|
|
47
|
-
if (!gatewayWire || !
|
|
46
|
+
function applyGatewayPresentation(routed, gatewayWire, preferOpenRouter) {
|
|
47
|
+
if (!gatewayWire || !preferOpenRouter) {
|
|
48
48
|
return routed;
|
|
49
49
|
}
|
|
50
50
|
return {
|
|
@@ -59,26 +59,26 @@ function applyGatewayPresentation(routed, gatewayWire, useOpenRouter) {
|
|
|
59
59
|
*/
|
|
60
60
|
export function resolveBundledCatalogModelBestEffort(input, options = {}) {
|
|
61
61
|
const catalog = loadBundledModelsCatalog();
|
|
62
|
-
const
|
|
62
|
+
const preferOpenRouter = resolvePreferOpenRouter(options.preferOpenRouter);
|
|
63
63
|
const { lookupInput, displayInput, gatewayWire } = catalogLookupKey(input);
|
|
64
64
|
const match = resolveModelFromCatalogResilient(lookupInput, catalog, {
|
|
65
65
|
skipBundledMerge: true,
|
|
66
66
|
});
|
|
67
67
|
if (match) {
|
|
68
|
-
const routed = endpointFromMatch(match,
|
|
68
|
+
const routed = endpointFromMatch(match, preferOpenRouter);
|
|
69
69
|
const matchConfidence = match.resilienceSource === "parsed-invocation" ? "parsed" : match.confidence;
|
|
70
70
|
return applyGatewayPresentation({
|
|
71
71
|
...routed,
|
|
72
72
|
matchConfidence,
|
|
73
|
-
}, gatewayWire,
|
|
73
|
+
}, gatewayWire, preferOpenRouter);
|
|
74
74
|
}
|
|
75
75
|
const parsed = modelLikeFallbackInvocation(lookupInput);
|
|
76
76
|
if (parsed) {
|
|
77
|
-
const routed = endpointFromMatch({ invocation: parsed, confidence: "low", score: 0, matchedBy: lookupInput },
|
|
77
|
+
const routed = endpointFromMatch({ invocation: parsed, confidence: "low", score: 0, matchedBy: lookupInput }, preferOpenRouter);
|
|
78
78
|
return applyGatewayPresentation({
|
|
79
79
|
...routed,
|
|
80
80
|
matchConfidence: "parsed",
|
|
81
|
-
}, gatewayWire,
|
|
81
|
+
}, gatewayWire, preferOpenRouter);
|
|
82
82
|
}
|
|
83
83
|
throw new AIProfilesError("UNKNOWN_MODEL", `Unknown catalog model: ${displayInput}`, { input: displayInput });
|
|
84
84
|
}
|
|
@@ -115,7 +115,7 @@ export function resolveBundledCatalogModel(input, options = {}) {
|
|
|
115
115
|
match,
|
|
116
116
|
registry,
|
|
117
117
|
loaderWarnings,
|
|
118
|
-
|
|
118
|
+
preferOpenRouter: options.preferOpenRouter,
|
|
119
119
|
});
|
|
120
120
|
const routed = resolveBundledCatalogModelBestEffort(input, options);
|
|
121
121
|
if (routed.routing === "openrouter" && routed.provider === "openrouter") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveBundledCatalogModel.js","sourceRoot":"","sources":["../src/resolveBundledCatalogModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EACL,mBAAmB,EAEnB,iBAAiB,EACjB,sBAAsB,GACvB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,qBAAqB,EACrB,gCAAgC,GACjC,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,uBAAuB,EACvB,2BAA2B,GAE5B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"resolveBundledCatalogModel.js","sourceRoot":"","sources":["../src/resolveBundledCatalogModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,7 +48,7 @@ export async function resolveCatalogModel(input, options) {
|
|
|
48
48
|
match: resilient,
|
|
49
49
|
registry,
|
|
50
50
|
loaderWarnings,
|
|
51
|
-
|
|
51
|
+
preferOpenRouter: options.preferOpenRouter,
|
|
52
52
|
});
|
|
53
53
|
}
|
|
54
54
|
//# sourceMappingURL=resolveCatalogModel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveCatalogModel.js","sourceRoot":"","sources":["../src/resolveCatalogModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,kCAAkC,EAAE,MAAM,oCAAoC,CAAC;AACxF,OAAO,EAAE,6BAA6B,EAAE,MAAM,+BAA+B,CAAC;AAC9E,OAAO,EACL,qBAAqB,EACrB,gCAAgC,GACjC,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,uBAAuB,EACvB,iBAAiB,GAClB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAGrC;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,KAAa,EACb,OAAmC;IAEnC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAChE,kCAAkC,CAAC;YACjC,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAC;QACF,6BAA6B,CAAC;YAC5B,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAC;KACH,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,gCAAgC,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IACjF,IAAI,CAAC,SAAS,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,eAAe,CACvB,eAAe,EACf,0BAA0B,KAAK,EAAE,EACjC,EAAE,KAAK,EAAE,CACV,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,8BAA8B,EAAE;QAC1C,GAAG,iBAAiB,CAAC,KAAK,EAAE,SAAS,CAAC;QACtC,gBAAgB,EAAE,SAAS,CAAC,gBAAgB;QAC5C,GAAG,CAAC,SAAS,CAAC,aAAa;YACzB,CAAC,CAAC,EAAE,aAAa,EAAE,SAAS,CAAC,aAAa,EAAE;YAC5C,CAAC,CAAC,EAAE,CAAC;KACR,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,CAAC,GAAG,QAAQ,EAAE,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;IAChE,IAAI,SAAS,CAAC,OAAO,IAAI,SAAS,CAAC,gBAAgB,KAAK,iBAAiB,EAAE,CAAC;QAC1E,cAAc,CAAC,IAAI,CAAC;YAClB,IAAI,EACF,SAAS,CAAC,gBAAgB,KAAK,0BAA0B;gBACvD,CAAC,CAAC,0BAA0B;gBAC5B,CAAC,CAAC,SAAS,CAAC,gBAAgB,KAAK,mBAAmB;oBAClD,CAAC,CAAC,2BAA2B;oBAC7B,CAAC,CAAC,SAAS,CAAC,gBAAgB,KAAK,2BAA2B;wBAC1D,CAAC,CAAC,mCAAmC;wBACrC,CAAC,CAAC,yBAAyB;YACnC,OAAO,EAAE,SAAS,CAAC,OAAO;SAC3B,CAAC,CAAC;IACL,CAAC;IAED,OAAO,uBAAuB,CAAC;QAC7B,KAAK;QACL,KAAK,EAAE,SAAS;QAChB,QAAQ;QACR,cAAc;QACd,
|
|
1
|
+
{"version":3,"file":"resolveCatalogModel.js","sourceRoot":"","sources":["../src/resolveCatalogModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,kCAAkC,EAAE,MAAM,oCAAoC,CAAC;AACxF,OAAO,EAAE,6BAA6B,EAAE,MAAM,+BAA+B,CAAC;AAC9E,OAAO,EACL,qBAAqB,EACrB,gCAAgC,GACjC,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,uBAAuB,EACvB,iBAAiB,GAClB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAGrC;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,KAAa,EACb,OAAmC;IAEnC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAChE,kCAAkC,CAAC;YACjC,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAC;QACF,6BAA6B,CAAC;YAC5B,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAC;KACH,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,gCAAgC,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IACjF,IAAI,CAAC,SAAS,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,eAAe,CACvB,eAAe,EACf,0BAA0B,KAAK,EAAE,EACjC,EAAE,KAAK,EAAE,CACV,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,8BAA8B,EAAE;QAC1C,GAAG,iBAAiB,CAAC,KAAK,EAAE,SAAS,CAAC;QACtC,gBAAgB,EAAE,SAAS,CAAC,gBAAgB;QAC5C,GAAG,CAAC,SAAS,CAAC,aAAa;YACzB,CAAC,CAAC,EAAE,aAAa,EAAE,SAAS,CAAC,aAAa,EAAE;YAC5C,CAAC,CAAC,EAAE,CAAC;KACR,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,CAAC,GAAG,QAAQ,EAAE,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;IAChE,IAAI,SAAS,CAAC,OAAO,IAAI,SAAS,CAAC,gBAAgB,KAAK,iBAAiB,EAAE,CAAC;QAC1E,cAAc,CAAC,IAAI,CAAC;YAClB,IAAI,EACF,SAAS,CAAC,gBAAgB,KAAK,0BAA0B;gBACvD,CAAC,CAAC,0BAA0B;gBAC5B,CAAC,CAAC,SAAS,CAAC,gBAAgB,KAAK,mBAAmB;oBAClD,CAAC,CAAC,2BAA2B;oBAC7B,CAAC,CAAC,SAAS,CAAC,gBAAgB,KAAK,2BAA2B;wBAC1D,CAAC,CAAC,mCAAmC;wBACrC,CAAC,CAAC,yBAAyB;YACnC,OAAO,EAAE,SAAS,CAAC,OAAO;SAC3B,CAAC,CAAC;IACL,CAAC;IAED,OAAO,uBAAuB,CAAC;QAC7B,KAAK;QACL,KAAK,EAAE,SAAS;QAChB,QAAQ;QACR,cAAc;QACd,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;KAC3C,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,13 +1,18 @@
|
|
|
1
|
-
import type { AIProfileBackend, AIProfileChoice, AIProvider, ModelsCatalogJson } from "./types.js";
|
|
1
|
+
import type { AIProfileBackend, AIProfileChoice, AIProvider, ModelsCatalogJson, PreferOpenRouterInput } from "./types.js";
|
|
2
2
|
import { buildOpenRouterModelId } from "./modelIdentity.js";
|
|
3
3
|
export type AIModelRoutingMode = "openrouter" | "direct";
|
|
4
|
-
|
|
5
|
-
export declare function
|
|
4
|
+
export type { PreferOpenRouterInput };
|
|
5
|
+
export declare function parsePreferOpenRouter(value: unknown): boolean | undefined;
|
|
6
|
+
/** Reads `PREFER_OPENROUTER` from process env (loading `.env` once when unset). */
|
|
7
|
+
export declare function readPreferOpenRouterFromEnv(): boolean | undefined;
|
|
6
8
|
/**
|
|
7
9
|
* Resolves whether to route via OpenRouter.
|
|
8
|
-
* Explicit option wins, then `
|
|
10
|
+
* Explicit option wins, then `PREFER_OPENROUTER` env, then default `true`.
|
|
9
11
|
*/
|
|
10
|
-
export declare function
|
|
12
|
+
export declare function resolvePreferOpenRouter(explicit?: PreferOpenRouterInput): boolean;
|
|
13
|
+
export declare function resolvePreferOpenRouterFromOptions(options?: {
|
|
14
|
+
preferOpenRouter?: PreferOpenRouterInput;
|
|
15
|
+
}): boolean;
|
|
11
16
|
export declare function isRemoteProfileChoice(choice: AIProfileChoice): boolean;
|
|
12
17
|
export { buildOpenRouterModelId };
|
|
13
18
|
export interface AppliedModelRouting {
|
|
@@ -16,5 +21,5 @@ export interface AppliedModelRouting {
|
|
|
16
21
|
backend: AIProfileBackend;
|
|
17
22
|
routing: AIModelRoutingMode;
|
|
18
23
|
}
|
|
19
|
-
export declare function applyModelRouting(choice: AIProfileChoice, backend: AIProfileBackend,
|
|
24
|
+
export declare function applyModelRouting(choice: AIProfileChoice, backend: AIProfileBackend, preferOpenRouter: boolean, catalog?: ModelsCatalogJson): AppliedModelRouting;
|
|
20
25
|
//# sourceMappingURL=resolveModelRouting.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveModelRouting.d.ts","sourceRoot":"","sources":["../src/resolveModelRouting.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,gBAAgB,EAChB,eAAe,EACf,UAAU,EACV,iBAAiB,
|
|
1
|
+
{"version":3,"file":"resolveModelRouting.d.ts","sourceRoot":"","sources":["../src/resolveModelRouting.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,gBAAgB,EAChB,eAAe,EACf,UAAU,EACV,iBAAiB,EACjB,qBAAqB,EACtB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAO5D,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG,QAAQ,CAAC;AAEzD,YAAY,EAAE,qBAAqB,EAAE,CAAC;AAWtC,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,CAkCzE;AAED,mFAAmF;AACnF,wBAAgB,2BAA2B,IAAI,OAAO,GAAG,SAAS,CAUjE;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAEjF;AAED,wBAAgB,kCAAkC,CAAC,OAAO,CAAC,EAAE;IAC3D,gBAAgB,CAAC,EAAE,qBAAqB,CAAC;CAC1C,GAAG,OAAO,CAEV;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAUtE;AAED,OAAO,EAAE,sBAAsB,EAAE,CAAC;AAElC,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,UAAU,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,gBAAgB,CAAC;IAC1B,OAAO,EAAE,kBAAkB,CAAC;CAC7B;AAED,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,gBAAgB,EACzB,gBAAgB,EAAE,OAAO,EACzB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,mBAAmB,CAuBrB"}
|
|
@@ -8,34 +8,52 @@ function ensureDotenvLoaded() {
|
|
|
8
8
|
dotenvLoaded = true;
|
|
9
9
|
}
|
|
10
10
|
}
|
|
11
|
-
function
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
return true;
|
|
11
|
+
export function parsePreferOpenRouter(value) {
|
|
12
|
+
if (value === undefined || value === null) {
|
|
13
|
+
return undefined;
|
|
15
14
|
}
|
|
16
|
-
if (
|
|
17
|
-
return
|
|
15
|
+
if (typeof value === "boolean") {
|
|
16
|
+
return value;
|
|
17
|
+
}
|
|
18
|
+
if (typeof value === "number") {
|
|
19
|
+
if (value === 1) {
|
|
20
|
+
return true;
|
|
21
|
+
}
|
|
22
|
+
if (value === 0) {
|
|
23
|
+
return false;
|
|
24
|
+
}
|
|
25
|
+
return undefined;
|
|
26
|
+
}
|
|
27
|
+
if (typeof value === "string") {
|
|
28
|
+
const normalized = value.trim().toLowerCase();
|
|
29
|
+
if (["1", "true", "yes", "on"].includes(normalized)) {
|
|
30
|
+
return true;
|
|
31
|
+
}
|
|
32
|
+
if (["0", "false", "no", "off"].includes(normalized)) {
|
|
33
|
+
return false;
|
|
34
|
+
}
|
|
35
|
+
return undefined;
|
|
18
36
|
}
|
|
19
37
|
return undefined;
|
|
20
38
|
}
|
|
21
|
-
/** Reads `
|
|
22
|
-
export function
|
|
39
|
+
/** Reads `PREFER_OPENROUTER` from process env (loading `.env` once when unset). */
|
|
40
|
+
export function readPreferOpenRouterFromEnv() {
|
|
23
41
|
ensureDotenvLoaded();
|
|
24
|
-
const raw = process.env.
|
|
42
|
+
const raw = process.env.PREFER_OPENROUTER;
|
|
25
43
|
if (raw === undefined || raw.trim() === "") {
|
|
26
44
|
return undefined;
|
|
27
45
|
}
|
|
28
|
-
return
|
|
46
|
+
return parsePreferOpenRouter(raw);
|
|
29
47
|
}
|
|
30
48
|
/**
|
|
31
49
|
* Resolves whether to route via OpenRouter.
|
|
32
|
-
* Explicit option wins, then `
|
|
50
|
+
* Explicit option wins, then `PREFER_OPENROUTER` env, then default `true`.
|
|
33
51
|
*/
|
|
34
|
-
export function
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
return
|
|
52
|
+
export function resolvePreferOpenRouter(explicit) {
|
|
53
|
+
return parsePreferOpenRouter(explicit) ?? readPreferOpenRouterFromEnv() ?? true;
|
|
54
|
+
}
|
|
55
|
+
export function resolvePreferOpenRouterFromOptions(options) {
|
|
56
|
+
return resolvePreferOpenRouter(options?.preferOpenRouter);
|
|
39
57
|
}
|
|
40
58
|
export function isRemoteProfileChoice(choice) {
|
|
41
59
|
if (choice.provider === "local") {
|
|
@@ -47,13 +65,13 @@ export function isRemoteProfileChoice(choice) {
|
|
|
47
65
|
return true;
|
|
48
66
|
}
|
|
49
67
|
export { buildOpenRouterModelId };
|
|
50
|
-
export function applyModelRouting(choice, backend,
|
|
68
|
+
export function applyModelRouting(choice, backend, preferOpenRouter, catalog) {
|
|
51
69
|
const vendorModelId = getChoiceVendorModelId(choice);
|
|
52
|
-
if (!isRemoteProfileChoice(choice) || !
|
|
70
|
+
if (!isRemoteProfileChoice(choice) || !preferOpenRouter) {
|
|
53
71
|
return {
|
|
54
72
|
provider: choice.provider,
|
|
55
73
|
modelId: vendorModelId,
|
|
56
|
-
backend:
|
|
74
|
+
backend: preferOpenRouter ? backend : backend === "openrouter" ? "custom" : backend,
|
|
57
75
|
routing: "direct",
|
|
58
76
|
};
|
|
59
77
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveModelRouting.js","sourceRoot":"","sources":["../src/resolveModelRouting.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"resolveModelRouting.js","sourceRoot":"","sources":["../src/resolveModelRouting.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAQvC,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EACL,8BAA8B,EAC9B,0BAA0B,EAC1B,sBAAsB,GACvB,MAAM,wBAAwB,CAAC;AAMhC,IAAI,YAAY,GAAG,KAAK,CAAC;AAEzB,SAAS,kBAAkB;IACzB,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,UAAU,EAAE,CAAC;QACb,YAAY,GAAG,IAAI,CAAC;IACtB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAAc;IAClD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAC1C,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE,CAAC;QAC/B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;YAChB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAE9C,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YACpD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YACrD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,mFAAmF;AACnF,MAAM,UAAU,2BAA2B;IACzC,kBAAkB,EAAE,CAAC;IAErB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;IAE1C,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QAC3C,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,qBAAqB,CAAC,GAAG,CAAC,CAAC;AACpC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,uBAAuB,CAAC,QAAgC;IACtE,OAAO,qBAAqB,CAAC,QAAQ,CAAC,IAAI,2BAA2B,EAAE,IAAI,IAAI,CAAC;AAClF,CAAC;AAED,MAAM,UAAU,kCAAkC,CAAC,OAElD;IACC,OAAO,uBAAuB,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,MAAuB;IAC3D,IAAI,MAAM,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QAChC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAChF,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,OAAO,EAAE,sBAAsB,EAAE,CAAC;AASlC,MAAM,UAAU,iBAAiB,CAC/B,MAAuB,EACvB,OAAyB,EACzB,gBAAyB,EACzB,OAA2B;IAE3B,MAAM,aAAa,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAErD,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxD,OAAO;YACL,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,OAAO,EAAE,aAAa;YACtB,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,KAAK,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO;YACnF,OAAO,EAAE,QAAQ;SAClB,CAAC;IACJ,CAAC;IAED,MAAM,iBAAiB,GACrB,0BAA0B,CAAC,MAAM,EAAE,OAAO,CAAC;QAC3C,8BAA8B,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,UAAU,EAAE,OAAO;QACnE,sBAAsB,CAAC,MAAM,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IAEzD,OAAO;QACL,QAAQ,EAAE,YAAY;QACtB,OAAO,EAAE,iBAAiB;QAC1B,OAAO,EAAE,YAAY;QACrB,OAAO,EAAE,YAAY;KACtB,CAAC;AACJ,CAAC"}
|
|
@@ -132,7 +132,7 @@ export function resolveProfileInputCore(input, options, registry, catalog, loade
|
|
|
132
132
|
choiceKey: finalChoiceKey,
|
|
133
133
|
registry,
|
|
134
134
|
loaderWarnings,
|
|
135
|
-
|
|
135
|
+
preferOpenRouter: options.preferOpenRouter,
|
|
136
136
|
catalog,
|
|
137
137
|
costCapApplied: normalizeCostCap(costCapPer1M),
|
|
138
138
|
});
|