chore(deps): update dependency esbuild to v0.25.2

.github/dependabot.yml

@@ -1,15 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
-
-version: 2
-updates:
-  - package-ecosystem: "cargo" # See documentation for possible values
-    directory: "/" # Location of package manifests
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "npm" # See documentation for possible values
-    directory: "/" # Location of package manifests
-    schedule:
-      interval: "weekly"

.github/workflows/CI.yml

@@ -1,4 +1,4 @@
-name: Build
+name: CI
 
 on:
   push:
@@ -6,6 +6,7 @@ on:
       - main
     tags:
       - '*'
+  pull_request:
   workflow_dispatch:
 
 permissions:
@@ -28,7 +29,7 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: 3.x
-      - run: docker build . -f .github/workflows/build.Dockerfile --tag ci
+      - run: docker build . -f .github/workflows/CI.Dockerfile --tag ci
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
@@ -110,7 +111,6 @@ jobs:
         with:
           name: wheels-sdist
           path: ./crates/sbv2_bindings/dist
-
   python-wheel:
     name: Wheel Upload
     runs-on: ubuntu-latest

.github/workflows/lint.yml

@@ -1,26 +0,0 @@
-name: Lint
-
-on:
-  pull_request:
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        components:
-          - rustfmt
-          - clippy
-    steps:
-      - name: Setup
-        uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          components: ${{ matrix.components }}
-      - name: Format
-        if: ${{ matrix.components == 'rustfmt' }}
-        run: cargo fmt --all -- --check
-      - name: Lint
-        if: ${{ matrix.components == 'clippy' }}
-        run: cargo clippy --all-targets --all-features -- -D warnings

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-resolver = "3"
+resolver = "2"
 members = ["./crates/sbv2_api", "./crates/sbv2_core", "./crates/sbv2_bindings", "./crates/sbv2_wasm"]
 
 [workspace.package]
@@ -8,7 +8,7 @@ edition = "2021"
 description = "Style-Bert-VITSの推論ライブラリ"
 license = "MIT"
 readme = "./README.md"
-repository = "https://github.com/neodyland/sbv2-api"
+repository = "https://github.com/tuna2134/sbv2-api"
 documentation = "https://docs.rs/sbv2_core"
 
 [workspace.dependencies]

LICENSE

@@ -1,7 +1,6 @@
 MIT License
 
 Copyright (c) 2024 tuna2134
-Copyright (c) 2025- neodyland
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,23 +1,14 @@
 # SBV2-API
 
