sonolus.py 0.7.0__py3-none-any.whl → 0.7.1__py3-none-any.whl

sonolus/build/collection.py

@@ -129,7 +129,7 @@ class Collection:
                         resource_data = resource_path.read_bytes()
 
                         if resource_path.suffix.lower() in {".json", ".bin"}:
-                            resource_data = gzip.compress(resource_data)
+                            resource_data = gzip.compress(resource_data, mtime=0)
 
                         srl = self.add_asset(resource_data)
                         item_data[resource_path.stem] = srl

sonolus/build/engine.py

@@ -407,12 +407,12 @@ def package_rom(rom: ReadOnlyMemory) -> bytes:
     for value in values:
         output.extend(struct.pack("<f", value))
 
-    return gzip.compress(bytes(output))
+    return gzip.compress(bytes(output), mtime=0)
 
 
 def package_data(value: JsonValue) -> bytes:
     json_data = json.dumps(value, separators=(",", ":")).encode("utf-8")
-    return gzip.compress(json_data)
+    return gzip.compress(json_data, mtime=0)
 
 
 def unpackage_data(data: bytes) -> JsonValue:

sonolus/build/project.py

@@ -39,7 +39,7 @@ def build_project_to_collection(project: Project, config: BuildConfig | None):
 
 
 def apply_converter_to_collection(
-    self, src_engine: str | None, converter: Callable[[ExternalLevelData], LevelData]
+    self, src_engine: str | None, converter: Callable[[ExternalLevelData], LevelData | None]
 ) -> None:
     for level_details in self.categories.get("levels", {}).values():
         level = level_details["item"]
@@ -56,6 +56,8 @@ def apply_converter_to_collection(
             raise ValueError(f"Level data for level '{level['name']}' is not valid")
         parsed_data = parse_external_level_data(cast(ExternalLevelDataDict, data))
         new_data = converter(parsed_data)
+        if new_data is None:
+            continue
         packaged_new_data = package_level_data(new_data)
         new_data_srl = self.add_asset(packaged_new_data)
         level["data"] = new_data_srl

sonolus/script/archetype.py

@@ -1233,6 +1233,11 @@ class EntityRef[A: _BaseArchetype](Record):
             return self._ref_ is other._ref_
         return super().__eq__(other)
 
+    def __hash__(self) -> int:
+        if not ctx() and hasattr(self, "_ref_"):
+            return hash(id(self._ref_))
+        return super().__hash__()
+
     @meta_fn
     def get(self) -> A:
         """Get the entity."""

sonolus/script/level.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import gzip
 import json
 from collections.abc import Iterator
 from os import PathLike
@@ -229,7 +230,21 @@ class ExternalEntityData(NamedTuple):
     data: dict[str, Any]
 
 
-def parse_external_level_data(raw_data: ExternalLevelDataDict) -> ExternalLevelData:
+def parse_external_level_data(raw_data: ExternalLevelDataDict | str | bytes, /) -> ExternalLevelData:
+    """Parse level data from an external source.
+
+    If given a string, it is parsed as JSON. If given bytes, it is un-gzipped and then parsed as JSON.
+
+    Args:
+        raw_data: The raw level data to parse.
+
+    Returns:
+        The parsed level data.
+    """
+    if isinstance(raw_data, bytes):
+        raw_data = gzip.decompress(raw_data).decode("utf-8")
+    if isinstance(raw_data, str):
+        raw_data = json.loads(raw_data)
     bgm_offset = raw_data["bgmOffset"]
     raw_entities = raw_data["entities"]
     entity_name_to_index = {e["name"]: i for i, e in enumerate(raw_entities) if "name" in e}

sonolus/script/project.py

@@ -28,7 +28,7 @@ class Project:
         engine: Engine,
         levels: Iterable[Level] | Callable[[], Iterable[Level]] | None = None,
         resources: PathLike | None = None,
-        converters: dict[str | None, Callable[[ExternalLevelData], LevelData]] | None = None,
+        converters: dict[str | None, Callable[[ExternalLevelData], LevelData | None]] | None = None,
     ):
         self.engine = engine
         match levels:

{sonolus_py-0.7.0.dist-info → sonolus_py-0.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sonolus.py
-Version: 0.7.0
+Version: 0.7.1
 Summary: Sonolus engine development in Python
 License-File: LICENSE
 Requires-Python: >=3.12

{sonolus_py-0.7.0.dist-info → sonolus_py-0.7.1.dist-info}/RECORD

@@ -27,14 +27,14 @@ sonolus/backend/optimize/simplify.py,sha256=RDNVTKfC7ByRyxY5z30_ShimOAKth_pKlVFV
 sonolus/backend/optimize/ssa.py,sha256=raQO0furQQRPYb8iIBKfNrJlj-_5wqtI4EWNfLZ8QFo,10834
 sonolus/build/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sonolus/build/cli.py,sha256=-_lTN8zT7nQB2lySM8itAEPVutcEQI-TJ13BcPIfGb4,10113
-sonolus/build/collection.py,sha256=sMYLfEIVn6UydLy7iEnNwrpIXDs7bGG32uQQgHXyhSI,12289
+sonolus/build/collection.py,sha256=5TvltBugFmIrvZC5HSP3LRZe6sjO9g6q-DHjBrovHsg,12298
 sonolus/build/compile.py,sha256=Yex-ZbSZmv9ujyAOVaMcfq-0NnZzFIqtmNYYaplF4Uc,6761
-sonolus/build/engine.py,sha256=xPhNnaFkfAuflp7CYb2NrXTgh9xCNN2h_hT_uWAYl1g,13445
+sonolus/build/engine.py,sha256=YQ2Sc2zC56N2Y5S5zE3QCoUzwKcVHSPl14iQE0tkm6Q,13463
 sonolus/build/level.py,sha256=KLqUAtxIuIqrzeFURJA97rdqjA5pcvYSmwNZQhElaMQ,702
 sonolus/build/node.py,sha256=gnX71RYDUOK_gYMpinQi-bLWO4csqcfiG5gFmhxzSec,1330
-sonolus/build/project.py,sha256=h-9tcC60KqrpUOxGHFCK9trGVhGPUkciXiibasBEzu4,8097
+sonolus/build/project.py,sha256=__sOJas3RTwn4aizq16rYCvZgG8aX-JbQaxmfVhRnc4,8154
 sonolus/script/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sonolus/script/archetype.py,sha256=xoBVt4sQcC0e1ikyaM4NfcDZrMrJ0lHHUrxznl6dsU4,49492
+sonolus/script/archetype.py,sha256=xhdm1jO_p32V1NtGjgV0SGPm7X9GnJ6Z7hXi2zT69Ww,49647
 sonolus/script/array.py,sha256=9uOUHZIDMyMT9q3APcXJWXWt97yG-AZoRlxwrvSY6SU,12367
 sonolus/script/array_like.py,sha256=hUDdDaP306kflVv9YomdHIMXogrVjxsBXCrLvB9QpuE,9681
 sonolus/script/bucket.py,sha256=SNqnfLGpnO_u-3LFFazdgzNk332OdDUIlmZHsuoVZuE,7674
@@ -47,7 +47,7 @@ sonolus/script/globals.py,sha256=nlXSNS4NRXsgQU2AJImVIs752h1WqsMnShSKgU011c4,102
 sonolus/script/instruction.py,sha256=Dd-14D5Amo8nhPBr6DNyg2lpYw_rqZkT8Kix3HkfE7k,6793
 sonolus/script/interval.py,sha256=dj6F2wn5uP6I6_mcZn-wIREgRUQbsLzhvhzB0oEyAdU,11290
 sonolus/script/iterator.py,sha256=_ICY_yX7FG0Zbgs3NhVnaIBdVDpAeXjxJ_CQtq30l7Y,3774
-sonolus/script/level.py,sha256=5M_XTzvXpFZTY-ODlS6M3GOiCIYN3F8rFuUgOiGxVBI,7824
+sonolus/script/level.py,sha256=X3-V99ihruYYCcPdch66dHi_ydCWXXn7epviLLjxW8w,8288
 sonolus/script/maybe.py,sha256=VYvTWgEfPzoXqI3i3zXhc4dz0pWBVoHmW8FtWH0GQvM,8194
 sonolus/script/metadata.py,sha256=ttRK27eojHf3So50KQJ-8yj3udZoN1bli5iD-knaeLw,753
 sonolus/script/num.py,sha256=924kWWZusW7oaWuvtQzdAMzkb4ZItWSJwNj3W9XrqZU,16041
@@ -55,7 +55,7 @@ sonolus/script/options.py,sha256=XVN-mL7Rwhd2Tu9YysYq9YDGpH_LazdmhqzSYE6nR3Q,945
 sonolus/script/particle.py,sha256=RTfamg_ZTq7-qJ6j9paduNVUHCkw3hzkBK1QUbwwN7I,8403
 sonolus/script/pointer.py,sha256=FoOfyD93r0G5d_2BaKfeOT9SqkOP3hq6sqtOs_Rb0c8,1511
 sonolus/script/printing.py,sha256=mNYu9QWiacBBGZrnePZQMVwbbguoelUps9GiOK_aVRU,2096
-sonolus/script/project.py,sha256=a9bRY5T8deRMR35iC-6cuqn4HiKwZHvVy9K-np-rAfI,4432
+sonolus/script/project.py,sha256=gG6mYsGlIqznY_RODyFMiXVBh0tVbXLAWZ5LHCiBIuU,4439
 sonolus/script/quad.py,sha256=XoAjaUqR60zIrC_CwheZs7HwS-DRS58yUmlj9GIjX7k,11179
 sonolus/script/record.py,sha256=igmawc0hqb98YVcZnPTThHvnIP88Qelhoge4cNJx45Q,12770
 sonolus/script/runtime.py,sha256=rJZM_KbKmnwpjhDEpR0DrM6EMSEu46apIErWA_pfLJA,33321
@@ -86,8 +86,8 @@ sonolus/script/internal/simulation_context.py,sha256=LGxLTvxbqBIhoe1R-SfwGajNIDw
 sonolus/script/internal/transient.py,sha256=y2AWABqF1aoaP6H4_2u4MMpNioC4OsZQCtPyNI0txqo,1634
 sonolus/script/internal/tuple_impl.py,sha256=DPNdmmRmupU8Ah4_XKq6-PdT336l4nt15_uCJKQGkkk,3587
 sonolus/script/internal/value.py,sha256=OngrCdmY_h6mV2Zgwqhuo4eYFad0kTk6263UAxctZcY,6963
-sonolus_py-0.7.0.dist-info/METADATA,sha256=aTrZv-zipIgHI36FFgSO_bmIjPOAixQa4-CdHcq7Cvc,302
-sonolus_py-0.7.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sonolus_py-0.7.0.dist-info/entry_points.txt,sha256=oTYspY_b7SA8TptEMTDxh4-Aj-ZVPnYC9f1lqH6s9G4,54
-sonolus_py-0.7.0.dist-info/licenses/LICENSE,sha256=JEKpqVhQYfEc7zg3Mj462sKbKYmO1K7WmvX1qvg9IJk,1067
-sonolus_py-0.7.0.dist-info/RECORD,,
+sonolus_py-0.7.1.dist-info/METADATA,sha256=p9fNorfrM-GbAWcBdMkyFjWt5mTc3xVnEXrZLql5AqQ,302
+sonolus_py-0.7.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sonolus_py-0.7.1.dist-info/entry_points.txt,sha256=oTYspY_b7SA8TptEMTDxh4-Aj-ZVPnYC9f1lqH6s9G4,54
+sonolus_py-0.7.1.dist-info/licenses/LICENSE,sha256=JEKpqVhQYfEc7zg3Mj462sKbKYmO1K7WmvX1qvg9IJk,1067
+sonolus_py-0.7.1.dist-info/RECORD,,