fix: riva_server_uri

lib/routes/api/speech-credentials.js

@@ -51,7 +51,7 @@ const encryptCredential = (obj) => {
     tts_region,
     stt_api_key,
     stt_region,
-    nvidia_speech_endpoint,
+    riva_server_uri,
     instance_id
   } = obj;
 
@@ -108,8 +108,8 @@ const encryptCredential = (obj) => {
       return encrypt(ibmData);
 
     case 'nvidia':
-      assert(nvidia_speech_endpoint, 'invalid nvidia speech endpoint: nvidia_speech_endpoint is required');
-      const nvidiaData = JSON.stringify({ nvidia_speech_endpoint });
+      assert(riva_server_uri, 'invalid riva server uri: riva_server_uri is required');
+      const nvidiaData = JSON.stringify({ riva_server_uri });
       return encrypt(nvidiaData);
 
     default:
@@ -218,7 +218,7 @@ router.get('/', async(req, res) => {
         obj.instance_id = o.instance_id;
       } else if ('nvidia' == obj.vendor) {
         const o = JSON.parse(decrypt(credential));
-        obj.nvidia_speech_endpoint = obscureKey(o.nvidia_speech_endpoint);
+        obj.riva_server_uri = obscureKey(o.riva_server_uri);
       }
       return obj;
     }));
@@ -283,7 +283,7 @@ router.get('/:sid', async(req, res) => {
       obj.instance_id = o.instance_id;
     } else if ('nvidia' == obj.vendor) {
       const o = JSON.parse(decrypt(credential));
-      obj.nvidia_speech_endpoint = o.nvidia_speech_endpoint;
+      obj.riva_server_uri = o.riva_server_uri;
     }
     res.status(200).json(obj);
   } catch (err) {
@@ -314,7 +314,7 @@ router.put('/:sid', async(req, res) => {
   const sid = req.params.sid;
   const logger = req.app.locals.logger;
   try {
-    const {use_for_tts, use_for_stt, region, aws_region, stt_region, tts_region, nvidia_speech_endpoint} = req.body;
+    const {use_for_tts, use_for_stt, region, aws_region, stt_region, tts_region, riva_server_uri} = req.body;
     if (typeof use_for_tts === 'undefined' && typeof use_for_stt === 'undefined') {
       throw new DbErrorUnprocessableRequest('use_for_tts and use_for_stt are the only updateable fields');
     }
@@ -350,7 +350,7 @@ router.put('/:sid', async(req, res) => {
           custom_stt_endpoint,
           stt_region,
           tts_region,
-          nvidia_speech_endpoint
+          riva_server_uri
         };
         logger.info({o, newCred}, 'updating speech credential with this new credential');
         obj.credential = encryptCredential(newCred);

lib/swagger/swagger.yaml

@@ -4262,7 +4262,7 @@ components:
           type: boolean
         stt_tested_ok:
           type: boolean
-        nvidia_speech_endpoint:
+        riva_server_uri:
           type: string
     SpeechCredentialUpdate:
       properties:

test/speech-credentials.js

@@ -301,37 +301,35 @@ test('speech credentials tests', async(t) => {
     }
 
     /* add a credential for nvidia */
-    if (!process.env.NVIDIA_SPEECH_ENDPOINT) {
-      result = await request.post(`/Accounts/${account_sid}/SpeechCredentials`, {
-        resolveWithFullResponse: true,
-        auth: authUser,
-        json: true,
-        body: {
-          vendor: 'nvidia',
-          use_for_stt: true,
-          use_for_tts: true,
-          nvidia_speech_endpoint: process.env.NVIDIA_SPEECH_ENDPOINT || "192.168.1.9:5060"
-        }
-      });
-      t.ok(result.statusCode === 201, 'successfully added speech credential for nvidia');
-      const ms_sid = result.body.sid;
+    result = await request.post(`/Accounts/${account_sid}/SpeechCredentials`, {
+      resolveWithFullResponse: true,
+      auth: authUser,
+      json: true,
+      body: {
+        vendor: 'nvidia',
+        use_for_stt: true,
+        use_for_tts: true,
+        riva_server_uri: "192.168.1.2:5060"
+      }
+    });
+    t.ok(result.statusCode === 201, 'successfully added speech credential for nvidia');
+    const ms_sid = result.body.sid;
 
-      /* test the speech credential */
-      result = await request.get(`/Accounts/${account_sid}/SpeechCredentials/${ms_sid}/test`, {
-        resolveWithFullResponse: true,
-        auth: authUser,
-        json: true,   
-      });
-      // TODO Nvidia test.
-      t.ok(result.statusCode === 200 && result.body.stt.status === 'not tested', 'successfully tested speech credential for nvida stt');
+    /* test the speech credential */
+    result = await request.get(`/Accounts/${account_sid}/SpeechCredentials/${ms_sid}/test`, {
+      resolveWithFullResponse: true,
+      auth: authUser,
+      json: true,   
+    });
+    // TODO Nvidia test.
+    t.ok(result.statusCode === 200 && result.body.stt.status === 'not tested', 'successfully tested speech credential for nvida stt');
 
-      /* delete the credential */
-      result = await request.delete(`/Accounts/${account_sid}/SpeechCredentials/${ms_sid}`, {
-        auth: authUser,
-        resolveWithFullResponse: true,
-      });
-      t.ok(result.statusCode === 204, 'successfully deleted speech credential');
-    }
+    /* delete the credential */
+    result = await request.delete(`/Accounts/${account_sid}/SpeechCredentials/${ms_sid}`, {
+      auth: authUser,
+      resolveWithFullResponse: true,
+    });
+    t.ok(result.statusCode === 204, 'successfully deleted speech credential');
 
     await deleteObjectBySid(request, '/Accounts', account_sid);
     await deleteObjectBySid(request, '/ServiceProviders', service_provider_sid);