fastled 1.2.39__py3-none-any.whl → 1.2.41__py3-none-any.whl

fastled/__init__.py

@@ -3,11 +3,14 @@
 # context
 import shutil
 import subprocess
+import tempfile
 from contextlib import contextmanager
 from multiprocessing import Process
 from pathlib import Path
 from typing import Generator
 
+import httpx
+
 from .compile_server import CompileServer
 from .live_client import LiveClient
 from .site.build import build
@@ -16,7 +19,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.39"
+__version__ = "1.2.41"
+
+DOCKER_FILE = (
+    "https://raw.githubusercontent.com/zackees/fastled-wasm/refs/heads/main/Dockerfile"
+)
 
 
 class Api:
@@ -222,36 +229,40 @@ class Docker:
                 ["git", "clone", "--depth", "1", url, str(output_dir)], check=True
             )
 
-        dockerfile_path = (
-            output_dir / "src" / "platforms" / "wasm" / "compiler" / "Dockerfile"
-        )
+        with tempfile.TemporaryDirectory() as tempdir:
+            dockerfiles_dst = Path(tempdir) / "Dockerfile"
+            # download the file and write it to dockerfiles_dst path
+            with open(dockerfiles_dst, "wb") as f:
+                with httpx.stream("GET", DOCKER_FILE) as response:
+                    for chunk in response.iter_bytes():
+                        f.write(chunk)
+
+            if not dockerfiles_dst.exists():
+                raise FileNotFoundError(
+                    f"Dockerfile not found at {dockerfiles_dst}. "
+                    "This may not be a valid FastLED repository."
+                )
 
-        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=dockerfiles_dst,
+                build_context=output_dir,
+                build_args={"NO_PREWARM": "1"},
+                platform_tag=platform_tag,
             )
 
-        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,
@@ -298,18 +309,17 @@ class Docker:
         if interactive:
             if sketch_folder is None:
                 sketch_folder = project_root / "examples" / "wasm"
-        else:
-            if sketch_folder is not None:
-                raise ValueError(
-                    "Cannot specify sketch_folder when not in interactive mode."
-                )
+
         if isinstance(project_root, str):
             project_root = Path(project_root)
 
-        dockerfile_path = (
-            project_root / "src" / "platforms" / "wasm" / "compiler" / "Dockerfile"
-        )
+        if DockerManager.is_docker_installed() is False:
+            raise Exception("Docker is not installed.")
+
         docker_mgr = DockerManager()
+        if DockerManager.is_running() is False:
+            docker_mgr.start()
+
         platform_tag = ""
         # if "arm" in docker_mgr.architecture():
         if (
@@ -321,15 +331,24 @@ class Docker:
         # 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,
-        )
+        with tempfile.TemporaryDirectory() as tempdir:
+            dockerfile_dst = Path(tempdir) / "Dockerfile"
+
+            # download the file and write it to dockerfiles_dst path
+            with open(dockerfile_dst, "wb") as f:
+                with httpx.stream("GET", DOCKER_FILE) as response:
+                    for chunk in response.iter_bytes():
+                        f.write(chunk)
+
+            # Build the image
+            docker_mgr.build_image(
+                image_name=IMAGE_NAME,
+                tag="main",
+                dockerfile_path=dockerfile_dst,
+                build_context=project_root,
+                build_args={"NO_PREWARM": "1"},
+                platform_tag=platform_tag,
+            )
 
         out: CompileServer = CompileServer(
             container_name=CONTAINER_NAME,

fastled/app.py

@@ -60,17 +60,19 @@ def main() -> int:
         return 0
 
     if build:
-        try:
-            file_watcher_set(False)
-            project_root = Path(".").absolute()
-            print(f"Building Docker image at {project_root}")
-            from fastled import Api, Docker
-
-            server = Docker.spawn_server_from_fastled_repo(
-                project_root=project_root, interactive=interactive
-            )
-            assert isinstance(server, CompileServer)
+        file_watcher_set(False)
+        project_root = Path(".").absolute()
+        print(f"Building Docker image at {project_root}")
+        from fastled import Api, Docker
+
+        server = Docker.spawn_server_from_fastled_repo(
+            project_root=project_root,
+            interactive=interactive,
+            sketch_folder=directory,
+        )
+        assert isinstance(server, CompileServer)
 
+        try:
             if interactive:
                 server.stop()
                 return 0
@@ -82,17 +84,19 @@ def main() -> int:
                 return 0
 
             print("Running server")
+
             with Api.live_client(
                 auto_updates=False,
                 sketch_directory=directory,
                 host=server,
                 auto_start=True,
                 keep_running=not just_compile,
-            ) as client:
-                print(f"Exited client {client.url()}")
-                print(f"Exiting {server.name}")
+            ) as _:
+                while True:
+                    time.sleep(0.2)  # wait for user to exit
         except KeyboardInterrupt:
             print("\nExiting from client...")
