fix: azure chat

glorat · Jul 3, 2023 · 38c2e77 · 38c2e77
1 parent abfd6eb
commit 38c2e77
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/src/components/AudioTranscriber.vue b/src/components/AudioTranscriber.vue
@@ -1,7 +1,7 @@
 <template>
   <q-btn round flat :icon="recording ? matStop :matMic " :color="recording ? 'primary' : ''" @click="toggleRecording">
   </q-btn>
-  <btn v-if="props.showPlay" @click="playRecording" :disabled="!audioUrl">Play Recording</btn>
+  <q-btn v-if="props.showPlay" @click="playRecording" :disabled="!audioUrl">Play Recording</q-btn>
 </template>
 
 <script setup lang="ts">

diff --git a/src/lib/ai/config.ts b/src/lib/ai/config.ts
@@ -40,7 +40,7 @@ export function applyAiUserSettings(settings:AiUserSettings) {
   }
 }
 
-export const getOpenAIAPI = (deployment?: string) => {
+export function getOpenAIConfig(deployment?: string) {
   if (!OpenAIParams.apiKey) throw new Error('OPENAPI_KEY env not setup. Please check .env file or environment variables')
   const params = {...OpenAIParams}
   if (params.basePath) {
@@ -58,7 +58,12 @@ export const getOpenAIAPI = (deployment?: string) => {
       throw new Error(`Custom endpoint ${params.basePath} needs a deployment name`)
     }
   }
-  return new OpenAIApi(new Configuration(params));
+  return new Configuration(params)
+}
+
+export const getOpenAIAPI = (deployment?: string) => {
+  const config = getOpenAIConfig(deployment)
+  return new OpenAIApi(config);
 }
 
 export function getSettingsFromLocalStorage() {

diff --git a/src/lib/ai/openaiWrapper.ts b/src/lib/ai/openaiWrapper.ts
@@ -4,7 +4,7 @@
  * Function must be idempotent
  */
 import {CreateEmbeddingRequest} from 'openai'
-import {Config, getOpenAIAPI, OpenAIParams} from 'src/lib/ai/config'
+import {Config, getOpenAIAPI, getOpenAIConfig, OpenAIParams} from 'src/lib/ai/config'
 import {logger} from 'src/lib/ai/logger'
 import {callWithRetry} from 'src/lib/ai/callWithRetry'
 import {LRUCache} from 'lru-cache'
@@ -115,10 +115,23 @@ export async function createTranscriptionDirect(arg: {blob:Blob}) {
   return res.data?.text;
 }
 
+function getChatGPTClientOptions(clientOptions?:any) {
+  const cfg = getOpenAIConfig(Config.chatModel)
+  if (cfg.basePath) {
+    // Set up azure mode
+    // https://kevin-test-openai-1.openai.azure.com//openai/deployments/gpt-35-turbo/chat/completions?api-version=2023-03-15-preview
+    const opts = {azure: true, reverseProxyUrl: `${cfg.basePath}/chat/completions?api-version=2023-03-15-preview`}
+    return {...(clientOptions??{}), ...opts}
+  } else {
+    return clientOptions ?? {}
+  }
+
+}
+
 export async function sendChatMessageDirect(arg: {message:string, chatOptions?:any, cache: any, clientOptions?:any}) {
-  const clientOptions = {}
+  const clientOptions = getChatGPTClientOptions(arg.clientOptions)
   // TODO: make this work for Azure too
-  const client = new ChatGPTClient(OpenAIParams.apiKey, clientOptions ?? {}, arg.cache)
+  const client = new ChatGPTClient(OpenAIParams.apiKey, clientOptions, arg.cache)
   const res = await client.sendMessage(arg.message, arg.chatOptions)
   return res
 }