Nate/fix-openai-adapters

core/package.json

@@ -50,7 +50,7 @@
     "@continuedev/config-yaml": "file:../packages/config-yaml",
     "@continuedev/fetch": "^1.0.6",
     "@continuedev/llm-info": "^1.0.8",
-    "@continuedev/openai-adapters": "^1.0.19",
+    "@continuedev/openai-adapters": "^1.0.22",
     "@modelcontextprotocol/sdk": "^1.5.0",
     "@mozilla/readability": "^0.5.0",
     "@octokit/rest": "^20.1.1",

packages/openai-adapters/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@continuedev/openai-adapters",
-  "version": "1.0.21",
+  "version": "1.0.24",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/openai-adapters/src/apis/DeepSeek.ts

@@ -5,20 +5,21 @@ import { chatChunk, customFetch } from "../util.js";
 import { OpenAIApi } from "./OpenAI.js";
 import { FimCreateParamsStreaming } from "./base.js";
 
+export const DEEPSEEK_API_BASE = "https://api.deepseek.com/";
 export class DeepSeekApi extends OpenAIApi {
-  apiBase: string = "https://api.deepseek.com/";
   constructor(config: DeepseekConfig) {
     super({
       ...config,
       provider: "openai",
+      apiBase: config.apiBase ?? DEEPSEEK_API_BASE,
     });
   }
 
   async *fimStream(
     body: FimCreateParamsStreaming,
     signal: AbortSignal,
   ): AsyncGenerator<ChatCompletionChunk, any, unknown> {
-    const endpoint = new URL("beta/completions", this.apiBase);
+    const endpoint = new URL("beta/completions", this.config.apiBase);
     const resp = await customFetch(this.config.requestOptions)(endpoint, {
       method: "POST",
       body: JSON.stringify({

packages/openai-adapters/src/apis/Inception.ts

@@ -5,20 +5,21 @@ import { chatChunk, customFetch } from "../util.js";
 import { OpenAIApi } from "./OpenAI.js";
 import { FimCreateParamsStreaming } from "./base.js";
 
+export const INCEPTION_API_BASE = "https://api.inceptionlabs.ai/v1/";
 export class InceptionApi extends OpenAIApi {
-  apiBase: string = "https://api.inceptionlabs.ai/v1/";
   constructor(config: InceptionConfig) {
     super({
       ...config,
       provider: "openai",
+      apiBase: config.apiBase ?? INCEPTION_API_BASE,
     });
   }
 
   async *fimStream(
     body: FimCreateParamsStreaming,
     signal: AbortSignal,
   ): AsyncGenerator<ChatCompletionChunk, any, unknown> {
-    const endpoint = new URL("completions", this.apiBase);
+    const endpoint = new URL("completions", this.config.apiBase);
     const resp = await customFetch(this.config.requestOptions)(endpoint, {
       method: "POST",
       body: JSON.stringify({

packages/openai-adapters/src/test/main.test.ts

@@ -1,5 +1,9 @@
 import { ModelConfig } from "@continuedev/config-yaml";
 import * as dotenv from "dotenv";
+import { DEEPSEEK_API_BASE } from "../apis/DeepSeek.js";
+import { INCEPTION_API_BASE } from "../apis/Inception.js";
+import { OpenAIApi } from "../apis/OpenAI.js";
+import { constructLlmApi } from "../index.js";
 import { getLlmApi, testChat, testCompletion, testEmbed } from "./util.js";
 
 dotenv.config();
@@ -108,3 +112,43 @@ TESTS.forEach((config) => {
     testConfig({ name: config.model, ...config });
   });
 });
+
+describe("Configuration", () => {
+  it("should configure DeepSeek OpenAI client with correct apiBase and apiKey", () => {
+    const deepseek = constructLlmApi({
+      provider: "deepseek",
+      apiKey: "sk-xxx",
+    });
+
+    expect((deepseek as OpenAIApi).openai.baseURL).toBe(DEEPSEEK_API_BASE);
+    expect((deepseek as OpenAIApi).openai.apiKey).toBe("sk-xxx");
+
+    const deepseek2 = constructLlmApi({
+      provider: "deepseek",
+      apiKey: "sk-xxx",
+      apiBase: "https://api.example.com",
+    });
+    expect((deepseek2 as OpenAIApi).openai.baseURL).toBe(
+      "https://api.example.com",
+    );
+  });
+
+  it("should configure Inception OpenAI client with correct apiBase and apiKey", () => {
+    const inception = constructLlmApi({
+      provider: "inception",
+      apiKey: "sk-xxx",
+    });
+
+    expect((inception as OpenAIApi).openai.baseURL).toBe(INCEPTION_API_BASE);
+    expect((inception as OpenAIApi).openai.apiKey).toBe("sk-xxx");
+
+    const inception2 = constructLlmApi({
+      provider: "inception",
+      apiKey: "sk-xxx",
+      apiBase: "https://api.example.com",
+    });
+    expect((inception2 as OpenAIApi).openai.baseURL).toBe(
+      "https://api.example.com",
+    );
+  });
+});