Merge pull request #25 from antropia-studio/fix-lmstudio

Fix LM Studio integration

Author: Serchinastico

npm-shrinkwrap.json

@@ -20,42 +20,40 @@
     "ai": "^4.3.16",
     "color-json": "^3.0.5",
     "configstore": "^7",
-    "espree": "^10.3.0",
     "gettext-parser": "^8",
     "ink": "^5.2.1",
     "npm-check-updates": "^18.0.1",
     "ollama-ai-provider": "^1.2.0",
     "react": "^18.3.1",
     "ts-deepmerge": "^7.0.3",
-    "zod": "^3.25.32"
+    "zod": "^3.25.48"
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^19.8.1",
     "@eslint/eslintrc": "^3.3.1",
-    "@eslint/js": "^9.27.0",
+    "@eslint/js": "^9.28.0",
     "@oclif/prettier-config": "^0.2.1",
     "@oclif/test": "^4.1.13",
     "@release-it/conventional-changelog": "^10.0.1",
     "@types/chai": "^5.2.2",
     "@types/configstore": "^6.0.2",
     "@types/espree": "^10.1.0",
     "@types/gettext-parser": "^8.0.0",
-    "@types/node": "^22.15.23",
+    "@types/node": "^22.15.29",
     "@types/react": "^19.1.6",
     "chai": "^5.2.0",
     "commitlint": "^19.8.1",
-    "eslint": "^9.27.0",
-    "eslint-config-oclif": "^6.0.62",
+    "eslint": "^9.28.0",
+    "eslint-config-oclif": "^6.0.65",
     "eslint-config-prettier": "^10.1.5",
     "eslint-plugin-chai-friendly": "^1.0.1",
     "eslint-plugin-perfectionist": "^4.13.0",
-    "eslint-plugin-prettier": "^5.4.0",
+    "eslint-plugin-prettier": "^5.4.1",
     "lefthook": "^1.11.13",
     "oclif": "^4.17.46",
     "prettier": "^3.5.3",
-    "release-it": "^19.0.2",
+    "release-it": "^19.0.3",
     "shx": "^0.4.0",
-    "ts-morph": "^26.0.0",
     "tsc-alias": "^1.8.16",
     "tsx": "^4.19.4",
     "typescript": "^5.8.3",

package.json

