BOT-1988 service names using '_' to '-'

Author: Attila Ujj

.gitignore

@@ -1,2 +1,3 @@
 logs
-docker-compose.override.yml
+docker-compose.override.yml
+.idea

README.md

@@ -101,8 +101,8 @@ There are Websocket endpoints exposed for real-time audio decoding. Find the API
 
 The Websocket endpoints are:
 
-* English: ws://127.0.0.1/stt_en/client/ws/speech
-* German: ws://127.0.0.1/stt_de/client/ws/speech
+* English: ws://127.0.0.1/stt-en/client/ws/speech
+* German: ws://127.0.0.1/stt-de/client/ws/speech
 
 ## File System Watcher
 

dictate/server.js

@@ -11,8 +11,8 @@ app.get('/demos/mob.html', (req, res) => {
   let mobHtml = fs.readFileSync(`${dictateDir}/demos/mob.html`, { encoding: 'utf-8' })
 
   const wsProtocol = (req.protocol === 'https' ? 'wss:' : 'ws:')
-  const sttUrlDe = process.env.STT_URL_DE || `${wsProtocol}//${req.hostname}/stt_de`
-  const sttUrlEn = process.env.STT_URL_EN || `${wsProtocol}//${req.hostname}/stt_en`
+  const sttUrlDe = process.env.STT_URL_DE || `${wsProtocol}//${req.hostname}/stt-de`
+  const sttUrlEn = process.env.STT_URL_EN || `${wsProtocol}//${req.hostname}/stt-en`
 
   mobHtml = mobHtml.replace(
     '<option value="wss://bark.phon.ioc.ee:8443/dev/duplex-speech-api/ws/speech|wss://bark.phon.ioc.ee:8443/dev/duplex-speech-api/ws/status">eesti keel</option>',

docker-compose-dev.yml

@@ -22,22 +22,22 @@ services:
     volumes:
       - "./watcher:/app/watch"
       - "./logs/watcher:/app/logs"
-  stt_en:
+  stt-en:
     build:
       context: stt
       dockerfile: Dockerfile.kaldi.en
     image: botium/botium-speech-kaldi-en:develop
     restart: always
     volumes:
-      - "./logs/stt_en:/opt/logs"
-  stt_de:
+      - "./logs/stt-en:/opt/logs"
+  stt-de:
     build:
       context: stt
       dockerfile: Dockerfile.kaldi.de
     image: botium/botium-speech-kaldi-de:develop
     restart: always
     volumes:
-      - "./logs/stt_de:/opt/logs"
+      - "./logs/stt-de:/opt/logs"
   tts:
     build:
       context: tts

docker-compose-picotts.yml

@@ -11,7 +11,7 @@ services:
     image: botium/botium-speech-frontend:latest
     restart: always
     environment:
-      BOTIUM_API_TOKENS: 
+      BOTIUM_API_TOKENS:
       BOTIUM_SPEECH_PROVIDER_TTS: picotts
       BOTIUM_SPEECH_PROVIDER_STT: kaldi
     volumes:
@@ -22,16 +22,16 @@ services:
     volumes:
       - "./watcher:/app/watch"
       - "./logs/watcher:/app/logs"
-  stt_en:
+  stt-en:
     image: botium/botium-speech-kaldi-en:latest
     restart: always
     volumes:
-      - "./logs/stt_en:/opt/logs"
-  stt_de:
+      - "./logs/stt-en:/opt/logs"
+  stt-de:
     image: botium/botium-speech-kaldi-de:latest
     restart: always
     volumes:
-      - "./logs/stt_de:/opt/logs"
+      - "./logs/stt-de:/opt/logs"
   dictate:
     image: botium/botium-speech-dictate:latest
     restart: always

docker-compose.override.template.yml

@@ -3,5 +3,5 @@ services:
   dictate:
     image: botium/botium-speech-dictate:develop
     environment:
-      STT_URL_DE: wss://speech.botiumbox.com/stt_de
-      STT_URL_EN: wss://speech.botiumbox.com/stt_en
+      STT_URL_DE: wss://speech.botiumbox.com/stt-de
+      STT_URL_EN: wss://speech.botiumbox.com/stt-en

docker-compose.yml

@@ -11,7 +11,7 @@ services:
     image: botium/botium-speech-frontend:${TAG}
     restart: always
     environment:
-      BOTIUM_API_TOKENS: 
+      BOTIUM_API_TOKENS:
       BOTIUM_SPEECH_PROVIDER_TTS: marytts
       BOTIUM_SPEECH_PROVIDER_STT: kaldi
       BOTIUM_SPEECH_GOOGLE_CLIENT_EMAIL:
@@ -24,16 +24,16 @@ services:
     volumes:
       - "./watcher:/app/watch"
       - "./logs/watcher:/app/logs"
-  stt_en:
+  stt-en:
     image: botium/botium-speech-kaldi-en:${TAG}
     restart: always
     volumes:
-      - "./logs/stt_en:/opt/logs"
-  stt_de:
+      - "./logs/stt-en:/opt/logs"
+  stt-de:
     image: botium/botium-speech-kaldi-de:${TAG}
     restart: always
     volumes:
-      - "./logs/stt_de:/opt/logs"
+      - "./logs/stt-de:/opt/logs"
   tts:
     image: botium/botium-speech-marytts:${TAG}
     restart: always

frontend/resources/.env

@@ -26,8 +26,8 @@ BOTIUM_SPEECH_MARYTTS_URL=http://tts:59125
 BOTIUM_SPEECH_PICO_CMDPREFIX=pico2wave
 
 # STT Provider Kaldi URLs
-BOTIUM_SPEECH_KALDI_URL_EN=http://stt_en:80/client/dynamic/recognize
-BOTIUM_SPEECH_KALDI_URL_DE=http://stt_de:80/client/dynamic/recognize
+BOTIUM_SPEECH_KALDI_URL_EN=http://stt-en:80/client/dynamic/recognize
+BOTIUM_SPEECH_KALDI_URL_DE=http://stt-de:80/client/dynamic/recognize
 
 # STT Provider Google
 #BOTIUM_SPEECH_GOOGLE_KEYFILE=./resources/google.json

nginx.conf

@@ -16,23 +16,23 @@ http {
       proxy_pass                  http://$upstream_tts:59125;
       proxy_read_timeout          300;
     }
-    rewrite ^/stt_en$ /stt_en/ redirect;
-    location /stt_en/ {
+    rewrite ^/stt-en$ /stt-en/ redirect;
+    location /stt-en/ {
       resolver 127.0.0.11 valid=30s;
-      set $upstream_stt_en stt_en;
-      rewrite ^\/stt_en\/(.*) /$1 break;
+      set $upstream_stt_en stt-en;
+      rewrite ^\/stt-en\/(.*) /$1 break;
       proxy_http_version          1.1;
       proxy_cache_bypass          $http_upgrade;
       proxy_set_header            Upgrade $http_upgrade;
       proxy_set_header            Connection "Upgrade";
       proxy_pass                  http://$upstream_stt_en;
       proxy_read_timeout          300;
     }
-    rewrite ^/stt_de$ /stt_de/ redirect;
-    location /stt_de/ {
+    rewrite ^/stt-de$ /stt-de/ redirect;
+    location /stt-de/ {
       resolver 127.0.0.11 valid=30s;
-      set $upstream_stt_de stt_de;
-      rewrite ^\/stt_de\/(.*) /$1 break;
+      set $upstream_stt_de stt-de;
+      rewrite ^\/stt-de\/(.*) /$1 break;
       proxy_http_version          1.1;
       proxy_cache_bypass          $http_upgrade;
       proxy_set_header            Upgrade $http_upgrade;