From 779192e55d8616cb341f29c1b4cb0c35c420f07b Mon Sep 17 00:00:00 2001 From: prakhar Date: Tue, 12 Aug 2025 12:22:23 -0500 Subject: [PATCH] remove constant url, keeping on provider default --- core/llm/llms/oca/Oca.ts | 14 +++++++------- core/llm/llms/oca/util/constants.ts | 25 +++++++++++-------------- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/core/llm/llms/oca/Oca.ts b/core/llm/llms/oca/Oca.ts index 32199187609..d6a4307e96e 100644 --- a/core/llm/llms/oca/Oca.ts +++ b/core/llm/llms/oca/Oca.ts @@ -17,7 +17,6 @@ import { } from "../../openaiTypeConverters.js"; import { OcaTokenManager } from "./util/ocaTokenManager.js"; import { createOcaHeaders, generateOpcRequestId } from "./util/utils.js"; -import { DEFAULT_OCA_BASE_URL } from "./util/constants.js"; interface ModelInfoMap { models: { [key: string]: ModelInfo }; @@ -47,9 +46,6 @@ class Oca extends BaseLLM { } static providerName = "oca"; - static defaultOptions: Partial | undefined = { - apiBase: DEFAULT_OCA_BASE_URL, - }; protected useOpenAIAdapterFor: (LlmApiRequestType | "*")[] = [ "list", @@ -98,7 +94,9 @@ class Oca extends BaseLLM { ); } const ocaHeaders = await createOcaHeaders(token, this.uniqueId); - console.log(`Making request with customer opc-request-id: ${ocaHeaders["opc-request-id"]}`) + console.log( + `Making request with customer opc-request-id: ${ocaHeaders["opc-request-id"]}`, + ); return ocaHeaders; } @@ -119,7 +117,9 @@ class Oca extends BaseLLM { return completion; } - protected _getEndpoint(endpoint: "chat/completions" | "models" | "model/info") { + protected _getEndpoint( + endpoint: "chat/completions" | "models" | "model/info", + ) { if (!this.apiBase) { throw new Error( "No API base URL provided. Please set the 'apiBase' option in config.json", @@ -237,7 +237,7 @@ class Oca extends BaseLLM { } getModelInfo(model: string): ModelInfo | undefined { - return this.modelMap.models[model] + return this.modelMap.models[model]; } } diff --git a/core/llm/llms/oca/util/constants.ts b/core/llm/llms/oca/util/constants.ts index 6b69af13d7f..5bd5365f084 100644 --- a/core/llm/llms/oca/util/constants.ts +++ b/core/llm/llms/oca/util/constants.ts @@ -1,17 +1,14 @@ -import path from "path" -import os from "os" +import path from "path"; +import os from "os"; // OAUTH -export const DEFAULT_IDCS_CLIENT_ID = "a8331954c0cf48ba99b5dd223a14c6ea" -export const DEFAULT_IDCS_URL = "https://idcs-9dc693e80d9b469480d7afe00e743931.identity.oraclecloud.com" -export const DEFAULT_IDSC_SCOPES = "openid offline_access" -export const DEFAULT_IDCS_PORT_CANDIDATES = [8669, 8668, 8667] -export const DEFAULT_USE_PKCE = true -export const OCA_CONFIG_PATH = path.join(os.homedir(), ".oca", "config.json") -export const OCA_RENEW_TOKEN_BUFFER_SEC = 180 // 3 minutes - -// OCA LITELLM -export const DEFAULT_OCA_BASE_URL = "https://code-internal.aiservice.us-chicago-1.oci.oraclecloud.com/20250206/app/litellm" - +export const DEFAULT_IDCS_CLIENT_ID = "a8331954c0cf48ba99b5dd223a14c6ea"; +export const DEFAULT_IDCS_URL = + "https://idcs-9dc693e80d9b469480d7afe00e743931.identity.oraclecloud.com"; +export const DEFAULT_IDSC_SCOPES = "openid offline_access"; +export const DEFAULT_IDCS_PORT_CANDIDATES = [8669, 8668, 8667]; +export const DEFAULT_USE_PKCE = true; +export const OCA_CONFIG_PATH = path.join(os.homedir(), ".oca", "config.json"); +export const OCA_RENEW_TOKEN_BUFFER_SEC = 180; // 3 minutes // OCA SURVEY -export const DEFAULT_SURVEY_PORT = 3000 +export const DEFAULT_SURVEY_PORT = 3000;