+            server.stop()
             return 1
 
     if has_server:
@@ -106,12 +110,13 @@ 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()
         import os
 
         os.chdir("../fastled")
+        sys.argv.append("examples/wasm")
         sys.exit(main())
     except KeyboardInterrupt:
         print("\nExiting from main...")

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/open_browser.py

@@ -45,9 +45,8 @@ def open_http_server_subprocess(
             stderr=subprocess.DEVNULL,
         )  # type ignore
     except KeyboardInterrupt:
-        import _thread
-
-        _thread.interrupt_main()
+        print("Exiting from server...")
+        sys.exit(0)
 
 
 def is_port_free(port: int) -> bool:

{fastled-1.2.39.dist-info → fastled-1.2.41.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fastled
-Version: 1.2.39
+Version: 1.2.41
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -37,6 +37,7 @@ Dynamic: maintainer
 [![Build Webpage](https://github.com/zackees/fastled-wasm/actions/workflows/build_webpage.yml/badge.svg)](https://github.com/zackees/fastled-wasm/actions/workflows/build_webpage.yml)
 
 
+
 ## Compile your FastLED sketch and run it on the Browser!
 
 ![image](https://github.com/user-attachments/assets/243aeb4d-e42f-4cc3-9c31-0af51271f3e0)
@@ -293,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.39.dist-info → fastled-1.2.41.dist-info}/RECORD

@@ -1,15 +1,15 @@
-fastled/__init__.py,sha256=G7jKW5FxIFKFHmudUx5d8_BMzncikXsQ8a1O-KvQ0EI,13035
-fastled/app.py,sha256=dnbDSVpn7_wB3JZl-JAIROYbmmy0-K1RTyi7CaktKsc,3696
+fastled/__init__.py,sha256=3zpR2cQiWURhu56q_8wGqNj_kL_m7fORfnc3T4x-JHk,13851
+fastled/app.py,sha256=6EE7mRcKKFm1wTyvpk3zy6OtlbHovSlDGU8bSq-Pjws,3763
 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=DDzOXNYVYLIDWVdmpJ-jLxZSAs5mw3VGHo2UIJ-T8SE,4339
+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/paths.py,sha256=VsPmgu0lNSCFOoEC0BsTYzDygXqy15AHUfN-tTuzDZA,99
@@ -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.39.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-fastled-1.2.39.dist-info/METADATA,sha256=C9UAsR0nUCIg7wm9qXuLF-NgBs7Ze7L0sOl2-E7nZLw,21261
-fastled-1.2.39.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-fastled-1.2.39.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
-fastled-1.2.39.dist-info/top_level.txt,sha256=Bbv5kpJpZhWNCvDF4K0VcvtBSDMa8B7PTOrZa9CezHY,8
-fastled-1.2.39.dist-info/RECORD,,
+fastled-1.2.41.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+fastled-1.2.41.dist-info/METADATA,sha256=ZscaHfPqTwVv19ihdqqO6799oW8Q3PN58j6hUEFbAsc,21264
+fastled-1.2.41.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+fastled-1.2.41.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
+fastled-1.2.41.dist-info/top_level.txt,sha256=Bbv5kpJpZhWNCvDF4K0VcvtBSDMa8B7PTOrZa9CezHY,8
+fastled-1.2.41.dist-info/RECORD,,

{fastled-1.2.39.dist-info → fastled-1.2.41.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