sonolus.py 0.10.3__tar.gz → 0.10.4__tar.gz

{sonolus_py-0.10.3 → sonolus_py-0.10.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sonolus.py
-Version: 0.10.3
+Version: 0.10.4
 Summary: Sonolus engine development in Python
 Project-URL: Documentation, https://sonolus.py.qwewqa.xyz/
 Project-URL: Repository, https://github.com/qwewqa/sonolus.py

{sonolus_py-0.10.3 → sonolus_py-0.10.4}/docs/changelog/index.md

@@ -1,6 +1,10 @@
+### 0.10.4
+
+- Fixed the dev server becoming unresponsive after a command syntax error
+
 ### 0.10.3
 
-- Add `--runtime-checks {none,terminate,notify}` to the `dev` and `build` commands to override runtime check
+- Added `--runtime-checks {none,terminate,notify}` to the `dev` and `build` commands to override runtime check
   (e.g. assertion) behavior
 
 ### 0.10.2

{sonolus_py-0.10.3 → sonolus_py-0.10.4}/pyproject.toml

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

{sonolus_py-0.10.3 → sonolus_py-0.10.4}/sonolus/build/dev_server.py

@@ -57,7 +57,8 @@ DETAILED_HELP_TEXT = [
         description=[
             (
                 "Decode a debug message code to its original text with a stack trace. "
-                "Message codes are generated by assert statements, debug.error(), and debug.notify() calls. "
+                "Message codes are generated by assert statements and certain debug-related functions such as "
+                "debug.error() and debug.notify(). "
                 "The game is automatically paused when these are triggered in debug mode and the message code "
                 "can be found in the debug log."
             ),
@@ -189,7 +190,13 @@ def parse_dev_command(command_line: str) -> Command | None:
     subparsers.add_parser("quit", aliases=["q"])
 
     try:
-        args = parser.parse_args(shlex.split(command_line))
+        split_args = shlex.split(command_line)
+    except ValueError as e:
+        print(f"Error parsing command: {e}\n")
+        return None
+
+    try:
+        args = parser.parse_args(split_args)
         if args.cmd in {"rebuild", "r"}:
             return RebuildCommand()
         elif args.cmd in {"decode", "d"}:
@@ -226,8 +233,7 @@ def command_input_thread(command_queue: queue.Queue, prompt_event: threading.Eve
         except EOFError:
             break
         except Exception as e:
-            print(f"Error reading command: {e}")
-            break
+            print(f"Error reading command: {e}\n")
 
 
 def get_local_ips():
@@ -311,12 +317,12 @@ def run_server(
 
             try:
                 while True:
+                    cmd = command_queue.get()
                     try:
-                        cmd = command_queue.get(timeout=0.5)
                         cmd.execute(server_state)
-                        prompt_event.set()
-                    except queue.Empty:
-                        continue
+                    except Exception:
+                        print(f"{traceback.format_exc()}\n")
+                    prompt_event.set()
             except KeyboardInterrupt:
                 print("Exiting...")
                 sys.exit(0)

{sonolus_py-0.10.3 → sonolus_py-0.10.4}/sonolus/script/array.py

@@ -30,6 +30,8 @@ class ArrayMeta(ABCMeta):
 class Array[T, Size](GenericValue, ArrayLike[T], metaclass=ArrayMeta):
     """A fixed size array of values.
 
+    Supports negative indexes.
+
     Usage:
         ```python
         array_1 = Array(1, 2, 3)

{sonolus_py-0.10.3 → sonolus_py-0.10.4}/sonolus/script/containers.py

@@ -87,6 +87,8 @@ class Pair[T, U](Record):
 class VarArray[T, Capacity](Record, ArrayLike[T]):
     """An array with a variable size and fixed maximum capacity.
 
+    Supports negative indexes.
+
     Usage:
         ```python
         VarArray[T, Capacity].new()  # Create a new empty array
@@ -125,6 +127,8 @@ class VarArray[T, Capacity](Record, ArrayLike[T]):
     def __getitem__(self, item) -> T:
         """Return the element at the given index.
 
+        Supports negative indexes.
+
         The returned value continues to be part of the array.
         Future modifications to the array will affect the returned value.
 
@@ -310,6 +314,8 @@ class VarArray[T, Capacity](Record, ArrayLike[T]):
 class ArrayPointer[T](Record, ArrayLike[T]):
     """An array defined by a size and pointer to the first element.
 
+    Supports negative indexes.
+
     This is intended to be created internally and improper use may result in hard to debug issues.
 
     Usage:

{sonolus_py-0.10.3 → sonolus_py-0.10.4}/sonolus/script/debug.py

@@ -106,11 +106,10 @@ def notify(message: str):
 def require(value: int | float | bool, message: str | None = None):
     """Require a condition to be true, or raise an error.
 
-    Similar to assert, but does not get stripped in non-dev builds.
+    Similar to assert, but will terminate the current callback even if runtime checks are set to none.
 
-    If in a dev build, this function will log a message and pause the game if the condition is false.
-
-    In non-dev builds, this function will terminate the current callback silently if the condition is false.
+    If runtime checks are set to notify (default in dev), this function will log a message and pause the game
+    before terminating.
 
     Args:
         value: The condition to check.

{sonolus_py-0.10.3 → sonolus_py-0.10.4}/sonolus/script/effect.py

@@ -98,6 +98,8 @@ class ScheduledLoopedEffectHandle(Record):
 class EffectGroup(Record, ArrayLike[Effect]):
     """A group of effect clips.
 
+    Does not support negative indexes.
+
     Usage:
         ```python
         EffectGroup(start_id: int, size: int)

{sonolus_py-0.10.3 → sonolus_py-0.10.4}/sonolus/script/particle.py

@@ -58,6 +58,8 @@ class ParticleHandle(Record):
 class ParticleGroup(Record, ArrayLike[Particle]):
     """A group of particle effects.
 
+    Does not support negative indexes.
+
     Usage:
         ```python
         ParticleGroup(start_id: int, size: int)

{sonolus_py-0.10.3 → sonolus_py-0.10.4}/sonolus/script/sprite.py

@@ -126,6 +126,8 @@ class Sprite(Record):
 class SpriteGroup(Record, ArrayLike[Sprite]):
     """A group of sprites.
 
+    Does not support negative indexes.
+
     Usage:
         ```python
         SpriteGroup(start_id: int, size: int)

{sonolus_py-0.10.3 → sonolus_py-0.10.4}/sonolus/script/stream.py

@@ -470,6 +470,8 @@ class Stream[T](Record):
 class StreamGroup[T, Size](Record):
     """Represents a group of streams.
 
+    Does not support negative indexes.
+
     Most users should use [`@streams`][sonolus.script.stream.streams] to declare stream groups rather than using this
     class directly.
 
@@ -507,7 +509,10 @@ class StreamGroup[T, Size](Record):
         return 0 <= item < self.size()
 
     def __getitem__(self, index: int) -> Stream[T]:
-        """Get the stream at the given index."""
+        """Get the stream at the given index.
+
+        Does not support negative indexes.
+        """
         _check_can_read_or_write_stream()
         check_positive_index(index, self.size())
         # Size 0 elements still need 1 stream to preserve the key.

{sonolus_py-0.10.3 → sonolus_py-0.10.4}/uv.lock

@@ -727,7 +727,7 @@ wheels = [
 
 [[package]]
 name = "sonolus-py"
-version = "0.10.3"
+version = "0.10.4"
 source = { editable = "." }
 
 [package.dev-dependencies]

sonolus_py-0.10.3/scripts/generate.py

@@ -1,89 +0,0 @@
-import json
-from pathlib import Path
-from typing import TextIO
-
-functions_file = "Functions.json"
-block_files = {
-    "Tutorial": "Engine/Tutorial/Blocks.json",
-    "Play": "Level/Play/Blocks.json",
-    "Preview": "Level/Preview/Blocks.json",
-    "Watch": "Level/Watch/Blocks.json",
-}
-base_dir = Path(__file__).parent
-out_dir = base_dir / "out"
-runtimes_dir = base_dir / "runtimes"
-
-
-def functions():
-    with (
-        (runtimes_dir / functions_file).open("r", encoding="utf-8") as f,
-        (out_dir / "ops.py").open("w", encoding="utf-8") as out,
-    ):
-        data = json.load(f)
-        out.write(
-            "from enum import Enum\n"
-            "\n"
-            "\n"
-            "class Op(str, Enum):\n"
-            "    def __new__(cls, name: str, side_effects: bool, pure: bool, control_flow: bool):\n"
-            "        obj = str.__new__(cls, name)\n"
-            "        obj._value_ = name\n"
-            "        obj.side_effects = side_effects\n"
-            "        obj.pure = pure\n"
-            "        obj.control_flow = control_flow\n"
-            "        return obj\n"
-            "\n"
-        )
-        for function in data:
-            name = function["name"]
-            side_effects = function["sideEffects"]
-            pure = function["pure"]
-            control_flow = function["controlFlow"]
-            out.write(f'    {name} = ("{name}", {side_effects}, {pure}, {control_flow})\n')
-
-
-def block(name: str, f: TextIO, out: TextIO):
-    data = json.load(f)
-    out.write(f"class {name}Block(_Block, Enum):\n")
-    for block in data:
-        name = block["name"]
-        id_ = block["id"]
-        readable = block["readable"]
-        writable = block["writable"]
-        out.write(
-            f"    {name} = ({id_}, {{{', '.join(f'"{e}"' for e in readable)}}}, {{{
-                ', '.join(f'"{e}"' for e in writable)
-            }}})\n"
-        )
-
-
-def blocks():
-    with (out_dir / "blocks.py").open("w", encoding="utf-8") as out:
-        out.write(
-            "from enum import Enum\n"
-            "\n"
-            "\n"
-            "class _Block(int):\n"
-            "    def __new__(cls, id_: int, readable: set[str], writable: set[str]):\n"
-            "        obj = int.__new__(cls, id_)\n"
-            "        obj.readable = readable\n"
-            "        obj.writable = writable\n"
-            "        return obj\n"
-        )
-        for name, file in block_files.items():
-            out.write("\n\n")
-            with (
-                (runtimes_dir / file).open("r", encoding="utf-8") as f,
-            ):
-                block(name, f, out)
-        out.write(f"\n\ntype Block = {' | '.join(f'{name}Block' for name in block_files)}\n")
-
-
-def main():
-    out_dir.mkdir(exist_ok=True)
-    functions()
-    blocks()
-
-
-if __name__ == "__main__":
-    main()

sonolus_py-0.10.3/scripts/runtimes/Engine/Tutorial/Blocks.json

@@ -1,315 +0,0 @@
-[
-    {
-        "name": "RuntimeEnvironment",
-        "id": 1000,
-        "readable": [
-            "preprocess",
-            "navigate",
-            "update"
-        ],
-        "writable": [
-            "preprocess"
-        ],
-        "values": [
-            {
-                "type": "item",
-                "name": "debugMode"
-            },
-            {
-                "type": "item",
-                "name": "screenAspectRatio"
-            },
-            {
-                "type": "item",
-                "name": "audioOffset"
-            }
-        ]
-    },
-    {
-        "name": "RuntimeUpdate",
-        "id": 1001,
-        "readable": [
-            "preprocess",
-            "navigate",
-            "update"
-        ],
-        "writable": [],
-        "values": [
-            {
-                "type": "item",
-                "name": "time"
-            },
-            {
-                "type": "item",
-                "name": "deltaTime"
-            },
-            {
-                "type": "item",
-                "name": "navigationDirection"
-            }
-        ]
-    },
-    {
-        "name": "RuntimeSkinTransform",
-        "id": 1002,
-        "readable": [
-            "preprocess",
-            "navigate",
-            "update"
-        ],
-        "writable": [
-            "preprocess",
-            "navigate",
-            "update"
-        ],
-        "values": [
-            {
-                "type": "item",
-                "name": "m",
-                "count": 16
-            }
-        ]
-    },
-    {
-        "name": "RuntimeParticleTransform",
-        "id": 1003,
-        "readable": [
-            "preprocess",
-            "navigate",
-            "update"
-        ],
-        "writable": [
-            "preprocess",
-            "navigate",
-            "update"
-        ],
-        "values": [
-            {
-                "type": "item",
-                "name": "m",
-                "count": 16
-            }
-        ]
-    },
-    {
-        "name": "RuntimeBackground",
-        "id": 1004,
-        "readable": [
-            "preprocess",
-            "navigate",
-            "update"
-        ],
-        "writable": [
-            "preprocess",
-            "navigate",
-            "update"
-        ],
-        "values": [
-            {
-                "type": "group",
-                "items": [
-                    {
-                        "type": "item",
-                        "name": "x"
-                    },
-                    {
-                        "type": "item",
-                        "name": "y"
-                    }
-                ],
-                "count": 4
-            }
-        ]
-    },
-    {
-        "name": "RuntimeUI",
-        "id": 1005,
-        "readable": [
-            "preprocess",
-            "navigate",
-            "update"
-        ],
-        "writable": [
-            "preprocess"
-        ],
-        "values": [
-            {
-                "type": "group",
-                "items": [
-                    {
-                        "type": "item",
-                        "name": "anchorX"
-                    },
-                    {
-                        "type": "item",
-                        "name": "anchorY"
-                    },
-                    {
-                        "type": "item",
-                        "name": "pivotX"
-                    },
-                    {
-                        "type": "item",
-                        "name": "pivotY"
-                    },
-                    {
-                        "type": "item",
-                        "name": "width"
-                    },
-                    {
-                        "type": "item",
-                        "name": "height"
-                    },
-                    {
-                        "type": "item",
-                        "name": "rotation"
-                    },
-                    {
-                        "type": "item",
-                        "name": "alpha"
-                    },
-                    {
-                        "type": "item",
-                        "name": "background"
-                    }
-                ],
-                "forEach": [
-                    "menu",
-                    "navigationPrevious",
-                    "navigationNext",
-                    "instruction"
-                ]
-            }
-        ]
-    },
-    {
-        "name": "RuntimeUIConfiguration",
-        "id": 1006,
-        "readable": [
-            "preprocess",
-            "navigate",
-            "update"
-        ],
-        "writable": [
-            "preprocess"
-        ],
-        "values": [
-            {
-                "type": "group",
-                "items": [
-                    {
-                        "type": "item",
-                        "name": "scale"
-                    },
-                    {
-                        "type": "item",
-                        "name": "alpha"
-                    }
-                ],
-                "forEach": [
-                    "menu",
-                    "navigation",
-                    "instruction"
-                ]
-            }
-        ]
-    },
-    {
-        "name": "TutorialMemory",
-        "id": 2000,
-        "readable": [
-            "preprocess",
-            "navigate",
-            "update"
-        ],
-        "writable": [
-            "preprocess",
-            "navigate",
-            "update"
-        ],
-        "values": [
-            {
-                "type": "item",
-                "name": "generic",
-                "count": 4096
-            }
-        ]
-    },
-    {
-        "name": "TutorialData",
-        "id": 2001,
-        "readable": [
-            "preprocess",
-            "navigate",
-            "update"
-        ],
-        "writable": [
-            "preprocess"
-        ],
-        "values": [
-            {
-                "type": "item",
-                "name": "generic",
-                "count": 4096
-            }
-        ]
-    },
-    {
-        "name": "TutorialInstruction",
-        "id": 2002,
-        "readable": [
-            "preprocess",
-            "navigate",
-            "update"
-        ],
-        "writable": [
-            "preprocess",
-            "navigate",
-            "update"
-        ],
-        "values": [
-            {
-                "type": "item",
-                "name": "text"
-            }
-        ]
-    },
-    {
-        "name": "EngineRom",
-        "id": 3000,
-        "readable": [
-            "preprocess",
-            "navigate",
-            "update"
-        ],
-        "writable": [],
-        "values": [
-            {
-                "type": "item",
-                "name": "rom",
-                "minCount": 0
-            }
-        ]
-    },
-    {
-        "name": "TemporaryMemory",
-        "id": 10000,
-        "readable": [
-            "preprocess",
-            "navigate",
-            "update"
-        ],
-        "writable": [
-            "preprocess",
-            "navigate",
-            "update"
-        ],
-        "values": [
-            {
-                "type": "item",
-                "name": "generic",
-                "count": 4096
-            }
-        ]
-    }
-]