@@ -41,13 +41,7 @@ export class Llm {
 
   async translateOne(missingTranslation: MissingTranslation): Promise<FilledTranslation> {
     const llmService = await this.getService()
-    const provider = await llmService.getProvider()
-    const availableModelIds = await llmService.getAvailableModelIds()
-
-    invariant(availableModelIds.length > 0, 'llm:no_models_found')
-
-    const modelId = availableModelIds[0]
-    const model = provider(modelId, {structuredOutputs: true})
+    const model = await llmService.getModel()
 
     const fileContents = await fs.readFile(missingTranslation.reference.filePath, 'utf-8')
 

src/lib/llm/llm.ts

@@ -2,15 +2,12 @@ import {AnthropicProvider, createAnthropic} from '@ai-sdk/anthropic'
 
 import {invariant} from '@/lib/command/invariant.js'
 import {nonEmptyStringOrUndefined} from '@/lib/common/string.js'
-import {Config} from '@/lib/common/types.js'
 import {Defaults} from '@/lib/llm/defaults.js'
 import {LlmProvider, LlmService} from '@/lib/llm/services/llm-service.js'
 
-export class Claude implements LlmService {
+export class Claude extends LlmService {
   private provider!: AnthropicProvider
 
-  constructor(private config: Config) {}
-
   async getAvailableModelIds(): Promise<string[]> {
     invariant(this.config.llmSettings?.provider === 'claude', 'internal_error')
 

src/lib/llm/services/claude.ts

@@ -1,16 +1,33 @@
 import {AnthropicProvider} from '@ai-sdk/anthropic'
 import {OpenAIProvider} from '@ai-sdk/openai'
 import {OpenAICompatibleProvider} from '@ai-sdk/openai-compatible'
+import {LanguageModelV1} from 'ai'
 import {OllamaProvider} from 'ollama-ai-provider'
 
+import {invariant} from '@/lib/command/invariant'
+import {Config} from '@/lib/common/types'
+
 export type LlmProvider = AnthropicProvider | OllamaProvider | OpenAICompatibleProvider | OpenAIProvider
 
 /**
  * Interface representing the base service for language model operations.
  * This class must be extended to define specific implementations for interacting
  * with language models.
  */
-export interface LlmService {
-  getAvailableModelIds(): Promise<string[]>
-  getProvider(): Promise<LlmProvider>
+export abstract class LlmService {
+  constructor(protected config: Config) {}
+
+  async getModel(): Promise<LanguageModelV1> {
+    const provider = await this.getProvider()
+    const availableModelIds = await this.getAvailableModelIds()
+
+    invariant(availableModelIds.length > 0, 'llm:no_models_found')
+
+    const modelId = availableModelIds[0]
+    return provider(modelId, {structuredOutputs: true})
+  }
+
+  protected abstract getAvailableModelIds(): Promise<string[]>
+
+  protected abstract getProvider(): Promise<LlmProvider>
 }

src/lib/llm/services/llm-service.ts

@@ -1,7 +1,7 @@
-import {createOpenAICompatible} from '@ai-sdk/openai-compatible'
+import {createOpenAICompatible, OpenAICompatibleChatLanguageModel} from '@ai-sdk/openai-compatible'
+import {LanguageModelV1} from 'ai'
 
 import {invariant} from '@/lib/command/invariant.js'
-import {Config} from '@/lib/common/types.js'
 import {Defaults} from '@/lib/llm/defaults.js'
 import {LlmProvider, LlmService} from '@/lib/llm/services/llm-service.js'
 
@@ -14,12 +14,10 @@ type LmStudioModelsResponse = {
   object: string
 }
 
-export class LmStudio implements LlmService {
+export class LmStudio extends LlmService {
   private modelIds!: string[]
   private provider!: LlmProvider
 
-  constructor(private config: Config) {}
-
   async getAvailableModelIds(): Promise<string[]> {
     invariant(this.config.llmSettings?.provider === 'lmstudio', 'internal_error')
 
@@ -32,6 +30,30 @@ export class LmStudio implements LlmService {
     return this.modelIds
   }
 
+  async getModel(): Promise<LanguageModelV1> {
+    const llmSettings = this.config.llmSettings
+    invariant(llmSettings?.provider === 'lmstudio', 'internal_error')
+
+    const models = await this.getAvailableModelIds()
+
+    invariant(models.length > 0, 'llm:no_models_found')
+
+    return new OpenAICompatibleChatLanguageModel(
+      models[0],
+      {},
+      {
+        defaultObjectGenerationMode: 'json',
+        headers: () => ({}),
+        provider: `lmstudio.chat`,
+        supportsStructuredOutputs: true,
+        url: ({path}) => {
+          const url = new URL(`${llmSettings.url ?? Defaults.llmSettings.lmstudio.url}/v1${path}`)
+          return url.toString()
+        },
+      },
+    )
+  }
+
   async getProvider(): Promise<LlmProvider> {
     invariant(this.config.llmSettings?.provider === 'lmstudio', 'internal_error')
 

src/lib/llm/services/lmstudio.ts

@@ -1,7 +1,6 @@
 import {createOllama} from 'ollama-ai-provider'
 
 import {invariant} from '@/lib/command/invariant.js'
-import {Config} from '@/lib/common/types.js'
 import {Defaults} from '@/lib/llm/defaults.js'
 import {LlmProvider, LlmService} from '@/lib/llm/services/llm-service.js'
 
@@ -11,12 +10,10 @@ type OllamaModelsResponse = {
   }[]
 }
 
-export class Ollama implements LlmService {
+export class Ollama extends LlmService {
   private modelIds!: string[]
   private provider!: LlmProvider
 
-  constructor(private config: Config) {}
-
   async getAvailableModelIds(): Promise<string[]> {
     invariant(this.config.llmSettings?.provider === 'ollama', 'internal_error')
 

src/lib/llm/services/ollama.ts

@@ -2,15 +2,12 @@ import {createOpenAI, OpenAIProvider} from '@ai-sdk/openai'
 
 import {invariant} from '@/lib/command/invariant.js'
 import {nonEmptyStringOrUndefined} from '@/lib/common/string.js'
-import {Config} from '@/lib/common/types.js'
 import {Defaults} from '@/lib/llm/defaults.js'
 import {LlmProvider, LlmService} from '@/lib/llm/services/llm-service.js'
 
-export class OpenAi implements LlmService {
+export class OpenAi extends LlmService {
   private provider!: OpenAIProvider
 
-  constructor(private config: Config) {}
-
   async getAvailableModelIds(): Promise<string[]> {
     invariant(this.config.llmSettings?.provider === 'openai', 'internal_error')