fastled 1.2.40__py3-none-any.whl → 1.2.42__py3-none-any.whl

fastled/__init__.py

@@ -1,8 +1,5 @@
 """FastLED Wasm Compiler package."""
 
-# context
-import shutil
-import subprocess
 from contextlib import contextmanager
 from multiprocessing import Process
 from pathlib import Path
@@ -16,7 +13,11 @@ from .types import BuildMode, CompileResult, CompileServerError
 # IMPORTANT! There's a bug in github which will REJECT any version update
 # that has any other change in the repo. Please bump the version as the
 # ONLY change in a commit, or else the pypi update and the release will fail.
-__version__ = "1.2.40"
+__version__ = "1.2.42"
+
+DOCKER_FILE = (
+    "https://raw.githubusercontent.com/zackees/fastled-wasm/refs/heads/main/Dockerfile"
+)
 
 
 class Api:
@@ -156,188 +157,6 @@ class Docker:
         docker_mgr = DockerManager()
         docker_mgr.purge(image_name=IMAGE_NAME)
 
-    @staticmethod
-    def spawn_server_from_github(
-        url: str = "https://github.com/fastled/fastled",
-        output_dir: Path | str = Path(".cache/fastled"),
-    ) -> CompileServer:
-        """Build the FastLED WASM compiler Docker image from a GitHub repository.
-
-        Args:
-            url: GitHub repository URL (default: https://github.com/fastled/fastled)
-            output_dir: Directory to clone the repo into (default: .cache/fastled)
-
-        Returns:
-            Container name.
-        """
-
-        from fastled.docker_manager import DockerManager
-        from fastled.settings import CONTAINER_NAME, IMAGE_NAME
-
-        if isinstance(output_dir, str):
-            output_dir = Path(output_dir)
-
-        # Create output directory if it doesn't exist
-        output_dir.mkdir(parents=True, exist_ok=True)
-
-        git_dir = output_dir / ".git"
-        library_properties = output_dir / "library.properties"
-
-        git_dir_exists = git_dir.exists()
-        library_properties_exists = library_properties.exists()
-        library_properties_text = (
-            library_properties.read_text().strip() if library_properties_exists else ""
-        )
-
-        already_exists = (
-            git_dir_exists
-            and library_properties_exists
-            and "FastLED" in library_properties_text
-        )
-        if git_dir_exists and not already_exists:
-            if ".cache/fastled" in str(output_dir.as_posix()):
-                shutil.rmtree(output_dir)
-                already_exists = False
-            else:
-                raise ValueError(
-                    f"Output directory {output_dir} already exists but does not appear to be a FastLED repository."
-                )
-
-        # Clone or update the repository
-        if already_exists:
-            print(f"Updating existing repository in {output_dir}")
-            # Reset local changes and move HEAD back to handle force pushes
-            subprocess.run(
-                ["git", "reset", "--hard", "HEAD~10"],
-                cwd=output_dir,
-                check=False,
-                capture_output=True,  # Suppress output of reset
-            )
-            subprocess.run(
-                ["git", "pull", "origin", "master"], cwd=output_dir, check=True
-            )
-        else:
-            print(f"Cloning {url} into {output_dir}")
-            subprocess.run(
-                ["git", "clone", "--depth", "1", url, str(output_dir)], check=True
-            )
-
-        dockerfile_path = (
-            output_dir / "src" / "platforms" / "wasm" / "compiler" / "Dockerfile"
-        )
-
-        if not dockerfile_path.exists():
-            raise FileNotFoundError(
-                f"Dockerfile not found at {dockerfile_path}. "
-                "This may not be a valid FastLED repository."
-            )
-
-        docker_mgr = DockerManager()
-
-        platform_tag = ""
-        # if "arm" in docker_mgr.architecture():
-        if (
-            "arm"
-            in subprocess.run(["uname", "-m"], capture_output=True).stdout.decode()
-        ):
-            platform_tag = "-arm64"
-
-        # Build the image
-        docker_mgr.build_image(
-            image_name=IMAGE_NAME,
-            tag="main",
-            dockerfile_path=dockerfile_path,
-            build_context=output_dir,
-            build_args={"NO_PREWARM": "1"},
-            platform_tag=platform_tag,
-        )
-
-        # # Run the container and return it
-        # container = docker_mgr.run_container_detached(
-        #     image_name=IMAGE_NAME,
-        #     tag="main",
-        #     container_name=CONTAINER_NAME,
-        #     command=None,  # Use default command from Dockerfile
-        #     volumes=None,  # No volumes needed for build
-        #     ports=None,  # No ports needed for build
-        #     remove_previous=True,  # Remove any existing container
-        # )
-        # name = container.name
-        # container.stop()
-
-        out: CompileServer = CompileServer(
-            container_name=CONTAINER_NAME,
-            interactive=False,
-            auto_updates=False,
-            mapped_dir=None,
-            auto_start=True,
-            remove_previous=True,
-        )
-
-        return out
-
-    @staticmethod
-    def spawn_server_from_fastled_repo(
-        project_root: Path | str = Path("."),
-        interactive: bool = False,
-        sketch_folder: Path | None = None,
-    ) -> CompileServer:
-        """Build the FastLED WASM compiler Docker image, which will be tagged as "main".
-
-        Args:
-            project_root: Path to the FastLED project root directory
-            platform_tag: Optional platform tag (e.g. "-arm64" for ARM builds)
-
-        Returns:
-            The string name of the docker container.
-        """
-        from fastled.docker_manager import DockerManager
-        from fastled.settings import CONTAINER_NAME, IMAGE_NAME
-
-        project_root = Path(project_root)
-        if interactive:
-            if sketch_folder is None:
-                sketch_folder = project_root / "examples" / "wasm"
-
-        if isinstance(project_root, str):
-            project_root = Path(project_root)
-
-        dockerfile_path = (
-            project_root / "src" / "platforms" / "wasm" / "compiler" / "Dockerfile"
-        )
-        docker_mgr = DockerManager()
-        platform_tag = ""
-        # if "arm" in docker_mgr.architecture():
-        if (
-            "arm"
-            in subprocess.run(["uname", "-m"], capture_output=True).stdout.decode()
-        ):
-            platform_tag = "-arm64"
-
-        # if image exists, remove it
-        docker_mgr.purge(image_name=IMAGE_NAME)
-
-        # Build the image
-        docker_mgr.build_image(
-            image_name=IMAGE_NAME,
-            tag="main",
-            dockerfile_path=dockerfile_path,
-            build_context=project_root,
-            build_args={"NO_PREWARM": "1"},
-            platform_tag=platform_tag,
-        )
-
-        out: CompileServer = CompileServer(
-            container_name=CONTAINER_NAME,
-            interactive=interactive,
-            auto_updates=False,
-            mapped_dir=sketch_folder,
-            auto_start=True,
-            remove_previous=True,
-        )
-
-        return out
-
 
 class Tools:
     @staticmethod

