Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

voice - add a new action to stop and accept voice input #191802

Merged
merged 2 commits into from
Aug 30, 2023
Merged

voice - add a new action to stop and accept voice input #191802

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0413f14
voice - add a new action to stop and accept voice input
bpasero Aug 30, 2023
3bab13e
voice - clear input when starting voice transcription
bpasero Aug 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
87 changes: 65 additions & 22 deletions src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,21 +159,26 @@ class VoiceChatSessionControllerFactory {
}
}

class VoiceChatSession {
interface ActiveVoiceChatSession {
readonly controller: IVoiceChatSessionController;
readonly disposables: DisposableStore;
}

class VoiceChatSessions {

private static instance: VoiceChatSession | undefined = undefined;
static getInstance(instantiationService: IInstantiationService): VoiceChatSession {
if (!VoiceChatSession.instance) {
VoiceChatSession.instance = instantiationService.createInstance(VoiceChatSession);
private static instance: VoiceChatSessions | undefined = undefined;
static getInstance(instantiationService: IInstantiationService): VoiceChatSessions {
if (!VoiceChatSessions.instance) {
VoiceChatSessions.instance = instantiationService.createInstance(VoiceChatSessions);
}

return VoiceChatSession.instance;
return VoiceChatSessions.instance;
}

private voiceChatInProgressKey = CONTEXT_VOICE_CHAT_IN_PROGRESS.bindTo(this.contextKeyService);
private voiceChatGettingReadyKey = CONTEXT_VOICE_CHAT_GETTING_READY.bindTo(this.contextKeyService);

private currentVoiceChatSession: DisposableStore | undefined = undefined;
private currentVoiceChatSession: ActiveVoiceChatSession | undefined = undefined;
private voiceChatSessionIds = 0;

constructor(
Expand All @@ -185,14 +190,18 @@ class VoiceChatSession {
this.stop();

const voiceChatSessionId = ++this.voiceChatSessionIds;
this.currentVoiceChatSession = new DisposableStore();
this.currentVoiceChatSession = {
controller,
disposables: new DisposableStore()
};

const cts = new CancellationTokenSource();
this.currentVoiceChatSession.add(toDisposable(() => cts.dispose(true)));
this.currentVoiceChatSession.disposables.add(toDisposable(() => cts.dispose(true)));

this.currentVoiceChatSession.add(controller.onDidAcceptInput(() => this.stop(voiceChatSessionId)));
this.currentVoiceChatSession.add(controller.onDidCancelInput(() => this.stop(voiceChatSessionId)));
this.currentVoiceChatSession.disposables.add(controller.onDidAcceptInput(() => this.stop(voiceChatSessionId)));
this.currentVoiceChatSession.disposables.add(controller.onDidCancelInput(() => this.stop(voiceChatSessionId)));

controller.updateInput('');
controller.focusInput();

this.voiceChatGettingReadyKey.set(true);
Expand All @@ -208,14 +217,14 @@ class VoiceChatSession {
this.voiceChatGettingReadyKey.set(false);
this.voiceChatInProgressKey.set(true);

this.registerTranscriptionListener(controller, onDidTranscribe, this.currentVoiceChatSession);
this.registerTranscriptionListener(this.currentVoiceChatSession, onDidTranscribe);
}

private registerTranscriptionListener(controller: IVoiceChatSessionController, onDidTranscribe: Event<string>, disposables: DisposableStore) {
private registerTranscriptionListener(session: ActiveVoiceChatSession, onDidTranscribe: Event<string>) {
let lastText: string | undefined = undefined;
let lastTextSimilarCount = 0;

disposables.add(onDidTranscribe(text => {
session.disposables.add(onDidTranscribe(text => {
if (!text && lastText) {
text = lastText;
}
Expand All @@ -229,9 +238,9 @@ class VoiceChatSession {
}

if (lastTextSimilarCount >= 2) {
controller.acceptInput();
session.controller.acceptInput();
} else {
controller.updateInput(text);
session.controller.updateInput(text);
}

}
Expand Down Expand Up @@ -260,12 +269,23 @@ class VoiceChatSession {
return;
}

this.currentVoiceChatSession.dispose();
this.currentVoiceChatSession.disposables.dispose();
this.currentVoiceChatSession = undefined;

this.voiceChatGettingReadyKey.set(false);
this.voiceChatInProgressKey.set(false);
}

accept(voiceChatSessionId = this.voiceChatSessionIds): void {
if (
!this.currentVoiceChatSession ||
this.voiceChatSessionIds !== voiceChatSessionId
) {
return;
}

this.currentVoiceChatSession.controller.acceptInput();
}
}

class VoiceChatInChatViewAction extends Action2 {
Expand All @@ -290,7 +310,7 @@ class VoiceChatInChatViewAction extends Action2 {

const controller = await VoiceChatSessionControllerFactory.create(accessor, 'view');
if (controller) {
VoiceChatSession.getInstance(instantiationService).start(controller);
VoiceChatSessions.getInstance(instantiationService).start(controller);
}
}
}
Expand All @@ -317,7 +337,7 @@ class InlineVoiceChatAction extends Action2 {

const controller = await VoiceChatSessionControllerFactory.create(accessor, 'inline');
if (controller) {
VoiceChatSession.getInstance(instantiationService).start(controller);
VoiceChatSessions.getInstance(instantiationService).start(controller);
}
}
}
Expand All @@ -344,7 +364,7 @@ class QuickVoiceChatAction extends Action2 {

const controller = await VoiceChatSessionControllerFactory.create(accessor, 'quick');
if (controller) {
VoiceChatSession.getInstance(instantiationService).start(controller);
VoiceChatSessions.getInstance(instantiationService).start(controller);
}
}
}
Expand Down Expand Up @@ -390,7 +410,7 @@ class StartVoiceChatAction extends Action2 {

const controller = await VoiceChatSessionControllerFactory.create(accessor, 'focussed');
if (controller) {
VoiceChatSession.getInstance(instantiationService).start(controller);
VoiceChatSessions.getInstance(instantiationService).start(controller);
} else {
// fallback to Quick Voice Chat command
commandService.executeCommand(QuickVoiceChatAction.ID);
Expand Down Expand Up @@ -433,7 +453,29 @@ class StopVoiceChatAction extends Action2 {
}

run(accessor: ServicesAccessor): void {
VoiceChatSession.getInstance(accessor.get(IInstantiationService)).stop();
VoiceChatSessions.getInstance(accessor.get(IInstantiationService)).stop();
}
}

class StopVoiceChatAndSubmitAction extends Action2 {

static readonly ID = 'workbench.action.chat.stopVoiceChatAndSubmit';

constructor() {
super({
id: StopVoiceChatAndSubmitAction.ID,
title: {
value: localize('workbench.action.chat.stopAndAcceptVoiceChat.label', "Stop Voice Chat and Submit"),
original: 'Stop Voice Chat and Submit'
},
category: CHAT_CATEGORY,
f1: true,
precondition: CONTEXT_VOICE_CHAT_IN_PROGRESS
});
}

run(accessor: ServicesAccessor): void {
VoiceChatSessions.getInstance(accessor.get(IInstantiationService)).accept();
}
}

Expand All @@ -445,5 +487,6 @@ export function registerVoiceChatActions() {

registerAction2(StartVoiceChatAction);
registerAction2(StopVoiceChatAction);
registerAction2(StopVoiceChatAndSubmitAction);
}
}