From 4723c8493d330c6e0b5fa6487f8db4115505f281 Mon Sep 17 00:00:00 2001 From: Prasang Prajapati Date: Wed, 17 Sep 2025 19:10:20 -0400 Subject: [PATCH] Merge branch 'main' into watsonx-ai-integration --- packages/types/src/provider-settings.ts | 1 + src/api/providers/fetchers/modelCache.ts | 2 +- src/shared/api.ts | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/types/src/provider-settings.ts b/packages/types/src/provider-settings.ts index 2759c1e9c7..4dc056d2c5 100644 --- a/packages/types/src/provider-settings.ts +++ b/packages/types/src/provider-settings.ts @@ -49,6 +49,7 @@ export const dynamicProviders = [ "requesty", "unbound", "glama", + "watsonx", ] as const export type DynamicProvider = (typeof dynamicProviders)[number] diff --git a/src/api/providers/fetchers/modelCache.ts b/src/api/providers/fetchers/modelCache.ts index 07d27f45fc..54e65fd88d 100644 --- a/src/api/providers/fetchers/modelCache.ts +++ b/src/api/providers/fetchers/modelCache.ts @@ -9,7 +9,7 @@ import { safeWriteJson } from "../../../utils/safeWriteJson" import { ContextProxy } from "../../../core/config/ContextProxy" import { getCacheDirectoryPath } from "../../../utils/storage" -import type { toRouterName, ModelRecord } from "../../../shared/api" +import type { ModelRecord, RouterName } from "../../../shared/api" import { fileExistsAtPath } from "../../../utils/fs" import { getOpenRouterModels } from "./openrouter" diff --git a/src/shared/api.ts b/src/shared/api.ts index 13b6661119..3a8271d776 100644 --- a/src/shared/api.ts +++ b/src/shared/api.ts @@ -157,6 +157,7 @@ const dynamicProviderExtras = { glama: {} as {}, // eslint-disable-line @typescript-eslint/no-empty-object-type ollama: {} as {}, // eslint-disable-line @typescript-eslint/no-empty-object-type lmstudio: {} as {}, // eslint-disable-line @typescript-eslint/no-empty-object-type + watsonx: {} as { apiKey: string; baseUrl: string }, } as const satisfies Record // Build the dynamic options union from the map, intersected with CommonFetchParams