PyPI - codingpirates-maze - Versions diffs - 0.3.0__tar.gz → 0.4.0__tar.gz - Mend

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codingpirates-maze
-Version: 0.3.0
+Version: 0.4.0
 Summary: Turtle-graphics maze framework and code.org level importer used by Coding Pirates Python puzzles
 License-Expression: Apache-2.0
 Requires-Python: >=3.11

@@ -1,6 +1,6 @@
 [project]
 name = "codingpirates-maze"
-version = "0.3.0"
+version = "0.4.0"
 description = "Turtle-graphics maze framework and code.org level importer used by Coding Pirates Python puzzles"
 readme = "README.md"
 license = "Apache-2.0"

@@ -1,6 +1,6 @@
 [project]
 name = "codingpirates-maze"
-version = "0.3.0"
+version = "0.4.0"
 description = "Turtle-graphics maze framework and code.org level importer used by Coding Pirates Python puzzles"
 readme = "README.md"
 license = "Apache-2.0"

@@ -4,18 +4,20 @@ import math
 import random
 import functools
 import json
-import os
 import sys
-import importlib.resources
-_TESTMODE = os.environ.get('TESTMODE')
+from .resources import get_provider
+try:
+    # os.environ is unavailable under Skulpt (import os raises NotImplementedError there)
+    import os
+    _TESTMODE = os.environ.get('TESTMODE')
+except Exception:
+    _TESTMODE = None
 _TRACER_DELAY = 0 if _TESTMODE == "True" else 15
 _TRACER_N = 0 if _TESTMODE == "True" else 1
-# Get the directory of this Python file
-_DIR_PATH = os.path.dirname(os.path.realpath(__file__))
 class Pen(turtle.Turtle):
     def __init__(self):
@@ -313,15 +315,9 @@ class Maze:
         _TRACER_DELAY = 0
         _TRACER_N = 0
-    # @staticmethod
-    # def shapefile(name: str, ext: str = ".gif") -> str:
-    #     name = os.path.join(Maze.instance.maze_type.subfolder, name)
-    #     return os.path.join(_DIR_PATH, "images", name + ext)
     @staticmethod
     def shapefile(name: str, ext: str = ".gif") -> str:
-        with importlib.resources.path('maze.images.' + Maze.instance.maze_type.subfolder, name + ext) as image_path:
-            return image_path.__str__()
+        return get_provider().get_shape_source(Maze.instance.maze_type.subfolder, name, ext)
     instance = None

@@ -0,0 +1,37 @@
+from .maze import Maze, Player
+from .bee import BeeMazeType
+from .pvz import ZombieMazeType
+from .farmer import FarmerMazeType
+from .harvester import HarvesterMazeType
+from .birds import BirdsMazeType
+from .collector import CollectorMazeType
+from .resources import get_provider
+class Puzzle:
+    mazeTypes = {
+        "bee": BeeMazeType(),
+        "pvz": ZombieMazeType(),
+        "farmer": FarmerMazeType(),
+        "harvester": HarvesterMazeType(),
+        "birds": BirdsMazeType(),
+        "collector": CollectorMazeType()
+    }
+    @staticmethod
+    def from_file(filename):
+        level_json = get_provider().get_level(filename)
+        game_id = level_json.get("game_id")
+        if game_id and int(game_id) == 25:
+            levelProps = level_json['properties']
+            mazeType = Puzzle.mazeTypes[levelProps["skin"]]
+            return Maze(level_json, mazeType)
+        else:
+            print(f"Unknown game_id: {game_id}")
+    @staticmethod
+    def done():
+        Maze.instance.done()

