Main reason for the JSON formatting error: the Function call puts the…

… JSON content inside a 'data' field, and it also expects it back that way! #53

functions/fn_impl/chirp.py

@@ -2,9 +2,9 @@
 from firebase_admin import initialize_app, storage
 import firebase_admin
 import google.cloud.logging
+import json
 import logging
 
-from flask import jsonify
 from google.api_core.client_options import ClientOptions
 from google.cloud.speech_v2 import SpeechClient
 from google.cloud.speech_v2.types import cloud_speech
@@ -71,14 +71,6 @@ def chirp(req: https_fn.Request) -> https_fn.Response:
 
         return ('', 204, headers)
 
-    # Set CORS headers for the main request
-    headers = {
-        'Content-Type':'application/json',
-        'Access-Control-Allow-Origin': '*',
-        'Access-Control-Allow-Headers': 'Content-Type',
-    }
-    # END CORS
-
     if not firebase_admin._apps:
         initialize_app()
 
@@ -90,8 +82,8 @@ def chirp(req: https_fn.Request) -> https_fn.Response:
     project_id = 'open-mmpa'
     region = 'us-central1'
 
-    if request_json and 'recording_file_name' in request_json:
-        recording_file_name = request_json['recording_file_name']
+    if request_json and 'data' in request_json and 'recording_file_name' in request_json['data']:
+        recording_file_name = request_json['data']['recording_file_name']
     elif request_args and 'recording_file_name' in request_args:
         recording_file_name = request_args['recording_file_name']
     elif request_form and 'recording_file_name' in request_form:
@@ -113,4 +105,8 @@ def chirp(req: https_fn.Request) -> https_fn.Response:
         logging.exception(e)
         return transcripts, 500
 
-    return (jsonify(dict(transcripts=transcripts)), 200, headers)
+    return https_fn.Response(
+        json.dumps(dict(data=transcripts)),
+        status=200,
+        content_type='application/json',
+    )

lib/speech/service/transcription_list.dart

@@ -14,17 +14,14 @@ class Transcription {
 class Transcriptions {
   Transcriptions();
 
-  Transcriptions.fromJson(Map<String, Object?> jsonObject) {
+  Transcriptions.fromJson(List<Object?> transcriptList) {
     transcriptions.clear();
-    if (jsonObject.containsKey('transcripts') &&
-        jsonObject['transcripts'] != null) {
-      final json = jsonObject['transcripts']! as List<dynamic>;
-      final stringList = json.map((e) => e as String).toList(growable: false);
-      for (var i = 0; i < stringList.length; i += 2) {
-        final transcript = stringList[i].trim();
-        final language = i + 1 < stringList.length ? stringList[i + 1] : '';
-        transcriptions.add(Transcription(transcript, language.trim()));
-      }
+    final stringList =
+        transcriptList.nonNulls.map((e) => e as String).toList(growable: false);
+    for (var i = 0; i < stringList.length; i += 2) {
+      final transcript = stringList[i].trim();
+      final language = i + 1 < stringList.length ? stringList[i + 1] : '';
+      transcriptions.add(Transcription(transcript, language.trim()));
     }
   }
 

lib/speech/view/stt_mixin.dart

@@ -162,8 +162,8 @@ mixin SttMixin {
       final transcriptionResponse = await FirebaseFunctions.instance
           .httpsCallable(chirpFunctionName)
           .call<dynamic>({'recording_file_name': recordingFileName});
-      final transcriptJson = transcriptionResponse.data as Map<String, dynamic>;
-      final transcripts = Transcriptions.fromJson(transcriptJson);
+      final transcriptList = transcriptionResponse.data as List<Object?>;
+      final transcripts = Transcriptions.fromJson(transcriptList);
       addToDeferredQueueFunction?.call(
         DeferredAction(
           ActionKind.speechTranscripted,