release: 0.2.0

Author: YaoerWu

.github/workflows/CI.yml

@@ -7,9 +7,9 @@ name: CI
 
 on:
   push:
-    branches:
-      - main
-      - master
+    # branches:
+    #   - main
+    #   - master
     tags:
       - "*"
   pull_request:
@@ -191,6 +191,7 @@ jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
+    environment: pypi_api_token
     if: ${{ startsWith(github.ref, 'refs/tags/') || github.event_name ==
       'workflow_dispatch' }}
     needs: [ linux, musllinux, windows, macos, sdist ]
@@ -207,19 +208,20 @@ jobs:
         uses: actions/attest-build-provenance@v3
         with:
           subject-path: "wheels-*/*"
-      # - name: Install uv
-      #   if: ${{ startsWith(github.ref, 'refs/tags/') }}
-      #   uses: astral-sh/setup-uv@v7
-      # - name: Publish to PyPI
-      #   if: ${{ startsWith(github.ref, 'refs/tags/') }}
-      #   run: uv publish 'wheels-*/*'
-      - name: Create GitHub Release
-        uses: softprops/action-gh-release@v2
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          # 同样使用通配符，确保抓取所有子文件夹里的 whl 和 sdist
-          files: wheels-*/*
-          generate_release_notes: true
+      - name: Install uv
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        uses: astral-sh/setup-uv@v7
+      - name: Publish to PyPI
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        run: uv publish 'wheels-*/*'
+
+        # - name: Create GitHub Release
+        #   uses: softprops/action-gh-release@v2
+        #   if: startsWith(github.ref, 'refs/tags/')
+        #   with:
+        #     # 同样使用通配符，确保抓取所有子文件夹里的 whl 和 sdist
+        #     files: wheels-*/*
+        #     generate_release_notes: true
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # UV_PUBLISH_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
+          # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          UV_PUBLISH_TRUSTED_PUBLISHER: "true"

Cargo.lock

@@ -1,17 +1,22 @@
-[package]
-name = "image-autowsgrs"
-version = "0.1.0"
-edition = "2024"
 [workspace]
-members = ["vessel-type", "python-bindings"]
+members = ["vessel_type", "python_bindings"]
+[workspace.package]
+version = "0.0.0"
+edition = "2024"
+
+[package]
+name = "autowsgr_native"
+version.workspace = true
+edition.workspace = true
+
 
 [build-dependencies]
-vessel-type = { path = "./vessel-type" }
+vessel_type = { path = "./vessel_type" }
 strum = "0.28"
 image = "0.25"
 
 [dependencies]
-vessel-type = { path = "./vessel-type" }
+vessel_type = { path = "./vessel_type" }
 
 [dev-dependencies]
 image = "0.25"

Cargo.toml

@@ -3,13 +3,13 @@ requires = ["maturin>=1.0,<2.0"]
 build-backend = "maturin"
 
 [project]
-name = "image-autowsgrs"
-version = "0.2.0"
+name = "autowsgr_native"
+dynamic = ["version"]
 description = "Image recognition library for AutoWSGR"
-requires-python = ">=3.8"
+requires-python = ">=3.12"
 dependencies = ["numpy>=1.24.4", "opencv-python>=4.13.0.92"]
 
 [tool.maturin]
 features = ["pyo3/extension-module"]
 # Default cargo manifest used by maturin when run from the repository root
-manifest-path = "python-bindings/Cargo.toml"
+manifest-path = "python_bindings/Cargo.toml"

pyproject.toml

@@ -0,0 +1,14 @@
+[package]
+name = "autowsgr_native_py"
+version.workspace = true
+edition.workspace = true
+
+[lib]
+name = "autowsgr_native"
+crate-type = ["cdylib"]
+
+[dependencies]
+pyo3 = { version = "0.28", features = ["extension-module", "abi3-py312"] }
+numpy = "0.28"
+autowsgr_native = { path = ".." }
+vessel_type = { path = "../vessel_type", features = ["pyo3"] }

python-bindings/Cargo.toml

@@ -4,9 +4,9 @@ use pyo3::prelude::*;
 use std::borrow::Cow;
 
 #[pyo3::pymodule]
-mod image_autowsgrs {
+mod autowsgr_native {
     use super::*;
-    use ::image_autowsgrs::{
+    use ::autowsgr_native::{
         WrappedPixels, image::BGRImage, recognize_enemy::character_image::CharacterImage,
     };
 
@@ -38,7 +38,7 @@ mod image_autowsgrs {
             pixels: &pixels,
         };
         let bgr = BGRImage::from_wrapped_pixels(wrapped);
-        Ok(::image_autowsgrs::locator::locate(&bgr))
+        Ok(::autowsgr_native::locator::locate(&bgr))
     }
 
     #[pyfunction]
@@ -47,8 +47,8 @@ mod image_autowsgrs {
         for img in &images {
             let shape = img.shape();
             let (height, width) = (shape[0], shape[1]);
-            if height != ::image_autowsgrs::recognize_enemy::HEIGHT
-                || width != ::image_autowsgrs::recognize_enemy::WIDTH
+            if height != ::autowsgr_native::recognize_enemy::HEIGHT
+                || width != ::autowsgr_native::recognize_enemy::WIDTH
             {
                 return Err(PyValueError::new_err(format!(
                     "expected grayscale image with shape (H, W), got shape {:?}",
@@ -68,7 +68,7 @@ mod image_autowsgrs {
             };
             char_images.push(CharacterImage::from_wrapped_pixels(wrapped));
         }
-        let result = ::image_autowsgrs::recognize_enemy::recognize_enemy(&char_images);
+        let result = ::autowsgr_native::recognize_enemy::recognize_enemy(&char_images);
         Ok(result
             .iter()
             .map(|vessel_type| vessel_type.as_english())
@@ -98,7 +98,7 @@ mod image_autowsgrs {
             pixels: &pixels,
         };
         let bgr = BGRImage::from_wrapped_pixels(wrapped);
-        let result = ::image_autowsgrs::recognize_map::recognize_map(&bgr);
+        let result = ::autowsgr_native::recognize_map::recognize_map(&bgr);
         Ok(result.to_string())
     }
 }

python_bindings/Cargo.toml

@@ -7,7 +7,7 @@ use vessel_type::VesselType;
 
 pub const WIDTH: usize = 32;
 pub const HEIGHT: usize = 16;
-const ENDWITH_巡: &[&str; 6] = &["CA", "CL", "CAV", "CLT", "CBG", "BC"];
+const ENDWITH_巡: &[&str; 6] = &["CA", "CL", "CAV", "CLT", "BG", "BC"];
 const ENDWITH_母: &[&str; 3] = &["CV", "AV", "CVL"];
 const STARTWITH_战: &[&str; 2] = &["BB", "BC"];
 const STARTWITH_轻: &[&str; 2] = &["CL", "CVL"];

python-bindings/src/lib.rs python_bindings/src/lib.rspython-bindings/src/lib.rs renamed to python_bindings/src/lib.rs

@@ -1,7 +1,7 @@
 [package]
-name = "vessel-type"
-version = "0.1.0"
-edition = "2024"
+name = "vessel_type"
+version.workspace = true
+edition.workspace = true
 
 [dependencies]
 strum = { version = "0.28", features = ["derive"] }