@@ -0,0 +1,115 @@
+"""
+Pluggable resource loading for maze levels/images.
+CPython (desktop, `pip install codingpirates-maze`) resolves levels/images from the local
+filesystem via `DefaultFilesystemProvider`. Skulpt (browser, no real filesystem) instead
+fetches them from a version-pinned CDN via `SkulptBrowserProvider`. The active provider is
+auto-detected via `platform.python_implementation()` so `from maze import Puzzle` just works
+in both environments without any explicit wiring.
+Only `DefaultFilesystemProvider` may import `os`/`importlib.resources`, and only locally
+inside its methods -- those modules raise `NotImplementedError` on import under Skulpt, so
+importing them at module level here (or in puzzle.py/maze.py) would crash `import maze`.
+"""
+import platform
+IS_SKULPT = platform.python_implementation() == "Skulpt"
+# Keep this aligned with the `version` in pyproject.toml and the matching GitHub release tag
+# (see README) so the CDN URL below actually resolves to the release these assets ship with.
+_PACKAGE_VERSION = "0.4.0"
+_GITHUB_REPO = "StefanUG/codingpirates-maze"
+def _default_asset_base_url() -> str:
+    return f"https://cdn.jsdelivr.net/gh/{_GITHUB_REPO}@v{_PACKAGE_VERSION}/src/maze"
+class ResourceProvider:
+    """Strategy for loading level data and shape/image sources."""
+    def get_level(self, name: str) -> dict:
+        """Return the level data (as a plain dict) for a given level name."""
+        raise NotImplementedError
+    def get_shape_source(self, subfolder: str, name: str, ext: str = ".gif") -> str:
+        """Return whatever `screen.register_shape` / `screen.bgpic` need: a local
+        filesystem path (desktop) or an image URL (browser)."""
+        raise NotImplementedError
+class DefaultFilesystemProvider(ResourceProvider):
+    """Reproduces the pre-refactor filesystem-based resolution exactly."""
+    def get_level(self, name: str) -> dict:
+        import importlib.resources
+        import json
+        import os
+        import sys
+        filename = name if name.endswith(".json") else f"{name}.json"
+        script_path = os.path.dirname(os.path.realpath(sys.argv[0]))
+        resolved = None
+        for candidate in (
+            filename,
+            os.path.join(script_path, filename),
+            os.path.join(script_path, "levels", filename),
+        ):
+            if os.path.exists(candidate):
+                resolved = candidate
+                break
+        if resolved is None:
+            packaged = importlib.resources.files("maze.levels").joinpath(os.path.basename(filename))
+            if packaged.is_file():
+                resolved = packaged
+        if resolved is None:
+            raise TypeError("Unable to find file for level " + name)
+        # `resolved` is either a plain path (str) or an importlib.resources Traversable
+        opener = resolved.open if hasattr(resolved, "open") else lambda: open(resolved)
+        with opener() as fp:
+            return json.load(fp)
+    def get_shape_source(self, subfolder: str, name: str, ext: str = ".gif") -> str:
+        import importlib.resources
+        with importlib.resources.path("maze.images." + subfolder, name + ext) as image_path:
+            return str(image_path)
+class SkulptBrowserProvider(ResourceProvider):
+    """Only ever instantiated when IS_SKULPT is True."""
+    def __init__(self, asset_base_url: str):
+        self.asset_base_url = asset_base_url
+    def get_level(self, name: str) -> dict:
+        import json
+        import urllib.request
+        filename = name if name.endswith(".json") else f"{name}.json"
+        url = f"{self.asset_base_url}/levels/{filename}"
+        return json.loads(urllib.request.urlopen(url).read())
+    def get_shape_source(self, subfolder: str, name: str, ext: str = ".gif") -> str:
+        # No fetch needed -- Skulpt's turtle loads images from a URL itself.
+        return f"{self.asset_base_url}/images/{subfolder}/{name}{ext}"
+_provider: ResourceProvider = (
+    SkulptBrowserProvider(_default_asset_base_url()) if IS_SKULPT
+    else DefaultFilesystemProvider()
+)
+def set_provider(provider: ResourceProvider) -> None:
+    """Escape hatch for tests or to override the auto-picked default."""
+    global _provider
+    _provider = provider
+def get_provider() -> ResourceProvider:
+    return _provider

@@ -1,11 +1,13 @@
 import turtle
-import datetime
-import subprocess
 """
 Module to capture a turtle screen into image files
 """
 def capture(screen:turtle.Screen, filename=None):
+  # desktop-only tool: subprocess/datetime are unavailable under Skulpt, so import lazily
+  import datetime
+  import subprocess
   if (not filename):
     dt = datetime.datetime.now()
     filename = dt.strftime("%Y-%m-%d %H.%M.%S") + " screen"

codingpirates-maze 0.3.0__tar.gz → 0.4.0__tar.gz

codingpirates-maze 0.3.0tar.gz → 0.4.0tar.gz