fastled/app.py

@@ -60,6 +60,11 @@ def main() -> int:
         return 0
 
     if build:
+        print("Building is disabled")
+        build = False
+
+    if build:
+        raise NotImplementedError("Building is not yet supported.")
         file_watcher_set(False)
         project_root = Path(".").absolute()
         print(f"Building Docker image at {project_root}")
@@ -110,6 +115,7 @@ def main() -> int:
 if __name__ == "__main__":
     # Note that the entry point for the exe is in cli.py
     try:
+        sys.argv.append("-i")
         sys.argv.append("-b")
         # sys.argv.append("examples/wasm")
         # sys.argv.append()

fastled/compile_server_impl.py

@@ -220,7 +220,6 @@ class CompileServerImpl:
                 "mode": "rw",
             }
             if self.fastled_src_dir is not None:
-                # add volume for src/platforms/wasm/compiler/CMakelists.txt
                 # to allow for interactive compilation
                 interactive_sources = list(INTERACTIVE_SOURCES)
                 for src in interactive_sources:

fastled/docker_manager.py

@@ -694,7 +694,9 @@ class DockerManager:
                     print("Error decoding line")
             rtn = proc.wait()
             if rtn != 0:
-                print(f"Error building Docker image: {rtn}")
+                warnings.warn(
+                    f"Error building Docker image, is docker running? {rtn}, stdout: {stdout}, stderr: {proc.stderr}"
+                )
                 raise subprocess.CalledProcessError(rtn, cmd_str)
             print(f"Successfully built image {image_name}:{tag}")
 

fastled/interactive_srcs.py

@@ -1,5 +1,5 @@
 INTERACTIVE_SOURCES: list[str] = [
-    "src/platforms/wasm/compiler/CMakeLists.txt",
-    "src/platforms/wasm/compiler/build_archive.sh",
-    "src/platforms/wasm/compiler/build.sh",
+    "/js/compiler/CMakeLists.txt",
+    "/js/compiler/build_archive.sh",
+    "/js/compiler/build.sh",
 ]

fastled/parse_args.py

@@ -155,6 +155,10 @@ def parse_args() -> Args:
             os.chdir(fastled_dir)
         if args.directory is None:
             args.directory = str(Path("examples/wasm").absolute())
+        if args.interactive:
+            if not args.build:
+                print("Adding --build flag when using --interactive")
+                args.build = True
         return Args.from_namespace(args)
 
     if not args.update:

