0.0.43

remove seemingly redundant code, reintroduce param to force bypass of…

index.js

@@ -12,6 +12,7 @@ module.exports = (opts, logger) => {
     client,
     getTtsSize: require('./lib/get-tts-size').bind(null, client, logger),
     purgeTtsCache: require('./lib/purge-tts-cache').bind(null, client, logger),
+    addFileToCache: require('./lib/add-file-to-cache').bind(null, client, logger),
     synthAudio: require('./lib/synth-audio').bind(null, client, logger),
     getNuanceAccessToken: require('./lib/get-nuance-access-token').bind(null, client, logger),
     getIbmAccessToken: require('./lib/get-ibm-access-token').bind(null, client, logger),

lib/add-file-to-cache.js

@@ -0,0 +1,30 @@
+const fs = require('fs/promises');
+const {noopLogger, makeSynthKey} = require('./utils');
+const EXPIRES = (process.env.JAMBONES_TTS_CACHE_DURATION_MINS || 4 * 60) * 60; // cache tts for 4 hours
+
+async function addFileToCache(client, logger, path,
+  {account_sid, vendor, language, voice, deploymentId, engine, text}) {
+  let key;
+  logger = logger || noopLogger;
+
+  try {
+    key = makeSynthKey({
+      account_sid,
+      vendor,
+      language: language || '',
+      voice: voice || deploymentId,
+      engine,
+      text,
+    });
+    const audioBuffer = await fs.readFile(path);
+    await client.setex(key, EXPIRES, audioBuffer.toString('base64'));
+  } catch (err) {
+    logger.error(err, 'addFileToCache: Error');
+    return;
+  }
+
+  logger.debug(`addFileToCache: added ${path} to cache with key ${key}`);
+  return key;
+}
+
+module.exports = addFileToCache;

lib/get-tts-voices.js

@@ -97,7 +97,7 @@ const getAwsVoices = async(_client, logger, credentials) => {
         secretAccessKey
       }
     });
