nnnotes 0.1.2__tar.gz → 0.1.3__tar.gz

{nnnotes-0.1.2 → nnnotes-0.1.3}/PKG-INFO

@@ -1,36 +1,39 @@
 Metadata-Version: 2.4
 Name: nnnotes
-Version: 0.1.2
-Summary: Offline data toolkit for BanG Dream! Our Notes game files: catalogs, bundles, master data, stories, Live2D, audio and live charts
-Author: MetaMiku, emptysekai
-License-Expression: MIT
-Project-URL: Homepage, https://github.com/MetaSekaiLab/nnnotes
-Project-URL: Source, https://github.com/MetaSekaiLab/nnnotes
-Project-URL: Issues, https://github.com/MetaSekaiLab/nnnotes/issues
+Version: 0.1.3
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Multimedia
-Requires-Python: >=3.11
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: UnityPy>=1.25
+Requires-Dist: unitypy>=1.25
 Requires-Dist: numpy>=2.0
-Requires-Dist: Pillow>=10.0
+Requires-Dist: pillow>=10.0
 Requires-Dist: pycryptodome>=3.20
 Requires-Dist: grpcio>=1.49.1
 Requires-Dist: brotli>=1.1
-Provides-Extra: test
-Requires-Dist: pytest>=8; extra == "test"
-Requires-Dist: pyflakes>=3.2; extra == "test"
-Requires-Dist: jsonschema>=4.18; extra == "test"
+Requires-Dist: fonttools>=4.50 ; extra == 'fonts'
+Requires-Dist: freetype-py>=2.5 ; extra == 'fonts'
+Requires-Dist: scipy>=1.13 ; extra == 'fonts'
+Requires-Dist: pytest>=8 ; extra == 'test'
+Requires-Dist: pyflakes>=3.2 ; extra == 'test'
+Requires-Dist: jsonschema>=4.18 ; extra == 'test'
 Provides-Extra: fonts
-Requires-Dist: fonttools>=4.50; extra == "fonts"
-Requires-Dist: freetype-py>=2.5; extra == "fonts"
-Requires-Dist: scipy>=1.13; extra == "fonts"
-Dynamic: license-file
+Provides-Extra: test
+License-File: LICENSE
+Summary: Offline data toolkit for BanG Dream! Our Notes game files: catalogs, bundles, master data, stories, Live2D, audio and live charts
+Author: MetaMiku, emptysekai
+License-Expression: MIT
+Requires-Python: >=3.11
+Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
+Project-URL: Homepage, https://github.com/MetaSekaiLab/nnnotes
+Project-URL: Issues, https://github.com/MetaSekaiLab/nnnotes/issues
+Project-URL: Source, https://github.com/MetaSekaiLab/nnnotes
 
 # nnnotes？！
 
