Merge branch 'main' into change-liberate-voicevox-core

.github/workflows/build_and_deploy.yml

@@ -212,7 +212,9 @@ jobs:
       - name: set cargo version
         run: |
           cargo set-version "$VERSION" --exclude voicevox_core_python_api --exclude downloader --exclude xtask
-          if ${{ matrix.python_whl }}; then cargo set-version "$VERSION" -p voicevox_core_python_api; fi
+          if ${{ matrix.python_whl }}; then
+            sed -i_ 's/version = "\(0\.0\.0\)"/version = "'"$VERSION"'"/' ./crates/voicevox_core_python_api/pyproject.toml
+          fi
       - name: cache target
         uses: Swatinem/rust-cache@v2
       - name: build voicevox_core_c_api

.github/workflows/python_lint.yml

@@ -31,7 +31,7 @@ jobs:
           poetry config virtualenvs.create false
       - name: Validate poetry.lock
         run: |
-          poetry lock --no-update
+          poetry lock
           git diff --exit-code
       - name: Install dependencies
         run: poetry install --with test

Cargo.toml

@@ -94,12 +94,13 @@ typetag = "0.2.18"
 url = "2.5.4"
 uuid = "1.10.0"
 voicevox_core = { path = "crates/voicevox_core" }
+voicevox_core_macros = { path = "crates/voicevox_core_macros" }
 windows = "0.43.0"
 zip = "0.6.3"
 
 [workspace.dependencies.voicevox-ort]
 git = "https://github.com/VOICEVOX/ort.git"
-rev = "09a9fe1619c1561efafc02f68f0bda4aad879771"
+rev = "cecd844162a1c6188de03b4566c81d9d38a28600"
 
 [workspace.dependencies.open_jtalk]
 git = "https://github.com/VOICEVOX/open_jtalk-rs.git"

crates/voicevox_core/Cargo.toml

@@ -53,7 +53,7 @@ thiserror.workspace = true
 tracing.workspace = true
 uuid = { workspace = true, features = ["v4", "serde"] }
 voicevox-ort = { workspace = true, features = ["download-binaries", "__init-for-voicevox"] }
-voicevox_core_macros = { path = "../voicevox_core_macros" }
+voicevox_core_macros.workspace = true
 
 [dev-dependencies]
 heck.workspace = true

crates/voicevox_core_macros/Cargo.toml

@@ -12,10 +12,13 @@ proc-macro = true
 
 [dependencies]
 derive-syn-parse.workspace = true
+fs-err.workspace = true
 indexmap.workspace = true
 proc-macro2.workspace = true
 quote.workspace = true
+serde = { workspace = true, features = ["derive"] }
 syn = { workspace = true, features = ["extra-traits", "full", "visit-mut"] }
+toml.workspace = true
 
 [lints.rust]
 unsafe_code = "forbid"

crates/voicevox_core_macros/src/lib.rs

@@ -3,6 +3,7 @@
 mod extract;
 mod inference_domain;
 mod inference_domains;
+mod python_api;
 
 use syn::parse_macro_input;
 
@@ -123,6 +124,12 @@ pub fn substitute_type(input: proc_macro::TokenStream) -> proc_macro::TokenStrea
     from_syn(inference_domains::substitute_type(input))
 }
 
+#[proc_macro]
+pub fn pyproject_project_version(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    let input = parse_macro_input!(input);
+    from_syn(python_api::pyproject_project_version(input))
+}
+
 fn from_syn(result: syn::Result<proc_macro2::TokenStream>) -> proc_macro::TokenStream {
     result.unwrap_or_else(|e| e.to_compile_error()).into()
 }

crates/voicevox_core_macros/src/python_api.rs

@@ -0,0 +1,37 @@
+use std::env;
+
+use derive_syn_parse::Parse;
+use quote::ToTokens as _;
+use serde::Deserialize;
+use syn::LitStr;
+
+pub(crate) fn pyproject_project_version(_: Input) -> syn::Result<proc_macro2::TokenStream> {
+    let span = proc_macro2::Span::call_site();
+    let error = |e| syn::Error::new(span, e);
+
+    let path = &env::var("CARGO_MANIFEST_DIR")
+        .map_err(|e| error(format!("could not get `$CARGO_MANIFEST_DIR`: {e}")))?;
+    let path = std::path::Path::new(path).join("pyproject.toml");
+
+    let PyprojectToml {
+        project: Project { version },
+    } = &fs_err::read_to_string(path)
+        .map_err(|e| e.to_string())
+        .and_then(|s| toml::from_str(&s).map_err(|e| e.to_string()))
+        .map_err(error)?;
+
+    return Ok(LitStr::new(version, span).to_token_stream());
+
+    #[derive(Deserialize)]
+    struct PyprojectToml {
+        project: Project,
+    }
+
+    #[derive(Deserialize)]
+    struct Project {
+        version: String,
+    }
+}
+
+#[derive(Parse)]
+pub(crate) struct Input {}

crates/voicevox_core_python_api/Cargo.toml

@@ -1,6 +1,5 @@
 [package]
 name = "voicevox_core_python_api"
-version = "0.0.0"
 edition.workspace = true
 publish.workspace = true
 rust-version.workspace = true
@@ -24,6 +23,7 @@ tokio = { workspace = true, features = ["rt", "sync"] }
 tracing = { workspace = true, features = ["log"] }
 uuid.workspace = true
 voicevox_core = { workspace = true, features = ["load-onnxruntime"] }
+voicevox_core_macros.workspace = true
 
 [lints.rust]
 unsafe_code = "forbid"