mirror of
https://github.com/jambonz/speech-utils.git
synced 2026-10-03 23:33:59 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5463e9f56e | ||
|
|
2eb36af650 | ||
|
|
b186cbc4f2 | ||
|
|
b1b9c182a9 | ||
|
|
15c77626fc | ||
|
|
76126ec0b3 | ||
|
|
55431ee511 | ||
|
|
1c76f74b4a | ||
|
|
62ad8abb8e | ||
|
|
92734aaedb | ||
|
|
fe4ccfe7d7 | ||
|
|
ab05976032 | ||
|
|
babd8abc51 | ||
|
|
91f85e16b2 |
+38
-4
@@ -211,7 +211,7 @@ async function synthAudio(client, createHash, retrieveHash, logger, stats, { acc
|
||||
case 'polly':
|
||||
vendorLabel = 'aws';
|
||||
audioData = await synthPolly(createHash, retrieveHash, logger,
|
||||
{credentials, stats, language, voice, text, engine});
|
||||
{credentials, stats, language, voice, text, engine, renderForCaching, disableTtsStreaming});
|
||||
break;
|
||||
case 'azure':
|
||||
case 'microsoft':
|
||||
@@ -307,9 +307,42 @@ async function synthAudio(client, createHash, retrieveHash, logger, stats, { acc
|
||||
}
|
||||
|
||||
const synthPolly = async(createHash, retrieveHash, logger,
|
||||
{credentials, stats, language, voice, engine, text}) => {
|
||||
{credentials, stats, language, voice, engine, text, renderForCaching, disableTtsStreaming}) => {
|
||||
const {region, accessKeyId, secretAccessKey, roleArn} = credentials;
|
||||
if (!JAMBONES_DISABLE_TTS_STREAMING && !renderForCaching && !disableTtsStreaming) {
|
||||
|
||||
let params = '{';
|
||||
params += `language=${language}`;
|
||||
params += ',write_cache_file=1';
|
||||
params += ',vendor=aws';
|
||||
if (accessKeyId && secretAccessKey) {
|
||||
if (accessKeyId) params += `,accessKeyId=${accessKeyId}`;
|
||||
if (secretAccessKey) params += `,secretAccessKey=${secretAccessKey}`;
|
||||
} else if (roleArn) {
|
||||
const cred = await getAwsAuthToken(
|
||||
logger, createHash, retrieveHash,
|
||||
{
|
||||
region,
|
||||
roleArn
|
||||
});
|
||||
|
||||
if (cred) {
|
||||
params += `,accessKeyId=${cred.accessKeyId}`;
|
||||
params += `,secretAccessKey=${cred.secretAccessKey}`;
|
||||
params += `,sessionToken=${cred.sessionToken}`;
|
||||
}
|
||||
}
|
||||
if (region) params += `,region=${region}`;
|
||||
if (engine) params += `,engine=${engine}`;
|
||||
params += '}';
|
||||
|
||||
return {
|
||||
filePath: `say:${params}${text.replace(/\n/g, ' ').replace(/\r/g, ' ')}`,
|
||||
servedFromCache: false,
|
||||
rtt: 0
|
||||
};
|
||||
}
|
||||
try {
|
||||
const {region, accessKeyId, secretAccessKey, roleArn} = credentials;
|
||||
let polly;
|
||||
if (accessKeyId && secretAccessKey) {
|
||||
polly = new PollyClient({
|
||||
@@ -1295,7 +1328,7 @@ const synthCartesia = async(logger, {
|
||||
const synthResemble = async(logger, {
|
||||
credentials, options, stats, voice, text, renderForCaching, disableTtsStreaming
|
||||
}) => {
|
||||
const {api_key, resemble_tts_uri} = credentials;
|
||||
const {api_key, resemble_tts_uri, resemble_tts_use_tls} = credentials;
|
||||
const {project_uuid, use_hd} = options || {};
|
||||
|
||||
/* default to using the streaming interface, unless disabled by env var OR we want just a cache file */
|
||||
@@ -1308,6 +1341,7 @@ const synthResemble = async(logger, {
|
||||
if (project_uuid) params += `,project_uuid=${project_uuid}`;
|
||||
if (use_hd) params += `,use_hd=${use_hd}`;
|
||||
if (resemble_tts_uri) params += `,endpoint=${resemble_tts_uri}`;
|
||||
if (resemble_tts_use_tls) params += `,use_tls=${resemble_tts_use_tls}`;
|
||||
|
||||
params += '}';
|
||||
|
||||
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@jambonz/speech-utils",
|
||||
"version": "0.2.16",
|
||||
"version": "0.2.19",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@jambonz/speech-utils",
|
||||
"version": "0.2.16",
|
||||
"version": "0.2.19",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"23": "^0.0.0",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@jambonz/speech-utils",
|
||||
"version": "0.2.16",
|
||||
"version": "0.2.19",
|
||||
"description": "TTS-related speech utilities for jambonz",
|
||||
"main": "index.js",
|
||||
"author": "Dave Horton",
|
||||
|
||||
@@ -185,6 +185,7 @@ test('AWS speech synth tests', async(t) => {
|
||||
language: 'en-US',
|
||||
voice: 'Joey',
|
||||
text: 'This is a test. This is only a test',
|
||||
renderForCaching: true,
|
||||
});
|
||||
t.ok(!opts.servedFromCache, `successfully synthesized aws audio to ${opts.filePath}`);
|
||||
|
||||
@@ -198,6 +199,7 @@ test('AWS speech synth tests', async(t) => {
|
||||
language: 'en-US',
|
||||
voice: 'Joey',
|
||||
text: 'This is a test. This is only a test',
|
||||
renderForCaching: true,
|
||||
});
|
||||
t.ok(opts.servedFromCache, `successfully retrieved aws audio from cache ${opts.filePath}`);
|
||||
} catch (err) {
|
||||
|
||||
Reference in New Issue
Block a user