Merge pull request #188 from tegnike/feature/realtimeapi-bug-fix

Realtime API関連のバグフィックス
tegnike · Oct 18, 2024 · 42e9b59 · 42e9b59
2 parents 9c96078 + 9f4f343
commit 42e9b59
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 19 deletions.
diff --git a/src/components/messageInput.tsx b/src/components/messageInput.tsx
@@ -108,7 +108,7 @@ export const MessageInput = ({
  iconName="24/Send"
  className="bg-secondary hover:bg-secondary-hover active:bg-secondary-press disabled:bg-secondary-disabled"
  isProcessing={chatProcessing}
- disabled={chatProcessing || !userMessage}
+ disabled={chatProcessing || !userMessage || realtimeAPIMode}
  onClick={onClickSendButton}
  />
  </div>

diff --git a/src/components/settings/modelProvider.tsx b/src/components/settings/modelProvider.tsx
@@ -68,6 +68,10 @@ const ModelProvider = () => {
  isPlaying: false,
  })
  }
+
+ if (newService !== 'openai' && newService !== 'azure') {
+ settingsStore.setState({ realtimeAPIMode: false })
+ }
  },
  []
  )
@@ -319,7 +323,7 @@ const ModelProvider = () => {
  https://RESOURCE_NAME.openai.azure.com/openai/deployments/DEPLOYMENT_NAME/chat/completions?api-version=API_VERSION
  <br />
  Realtime API ex.
- https://RESOURCE_NAME.openai.azure.com/openai/realtime?api-version=API_VERSION&deployment=DEPLOYMENT_NAME
+ wss://RESOURCE_NAME.openai.azure.com/openai/realtime?api-version=API_VERSION&deployment=DEPLOYMENT_NAME
  </div>
  <input
  className="text-ellipsis px-16 py-8 w-col-span-2 bg-surface1 hover:bg-surface1-hover rounded-8"

diff --git a/src/components/useRealtimeAPI.tsx b/src/components/useRealtimeAPI.tsx
@@ -276,10 +276,7 @@ const useRealtimeAPI = ({ handleReceiveTextFromRt }: Params) => {
  'openai-beta.realtime-v1',
  ])
  } else if (ss.selectAIService === 'azure') {
- const url =
- `${ss.azureEndpoint}&api-key=${ss.azureKey}` ||
- `${process.env.AZURE_ENDPOINT}&api-key=${ss.azureKey}` ||
- ''
+ const url = `${ss.azureEndpoint}&api-key=${ss.azureKey}`
  ws = new WebSocket(url, [])
  } else {
  return null

diff --git a/src/features/chat/vercelAIChat.ts b/src/features/chat/vercelAIChat.ts
@@ -16,12 +16,6 @@ const getAIConfig = () => {
  const apiKeyName = `${aiService}Key` as const
  const apiKey = ss[apiKeyName]
 
- if (!apiKey) {
- throw new Error(
- `API key for ${aiService} is missing. Unable to proceed with the AI service.`
- )
- }
-
  return {
  aiApiKey: apiKey,
  selectAIService: aiService,

diff --git a/src/features/slide/slideAIHelpers.ts b/src/features/slide/slideAIHelpers.ts
@@ -19,12 +19,6 @@ export const judgeSlide = async (
  const apiKeyName = `${aiService}Key` as const
  const apiKey = ss[apiKeyName]
 
- if (!apiKey) {
- throw new Error(
- `API key for ${aiService} is missing. Unable to proceed with the AI service.`
- )
- }
-
  const systemMessage = `
 You are an AI tasked with determining whether a user's comment is a question about a given script document and supplementary text, and if so, which page of the document is most relevant to the question. Follow these instructions carefully:
 

diff --git a/src/features/stores/settings.ts b/src/features/stores/settings.ts
@@ -177,7 +177,12 @@ const settingsStore = create<SettingsState>()(
  process.env.NEXT_PUBLIC_CHANGE_ENGLISH_TO_JAPANESE === 'true',
  showControlPanel: process.env.NEXT_PUBLIC_SHOW_CONTROL_PANEL !== 'false',
  webSocketMode: process.env.NEXT_PUBLIC_WEB_SOCKET_MODE === 'true',
- realtimeAPIMode: process.env.NEXT_PUBLIC_REALTIME_API_MODE === 'true',
+ realtimeAPIMode:
+ (process.env.NEXT_PUBLIC_REALTIME_API_MODE === 'true' &&
+ ['openai', 'azure'].includes(
+ process.env.NEXT_PUBLIC_SELECT_AI_SERVICE as AIService
+ )) ||
+ false,
  slideMode: process.env.NEXT_PUBLIC_SLIDE_MODE === 'true',
  messageReceiverEnabled: false,
  clientId: '',