Skip to content

fix: use LM Studio native API endpoint (/api/v1) instead of OpenAI-compatible (/v1) #12224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
roomote-v0 wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −11
Draft

fix: use LM Studio native API endpoint (/api/v1) instead of OpenAI-compatible (/v1) #12224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/api/providers/__tests__/lm-studio-timeout.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ describe("LmStudioHandler timeout configuration", () => {
expect(getApiRequestTimeout).toHaveBeenCalled()
expect(mockOpenAIConstructor).toHaveBeenCalledWith(
expect.objectContaining({
baseURL: "http://localhost:1234/v1",
baseURL: "http://localhost:1234/api/v1",
apiKey: "noop",
timeout: 600000, // 600 seconds in milliseconds
}),
Expand Down
12 changes: 6 additions & 6 deletions src/api/providers/fetchers/__tests__/lmstudio.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ describe("LMStudio Fetcher", () => {
const result = await getLMStudioModels(baseUrl)

expect(mockedAxios.get).toHaveBeenCalledTimes(1)
expect(mockedAxios.get).toHaveBeenCalledWith(`${baseUrl}/v1/models`)
expect(mockedAxios.get).toHaveBeenCalledWith(`${baseUrl}/api/v1/models`)
expect(MockedLMStudioClientConstructor).toHaveBeenCalledTimes(1)
expect(MockedLMStudioClientConstructor).toHaveBeenCalledWith({ baseUrl: lmsUrl })
expect(mockListDownloadedModels).toHaveBeenCalledTimes(1)
Expand All @@ -133,7 +133,7 @@ describe("LMStudio Fetcher", () => {
const result = await getLMStudioModels(baseUrl)

expect(mockedAxios.get).toHaveBeenCalledTimes(1)
expect(mockedAxios.get).toHaveBeenCalledWith(`${baseUrl}/v1/models`)
expect(mockedAxios.get).toHaveBeenCalledWith(`${baseUrl}/api/v1/models`)
expect(MockedLMStudioClientConstructor).toHaveBeenCalledTimes(1)
expect(MockedLMStudioClientConstructor).toHaveBeenCalledWith({ baseUrl: lmsUrl })
expect(mockListDownloadedModels).toHaveBeenCalledTimes(1)
Expand Down Expand Up @@ -373,7 +373,7 @@ describe("LMStudio Fetcher", () => {

await getLMStudioModels("")

expect(mockedAxios.get).toHaveBeenCalledWith(`${defaultBaseUrl}/v1/models`)
expect(mockedAxios.get).toHaveBeenCalledWith(`${defaultBaseUrl}/api/v1/models`)
expect(MockedLMStudioClientConstructor).toHaveBeenCalledWith({ baseUrl: defaultLmsUrl })
})

Expand All @@ -385,7 +385,7 @@ describe("LMStudio Fetcher", () => {

await getLMStudioModels(httpsBaseUrl)

expect(mockedAxios.get).toHaveBeenCalledWith(`${httpsBaseUrl}/v1/models`)
expect(mockedAxios.get).toHaveBeenCalledWith(`${httpsBaseUrl}/api/v1/models`)
expect(MockedLMStudioClientConstructor).toHaveBeenCalledWith({ baseUrl: wssLmsUrl })
})

Expand All @@ -407,7 +407,7 @@ describe("LMStudio Fetcher", () => {
const result = await getLMStudioModels(baseUrl)

expect(mockedAxios.get).toHaveBeenCalledTimes(1)
expect(mockedAxios.get).toHaveBeenCalledWith(`${baseUrl}/v1/models`)
expect(mockedAxios.get).toHaveBeenCalledWith(`${baseUrl}/api/v1/models`)
expect(MockedLMStudioClientConstructor).not.toHaveBeenCalled()
expect(mockListLoaded).not.toHaveBeenCalled()
expect(consoleErrorSpy).toHaveBeenCalledWith(
Expand All @@ -426,7 +426,7 @@ describe("LMStudio Fetcher", () => {
const result = await getLMStudioModels(baseUrl)

expect(mockedAxios.get).toHaveBeenCalledTimes(1)
expect(mockedAxios.get).toHaveBeenCalledWith(`${baseUrl}/v1/models`)
expect(mockedAxios.get).toHaveBeenCalledWith(`${baseUrl}/api/v1/models`)
expect(MockedLMStudioClientConstructor).not.toHaveBeenCalled()
expect(mockListLoaded).not.toHaveBeenCalled()
expect(consoleInfoSpy).toHaveBeenCalledWith(`Error connecting to LMStudio at ${baseUrl}`)
Expand Down
4 changes: 2 additions & 2 deletions src/api/providers/fetchers/lmstudio.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const forceFullModelDetailsLoad = async (baseUrl: string, modelId: string
try {
// Test the connection to LM Studio first
// Crrors will be caught further down.
await axios.get(`${baseUrl}/v1/models`)
await axios.get(`${baseUrl}/api/v1/models`)
const lmsUrl = baseUrl.replace(/^http:\/\//, "ws://").replace(/^https:\/\//, "wss://")

const client = new LMStudioClient({ baseUrl: lmsUrl })
Expand Down Expand Up @@ -66,7 +66,7 @@ export async function getLMStudioModels(baseUrl = "http://localhost:1234"): Prom

// test the connection to LM Studio first
// errors will be caught further down
await axios.get(`${baseUrl}/v1/models`)
await axios.get(`${baseUrl}/api/v1/models`)

const client = new LMStudioClient({ baseUrl: lmsUrl })

Expand Down
4 changes: 2 additions & 2 deletions src/api/providers/lm-studio.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export class LmStudioHandler extends BaseProvider implements SingleCompletionHan
const apiKey = "noop"

this.client = new OpenAI({
baseURL: (this.options.lmStudioBaseUrl || "http://localhost:1234") + "/v1",
baseURL: (this.options.lmStudioBaseUrl || "http://localhost:1234") + "/api/v1",
apiKey: apiKey,
timeout: getApiRequestTimeout(),
})
Expand Down Expand Up @@ -221,7 +221,7 @@ export async function getLmStudioModels(baseUrl = "http://localhost:1234") {
return []
}

const response = await axios.get(`${baseUrl}/v1/models`)
const response = await axios.get(`${baseUrl}/api/v1/models`)
const modelsArray = response.data?.data?.map((model: any) => model.id) || []
return [...new Set<string>(modelsArray)]
} catch (error) {
Expand Down
Loading