bump speech-utils

* add ws msgid to telemetry span if it's ws requestor

* wip

lib/middleware.js

@@ -438,7 +438,7 @@ module.exports = function(srf, logger) {
         span = obj.span;
         const b3 = rootSpan.getTracingPropagation();
         const httpHeaders = b3 && { b3 };
-        json = await app.requestor.request('session:new', app.call_hook, params, httpHeaders);
+        json = await app.requestor.request('session:new', app.call_hook, params, httpHeaders, span);
       }
 
       app.tasks = normalizeJambones(logger, json).map((tdata) => makeTask(logger, tdata));

lib/session/call-session.js

@@ -1032,6 +1032,7 @@ class CallSession extends Emitter {
           return {
             speech_credential_sid: credential.speech_credential_sid,
             api_key: credential.api_key,
+            model_id: credential.model_id,
             deepgram_stt_uri: credential.deepgram_stt_uri,
             deepgram_tts_uri: credential.deepgram_tts_uri,
             deepgram_stt_use_tls: credential.deepgram_stt_use_tls

lib/tasks/conference.js

@@ -465,7 +465,7 @@ class Conference extends Task {
 
   doConferenceMute(cs, opts) {
     assert (cs.isInConference);
-    this.logger.info(`Conference:doConferenceMute ${mute ? 'muting' : 'unmuting'} member`);
+
     const mute = opts.conf_mute_status === 'mute';
     this.ep.api(`conference ${this.confName} ${mute ? 'mute' : 'unmute'} ${this.memberId}`)
       .catch((err) => this.logger.info({err}, 'Error muting or unmuting participant'));
@@ -568,8 +568,8 @@ class Conference extends Task {
   /**
    * mute or unmute side of the call
    */
-  async mute(callSid, doMute) {
-    this.doConferenceMute(this.callSession, {conf_mute_status: doMute ? 'mute' : 'unmute'});
+  mute(callSid, doMute) {
+    this.doConferenceMute(this.callSession, {conf_mute_status: doMute});
   }
 
   /**

lib/tasks/config.js

@@ -139,7 +139,7 @@ class TaskConfig extends Task {
 
       try {
         this.ep = ep;
-        this.startAmd(cs, ep, this, this.data.amd);
+        await this.startAmd(cs, ep, this, this.data.amd);
       } catch (err) {
         this.logger.info({err}, 'Config:exec - Error calling startAmd');
       }

lib/tasks/task.js

@@ -166,7 +166,7 @@ class Task extends Emitter {
       span.setAttributes({'http.body': JSON.stringify(params)});
       try {
         if (this.id) params.verb_id = this.id;
-        const json = await this.cs.requestor.request(type, this.actionHook, params, httpHeaders);
+        const json = await this.cs.requestor.request(type, this.actionHook, params, httpHeaders, span);
         span.setAttributes({'http.statusCode': 200});
         const isWsConnection = this.cs.requestor instanceof WsRequestor;
         if (!isWsConnection || (expectResponse && json && Array.isArray(json) && json.length)) {
@@ -210,7 +210,7 @@ class Task extends Emitter {
     const httpHeaders = b3 && {b3};
     span.setAttributes({'http.body': JSON.stringify(params)});
     try {
-      const json = await cs.requestor.request('verb:hook', hook, params, httpHeaders);
+      const json = await cs.requestor.request('verb:hook', hook, params, httpHeaders, span);
       span.setAttributes({'http.statusCode': 200});
       span.end();
       if (json && Array.isArray(json)) {

lib/tasks/tts-task.js

@@ -45,7 +45,8 @@ class TtsTask extends Task {
     }
 
     const fullText = Array.isArray(this.text) ? this.text.join(' ') : this.text;
-    if (fullText.length > 0) {
+    // in case dub verb, text might not be set.
+    if (fullText?.length > 0) {
       cs.emit('botSaid', fullText);
     }
   }

lib/utils/db-utils.js

@@ -76,6 +76,7 @@ const speechMapper = (cred) => {
     else if ('deepgram' === obj.vendor) {
       const o = JSON.parse(decrypt(credential));
       obj.api_key = o.api_key;
+      obj.model_id = o.model_id;
       obj.deepgram_stt_uri = o.deepgram_stt_uri;
       obj.deepgram_tts_uri = o.deepgram_tts_uri;
       obj.deepgram_stt_use_tls = o.deepgram_stt_use_tls;

lib/utils/http-requestor.js

@@ -102,7 +102,7 @@ class HttpRequestor extends BaseRequestor {
    * @param {string} [hook.password] - if basic auth is protecting the endpoint
    * @param {object} [params] - request parameters
    */
-  async request(type, hook, params, httpHeaders = {}) {
+  async request(type, hook, params, httpHeaders = {}, span) {
     /* jambonz:error only sent over ws */
     if (type === 'jambonz:error') return;
 
@@ -131,7 +131,7 @@ class HttpRequestor extends BaseRequestor {
         this.close();
         this.emit('handover', requestor);
       }
-      return requestor.request('session:new', hook, params, httpHeaders);
+      return requestor.request('session:new', hook, params, httpHeaders, span);
     }
 
     let newClient;

lib/utils/transcription-utils.js

@@ -829,7 +829,7 @@ module.exports = (logger) => {
       };
     }
     else if ('deepgram' === vendor) {
-      let model = rOpts.deepgramOptions?.model || rOpts.model;
+      let model = rOpts.deepgramOptions?.model || rOpts.model || sttCredentials.model_id;
       const {deepgramOptions = {}} = rOpts;
       const deepgramUri = deepgramOptions.deepgramSttUri || sttCredentials.deepgram_stt_uri;
       const useTls = deepgramOptions.deepgramSttUseTls || sttCredentials.deepgram_stt_use_tls;

lib/utils/ws-requestor.js

@@ -55,7 +55,7 @@ class WsRequestor extends BaseRequestor {
    * @param {string} [hook.password] - if basic auth is protecting the endpoint
    * @param {object} [params] - request parameters
    */
-  async request(type, hook, params, httpHeaders = {}) {
+  async request(type, hook, params, httpHeaders = {}, span) {
     assert(HookMsgTypes.includes(type));
     const url = hook.url || hook;
     const wantsAck = !MTYPE_WANTS_ACK.includes(type);
@@ -87,7 +87,7 @@ class WsRequestor extends BaseRequestor {
         this.close();
         this.emit('handover', requestor);
       }
-      return requestor.request(type, hook, params, httpHeaders);
+      return requestor.request(type, hook, params, httpHeaders, span);
     }
 
     /* connect if necessary */
@@ -152,13 +152,17 @@ class WsRequestor extends BaseRequestor {
       data: {...payload},
       ...b3
     };
+    // add msgid to span attributes if it exists
+    if (span) {
+      span.setAttributes({'msgid': msgid});
+    }
 
     const sendQueuedMsgs = () => {
       if (this.queuedMsg.length > 0) {
         for (const {type, hook, params, httpHeaders, promise} of this.queuedMsg) {
           this.logger.debug(`WsRequestor:request - preparing queued ${type} for sending`);
           if (promise) {
-            this.request(type, hook, params, httpHeaders)
+            this.request(type, hook, params, httpHeaders, span)
               .then((res) => promise.resolve(res))
               .catch((err) => promise.reject(err));
           }

package-lock.json

@@ -15,7 +15,7 @@
         "@jambonz/http-health-check": "^0.0.1",
         "@jambonz/mw-registrar": "^0.2.7",
         "@jambonz/realtimedb-helpers": "^0.8.13",
-        "@jambonz/speech-utils": "^0.2.10",
+        "@jambonz/speech-utils": "^0.2.11",
         "@jambonz/stats-collector": "^0.1.10",
         "@jambonz/time-series": "^0.2.13",
         "@jambonz/verb-specifications": "^0.0.104",
@@ -1466,9 +1466,9 @@
       }
     },
     "node_modules/@jambonz/speech-utils": {
-      "version": "0.2.10",
-      "resolved": "https://registry.npmjs.org/@jambonz/speech-utils/-/speech-utils-0.2.10.tgz",
-      "integrity": "sha512-RyBSS/xWMG/Uo3RG+jtESKXz/afySe8qaTuuAP9iDzEVzEXtSdxSp5lwuBjA1LZV8FUeWGI7KOV23izGQeNtHg==",
+      "version": "0.2.11",
+      "resolved": "https://registry.npmjs.org/@jambonz/speech-utils/-/speech-utils-0.2.11.tgz",
+      "integrity": "sha512-5V+OJUUnK1CpKKrB0PrAbGVDcwRGQYH/ZPHFMBayW67XaNRpiL3b9jDpMvq35yzx8MGY18JpzCPgVKHTxERlqQ==",
       "dependencies": {
         "23": "^0.0.0",
         "@aws-sdk/client-polly": "^3.496.0",

package.json

@@ -31,7 +31,7 @@
     "@jambonz/http-health-check": "^0.0.1",
     "@jambonz/mw-registrar": "^0.2.7",
     "@jambonz/realtimedb-helpers": "^0.8.13",
-    "@jambonz/speech-utils": "^0.2.10",
+    "@jambonz/speech-utils": "^0.2.11",
     "@jambonz/stats-collector": "^0.1.10",
     "@jambonz/time-series": "^0.2.13",
     "@jambonz/verb-specifications": "^0.0.104",