Cleanup provider constructors

ai-providers/mistral.ts

@@ -52,12 +52,17 @@ class MistralByteSource implements UnderlyingByteSource {
   }
 }
 
+interface MistralProviderCtorOptions {
+  model: string
+  apiKey: string
+}
+
 export class MistralProvider implements AiProvider {
   model: string
   apiKey: string
   client?: import('@mistralai/mistralai').default = undefined
 
-  constructor (model: string, apiKey: string) {
+  constructor ({ model, apiKey }: MistralProviderCtorOptions) {
     this.model = model
     this.apiKey = apiKey
   }

ai-providers/ollama.ts

@@ -37,11 +37,16 @@ class OllamaByteSource implements UnderlyingByteSource {
   }
 }
 
+interface OllamaProviderCtorOptions {
+  host: string
+  model: string
+}
+
 export class OllamaProvider implements AiProvider {
   model: string
   client: Ollama
 
-  constructor (host: string, model: string) {
+  constructor ({ host, model }: OllamaProviderCtorOptions) {
     this.model = model
     this.client = new Ollama({ host })
   }

ai-providers/open-ai.ts

@@ -81,11 +81,16 @@ class OpenAiByteSource implements UnderlyingByteSource {
   }
 }
 
+interface OpenAiProviderCtorOptions {
+  model: string
+  apiKey: string
+}
+
 export class OpenAiProvider implements AiProvider {
   model: string
   client: OpenAI
 
-  constructor (model: string, apiKey: string) {
+  constructor ({ model, apiKey }: OpenAiProviderCtorOptions) {
     this.model = model
     // @ts-expect-error
     this.client = new OpenAI({ apiKey, fetch })

plugins/warp.ts

@@ -12,14 +12,11 @@ const UnknownAiProviderError = createError('UNKNOWN_AI_PROVIDER', 'Unknown AI Pr
 
 function build (aiProvider: AiWarpConfig['aiProvider']): AiProvider {
   if ('openai' in aiProvider) {
-    const { model, apiKey } = aiProvider.openai
-    return new OpenAiProvider(model, apiKey)
+    return new OpenAiProvider(aiProvider.openai)
   } else if ('mistral' in aiProvider) {
-    const { model, apiKey } = aiProvider.mistral
-    return new MistralProvider(model, apiKey)
+    return new MistralProvider(aiProvider.mistral)
   } else if ('ollama' in aiProvider) {
-    const { host, model } = aiProvider.ollama
-    return new OllamaProvider(host, model)
+    return new OllamaProvider(aiProvider.ollama)
   } else {
     throw new UnknownAiProviderError()
   }

tests/unit/ai-providers.test.ts

@@ -10,9 +10,9 @@ import { OllamaProvider } from '../../ai-providers/ollama'
 const expectedStreamBody = buildExpectedStreamBodyString()
 
 const providers: AiProvider[] = [
-  new OpenAiProvider('gpt-3.5-turbo', ''),
-  new MistralProvider('open-mistral-7b', ''),
-  new OllamaProvider(OLLAMA_MOCK_HOST, 'some-model')
+  new OpenAiProvider({ model: 'gpt-3.5-turbo', apiKey: '' }),
+  new MistralProvider({ model: 'open-mistral-7b', apiKey: '' }),
+  new OllamaProvider({ host: OLLAMA_MOCK_HOST, model: 'some-model' })
 ]
 
 for (const provider of providers) {