Changeset 35454

Timestamp:

2021-09-23T14:13:40+12:00 (3 years ago)

Author:

cstephen

Message:

Improve translations
Improve translation test return
Begin adding WordTimingSelector

Location:

main/trunk/model-interfaces-dev/atea

Files:

• korero-maori-asr/README.md (modified) (1 diff)
• korero-maori-asr/src/App.vue (modified) (1 diff)
• korero-maori-asr/src/components/AudioTimeBar.vue (modified) (2 diffs)
• korero-maori-asr/src/components/TranscriptionItemEditor.vue (modified) (4 diffs)
• korero-maori-asr/src/components/WordTimingSelector.vue (added)
• korero-maori-asr/src/js/TranscribeModule.js (modified) (2 diffs)
• korero-maori-asr/src/main.js (modified) (1 diff)
• korero-maori-asr/src/styles/_material.scss (modified) (3 diffs)
• korero-maori-asr/vue.config.js (modified) (1 diff)
• resources/interface_atea.properties (modified) (1 diff)
• resources/interface_atea_mi.properties (modified) (1 diff)
• transform/pages/korero-maori-asr.xsl (modified) (1 diff)

main/trunk/model-interfaces-dev/atea/korero-maori-asr/README.md

@@ -25 +25 @@
 Firstly, development-specific code needs to be changed.
 
-1. In `TranscribeModule.js` change the `queryUrl` property to point to the primary transcribe endpoint.
+1. In `TranscribeModule.js` rename the transcribe methods to stop the test data being returned.
 
     ```js
-    -- this.queryUrl = "//localhost:8383/gs3-koreromaori/transcribe/test";
-    ++ this.queryUrl = "//localhost:8383/gs3-koreromaori/transcribe";
+    -- async transcribeFiles(files) {
+    ++ async transcribeFilesTest(files) {
+    // And
+    -- async transcribeFilesActual(files) {
+    ++ async transcribeFiles(files) {
     ```
 

main/trunk/model-interfaces-dev/atea/korero-maori-asr/src/App.vue

@@ -14 +14 @@
         </div>
 
-        <div v-if="showInfo" class="paper">
-            A tool to transcribe audio recordings of spoken Māori. Basic support for editing the transcriptions is provided,
-            and they can be downloaded in multiple formats.
-            <br />
-            The actual transcriptions are produced with gratitude by using <a href="https://koreromaori.io">koreromaori.io</a>'s service.
-        </div>
+        <div v-if="showInfo" class="paper" v-html="translations.get('Description')" />
     </div>
 

main/trunk/model-interfaces-dev/atea/korero-maori-asr/src/components/AudioTimeBar.vue

@@ -3 +3 @@
     <input type="range" class="slider-continuous" v-model.number="sliderValue" min="0" :max="audioLength" step="0.01" :disabled="isDisabled" />
 
-    <button type="button" class="btn-fab" @click="stepBack" :disabled="isDisabled">
+    <button type="button" class="btn-fab theme-flat" @click="stepBack" :disabled="isDisabled">
         <span class="material-icons mdi-s">arrow_back_ios_new</span>
     </button>
@@ -9 +9 @@
     <span>{{ stringSliderValue }}</span>
 
-    <button type="button" class="btn-fab" @click="stepForward" :disabled="isDisabled">
+    <button type="button" class="btn-fab theme-flat" @click="stepForward" :disabled="isDisabled">
         <span class="material-icons mdi-s">arrow_forward_ios</span>
     </button>

main/trunk/model-interfaces-dev/atea/korero-maori-asr/src/components/TranscriptionItemEditor.vue

@@ -20 +20 @@
     </div>
 
+    <word-timing-selector :surroundingWords="getSurroundingWords()" />
+
     <div class="editor-controls">
         <audio-time-bar v-model.number="currentPlaybackTime" :audio-length="audioLength" :isDisabled="playbackState.id != transcription.id" />
@@ -81 +83 @@
 import AudioPlayback from "../js/AudioPlaybackModule"
 import AudioTimeBar from "./AudioTimeBar.vue"
+import WordTimingSelector from "./WordTimingSelector.vue"
 import Util from "../js/Util";
 
