sonolus.py 0.7.0__tar.gz → 0.7.1__tar.gz

{sonolus_py-0.7.0 → sonolus_py-0.7.1}/PKG-INFO

@@ -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 → sonolus_py-0.7.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sonolus.py"
-version = "0.7.0"
+version = "0.7.1"
 description = "Sonolus engine development in Python"
 readme = "README.md"
 requires-python = ">=3.12"

{sonolus_py-0.7.0 → sonolus_py-0.7.1}/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_py-0.7.0 → sonolus_py-0.7.1}/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_py-0.7.0 → sonolus_py-0.7.1}/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_py-0.7.0 → sonolus_py-0.7.1}/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_py-0.7.0 → sonolus_py-0.7.1}/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_py-0.7.0 → sonolus_py-0.7.1}/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 → sonolus_py-0.7.1}/uv.lock

@@ -696,7 +696,7 @@ wheels = [
 
 [[package]]
 name = "sonolus-py"
-version = "0.7.0"
+version = "0.7.1"
 source = { editable = "." }
 
 [package.dev-dependencies]