-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
8 changed files
with
195 additions
and
44 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
backend/src/main/java/com/odde/doughnut/configs/WebSocketConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
package com.odde.doughnut.configs; | ||
|
||
import com.odde.doughnut.factoryServices.ModelFactoryService; | ||
import com.odde.doughnut.handlers.AudioWebSocketHandler; | ||
import com.theokanning.openai.client.OpenAiApi; | ||
import org.springframework.beans.factory.annotation.Autowired; | ||
import org.springframework.beans.factory.annotation.Qualifier; | ||
import org.springframework.context.annotation.Bean; | ||
import org.springframework.context.annotation.Configuration; | ||
import org.springframework.web.socket.WebSocketHandler; | ||
import org.springframework.web.socket.config.annotation.EnableWebSocket; | ||
import org.springframework.web.socket.config.annotation.WebSocketConfigurer; | ||
import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry; | ||
|
||
@Configuration | ||
@EnableWebSocket | ||
public class WebSocketConfig implements WebSocketConfigurer { | ||
|
||
@Autowired private ModelFactoryService modelFactoryService; | ||
|
||
@Autowired | ||
@Qualifier("testableOpenAiApi") | ||
private OpenAiApi openAiApi; | ||
|
||
@Override | ||
public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { | ||
registry.addHandler(audioWebSocketHandler(), "/ws/audio").setAllowedOrigins("*"); | ||
} | ||
|
||
@Bean | ||
public WebSocketHandler audioWebSocketHandler() { | ||
return new AudioWebSocketHandler(openAiApi, modelFactoryService); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
backend/src/main/java/com/odde/doughnut/handlers/AudioWebSocketHandler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
package com.odde.doughnut.handlers; | ||
|
||
import com.odde.doughnut.factoryServices.ModelFactoryService; | ||
import com.odde.doughnut.services.AiAdvisorService; | ||
import com.odde.doughnut.services.GlobalSettingsService; | ||
import com.odde.doughnut.services.ai.TextFromAudio; | ||
import com.theokanning.openai.client.OpenAiApi; | ||
import java.io.IOException; | ||
import java.util.Optional; | ||
import org.springframework.beans.factory.annotation.Autowired; | ||
import org.springframework.beans.factory.annotation.Qualifier; | ||
import org.springframework.web.socket.BinaryMessage; | ||
import org.springframework.web.socket.TextMessage; | ||
import org.springframework.web.socket.WebSocketSession; | ||
import org.springframework.web.socket.handler.BinaryWebSocketHandler; | ||
|
||
public class AudioWebSocketHandler extends BinaryWebSocketHandler { | ||
|
||
private final AiAdvisorService aiAdvisorService; | ||
private final ModelFactoryService modelFactoryService; | ||
|
||
@Autowired | ||
public AudioWebSocketHandler( | ||
@Qualifier("testableOpenAiApi") OpenAiApi openAiApi, | ||
ModelFactoryService modelFactoryService) { | ||
this.modelFactoryService = modelFactoryService; | ||
this.aiAdvisorService = new AiAdvisorService(openAiApi); | ||
} | ||
|
||
@Override | ||
protected void handleBinaryMessage(WebSocketSession session, BinaryMessage message) | ||
throws IOException { | ||
byte[] audioData = message.getPayload().array(); | ||
|
||
Optional<TextFromAudio> result = | ||
aiAdvisorService | ||
.getOtherAiServices() | ||
.getTextFromAudio( | ||
getPreviousNoteDetails(session), | ||
"stream.wav", | ||
audioData, | ||
getGlobalSettingsService().globalSettingOthers().getValue()); | ||
|
||
if (result.isPresent()) { | ||
session.sendMessage(new TextMessage(result.get().getCompletionMarkdownFromAudio())); | ||
} | ||
} | ||
|
||
private GlobalSettingsService getGlobalSettingsService() { | ||
return new GlobalSettingsService(modelFactoryService); | ||
} | ||
|
||
private String getPreviousNoteDetails(WebSocketSession session) { | ||
// Implement logic to get previous note details from session | ||
return ""; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
63 changes: 63 additions & 0 deletions
63
backend/src/test/java/com/odde/doughnut/handlers/AudioWebSocketHandlerTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
package com.odde.doughnut.handlers; | ||
|
||
import static org.mockito.ArgumentMatchers.any; | ||
import static org.mockito.Mockito.*; | ||
|
||
import com.odde.doughnut.services.ai.TextFromAudio; | ||
import com.odde.doughnut.services.openAiApis.OpenAiApiExtended; | ||
import com.odde.doughnut.testability.MakeMe; | ||
import com.odde.doughnut.testability.OpenAIChatCompletionMock; | ||
import io.reactivex.Single; | ||
import java.io.IOException; | ||
import okhttp3.RequestBody; | ||
import okhttp3.ResponseBody; | ||
import org.junit.jupiter.api.BeforeEach; | ||
import org.junit.jupiter.api.Test; | ||
import org.mockito.Mock; | ||
import org.springframework.beans.factory.annotation.Autowired; | ||
import org.springframework.boot.test.context.SpringBootTest; | ||
import org.springframework.test.context.ActiveProfiles; | ||
import org.springframework.transaction.annotation.Transactional; | ||
import org.springframework.web.socket.BinaryMessage; | ||
import org.springframework.web.socket.TextMessage; | ||
import org.springframework.web.socket.WebSocketSession; | ||
|
||
@SpringBootTest | ||
@ActiveProfiles("test") | ||
@Transactional | ||
class AudioWebSocketHandlerTests { | ||
|
||
@Autowired MakeMe makeMe; | ||
|
||
@Mock OpenAiApiExtended openAiApi; | ||
|
||
@Mock WebSocketSession session; | ||
|
||
private AudioWebSocketHandler handler; | ||
OpenAIChatCompletionMock openAIChatCompletionMock; | ||
|
||
@BeforeEach | ||
void setup() { | ||
handler = new AudioWebSocketHandler(openAiApi, makeMe.modelFactoryService); | ||
when(openAiApi.createTranscriptionSrt(any(RequestBody.class))) | ||
.thenReturn(Single.just(ResponseBody.create("test", null))); | ||
TextFromAudio completionMarkdownFromAudio = new TextFromAudio(); | ||
completionMarkdownFromAudio.setCompletionMarkdownFromAudio("test123"); | ||
openAIChatCompletionMock = new OpenAIChatCompletionMock(openAiApi); | ||
openAIChatCompletionMock.mockChatCompletionAndReturnToolCall( | ||
completionMarkdownFromAudio, "audio_transcription_to_text"); | ||
} | ||
|
||
@Test | ||
void handleBinaryMessage_shouldSendTextMessageWhenTextFromAudioIsPresent() throws IOException { | ||
byte[] audioData = "test audio data".getBytes(); | ||
BinaryMessage binaryMessage = new BinaryMessage(audioData); | ||
|
||
TextFromAudio textFromAudio = new TextFromAudio(); | ||
textFromAudio.setCompletionMarkdownFromAudio("Transcribed text"); | ||
|
||
handler.handleBinaryMessage(session, binaryMessage); | ||
|
||
verify(session).sendMessage(any(TextMessage.class)); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters