bdo-toolkit 1.0.8__tar.gz → 1.0.9__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {bdo_toolkit-1.0.8/src/bdo_toolkit.egg-info → bdo_toolkit-1.0.9}/PKG-INFO +1 -1
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_item_state/inventory.py +21 -5
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_version.py +1 -1
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/solare/__init__.py +2 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/solare/_constants.py +14 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/solare/_detail_learning.py +353 -40
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/solare/_details.py +8 -7
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/solare/_discovery.py +31 -13
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/solare/_live_tracker.py +2 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/solare/_result.py +20 -2
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/solare/models.py +32 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9/src/bdo_toolkit.egg-info}/PKG-INFO +1 -1
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit.egg-info/SOURCES.txt +1 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_character_state.py +60 -3
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_solare_details.py +20 -9
- bdo_toolkit-1.0.9/tests/test_solare_equipment.py +82 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_solare_learning.py +101 -2
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_solare_learning_adversarial.py +240 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_solare_real_captures.py +44 -2
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_solare_replay.py +51 -4
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/LICENSE +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/README.md +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/pyproject.toml +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/setup.cfg +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/__init__.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_async_sessions.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_async_utils.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_calibration/__init__.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_calibration/_constants.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_calibration/_formatting.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_calibration/_records.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_calibration/analysis.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_calibration/capture.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_calibration/companions.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_calibration/live.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_calibration/models.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_calibration/observations.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_calibration/persistence.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_calibration/progress.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_calibration/validation.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_calibration/workflow.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_capture_backend.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_capture_options.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_capture_runtime.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_deposit_origin.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_engine.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_framing.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_item_state/__init__.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_item_state/_constants.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_item_state/_records.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_item_state/assembly.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_item_state/formatting.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_item_state/models.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_item_state/session.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_item_state/storage.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_observation_session.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_origin/__init__.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_origin/discovery.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_origin/manual.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_origin/models.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_origin/tracker.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_profile_io.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_profile_runtime.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_protocol.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_reassembly.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_record_geometry.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_specs.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_storage_destination_validation.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_storage_hydration.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/_tracked_capture.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/agris/__init__.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/agris/_calibration_models.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/agris/_capture.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/agris/_discovery.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/agris/_profile.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/agris/_validation.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/agris/async_session.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/agris/calibration.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/agris/models.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/agris/replay.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/agris/session.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/calibration.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/capture.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/capture_diagnosis.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/character_state.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/cli.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/diagnostics.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/events.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/filters.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/grind/__init__.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/grind/_pipeline.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/grind/models.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/grind/session.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/item_state.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/origin_learning.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/profiles.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/py.typed +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/raw/__init__.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/raw/_collector.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/raw/models.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/raw/replay.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/raw/session.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/remote_profiles.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/solare/_replay_capture.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/solare/_scanner.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/solare/_validation.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/solare/async_session.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/solare/replay.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/solare/session.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/writers.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/xp/__init__.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/xp/_tracker.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/xp/models.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/xp/profile.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/xp/replay.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit/xp/session.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit.egg-info/dependency_links.txt +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit.egg-info/entry_points.txt +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit.egg-info/requires.txt +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/src/bdo_toolkit.egg-info/top_level.txt +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_agris_async.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_agris_cli.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_agris_discovery.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_agris_evidence.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_agris_models.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_agris_profiles.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_agris_replay.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_agris_session.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_async_sessions.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_calibration.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_calibration_conveniences.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_calibration_lifecycle.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_calibration_persistence.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_calibration_progress.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_calibration_retention.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_capture_backend.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_capture_diagnosis.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_capture_replay.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_capture_runtime.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_cli.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_decoder_diagnostics.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_deposit_origin.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_direction.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_dynamic_storage_calibration_matrix.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_engine.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_examples_and_writers.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_explicit_profile.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_fixture_catalog.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_fixture_regressions.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_framing.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_grind.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_initial_load_storage.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_inventory_snapshots.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_item_state.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_live_capture_session.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_origin_learning.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_package_layout.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_profile_validation.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_raw.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_reassembly.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_remote_profiles.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_solare_api.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_solare_session.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_storage_destination_validation.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_storage_events.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_storage_hydration_tracker.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_storage_unknown_destination_calibration.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_toolkit_api.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_xp.py +0 -0
- {bdo_toolkit-1.0.8 → bdo_toolkit-1.0.9}/tests/test_xp_profiles.py +0 -0
|
@@ -148,7 +148,19 @@ def _discover_inventory_tail_layout(
|
|
|
148
148
|
window_start = max(0, stride - _INVENTORY_TRAILING_DISCOVERY_BYTES)
|
|
149
149
|
candidates: list[tuple[int, int]] = []
|
|
150
150
|
|
|
151
|
-
|
|
151
|
+
# Slots can precede the item field while container codes remain at the
|
|
152
|
+
# end of that record. Search a bounded prefix as well as the tail; never
|
|
153
|
+
# substitute the next record's slot for a missing final-record field.
|
|
154
|
+
# The base length bounds the prefix to bytes outside the previous record's
|
|
155
|
+
# item-relative payload, avoiding a shifted copy of an existing tail slot.
|
|
156
|
+
prefix_start = max(
|
|
157
|
+
-4,
|
|
158
|
+
max(
|
|
159
|
+
int(spec.single_record_message_length or 0) - stride - spec.item_offset
|
|
160
|
+
for _, _, spec, _ in frame_groups
|
|
161
|
+
),
|
|
162
|
+
)
|
|
163
|
+
for slot_relative in (*range(prefix_start, 0), *range(window_start, stride)):
|
|
152
164
|
slot_groups: list[list[int]] = []
|
|
153
165
|
for frame, group, _, _ in frame_groups:
|
|
154
166
|
ordered = sorted(group, key=lambda event: int(event.record_offset or 0))
|
|
@@ -156,7 +168,7 @@ def _discover_inventory_tail_layout(
|
|
|
156
168
|
frame.message[int(event.record_offset) + slot_relative]
|
|
157
169
|
for event in ordered
|
|
158
170
|
if event.record_offset is not None
|
|
159
|
-
and int(event.record_offset) + slot_relative < len(frame.message)
|
|
171
|
+
and 0 <= int(event.record_offset) + slot_relative < len(frame.message)
|
|
160
172
|
]
|
|
161
173
|
slot_groups.append(slots)
|
|
162
174
|
if any(
|
|
@@ -176,9 +188,10 @@ def _discover_inventory_tail_layout(
|
|
|
176
188
|
# Observed generations serialize these neighboring fields in both
|
|
177
189
|
# orders. Keep the bounded tail search, but do not treat their order as
|
|
178
190
|
# part of the protocol invariant.
|
|
191
|
+
slot_tail_position = slot_relative % stride
|
|
179
192
|
for container_relative in range(
|
|
180
|
-
max(window_start,
|
|
181
|
-
min(stride,
|
|
193
|
+
max(window_start, slot_tail_position - 4),
|
|
194
|
+
min(stride, slot_tail_position + 5),
|
|
182
195
|
):
|
|
183
196
|
if container_relative == slot_relative:
|
|
184
197
|
continue
|
|
@@ -280,7 +293,10 @@ def _inventory_record_metadata(
|
|
|
280
293
|
assert event.record_offset is not None
|
|
281
294
|
slot_offset = event.record_offset + slot_relative
|
|
282
295
|
container_offset = event.record_offset + container_relative
|
|
283
|
-
if
|
|
296
|
+
if (
|
|
297
|
+
min(slot_offset, container_offset) < 0
|
|
298
|
+
or max(slot_offset, container_offset) >= len(frame.message)
|
|
299
|
+
):
|
|
284
300
|
return None
|
|
285
301
|
slot = frame.message[slot_offset]
|
|
286
302
|
code = frame.message[container_offset]
|
|
@@ -14,6 +14,7 @@ from .models import (
|
|
|
14
14
|
SolareClass,
|
|
15
15
|
SolareClassPerformance,
|
|
16
16
|
SolareDetectionStatus,
|
|
17
|
+
SolareEquipment,
|
|
17
18
|
SolareEvidence,
|
|
18
19
|
SolareFamilyLayout,
|
|
19
20
|
SolareLeaderboardSnapshot,
|
|
@@ -36,6 +37,7 @@ __all__ = [
|
|
|
36
37
|
"SolareClass",
|
|
37
38
|
"SolareClassPerformance",
|
|
38
39
|
"SolareDetectionStatus",
|
|
40
|
+
"SolareEquipment",
|
|
39
41
|
"SolareEvidence",
|
|
40
42
|
"SolareFamilyLayout",
|
|
41
43
|
"SolareLeaderboardSnapshot",
|
|
@@ -76,8 +76,22 @@ CLASS_NAMES: dict[int, str] = {
|
|
|
76
76
|
32: "Seraph",
|
|
77
77
|
33: "Dosa",
|
|
78
78
|
34: "Deadeye",
|
|
79
|
+
35: "Agent",
|
|
79
80
|
}
|
|
80
81
|
|
|
82
|
+
# Reviewed complete rosters; display-name additions must not invalidate history.
|
|
83
|
+
_HISTORICAL_CLASS_ROSTER = frozenset({
|
|
84
|
+
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 15, 16, 17,
|
|
85
|
+
19, 20, 21, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
|
|
86
|
+
})
|
|
87
|
+
SOLARE_CLASS_ROSTERS = (
|
|
88
|
+
_HISTORICAL_CLASS_ROSTER,
|
|
89
|
+
_HISTORICAL_CLASS_ROSTER | {35},
|
|
90
|
+
)
|
|
91
|
+
SOLARE_RICH_RECORD_COUNTS = frozenset(
|
|
92
|
+
len(roster) * 20 for roster in SOLARE_CLASS_ROSTERS
|
|
93
|
+
)
|
|
94
|
+
|
|
81
95
|
ADVANCED_SPEC_BY_CLASS: dict[int, str] = {
|
|
82
96
|
3: "Ascension",
|
|
83
97
|
6: "Ascension",
|
|
@@ -13,13 +13,19 @@ from __future__ import annotations
|
|
|
13
13
|
|
|
14
14
|
import hashlib
|
|
15
15
|
import itertools
|
|
16
|
+
import re
|
|
16
17
|
from collections import Counter
|
|
17
|
-
from dataclasses import dataclass
|
|
18
|
+
from dataclasses import dataclass, replace
|
|
18
19
|
from typing import Mapping, Optional, Sequence
|
|
19
20
|
|
|
20
21
|
from bdo_toolkit._protocol import BDOFrame
|
|
21
22
|
|
|
22
|
-
from ._constants import
|
|
23
|
+
from ._constants import (
|
|
24
|
+
EMPTY_CLASS_CODE,
|
|
25
|
+
EMPTY_SPEC_CODE,
|
|
26
|
+
SOLARE_RICH_RECORD_COUNTS,
|
|
27
|
+
class_name,
|
|
28
|
+
)
|
|
23
29
|
from ._details import (
|
|
24
30
|
_ADDON_SLOT_SIZE,
|
|
25
31
|
_CLASS_SLOT_COUNT,
|
|
@@ -41,19 +47,20 @@ from ._discovery import DiscoveredSolareFamily
|
|
|
41
47
|
from .models import (
|
|
42
48
|
SolareClass,
|
|
43
49
|
SolareClassPerformance,
|
|
50
|
+
SolareEquipment,
|
|
44
51
|
SolareOverallEntry,
|
|
45
52
|
SolarePlayer,
|
|
46
53
|
)
|
|
47
54
|
|
|
48
55
|
|
|
49
|
-
_EXPECTED_RICH_RECORDS = 620
|
|
50
|
-
_EXPECTED_RICH_FRAMES = _EXPECTED_RICH_RECORDS // 2
|
|
51
56
|
_EXPECTED_OVERALL_RECORDS = 100
|
|
52
57
|
_EXPECTED_OVERALL_FRAMES = _EXPECTED_OVERALL_RECORDS // 2
|
|
53
58
|
_MIN_ELO_DISTINCT = 20
|
|
54
59
|
_MAX_LEARNED_ELO = 0xFFFF
|
|
55
60
|
_MAX_LEARNED_COUNTER = 0xFFFF
|
|
56
|
-
|
|
61
|
+
# Experienced-player boards can make all outcome arrays positive, including
|
|
62
|
+
# nearby byte-shift aliases. Let balanced-counter validation resolve them.
|
|
63
|
+
_MAX_MATCH_CANDIDATES = 8
|
|
57
64
|
_MAX_COUNTER_CANDIDATES = 64
|
|
58
65
|
_MAX_PREFILTER_CANDIDATES = 128
|
|
59
66
|
_MAX_ACTIVE_OUTCOME_PREFILTER_CANDIDATES = 4096
|
|
@@ -456,9 +463,91 @@ def _outcome_candidates(
|
|
|
456
463
|
return tuple(candidates)
|
|
457
464
|
|
|
458
465
|
|
|
466
|
+
def _anchored_zero_outcome_offsets(
|
|
467
|
+
records: _RecordTable,
|
|
468
|
+
occupancies: Sequence[int],
|
|
469
|
+
matches_offset: int,
|
|
470
|
+
matches: tuple[int, ...],
|
|
471
|
+
outcomes: tuple[tuple[int, tuple[int, ...]], ...],
|
|
472
|
+
) -> tuple[int, ...]:
|
|
473
|
+
"""Locate zero counters by bounded field geometry, never by zero scans.
|
|
474
|
+
|
|
475
|
+
Require two complementary active outcomes and independently validated
|
|
476
|
+
text-array boundaries. Across the tail from class codes to record end,
|
|
477
|
+
exactly one 12-byte gap may remain; other gaps are at most three bytes
|
|
478
|
+
of patch padding. No arbitrary zero region is promoted to an outcome.
|
|
479
|
+
The normal solution search still rejects multiple interpretations.
|
|
480
|
+
"""
|
|
481
|
+
complementary = tuple(
|
|
482
|
+
(first_offset, second_offset)
|
|
483
|
+
for index, (first_offset, first) in enumerate(outcomes)
|
|
484
|
+
for second_offset, second in outcomes[index + 1:]
|
|
485
|
+
if all(a + b == total for a, b, total in zip(first, second, matches))
|
|
486
|
+
)
|
|
487
|
+
if not complementary:
|
|
488
|
+
return ()
|
|
489
|
+
rows = records.rows
|
|
490
|
+
class_field = records.family.class_offset
|
|
491
|
+
if class_field is None:
|
|
492
|
+
learned_class = _learn_overall_class_offset(records)
|
|
493
|
+
if learned_class is None:
|
|
494
|
+
return ()
|
|
495
|
+
class_field = learned_class[0]
|
|
496
|
+
spec = _learn_spec_offset(rows, occupancies)
|
|
497
|
+
history = _history_candidates(rows, occupancies, matches_offset)
|
|
498
|
+
elos = _elo_candidates(records)
|
|
499
|
+
if spec is None or len(history) != 1 or len(elos) != 1:
|
|
500
|
+
return ()
|
|
501
|
+
gear = _raw_base_candidates(
|
|
502
|
+
rows, occupancies, value_count=126, slot_size=_GEAR_SLOT_SIZE,
|
|
503
|
+
minimum_text_length=300, maximum_text_length=500,
|
|
504
|
+
)
|
|
505
|
+
addons = _raw_base_candidates(
|
|
506
|
+
rows, occupancies, value_count=12, slot_size=_ADDON_SLOT_SIZE,
|
|
507
|
+
minimum_text_length=20, maximum_text_length=100,
|
|
508
|
+
allow_empty_slots=True,
|
|
509
|
+
)
|
|
510
|
+
if len(gear) != 1 or len(addons) != 1:
|
|
511
|
+
return ()
|
|
512
|
+
fixed = [
|
|
513
|
+
(class_field, 3), (spec, 3), (matches_offset, 12),
|
|
514
|
+
(history[0], 3 * _HISTORY_SLOT_SIZE),
|
|
515
|
+
(gear[0], 3 * _GEAR_SLOT_SIZE),
|
|
516
|
+
(addons[0], 3 * _ADDON_SLOT_SIZE),
|
|
517
|
+
]
|
|
518
|
+
if elos[0] >= class_field:
|
|
519
|
+
fixed.append((elos[0], 4))
|
|
520
|
+
candidates: set[int] = set()
|
|
521
|
+
for first_offset, second_offset in complementary:
|
|
522
|
+
intervals = sorted(fixed + [(first_offset, 12), (second_offset, 12)])
|
|
523
|
+
cursor = class_field
|
|
524
|
+
gaps: list[tuple[int, int]] = []
|
|
525
|
+
valid = True
|
|
526
|
+
for start, size in intervals:
|
|
527
|
+
if start < cursor or start + size > records.record_end:
|
|
528
|
+
valid = False
|
|
529
|
+
break
|
|
530
|
+
if start > cursor:
|
|
531
|
+
gaps.append((cursor, start - cursor))
|
|
532
|
+
cursor = start + size
|
|
533
|
+
if not valid:
|
|
534
|
+
continue
|
|
535
|
+
if cursor < records.record_end:
|
|
536
|
+
gaps.append((cursor, records.record_end - cursor))
|
|
537
|
+
wide = [(start, size) for start, size in gaps if size > 3]
|
|
538
|
+
if len(wide) != 1 or wide[0][1] != 12:
|
|
539
|
+
continue
|
|
540
|
+
offset = wide[0][0]
|
|
541
|
+
if all(row[offset:offset + 12] == bytes(12) for row in rows):
|
|
542
|
+
candidates.add(offset)
|
|
543
|
+
return tuple(sorted(candidates))
|
|
544
|
+
|
|
545
|
+
|
|
459
546
|
def _balanced_counter_solution(
|
|
460
547
|
rows: Sequence[bytes],
|
|
461
548
|
occupancies: Sequence[int],
|
|
549
|
+
*,
|
|
550
|
+
records: Optional[_RecordTable] = None,
|
|
462
551
|
) -> Optional[tuple[int, tuple[int, int, int]]]:
|
|
463
552
|
record_size = len(rows[0])
|
|
464
553
|
occupied_activity = [0] * _CLASS_SLOT_COUNT
|
|
@@ -481,6 +570,13 @@ def _balanced_counter_solution(
|
|
|
481
570
|
)
|
|
482
571
|
if not outcomes:
|
|
483
572
|
continue
|
|
573
|
+
if records is not None:
|
|
574
|
+
zero_offsets = _anchored_zero_outcome_offsets(
|
|
575
|
+
records, occupancies, matches_offset, matches, outcomes,
|
|
576
|
+
)
|
|
577
|
+
outcomes += tuple(
|
|
578
|
+
(offset, (0,) * len(matches)) for offset in zero_offsets
|
|
579
|
+
)
|
|
484
580
|
by_vector: dict[tuple[int, ...], list[int]] = {}
|
|
485
581
|
for offset, vector in outcomes:
|
|
486
582
|
by_vector.setdefault(vector, []).append(offset)
|
|
@@ -575,64 +671,128 @@ def _history_candidates(
|
|
|
575
671
|
return tuple(candidates)
|
|
576
672
|
|
|
577
673
|
|
|
578
|
-
def
|
|
674
|
+
def _history_outcome_candidates(
|
|
579
675
|
rows: Sequence[bytes],
|
|
580
676
|
occupancies: Sequence[int],
|
|
581
677
|
matches_offset: int,
|
|
582
678
|
outcome_offsets: Sequence[int],
|
|
583
679
|
history_offset: int,
|
|
584
|
-
|
|
585
|
-
|
|
586
|
-
|
|
587
|
-
|
|
588
|
-
|
|
680
|
+
*,
|
|
681
|
+
minimum_discriminators: int = _MIN_HISTORY_DISCRIMINATORS,
|
|
682
|
+
) -> tuple[tuple[int, int, int], ...]:
|
|
683
|
+
"""Constrain lifetime outcomes with complete or bounded recent histories.
|
|
684
|
+
|
|
685
|
+
For a zero-draw record, equal/unequal history pairs give observed wins and
|
|
686
|
+
losses. A longer lifetime record must contain at least those counts. Draw
|
|
687
|
+
encoding is not established, so nonzero-draw long histories provide no
|
|
688
|
+
positive orientation evidence. Ambiguous supported mappings stay unavailable.
|
|
689
|
+
"""
|
|
690
|
+
candidates: list[tuple[int, int, int]] = []
|
|
691
|
+
for wins_offset, draws_offset, losses_offset in itertools.permutations(outcome_offsets):
|
|
589
692
|
discriminators = 0
|
|
590
693
|
valid = True
|
|
591
694
|
for row, occupied in zip(rows, occupancies):
|
|
592
695
|
for slot in range(occupied):
|
|
593
696
|
matches = _u32le(row, matches_offset + slot * 4)
|
|
594
|
-
|
|
595
|
-
|
|
596
|
-
|
|
597
|
-
|
|
598
|
-
|
|
599
|
-
+ slot * _HISTORY_SLOT_SIZE : history_offset
|
|
600
|
-
+ (slot + 1) * _HISTORY_SLOT_SIZE
|
|
601
|
-
]
|
|
602
|
-
)
|
|
603
|
-
if decoded is None:
|
|
697
|
+
decoded = _decode_history_region(row[
|
|
698
|
+
history_offset + slot * _HISTORY_SLOT_SIZE:
|
|
699
|
+
history_offset + (slot + 1) * _HISTORY_SLOT_SIZE
|
|
700
|
+
])
|
|
701
|
+
if decoded is None or len(decoded[1]) != 2 * min(matches, 5):
|
|
604
702
|
valid = False
|
|
605
703
|
break
|
|
606
|
-
|
|
607
|
-
equal = sum(
|
|
608
|
-
|
|
609
|
-
for index in range(0, len(codes), 2)
|
|
610
|
-
)
|
|
611
|
-
unequal = matches - equal
|
|
704
|
+
codes = decoded[1]
|
|
705
|
+
equal = sum(codes[i] == codes[i + 1] for i in range(0, len(codes), 2))
|
|
706
|
+
unequal = len(codes) // 2 - equal
|
|
612
707
|
wins = _u32le(row, wins_offset + slot * 4)
|
|
613
708
|
draws = _u32le(row, draws_offset + slot * 4)
|
|
614
709
|
losses = _u32le(row, losses_offset + slot * 4)
|
|
615
|
-
if
|
|
710
|
+
if matches <= 5:
|
|
711
|
+
if draws != 0 or wins != equal or losses != unequal:
|
|
712
|
+
valid = False
|
|
713
|
+
break
|
|
714
|
+
elif draws != 0:
|
|
715
|
+
# A draw may occupy either pair category. These bounds
|
|
716
|
+
# reject contradictions without assigning it an encoding.
|
|
717
|
+
if wins + draws < equal or losses + draws < unequal:
|
|
718
|
+
valid = False
|
|
719
|
+
break
|
|
720
|
+
continue
|
|
721
|
+
elif wins < equal or losses < unequal:
|
|
616
722
|
valid = False
|
|
617
723
|
break
|
|
618
|
-
if
|
|
724
|
+
if equal != unequal:
|
|
619
725
|
discriminators += 1
|
|
620
726
|
if not valid:
|
|
621
727
|
break
|
|
622
|
-
if valid and discriminators >=
|
|
623
|
-
|
|
624
|
-
|
|
625
|
-
|
|
626
|
-
|
|
728
|
+
if valid and discriminators >= minimum_discriminators:
|
|
729
|
+
candidates.append((wins_offset, draws_offset, losses_offset))
|
|
730
|
+
return tuple(candidates)
|
|
731
|
+
|
|
732
|
+
|
|
733
|
+
def _orient_outcomes(
|
|
734
|
+
rows: Sequence[bytes],
|
|
735
|
+
occupancies: Sequence[int],
|
|
736
|
+
matches_offset: int,
|
|
737
|
+
outcome_offsets: Sequence[int],
|
|
738
|
+
history_offset: int,
|
|
739
|
+
) -> Optional[tuple[int, int, int]]:
|
|
740
|
+
candidates = _history_outcome_candidates(
|
|
741
|
+
rows, occupancies, matches_offset, outcome_offsets, history_offset,
|
|
742
|
+
)
|
|
743
|
+
return candidates[0] if len(candidates) == 1 else None
|
|
744
|
+
|
|
745
|
+
|
|
746
|
+
def _companion_outcomes_agree(
|
|
747
|
+
records: _RecordTable,
|
|
748
|
+
class_offset: int,
|
|
749
|
+
occupancies: Sequence[int],
|
|
750
|
+
matches_offset: int,
|
|
751
|
+
outcomes: tuple[int, int, int],
|
|
752
|
+
companion: _RecordTable,
|
|
753
|
+
known: _PerformanceOffsets,
|
|
754
|
+
) -> bool:
|
|
755
|
+
by_name = {name: i for i, name in enumerate(companion.names)}
|
|
756
|
+
shared = 0
|
|
757
|
+
discriminating_names = 0
|
|
758
|
+
for row, name, rank, occupied in zip(
|
|
759
|
+
records.rows, records.names, records.ranks, occupancies,
|
|
760
|
+
):
|
|
761
|
+
ordinal = by_name.get(name)
|
|
762
|
+
if ordinal is None:
|
|
763
|
+
continue
|
|
764
|
+
other = companion.rows[ordinal]
|
|
765
|
+
if rank != companion.ranks[ordinal] or occupied != known.occupancies[ordinal]:
|
|
766
|
+
return False
|
|
767
|
+
discriminating = False
|
|
768
|
+
for slot in range(occupied):
|
|
769
|
+
if row[class_offset + slot] != other[known.class_offset + slot]:
|
|
770
|
+
return False
|
|
771
|
+
values = tuple(_u32le(row, offset + slot * 4)
|
|
772
|
+
for offset in (matches_offset, *outcomes))
|
|
773
|
+
expected = tuple(_u32le(other, offset + slot * 4) for offset in (
|
|
774
|
+
known.matches_offset, known.wins_offset,
|
|
775
|
+
known.draws_offset, known.losses_offset,
|
|
776
|
+
))
|
|
777
|
+
if values != expected:
|
|
778
|
+
return False
|
|
779
|
+
discriminating |= len(set(values[1:])) == 3
|
|
780
|
+
shared += 1
|
|
781
|
+
discriminating_names += discriminating
|
|
782
|
+
return shared >= 20 and discriminating_names >= _MIN_HISTORY_DISCRIMINATORS
|
|
627
783
|
|
|
628
784
|
|
|
629
785
|
def _learn_performance_offsets(
|
|
630
786
|
records: _RecordTable,
|
|
631
787
|
class_offset: int,
|
|
632
788
|
occupancies: tuple[int, ...],
|
|
789
|
+
*,
|
|
790
|
+
companion: Optional[tuple[_RecordTable, _PerformanceOffsets]] = None,
|
|
633
791
|
) -> Optional[_PerformanceOffsets]:
|
|
634
792
|
spec_offset = _learn_spec_offset(records.rows, occupancies)
|
|
635
|
-
counters = _balanced_counter_solution(
|
|
793
|
+
counters = _balanced_counter_solution(
|
|
794
|
+
records.rows, occupancies, records=records,
|
|
795
|
+
)
|
|
636
796
|
if spec_offset is None or counters is None:
|
|
637
797
|
return None
|
|
638
798
|
matches_offset, outcome_offsets = counters
|
|
@@ -651,6 +811,21 @@ def _learn_performance_offsets(
|
|
|
651
811
|
outcome_offsets,
|
|
652
812
|
history_offset,
|
|
653
813
|
)
|
|
814
|
+
if oriented is None and companion is not None:
|
|
815
|
+
# The companion already has independent outcome authority. Local
|
|
816
|
+
# history must not contradict it, but no short-history witness is needed.
|
|
817
|
+
supported = tuple(
|
|
818
|
+
proposed for proposed in _history_outcome_candidates(
|
|
819
|
+
records.rows, occupancies, matches_offset, outcome_offsets,
|
|
820
|
+
history_offset, minimum_discriminators=0,
|
|
821
|
+
)
|
|
822
|
+
if _companion_outcomes_agree(
|
|
823
|
+
records, class_offset, occupancies, matches_offset, proposed,
|
|
824
|
+
companion[0], companion[1],
|
|
825
|
+
)
|
|
826
|
+
)
|
|
827
|
+
if len(supported) == 1:
|
|
828
|
+
oriented = supported[0]
|
|
654
829
|
if oriented is None:
|
|
655
830
|
return None
|
|
656
831
|
wins_offset, draws_offset, losses_offset = oriented
|
|
@@ -701,13 +876,55 @@ def _raw_base_candidates(
|
|
|
701
876
|
slot_size: int,
|
|
702
877
|
minimum_text_length: int,
|
|
703
878
|
maximum_text_length: int,
|
|
879
|
+
allow_empty_slots: bool = False,
|
|
704
880
|
) -> tuple[int, ...]:
|
|
705
881
|
first = rows[0]
|
|
706
882
|
candidates: list[int] = []
|
|
707
883
|
required_end = _CLASS_SLOT_COUNT * slot_size
|
|
708
|
-
|
|
884
|
+
offsets: Sequence[int] = range(len(first) - required_end + 1)
|
|
885
|
+
if allow_empty_slots:
|
|
886
|
+
# A blank first player cannot seed discovery. Gather text witnesses
|
|
887
|
+
# from every record, then validate the entire table at each boundary.
|
|
888
|
+
pattern = rb"(?<![0-9,])[0-9]+(?:,[0-9]+){" + str(value_count - 1).encode() + rb"}\x00"
|
|
889
|
+
witnessed = {
|
|
890
|
+
match.start() - slot * slot_size
|
|
891
|
+
for row in rows
|
|
892
|
+
for match in re.finditer(pattern, row)
|
|
893
|
+
for slot in range(_CLASS_SLOT_COUNT)
|
|
894
|
+
if 0 <= match.start() - slot * slot_size <= len(first) - required_end
|
|
895
|
+
}
|
|
896
|
+
offsets = sorted(witnessed)
|
|
897
|
+
for offset in offsets:
|
|
898
|
+
if allow_empty_slots:
|
|
899
|
+
# Addon boundary evidence permits zero to six complete pairs.
|
|
900
|
+
# Validate every occupied block, including its zero padding; a
|
|
901
|
+
# population percentage must not decide whether partial lists fit.
|
|
902
|
+
valid_blocks = True
|
|
903
|
+
for row, occupied in zip(rows, occupancies):
|
|
904
|
+
for slot in range(occupied):
|
|
905
|
+
start = offset + slot * slot_size
|
|
906
|
+
block = row[start:start + slot_size]
|
|
907
|
+
if len(block) != slot_size:
|
|
908
|
+
valid_blocks = False
|
|
909
|
+
break
|
|
910
|
+
if not any(block):
|
|
911
|
+
continue
|
|
912
|
+
shape = _csv_integer_count(row, start)
|
|
913
|
+
if (shape is None or not 2 <= shape[0] <= value_count
|
|
914
|
+
or shape[0] % 2 or shape[1] > maximum_text_length
|
|
915
|
+
or any(block[shape[1]:])):
|
|
916
|
+
valid_blocks = False
|
|
917
|
+
break
|
|
918
|
+
if not valid_blocks:
|
|
919
|
+
break
|
|
920
|
+
if valid_blocks and all(any(n > slot for n in occupancies)
|
|
921
|
+
for slot in range(_CLASS_SLOT_COUNT)):
|
|
922
|
+
candidates.append(offset)
|
|
923
|
+
if len(candidates) > 1:
|
|
924
|
+
return ()
|
|
925
|
+
continue
|
|
709
926
|
first_shape = _csv_integer_count(first, offset)
|
|
710
|
-
if (
|
|
927
|
+
if not allow_empty_slots and (
|
|
711
928
|
first_shape is None
|
|
712
929
|
or first_shape[0] != value_count
|
|
713
930
|
or not minimum_text_length <= first_shape[1] <= maximum_text_length
|
|
@@ -716,6 +933,8 @@ def _raw_base_candidates(
|
|
|
716
933
|
valid = True
|
|
717
934
|
for row in rows:
|
|
718
935
|
shape = _csv_integer_count(row, offset)
|
|
936
|
+
if allow_empty_slots and not any(row[offset : offset + slot_size]):
|
|
937
|
+
continue
|
|
719
938
|
if (
|
|
720
939
|
shape is None
|
|
721
940
|
or shape[0] != value_count
|
|
@@ -742,7 +961,11 @@ def _raw_base_candidates(
|
|
|
742
961
|
break
|
|
743
962
|
matching = 0
|
|
744
963
|
for row in eligible:
|
|
745
|
-
|
|
964
|
+
start = offset + slot * slot_size
|
|
965
|
+
if allow_empty_slots and not any(row[start:start + slot_size]):
|
|
966
|
+
matching += 1
|
|
967
|
+
continue
|
|
968
|
+
shape = _csv_integer_count(row, start)
|
|
746
969
|
if (
|
|
747
970
|
shape is not None
|
|
748
971
|
and shape[0] == value_count
|
|
@@ -1310,11 +1533,13 @@ def learn_unknown_solare_details(
|
|
|
1310
1533
|
cached or written to disk.
|
|
1311
1534
|
"""
|
|
1312
1535
|
|
|
1536
|
+
if rich.record_count not in SOLARE_RICH_RECORD_COUNTS:
|
|
1537
|
+
return None, None
|
|
1313
1538
|
rich_records = _extract_records(
|
|
1314
1539
|
rich_frames,
|
|
1315
1540
|
rich,
|
|
1316
|
-
expected_frames=
|
|
1317
|
-
expected_records=
|
|
1541
|
+
expected_frames=rich.record_count // 2,
|
|
1542
|
+
expected_records=rich.record_count,
|
|
1318
1543
|
)
|
|
1319
1544
|
overall_records = _extract_records(
|
|
1320
1545
|
overall_frames,
|
|
@@ -1386,6 +1611,16 @@ def learn_unknown_solare_details(
|
|
|
1386
1611
|
and overall_class is not None
|
|
1387
1612
|
else None
|
|
1388
1613
|
)
|
|
1614
|
+
if learn_overall and overall_performance is None and rich_performance is not None and overall_class is not None:
|
|
1615
|
+
overall_performance = _learn_performance_offsets(
|
|
1616
|
+
overall_records, overall_class[0], overall_class[1],
|
|
1617
|
+
companion=(rich_records, rich_performance),
|
|
1618
|
+
)
|
|
1619
|
+
elif learn_rich and rich_performance is None and overall_performance is not None and rich.class_offset is not None and rich_occupancies is not None:
|
|
1620
|
+
rich_performance = _learn_performance_offsets(
|
|
1621
|
+
rich_records, rich.class_offset, rich_occupancies,
|
|
1622
|
+
companion=(overall_records, overall_performance),
|
|
1623
|
+
)
|
|
1389
1624
|
rich_learned = _LearnedTable(
|
|
1390
1625
|
rich_records,
|
|
1391
1626
|
rich_elo if learn_rich else None,
|
|
@@ -1435,3 +1670,81 @@ def learn_unknown_solare_details(
|
|
|
1435
1670
|
_decode_learned_rich(rich_learned) if learn_rich else None,
|
|
1436
1671
|
_decode_learned_overall(overall_learned) if learn_overall else None,
|
|
1437
1672
|
)
|
|
1673
|
+
|
|
1674
|
+
|
|
1675
|
+
_EQUIPMENT_SLOT_CODES = (0, 1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 27, 29)
|
|
1676
|
+
|
|
1677
|
+
|
|
1678
|
+
def _parse_equipment(data: bytes) -> Optional[tuple[SolareEquipment, ...]]:
|
|
1679
|
+
"""Validate the observed 14 x 9 CSV grammar without collapsing duplicates."""
|
|
1680
|
+
if len(data) != _GEAR_SLOT_SIZE or b"\0" not in data:
|
|
1681
|
+
return None
|
|
1682
|
+
text = data.split(b"\0", 1)[0]
|
|
1683
|
+
tokens = text.split(b",")
|
|
1684
|
+
if len(tokens) != 126 or any(not t.isdigit() or len(t) > 10 for t in tokens):
|
|
1685
|
+
return None
|
|
1686
|
+
values = [int(token) for token in tokens]
|
|
1687
|
+
if any(value > 0xFFFFFFFF for value in values):
|
|
1688
|
+
return None
|
|
1689
|
+
groups = [values[i:i + 9] for i in range(0, 126, 9)]
|
|
1690
|
+
if tuple(g[0] for g in groups) != _EQUIPMENT_SLOT_CODES:
|
|
1691
|
+
return None
|
|
1692
|
+
if any(g[1] == 0 for g in groups):
|
|
1693
|
+
return None
|
|
1694
|
+
return tuple(
|
|
1695
|
+
SolareEquipment(
|
|
1696
|
+
slot_code=g[0],
|
|
1697
|
+
item_id=g[1],
|
|
1698
|
+
crystal_ids=(g[3], g[4]),
|
|
1699
|
+
unknown_fields=(g[2], g[5], g[6], g[7], g[8]),
|
|
1700
|
+
)
|
|
1701
|
+
for g in groups
|
|
1702
|
+
)
|
|
1703
|
+
|
|
1704
|
+
|
|
1705
|
+
def decode_equipment_table(
|
|
1706
|
+
frames: Sequence[BDOFrame],
|
|
1707
|
+
family: DiscoveredSolareFamily,
|
|
1708
|
+
entries: Sequence[SolarePlayer] | Sequence[SolareOverallEntry],
|
|
1709
|
+
*,
|
|
1710
|
+
gear_offset: Optional[int] = None,
|
|
1711
|
+
) -> Optional[dict[str, tuple[SolareClassPerformance, ...]]]:
|
|
1712
|
+
"""Validate equipment independently of addons, for every occupied class slot.
|
|
1713
|
+
|
|
1714
|
+
Registered geometries supply their pinned boundary; only unknown geometries
|
|
1715
|
+
use the bounded CSV boundary finder. Existing class ownership is required.
|
|
1716
|
+
A failed slot withholds equipment for this table, preserving other details.
|
|
1717
|
+
"""
|
|
1718
|
+
by_name = {entry.name: entry for entry in entries}
|
|
1719
|
+
if len(by_name) != family.record_count or any(not e.classes_played for e in entries):
|
|
1720
|
+
return None
|
|
1721
|
+
records = _extract_records(
|
|
1722
|
+
frames, family,
|
|
1723
|
+
expected_frames=family.frame_count,
|
|
1724
|
+
expected_records=family.record_count,
|
|
1725
|
+
)
|
|
1726
|
+
if records is None:
|
|
1727
|
+
return None
|
|
1728
|
+
occupancies = tuple(len(by_name[name].classes_played) for name in records.names)
|
|
1729
|
+
if gear_offset is None:
|
|
1730
|
+
candidates = _raw_base_candidates(
|
|
1731
|
+
records.rows, occupancies,
|
|
1732
|
+
value_count=126,
|
|
1733
|
+
slot_size=_GEAR_SLOT_SIZE,
|
|
1734
|
+
minimum_text_length=300,
|
|
1735
|
+
maximum_text_length=500,
|
|
1736
|
+
)
|
|
1737
|
+
if len(candidates) != 1:
|
|
1738
|
+
return None
|
|
1739
|
+
gear_offset = candidates[0]
|
|
1740
|
+
output: dict[str, tuple[SolareClassPerformance, ...]] = {}
|
|
1741
|
+
for name, row in zip(records.names, records.rows):
|
|
1742
|
+
slots = []
|
|
1743
|
+
for performance in by_name[name].classes_played:
|
|
1744
|
+
start = gear_offset + performance.slot * _GEAR_SLOT_SIZE
|
|
1745
|
+
equipment = _parse_equipment(row[start:start + _GEAR_SLOT_SIZE])
|
|
1746
|
+
if equipment is None:
|
|
1747
|
+
return None
|
|
1748
|
+
slots.append(replace(performance, equipment=equipment))
|
|
1749
|
+
output[name] = tuple(slots)
|
|
1750
|
+
return output
|
|
@@ -25,6 +25,7 @@ from ._constants import (
|
|
|
25
25
|
ADVANCED_SPEC_BY_CLASS,
|
|
26
26
|
EMPTY_CLASS_CODE,
|
|
27
27
|
EMPTY_SPEC_CODE,
|
|
28
|
+
SOLARE_RICH_RECORD_COUNTS,
|
|
28
29
|
class_name,
|
|
29
30
|
)
|
|
30
31
|
from ._discovery import DiscoveredSolareFamily
|
|
@@ -38,8 +39,6 @@ from .models import (
|
|
|
38
39
|
SolareSpecialization,
|
|
39
40
|
)
|
|
40
41
|
|
|
41
|
-
_EXPECTED_RICH_RECORDS = 620
|
|
42
|
-
_EXPECTED_RICH_FRAMES = _EXPECTED_RICH_RECORDS // 2
|
|
43
42
|
_EXPECTED_OVERALL_RECORDS = 100
|
|
44
43
|
_EXPECTED_OVERALL_FRAMES = _EXPECTED_OVERALL_RECORDS // 2
|
|
45
44
|
_CLASS_SLOT_COUNT = 3
|
|
@@ -587,23 +586,25 @@ def decode_solare_details(
|
|
|
587
586
|
"""
|
|
588
587
|
|
|
589
588
|
retain_raw_extensions = validate_retain_raw_extensions(retain_raw_extensions)
|
|
589
|
+
if rich.record_count not in SOLARE_RICH_RECORD_COUNTS:
|
|
590
|
+
return None
|
|
590
591
|
layout = _rich_layout_for(rich)
|
|
591
592
|
if layout is None:
|
|
592
593
|
return None
|
|
593
594
|
locations = _record_locations(
|
|
594
595
|
rich_frames,
|
|
595
|
-
expected_frames=
|
|
596
|
+
expected_frames=rich.record_count // 2,
|
|
596
597
|
frame_length=layout.frame_length,
|
|
597
598
|
record_stride=layout.record_stride,
|
|
598
599
|
required_record_end=layout.required_record_end,
|
|
599
600
|
)
|
|
600
|
-
if locations is None or len(locations) !=
|
|
601
|
+
if locations is None or len(locations) != rich.record_count:
|
|
601
602
|
return None
|
|
602
603
|
if not (
|
|
603
604
|
len(rich.names)
|
|
604
605
|
== len(rich.ranks)
|
|
605
606
|
== len(rich.class_codes)
|
|
606
|
-
==
|
|
607
|
+
== rich.record_count
|
|
607
608
|
):
|
|
608
609
|
return None
|
|
609
610
|
|
|
@@ -648,8 +649,8 @@ def decode_solare_details(
|
|
|
648
649
|
primary_codes.append(primary.code)
|
|
649
650
|
|
|
650
651
|
if (
|
|
651
|
-
len({player.name for player in players}) !=
|
|
652
|
-
or len({player.global_rank for player in players}) !=
|
|
652
|
+
len({player.name for player in players}) != rich.record_count
|
|
653
|
+
or len({player.global_rank for player in players}) != rich.record_count
|
|
653
654
|
or tuple(player.global_rank for player in players[:20]) != tuple(range(1, 21))
|
|
654
655
|
or any(
|
|
655
656
|
left.global_rank >= right.global_rank
|