@@ -114 +117 @@
     name: "TranscriptionItemEditor",
     components: {
-        AudioTimeBar
+        AudioTimeBar,
+        WordTimingSelector
     },
     props: {
@@ -146 +150 @@
         async playAudio(startTime) {
             await AudioPlayback.play(this.transcription.id, startTime);
+        },
+        getSurroundingWords() {
+            return this.words.slice(2, 7);
         },
         /**

main/trunk/model-interfaces-dev/atea/korero-maori-asr/src/js/TranscribeModule.js

@@ -67 +67 @@
 export default class TranscribeService {
     constructor() {
+        /* eslint-disable quotes */
+        this.TEST_JSON = '{"file_name":"akl_mi_pk_0002.wav","log":"Took 0.6s to transcribe 8.7s audio file /tmp/transcribe-aw7ujpu8-clean.wav","metadata":[{"char":"k","prob":7.0E-6,"start_time":0.24},{"char":"o","prob":8.3E-5,"start_time":0.26},{"char":"t","prob":0.995578,"start_time":0.42},{"char":"a","prob":0.997089,"start_time":0.44},{"char":"h","prob":3.0E-6,"start_time":0.54},{"char":"i","prob":8.0E-6,"start_time":0.56},{"char":" ","prob":2.2E-5,"start_time":0.6},{"char":"a","prob":0.982987,"start_time":0.64},{"char":"n","prob":5.0E-6,"start_time":0.8},{"char":"ō","prob":1.82E-4,"start_time":0.84},{"char":" ","prob":0.996944,"start_time":1.08},{"char":"t","prob":1.23E-4,"start_time":1.14},{"char":"e","prob":6.3E-5,"start_time":1.16},{"char":" ","prob":0.587595,"start_time":1.28},{"char":"t","prob":4.91E-4,"start_time":1.34},{"char":"u","prob":0.010654,"start_time":1.36},{"char":"p","prob":5.9E-5,"start_time":1.52},{"char":"u","prob":1.26E-4,"start_time":1.54},{"char":"n","prob":0.0,"start_time":1.7},{"char":"a","prob":0.99997,"start_time":1.72},{"char":" ","prob":0.993724,"start_time":2.14},{"char":"o","prob":4.3E-5,"start_time":2.22},{"char":" ","prob":0.99696,"start_time":2.32},{"char":"t","prob":1.4E-5,"start_time":2.36},{"char":"e","prob":3.8E-5,"start_time":2.38},{"char":" ","prob":0.996606,"start_time":2.48},{"char":"t","prob":0.0,"start_time":2.52},{"char":"a","prob":0.994873,"start_time":2.54},{"char":"ŋ","prob":2.9E-5,"start_time":2.64},{"char":"a","prob":0.994639,"start_time":2.66},{"char":"t","prob":3.0E-6,"start_time":2.8},{"char":"a","prob":0.99995,"start_time":2.82},{"char":" ","prob":0.0,"start_time":2.9},{"char":"m","prob":0.999606,"start_time":2.98},{"char":"ā","prob":0.010628,"start_time":3.0},{"char":"o","prob":0.996415,"start_time":3.2},{"char":"r","prob":0.0,"start_time":3.28},{"char":"i","prob":0.999698,"start_time":3.32},{"char":" ","prob":0.997927,"start_time":4.5},{"char":"k","prob":0.0,"start_time":4.58},{"char":"o","prob":3.2E-5,"start_time":4.6},{"char":" ","prob":0.956949,"start_time":4.7},{"char":"r","prob":2.5E-5,"start_time":4.74},{"char":"a","prob":0.997649,"start_time":4.76},{"char":"ŋ","prob":0.0,"start_time":4.9},{"char":"i","prob":1.63E-4,"start_time":4.92},{"char":"n","prob":1.3E-5,"start_time":5.28},{"char":"u","prob":4.0E-6,"start_time":5.3},{"char":"i","prob":0.99997,"start_time":5.42},{"char":" ","prob":0.994305,"start_time":5.78},{"char":"e","prob":3.1E-5,"start_time":5.84},{"char":" ","prob":0.966097,"start_time":6.04},{"char":"t","prob":2.0E-6,"start_time":6.1},{"char":"ū","prob":5.4E-5,"start_time":6.12},{"char":" ","prob":0.837368,"start_time":6.34},{"char":"n","prob":0.0,"start_time":6.38},{"char":"e","prob":0.004238,"start_time":6.4},{"char":"i","prob":0.99966,"start_time":6.5},{"char":" ","prob":0.99728,"start_time":7.28},{"char":"o","prob":6.28E-4,"start_time":7.36},{"char":" ","prob":0.961049,"start_time":7.48},{"char":"p","prob":5.0E-6,"start_time":7.52},{"char":"a","prob":0.984707,"start_time":7.54},{"char":"p","prob":9.0E-6,"start_time":7.66},{"char":"a","prob":0.998754,"start_time":7.68},{"char":"t","prob":0.002356,"start_time":7.88},{"char":"ū","prob":1.24E-4,"start_time":7.9},{"char":"ā","prob":0.883958,"start_time":8.0},{"char":"n","prob":0.985871,"start_time":8.24},{"char":"u","prob":0.907369,"start_time":8.26},{"char":"k","prob":0.999045,"start_time":8.38},{"char":"u","prob":0.995632,"start_time":8.4}],"success":true,"transcription":"kotahi anō te tupuna o te tangata māori ko ranginui e tū nei o papatūānuku"}';
+        /* eslint-enable quotes */
+
         /** @type {String} The URL to which query POST requests should be made. */
-        this.queryUrl = "//localhost:8383/gs3-koreromaori/transcribe/test";
+        this.queryUrl = "//localhost:8383/gs3-koreromaori/transcribe";
 
         /** @type {Number} The maximum number of files which can be transcribed in one request to the API. */
@@ -117 +121 @@
      */
     async transcribeFiles(files) {
+        const objects = [];
+
+        for (const file of files) {
+            const object = JSON.parse(this.TEST_JSON);
+            object.file_name = file.name;
+            objects.push(object);
+        }
+
+        return objects;
+    }
+
+    /**
+     * Performs a query to transcribe the given audio files.
+     *
+     * @param {FileList | File[]} files The files to upload.
+     * @returns {Promise<TranscriptionModel[]>} The transcribed audio file.
+     * @throws {TranscriptionError} When the transcription request fails to complete.
+     */
+    async transcribeFilesActual(files) {
         const that = this;
         const formData = new FormData();

main/trunk/model-interfaces-dev/atea/korero-maori-asr/src/main.js

@@ -162 +162 @@
 
                 const namespaceEndIndex = components[0].lastIndexOf(".");
-                translations.set(components[0].slice(namespaceEndIndex + 1), components[1]);
+                translations.set(components[0].slice(namespaceEndIndex + 1), components.slice(1).join("="));
             }
 

main/trunk/model-interfaces-dev/atea/korero-maori-asr/src/styles/_material.scss

@@ -73 +73 @@
     border: none;
     box-shadow: var(--primary-box-shadow-thin);
-
     border-radius: var(--border-radius);
     padding: 0.5em;
+
     cursor: pointer;
     font-size: 1rem;
+    font-weight: 400;
     text-decoration: none;
 
@@ -161 +162 @@
     font-style: italic;
     cursor: inherit;
+    user-select: none;
 }
 
