feat: multi speech credential diff labels but same vendor (#426)

* feat: multi speech credential diff labels but same vendor

* update sql

* fix

* fix

* fix jslint

* fix review comment

* update verb spec version

lib/session/call-session.js

@@ -179,6 +179,16 @@ class CallSession extends Emitter {
   set speechSynthesisVendor(vendor) {
     this.application.speech_synthesis_vendor = vendor;
   }
+
+  /**
+   * default label to use for speech synthesis if not provided in the app
+   */
+  get speechSynthesisLabel() {
+    return this.application.speech_synthesis_label;
+  }
+  set speechSynthesisLabel(label) {
+    this.application.speech_synthesis_label = label;
+  }
   /**
    * default voice to use for speech synthesis if not provided in the app
    */
@@ -207,6 +217,15 @@ class CallSession extends Emitter {
   set speechRecognizerVendor(vendor) {
     this.application.speech_recognizer_vendor = vendor;
   }
+  /**
+   * default vendor to use for speech recognition if not provided in the app
+   */
+  get speechRecognizerLabel() {
+    return this.application.speech_recognizer_label;
+  }
+  set speechRecognizerLabel(label) {
+    this.application.speech_recognizer_label = label;
+  }
   /**
  * default language to use for speech recognition if not provided in the app
  */
@@ -640,14 +659,17 @@ class CallSession extends Emitter {
    * Check for speech credentials for the specified vendor
    * @param {*} vendor - google or aws
    */
-  getSpeechCredentials(vendor, type) {
+  getSpeechCredentials(vendor, type, label = null) {
     const {writeAlerts, AlertType} = this.srf.locals;
     if (this.accountInfo.speech && this.accountInfo.speech.length > 0) {
-      const credential = this.accountInfo.speech.find((s) => s.vendor === vendor);
+      const credential = this.accountInfo.speech.find((s) => s.vendor === vendor &&
+        ((label && s.label === label) || label === null));
       if (credential && (
         (type === 'tts' && credential.use_for_tts) ||
         (type === 'stt' && credential.use_for_stt)
       )) {
+        this.logger.info(`Speech credential vendor: ${credential.vendor} 
+          ${credential.label ? `, label: ${credential.label}` : ''} is chosen`);
         if ('google' === vendor) {
           try {
             const cred = JSON.parse(credential.service_key.replace(/\n/g, '\\n'));

lib/tasks/config.js

@@ -105,6 +105,9 @@ class TaskConfig extends Task {
       cs.speechSynthesisVendor = this.synthesizer.vendor !== 'default'
         ? this.synthesizer.vendor
         : cs.speechSynthesisVendor;
+      cs.speechSynthesisLabel = this.synthesizer.label !== 'default'
+        ? this.synthesizer.label
+        : cs.speechSynthesisLabel;
       cs.speechSynthesisLanguage = this.synthesizer.language !== 'default'
         ?  this.synthesizer.language
         : cs.speechSynthesisLanguage;
@@ -117,6 +120,9 @@ class TaskConfig extends Task {
       cs.speechRecognizerVendor = this.recognizer.vendor !== 'default'
         ? this.recognizer.vendor
         : cs.speechRecognizerVendor;
+      cs.speechRecognizerLabel = this.recognizer.label !== 'default'
+        ? this.recognizer.label
+        : cs.speechRecognizerLabel;
       cs.speechRecognizerLanguage = this.recognizer.language !== 'default'
         ? this.recognizer.language
         : cs.speechRecognizerLanguage;

lib/tasks/dialogflow/index.js

@@ -58,6 +58,7 @@ class Dialogflow extends Task {
       this.vendor = this.data.tts.vendor || 'default';
       this.language = this.data.tts.language || 'default';
       this.voice = this.data.tts.voice || 'default';
+      this.speechSynthesisLabel = this.data.tts.label || null;
     }
     this.bargein = this.data.bargein;
   }
@@ -119,7 +120,8 @@ class Dialogflow extends Task {
         this.language = cs.speechSynthesisLanguage;
         this.voice = cs.speechSynthesisVoice;
       }
-      this.ttsCredentials = cs.getSpeechCredentials(this.vendor, 'tts');
+      this.ttsCredentials = cs.getSpeechCredentials(this.vendor, 'tts',
+        this.speechSynthesisLabel || cs.speechSynthesisLabel);
 
       this.ep.addCustomEventListener('dialogflow::intent', this._onIntent.bind(this, ep, cs));
       this.ep.addCustomEventListener('dialogflow::transcription', this._onTranscription.bind(this, ep, cs));

lib/tasks/gather.js

@@ -187,7 +187,8 @@ class TaskGather extends Task {
     if (!this.data.recognizer.vendor) {
       this.data.recognizer.vendor = this.vendor;
     }
-    if (this.needsStt && !this.sttCredentials) this.sttCredentials = cs.getSpeechCredentials(this.vendor, 'stt');
+    if (this.needsStt && !this.sttCredentials) this.sttCredentials =
+      cs.getSpeechCredentials(this.vendor, 'stt', this.data.recognizer?.label || cs.speechRecognizerLabel);
     if (this.needsStt && !this.sttCredentials) {
       const {writeAlerts, AlertType} = cs.srf.locals;
       this.logger.info(`TaskGather:exec - ERROR stt using ${this.vendor} requested but creds not supplied`);

lib/tasks/lex.js

@@ -25,6 +25,7 @@ class Lex extends Task {
       this.vendor = this.data.tts.vendor || 'default';
       this.language = this.data.tts.language || 'default';
       this.voice = this.data.tts.voice || 'default';
+      this.speechCredentialLabel = this.data.tts.label || null;
     }
 
     this.botName = `${this.bot}:${this.alias}:${this.region}`;
@@ -103,7 +104,8 @@ class Lex extends Task {
         this.language = cs.speechSynthesisLanguage;
         this.voice = cs.speechSynthesisVoice;
       }
-      this.ttsCredentials = cs.getSpeechCredentials(this.vendor, 'tts');
+      this.ttsCredentials = cs.getSpeechCredentials(this.vendor, 'tts',
+        this.speechCredentialLabel || cs.speechSynthesisVendor);
 
       this.ep.addCustomEventListener('lex::intent', this._onIntent.bind(this, ep, cs));
       this.ep.addCustomEventListener('lex::transcription', this._onTranscription.bind(this, ep, cs));

lib/tasks/say.js

@@ -67,7 +67,7 @@ class TaskSay extends Task {
       cs.speechSynthesisVoice;
     const engine = this.synthesizer.engine || 'standard';
     const salt = cs.callSid;
-    let credentials = cs.getSpeechCredentials(vendor, 'tts');
+    let credentials = cs.getSpeechCredentials(vendor, 'tts', this.data.synthesizer?.label || cs.speechSynthesisLabel);
 
     /* parse Nuance voices into name and model */
     let model;

lib/tasks/transcribe.js

@@ -101,7 +101,8 @@ class TaskTranscribe extends Task {
     if (!this.data.recognizer.vendor) {
       this.data.recognizer.vendor = this.vendor;
     }
-    if (!this.sttCredentials) this.sttCredentials = cs.getSpeechCredentials(this.vendor, 'stt');
+    if (!this.sttCredentials) this.sttCredentials =
+      cs.getSpeechCredentials(this.vendor, 'stt', this.data.recognizer?.label || cs.speechRecognizerLabel);
 
     try {
       if (!this.sttCredentials) {

lib/utils/amd-utils.js

@@ -54,7 +54,8 @@ class Amd extends Emitter {
     this.language = opts.recognizer?.language || cs.speechRecognizerLanguage;
     if ('default' === this.language) this.language = cs.speechRecognizerLanguage;
 
-    this.sttCredentials = cs.getSpeechCredentials(this.vendor, 'stt');
+    this.sttCredentials = cs.getSpeechCredentials(this.vendor, 'stt',
+      opts.recognizer?.label || cs.speechRecognizerLabel);
 
     if (!this.sttCredentials) throw new Error(`No speech credentials found for vendor ${this.vendor}`);