Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active
TypeScript aianthropicartifactsawsazurechatgptchatgpt-cloneclaudeclonedeepseekgeminigooglegpt-5librechatmcpo1openairesponses-apivisionwebui
🗝️ fix: Resolve Config-Scoped Custom Providers (#16687)
Danny Avila67a5fe247c2a
diff --git a/packages/api/src/app/service.spec.ts b/packages/api/src/app/service.spec.tsindex 10e9c5e20c..aeb553311f 100644--- a/packages/api/src/app/service.spec.ts+++ b/packages/api/src/app/service.spec.ts@@ -165,6 +165,55 @@ describe('createAppConfigService', () => {expect(custom).toHaveLength(2);});+ it.each([false, true])(+ 'prefers tenant providers over same-named global providers (tenant first: %s)',+ async (tenantFirst) => {+ const global = {+ name: 'Claude',+ apiKey: 'global-key',+ baseURL: 'https://global.example',+ models: { default: ['global-model'], fetch: false },+ };+ const tenants = ['tenant-a', 'tenant-b'].map((tenantId) => ({+ ...global,+ name: 'Claude',+ tenantId,+ apiKey: 'tenant-key',+ baseURL: 'https://tenant.example',+ models: { default: ['tenant-model'], fetch: false },+ }));+ const custom = tenantFirst ? [...tenants, global] : [global, ...tenants];+ const modelSpecs = {+ list: [{ name: 'agent-spec', preset: { endpoint: 'Claude' } }],+ addedEndpoints: ['agents'],+ };+ const deps = createDeps({+ loadBaseConfig: jest.fn().mockResolvedValue({+ endpoints: { custom },+ modelSpecs,+ config: { endpoints: { custom }, modelSpecs },+ }),+ });+ const { getAppConfig } = createAppConfigService(deps);++ for (const tenantId of ['tenant-a', 'tenant-c', 'tenant-b', 'tenant-a']) {+ const config = await getAppConfig({ role: 'USER', tenantId });+ const expected = tenants.find((endpoint) => endpoint.tenantId === tenantId) ?? global;+ expect(config.endpoints?.custom).toEqual([expected]);+ expect(config.config.endpoints?.custom).toEqual([expected]);+ expect(config.modelSpecs).toEqual(modelSpecs);+ const provider = getProviderConfig({ provider: 'Claude', appConfig: config });+ expect(provider.customEndpointConfig?.apiKey).toBe(expected.apiKey);+ expect(provider.customEndpointConfig?.models).toEqual(expected.models);+ }++ const base = await getAppConfig({ baseOnly: true });+ expect(base.endpoints?.custom).toEqual([global]);+ expect(custom).toHaveLength(3);+ expect(deps.loadBaseConfig).toHaveBeenCalledTimes(1);+ },+ );+it('removes a prioritized spec when its only endpoint belongs to another tenant', async () => {const deps = createDeps({loadBaseConfig: jest.fn().mockResolvedValue({diff --git a/packages/api/src/app/service.ts b/packages/api/src/app/service.tsindex 2ce0b85c06..1e6304fb13 100644--- a/packages/api/src/app/service.ts+++ b/packages/api/src/app/service.ts@@ -52,12 +52,23 @@ function scopeEndpointList<T extends { name?: string; tenantId?: string }>(hiddenEndpoints: ReadonlySet<string>,): T[] | undefined {if (!endpoints) return endpoints;- const scoped = endpoints.filter(- (endpoint) =>- (!endpoint.tenantId || endpoint.tenantId === tenantId) &&- !hiddenEndpoints.has(normalizeEndpointName(endpoint.name ?? '')),- );- return scoped.length === endpoints.length ? endpoints : scoped;+ const tenantNames = new Set<string>();+ const scoped = endpoints.filter((endpoint) => {+ const name = normalizeEndpointName(endpoint.name ?? '');+ if ((endpoint.tenantId && endpoint.tenantId !== tenantId) || hiddenEndpoints.has(name)) {+ return false;+ }+ if (endpoint.tenantId) tenantNames.add(name);+ return true;+ });+ const selected =+ tenantNames.size === 0+ ? scoped+ : scoped.filter(+ (endpoint) =>+ endpoint.tenantId || !tenantNames.has(normalizeEndpointName(endpoint.name ?? '')),+ );+ return selected.length === endpoints.length ? endpoints : selected;}function scopeModelSpecs(