@llmgateway/models 1.194.0 → 1.195.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/dist/provider.d.ts +13 -3
- package/dist/provider.js +47 -5
- package/dist/provider.js.map +1 -1
- package/dist/provider.spec.d.ts +1 -0
- package/dist/provider.spec.js +136 -0
- package/dist/provider.spec.js.map +1 -0
- package/package.json +1 -1
package/dist/provider.d.ts
CHANGED
|
@@ -3,15 +3,25 @@ import type { Provider } from "./index.js";
|
|
|
3
3
|
export type { ProviderEnvConfig };
|
|
4
4
|
export declare const providerEnvVarMap: Record<Provider, string | undefined>;
|
|
5
5
|
export declare function getProviderEnvVar(provider: Provider | string): string | undefined;
|
|
6
|
+
export type EnvVarVariant = "enterprise" | "plans";
|
|
7
|
+
export declare const ENV_VAR_VARIANT_SUFFIXES: Record<EnvVarVariant, string>;
|
|
8
|
+
export declare function getOrganizationEnvVariant(organization: {
|
|
9
|
+
plan: string;
|
|
10
|
+
kind?: string | null;
|
|
11
|
+
devPlan?: string | null;
|
|
12
|
+
chatPlan?: string | null;
|
|
13
|
+
} | null | undefined): EnvVarVariant | undefined;
|
|
14
|
+
export declare function getVariantEnvVarNameFor(baseEnvVarName: string, variant: EnvVarVariant | undefined): string | undefined;
|
|
15
|
+
export declare function getVariantEnvVarName(provider: Provider | string, variant: EnvVarVariant | undefined): string | undefined;
|
|
6
16
|
export declare function getProviderEnvConfig(provider: Provider | string): ProviderEnvConfig | undefined;
|
|
7
17
|
export declare function hasProviderEnvironmentToken(provider: Provider | string): boolean;
|
|
8
|
-
export declare function getProviderEnvValue(provider: Provider, key: string, configIndex?: number, defaultValue?: string): string | undefined;
|
|
18
|
+
export declare function getProviderEnvValue(provider: Provider, key: string, configIndex?: number, defaultValue?: string, variant?: EnvVarVariant): string | undefined;
|
|
9
19
|
export type VertexTokenType = "api-key" | "oauth";
|
|
10
20
|
interface VertexTokenTypeOptions {
|
|
11
21
|
google_vertex_token_type?: VertexTokenType;
|
|
12
22
|
}
|
|
13
|
-
export declare function resolveVertexTokenType(provider: "google-vertex", providerKeyOptions?: VertexTokenTypeOptions, configIndex?: number, skipEnvVars?: boolean): VertexTokenType;
|
|
23
|
+
export declare function resolveVertexTokenType(provider: "google-vertex", providerKeyOptions?: VertexTokenTypeOptions, configIndex?: number, skipEnvVars?: boolean, variant?: EnvVarVariant): VertexTokenType;
|
|
14
24
|
export declare function validateProviderEnv(provider: Provider): string[];
|
|
15
25
|
export declare function getRegionSpecificEnvValue(provider: Provider, region: string): string | undefined;
|
|
16
|
-
export declare function getRegionSpecificEnvVarName(provider: Provider, region: string): string | undefined;
|
|
26
|
+
export declare function getRegionSpecificEnvVarName(provider: Provider, region: string, variant?: EnvVarVariant): string | undefined;
|
|
17
27
|
export declare function hasRegionSpecificEnvKey(provider: Provider, region: string): boolean;
|
package/dist/provider.js
CHANGED
|
@@ -6,6 +6,41 @@ export const providerEnvVarMap = Object.fromEntries(providers.map((provider) =>
|
|
|
6
6
|
export function getProviderEnvVar(provider) {
|
|
7
7
|
return providerEnvVarMap[provider];
|
|
8
8
|
}
|
|
9
|
+
export const ENV_VAR_VARIANT_SUFFIXES = {
|
|
10
|
+
enterprise: "__ENTERPRISE",
|
|
11
|
+
plans: "__PLANS",
|
|
12
|
+
};
|
|
13
|
+
export function getOrganizationEnvVariant(organization) {
|
|
14
|
+
if (!organization) {
|
|
15
|
+
return undefined;
|
|
16
|
+
}
|
|
17
|
+
if (organization.plan === "enterprise") {
|
|
18
|
+
return "enterprise";
|
|
19
|
+
}
|
|
20
|
+
if ((organization.kind === "devpass" &&
|
|
21
|
+
organization.devPlan &&
|
|
22
|
+
organization.devPlan !== "none") ||
|
|
23
|
+
(organization.kind === "chat" &&
|
|
24
|
+
organization.chatPlan &&
|
|
25
|
+
organization.chatPlan !== "none")) {
|
|
26
|
+
return "plans";
|
|
27
|
+
}
|
|
28
|
+
return undefined;
|
|
29
|
+
}
|
|
30
|
+
export function getVariantEnvVarNameFor(baseEnvVarName, variant) {
|
|
31
|
+
if (!variant) {
|
|
32
|
+
return undefined;
|
|
33
|
+
}
|
|
34
|
+
const variantName = `${baseEnvVarName}${ENV_VAR_VARIANT_SUFFIXES[variant]}`;
|
|
35
|
+
return process.env[variantName] ? variantName : undefined;
|
|
36
|
+
}
|
|
37
|
+
export function getVariantEnvVarName(provider, variant) {
|
|
38
|
+
const baseEnvVar = getProviderEnvVar(provider);
|
|
39
|
+
if (!baseEnvVar) {
|
|
40
|
+
return undefined;
|
|
41
|
+
}
|
|
42
|
+
return getVariantEnvVarNameFor(baseEnvVar, variant);
|
|
43
|
+
}
|
|
9
44
|
export function getProviderEnvConfig(provider) {
|
|
10
45
|
const def = getProviderDefinition(provider);
|
|
11
46
|
return def?.env;
|
|
@@ -14,7 +49,7 @@ export function hasProviderEnvironmentToken(provider) {
|
|
|
14
49
|
const envVar = getProviderEnvVar(provider);
|
|
15
50
|
return envVar ? Boolean(process.env[envVar]) : false;
|
|
16
51
|
}
|
|
17
|
-
export function getProviderEnvValue(provider, key, configIndex, defaultValue) {
|
|
52
|
+
export function getProviderEnvValue(provider, key, configIndex, defaultValue, variant) {
|
|
18
53
|
const config = getProviderEnvConfig(provider);
|
|
19
54
|
if (!config) {
|
|
20
55
|
return undefined;
|
|
@@ -29,7 +64,8 @@ export function getProviderEnvValue(provider, key, configIndex, defaultValue) {
|
|
|
29
64
|
if (!envVarName) {
|
|
30
65
|
return defaultValue;
|
|
31
66
|
}
|
|
32
|
-
const
|
|
67
|
+
const effectiveEnvVarName = getVariantEnvVarNameFor(envVarName, variant) ?? envVarName;
|
|
68
|
+
const envValue = process.env[effectiveEnvVarName];
|
|
33
69
|
if (!envValue) {
|
|
34
70
|
return defaultValue;
|
|
35
71
|
}
|
|
@@ -48,13 +84,13 @@ export function getProviderEnvValue(provider, key, configIndex, defaultValue) {
|
|
|
48
84
|
}
|
|
49
85
|
return values[configIndex];
|
|
50
86
|
}
|
|
51
|
-
export function resolveVertexTokenType(provider, providerKeyOptions, configIndex, skipEnvVars) {
|
|
87
|
+
export function resolveVertexTokenType(provider, providerKeyOptions, configIndex, skipEnvVars, variant) {
|
|
52
88
|
const optionValue = providerKeyOptions?.google_vertex_token_type;
|
|
53
89
|
if (optionValue === "api-key" || optionValue === "oauth") {
|
|
54
90
|
return optionValue;
|
|
55
91
|
}
|
|
56
92
|
if (!skipEnvVars) {
|
|
57
|
-
const envValue = getProviderEnvValue(provider, "tokenType", configIndex);
|
|
93
|
+
const envValue = getProviderEnvValue(provider, "tokenType", configIndex, undefined, variant);
|
|
58
94
|
if (envValue === "api-key" || envValue === "oauth") {
|
|
59
95
|
return envValue;
|
|
60
96
|
}
|
|
@@ -82,12 +118,18 @@ export function getRegionSpecificEnvValue(provider, region) {
|
|
|
82
118
|
const regionSuffix = region.toUpperCase().replace(/-/g, "_");
|
|
83
119
|
return (process.env[`${baseEnvVar}__${regionSuffix}`] ?? process.env[baseEnvVar]);
|
|
84
120
|
}
|
|
85
|
-
export function getRegionSpecificEnvVarName(provider, region) {
|
|
121
|
+
export function getRegionSpecificEnvVarName(provider, region, variant) {
|
|
86
122
|
const baseEnvVar = getProviderEnvVar(provider);
|
|
87
123
|
if (!baseEnvVar) {
|
|
88
124
|
return undefined;
|
|
89
125
|
}
|
|
90
126
|
const regionSuffix = region.toUpperCase().replace(/-/g, "_");
|
|
127
|
+
if (variant) {
|
|
128
|
+
const variantRegionalName = `${baseEnvVar}${ENV_VAR_VARIANT_SUFFIXES[variant]}__${regionSuffix}`;
|
|
129
|
+
if (process.env[variantRegionalName]) {
|
|
130
|
+
return variantRegionalName;
|
|
131
|
+
}
|
|
132
|
+
}
|
|
91
133
|
const regionalName = `${baseEnvVar}__${regionSuffix}`;
|
|
92
134
|
return process.env[regionalName] ? regionalName : undefined;
|
|
93
135
|
}
|
package/dist/provider.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,SAAS,EAET,qBAAqB,GACrB,MAAM,gBAAgB,CAAC;AAMxB,MAAM,CAAC,MAAM,iBAAiB,GAC7B,MAAM,CAAC,WAAW,CACjB,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC;IAC3B,QAAQ,CAAC,EAAE;IACV,QAAQ,CAAC,GAAG,CAAC,QAA+C,CAAC,MAAM;CACpE,CAAC,CACsC,CAAC;AAE3C,MAAM,UAAU,iBAAiB,CAChC,QAA2B;IAE3B,OAAO,iBAAiB,CAAC,QAAoB,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,oBAAoB,CACnC,QAA2B;IAE3B,MAAM,GAAG,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAC;IAC5C,OAAO,GAAG,EAAE,GAAG,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,2BAA2B,CAC1C,QAA2B;IAE3B,MAAM,MAAM,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAC3C,OAAO,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AACtD,CAAC;AAED,MAAM,UAAU,mBAAmB,CAClC,QAAkB,EAClB,GAAW,EACX,WAAoB,EACpB,YAAqB;
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,136 @@
|
|
|
1
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
2
|
+
import { getOrganizationEnvVariant, getProviderEnvValue, getRegionSpecificEnvVarName, getVariantEnvVarName, getVariantEnvVarNameFor, } from "./provider.js";
|
|
3
|
+
const BASE = "LLM_ALIBABA_API_KEY";
|
|
4
|
+
const ENTERPRISE = `${BASE}__ENTERPRISE`;
|
|
5
|
+
const PLANS = `${BASE}__PLANS`;
|
|
6
|
+
const REGIONAL = `${BASE}__US_VIRGINIA`;
|
|
7
|
+
const ENTERPRISE_REGIONAL = `${BASE}__ENTERPRISE__US_VIRGINIA`;
|
|
8
|
+
const PLANS_REGIONAL = `${BASE}__PLANS__US_VIRGINIA`;
|
|
9
|
+
const VERTEX_PROJECT = "LLM_GOOGLE_CLOUD_PROJECT";
|
|
10
|
+
describe("variant env var helpers", () => {
|
|
11
|
+
beforeEach(() => {
|
|
12
|
+
for (const name of [
|
|
13
|
+
BASE,
|
|
14
|
+
ENTERPRISE,
|
|
15
|
+
PLANS,
|
|
16
|
+
REGIONAL,
|
|
17
|
+
ENTERPRISE_REGIONAL,
|
|
18
|
+
PLANS_REGIONAL,
|
|
19
|
+
VERTEX_PROJECT,
|
|
20
|
+
`${VERTEX_PROJECT}__ENTERPRISE`,
|
|
21
|
+
`${VERTEX_PROJECT}__PLANS`,
|
|
22
|
+
]) {
|
|
23
|
+
vi.stubEnv(name, undefined);
|
|
24
|
+
}
|
|
25
|
+
});
|
|
26
|
+
afterEach(() => {
|
|
27
|
+
vi.unstubAllEnvs();
|
|
28
|
+
});
|
|
29
|
+
describe("getVariantEnvVarName", () => {
|
|
30
|
+
it("returns the variant var name only when it is set", () => {
|
|
31
|
+
expect(getVariantEnvVarName("alibaba", "enterprise")).toBeUndefined();
|
|
32
|
+
expect(getVariantEnvVarName("alibaba", "plans")).toBeUndefined();
|
|
33
|
+
vi.stubEnv(ENTERPRISE, "sk-ent");
|
|
34
|
+
vi.stubEnv(PLANS, "sk-dev");
|
|
35
|
+
expect(getVariantEnvVarName("alibaba", "enterprise")).toBe(ENTERPRISE);
|
|
36
|
+
expect(getVariantEnvVarName("alibaba", "plans")).toBe(PLANS);
|
|
37
|
+
});
|
|
38
|
+
it("returns undefined without a variant or for unknown providers", () => {
|
|
39
|
+
vi.stubEnv(ENTERPRISE, "sk-ent");
|
|
40
|
+
expect(getVariantEnvVarName("alibaba", undefined)).toBeUndefined();
|
|
41
|
+
expect(getVariantEnvVarName("not-a-provider", "enterprise")).toBeUndefined();
|
|
42
|
+
});
|
|
43
|
+
});
|
|
44
|
+
describe("getVariantEnvVarNameFor", () => {
|
|
45
|
+
it("applies to arbitrary env var names", () => {
|
|
46
|
+
vi.stubEnv(`${VERTEX_PROJECT}__PLANS`, "plans-project");
|
|
47
|
+
expect(getVariantEnvVarNameFor(VERTEX_PROJECT, "plans")).toBe(`${VERTEX_PROJECT}__PLANS`);
|
|
48
|
+
expect(getVariantEnvVarNameFor(VERTEX_PROJECT, "enterprise")).toBeUndefined();
|
|
49
|
+
});
|
|
50
|
+
});
|
|
51
|
+
describe("getProviderEnvValue with variant", () => {
|
|
52
|
+
it("reads the variant list at the config index", () => {
|
|
53
|
+
vi.stubEnv(VERTEX_PROJECT, "base-project-a,base-project-b");
|
|
54
|
+
vi.stubEnv(`${VERTEX_PROJECT}__ENTERPRISE`, "ent-project-a,ent-project-b");
|
|
55
|
+
expect(getProviderEnvValue("google-vertex", "project", 1)).toBe("base-project-b");
|
|
56
|
+
expect(getProviderEnvValue("google-vertex", "project", 1, undefined, "enterprise")).toBe("ent-project-b");
|
|
57
|
+
expect(getProviderEnvValue("google-vertex", "project", 0, undefined, "plans")).toBe("base-project-a");
|
|
58
|
+
});
|
|
59
|
+
it("returns the default when neither variant nor base var is set", () => {
|
|
60
|
+
expect(getProviderEnvValue("google-vertex", "region", 0, "global", "plans")).toBe("global");
|
|
61
|
+
});
|
|
62
|
+
});
|
|
63
|
+
describe("getRegionSpecificEnvVarName with variant", () => {
|
|
64
|
+
it("prefers the variant-regional var for matching orgs", () => {
|
|
65
|
+
vi.stubEnv(REGIONAL, "sk-region");
|
|
66
|
+
vi.stubEnv(ENTERPRISE_REGIONAL, "sk-ent-region");
|
|
67
|
+
vi.stubEnv(PLANS_REGIONAL, "sk-dev-region");
|
|
68
|
+
expect(getRegionSpecificEnvVarName("alibaba", "us-virginia", "enterprise")).toBe(ENTERPRISE_REGIONAL);
|
|
69
|
+
expect(getRegionSpecificEnvVarName("alibaba", "us-virginia", "plans")).toBe(PLANS_REGIONAL);
|
|
70
|
+
});
|
|
71
|
+
it("falls back to the shared regional var when no variant-regional var is set", () => {
|
|
72
|
+
vi.stubEnv(REGIONAL, "sk-region");
|
|
73
|
+
expect(getRegionSpecificEnvVarName("alibaba", "us-virginia", "enterprise")).toBe(REGIONAL);
|
|
74
|
+
});
|
|
75
|
+
it("never returns a variant-regional name without a variant", () => {
|
|
76
|
+
vi.stubEnv(REGIONAL, "sk-region");
|
|
77
|
+
vi.stubEnv(ENTERPRISE_REGIONAL, "sk-ent-region");
|
|
78
|
+
expect(getRegionSpecificEnvVarName("alibaba", "us-virginia")).toBe(REGIONAL);
|
|
79
|
+
});
|
|
80
|
+
it("returns undefined when no regional var is set, even with a plain variant var", () => {
|
|
81
|
+
vi.stubEnv(ENTERPRISE, "sk-ent");
|
|
82
|
+
expect(getRegionSpecificEnvVarName("alibaba", "us-virginia", "enterprise")).toBeUndefined();
|
|
83
|
+
});
|
|
84
|
+
});
|
|
85
|
+
describe("getOrganizationEnvVariant", () => {
|
|
86
|
+
it("maps enterprise-plan orgs to the enterprise variant", () => {
|
|
87
|
+
expect(getOrganizationEnvVariant({
|
|
88
|
+
plan: "enterprise",
|
|
89
|
+
kind: "default",
|
|
90
|
+
devPlan: "none",
|
|
91
|
+
})).toBe("enterprise");
|
|
92
|
+
});
|
|
93
|
+
it("maps DevPass orgs to the plans variant", () => {
|
|
94
|
+
expect(getOrganizationEnvVariant({
|
|
95
|
+
plan: "free",
|
|
96
|
+
kind: "devpass",
|
|
97
|
+
devPlan: "pro",
|
|
98
|
+
})).toBe("plans");
|
|
99
|
+
});
|
|
100
|
+
it("maps Chat plan orgs to the plans variant", () => {
|
|
101
|
+
expect(getOrganizationEnvVariant({
|
|
102
|
+
plan: "free",
|
|
103
|
+
kind: "chat",
|
|
104
|
+
devPlan: "none",
|
|
105
|
+
chatPlan: "plus",
|
|
106
|
+
})).toBe("plans");
|
|
107
|
+
});
|
|
108
|
+
it("prefers enterprise when an org matches both", () => {
|
|
109
|
+
expect(getOrganizationEnvVariant({
|
|
110
|
+
plan: "enterprise",
|
|
111
|
+
kind: "devpass",
|
|
112
|
+
devPlan: "pro",
|
|
113
|
+
})).toBe("enterprise");
|
|
114
|
+
});
|
|
115
|
+
it("returns undefined for regular orgs, inactive plans, and missing orgs", () => {
|
|
116
|
+
expect(getOrganizationEnvVariant({
|
|
117
|
+
plan: "pro",
|
|
118
|
+
kind: "default",
|
|
119
|
+
devPlan: "none",
|
|
120
|
+
})).toBeUndefined();
|
|
121
|
+
expect(getOrganizationEnvVariant({
|
|
122
|
+
plan: "free",
|
|
123
|
+
kind: "devpass",
|
|
124
|
+
devPlan: "none",
|
|
125
|
+
})).toBeUndefined();
|
|
126
|
+
expect(getOrganizationEnvVariant({
|
|
127
|
+
plan: "free",
|
|
128
|
+
kind: "chat",
|
|
129
|
+
chatPlan: "none",
|
|
130
|
+
})).toBeUndefined();
|
|
131
|
+
expect(getOrganizationEnvVariant(null)).toBeUndefined();
|
|
132
|
+
expect(getOrganizationEnvVariant(undefined)).toBeUndefined();
|
|
133
|
+
});
|
|
134
|
+
});
|
|
135
|
+
});
|
|
136
|
+
//# sourceMappingURL=provider.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider.spec.js","sourceRoot":"","sources":["../src/provider.spec.ts"],"names":[],"mappings":"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"}
|