+Japanese-release support includes anonymous version discovery, authenticated CDN downloads, gzip catalogs,
+snapshot-isolated caches and split APKs. See the [JP guide](https://github.com/MetaSekaiLab/nnnotes/blob/main/docs/jp.md)
+for configuration and validation limits.
+
 [简体中文](https://github.com/MetaSekaiLab/nnnotes/blob/main/README.md) | [English](https://github.com/MetaSekaiLab/nnnotes/blob/main/README.en.md)
 
 nnnotes is an offline data toolkit for the game files of BanG Dream! Our Notes: it reads Addressables catalogs,
@@ -78,9 +81,10 @@ nnnotes config check             # each setting's origin and whether it is valid
 | `audio` | CRI cue sheet | one audio file per cue (FLAC / Ogg / WAV) + cue metadata |
 | `crikey` | APK | the CRI HCA keycode from the game's boot data (shows whether it was found; can write a `.hcakey`) |
 | `player` | APK | render-related global settings (color space, quality levels, renderers) as JSON |
+| `ui` (experimental) | APK set and its embedded catalog | an offline serialized prefab library with dependency roots, AnimatorControllers, stable references and PNG/font resources for the optional ournotes-player UI preview ([format and limits](https://github.com/MetaSekaiLab/nnnotes/blob/main/docs/ui.md)) |
 | `live` | music ID + difficulty | a full chart directory: chart and runtime notes, 3D scene, note and effect assets, BGM and sounds, sound routing |
 | `web` | `--pair music:difficulty` (repeatable) or `--all`; `--live2d model` (repeatable) or `--all-live2d`; `--story episode` (repeatable) or `--all-stories`; `--region region` (repeatable) or `--all-regions` | an ournotes-player static site: shared player + per-chart / per-model / per-episode manifests + content-addressed assets; the Live2D models of the stories are built first as models, listed in `models.json`, and the story manifests reference them; one site can serve several regions, with listing texts in five languages; a story's interface texts are grouped by language, with TextMeshPro font assets generated from open fonts (the game's fonts with `--fonts game`); compressible assets (JSON, shaders, moc3, ...) are stored gzip encoded by default (`--compress br` / `none`) |
-| `deck-data` | master data files (`--master-files` directory or `--apk-master`) | one JSON file for deck-building tools: every chart's runtime notes, skill events and fever ranges, and the master data tables about cards, skills, bonuses, scores and events ([format](https://github.com/MetaSekaiLab/nnnotes/blob/main/docs/deck-data.md)) |
+| `music-data` | master data files (`--master-files` directory or `--apk-master`), or decoded master data with its manifest (`--decoded-master`) | one JSON file with every song and chart: titles and credits in five languages, bands, vocal characters, category, tags, release time, score ranks, BGM length; the Gekisou catalog (member cards, snaps and their Gekisou skills and support skills); per difficulty the level, note counts, BPM, chart times, skill events and fever ranges; and the chart statistics the deck model ournotes-deck (built into nnnotes) measures on its whole-live simulation (the no-skill score, the weight of every score-up skill kind at every position), plus single-shape Gekisou aptitude (increments and standard errors, not an optimal deck; omit with `--no-gekisou-aptitude`). `--full` adds the deck model's input: every chart's runtime notes and the master data tables about cards, skills, bonuses, scores and events ([format](https://github.com/MetaSekaiLab/nnnotes/blob/main/docs/music-data.md)) |
 
 Export conventions:
 
@@ -220,3 +224,4 @@ See [docs/performance.md](https://github.com/MetaSekaiLab/nnnotes/blob/main/docs
 ## License
 
 MIT, see [LICENSE](https://github.com/MetaSekaiLab/nnnotes/blob/main/LICENSE).
+

nnnotes-0.1.2/src/nnnotes.egg-info/PKG-INFO → nnnotes-0.1.3/README.en.md

@@ -1,36 +1,9 @@
-Metadata-Version: 2.4
-Name: nnnotes
-Version: 0.1.2
-Summary: Offline data toolkit for BanG Dream! Our Notes game files: catalogs, bundles, master data, stories, Live2D, audio and live charts
-Author: MetaMiku, emptysekai
-License-Expression: MIT
-Project-URL: Homepage, https://github.com/MetaSekaiLab/nnnotes
-Project-URL: Source, https://github.com/MetaSekaiLab/nnnotes
-Project-URL: Issues, https://github.com/MetaSekaiLab/nnnotes/issues
-Classifier: Programming Language :: Python :: 3
-Classifier: Operating System :: OS Independent
-Classifier: Topic :: Multimedia
-Requires-Python: >=3.11
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: UnityPy>=1.25
-Requires-Dist: numpy>=2.0
-Requires-Dist: Pillow>=10.0
-Requires-Dist: pycryptodome>=3.20
-Requires-Dist: grpcio>=1.49.1
-Requires-Dist: brotli>=1.1
-Provides-Extra: test
-Requires-Dist: pytest>=8; extra == "test"
-Requires-Dist: pyflakes>=3.2; extra == "test"
-Requires-Dist: jsonschema>=4.18; extra == "test"
-Provides-Extra: fonts
-Requires-Dist: fonttools>=4.50; extra == "fonts"
-Requires-Dist: freetype-py>=2.5; extra == "fonts"
-Requires-Dist: scipy>=1.13; extra == "fonts"
-Dynamic: license-file
-
 # nnnotes？！
 
+Japanese-release support includes anonymous version discovery, authenticated CDN downloads, gzip catalogs,
+snapshot-isolated caches and split APKs. See the [JP guide](https://github.com/MetaSekaiLab/nnnotes/blob/main/docs/jp.md)
+for configuration and validation limits.
+
 [简体中文](https://github.com/MetaSekaiLab/nnnotes/blob/main/README.md) | [English](https://github.com/MetaSekaiLab/nnnotes/blob/main/README.en.md)
 
 nnnotes is an offline data toolkit for the game files of BanG Dream! Our Notes: it reads Addressables catalogs,
@@ -78,9 +51,10 @@ nnnotes config check             # each setting's origin and whether it is valid
 | `audio` | CRI cue sheet | one audio file per cue (FLAC / Ogg / WAV) + cue metadata |
 | `crikey` | APK | the CRI HCA keycode from the game's boot data (shows whether it was found; can write a `.hcakey`) |
 | `player` | APK | render-related global settings (color space, quality levels, renderers) as JSON |
+| `ui` (experimental) | APK set and its embedded catalog | an offline serialized prefab library with dependency roots, AnimatorControllers, stable references and PNG/font resources for the optional ournotes-player UI preview ([format and limits](https://github.com/MetaSekaiLab/nnnotes/blob/main/docs/ui.md)) |
 | `live` | music ID + difficulty | a full chart directory: chart and runtime notes, 3D scene, note and effect assets, BGM and sounds, sound routing |
 | `web` | `--pair music:difficulty` (repeatable) or `--all`; `--live2d model` (repeatable) or `--all-live2d`; `--story episode` (repeatable) or `--all-stories`; `--region region` (repeatable) or `--all-regions` | an ournotes-player static site: shared player + per-chart / per-model / per-episode manifests + content-addressed assets; the Live2D models of the stories are built first as models, listed in `models.json`, and the story manifests reference them; one site can serve several regions, with listing texts in five languages; a story's interface texts are grouped by language, with TextMeshPro font assets generated from open fonts (the game's fonts with `--fonts game`); compressible assets (JSON, shaders, moc3, ...) are stored gzip encoded by default (`--compress br` / `none`) |
-| `deck-data` | master data files (`--master-files` directory or `--apk-master`) | one JSON file for deck-building tools: every chart's runtime notes, skill events and fever ranges, and the master data tables about cards, skills, bonuses, scores and events ([format](https://github.com/MetaSekaiLab/nnnotes/blob/main/docs/deck-data.md)) |
+| `music-data` | master data files (`--master-files` directory or `--apk-master`), or decoded master data with its manifest (`--decoded-master`) | one JSON file with every song and chart: titles and credits in five languages, bands, vocal characters, category, tags, release time, score ranks, BGM length; the Gekisou catalog (member cards, snaps and their Gekisou skills and support skills); per difficulty the level, note counts, BPM, chart times, skill events and fever ranges; and the chart statistics the deck model ournotes-deck (built into nnnotes) measures on its whole-live simulation (the no-skill score, the weight of every score-up skill kind at every position), plus single-shape Gekisou aptitude (increments and standard errors, not an optimal deck; omit with `--no-gekisou-aptitude`). `--full` adds the deck model's input: every chart's runtime notes and the master data tables about cards, skills, bonuses, scores and events ([format](https://github.com/MetaSekaiLab/nnnotes/blob/main/docs/music-data.md)) |
 
 Export conventions:
 

{nnnotes-0.1.2 → nnnotes-0.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [build-system]
-requires = ["setuptools>=77"]
-build-backend = "setuptools.build_meta"
+requires = ["maturin>=1.9,<2"]
+build-backend = "maturin"
 
 [project]
 name = "nnnotes"
@@ -37,14 +37,14 @@ Homepage = "https://github.com/MetaSekaiLab/nnnotes"
 Source = "https://github.com/MetaSekaiLab/nnnotes"
 Issues = "https://github.com/MetaSekaiLab/nnnotes/issues"
 
-[tool.setuptools.dynamic]
-version = { attr = "nnnotes.__version__" }
-
-[tool.setuptools.packages.find]
-where = ["src"]
-
-[tool.setuptools.package-data]
-nnnotes = ["typetrees/*.json", "viewrules.json", "nnnotes.example.toml"]
+[tool.maturin]
+# the pure Python package src/nnnotes with the extension module nnnotes._deck (rust/: ournotes-deck, pinned by
+# commit); the version is rust/Cargo.toml's, kept equal to nnnotes.__version__ (tests/test_musicdata.py)
+python-source = "src"
+module-name = "nnnotes._deck"
+manifest-path = "rust/Cargo.toml"
+profile = "release"
+locked = true
 
 [tool.pytest.ini_options]
 testpaths = ["tests"]

nnnotes-0.1.3/rust/Cargo.lock

@@ -0,0 +1,215 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "itoa"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
+
+[[package]]
+name = "libc"
+version = "0.2.189"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
+
+[[package]]
+name = "memchr"
+version = "2.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
+
+[[package]]
+name = "nnnotes-deck"
+version = "0.1.3"
+dependencies = [
+ "ournotes-deck",
+ "pyo3",
+ "serde_json",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
+
+[[package]]
+name = "ournotes-deck"
+version = "0.0.1"
+source = "git+https://github.com/empty-sekai/ournotes-deck?rev=dbd9cf01a4854808dceb6aedcd4041af372faeee#dbd9cf01a4854808dceb6aedcd4041af372faeee"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "portable-atomic"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05c8b63e8d9609db387f0324918f81d68fe27748f084ef092fb35954d0539a85"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.107"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "pyo3"
+version = "0.29.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4688ddedf473e32662b9b067670129a8afb8c18e351482c70d62ba4a88171e8b"
+dependencies = [
+ "libc",
+ "once_cell",
+ "portable-atomic",
+ "pyo3-build-config",
+ "pyo3-ffi",
+ "pyo3-macros",
+]
+
+[[package]]
+name = "pyo3-build-config"
+version = "0.29.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f41027e41b4bd03f6e60f9f417fe24a6341a6bb744edd62b6f709f2a52ea30e9"
+dependencies = [
+ "target-lexicon",
+]
+
+[[package]]
+name = "pyo3-ffi"
+version = "0.29.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e591a95526fead067432c3b3a33fc74770b87b1e04e73671090d9c2055a2b327"
+dependencies = [
+ "libc",
+ "pyo3-build-config",
+]
+
+[[package]]
+name = "pyo3-macros"
+version = "0.29.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73225868fc1cd84eef2c3c230ddb91273bf1de46aeb8a4248da76d32a0924a1c"
+dependencies = [
+ "proc-macro2",
+ "pyo3-macros-backend",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "pyo3-macros-backend"
+version = "0.29.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "571575aa3749fa6216757dd47d2a3e7ef360f329a40f0666a9fbd14889024952"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.229"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.229"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.229"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.6",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.151"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c841b55ecdae098c80dcae9cf767f6f8a0c2cdb3416bbef72181df4d0fe73f14"
+dependencies = [
+ "itoa",
+ "memchr",
+ "serde",
+ "serde_core",
+ "zmij",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.119"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "3.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8593e8e72159ed2257d083c7a454a85cbf854f37a0966d8d483aff8c8a3ebcee"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "target-lexicon"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d245f478577f809a851594d02313b640fb437e0bb33866753cff937863096954"
+
+[[package]]
+name = "zmij"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"

nnnotes-0.1.3/rust/Cargo.toml

@@ -0,0 +1,23 @@
+[package]
+name = "nnnotes-deck"
+# the nnnotes version (src/nnnotes/__init__.py); the wheel takes its version from here
+version = "0.1.3"
+edition = "2024"
+rust-version = "1.85"
+description = "nnnotes._deck: the ournotes-deck chart statistics as a Python extension module"
+license = "MIT"
+publish = false
+
+[lib]
+name = "_deck"
+crate-type = ["cdylib"]
+
+[dependencies]
+pyo3 = { version = "0.29", features = ["abi3-py311"] }
+# pinned by commit; .github/workflows/deck.yml opens a pull request when ournotes-deck moves
+ournotes-deck = { git = "https://github.com/empty-sekai/ournotes-deck", rev = "dbd9cf01a4854808dceb6aedcd4041af372faeee" }
+serde_json = { version = "1", features = ["raw_value", "arbitrary_precision"] }
+
+[profile.release]
+lto = "thin"
+codegen-units = 1

nnnotes-0.1.3/rust/build.rs

@@ -0,0 +1,33 @@
+//! Records the ournotes-deck package the module is built with (version and git commit, from Cargo.lock) as the
+//! environment variables DECK_VERSION, DECK_SOURCE and DECK_COMMIT of the crate.
+
+use std::path::Path;
+
+fn main() {
+    let dir = std::env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR");
+    let lock = Path::new(&dir).join("Cargo.lock");
+    println!("cargo:rerun-if-changed={}", lock.display());
+    let text = std::fs::read_to_string(&lock).expect("rust/Cargo.lock (the deck commit is read from it)");
+    let (mut version, mut source) = (None, None);
+    for block in text.split("[[package]]") {
+        let field = |k: &str| {
+            block.lines().find_map(|l| {
+                let v = l.trim().strip_prefix(k)?.trim_start().strip_prefix('=')?.trim();
+                Some(v.trim_matches('"').to_string())
+            })
+        };
+        if field("name").as_deref() == Some("ournotes-deck") {
+            version = field("version");
+            source = field("source");
+        }
+    }
+    let version = version.expect("Cargo.lock has no ournotes-deck package");
+    let source = source.expect("ournotes-deck has no source in Cargo.lock");
+    // git+https://github.com/empty-sekai/ournotes-deck?rev=<rev>#<commit>
+    let (url, commit) = source.split_once('#').expect("ournotes-deck is not a git dependency");
+    let url = url.strip_prefix("git+").unwrap_or(url);
+    let url = url.split_once('?').map_or(url, |(u, _)| u);
+    println!("cargo:rustc-env=DECK_VERSION={version}");
+    println!("cargo:rustc-env=DECK_SOURCE={url}");
+    println!("cargo:rustc-env=DECK_COMMIT={commit}");
+}

nnnotes-0.1.3/rust/rustfmt.toml

@@ -0,0 +1,2 @@
+max_width = 120
+use_small_heuristics = "Max"

nnnotes-0.1.3/rust/src/lib.rs

@@ -0,0 +1,116 @@
+//! `nnnotes._deck`: the chart statistics of ournotes-deck (`ournotes-deck.chart-stats/2`) on a deck data document
+//! held in memory, the charts measured in parallel.
+
+use std::sync::Mutex;
+use std::sync::atomic::{AtomicUsize, Ordering};
+
+use ournotes_deck::chartstats::{self, AptitudeOptions, ChartStats, GEKISOU_SEEDS, Options};
+use ournotes_deck::data::DeckData;
+use ournotes_deck::error::Error;
+use pyo3::exceptions::PyValueError;
+use pyo3::prelude::*;
+use pyo3::types::PyDict;
+
+fn value_error(e: impl std::fmt::Display) -> PyErr {
+    PyValueError::new_err(e.to_string())
+}
+
+/// The statistics of every chart, in chart order, on `workers` threads.
+fn measure(data: &DeckData, options: &Options, workers: usize) -> Result<Vec<ChartStats>, Error> {
+    let kinds = chartstats::kinds(&data.master);
+    let n = data.charts.len();
+    let next = AtomicUsize::new(0);
+    let out: Mutex<Vec<Option<Result<ChartStats, Error>>>> = Mutex::new((0..n).map(|_| None).collect());
+    std::thread::scope(|s| {
+        for _ in 0..workers.clamp(1, n.max(1)) {
+            s.spawn(|| {
+                loop {
+                    let i = next.fetch_add(1, Ordering::Relaxed);
+                    if i >= n {
+                        break;
+                    }
+                    let c = &data.charts[i];
+                    // as chartstats::document names a chart's domain errors
+                    let r = chartstats::chart_stats_with(&data.master, c, &kinds, options).map_err(|e| match e {
+                        Error::Domain(m) => Error::Domain(format!("chart {}: {m}", c.score_id)),
+                        e => e,
+                    });
+                    let failed = r.is_err();
+                    out.lock().expect("results")[i] = Some(r);
+                    if failed {
+                        next.store(n, Ordering::Relaxed);
+                    }
+                }
+            });
+        }
+    });
+    // charts are taken in order and a taken chart always completes, so every chart before the first failure has
+    // its result: the error returned is the first in chart order, as the command's
+    let mut stats = Vec::with_capacity(n);
+    for r in out.into_inner().expect("results") {
+        stats.push(r.expect("a chart before the first failure has run")?);
+    }
+    Ok(stats)
+}
+
+/// chart_stats(data, seeds=None, workers=None, aptitude=True, aptitude_max_seeds=None,
+///             aptitude_cross_seeds=None) -> str
+///
+/// The `ournotes-deck.chart-stats/2` document (JSON text) of a deck data document (`nnnotes.deck-data/1` JSON text),
+/// as `ournotes-deck chart-stats` writes it. `seeds`: the size of the seed set of charts with a luck range (default
+/// 8); `workers`: threads measuring charts (default: the available parallelism). Raises ValueError for data the
+/// deck model cannot read or a chart whose check deck fails. `aptitude`: measure single Gekisou skill shapes
+/// (default true); `aptitude_max_seeds` and `aptitude_cross_seeds`: sample caps (defaults 65536 and 64).
+#[pyfunction]
+#[pyo3(signature = (data, seeds=None, workers=None, aptitude=true, aptitude_max_seeds=None, aptitude_cross_seeds=None))]
+fn chart_stats(
+    py: Python<'_>,
+    data: &str,
+    seeds: Option<usize>,
+    workers: Option<usize>,
+    aptitude: bool,
+    aptitude_max_seeds: Option<usize>,
+    aptitude_cross_seeds: Option<usize>,
+) -> PyResult<String> {
+    let seeds = seeds.unwrap_or(GEKISOU_SEEDS);
+    let defaults = AptitudeOptions::default();
+    let options = Options {
+        seeds,
+        aptitude: aptitude.then_some(AptitudeOptions {
+            max_seeds: aptitude_max_seeds.unwrap_or(defaults.max_seeds),
+            cross_seeds: aptitude_cross_seeds.unwrap_or(defaults.cross_seeds),
+        }),
+    };
+    let workers = workers.unwrap_or_else(|| std::thread::available_parallelism().map_or(1, |n| n.get()));
+    py.detach(|| {
+        let mut data = DeckData::from_json(data).map_err(value_error)?;
+        let charts = std::mem::take(&mut data.charts);
+        // the document of no chart: the format, source, model and kinds, exactly as the command writes them
+        let mut doc = chartstats::document_with(&data, &options).map_err(value_error)?;
+        data.charts = charts;
+        let stats = measure(&data, &options, workers).map_err(value_error)?;
+        doc["charts"] = serde_json::to_value(stats).map_err(value_error)?;
+        serde_json::to_string(&doc).map_err(value_error)
+    })
+}
+
+/// info() -> dict: the ournotes-deck package of this module (name, version, source, commit) and the formats it reads
+/// and writes.
+#[pyfunction]
+fn info(py: Python<'_>) -> PyResult<Bound<'_, PyDict>> {
+    let d = PyDict::new(py);
+    d.set_item("name", "ournotes-deck")?;
+    d.set_item("version", env!("DECK_VERSION"))?;
+    d.set_item("source", env!("DECK_SOURCE"))?;
+    d.set_item("commit", env!("DECK_COMMIT"))?;
+    d.set_item("dataFormat", ournotes_deck::data::FORMAT)?;
+    d.set_item("format", chartstats::FORMAT)?;
+    Ok(d)
+}
+
+#[pymodule]
+fn _deck(m: &Bound<'_, PyModule>) -> PyResult<()> {
+    m.add_function(wrap_pyfunction!(chart_stats, m)?)?;
+    m.add_function(wrap_pyfunction!(info, m)?)?;
+    Ok(())
+}

{nnnotes-0.1.2 → nnnotes-0.1.3}/src/nnnotes/__init__.py

@@ -4,4 +4,4 @@ Reads Addressables catalogs, fetches and decrypts asset bundles, decodes master
 models, spots, shaders, CRI audio and live charts as JSON and common file formats. Game files, keys and server
 addresses are supplied by the user through the configuration; nothing of the game is included.
 """
-__version__ = "0.1.2"
+__version__ = "0.1.3"