-    const command = new DescribeVoicesCommand({LanguageCode: 'en-US'});
+    const command = new DescribeVoicesCommand({});
     const response = await client.send(command);
     return response;
   } catch (err) {

lib/synth-audio.js

@@ -77,7 +77,7 @@ const trimTrailingSilence = (buffer) => {
  */
 async function synthAudio(client, logger, stats, { account_sid,
   vendor, language, voice, gender, text, engine, salt, model, credentials, deploymentId,
-  disableTtsCache, renderForCaching, options
+  disableTtsCache, renderForCaching, disableTtsStreaming, options
 }) {
   let audioBuffer;
   let servedFromCache = false;
@@ -143,6 +143,10 @@ async function synthAudio(client, logger, stats, { account_sid,
     (
       process.env.JAMBONES_TTS_TRIM_SILENCE &&
       ['microsoft', 'azure'].includes(vendor)
+    ) ||
+    (
+      !process.env.JAMBONES_DISABLE_TTS_STREAMING &&
+      vendor === 'elevenlabs'
     )
   ) {
     filePath = `${TMP_FOLDER}/${key.replace('tts:', `tts-${salt || ''}`)}.r8`;
@@ -196,17 +200,14 @@ async function synthAudio(client, logger, stats, { account_sid,
         break;
       case 'elevenlabs':
         audioBuffer = await synthElevenlabs(logger, {
-          credentials, options, stats, language, voice, text, renderForCaching, filePath
+          credentials, options, stats, language, voice, text, renderForCaching, disableTtsStreaming, filePath
         });
-        if (typeof audioBuffer === 'object' && audioBuffer.filePath) {
-          return audioBuffer;
-        }
-        else {
-          audioBuffer = await synthElevenlabs(logger, {credentials, options, stats, language, voice, text, filePath});
-        }
+        if (audioBuffer?.filePath) return audioBuffer;
         break;
       case 'whisper':
-        audioBuffer = await synthWhisper(logger, {credentials, stats, voice, text});
+        audioBuffer = await synthWhisper(logger, {
+          credentials, stats, voice, text, renderForCaching, disableTtsStreaming});
+        if (audioBuffer?.filePath) return audioBuffer;
         break;
       case 'deepgram':
         audioBuffer = await synthDeepgram(logger, {credentials, stats, model, text});
@@ -603,16 +604,19 @@ const synthCustomVendor = async(logger, {credentials, stats, language, voice, te
   }
 };
 
-const synthElevenlabs = async(logger, {credentials, options, stats, language, voice, text, renderForCaching}) => {
+const synthElevenlabs = async(logger, {
+  credentials, options, stats, voice, text, renderForCaching, disableTtsStreaming
+}) => {
   const {api_key, model_id, options: credOpts} = credentials;
   const opts = !!options && Object.keys(options).length !== 0 ? options : JSON.parse(credOpts || '{}');
 
-  /* if the env is set to stream then bag out, unless we are specifically rendering to generate a cache file */
-  if (process.env.JAMBONES_ELEVENLABS_STREAMING && !renderForCaching) {
+  /* default to using the streaming interface, unless disabled by env var OR we want just a cache file */
+  if (!process.env.JAMBONES_DISABLE_TTS_STREAMING && !renderForCaching && !disableTtsStreaming) {
     let params = '';
     params += `{api_key=${api_key}`;
     params += `,model_id=${model_id}`;
     params += `,optimize_streaming_latency=${opts.optimize_streaming_latency || 2}`;
+    params += ',write_cache_file=1';
     if (opts.voice_settings?.similarity_boost) params += `,similarity_boost=${opts.voice_settings.similarity_boost}`;
     if (opts.voice_settings?.stability) params += `,stability=${opts.voice_settings.stability}`;
     if (opts.voice_settings?.style) params += `,style=${opts.voice_settings.style}`;
@@ -620,7 +624,7 @@ const synthElevenlabs = async(logger, {credentials, options, stats, language, vo
     params += '}';
 
     return {
-      filePath: `say:${params}${text.replace(/\n/g, ' ')}`,
+      filePath: `say:${params}${text.replace(/\n/g, ' ').replace(/\r/g, ' ')}`,
       servedFromCache: false,
       rtt: 0
     };
@@ -651,8 +655,24 @@ const synthElevenlabs = async(logger, {credentials, options, stats, language, vo
   }
 };
 
-const synthWhisper = async(logger, {credentials, stats, voice, text}) => {
-  const {api_key, model_id, baseURL, timeout} = credentials;
+const synthWhisper = async(logger, {credentials, stats, voice, text, renderForCaching, disableTtsStreaming}) => {
+  const {api_key, model_id, baseURL, timeout, speed} = credentials;
+  /* if the env is set to stream then bag out, unless we are specifically rendering to generate a cache file */
+  if (!process.env.JAMBONES_DISABLE_TTS_STREAMING && !renderForCaching && !disableTtsStreaming) {
+    let params = '';
+    params += `{api_key=${api_key}`;
+    params += `,model_id=${model_id}`;
+    params += `,voice=${voice}`;
+    params += ',write_cache_file=1';
+    if (speed) params += `,speed=${speed}`;
+    params += '}';
+
+    return {
+      filePath: `say:${params}${text.replace(/\n/g, ' ')}`,
+      servedFromCache: false,
+      rtt: 0
+    };
+  }
   try {
     const openai = new OpenAI.OpenAI({
       apiKey: api_key,
@@ -677,7 +697,7 @@ const synthWhisper = async(logger, {credentials, stats, voice, text}) => {
 const synthDeepgram = async(logger, {credentials, stats, model, text}) => {
   const {api_key} = credentials;
   try {
-    const post = bent('https://api.beta.deepgram.com', 'POST', 'buffer', {
+    const post = bent('https://api.deepgram.com', 'POST', 'buffer', {
       'Authorization': `Token ${api_key}`,
       'Accept': 'audio/mpeg',
       'Content-Type': 'application/json'

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@jambonz/speech-utils",
-  "version": "0.0.34",
+  "version": "0.0.43",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@jambonz/speech-utils",
-      "version": "0.0.34",
+      "version": "0.0.43",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-polly": "^3.496.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jambonz/speech-utils",
-  "version": "0.0.34",
+  "version": "0.0.43",
   "description": "TTS-related speech utilities for jambonz",
   "main": "index.js",
   "author": "Dave Horton",

test/synth.js

@@ -20,7 +20,7 @@ const stats = {
 
 test('Google speech synth tests', async(t) => {
   const fn = require('..');
-  const {synthAudio, client} = fn(opts, logger);
+  const {synthAudio, addFileToCache, client} = fn(opts, logger);
 
   if (!process.env.GCP_FILE && !process.env.GCP_JSON_KEY) {
     t.pass('skipping google speech synth tests since neither GCP_FILE nor GCP_JSON_KEY provided');
@@ -58,6 +58,14 @@ test('Google speech synth tests', async(t) => {
     });
     t.ok(opts.servedFromCache, `successfully retrieved cached google audio from ${opts.filePath}`);
 
+    const success = await addFileToCache(opts.filePath, {
+      vendor: 'google',
+      language: 'en-GB',
+      gender: 'FEMALE',
+      text: 'This is a test.  This is only a test'
+    });
+    t.ok(success, `successfully added ${opts.filePath} to cache`);
+
     opts = await synthAudio(stats, {
       vendor: 'google',
       credentials: {
@@ -529,7 +537,7 @@ test('Deepgram speech synth tests', async(t) => {
       credentials: {
         api_key: process.env.DEEPGRAM_API_KEY
       },
-      model: 'alpha-asteria-en-v2',
+      model: 'aura-asteria-en',
       text,
     });
     t.ok(!opts.servedFromCache, `successfully synthesized deepgram audio to ${opts.filePath}`);