fix

Cargo.lock

@@ -261,12 +261,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
-[[package]]
-name = "cfg_aliases"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
-
 [[package]]
 name = "colorchoice"
 version = "1.0.3"
@@ -703,7 +697,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
- "futures-sink",
 ]
 
 [[package]]
@@ -712,12 +705,6 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
-[[package]]
-name = "futures-io"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
-
 [[package]]
 name = "futures-sink"
 version = "0.3.31"
@@ -737,13 +724,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-core",
- "futures-io",
- "futures-sink",
  "futures-task",
- "memchr",
  "pin-project-lite",
  "pin-utils",
- "slab",
 ]
 
 [[package]]
@@ -934,7 +917,6 @@ dependencies = [
  "tokio",
  "tokio-rustls",
  "tower-service",
- "webpki-roots",
 ]
 
 [[package]]
@@ -1996,58 +1978,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "quinn"
-version = "0.11.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
-dependencies = [
- "bytes",
- "pin-project-lite",
- "quinn-proto",
- "quinn-udp",
- "rustc-hash",
- "rustls",
- "socket2",
- "thiserror 2.0.11",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "quinn-proto"
-version = "0.11.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
-dependencies = [
- "bytes",
- "getrandom 0.2.15",
- "rand",
- "ring",
- "rustc-hash",
- "rustls",
- "rustls-pki-types",
- "slab",
- "thiserror 2.0.11",
- "tinyvec",
- "tracing",
- "web-time",
-]
-
-[[package]]
-name = "quinn-udp"
-version = "0.5.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e46f3055866785f6b92bc6164b76be02ca8f2eb4b002c0354b28cf4c119e5944"
-dependencies = [
- "cfg_aliases",
- "libc",
- "once_cell",
- "socket2",
- "tracing",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "quote"
 version = "1.0.38"
@@ -2171,7 +2101,6 @@ dependencies = [
  "base64 0.22.1",
  "bytes",
  "encoding_rs",
- "futures-channel",
  "futures-core",
  "futures-util",
  "h2",
@@ -2190,10 +2119,7 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "quinn",
- "rustls",
  "rustls-pemfile",
- "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
@@ -2201,14 +2127,12 @@ dependencies = [
  "system-configuration",
  "tokio",
  "tokio-native-tls",
- "tokio-rustls",
  "tower",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "webpki-roots",
  "windows-registry",
 ]
 
@@ -2232,12 +2156,6 @@ version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
-[[package]]
-name = "rustc-hash"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
-
 [[package]]
 name = "rustix"
 version = "0.38.44"
@@ -2257,6 +2175,7 @@ version = "0.23.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395"
 dependencies = [
+ "log",
  "once_cell",
  "ring",
  "rustls-pki-types",
@@ -2279,9 +2198,6 @@ name = "rustls-pki-types"
 version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
-dependencies = [
- "web-time",
-]
 
 [[package]]
 name = "rustls-webpki"
@@ -2348,12 +2264,12 @@ dependencies = [
  "once_cell",
  "ort",
  "regex",
- "reqwest",
  "serde",
  "serde_json",
  "tar",
  "thiserror 2.0.11",
  "tokenizers",
+ "ureq",
  "zstd",
 ]
 
@@ -2977,15 +2893,18 @@ checksum = "ca2e2dbdf4e95780e5d41804fab88b928a24585721018409eb429b1d29356bde"
 dependencies = [
  "base64 0.22.1",
  "der",
+ "flate2",
  "log",
  "native-tls",
  "percent-encoding",
+ "rustls",
  "rustls-pemfile",
  "rustls-pki-types",
  "socks",
  "ureq-proto",
  "utf-8",
  "webpki-root-certs",
+ "webpki-roots",
 ]
 
 [[package]]

README.md

@@ -3,6 +3,9 @@
 ## 注意：本バージョンはアルファ版です。
 安定版を利用したい場合は[こちら](https://github.com/tuna2134/sbv2-api/tree/v0.1.x)をご覧ください。
 
+## 注意: オプションの辞書はLGPLです。
+オプションの辞書を使用する場合、バイナリの内部の辞書部分について、LGPLが適用されます。
+
 ## プログラミングに詳しくない方向け
 
 [こちら](https://github.com/tuna2134/sbv2-gui?tab=readme-ov-file)を参照してください。
@@ -29,16 +32,17 @@ JP-Extra しか対応していません。(基本的に対応する予定もあ
 - [x] GPU 対応(CUDA)
 - [x] GPU 対応(DirectML)
 - [x] GPU 対応(CoreML)
-- [ ] WASM 変換(依存ライブラリの関係により現在は不可)
+- [x] WASM 変換
 - [x] arm64のdockerサポート
+- [x] aivis形式のサポート
 - [ ] MeCabを利用する
 
 ## 構造説明
 
-- `sbv2_api` - 推論用 REST API
+- `crates/sbv2_api` - 推論用 REST API
-- `sbv2_core` - 推論コア部分
+- `crates/sbv2_core` - 推論コア部分
-- `docker` - docker ビルドスクリプト
+- `scripts/docker` - docker ビルドスクリプト
-- `convert` - onnx, sbv2フォーマットへの変換スクリプト
+- `scripts/convert` - onnx, sbv2フォーマットへの変換スクリプト
 
 ## プログラミングある程度できる人向けREST API起動方法
 

crates/sbv2_core/Cargo.toml

@@ -41,4 +41,4 @@ aivmx = ["npyz", "base64"]
 base64 = ["dep:base64"]
 
 [build-dependencies]
-reqwest = { version = "0.12.12", features = ["blocking", "rustls-tls-webpki-roots"], default-features = false }
+ureq = "3.0.6"

crates/sbv2_core/build.rs

@@ -8,9 +8,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let out_path = Path::new(&out_dir).join("all.bin");
     if !out_path.exists() {
         println!("cargo:warning=Downloading dictionary file...");
-        let mut response = reqwest::blocking::get(
+        let mut response =
-            "https://huggingface.co/neody/sbv2-api-assets/resolve/main/dic/all.bin",
+            ureq::get("https://huggingface.co/neody/sbv2-api-assets/resolve/main/dic/all.bin")
-        )?;
+                .call()?;
+        let mut response = response.body_mut().as_reader();
         let mut file = fs::File::create(&out_path)?;
         copy(&mut response, &mut file)?;
     }