Merge pull request #1116 from stanford-oval/wip/update-deps

Small fixes

.travis.yml

@@ -20,18 +20,19 @@ services:
 before_install:
   - sudo apt-get update && sudo apt-get install apt-transport-https ca-certificates -y && sudo update-ca-certificates
 
-stages:
-  - test
-  - name: deploy
-    if: type = push AND branch = master AND repo = stanford-oval/almond-cloud
-
 env:
   global:
   - TZ="America/Los_Angeles"
   - COVERALLS_PARALLEL=true
 
 jobs:
   include:
+    -
+      name: "Docker Build"
+      if: type = push AND branch = master AND repo = stanford-oval/almond-cloud
+      install:
+      - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
+      script: ./travis/docker-build.sh
     -
       name: "Unit Tests"
       install:
@@ -95,12 +96,6 @@ jobs:
       - export PATH="`pwd`/geckodriver:$PATH"
       script: npx nyc ./tests/nlp-integration.sh
       after_success: npm run coverage
-    -
-      stage: deploy
-      name: "Docker Build"
-      install:
-      - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
-      script: ./travis/docker-build.sh
 
 notifications:
   webhooks: https://coveralls.io/webhook

src/nlp/main.ts

@@ -87,11 +87,17 @@ export class NLPInferenceServer {
 
     async loadExactMatcher(matcher : Genie.ExactMatcher, language : string) {
         const url = AbstractFS.resolve(Config.NL_EXACT_MATCH_DIR, language + '.btrie');
-        const tmpPath = await AbstractFS.download(url);
 
-        await matcher.load(tmpPath);
+        try {
+            const tmpPath = await AbstractFS.download(url);
+            await matcher.load(tmpPath);
 
-        await AbstractFS.removeTemporary(tmpPath);
+            await AbstractFS.removeTemporary(tmpPath);
+        } catch(e : any) {
+            if (e.code !== 'ENOENT' && e.code !== 404)
+                throw e;
+            console.log(`WARNING: missing exact matcher file for ${language}`);
+        }
     }
 
     async load() {

src/nlp/voice/backend-microsoft.ts

@@ -216,6 +216,26 @@ const VOICES : Record<string, { male : string; female : string }> = {
         male: "GuyNeural",
         female: "AriaNeural",
     },
+    "it-it": {
+        male: "DiegoNeural",
+        female: "ElsaNeural"
+    },
+    "zh-cn": {
+        male: "YunxiNeural",
+        female: "XiaohanNeural"
+    },
+    "zh-tw": {
+        male: "YunJheNeural",
+        female: "HsiaoChenNeural"
+    },
+    "es-es": {
+        male: "AlvaroNeural",
+        female: "ElviraNeural"
+    },
+    "es-us": {
+        male: "AlonsoNeural",
+        female: "PalomaNeural"
+    }
 };
 
 /**

tests/nlp-integration.sh

@@ -54,6 +54,11 @@ ENABLE_PROMETHEUS: true
 PROMETHEUS_ACCESS_TOKEN: my-prometheus-access-token
 MS_SPEECH_SUBSCRIPTION_KEY: "${MS_SPEECH_SUBSCRIPTION_KEY}"
 MS_SPEECH_SERVICE_REGION: westus2
+SUPPORTED_LANGUAGES:
+  - en-US
+  - it-IT
+  - zh-CN
+  - es-ES
 NL_MODELS:
 - tag: org.thingpedia.models.default
   locale: en

tests/website/test_register.js

@@ -116,7 +116,7 @@ async function testRegister(charlie) {
     }, charlie);
 
     // check that now we're registered
-    await util.promisify(setTimeout)(30000);
+    await util.promisify(setTimeout)(45000);
     const result = minidom.parse(await sessionRequest('/user/profile', 'GET', null, charlie));
 
     let found = false;