Fix building for various language bindings after adding zipvoice (#2709)

Author: csukuangfj

.github/scripts/test-dot-net.sh

@@ -71,8 +71,8 @@ rm -rf sherpa-onnx-*
 ./run-whisper.sh
 rm -rf sherpa-onnx-*
 
-./run-whisper-large-v3.sh
-rm -rf sherpa-onnx-*
+# ./run-whisper-large-v3.sh
+# rm -rf sherpa-onnx-*
 
 ./run-tdnn-yesno.sh
 rm -rf sherpa-onnx-*

.github/workflows/test-dot-net.yaml

@@ -112,7 +112,7 @@ jobs:
           sudo rm -rf "$AGENT_TOOLSDIRECTORY"
 
       - name: Free Disk Space (Ubuntu)
-        if: false
+        if: true
         uses: jlumbroso/free-disk-space@main
         with:
           # this might remove tools that are actually needed,
@@ -129,7 +129,7 @@ jobs:
           swap-storage: true
 
       - name: Check space
-        if: false
+        if: true
         shell: bash
         run: |
           df -h

flutter/sherpa_onnx/lib/src/audio_tagging.dart

@@ -157,17 +157,17 @@ class AudioTagging {
     final ptr =
         SherpaOnnxBindings.sherpaOnnxCreateAudioTagging?.call(c) ?? nullptr;
 
-    if (ptr == nullptr) {
-      throw Exception(
-          "Failed to create audio tagging. Please check your config");
-    }
-
     calloc.free(labelsPtr);
     calloc.free(providerPtr);
     calloc.free(cedPtr);
     calloc.free(zipformerPtr);
     calloc.free(c);
 
+    if (ptr == nullptr) {
+      throw Exception(
+          "Failed to create audio tagging. Please check your config");
+    }
+
     return AudioTagging._(ptr: ptr, config: config);
   }
 

flutter/sherpa_onnx/lib/src/keyword_spotter.dart

@@ -146,10 +146,6 @@ class KeywordSpotter {
 
     final ptr = SherpaOnnxBindings.createKeywordSpotter?.call(c) ?? nullptr;
 
-    if (ptr == nullptr) {
-      throw Exception("Failed to create kws. Please check your config");
-    }
-
     calloc.free(c.ref.keywordsBuf);
     calloc.free(c.ref.keywordsFile);
     calloc.free(c.ref.model.bpeVocab);
@@ -167,6 +163,10 @@ class KeywordSpotter {
     calloc.free(c.ref.model.transducer.joiner);
     calloc.free(c);
 
+    if (ptr == nullptr) {
+      throw Exception("Failed to create kws. Please check your config");
+    }
+
     return KeywordSpotter._(ptr: ptr, config: config);
   }
 

flutter/sherpa_onnx/lib/src/offline_punctuation.dart

@@ -69,6 +69,10 @@ class OfflinePunctuation {
 
   // The user has to invoke OfflinePunctuation.free() to avoid memory leak.
   factory OfflinePunctuation({required OfflinePunctuationConfig config}) {
+    if (SherpaOnnxBindings.sherpaOnnxCreateOfflinePunctuation == null) {
+      throw Exception("Please initialize sherpa-onnx first");
+    }
+
     final c = calloc<SherpaOnnxOfflinePunctuationConfig>();
 
     final ctTransformerPtr = config.model.ctTransformer.toNativeUtf8();
@@ -79,23 +83,19 @@ class OfflinePunctuation {
     final providerPtr = config.model.provider.toNativeUtf8();
     c.ref.model.provider = providerPtr;
 
-    if (SherpaOnnxBindings.sherpaOnnxCreateOfflinePunctuation == null) {
-      throw Exception("Please initialize sherpa-onnx first");
-    }
-
     final ptr =
         SherpaOnnxBindings.sherpaOnnxCreateOfflinePunctuation?.call(c) ??
             nullptr;
 
+    calloc.free(providerPtr);
+    calloc.free(ctTransformerPtr);
+    calloc.free(c);
+
     if (ptr == nullptr) {
       throw Exception(
           "Failed to create offline punctuation. Please check your config");
     }
 
-    calloc.free(providerPtr);
-    calloc.free(ctTransformerPtr);
-    calloc.free(c);
-
     return OfflinePunctuation._(ptr: ptr, config: config);
   }
 

flutter/sherpa_onnx/lib/src/offline_speaker_diarization.dart

@@ -192,6 +192,10 @@ class OfflineSpeakerDiarization {
   /// The user is responsible to call the OfflineSpeakerDiarization.free()
   /// method of the returned instance to avoid memory leak.
   factory OfflineSpeakerDiarization(OfflineSpeakerDiarizationConfig config) {
+    if (SherpaOnnxBindings.sherpaOnnxCreateOfflineSpeakerDiarization == null) {
+      throw Exception("Please initialize sherpa-onnx first");
+    }
+
     final c = calloc<SherpaOnnxOfflineSpeakerDiarizationConfig>();
 
     c.ref.segmentation.pyannote.model =
@@ -211,31 +215,25 @@ class OfflineSpeakerDiarization {
     c.ref.minDurationOn = config.minDurationOn;
     c.ref.minDurationOff = config.minDurationOff;
 
-    if (SherpaOnnxBindings.sherpaOnnxCreateOfflineSpeakerDiarization == null) {
-      throw Exception("Please initialize sherpa-onnx first");
-    }
-
     final ptr =
         SherpaOnnxBindings.sherpaOnnxCreateOfflineSpeakerDiarization?.call(c) ??
             nullptr;
 
-    if (ptr == nullptr) {
-      throw Exception(
-          "Failed to create offline speaker diarization. Please check your config");
-    }
-
     calloc.free(c.ref.embedding.provider);
     calloc.free(c.ref.embedding.model);
     calloc.free(c.ref.segmentation.provider);
     calloc.free(c.ref.segmentation.pyannote.model);
+    calloc.free(c);
 
-    int sampleRate = 0;
-    if (ptr != nullptr) {
-      sampleRate = SherpaOnnxBindings
-              .sherpaOnnxOfflineSpeakerDiarizationGetSampleRate
-              ?.call(ptr) ??
-          0;
+    if (ptr == nullptr) {
+      throw Exception(
+          "Failed to create offline speaker diarization. Please check your config");
     }
+
+    int sampleRate = SherpaOnnxBindings
+              .sherpaOnnxOfflineSpeakerDiarizationGetSampleRate
+              ?.call(ptr) ?? 0;
+
     return OfflineSpeakerDiarization._(
         ptr: ptr, config: config, sampleRate: sampleRate);
   }

flutter/sherpa_onnx/lib/src/offline_speech_denoiser.dart

@@ -126,14 +126,15 @@ class OfflineSpeechDenoiser {
         SherpaOnnxBindings.sherpaOnnxCreateOfflineSpeechDenoiser?.call(c) ??
             nullptr;
 
+    calloc.free(c.ref.model.provider);
+    calloc.free(c.ref.model.gtcrn.model);
+    calloc.free(c);
+
     if (ptr == nullptr) {
       throw Exception(
           "Failed to create offline speech denoiser. Please check your config");
     }
 
-    calloc.free(c.ref.model.provider);
-    calloc.free(c.ref.model.gtcrn.model);
-
     return OfflineSpeechDenoiser._(ptr: ptr, config: config);
   }
 

flutter/sherpa_onnx/lib/src/online_punctuation.dart

@@ -77,6 +77,10 @@ class OnlinePunctuation {
 
   // The user has to invoke OnlinePunctuation.free() to avoid memory leak.
   factory OnlinePunctuation({required OnlinePunctuationConfig config}) {
+    if (SherpaOnnxBindings.sherpaOnnxCreateOnlinePunctuation == null) {
+      throw Exception("Please initialize sherpa-onnx first");
+    }
+
     final c = calloc<SherpaOnnxOnlinePunctuationConfig>();
 
     final cnnBiLstmPtr = config.model.cnnBiLstm.toNativeUtf8();
@@ -89,24 +93,19 @@ class OnlinePunctuation {
     final providerPtr = config.model.provider.toNativeUtf8();
     c.ref.model.provider = providerPtr;
 
-    if (SherpaOnnxBindings.sherpaOnnxCreateOnlinePunctuation == null) {
-      throw Exception("Please initialize sherpa-onnx first");
-    }
-
     final ptr = SherpaOnnxBindings.sherpaOnnxCreateOnlinePunctuation?.call(c) ??
         nullptr;
 
-    if (ptr == nullptr) {
-      throw Exception(
-          "Failed to create online punctuation. Please check your config");
-    }
-
-    // Free the allocated strings and struct memory
     calloc.free(providerPtr);
     calloc.free(cnnBiLstmPtr);
     calloc.free(bpeVocabPtr);
     calloc.free(c);
 
+    if (ptr == nullptr) {
+      throw Exception(
+          "Failed to create online punctuation. Please check your config");
+    }
+
     return OnlinePunctuation._(ptr: ptr, config: config);
   }
 

flutter/sherpa_onnx/lib/src/online_recognizer.dart

@@ -363,6 +363,10 @@ class OnlineRecognizer {
   /// The user is responsible to call the OnlineRecognizer.free()
   /// method of the returned instance to avoid memory leak.
   factory OnlineRecognizer(OnlineRecognizerConfig config) {
+    if (SherpaOnnxBindings.createOnlineRecognizer == null) {
+      throw Exception("Please initialize sherpa-onnx first");
+    }
+
     final c = calloc<SherpaOnnxOnlineRecognizerConfig>();
     c.ref.feat.sampleRate = config.feat.sampleRate;
     c.ref.feat.featureDim = config.feat.featureDim;
@@ -419,17 +423,8 @@ class OnlineRecognizer {
     c.ref.hr.lexicon = config.hr.lexicon.toNativeUtf8();
     c.ref.hr.ruleFsts = config.hr.ruleFsts.toNativeUtf8();
 
-    if (SherpaOnnxBindings.createOnlineRecognizer == null) {
-      throw Exception("Please initialize sherpa-onnx first");
-    }
-
     final ptr = SherpaOnnxBindings.createOnlineRecognizer?.call(c) ?? nullptr;
 
-    if (ptr == nullptr) {
-      throw Exception(
-          "Failed to create online recognizer. Please check your config");
-    }
-
     calloc.free(c.ref.hr.lexicon);
     calloc.free(c.ref.hr.ruleFsts);
     calloc.free(c.ref.ruleFars);
@@ -453,6 +448,11 @@ class OnlineRecognizer {
     calloc.free(c.ref.model.transducer.joiner);
     calloc.free(c);
 
+    if (ptr == nullptr) {
+      throw Exception(
+          "Failed to create online recognizer. Please check your config");
+    }
+
     return OnlineRecognizer._(ptr: ptr, config: config);
   }
 

flutter/sherpa_onnx/lib/src/sherpa_onnx_bindings.dart

@@ -214,6 +214,27 @@ final class SherpaOnnxOfflineTtsKittenModelConfig extends Struct {
   external double lengthScale;
 }
 
+final class SherpaOnnxOfflineTtsZipVoiceModelConfig extends Struct {
+  external Pointer<Utf8> tokens;
+  external Pointer<Utf8> textModel;
+  external Pointer<Utf8> flowMatchingModel;
+  external Pointer<Utf8> vocoder;
+  external Pointer<Utf8> dataDir;
+  external Pointer<Utf8> pinyinDict;
+
+  @Float()
+  external double featScale;
+
+  @Float()
+  external double tShift;
+
+  @Float()
+  external double targetRms;
+
+  @Float()
+  external double guidanceScale;
+}
+
 final class SherpaOnnxOfflineTtsModelConfig extends Struct {
   external SherpaOnnxOfflineTtsVitsModelConfig vits;
   @Int32()
@@ -226,6 +247,7 @@ final class SherpaOnnxOfflineTtsModelConfig extends Struct {
   external SherpaOnnxOfflineTtsMatchaModelConfig matcha;
   external SherpaOnnxOfflineTtsKokoroModelConfig kokoro;
   external SherpaOnnxOfflineTtsKittenModelConfig kitten;
+  external SherpaOnnxOfflineTtsZipVoiceModelConfig zipvoice;
 }
 
 final class SherpaOnnxOfflineTtsConfig extends Struct {