haruki-sekai-deck-recommend-cpp 0.3.6__tar.gz → 0.3.8__tar.gz

{haruki_sekai_deck_recommend_cpp-0.3.6 → haruki_sekai_deck_recommend_cpp-0.3.8}/AGENTS.md

@@ -1,9 +1,8 @@
 # AGENTS.md
 
-This file applies to the entire `sekai-deck-recommend-cpp` repository. The
-same engineering rules also live in `CLAUDE.md` and
-`.github/copilot-instructions.md` — keep all three in sync when changing
-guidance.
+This file applies to the entire `sekai-deck-recommend-cpp` repository and is
+the single source of truth for it. The same engineering rules also live in
+`.github/copilot-instructions.md` — keep both in sync when changing guidance.
 
 ## Project Overview
 
@@ -86,8 +85,10 @@ cmake --build . -j
 ```
 
 Outputs ES6 module glue (`sekai_deck_recommend.js`) + `sekai_deck_recommend.wasm`.
-Static files in `data/` are embedded into the wasm via `--embed-file`; runtime
-masterdata/music-metas are pushed in by the JS caller.
+The CMakeLists branches on `EMSCRIPTEN`: the pybind11 binding is dropped and the
+Embind binding is linked instead. Static files in `data/` are embedded into the
+wasm via `--embed-file`; runtime masterdata/music-metas are pushed in by the JS
+caller.
 
 The npm package scaffold lives in `npm/haruki-sekai-deck-recommend-cpp` and is
 reserved as `haruki-sekai-deck-recommend-cpp`. It should contain only the wasm
@@ -117,6 +118,9 @@ repository.
 
 ## Engineering Rules
 
+- C++20. Headers and implementations live next to each other in `src/<area>/`.
+- Masterdata, music metas, userdata parsing, and the wasm binding's JSON-in /
+  JSON-out payloads go through yyjson via `src/common/collection-utils.h`.
 - Prefer small, behavior-focused changes over broad refactors.
 - Preserve existing enum mapping and validation behavior unless a caller-visible
   migration is intentional.

haruki_sekai_deck_recommend_cpp-0.3.8/CLAUDE.md

@@ -0,0 +1,3 @@
+# CLAUDE.md
+
+See [AGENTS.md](AGENTS.md) — it is the single source of truth for this repository.

{haruki_sekai_deck_recommend_cpp-0.3.6 → haruki_sekai_deck_recommend_cpp-0.3.8}/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.15)
 
-project(sekai-deck-recommend-cpp VERSION 0.3.6 LANGUAGES C CXX)
+project(sekai-deck-recommend-cpp VERSION 0.3.7 LANGUAGES C CXX)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

{haruki_sekai_deck_recommend_cpp-0.3.6 → haruki_sekai_deck_recommend_cpp-0.3.8}/PKG-INFO

@@ -1,5 +1,5 @@
 Metadata-Version: 2.2
 Name: haruki-sekai-deck-recommend-cpp
-Version: 0.3.6
+Version: 0.3.8
 Requires-Python: >=3.10
 

{haruki_sekai_deck_recommend_cpp-0.3.6 → haruki_sekai_deck_recommend_cpp-0.3.8}/npm/haruki-sekai-deck-recommend-cpp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "haruki-sekai-deck-recommend-cpp",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "description": "WebAssembly bindings for the Project Sekai deck recommendation engine.",
   "type": "module",
   "license": "LGPL-2.0-only",

{haruki_sekai_deck_recommend_cpp-0.3.6 → haruki_sekai_deck_recommend_cpp-0.3.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "haruki-sekai-deck-recommend-cpp"
-version = "0.3.6"
+version = "0.3.8"
 requires-python = ">=3.10"
 
 [tool.scikit-build]

{haruki_sekai_deck_recommend_cpp-0.3.6 → haruki_sekai_deck_recommend_cpp-0.3.8}/src/data-provider/master-data.cpp

@@ -803,7 +803,7 @@ std::optional<double> MasterData::getEventSkillScoreUpLimit(int eventId) const
     }
     for (const auto& limit : eventSkillScoreUpLimits) {
         if (limit.eventId == eventId) {
-            return std::max(0.0, limit.scoreUpRateLimit - 100.0);
+            return std::max(0.0, limit.scoreUpRateLimit);
         }
     }
     if (isWorldBloomFinale(eventId)) {

{haruki_sekai_deck_recommend_cpp-0.3.6 → haruki_sekai_deck_recommend_cpp-0.3.8}/src/data-provider/master-data.h

@@ -15,7 +15,7 @@ constexpr double legacyWorldBloom2FinaleSkillScoreUpLimit = 140.0;
 constexpr int worldBloom3FinaleCardBonusCountLimit = 5;
 // Fixture rates use 0.1% units, so 60 represents the announced 6% cap.
 constexpr int worldBloom3FinaleMysekaiFixtureBonusLimit = 60;
-constexpr int worldBloom3FinaleTotalPowerLimit = 336000;
+constexpr int worldBloom3TotalPowerLimit = 336000;
 
 
 class MasterData {

{haruki_sekai_deck_recommend_cpp-0.3.6 → haruki_sekai_deck_recommend_cpp-0.3.8}/src/deck-information/deck-calculator.cpp

@@ -242,10 +242,10 @@ void DeckCalculator::forEachDeckDetail(
     }
     power.honorBonus = honorBonus;
     power.total += honorBonus;
-    if (eventId.has_value()
-     && this->dataProvider.masterData->isWorldBloomFinale(eventId.value())
+    if (eventType == Enums::EventType::world_bloom
+     && eventId.has_value()
      && this->dataProvider.masterData->getWorldBloomEventTurn(eventId.value()) == 3) {
-        power.total = std::min(power.total, worldBloom3FinaleTotalPowerLimit);
+        power.total = std::min(power.total, worldBloom3TotalPowerLimit);
     }
 
     // 计算当前卡组每个卡牌的花前/花后固定技能效果（进Live之前）

{haruki_sekai_deck_recommend_cpp-0.3.6 → haruki_sekai_deck_recommend_cpp-0.3.8}/tests/test_binding_smoke.py

@@ -205,6 +205,13 @@ def wl3_rule_master_data():
                         "gameCharacterId": 1,
                         "chapterNo": 1,
                         "worldBloomChapterType": "game_character",
+                    },
+                    {
+                        "id": 2,
+                        "eventId": 163,
+                        "gameCharacterId": 1,
+                        "chapterNo": 1,
+                        "worldBloomChapterType": "game_character",
                     }
                 ]
             ),
@@ -339,8 +346,12 @@ class BindingSmokeTests(unittest.TestCase):
 
 class WorldBloom3FinaleRuleTests(unittest.TestCase):
     def setUp(self):
+        self.init_region("jp")
+
+    def init_region(self, region):
+        self.region = region
         self.engine = binding.SekaiDeckRecommend()
-        self.engine.update_masterdata_from_strings(wl3_rule_master_data(), "jp")
+        self.engine.update_masterdata_from_strings(wl3_rule_master_data(), region)
         self.engine.update_musicmetas_from_string(
             json.dumps(
                 [
@@ -360,18 +371,20 @@ class WorldBloom3FinaleRuleTests(unittest.TestCase):
                     }
                 ]
             ),
-            "jp",
+            region,
         )
 
-    def recommend(self, card_ids, leader, *, finale=True, honor_ids=()):
+    def recommend(self, card_ids, leader, *, finale=True, honor_ids=(), event_id=None):
         event_options = (
             {"world_bloom_finale_turn": 3, "forcedLeaderCharacterId": leader}
             if finale
             else {"world_bloom_event_turn": 3, "world_bloom_character_id": leader}
         )
+        if event_id is not None:
+            event_options = {"event_id": event_id, "world_bloom_character_id": leader}
         options = binding.DeckRecommendOptions.from_dict(
             {
-                "region": "jp",
+                "region": self.region,
                 "user_data_str": wl3_test_user_data(card_ids, honor_ids=honor_ids),
                 "live_type": "multi",
                 "music_id": 1,
@@ -403,7 +416,21 @@ class WorldBloom3FinaleRuleTests(unittest.TestCase):
                     [40, 40, 40, 40, 60],
                 )
 
-    def test_fixture_and_total_power_limits_only_apply_to_finale(self):
+    def test_event_skill_cap_uses_master_value_in_all_regions(self):
+        for region in ("jp", "en", "cn", "tw", "kr"):
+            for raw_cap in (140, 240):
+                with self.subTest(region=region, raw_cap=raw_cap):
+                    self.init_region(region)
+                    data = wl3_rule_master_data()
+                    data["eventSkillScoreUpLimits"] = json.dumps(
+                        [{"id": 2, "eventId": 202, "scoreUpRateLimit": raw_cap}]
+                    )
+                    self.engine.update_masterdata_from_strings(data, region)
+                    deck = self.recommend([1, 2, 3, 4, 5], 1, finale=False, event_id=202)
+                    cap = raw_cap
+                    self.assertEqual({card.skill_score_up for card in deck.cards}, {min(200, cap)})
+
+    def test_wl3_power_cap_applies_to_chapters_and_finale_but_fixture_cap_is_finale_only(self):
         card_ids = [1, 2, 3, 4, 5]
         finale = self.recommend(card_ids, 1)
         normal = self.recommend(card_ids, 1, finale=False)
@@ -412,7 +439,11 @@ class WorldBloom3FinaleRuleTests(unittest.TestCase):
         self.assertEqual(finale.fixture_bonus_power, 27000)
         self.assertEqual(finale.total_power, 336000)
         self.assertEqual(normal.fixture_bonus_power, 45000)
-        self.assertEqual(normal.total_power, 495000)
+        self.assertEqual(normal.total_power, 336000)
+        released_chapter = self.recommend(card_ids, 1, finale=False, event_id=202)
+        self.assertEqual(released_chapter.total_power, 336000)
+        wl2 = self.recommend(card_ids, 1, finale=False, event_id=163)
+        self.assertGreater(wl2.total_power, 336000)
 
     def test_score_up_and_current_wl_honor_limits(self):
         card_ids = [1, 2, 3, 4, 5]

haruki_sekai_deck_recommend_cpp-0.3.6/CLAUDE.md

@@ -1,236 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code (claude.ai/code) when working with
-code in this repository. The same engineering rules also live in `AGENTS.md`
-and `.github/copilot-instructions.md` — keep all three in sync when changing
-guidance.
-
-## What This Is
-
-A C++20 Project Sekai deck recommendation and live-score engine maintained as
-Team Haruki's fork of the previous C++ optimization project
-[NeuraXmy/sekai-deck-recommend-cpp](https://github.com/NeuraXmy/sekai-deck-recommend-cpp).
-Some modifications are based on
-[moe-sekai/sekai-deck-recommend-cpp](https://github.com/moe-sekai/sekai-deck-recommend-cpp).
-It ships Python bindings (pybind11) and a WebAssembly/npm target. Production
-callers consume it in three ways:
-
-- Python: `import sekai_deck_recommend_cpp` directly via the binding surface in
-  `sekai_deck_recommend.cpp` / `.pyi`.
-- Browser/Worker: imports the wasm npm package generated from
-  `src/sekai_deck_recommend_wasm.cpp`.
-- Team Haruki `deck-service` (sibling repo): builds this code through a Rust
-  FFI bridge and exposes it as an HTTP service. C++ exceptions cross the FFI
-  boundary as error strings, so error messages must identify the bad input.
-
-This is production scoring code. Changes to card power, deck selection, event
-bonus, support deck, live score, userdata parsing, or masterdata loading change
-live automation behavior downstream.
-
-## Repository Layout
-
-- `src/deck-recommend/`: event, challenge live, MySekai, and base deck
-  recommendation logic; result ordering for emitted detail fields.
-- `src/deck-information/`: fixed deck lookup and deck power aggregation.
-- `src/card-information/`: card detail, power, skill, and image state.
-- `src/live-score/`: live score, skill ordering, multi-live active bonus,
-  fixed-live timing.
-- `src/event-point/`: event point and event bonus calculations.
-- `src/data-provider/`: static data, masterdata, music metas, userdata loaders.
-- `src/user-data/`: userdata model parsers. Production API payloads are
-  object/dictionary shaped. Compact arrays can appear in Mongo-exported local
-  fixtures, but they are not the runtime API contract.
-- `src/master-data/`: masterdata model structs.
-- `3rdparty/yyjson/`: vendored yyjson dependency for masterdata, music metas,
-  userdata parsing, and wasm JSON-in / JSON-out binding payloads.
-- `sekai_deck_recommend.cpp` / `.pyi`: Python binding surface.
-- `data/`: static data required by the engine. Do not change unless the task
-  is explicitly about static data. `data/rl_seed_cache.tsv` is a
-  runtime-generated RL warm-start cache (written when `DECK_DATA_DIR` or
-  `DECK_RL_SEED_CACHE_FILE` is set). Only the default
-  `data/rl_seed_cache.tsv` path is gitignored; add any custom in-repository
-  cache path to `.gitignore`, and never commit generated cache files.
-
-## Build & Run
-
-Prerequisites: CMake ≥ 3.15, C++20 compiler (GCC/Clang/MSVC), Python 3.10+
-with development headers.
-
-```bash
-# If submodules are missing
-git submodule update --init --recursive
-
-# Local install + smoke test
-uv pip install -e . -v
-uv run python -c "import sekai_deck_recommend_cpp"
-```
-
-`pip install -e . -v` remains supported for callers that are not using uv.
-
-When changes are intended for `deck-service`, also validate from the sibling
-repo:
-
-```bash
-cd ../deck-service
-cargo check
-cargo build
-```
-
-For the browser/Worker WebAssembly target (Embind), with `emsdk` activated:
-
-```bash
-mkdir build_wasm && cd build_wasm
-emcmake cmake .. -DCMAKE_BUILD_TYPE=Release
-cmake --build . -j
-```
-
-Produces `sekai_deck_recommend.js` (ES6 module) + `sekai_deck_recommend.wasm`.
-The CMakeLists branches on `EMSCRIPTEN`: pybind11 binding is dropped, the
-Embind binding in `src/sekai_deck_recommend_wasm.cpp` is linked instead, and
-`data/` is embedded into the wasm with `--embed-file`.
-
-The npm package scaffold lives in `npm/haruki-sekai-deck-recommend-cpp` and is
-reserved as `haruki-sekai-deck-recommend-cpp`. It should contain only the wasm
-loader, `.wasm` binary, wrapper helpers, and TypeScript declarations. Do not
-bundle masterdata, music metas, or user data in the npm package; the application
-provides them at runtime.
-
-Common local benchmark fixtures in this workspace use:
-
-- masterdata: `../haruki-sekai-master`
-- music metas: `../music_metas.json`
-- user data: `../collections.suite.json`
-
-These fixtures are not package assets and should not be committed from this
-repository.
-
-## Packaging & Release
-
-- PyPI package name: `haruki-sekai-deck-recommend-cpp`.
-- npm package name: `haruki-sekai-deck-recommend-cpp`.
-- Release workflows build PyPI wheels, PyPI sdist, and the npm wasm package.
-- PyPI and npm publishing use Trusted Publishing/OIDC. Keep the GitHub
-  environments named `pypi-publish` and `npm-publish` unless the publishing
-  setup is intentionally redesigned.
-- GitHub Release artifacts may include both PyPI artifacts and the npm tarball;
-  PyPI publishing must only download artifacts prefixed with `pypi-`.
-
-## Code Conventions
-
-- C++20, headers and implementations live next to each other in `src/<area>/`.
-- Masterdata, music metas, userdata parsing, and the wasm binding's JSON-in /
-  JSON-out payloads go through yyjson in `src/common/collection-utils.h`.
-- Prefer small, behavior-focused changes over broad refactors.
-- Preserve existing enum mapping and validation behavior unless a
-  caller-visible migration is intentional.
-- Treat production userdata as object/dictionary shaped. Do not add runtime API
-  behavior for Mongo-exported compact arrays unless the task is specifically
-  about local fixtures or migration tooling.
-- Be careful with `std::optional` fields in score details — missing bonus
-  data must not silently turn into a different calculation result.
-- Use concise comments only when the calculation or data shape is non-obvious.
-  Don't restate what the code already says.
-
-## Bindings
-
-The engine has two parallel binding files. Pick the right one for the target
-and keep their option/result schemas in sync:
-
-- `src/sekai_deck_recommend.cpp` — pybind11 (Python wheel + deck-service FFI).
-- `src/sekai_deck_recommend_wasm.cpp` — Embind (browser/Worker WebAssembly),
-  JSON-in / JSON-out surface so the JS side never needs per-field glue.
-
-Option validation logic is currently duplicated between the two; when adding
-a `DeckRecommendOptions` field, update both. A shared core extraction is the
-intended follow-up.
-
-## High-Risk Areas
-
-These spots have produced production-visible regressions in the past — read
-the surrounding code before changing them, and prefer adding tests or running
-the deck-service integration build:
-
-- `src/live-score/live-calculator.cpp` — skill ordering, multi-live active
-  bonus, fixed live score timing.
-- `src/deck-recommend/base-deck-recommend.{h,cpp}` — card filtering and the
-  shared deck recommendation config used by every recommender.
-- `src/deck-recommend/deck-result-update.*` — result ordering and emitted
-  detail fields consumed by `deck-service`.
-- `src/data-provider/user-data.cpp` and `src/user-data/*` — downstream
-  runtime userdata compatibility. Runtime API userdata is object/dictionary
-  shaped; compact arrays are local export fixtures, not the API contract.
-- `src/card-information/*` — power breakdown and card state normalization.
-
-## Performance & Regression Verification
-
-Changes to search algorithms, deck evaluation, or other hot paths must
-be validated with the local harness in `tools/bench/` (see its README):
-
-- `regress.py run/compare` — fixed-seed regression. Deterministic
-  scenarios must stay bit-identical; time-budgeted scenarios (DFS_GA /
-  SA) are compared on top values only.
-- `rl_quality.py` — RL hit-rate protocol (`DECK_RL_SEED_CACHE_DISABLE=1`;
-  repeated runs must keep hitting the GA-reference optimum). RL stage
-  budgets are a quality floor; never trim them for speed.
-- `bench_matrix.py` — old-vs-new latency matrix; build the old version
-  from a git worktree and run both builds in the same session.
-
-Fixtures (masterdata, music metas, user suite) are local-only and must
-never be committed.
-
-## Git Commit Format
-
-All commit subjects must follow:
-
-```text
-[Type] Short description starting with capital letter
-```
-
-| Type      | Usage                                                 |
-|-----------|-------------------------------------------------------|
-| `[Feat]`  | New feature or capability                             |
-| `[Fix]`   | Bug fix                                               |
-| `[Chore]` | Maintenance, refactoring, dependency or build changes |
-| `[Docs]`  | Documentation-only changes                            |
-
-Rules:
-
-- Description starts with a capital letter.
-- Use imperative mood: `Add ...`, not `Added ...`.
-- No trailing period.
-- Keep the subject at or below roughly 70 characters.
-- Agent attribution uses the standard Git `Co-authored-by:` trailer in the
-  commit body, on its own line, separated from the subject by a blank line.
-- Before creating any commit, ask the user whether this commit should publish a
-  new version.
-- If the user wants a new version, bump the relevant package versions according
-  to the user's requested release level. For this repository that normally means
-  `pyproject.toml` and, when npm is affected, `npm/haruki-sekai-deck-recommend-cpp/package.json`.
-- Version values for release bumps must use `major.minor.patch` format.
-- If the user does not want a new version, create the commit without changing
-  package versions.
-
-Suggested values per agent:
-
-- Claude: `Co-authored-by: Claude <Model> <noreply@anthropic.com>` with the
-  actual model name (e.g. `Claude Fable 5`, `Claude Opus 4.7`,
-  `Claude Haiku 4.5`)
-- Codex: `Co-authored-by: Codex <noreply@openai.com>`
-- Copilot: `Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>`
-
-Project examples:
-
-```text
-[Feat] Add MySekai bonus target support
-[Fix] Parse compact runtime user cards
-[Chore] Update pybind11 build metadata
-[Docs] Document deck recommend options
-```
-
-Agent-authored commit example:
-
-```text
-[Docs] Add agent commit guidelines
-
-Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
-```