@@ -448 +450 @@
 
     &:hover {
-        --bg-color: rgba(var(--primary-bg-color), 0.15);//#EEE;
+        --bg-color: rgba(var(--primary-bg-color), 0.15);
     }
 }

main/trunk/model-interfaces-dev/atea/korero-maori-asr/vue.config.js

@@ -12 +12 @@
             .plugin("html")
             .tap(args => {
-                args[0].title = "Korero Maori Transcription Interface";
+                args[0].title = "Korero Māori Transcription Interface";
                 return args;
             })

main/trunk/model-interfaces-dev/atea/resources/interface_atea.properties

@@ -1 +1 @@
 atea.Title=Korero Māori Transcription Interface
+atea.Description=A tool to transcribe audio recordings of spoken Māori. Basic support for editing the transcriptions is provided, and they can be downloaded in multiple formats.<br />The actual transcriptions are produced with gratitude by using <a href='https://koreromaori.io'>koreromaori.io</a>'s service.
 atea.ErrorTryAgain=Something went wrong! Please try again
 

main/trunk/model-interfaces-dev/atea/resources/interface_atea_mi.properties

@@ -1 +1 @@
 atea.Title=Atanga Tuhituhi Korero Māori
+atea.Description=...
 atea.ErrorTryAgain=Kua he tetahi mea! Tena koa ngana
 

main/trunk/model-interfaces-dev/atea/transform/pages/korero-maori-asr.xsl

@@ -16 +16 @@
     <xsl:variable name="groupPath"><xsl:value-of select="/page/pageRequest/paramList/param[@name='group']/@value"/></xsl:variable>
     <!-- set page title -->
-    <xsl:template name="pageTitle">Korero Maori Transcription Interface</xsl:template>
+    <xsl:template name="pageTitle">
+        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText('atea', /page/@lang, 'atea.Title')"/>
+    </xsl:template>
 
     <!-- set page breadcrumbs -->