-> [!CAUTION]
-> 本バージョンはアルファ版です。
-> 
-> 安定版を利用したい場合は[こちら](https://github.com/neodyland/sbv2-api/tree/v0.1.x)をご覧ください。
+## 注意：本バージョンはアルファ版です。
+安定版を利用したい場合は[こちら](https://github.com/tuna2134/sbv2-api/tree/v0.1.x)をご覧ください。
 
-> [!CAUTION]
-> オプションの辞書はLGPLです。
-> 
-> オプションの辞書を使用する場合、バイナリの内部の辞書部分について、LGPLが適用されます。
-
-> [!NOTE]
-> このレポジトリはメンテナンスの都合上、[tuna2134](https:://github.com/tuna2134)氏の所属する[Neodyland](https://neody.land/)へとリポジトリ所在地を移動しました。
-> 
-> 引き続きtuna2134氏がメインメンテナとして管理しています。
+## 注意: オプションの辞書はLGPLです。
+オプションの辞書を使用する場合、バイナリの内部の辞書部分について、LGPLが適用されます。
 
 ## プログラミングに詳しくない方向け
 
-[こちら](https://github.com/tuna2134/sbv2-gui)を参照してください。
+[こちら](https://github.com/tuna2134/sbv2-gui?tab=readme-ov-file)を参照してください。
 
 コマンドやpythonの知識なしで簡単に使えるバージョンです。(できることはほぼ同じ)
 
@@ -29,7 +20,7 @@ JP-Extra しか対応していません。(基本的に対応する予定もあ
 
 ## 変換方法
 
-[こちら](https://github.com/neodyland/sbv2-api/tree/main/scripts/convert)を参照してください。
+[こちら](https://github.com/tuna2134/sbv2-api/tree/main/scripts/convert)を参照してください。
 
 ## Todo
 
@@ -75,7 +66,7 @@ CPUの場合は
 ```sh
 docker run -it --rm -p 3000:3000 --name sbv2 \
 -v ./models:/work/models --env-file .env \
-ghcr.io/neodyland/sbv2-api:cpu
+ghcr.io/tuna2134/sbv2-api:cpu
 ```
 
 <details>
@@ -90,7 +81,7 @@ CPUの場合は
 ```bash
 docker run --platform linux/amd64 -it --rm -p 3000:3000 --name sbv2 \
 -v ./models:/work/models --env-file .env \
-ghcr.io/neodyland/sbv2-api:cpu
+ghcr.io/tuna2134/sbv2-api:cpu
 ```
 </details>
 
@@ -99,7 +90,7 @@ CUDAの場合は
 docker run -it --rm -p 3000:3000 --name sbv2 \
 -v ./models:/work/models --env-file .env \
 --gpus all \
-ghcr.io/neodyland/sbv2-api:cuda
+ghcr.io/tuna2134/sbv2-api:cuda
 ```
 
 ### 起動確認

crates/sbv2_api/Cargo.toml

@@ -16,8 +16,8 @@ env_logger.workspace = true
 log = "0.4.22"
 sbv2_core = { version = "0.2.0-alpha6", path = "../sbv2_core", features = ["aivmx"] }
 serde = { version = "1.0.210", features = ["derive"] }
-tokio = { version = "1.47.1", features = ["full"] }
-utoipa = { version = "5.4.0", features = ["axum_extras"] }
+tokio = { version = "1.40.0", features = ["full"] }
+utoipa = { version = "5.0.0", features = ["axum_extras"] }
 utoipa-scalar = { version = "0.3.0", features = ["axum"] }
 
 [features]

crates/sbv2_api/src/main.rs

@@ -53,16 +53,12 @@ struct SynthesizeRequest {
     text: String,
     ident: String,
     #[serde(default = "sdp_default")]
-    #[schema(example = 0.0_f32)]
     sdp_ratio: f32,
     #[serde(default = "length_default")]
-    #[schema(example = 1.0_f32)]
     length_scale: f32,
     #[serde(default = "style_id_default")]
-    #[schema(example = 0_i32)]
     style_id: i32,
     #[serde(default = "speaker_id_default")]
-    #[schema(example = 0_i64)]
     speaker_id: i64,
 }
 

crates/sbv2_bindings/Cargo.toml

@@ -16,7 +16,7 @@ crate-type = ["cdylib"]
 [dependencies]
 anyhow.workspace = true
 ndarray.workspace = true
-pyo3 = { version = "0.25.1", features = ["anyhow"] }
+pyo3 = { version = "0.23.0", features = ["anyhow"] }
 sbv2_core = { path = "../sbv2_core", features = ["std"], default-features = false }
 
 [features]

crates/sbv2_bindings/src/sbv2.rs

@@ -136,7 +136,6 @@ impl TTSModel {
     /// -------
     /// voice_data : bytes
     ///     音声データ
-    #[allow(clippy::too_many_arguments)]
     fn synthesize<'p>(
         &'p mut self,
         py: Python<'p>,

crates/sbv2_core/Cargo.toml

@@ -16,16 +16,16 @@ env_logger.workspace = true
 hound = "3.5.1"
 jpreprocess = { version = "0.12.0", features = ["naist-jdic"] }
 ndarray.workspace = true
-npyz = { version = "0.8.4", optional = true }
-num_cpus = "1.17.0"
+npyz = { version = "0.8.3", optional = true }
+num_cpus = "1.16.0"
 once_cell.workspace = true
 ort = { git = "https://github.com/pykeio/ort.git", version = "2.0.0-rc.9", optional = true }
 regex = "1.10.6"
 serde = { version = "1.0.210", features = ["derive"] }
-serde_json = "1.0.142"
+serde_json = "1.0.128"
 tar = "0.4.41"
 thiserror = "2.0.11"
-tokenizers = { version = "0.21.4", default-features = false }
+tokenizers = { version = "0.21.0", default-features = false }
 zstd = "0.13.2"
 
 [features]
@@ -44,4 +44,4 @@ base64 = ["dep:base64"]
 
 [build-dependencies]
 dirs = "6.0.0"
-ureq = "3.0.12"
+ureq = "3.0.6"

crates/sbv2_core/build.rs

@@ -5,27 +5,21 @@ use std::io::copy;
 use std::path::PathBuf;
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let static_dir = home_dir().unwrap().join(".cache/sbv2");
-    let static_path = static_dir.join("all.bin");
+    let static_path = home_dir().unwrap().join(".cache/sbv2/all.bin");
     let out_path = PathBuf::from(&env::var("OUT_DIR").unwrap()).join("all.bin");
     println!("cargo:rerun-if-changed=build.rs");
     if static_path.exists() {
-        println!("cargo:info=Dictionary file already exists, skipping download.");
+        if fs::hard_link(&static_path, &out_path).is_err() {
+            fs::copy(static_path, out_path).unwrap();
+        };
     } else {
         println!("cargo:warning=Downloading dictionary file...");
         let mut response =
             ureq::get("https://huggingface.co/neody/sbv2-api-assets/resolve/main/dic/all.bin")
                 .call()?;
         let mut response = response.body_mut().as_reader();
-        if !static_dir.exists() {
-            fs::create_dir_all(static_dir)?;
-        }
-        let mut file = fs::File::create(&static_path)?;
+        let mut file = fs::File::create(&out_path)?;
         copy(&mut response, &mut file)?;
     }
-    if !out_path.exists() && fs::hard_link(&static_path, &out_path).is_err() {
-        println!("cargo:warning=Failed to create hard link, copying instead.");
-        fs::copy(static_path, out_path)?;
-    }
     Ok(())
 }

crates/sbv2_core/src/bert.rs

@@ -14,9 +14,11 @@ pub fn predict(
             "attention_mask" => TensorRef::from_array_view((vec![1, attention_masks.len() as i64], attention_masks.as_slice()))?,
         }
     )?;
+
     let output = outputs["output"]
-        .try_extract_array::<f32>()?
+        .try_extract_tensor::<f32>()?
         .into_dimensionality::<Ix2>()?
         .to_owned();
+
     Ok(output)
 }

crates/sbv2_core/src/error.rs

@@ -28,8 +28,6 @@ pub enum Error {
     Base64Error(#[from] base64::DecodeError),
     #[error("other")]
     OtherError(String),
-    #[error("Style error: {0}")]
-    StyleError(String),
 }
 
 pub type Result<T> = std::result::Result<T, Error>;

crates/sbv2_core/src/jtalk.rs

@@ -1,5 +1,5 @@
 use crate::error::{Error, Result};
-use crate::mora::{CONSONANTS, MORA_KATA_TO_MORA_PHONEMES, MORA_PHONEMES_TO_MORA_KATA, VOWELS};
+use crate::mora::{MORA_KATA_TO_MORA_PHONEMES, VOWELS};
 use crate::norm::{replace_punctuation, PUNCTUATIONS};
 use jpreprocess::{kind, DefaultTokenizer, JPreprocess, SystemDictionaryConfig, UserDictionary};
 use once_cell::sync::Lazy;
@@ -76,34 +76,6 @@ static MORA_PATTERN: Lazy<Vec<String>> = Lazy::new(|| {
 });
 static LONG_PATTERN: Lazy<Regex> = Lazy::new(|| Regex::new(r"(\w)(ー*)").unwrap());
 
-fn phone_tone_to_kana(phones: Vec<String>, tones: Vec<i32>) -> Vec<(String, i32)> {
-    let phones = &phones[1..];
-    let tones = &tones[1..];
-    let mut results = Vec::new();
-    let mut current_mora = String::new();
-    for ((phone, _next_phone), (&tone, &next_tone)) in phones
-        .iter()
-        .zip(phones.iter().skip(1))
-        .zip(tones.iter().zip(tones.iter().skip(1)))
-    {
-        if PUNCTUATIONS.contains(&phone.clone().as_str()) {
-            results.push((phone.to_string(), tone));
-            continue;
-        }
-        if CONSONANTS.contains(&phone.clone()) {
-            assert_eq!(current_mora, "");
-            assert_eq!(tone, next_tone);
-            current_mora = phone.to_string()
-        } else {
-            current_mora += phone;
-            let kana = MORA_PHONEMES_TO_MORA_KATA.get(&current_mora).unwrap();
-            results.push((kana.to_string(), tone));
-            current_mora = String::new();
-        }
-    }
-    results
-}
-
 pub struct JTalkProcess {
     jpreprocess: Arc<JPreprocessType>,
     parsed: Vec<String>,
@@ -123,24 +95,24 @@ impl JTalkProcess {
             .map(|(_letter, tone)| *tone)
             .collect();
         if tone_values.len() == 1 {
-            assert!(tone_values == hash_set![0], "{tone_values:?}");
+            assert!(tone_values == hash_set![0], "{:?}", tone_values);
             Ok(phone_tone_list)
         } else if tone_values.len() == 2 {
             if tone_values == hash_set![0, 1] {
-                Ok(phone_tone_list)
+                return Ok(phone_tone_list);
             } else if tone_values == hash_set![-1, 0] {
-                Ok(phone_tone_list
+                return Ok(phone_tone_list
                     .iter()
                     .map(|x| {
                         let new_tone = if x.1 == -1 { 0 } else { 1 };
                         (x.0.clone(), new_tone)
                     })
-                    .collect())
+                    .collect());
             } else {
-                Err(Error::ValueError("Invalid tone values 0".to_string()))
+                return Err(Error::ValueError("Invalid tone values 0".to_string()));
             }
         } else {
-            Err(Error::ValueError("Invalid tone values 1".to_string()))
+            return Err(Error::ValueError("Invalid tone values 1".to_string()));
         }
     }
 
@@ -193,11 +165,6 @@ impl JTalkProcess {
         Ok((phones, tones, new_word2ph))
     }
 
-    pub fn g2kana_tone(&self) -> Result<Vec<(String, i32)>> {
-        let (phones, tones, _) = self.g2p()?;
-        Ok(phone_tone_to_kana(phones, tones))
-    }
-
     fn distribute_phone(n_phone: i32, n_word: i32) -> Vec<i32> {
         let mut phones_per_word = vec![0; n_word as usize];
         for _ in 0..n_phone {
@@ -226,12 +193,12 @@ impl JTalkProcess {
             } else if PUNCTUATIONS.contains(&phone.as_str()) {
                 result.push((phone, 0));
             } else {
-                println!("phones {phone_with_punct:?}");
-                println!("phone_tone_list: {phone_tone_list:?}");
-                println!("result: {result:?}");
-                println!("tone_index: {tone_index:?}");
-                println!("phone: {phone:?}");
-                return Err(Error::ValueError(format!("Mismatched phoneme: {phone}")));
+                println!("phones {:?}", phone_with_punct);
+                println!("phone_tone_list: {:?}", phone_tone_list);
+                println!("result: {:?}", result);
+                println!("tone_index: {:?}", tone_index);
+                println!("phone: {:?}", phone);
+                return Err(Error::ValueError(format!("Mismatched phoneme: {}", phone)));
             }
         }
 
@@ -276,7 +243,8 @@ impl JTalkProcess {
         }
         if !KATAKANA_PATTERN.is_match(&text) {
             return Err(Error::ValueError(format!(
-                "Input must be katakana only: {text}"
+                "Input must be katakana only: {}",
+                text
             )));
         }
 
@@ -284,7 +252,7 @@ impl JTalkProcess {
             let mora = mora.to_string();
             let (consonant, vowel) = MORA_KATA_TO_MORA_PHONEMES.get(&mora).unwrap();
             if consonant.is_none() {
-                text = text.replace(&mora, &format!(" {vowel}"));
+                text = text.replace(&mora, &format!(" {}", vowel));
             } else {
                 text = text.replace(
                     &mora,
@@ -318,7 +286,7 @@ impl JTalkProcess {
             let (string, pron) = self.parse_to_string_and_pron(parts.clone());
             let mut yomi = pron.replace('’', "");
             let word = replace_punctuation(string);
-            assert!(!yomi.is_empty(), "Empty yomi: {word}");
+            assert!(!yomi.is_empty(), "Empty yomi: {}", word);
             if yomi == "、" {
                 if !word
                     .chars()
@@ -329,7 +297,7 @@ impl JTalkProcess {
                     yomi = word.clone();
                 }
             } else if yomi == "？" {
-                assert!(word == "?", "yomi `？` comes from: {word}");
+                assert!(word == "?", "yomi `？` comes from: {}", word);
                 yomi = "?".to_string();
             }
             seq_text.push(word);

crates/sbv2_core/src/main.rs

@@ -30,7 +30,8 @@ fn main_inner() -> anyhow::Result<()> {
         }
     }
 
-    let audio = tts_holder.easy_synthesize(ident, text, 0, 0, tts::SynthesizeOptions::default())?;
+    let audio =
+        tts_holder.easy_synthesize(ident, &text, 0, 0, tts::SynthesizeOptions::default())?;
     fs::write("output.wav", audio)?;
 
     Ok(())

crates/sbv2_core/src/model.rs

@@ -21,7 +21,10 @@ pub fn load_model<P: AsRef<[u8]>>(model_file: P, bert: bool) -> Result<Session>
     #[cfg(feature = "cuda")]
     {
         #[allow(unused_mut)]
-        let mut cuda = ort::execution_providers::CUDAExecutionProvider::default();
+        let mut cuda = ort::execution_providers::CUDAExecutionProvider::default()
+            .with_conv_algorithm_search(
+                ort::execution_providers::cuda::CUDAExecutionProviderCuDNNConvAlgoSearch::Default,
+            );
         #[cfg(feature = "cuda_tf32")]
         {
             cuda = cuda.with_tf32(true);
@@ -98,9 +101,11 @@ pub fn synthesize(
         "noise_scale" => noise_scale,
         "noise_scale_w" => noise_scale_w,
     })?;
+
     let audio_array = outputs["output"]
-        .try_extract_array::<f32>()?
+        .try_extract_tensor::<f32>()?
         .into_dimensionality::<Ix3>()?
         .to_owned();
+
     Ok(audio_array)
 }

crates/sbv2_core/src/mora.rs

@@ -25,21 +25,6 @@ static MORA_LIST_ADDITIONAL: Lazy<Vec<Mora>> = Lazy::new(|| {
     data.additional
 });
 
-pub static MORA_PHONEMES_TO_MORA_KATA: Lazy<HashMap<String, String>> = Lazy::new(|| {
-    let mut map = HashMap::new();
-    for mora in MORA_LIST_MINIMUM.iter() {
-        map.insert(
-            format!(
-                "{}{}",
-                mora.consonant.clone().unwrap_or("".to_string()),
-                mora.vowel
-            ),
-            mora.mora.clone(),
-        );
-    }
-    map
-});
-
 pub static MORA_KATA_TO_MORA_PHONEMES: Lazy<HashMap<String, (Option<String>, String)>> =
     Lazy::new(|| {
         let mut map = HashMap::new();
@@ -52,12 +37,4 @@ pub static MORA_KATA_TO_MORA_PHONEMES: Lazy<HashMap<String, (Option<String>, Str
         map
     });
 
-pub static CONSONANTS: Lazy<Vec<String>> = Lazy::new(|| {
-    let consonants = MORA_KATA_TO_MORA_PHONEMES
-        .values()
-        .filter_map(|(consonant, _)| consonant.clone())
-        .collect::<Vec<_>>();
-    consonants
-});
-
 pub const VOWELS: [&str; 6] = ["a", "i", "u", "e", "o", "N"];

crates/sbv2_core/src/style.rs

@@ -1,4 +1,4 @@
-use crate::error::{Error, Result};
+use crate::error::Result;
 use ndarray::{s, Array1, Array2};
 use serde::Deserialize;
 
@@ -21,18 +21,6 @@ pub fn get_style_vector(
     style_id: i32,
     weight: f32,
 ) -> Result<Array1<f32>> {
-    if style_vectors.shape().len() != 2 {
-        return Err(Error::StyleError(
-            "Invalid shape for style vectors".to_string(),
-        ));
-    }
-    if style_id < 0 || style_id >= style_vectors.shape()[0] as i32 {
-        return Err(Error::StyleError(format!(
-            "Invalid style ID: {}. Max ID: {}",
-            style_id,
-            style_vectors.shape()[0] - 1
-        )));
-    }
     let mean = style_vectors.slice(s![0, ..]).to_owned();
     let style_vector = style_vectors.slice(s![style_id as usize, ..]).to_owned();
     let diff = (style_vector - &mean) * weight;

crates/sbv2_core/src/tts.rs

@@ -41,7 +41,7 @@ pub struct TTSModelHolder {
     tokenizer: Tokenizer,
     bert: Session,
     models: Vec<TTSModel>,
-    pub jtalk: jtalk::JTalk,
+    jtalk: jtalk::JTalk,
     max_loaded_models: Option<usize>,
 }
 
@@ -205,24 +205,6 @@ impl TTSModelHolder {
     ) -> Result<(Array2<f32>, Array1<i64>, Array1<i64>, Array1<i64>)> {
         crate::tts_util::parse_text_blocking(
             text,
-            None,
-            &self.jtalk,
-            &self.tokenizer,
-            |token_ids, attention_masks| {
-                crate::bert::predict(&mut self.bert, token_ids, attention_masks)
-            },
-        )
-    }
-
-    #[allow(clippy::type_complexity)]
-    pub fn parse_text_neo(
-        &mut self,
-        text: String,
-        given_tones: Option<Vec<i32>>,
-    ) -> Result<(Array2<f32>, Array1<i64>, Array1<i64>, Array1<i64>)> {
-        crate::tts_util::parse_text_blocking(
-            &text,
-            given_tones,
             &self.jtalk,
             &self.tokenizer,
             |token_ids, attention_masks| {
@@ -365,79 +347,6 @@ impl TTSModelHolder {
         };
         tts_util::array_to_vec(audio_array)
     }
-
-    pub fn easy_synthesize_neo<I: Into<TTSIdent> + Copy>(
-        &mut self,
-        ident: I,
-        text: &str,
-        given_tones: Option<Vec<i32>>,
-        style_id: i32,
-        speaker_id: i64,
-        options: SynthesizeOptions,
-    ) -> Result<Vec<u8>> {
-        self.find_and_load_model(ident)?;
-        let style_vector = self.get_style_vector(ident, style_id, options.style_weight)?;
-        let audio_array = if options.split_sentences {
-            let texts: Vec<&str> = text.split('\n').collect();
-            let mut audios = vec![];
-            for (i, t) in texts.iter().enumerate() {
-                if t.is_empty() {
-                    continue;
-                }
-                let (bert_ori, phones, tones, lang_ids) =
-                    self.parse_text_neo(t.to_string(), given_tones.clone())?;
-
-                let vits2 = self
-                    .find_model(ident)?
-                    .vits2
-                    .as_mut()
-                    .ok_or(Error::ModelNotFoundError(ident.into().to_string()))?;
-                let audio = model::synthesize(
-                    vits2,
-                    bert_ori.to_owned(),
-                    phones,
-                    Array1::from_vec(vec![speaker_id]),
-                    tones,
-                    lang_ids,
-                    style_vector.clone(),
-                    options.sdp_ratio,
-                    options.length_scale,
-                    0.677,
-                    0.8,
-                )?;
-                audios.push(audio.clone());
-                if i != texts.len() - 1 {
-                    audios.push(Array3::zeros((1, 1, 22050)));
-                }
-            }
-            concatenate(
-                Axis(2),
-                &audios.iter().map(|x| x.view()).collect::<Vec<_>>(),
-            )?
-        } else {
-            let (bert_ori, phones, tones, lang_ids) = self.parse_text(text)?;
-
-            let vits2 = self
-                .find_model(ident)?
-                .vits2
-                .as_mut()
-                .ok_or(Error::ModelNotFoundError(ident.into().to_string()))?;
-            model::synthesize(
-                vits2,
-                bert_ori.to_owned(),
-                phones,
-                Array1::from_vec(vec![speaker_id]),
-                tones,
-                lang_ids,
-                style_vector,
-                options.sdp_ratio,
-                options.length_scale,
-                0.677,
-                0.8,
-            )?
-        };
-        tts_util::array_to_vec(audio_array)
-    }
 }
 
 /// Synthesize options

crates/sbv2_core/src/tts_util.rs

@@ -1,22 +1,10 @@
 use std::io::Cursor;
 
 use crate::error::Result;
-use crate::jtalk::JTalkProcess;
-use crate::mora::MORA_KATA_TO_MORA_PHONEMES;
-use crate::norm::PUNCTUATIONS;
 use crate::{jtalk, nlp, norm, tokenizer, utils};
 use hound::{SampleFormat, WavSpec, WavWriter};
 use ndarray::{concatenate, s, Array, Array1, Array2, Array3, Axis};
 use tokenizers::Tokenizer;
-
-pub fn preprocess_parse_text(text: &str, jtalk: &jtalk::JTalk) -> Result<(String, JTalkProcess)> {
-    let text = jtalk.num2word(text)?;
-    let normalized_text = norm::normalize_text(&text);
-
-    let process = jtalk.process_text(&normalized_text)?;
-    Ok((normalized_text, process))
-}
-
 /// Parse text and return the input for synthesize
 ///
 /// # Note
@@ -33,9 +21,13 @@ pub async fn parse_text(
         Box<dyn std::future::Future<Output = Result<ndarray::Array2<f32>>>>,
     >,
 ) -> Result<(Array2<f32>, Array1<i64>, Array1<i64>, Array1<i64>)> {
-    let (normalized_text, process) = preprocess_parse_text(text, jtalk)?;
+    let text = jtalk.num2word(text)?;
+    let normalized_text = norm::normalize_text(&text);
+
+    let process = jtalk.process_text(&normalized_text)?;
     let (phones, tones, mut word2ph) = process.g2p()?;
     let (phones, tones, lang_ids) = nlp::cleaned_text_to_sequence(phones, tones);
+
     let phones = utils::intersperse(&phones, 0);
     let tones = utils::intersperse(&tones, 0);
     let lang_ids = utils::intersperse(&lang_ids, 0);
@@ -100,7 +92,6 @@ pub async fn parse_text(
 #[allow(clippy::type_complexity)]
 pub fn parse_text_blocking(
     text: &str,
-    given_tones: Option<Vec<i32>>,
     jtalk: &jtalk::JTalk,
     tokenizer: &Tokenizer,
     bert_predict: impl FnOnce(Vec<i64>, Vec<i64>) -> Result<ndarray::Array2<f32>>,
@@ -109,10 +100,7 @@ pub fn parse_text_blocking(
     let normalized_text = norm::normalize_text(&text);
 
     let process = jtalk.process_text(&normalized_text)?;
-    let (phones, mut tones, mut word2ph) = process.g2p()?;
-    if let Some(given_tones) = given_tones {
-        tones = given_tones;
-    }
+    let (phones, tones, mut word2ph) = process.g2p()?;
     let (phones, tones, lang_ids) = nlp::cleaned_text_to_sequence(phones, tones);
 
     let phones = utils::intersperse(&phones, 0);
@@ -173,15 +161,8 @@ pub fn parse_text_blocking(
 }
 
 pub fn array_to_vec(audio_array: Array3<f32>) -> Result<Vec<u8>> {
-    // If SBV2_FORCE_STEREO is set ("1"/"true"), duplicate mono to stereo
-    let force_stereo = std::env::var("SBV2_FORCE_STEREO")
-        .ok()
-        .map(|v| matches!(v.as_str(), "1" | "true" | "TRUE" | "True"))
-        .unwrap_or(false);
-
-    let channels: u16 = if force_stereo { 2 } else { 1 };
     let spec = WavSpec {
-        channels,
+        channels: 1,
         sample_rate: 44100,
         bits_per_sample: 32,
         sample_format: SampleFormat::Float,
@@ -190,38 +171,10 @@ pub fn array_to_vec(audio_array: Array3<f32>) -> Result<Vec<u8>> {
     let mut writer = WavWriter::new(&mut cursor, spec)?;
     for i in 0..audio_array.shape()[0] {
         let output = audio_array.slice(s![i, 0, ..]).to_vec();
-        if force_stereo {
-            for sample in output {
-                // Write to Left and Right channels
-                writer.write_sample(sample)?;
-                writer.write_sample(sample)?;
-            }
-        } else {
-            for sample in output {
-                writer.write_sample(sample)?;
-            }
+        for sample in output {
+            writer.write_sample(sample)?;
         }
     }
     writer.finalize()?;
     Ok(cursor.into_inner())
 }
-
-pub fn kata_tone2phone_tone(kata_tone: Vec<(String, i32)>) -> Vec<(String, i32)> {
-    let mut results = vec![("_".to_string(), 0)];
-    for (mora, tone) in kata_tone {
-        if PUNCTUATIONS.contains(&mora.as_str()) {
-            results.push((mora, 0));
-            continue;
-        } else {
-            let (consonant, vowel) = MORA_KATA_TO_MORA_PHONEMES.get(&mora).unwrap();
-            if let Some(consonant) = consonant {
-                results.push((consonant.to_string(), tone));
-                results.push((vowel.to_string(), tone));
-            } else {
-                results.push((vowel.to_string(), tone));
-            }
-        }
-    }
-    results.push(("_".to_string(), 0));
-    results
-}

crates/sbv2_editor/Cargo.toml

@@ -1,19 +0,0 @@
-[package]
-name = "sbv2_editor"
-version.workspace = true
-edition.workspace = true
-description.workspace = true
-license.workspace = true
-readme.workspace = true
-repository.workspace = true
-documentation.workspace = true
-
-[dependencies]
-anyhow.workspace = true
-axum = "0.8.1"
-dotenvy.workspace = true
-env_logger.workspace = true
-log = "0.4.27"
-sbv2_core = { version = "0.2.0-alpha6", path = "../sbv2_core", features = ["aivmx"] }
-serde = { version = "1.0.219", features = ["derive"] }
-tokio = { version = "1.44.1", features = ["full"] }

crates/sbv2_editor/README.md

@@ -1,2 +0,0 @@
-# sbv2-voicevox
-sbv2-apiをvoicevox化します。

crates/sbv2_editor/query2.json

@@ -1,226 +0,0 @@
-{
-    "accent_phrases": [
-        {
-            "moras": [
-                {
-                    "text": "コ",
-                    "consonant": "k",
-                    "consonant_length": 0.10002632439136505,
-                    "vowel": "o",
-                    "vowel_length": 0.15740256011486053,
-                    "pitch": 5.749961853027344
-                },
-                {
-                    "text": "ン",
-                    "consonant": null,
-                    "consonant_length": null,
-                    "vowel": "N",
-                    "vowel_length": 0.08265873789787292,
-                    "pitch": 5.89122200012207
-                },
-                {
-                    "text": "ニ",
-                    "consonant": "n",
-                    "consonant_length": 0.03657080978155136,
-                    "vowel": "i",
-                    "vowel_length": 0.1175866425037384,
-                    "pitch": 5.969866752624512
-                },
-                {
-                    "text": "チ",
-                    "consonant": "ch",
-                    "consonant_length": 0.09005842357873917,
-                    "vowel": "i",
-                    "vowel_length": 0.08666137605905533,
-                    "pitch": 5.958892822265625
-                },
-                {
-                    "text": "ワ",
-                    "consonant": "w",
-                    "consonant_length": 0.07833231985569,
-                    "vowel": "a",
-                    "vowel_length": 0.21250136196613312,
-                    "pitch": 5.949411392211914
-                }
-            ],
-            "accent": 5,
-            "pause_mora": {
-                "text": "、",
-                "consonant": null,
-                "consonant_length": null,
-                "vowel": "pau",
-                "vowel_length": 0.4723339378833771,
-                "pitch": 0.0
-            },
-            "is_interrogative": false
-        },
-        {
-            "moras": [
-                {
-                    "text": "オ",
-                    "consonant": null,
-                    "consonant_length": null,
-                    "vowel": "o",
-                    "vowel_length": 0.22004225850105286,
-                    "pitch": 5.6870927810668945
-                },
-                {
-                    "text": "ン",
-                    "consonant": null,
-                    "consonant_length": null,
-                    "vowel": "N",
-                    "vowel_length": 0.09161105751991272,
-                    "pitch": 5.93472957611084
-                },
-                {
-                    "text": "セ",
-                    "consonant": "s",
-                    "consonant_length": 0.08924821764230728,
-                    "vowel": "e",
-                    "vowel_length": 0.14142127335071564,
-                    "pitch": 6.121850490570068
-                },
-                {
-                    "text": "エ",
-                    "consonant": null,
-                    "consonant_length": null,
-                    "vowel": "e",
-                    "vowel_length": 0.10636933892965317,
-                    "pitch": 6.157896041870117
-                },
-                {
-                    "text": "ゴ",
-                    "consonant": "g",
-                    "consonant_length": 0.07600915431976318,
-                    "vowel": "o",
-                    "vowel_length": 0.09598273783922195,
-                    "pitch": 6.188933849334717
-                },
-                {
-                    "text": "オ",
-                    "consonant": null,
-                    "consonant_length": null,
-                    "vowel": "o",
-                    "vowel_length": 0.1079121008515358,
-                    "pitch": 6.235202789306641
-                },
-                {
-                    "text": "セ",
-                    "consonant": "s",
-                    "consonant_length": 0.09591838717460632,
-                    "vowel": "e",
-                    "vowel_length": 0.10286372154951096,
-                    "pitch": 6.153214454650879
-                },
-                {
-                    "text": "エ",
-                    "consonant": null,
-                    "consonant_length": null,
-                    "vowel": "e",
-                    "vowel_length": 0.08992656320333481,
-                    "pitch": 6.02571439743042
-                },
-                {
-                    "text": "ノ",
-                    "consonant": "n",
-                    "consonant_length": 0.05660202354192734,
-                    "vowel": "o",
-                    "vowel_length": 0.09676017612218857,
-                    "pitch": 5.711844444274902
-                }
-            ],
-            "accent": 5,
-            "pause_mora": null,
-            "is_interrogative": false
-        },
-        {
-            "moras": [
-                {
-                    "text": "セ",
-                    "consonant": "s",
-                    "consonant_length": 0.07805486768484116,
-                    "vowel": "e",
-                    "vowel_length": 0.09617523103952408,
-                    "pitch": 5.774399280548096
-                },
-                {
-                    "text": "カ",
-                    "consonant": "k",
-                    "consonant_length": 0.06712044775485992,
-                    "vowel": "a",
-                    "vowel_length": 0.148829385638237,
-                    "pitch": 6.063965797424316
-                },
-                {
-                    "text": "イ",
-                    "consonant": null,
-                    "consonant_length": null,
-                    "vowel": "i",
-                    "vowel_length": 0.11061104387044907,
-                    "pitch": 6.040698051452637
-                },
-                {
-                    "text": "エ",
-                    "consonant": null,
-                    "consonant_length": null,
-                    "vowel": "e",
-                    "vowel_length": 0.13046696782112122,
-                    "pitch": 5.806027889251709
-                }
-            ],
-            "accent": 1,
-            "pause_mora": null,
-            "is_interrogative": false
-        },
-        {
-            "moras": [
-                {
-                    "text": "ヨ",
-                    "consonant": "y",
-                    "consonant_length": 0.07194744795560837,
-                    "vowel": "o",
-                    "vowel_length": 0.08622600883245468,
-                    "pitch": 5.694094657897949
-                },
-                {
-                    "text": "オ",
-                    "consonant": null,
-                    "consonant_length": null,
-                    "vowel": "o",
-                    "vowel_length": 0.10635452717542648,
-                    "pitch": 5.787222385406494
-                },
-                {
-                    "text": "コ",
-                    "consonant": "k",
-                    "consonant_length": 0.07077334076166153,
-                    "vowel": "o",
-                    "vowel_length": 0.09248624742031097,
-                    "pitch": 5.793357849121094
-                },
-                {
-                    "text": "ソ",
-                    "consonant": "s",
-                    "consonant_length": 0.08705667406320572,
-                    "vowel": "o",
-                    "vowel_length": 0.2238258570432663,
-                    "pitch": 5.643765449523926
-                }
-            ],
-            "accent": 1,
-            "pause_mora": null,
-            "is_interrogative": false
-        }
-    ],
-    "speedScale": 1.0,
-    "pitchScale": 0.0,
-    "intonationScale": 1.0,
-    "volumeScale": 1.0,
-    "prePhonemeLength": 0.1,
-    "postPhonemeLength": 0.1,
-    "pauseLength": null,
-    "pauseLengthScale": 1.0,
-    "outputSamplingRate": 24000,
-    "outputStereo": false,
-    "kana": "コンニチワ'、オンセエゴ'オセエノ/セ'カイエ/ヨ'オコソ"
-}

crates/sbv2_editor/src/error.rs

@@ -1,27 +0,0 @@
-use axum::{
-    http::StatusCode,
-    response::{IntoResponse, Response},
-};
-
-pub type AppResult<T> = std::result::Result<T, AppError>;
-
-pub struct AppError(anyhow::Error);
-
-impl IntoResponse for AppError {
-    fn into_response(self) -> Response {
-        (
-            StatusCode::INTERNAL_SERVER_ERROR,
-            format!("Something went wrong: {}", self.0),
-        )
-            .into_response()
-    }
-}
-
-impl<E> From<E> for AppError
-where
-    E: Into<anyhow::Error>,
-{
-    fn from(err: E) -> Self {
-        Self(err.into())
-    }
-}

crates/sbv2_editor/src/main.rs

@@ -1,197 +0,0 @@
-use axum::extract::State;
-use axum::{
-    extract::Query,
-    http::header::CONTENT_TYPE,
-    response::IntoResponse,
-    routing::{get, post},
-    Json, Router,
-};
-use sbv2_core::tts_util::kata_tone2phone_tone;
-use sbv2_core::{
-    tts::{SynthesizeOptions, TTSModelHolder},
-    tts_util::preprocess_parse_text,
-};
-use serde::{Deserialize, Serialize};
-use tokio::{fs, net::TcpListener, sync::Mutex};
-
-use std::env;
-use std::sync::Arc;
-
-use error::AppResult;
-
-mod error;
-
-#[derive(Deserialize)]
-struct RequestCreateAudioQuery {
-    text: String,
-}
-
-#[derive(Serialize, Deserialize)]
-struct AudioQuery {
-    kana: String,
-    tone: i32,
-}
-
-#[derive(Serialize)]
-struct ResponseCreateAudioQuery {
-    audio_query: Vec<AudioQuery>,
-    text: String,
-}
-
-async fn create_audio_query(
-    State(state): State<AppState>,
-    Query(request): Query<RequestCreateAudioQuery>,
-) -> AppResult<impl IntoResponse> {
-    let (text, process) = {
-        let tts_model = state.tts_model.lock().await;
-        preprocess_parse_text(&request.text, &tts_model.jtalk)?
-    };
-    let kana_tone_list = process.g2kana_tone()?;
-    let audio_query = kana_tone_list
-        .iter()
-        .map(|(kana, tone)| AudioQuery {
-            kana: kana.clone(),
-            tone: *tone,
-        })
-        .collect::<Vec<_>>();
-    Ok(Json(ResponseCreateAudioQuery { audio_query, text }))
-}
-
-#[derive(Deserialize)]
-pub struct RequestSynthesis {
-    text: String,
-    speaker_id: i64,
-    sdp_ratio: f32,
-    length_scale: f32,
-    style_id: i32,
-    audio_query: Vec<AudioQuery>,
-    ident: String,
-}
-
-async fn synthesis(
-    State(state): State<AppState>,
-    Json(request): Json<RequestSynthesis>,
-) -> AppResult<impl IntoResponse> {
-    let phone_tone = request
-        .audio_query
-        .iter()
-        .map(|query| (query.kana.clone(), query.tone))
-        .collect::<Vec<_>>();
-    let phone_tone = kata_tone2phone_tone(phone_tone);
-    let tones = phone_tone.iter().map(|(_, tone)| *tone).collect::<Vec<_>>();
-    let buffer = {
-        let mut tts_model = state.tts_model.lock().await;
-        tts_model.easy_synthesize_neo(
-            &request.ident,
-            &request.text,
-            Some(tones),
-            request.style_id,
-            request.speaker_id,
-            SynthesizeOptions {
-                sdp_ratio: request.sdp_ratio,
-                length_scale: request.length_scale,
-                ..Default::default()
-            },
-        )?
-    };
-    Ok(([(CONTENT_TYPE, "audio/wav")], buffer))
-}
-
-#[derive(Clone)]
-struct AppState {
-    tts_model: Arc<Mutex<TTSModelHolder>>,
-}
-
-impl AppState {
-    pub async fn new() -> anyhow::Result<Self> {
-        let mut tts_model = TTSModelHolder::new(
-            &fs::read(env::var("BERT_MODEL_PATH")?).await?,
-            &fs::read(env::var("TOKENIZER_PATH")?).await?,
-            env::var("HOLDER_MAX_LOADED_MODElS")
-                .ok()
-                .and_then(|x| x.parse().ok()),
-        )?;
-        let models = env::var("MODELS_PATH").unwrap_or("models".to_string());
-        let mut f = fs::read_dir(&models).await?;
-        let mut entries = vec![];
-        while let Ok(Some(e)) = f.next_entry().await {
-            let name = e.file_name().to_string_lossy().to_string();
-            if name.ends_with(".onnx") && name.starts_with("model_") {
-                let name_len = name.len();
-                let name = name.chars();
-                entries.push(
-                    name.collect::<Vec<_>>()[6..name_len - 5]
-                        .iter()
-                        .collect::<String>(),
-                );
-            } else if name.ends_with(".sbv2") {
-                let entry = &name[..name.len() - 5];
-                log::info!("Try loading: {entry}");
-                let sbv2_bytes = match fs::read(format!("{models}/{entry}.sbv2")).await {
-                    Ok(b) => b,
-                    Err(e) => {
-                        log::warn!("Error loading sbv2_bytes from file {entry}: {e}");
-                        continue;
-                    }
-                };
-                if let Err(e) = tts_model.load_sbv2file(entry, sbv2_bytes) {
-                    log::warn!("Error loading {entry}: {e}");
-                };
-                log::info!("Loaded: {entry}");
-            } else if name.ends_with(".aivmx") {
-                let entry = &name[..name.len() - 6];
-                log::info!("Try loading: {entry}");
-                let aivmx_bytes = match fs::read(format!("{models}/{entry}.aivmx")).await {
-                    Ok(b) => b,
-                    Err(e) => {
-                        log::warn!("Error loading aivmx bytes from file {entry}: {e}");
-                        continue;
-                    }
-                };
-                if let Err(e) = tts_model.load_aivmx(entry, aivmx_bytes) {
-                    log::error!("Error loading {entry}: {e}");
-                }
-                log::info!("Loaded: {entry}");
-            }
-        }
-        for entry in entries {
-            log::info!("Try loading: {entry}");
-            let style_vectors_bytes =
-                match fs::read(format!("{models}/style_vectors_{entry}.json")).await {
-                    Ok(b) => b,
-                    Err(e) => {
-                        log::warn!("Error loading style_vectors_bytes from file {entry}: {e}");
-                        continue;
-                    }
-                };
-            let vits2_bytes = match fs::read(format!("{models}/model_{entry}.onnx")).await {
-                Ok(b) => b,
-                Err(e) => {
-                    log::warn!("Error loading vits2_bytes from file {entry}: {e}");
-                    continue;
-                }
-            };
-            if let Err(e) = tts_model.load(&entry, style_vectors_bytes, vits2_bytes) {
-                log::warn!("Error loading {entry}: {e}");
-            };
-            log::info!("Loaded: {entry}");
-        }
-        Ok(Self {
-            tts_model: Arc::new(Mutex::new(tts_model)),
-        })
-    }
-}
-
-#[tokio::main]
-async fn main() -> anyhow::Result<()> {
-    dotenvy::dotenv_override().ok();
-    env_logger::init();
-    let app = Router::new()
-        .route("/", get(|| async { "Hello, world!" }))
-        .route("/audio_query", get(create_audio_query))
-        .route("/synthesis", post(synthesis))
-        .with_state(AppState::new().await?);
-    let listener = TcpListener::bind("0.0.0.0:8080").await?;
-    axum::serve(listener, app).await?;
-    Ok(())
-}

crates/sbv2_wasm/README.md

@@ -1,2 +1,2 @@
 # StyleBertVITS2 wasm
-refer to https://github.com/neodyland/sbv2-api
+refer to https://github.com/tuna2134/sbv2-api

crates/sbv2_wasm/package.json

@@ -11,7 +11,6 @@
 	},
 	"keywords": [],
 	"author": "tuna2134",
-        "contributes": ["neodyland"],
 	"license": "MIT",
 	"devDependencies": {
 		"@biomejs/biome": "^1.9.4",

crates/sbv2_wasm/pnpm-lock.yaml

@@ -20,10 +20,10 @@ importers:
         version: 22.13.5
       esbuild:
         specifier: ^0.25.0
-        version: 0.25.0
+        version: 0.25.2
       typescript:
         specifier: ^5.7.3
-        version: 5.8.3
+        version: 5.7.3
 
 packages:
 
@@ -80,152 +80,152 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@esbuild/aix-ppc64@0.25.0':
-    resolution: {integrity: sha512-O7vun9Sf8DFjH2UtqK8Ku3LkquL9SZL8OLY1T5NZkA34+wG3OQF7cl4Ql8vdNzM6fzBbYfLaiRLIOZ+2FOCgBQ==}
+  '@esbuild/aix-ppc64@0.25.2':
+    resolution: {integrity: sha512-wCIboOL2yXZym2cgm6mlA742s9QeJ8DjGVaL39dLN4rRwrOgOyYSnOaFPhKZGLb2ngj4EyfAFjsNJwPXZvseag==}
     engines: {node: '>=18'}
     cpu: [ppc64]
     os: [aix]
 
-  '@esbuild/android-arm64@0.25.0':
-    resolution: {integrity: sha512-grvv8WncGjDSyUBjN9yHXNt+cq0snxXbDxy5pJtzMKGmmpPxeAmAhWxXI+01lU5rwZomDgD3kJwulEnhTRUd6g==}
+  '@esbuild/android-arm64@0.25.2':
+    resolution: {integrity: sha512-5ZAX5xOmTligeBaeNEPnPaeEuah53Id2tX4c2CVP3JaROTH+j4fnfHCkr1PjXMd78hMst+TlkfKcW/DlTq0i4w==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [android]
 
-  '@esbuild/android-arm@0.25.0':
-    resolution: {integrity: sha512-PTyWCYYiU0+1eJKmw21lWtC+d08JDZPQ5g+kFyxP0V+es6VPPSUhM6zk8iImp2jbV6GwjX4pap0JFbUQN65X1g==}
+  '@esbuild/android-arm@0.25.2':
+    resolution: {integrity: sha512-NQhH7jFstVY5x8CKbcfa166GoV0EFkaPkCKBQkdPJFvo5u+nGXLEH/ooniLb3QI8Fk58YAx7nsPLozUWfCBOJA==}
     engines: {node: '>=18'}
     cpu: [arm]
     os: [android]
 
-  '@esbuild/android-x64@0.25.0':
-    resolution: {integrity: sha512-m/ix7SfKG5buCnxasr52+LI78SQ+wgdENi9CqyCXwjVR2X4Jkz+BpC3le3AoBPYTC9NHklwngVXvbJ9/Akhrfg==}
+  '@esbuild/android-x64@0.25.2':
+    resolution: {integrity: sha512-Ffcx+nnma8Sge4jzddPHCZVRvIfQ0kMsUsCMcJRHkGJ1cDmhe4SsrYIjLUKn1xpHZybmOqCWwB0zQvsjdEHtkg==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [android]
 
-  '@esbuild/darwin-arm64@0.25.0':
-    resolution: {integrity: sha512-mVwdUb5SRkPayVadIOI78K7aAnPamoeFR2bT5nszFUZ9P8UpK4ratOdYbZZXYSqPKMHfS1wdHCJk1P1EZpRdvw==}
+  '@esbuild/darwin-arm64@0.25.2':
+    resolution: {integrity: sha512-MpM6LUVTXAzOvN4KbjzU/q5smzryuoNjlriAIx+06RpecwCkL9JpenNzpKd2YMzLJFOdPqBpuub6eVRP5IgiSA==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [darwin]
 
-  '@esbuild/darwin-x64@0.25.0':
-    resolution: {integrity: sha512-DgDaYsPWFTS4S3nWpFcMn/33ZZwAAeAFKNHNa1QN0rI4pUjgqf0f7ONmXf6d22tqTY+H9FNdgeaAa+YIFUn2Rg==}
+  '@esbuild/darwin-x64@0.25.2':
+    resolution: {integrity: sha512-5eRPrTX7wFyuWe8FqEFPG2cU0+butQQVNcT4sVipqjLYQjjh8a8+vUTfgBKM88ObB85ahsnTwF7PSIt6PG+QkA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [darwin]
 
-  '@esbuild/freebsd-arm64@0.25.0':
-    resolution: {integrity: sha512-VN4ocxy6dxefN1MepBx/iD1dH5K8qNtNe227I0mnTRjry8tj5MRk4zprLEdG8WPyAPb93/e4pSgi1SoHdgOa4w==}
+  '@esbuild/freebsd-arm64@0.25.2':
+    resolution: {integrity: sha512-mLwm4vXKiQ2UTSX4+ImyiPdiHjiZhIaE9QvC7sw0tZ6HoNMjYAqQpGyui5VRIi5sGd+uWq940gdCbY3VLvsO1w==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [freebsd]
 
-  '@esbuild/freebsd-x64@0.25.0':
-    resolution: {integrity: sha512-mrSgt7lCh07FY+hDD1TxiTyIHyttn6vnjesnPoVDNmDfOmggTLXRv8Id5fNZey1gl/V2dyVK1VXXqVsQIiAk+A==}
+  '@esbuild/freebsd-x64@0.25.2':
+    resolution: {integrity: sha512-6qyyn6TjayJSwGpm8J9QYYGQcRgc90nmfdUb0O7pp1s4lTY+9D0H9O02v5JqGApUyiHOtkz6+1hZNvNtEhbwRQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [freebsd]
 
-  '@esbuild/linux-arm64@0.25.0':
-    resolution: {integrity: sha512-9QAQjTWNDM/Vk2bgBl17yWuZxZNQIF0OUUuPZRKoDtqF2k4EtYbpyiG5/Dk7nqeK6kIJWPYldkOcBqjXjrUlmg==}
+  '@esbuild/linux-arm64@0.25.2':
+    resolution: {integrity: sha512-gq/sjLsOyMT19I8obBISvhoYiZIAaGF8JpeXu1u8yPv8BE5HlWYobmlsfijFIZ9hIVGYkbdFhEqC0NvM4kNO0g==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [linux]
 
-  '@esbuild/linux-arm@0.25.0':
-    resolution: {integrity: sha512-vkB3IYj2IDo3g9xX7HqhPYxVkNQe8qTK55fraQyTzTX/fxaDtXiEnavv9geOsonh2Fd2RMB+i5cbhu2zMNWJwg==}
+  '@esbuild/linux-arm@0.25.2':
+    resolution: {integrity: sha512-UHBRgJcmjJv5oeQF8EpTRZs/1knq6loLxTsjc3nxO9eXAPDLcWW55flrMVc97qFPbmZP31ta1AZVUKQzKTzb0g==}
     engines: {node: '>=18'}
     cpu: [arm]
     os: [linux]
 
-  '@esbuild/linux-ia32@0.25.0':
-    resolution: {integrity: sha512-43ET5bHbphBegyeqLb7I1eYn2P/JYGNmzzdidq/w0T8E2SsYL1U6un2NFROFRg1JZLTzdCoRomg8Rvf9M6W6Gg==}
+  '@esbuild/linux-ia32@0.25.2':
+    resolution: {integrity: sha512-bBYCv9obgW2cBP+2ZWfjYTU+f5cxRoGGQ5SeDbYdFCAZpYWrfjjfYwvUpP8MlKbP0nwZ5gyOU/0aUzZ5HWPuvQ==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [linux]
 
-  '@esbuild/linux-loong64@0.25.0':
-    resolution: {integrity: sha512-fC95c/xyNFueMhClxJmeRIj2yrSMdDfmqJnyOY4ZqsALkDrrKJfIg5NTMSzVBr5YW1jf+l7/cndBfP3MSDpoHw==}
+  '@esbuild/linux-loong64@0.25.2':
+    resolution: {integrity: sha512-SHNGiKtvnU2dBlM5D8CXRFdd+6etgZ9dXfaPCeJtz+37PIUlixvlIhI23L5khKXs3DIzAn9V8v+qb1TRKrgT5w==}
     engines: {node: '>=18'}
     cpu: [loong64]
     os: [linux]
 
-  '@esbuild/linux-mips64el@0.25.0':
-    resolution: {integrity: sha512-nkAMFju7KDW73T1DdH7glcyIptm95a7Le8irTQNO/qtkoyypZAnjchQgooFUDQhNAy4iu08N79W4T4pMBwhPwQ==}
+  '@esbuild/linux-mips64el@0.25.2':
+    resolution: {integrity: sha512-hDDRlzE6rPeoj+5fsADqdUZl1OzqDYow4TB4Y/3PlKBD0ph1e6uPHzIQcv2Z65u2K0kpeByIyAjCmjn1hJgG0Q==}
     engines: {node: '>=18'}
     cpu: [mips64el]
     os: [linux]
 
-  '@esbuild/linux-ppc64@0.25.0':
-    resolution: {integrity: sha512-NhyOejdhRGS8Iwv+KKR2zTq2PpysF9XqY+Zk77vQHqNbo/PwZCzB5/h7VGuREZm1fixhs4Q/qWRSi5zmAiO4Fw==}
+  '@esbuild/linux-ppc64@0.25.2':
+    resolution: {integrity: sha512-tsHu2RRSWzipmUi9UBDEzc0nLc4HtpZEI5Ba+Omms5456x5WaNuiG3u7xh5AO6sipnJ9r4cRWQB2tUjPyIkc6g==}
     engines: {node: '>=18'}
     cpu: [ppc64]
     os: [linux]
 
-  '@esbuild/linux-riscv64@0.25.0':
-    resolution: {integrity: sha512-5S/rbP5OY+GHLC5qXp1y/Mx//e92L1YDqkiBbO9TQOvuFXM+iDqUNG5XopAnXoRH3FjIUDkeGcY1cgNvnXp/kA==}
+  '@esbuild/linux-riscv64@0.25.2':
+    resolution: {integrity: sha512-k4LtpgV7NJQOml/10uPU0s4SAXGnowi5qBSjaLWMojNCUICNu7TshqHLAEbkBdAszL5TabfvQ48kK84hyFzjnw==}
     engines: {node: '>=18'}
     cpu: [riscv64]
     os: [linux]
 
-  '@esbuild/linux-s390x@0.25.0':
-    resolution: {integrity: sha512-XM2BFsEBz0Fw37V0zU4CXfcfuACMrppsMFKdYY2WuTS3yi8O1nFOhil/xhKTmE1nPmVyvQJjJivgDT+xh8pXJA==}
+  '@esbuild/linux-s390x@0.25.2':
+    resolution: {integrity: sha512-GRa4IshOdvKY7M/rDpRR3gkiTNp34M0eLTaC1a08gNrh4u488aPhuZOCpkF6+2wl3zAN7L7XIpOFBhnaE3/Q8Q==}
     engines: {node: '>=18'}
     cpu: [s390x]
     os: [linux]
 
-  '@esbuild/linux-x64@0.25.0':
-    resolution: {integrity: sha512-9yl91rHw/cpwMCNytUDxwj2XjFpxML0y9HAOH9pNVQDpQrBxHy01Dx+vaMu0N1CKa/RzBD2hB4u//nfc+Sd3Cw==}
+  '@esbuild/linux-x64@0.25.2':
+    resolution: {integrity: sha512-QInHERlqpTTZ4FRB0fROQWXcYRD64lAoiegezDunLpalZMjcUcld3YzZmVJ2H/Cp0wJRZ8Xtjtj0cEHhYc/uUg==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [linux]
 
-  '@esbuild/netbsd-arm64@0.25.0':
-    resolution: {integrity: sha512-RuG4PSMPFfrkH6UwCAqBzauBWTygTvb1nxWasEJooGSJ/NwRw7b2HOwyRTQIU97Hq37l3npXoZGYMy3b3xYvPw==}
+  '@esbuild/netbsd-arm64@0.25.2':
+    resolution: {integrity: sha512-talAIBoY5M8vHc6EeI2WW9d/CkiO9MQJ0IOWX8hrLhxGbro/vBXJvaQXefW2cP0z0nQVTdQ/eNyGFV1GSKrxfw==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [netbsd]
 
-  '@esbuild/netbsd-x64@0.25.0':
-    resolution: {integrity: sha512-jl+qisSB5jk01N5f7sPCsBENCOlPiS/xptD5yxOx2oqQfyourJwIKLRA2yqWdifj3owQZCL2sn6o08dBzZGQzA==}
+  '@esbuild/netbsd-x64@0.25.2':
+    resolution: {integrity: sha512-voZT9Z+tpOxrvfKFyfDYPc4DO4rk06qamv1a/fkuzHpiVBMOhpjK+vBmWM8J1eiB3OLSMFYNaOaBNLXGChf5tg==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [netbsd]
 
-  '@esbuild/openbsd-arm64@0.25.0':
-    resolution: {integrity: sha512-21sUNbq2r84YE+SJDfaQRvdgznTD8Xc0oc3p3iW/a1EVWeNj/SdUCbm5U0itZPQYRuRTW20fPMWMpcrciH2EJw==}
+  '@esbuild/openbsd-arm64@0.25.2':
+    resolution: {integrity: sha512-dcXYOC6NXOqcykeDlwId9kB6OkPUxOEqU+rkrYVqJbK2hagWOMrsTGsMr8+rW02M+d5Op5NNlgMmjzecaRf7Tg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openbsd]
 
-  '@esbuild/openbsd-x64@0.25.0':
-    resolution: {integrity: sha512-2gwwriSMPcCFRlPlKx3zLQhfN/2WjJ2NSlg5TKLQOJdV0mSxIcYNTMhk3H3ulL/cak+Xj0lY1Ym9ysDV1igceg==}
+  '@esbuild/openbsd-x64@0.25.2':
+    resolution: {integrity: sha512-t/TkWwahkH0Tsgoq1Ju7QfgGhArkGLkF1uYz8nQS/PPFlXbP5YgRpqQR3ARRiC2iXoLTWFxc6DJMSK10dVXluw==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [openbsd]
 
-  '@esbuild/sunos-x64@0.25.0':
-    resolution: {integrity: sha512-bxI7ThgLzPrPz484/S9jLlvUAHYMzy6I0XiU1ZMeAEOBcS0VePBFxh1JjTQt3Xiat5b6Oh4x7UC7IwKQKIJRIg==}
+  '@esbuild/sunos-x64@0.25.2':
+    resolution: {integrity: sha512-cfZH1co2+imVdWCjd+D1gf9NjkchVhhdpgb1q5y6Hcv9TP6Zi9ZG/beI3ig8TvwT9lH9dlxLq5MQBBgwuj4xvA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [sunos]
 
-  '@esbuild/win32-arm64@0.25.0':
-    resolution: {integrity: sha512-ZUAc2YK6JW89xTbXvftxdnYy3m4iHIkDtK3CLce8wg8M2L+YZhIvO1DKpxrd0Yr59AeNNkTiic9YLf6FTtXWMw==}
+  '@esbuild/win32-arm64@0.25.2':
+    resolution: {integrity: sha512-7Loyjh+D/Nx/sOTzV8vfbB3GJuHdOQyrOryFdZvPHLf42Tk9ivBU5Aedi7iyX+x6rbn2Mh68T4qq1SDqJBQO5Q==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [win32]
 
-  '@esbuild/win32-ia32@0.25.0':
-    resolution: {integrity: sha512-eSNxISBu8XweVEWG31/JzjkIGbGIJN/TrRoiSVZwZ6pkC6VX4Im/WV2cz559/TXLcYbcrDN8JtKgd9DJVIo8GA==}
+  '@esbuild/win32-ia32@0.25.2':
+    resolution: {integrity: sha512-WRJgsz9un0nqZJ4MfhabxaD9Ft8KioqU3JMinOTvobbX6MOSUigSBlogP8QB3uxpJDsFS6yN+3FDBdqE5lg9kg==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [win32]
 
-  '@esbuild/win32-x64@0.25.0':
-    resolution: {integrity: sha512-ZENoHJBxA20C2zFzh6AI4fT6RraMzjYw4xKWemRTRmRVtN9c5DcH9r/f2ihEkMjOW5eGgrwCslG/+Y/3bL+DHQ==}
+  '@esbuild/win32-x64@0.25.2':
+    resolution: {integrity: sha512-kM3HKb16VIXZyIeVrM1ygYmZBKybX8N4p754bw390wGO3Tf2j4L2/WYL+4suWujpgf6GBYs3jv7TyUivdd05JA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [win32]
@@ -263,8 +263,8 @@ packages:
   '@types/node@22.13.5':
     resolution: {integrity: sha512-+lTU0PxZXn0Dr1NBtC7Y8cR21AJr87dLLU953CWA6pMxxv/UDc7jYAY90upcrie1nRcD6XNG5HOYEDtgW5TxAg==}
 
-  esbuild@0.25.0:
-    resolution: {integrity: sha512-BXq5mqc8ltbaN34cDqWuYKyNhX8D/Z0J1xdtdQ8UcIIIyJyz+ZMKUt58tF3SrZ85jcfN/PZYhjR5uDQAYNVbuw==}
+  esbuild@0.25.2:
+    resolution: {integrity: sha512-16854zccKPnC+toMywC+uKNeYSv+/eXkevRAfwRD/G9Cleq66m8XFIrigkbvauLLlCfDL45Q2cWegSg53gGBnQ==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -290,8 +290,8 @@ packages:
     resolution: {integrity: sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==}
     engines: {node: '>=12.0.0'}
 
-  typescript@5.8.3:
-    resolution: {integrity: sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==}
+  typescript@5.7.3:
+    resolution: {integrity: sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==}
     engines: {node: '>=14.17'}
     hasBin: true
 
@@ -335,79 +335,79 @@ snapshots:
   '@biomejs/cli-win32-x64@1.9.4':
     optional: true
 
-  '@esbuild/aix-ppc64@0.25.0':
+  '@esbuild/aix-ppc64@0.25.2':
     optional: true
 
-  '@esbuild/android-arm64@0.25.0':
+  '@esbuild/android-arm64@0.25.2':
     optional: true
 
-  '@esbuild/android-arm@0.25.0':
+  '@esbuild/android-arm@0.25.2':
     optional: true
 
-  '@esbuild/android-x64@0.25.0':
+  '@esbuild/android-x64@0.25.2':
     optional: true
 
-  '@esbuild/darwin-arm64@0.25.0':
+  '@esbuild/darwin-arm64@0.25.2':
     optional: true
 
-  '@esbuild/darwin-x64@0.25.0':
+  '@esbuild/darwin-x64@0.25.2':
     optional: true
 
-  '@esbuild/freebsd-arm64@0.25.0':
+  '@esbuild/freebsd-arm64@0.25.2':
     optional: true
 
-  '@esbuild/freebsd-x64@0.25.0':
+  '@esbuild/freebsd-x64@0.25.2':
     optional: true
 
-  '@esbuild/linux-arm64@0.25.0':
+  '@esbuild/linux-arm64@0.25.2':
     optional: true
 
-  '@esbuild/linux-arm@0.25.0':
+  '@esbuild/linux-arm@0.25.2':
     optional: true
 
-  '@esbuild/linux-ia32@0.25.0':
+  '@esbuild/linux-ia32@0.25.2':
     optional: true
 
-  '@esbuild/linux-loong64@0.25.0':
+  '@esbuild/linux-loong64@0.25.2':
     optional: true
 
-  '@esbuild/linux-mips64el@0.25.0':
+  '@esbuild/linux-mips64el@0.25.2':
     optional: true
 
-  '@esbuild/linux-ppc64@0.25.0':
+  '@esbuild/linux-ppc64@0.25.2':
     optional: true
 
-  '@esbuild/linux-riscv64@0.25.0':
+  '@esbuild/linux-riscv64@0.25.2':
     optional: true
 
-  '@esbuild/linux-s390x@0.25.0':
+  '@esbuild/linux-s390x@0.25.2':
     optional: true
 
-  '@esbuild/linux-x64@0.25.0':
+  '@esbuild/linux-x64@0.25.2':
     optional: true
 
-  '@esbuild/netbsd-arm64@0.25.0':
+  '@esbuild/netbsd-arm64@0.25.2':
     optional: true
 
-  '@esbuild/netbsd-x64@0.25.0':
+  '@esbuild/netbsd-x64@0.25.2':
     optional: true
 
-  '@esbuild/openbsd-arm64@0.25.0':
+  '@esbuild/openbsd-arm64@0.25.2':
     optional: true
 
-  '@esbuild/openbsd-x64@0.25.0':
+  '@esbuild/openbsd-x64@0.25.2':
     optional: true
 
-  '@esbuild/sunos-x64@0.25.0':
+  '@esbuild/sunos-x64@0.25.2':
     optional: true
 
-  '@esbuild/win32-arm64@0.25.0':
+  '@esbuild/win32-arm64@0.25.2':
     optional: true
 
-  '@esbuild/win32-ia32@0.25.0':
+  '@esbuild/win32-ia32@0.25.2':
     optional: true
 
-  '@esbuild/win32-x64@0.25.0':
+  '@esbuild/win32-x64@0.25.2':
     optional: true
 
   '@protobufjs/aspromise@1.1.2': {}
@@ -437,33 +437,33 @@ snapshots:
     dependencies:
       undici-types: 6.20.0
 
-  esbuild@0.25.0:
+  esbuild@0.25.2:
     optionalDependencies:
-      '@esbuild/aix-ppc64': 0.25.0
-      '@esbuild/android-arm': 0.25.0
-      '@esbuild/android-arm64': 0.25.0
-      '@esbuild/android-x64': 0.25.0
-      '@esbuild/darwin-arm64': 0.25.0
-      '@esbuild/darwin-x64': 0.25.0
-      '@esbuild/freebsd-arm64': 0.25.0
-      '@esbuild/freebsd-x64': 0.25.0
-      '@esbuild/linux-arm': 0.25.0
-      '@esbuild/linux-arm64': 0.25.0
-      '@esbuild/linux-ia32': 0.25.0
-      '@esbuild/linux-loong64': 0.25.0
-      '@esbuild/linux-mips64el': 0.25.0
-      '@esbuild/linux-ppc64': 0.25.0
-      '@esbuild/linux-riscv64': 0.25.0
-      '@esbuild/linux-s390x': 0.25.0
-      '@esbuild/linux-x64': 0.25.0
-      '@esbuild/netbsd-arm64': 0.25.0
-      '@esbuild/netbsd-x64': 0.25.0
-      '@esbuild/openbsd-arm64': 0.25.0
-      '@esbuild/openbsd-x64': 0.25.0
-      '@esbuild/sunos-x64': 0.25.0
-      '@esbuild/win32-arm64': 0.25.0
-      '@esbuild/win32-ia32': 0.25.0
-      '@esbuild/win32-x64': 0.25.0
+      '@esbuild/aix-ppc64': 0.25.2
+      '@esbuild/android-arm': 0.25.2
+      '@esbuild/android-arm64': 0.25.2
+      '@esbuild/android-x64': 0.25.2
+      '@esbuild/darwin-arm64': 0.25.2
+      '@esbuild/darwin-x64': 0.25.2
+      '@esbuild/freebsd-arm64': 0.25.2
+      '@esbuild/freebsd-x64': 0.25.2
+      '@esbuild/linux-arm': 0.25.2
+      '@esbuild/linux-arm64': 0.25.2
+      '@esbuild/linux-ia32': 0.25.2
+      '@esbuild/linux-loong64': 0.25.2
+      '@esbuild/linux-mips64el': 0.25.2
+      '@esbuild/linux-ppc64': 0.25.2
+      '@esbuild/linux-riscv64': 0.25.2
+      '@esbuild/linux-s390x': 0.25.2
+      '@esbuild/linux-x64': 0.25.2
+      '@esbuild/netbsd-arm64': 0.25.2
+      '@esbuild/netbsd-x64': 0.25.2
+      '@esbuild/openbsd-arm64': 0.25.2
+      '@esbuild/openbsd-x64': 0.25.2
+      '@esbuild/sunos-x64': 0.25.2
+      '@esbuild/win32-arm64': 0.25.2
+      '@esbuild/win32-ia32': 0.25.2
+      '@esbuild/win32-x64': 0.25.2
 
   flatbuffers@1.12.0: {}
 
@@ -499,6 +499,6 @@ snapshots:
       '@types/node': 22.13.5
       long: 5.3.1
 
-  typescript@5.8.3: {}
+  typescript@5.7.3: {}
 
   undici-types@6.20.0: {}

scripts/convert/.python-version

@@ -1 +0,0 @@
-3.11

scripts/convert/requirements.txt

@@ -1,6 +1,5 @@
-git+https://github.com/neodyland/style-bert-vits2-ref
+style-bert-vits2
 onnxsim
 numpy<2
 zstandard
 onnxruntime
-cmake<4

scripts/docker/cpu.Dockerfile

@@ -2,16 +2,8 @@ FROM rust AS builder
 WORKDIR /work
 COPY . .
 RUN cargo build -r --bin sbv2_api
-FROM ubuntu AS upx
-WORKDIR /work
-RUN apt update && apt-get install -y upx binutils
-COPY --from=builder /work/target/release/sbv2_api /work/main
-COPY --from=builder /work/target/release/*.so /work
-RUN upx --best --lzma /work/main
-RUN find /work -maxdepth 1 -name "*.so" -exec strip --strip-unneeded {} +
-RUN find /work -maxdepth 1 -name "*.so" -exec upx --best --lzma {} +
 FROM gcr.io/distroless/cc-debian12
 WORKDIR /work
-COPY --from=upx /work/main /work/main
-COPY --from=upx /work/*.so /work
-CMD ["/work/main"]
+COPY --from=builder /work/target/release/sbv2_api /work/main
+COPY --from=builder /work/target/release/*.so /work
+CMD ["/work/main"]

scripts/docker/cuda.Dockerfile

@@ -2,16 +2,9 @@ FROM rust AS builder
 WORKDIR /work
 COPY . .
 RUN cargo build -r --bin sbv2_api -F cuda,cuda_tf32
-FROM ubuntu AS upx
-WORKDIR /work
-RUN apt update && apt-get install -y upx binutils
-COPY --from=builder /work/target/release/sbv2_api /work/main
-COPY --from=builder /work/target/release/*.so /work
-RUN upx --best --lzma /work/main
-RUN find /work -maxdepth 1 -name "*.so" -exec strip --strip-unneeded {} +
 FROM nvidia/cuda:12.3.2-cudnn9-runtime-ubuntu22.04
 WORKDIR /work
-COPY --from=upx /work/main /work/main
-COPY --from=upx /work/*.so /work
+COPY --from=builder /work/target/release/sbv2_api /work/main
+COPY --from=builder /work/target/release/*.so /work
 ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/work
-CMD ["/work/main"]
+CMD ["/work/main"]

scripts/docker/run_cpu.sh

@@ -1,3 +1,3 @@
 docker run -it --rm -p 3000:3000 --name sbv2 \
 -v ./models:/work/models --env-file .env \
-ghcr.io/neodyland/sbv2-api:cpu
+ghcr.io/tuna2134/sbv2-api:cpu

scripts/docker/run_cuda.sh

@@ -1,4 +1,4 @@
 docker run -it --rm -p 3000:3000 --name sbv2 \
 -v ./models:/work/models --env-file .env \
 --gpus all \
-ghcr.io/neodyland/sbv2-api:cuda
+ghcr.io/tuna2134/sbv2-api:cuda

test.py

@@ -1,19 +0,0 @@
-import requests
-
-
-data = (requests.get("http://localhost:8080/audio_query", params={
-    "text": "こんにちは、今日はいい天気ですね。",
-})).json()
-print(data)
-
-data = (requests.post("http://localhost:8080/synthesis", json={
-    "text": data["text"],
-    "ident": "tsukuyomi",
-    "speaker_id": 0,
-    "style_id": 0,
-    "sdp_ratio": 0.5,
-    "length_scale": 0.5,
-    "audio_query": data["audio_query"],
-})).content
-with open("test.wav", "wb") as f:
-    f.write(data)