{fastled-1.2.40.dist-info → fastled-1.2.42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fastled
-Version: 1.2.40
+Version: 1.2.42
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -294,6 +294,8 @@ A: `delay()` will block `loop()` which blocks the main thread of the browser. Th
 Q: How can I get the compiled size of my FastLED sketch smaller?
 A: A big chunk of space is being used by unnecessary javascript `emscripten` bundling. The wasm_compiler_settings.py file in the FastLED repo can tweak this.
 
+
+
 # Revisions
 
   * 1.2.31 - Bunch of fixes and ease of use while compiling code in the repo.

{fastled-1.2.40.dist-info → fastled-1.2.42.dist-info}/RECORD

@@ -1,17 +1,17 @@
-fastled/__init__.py,sha256=Ha6cPWlT-RRMkKSUD-c5cAzd5BDh3nNn7R63jPIYCeQ,12847
-fastled/app.py,sha256=6EE7mRcKKFm1wTyvpk3zy6OtlbHovSlDGU8bSq-Pjws,3763
+fastled/__init__.py,sha256=YrgAlORo0ezAxMNx3mGJa71YPAU04zTxhFX9yOShiow,6747
+fastled/app.py,sha256=AidwEoWyQCrOyz30HvhtqESDo1uze23VmtTr-UHWZJc,3936
 fastled/cli.py,sha256=FjVr31ht0UPlAcmX-84NwfAGMQHTkrCe4o744jCAxiw,375
 fastled/client_server.py,sha256=Q_-ALIbp474gY1zkYHoaU36eVSIa87nRcSB6IZOoaCg,14315
 fastled/compile_server.py,sha256=ul3eiZNX2wwmInooo3PJC3_kNpdejYVDIo94G3sV9HQ,2941
-fastled/compile_server_impl.py,sha256=vCuy4RlMm1FTJ6Xp6eFjV84xLVtLpdCaStz0N7Bi3n8,9977
-fastled/docker_manager.py,sha256=cIxOSeHnDqrT5IWPP1sl1cF8XYy3sUNfoOE-JpuKr3U,29815
+fastled/compile_server_impl.py,sha256=QPCzmSKoAm8rMftuvbxbojCAAcaazXSWFkjPv_UI7vk,9901
+fastled/docker_manager.py,sha256=QRHMdXugaegwOgXix8I0yvkjq2vY3jG8jBbYjnCxLps,29921
 fastled/filewatcher.py,sha256=XjFTo6NvEaosGTPr2Uhj91aqmtFdYHzJfxPzjBTMkKA,7086
-fastled/interactive_srcs.py,sha256=BZJ2IJNzUg4BuE_QWyD_y_xX978clY5CMzTSz8lvFcw,183
+fastled/interactive_srcs.py,sha256=F5nHdJc60xsnmOtnKhngE9JytqGn56PmYw_MVSIX1ac,138
 fastled/keyboard.py,sha256=vyYxE98WCXjvMpcUJd0YXPVvt7TzvBmifLYI-K7jtKg,3524
 fastled/live_client.py,sha256=MDauol0mxtXggV1Pv9ahC0Jjg_4wnnV6FjGEtdd9cxU,2763
 fastled/open_browser.py,sha256=KX2h9PUaPsKcwZ84i01DrXOnNpvaKLpB63u5kzcnEKQ,4342
 fastled/open_browser2.py,sha256=jUgN81bEYX-sr0zKTVJkwj9tXEVq7aZTxGUP_ShyCbs,3614
-fastled/parse_args.py,sha256=d0Aa_XPOpTjgxkBPZ_UyG-xNP9PgEjBQgrtzykVBeSc,7887
+fastled/parse_args.py,sha256=xgjxirQVX3FQxHZNVJtQQxTOeSJRQdGUNQ7W33Y880Y,8051
 fastled/paths.py,sha256=VsPmgu0lNSCFOoEC0BsTYzDygXqy15AHUfN-tTuzDZA,99
 fastled/project_init.py,sha256=bBt4DwmW5hZkm9ICt9Qk-0Nr_0JQM7icCgH5Iv-bCQs,3984
 fastled/select_sketch_directory.py,sha256=TZdCjl1D7YMKjodMTvDRurPcpAmN3x0TcJxffER2NfM,1314
@@ -26,9 +26,9 @@ fastled/assets/example.txt,sha256=lTBovRjiz0_TgtAtbA1C5hNi2ffbqnNPqkKg6UiKCT8,54
 fastled/site/build.py,sha256=l4RajIk0bApiAifT1lyLjIZi9lpPtSba4cnwWP5UOKc,14064
 fastled/test/can_run_local_docker_tests.py,sha256=LEuUbHctRhNNFWcvnz2kEGmjDJeXO4c3kNpizm3yVJs,400
 fastled/test/examples.py,sha256=GfaHeY1E8izBl6ZqDVjz--RHLyVR4NRnQ5pBesCFJFY,1673
-fastled-1.2.40.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-fastled-1.2.40.dist-info/METADATA,sha256=j_9e9ixRE1iug38SmM1rwts7rtakFyeasDZ7UNSIDLw,21262
-fastled-1.2.40.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-fastled-1.2.40.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
-fastled-1.2.40.dist-info/top_level.txt,sha256=Bbv5kpJpZhWNCvDF4K0VcvtBSDMa8B7PTOrZa9CezHY,8
-fastled-1.2.40.dist-info/RECORD,,
+fastled-1.2.42.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+fastled-1.2.42.dist-info/METADATA,sha256=LptcuXR92sgrugDf_QEzO1X78SN3pjNkqHOFIRjtnzA,21264
+fastled-1.2.42.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+fastled-1.2.42.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
+fastled-1.2.42.dist-info/top_level.txt,sha256=Bbv5kpJpZhWNCvDF4K0VcvtBSDMa8B7PTOrZa9CezHY,8
+fastled-1.2.42.dist-info/RECORD,,

{fastled-1.2.40.dist-info → fastled-1.2.42.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any