v2.0 flutter (#303)

binding/flutter/CHANGELOG.md

@@ -18,3 +18,7 @@
 
 ## [1.2.1] - 2023-08-25
 * Native packages updated
+
+## [2.0.0] - 2023-11-15
+* Engine improvements
+* Improved error reporting

binding/flutter/README.md

@@ -20,7 +20,7 @@ Leopard is an on-device speech-to-text engine. Leopard is:
 This binding is for running Leopard on **Flutter 2.8.1+** on the following platforms:
 
 - Android 5.0+ (API 21+)
-- iOS 11.0+
+- iOS 13.0+
 
 ## Installation
 

binding/flutter/android/build.gradle

@@ -1,10 +1,13 @@
 group 'ai.picovoice.flutter.leopard'
-version '1.2.1'
+version '2.0.0'
 
 buildscript {
     repositories {
         google()
         mavenCentral()
+        maven {
+            url 'https://s01.oss.sonatype.org/content/repositories/aipicovoice-1299/'
+        }
     }
 
     dependencies {
@@ -16,6 +19,9 @@ rootProject.allprojects {
     repositories {
         google()
         mavenCentral()
+        maven {
+            url 'https://s01.oss.sonatype.org/content/repositories/aipicovoice-1305/'
+        }
     }
 }
 
@@ -33,5 +39,5 @@ android {
 }
 
 dependencies {
-    implementation 'ai.picovoice:leopard-android:1.2.1'
+    implementation 'ai.picovoice:leopard-android:2.0.0'
 }

binding/flutter/android/src/main/java/ai/picovoice/flutter/leopard/LeopardPlugin.java

@@ -44,6 +44,8 @@ public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBindin
         flutterContext = flutterPluginBinding.getApplicationContext();
         channel = new MethodChannel(flutterPluginBinding.getBinaryMessenger(), "leopard");
         channel.setMethodCallHandler(this);
+
+        Leopard.setSdk("flutter");
     }
 
     @Override
@@ -90,11 +92,13 @@ private void leopardCreate(@NonNull MethodCall call, @NonNull Result result) {
             String accessKey = call.argument("accessKey");
             String modelPath = call.argument("modelPath");
             boolean enableAutomaticPunctuation = call.argument("enableAutomaticPunctuation");
+            boolean enableDiarization = call.argument("enableDiarization");
 
             Leopard.Builder leopardBuilder = new Leopard.Builder()
                     .setAccessKey(accessKey)
                     .setModelPath(modelPath)
-                    .setEnableAutomaticPunctuation(enableAutomaticPunctuation);
+                    .setEnableAutomaticPunctuation(enableAutomaticPunctuation)
+                    .setEnableDiarization(enableDiarization);
 
             Leopard leopard = leopardBuilder.build(flutterContext);
             leopardPool.put(String.valueOf(System.identityHashCode(leopard)), leopard);
@@ -217,6 +221,7 @@ private Map<String, Object> leopardTranscriptToMap(LeopardTranscript result) {
             wordMap.put("confidence", word.getConfidence());
             wordMap.put("startSec", word.getStartSec());
             wordMap.put("endSec", word.getEndSec());
+            wordMap.put("speakerTag", word.getSpeakerTag());
             words.add(wordMap);
         }
         resultMap.put("words", words);

binding/flutter/ios/Classes/SwiftLeopardPlugin.swift

@@ -1,5 +1,5 @@
 //
-// Copyright 2022 Picovoice Inc.
+// Copyright 2022-2023 Picovoice Inc.
 //
 // You may not use this file except in compliance with the license. A copy of the license is located in the "LICENSE"
 // file accompanying this source.
@@ -28,6 +28,8 @@ public class SwiftLeopardPlugin: NSObject, FlutterPlugin {
 
         let methodChannel = FlutterMethodChannel(name: "leopard", binaryMessenger: registrar.messenger())
         registrar.addMethodCallDelegate(instance, channel: methodChannel)
+
+        Leopard.setSdk(sdk: "flutter")
     }
 
     public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
@@ -44,11 +46,13 @@ public class SwiftLeopardPlugin: NSObject, FlutterPlugin {
                 if let accessKey = args["accessKey"] as? String,
                    let modelPath = args["modelPath"] as? String {
                     let enableAutomaticPunctuation = args["enableAutomaticPunctuation"] as? Bool
+                    let enableDiarization = args["enableDiarization"] as? Bool
 
                     let leopard = try Leopard(
                             accessKey: accessKey,
                             modelPath: modelPath,
-                            enableAutomaticPunctuation: enableAutomaticPunctuation ?? false
+                            enableAutomaticPunctuation: enableAutomaticPunctuation ?? false,
+                            enableDiarization: enableDiarization ?? false
                     )
 
                     let handle: String = String(describing: leopard)
@@ -137,6 +141,7 @@ public class SwiftLeopardPlugin: NSObject, FlutterPlugin {
             wordMap["confidence"] = wordMeta.confidence
             wordMap["startSec"] = wordMeta.startSec
             wordMap["endSec"] = wordMeta.endSec
+            wordMap["speakerTag"] = wordMeta.speakerTag
             wordMapArray.append(wordMap)
         }
         resultDictionary["words"] = wordMapArray

binding/flutter/ios/leopard_flutter.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'leopard_flutter'
-  s.version          = '1.2.1'
+  s.version          = '2.0.0'
   s.summary          = 'A Flutter package plugin for Picovoice\'s Leopard Speech-to-Text engine'
   s.description      = <<-DESC
   A Flutter package plugin for Picovoice\'s Leopard Speech-to-Text engine
@@ -10,9 +10,9 @@ Pod::Spec.new do |s|
   s.author           = { 'Picovoice' => '[email protected]' }
   s.source           = { :git => "https://github.com/Picovoice/leopard.git" }
   s.source_files = 'Classes/**/*'
-  s.platform = :ios, '11.0'
+  s.platform = :ios, '13.0'
   s.dependency 'Flutter'
-  s.dependency 'Leopard-iOS', '~> 1.2.0'
+  s.dependency 'Leopard-iOS', '~> 2.0.0'
 
   s.swift_version = '5.0'
 end

binding/flutter/lib/leopard.dart

@@ -1,5 +1,5 @@
 //
-// Copyright 2022 Picovoice Inc.
+// Copyright 2022-2023 Picovoice Inc.
 //
 // You may not use this file except in compliance with the license. A copy of the license is located in the "LICENSE"
 // file accompanying this source.
@@ -38,19 +38,27 @@ class Leopard {
   ///
   /// [enableAutomaticPunctuation] (Optional) Set to `true` to enable automatic punctuation insertion.
   ///
+  /// [enableDiarization] (Optional) Set to `true` to enable speaker diarization, which allows Leopard to
+  ///                     differentiate speakers as part of the transcription process. Word
+  ///                     metadata will include a `speaker_tag` to identify unique speakers.
+  /// 
   /// Throws a `LeopardException` if not initialized correctly
   ///
   /// returns an instance of the Leopard Speech-to-Text engine
   static Future<Leopard> create(String accessKey, String modelPath,
-      {enableAutomaticPunctuation = false}) async {
+      {
+        enableAutomaticPunctuation = false,
+        enableDiarization = false
+      }) async {
     modelPath = await _tryExtractFlutterAsset(modelPath);
 
     try {
       Map<String, dynamic> result =
           Map<String, dynamic>.from(await _channel.invokeMethod('create', {
         'accessKey': accessKey,
         'modelPath': modelPath,
-        'enableAutomaticPunctuation': enableAutomaticPunctuation
+        'enableAutomaticPunctuation': enableAutomaticPunctuation,
+        'enableDiarization': enableDiarization
       }));
 
       return Leopard._(
@@ -129,7 +137,11 @@ class Leopard {
     List<LeopardWord> words = [];
     for (dynamic word in result['words']) {
       words.add(LeopardWord(
-          word['word'], word['startSec'], word['endSec'], word['confidence']));
+          word['word'],
+          word['startSec'],
+          word['endSec'],
+          word['confidence'],
+          word['speakerTag']));
     }
     return LeopardTranscript(transcript, words);
   }

binding/flutter/lib/leopard_transcript.dart

@@ -26,8 +26,9 @@ class LeopardWord {
   final double startSec;
   final double endSec;
   final double confidence;
+  final int speakerTag;
 
-  LeopardWord(this._word, this.startSec, this.endSec, this.confidence);
+  LeopardWord(this._word, this.startSec, this.endSec, this.confidence, this.speakerTag);
 
   String get word => _word ?? "";
 }

binding/flutter/pubspec.yaml

@@ -1,6 +1,6 @@
 name: leopard_flutter
 description: A Flutter plugin for Picovoice's Leopard Speech-to-Text engine
-version: 1.2.1
+version: 2.0.0
 homepage: https://picovoice.ai/
 repository: https://github.com/Picovoice/leopard/
 documentation: https://picovoice.ai/docs/leopard/

demo/flutter/android/build.gradle

@@ -2,6 +2,9 @@ buildscript {
     repositories {
         google()
         jcenter()
+        maven {
+            url 'https://s01.oss.sonatype.org/content/repositories/aipicovoice-1305/'
+        }
     }
 
     dependencies {
@@ -13,6 +16,9 @@ allprojects {
     repositories {
         google()
         jcenter()
+        maven {
+            url 'https://s01.oss.sonatype.org/content/repositories/aipicovoice-1305/'
+        }
     }
 }