fastled 1.1.25__py2.py3-none-any.whl → 1.1.27__py2.py3-none-any.whl

fastled/__init__.py

@@ -1,3 +1,3 @@
-"""FastLED Wasm Compiler package."""
-
-__version__ = "1.1.25"
+"""FastLED Wasm Compiler package."""
+
+__version__ = "1.1.27"

fastled/app.py

@@ -154,10 +154,13 @@ def parse_args() -> argparse.Namespace:
 def run_server(args: argparse.Namespace) -> int:
     interactive = args.interactive
     auto_update = args.auto_update
-    compile_server = CompileServer(interactive=interactive, auto_updates=auto_update)
+    mapped_dir = Path(args.directory).absolute() if args.directory else None
+    compile_server = CompileServer(
+        interactive=interactive, auto_updates=auto_update, mapped_dir=mapped_dir
+    )
     if not interactive:
         print(f"Server started at {compile_server.url()}")
-    compile_server.wait_for_startup()
+        compile_server.wait_for_startup()
     try:
         while True:
             if not compile_server.proceess_running():
@@ -192,7 +195,8 @@ def main() -> int:
 if __name__ == "__main__":
     try:
         os.chdir("../fastled")
-        sys.argv.append("--upgrade")
+        sys.argv.append("--interactive")
+        sys.argv.append("examples/NoiseRing")
         sys.exit(main())
     except KeyboardInterrupt:
         print("\nExiting from main...")

fastled/compile_server.py

@@ -5,7 +5,12 @@ from pathlib import Path
 
 import httpx
 
-from fastled.docker_manager import DISK_CACHE, DockerManager, RunningContainer
+from fastled.docker_manager import (
+    DISK_CACHE,
+    Container,
+    DockerManager,
+    RunningContainer,
+)
 from fastled.sketch import looks_like_fastled_repo
 
 _IMAGE_NAME = "niteris/fastled-wasm"
@@ -22,8 +27,14 @@ class CompileServer:
         container_name=_DEFAULT_CONTAINER_NAME,
         interactive: bool = False,
         auto_updates: bool | None = None,
+        mapped_dir: Path | None = None,
     ) -> None:
-
+        if interactive and not mapped_dir:
+            raise ValueError(
+                "Interactive mode requires a mapped directory point to a sketch"
+            )
+        if not interactive and mapped_dir:
+            raise ValueError("Mapped directory is only used in interactive mode")
         cwd = Path(".").resolve()
         fastled_src_dir: Path | None = None
         if looks_like_fastled_repo(cwd):
@@ -33,6 +44,7 @@ class CompileServer:
             fastled_src_dir = cwd / "src"
 
         self.container_name = container_name
+        self.mapped_dir = mapped_dir
         self.docker = DockerManager()
         self.fastled_src_dir: Path | None = fastled_src_dir
         self.interactive = interactive
@@ -119,8 +131,6 @@ class CompileServer:
             server_command = ["/bin/bash"]
         else:
             server_command = ["python", "/js/run.py", "server"] + SERVER_OPTIONS
-        server_cmd_str = subprocess.list2cmdline(server_command)
-        print(f"Started Docker container with command: {server_cmd_str}")
         ports = {80: port}
         volumes = None
         if self.fastled_src_dir:
@@ -130,22 +140,47 @@ class CompileServer:
             volumes = {
                 str(self.fastled_src_dir): {"bind": "/host/fastled/src", "mode": "ro"}
             }
+        if self.interactive:
+            # add the mapped directory to the container
+            print(f"Mounting {self.mapped_dir} into container /mapped")
+            # volumes = {str(self.mapped_dir): {"bind": "/mapped", "mode": "rw"}}
+            # add it
+            assert self.mapped_dir is not None
+            dir_name = self.mapped_dir.name
+            if not volumes:
+                volumes = {}
+            volumes[str(self.mapped_dir)] = {
+                "bind": f"/mapped/{dir_name}",
+                "mode": "rw",
+            }
 
         cmd_str = subprocess.list2cmdline(server_command)
+        if not self.interactive:
+            container: Container = self.docker.run_container_detached(
+                image_name=_IMAGE_NAME,
+                tag="main",
+                container_name=self.container_name,
+                command=cmd_str,
+                ports=ports,
+                volumes=volumes,
+                remove_previous=self.interactive,
+            )
+            self.running_container = self.docker.attach_and_run(container)
+            assert self.running_container is not None, "Container should be running"
+            print("Compile server starting")
+            return port
+        else:
+            self.docker.run_container_interactive(
+                image_name=_IMAGE_NAME,
+                tag="main",
+                container_name=self.container_name,
+                command=cmd_str,
+                ports=ports,
+                volumes=volumes,
+            )
 
-        self.docker.run_container(
-            image_name=_IMAGE_NAME,
-            tag="main",
-            container_name=self.container_name,
-            command=cmd_str,
-            ports=ports,
-            volumes=volumes,
-        )
-        self.running_container = self.docker.attach_and_run(self.container_name)
-        assert self.running_container is not None, "Container should be running"
-
-        print("Compile server starting")
-        return port
+            print("Exiting interactive mode")
+            return port
 
     def proceess_running(self) -> bool:
         return self.docker.is_container_running(self.container_name)

fastled/docker_manager.py

@@ -339,7 +339,7 @@ class DockerManager:
             return False
         return True
 
-    def run_container(
+    def run_container_detached(
         self,
         image_name: str,
         tag: str,
@@ -347,6 +347,7 @@ class DockerManager:
         command: str | None = None,
         volumes: dict[str, dict[str, str]] | None = None,
         ports: dict[int, int] | None = None,
+        remove_previous: bool = False,
     ) -> Container:
         """
         Run a container from an image. If it already exists with matching config, start it.
@@ -362,8 +363,12 @@ class DockerManager:
         try:
             container: Container = self.client.containers.get(container_name)
 
+            if remove_previous:
+                print(f"Removing existing container {container_name}...")
+                container.remove(force=True)
+                raise docker.errors.NotFound("Container removed due to remove_previous")
             # Check if configuration matches
-            if not self._container_configs_match(container, command, volumes, ports):
+            elif not self._container_configs_match(container, command, volumes, ports):
                 print(
                     f"Container {container_name} exists but with different configuration. Removing and recreating..."
                 )
@@ -400,6 +405,11 @@ class DockerManager:
                 container.start()
         except docker.errors.NotFound:
             print(f"Creating and starting {container_name}")
+            out_msg = f"# Running in container: {command}"
+            msg_len = len(out_msg)
+            print("\n" + "#" * msg_len)
+            print(out_msg)
+            print("#" * msg_len + "\n")
             container = self.client.containers.run(
                 image_name,
                 command,
@@ -411,6 +421,46 @@ class DockerManager:
             )
         return container
 
+    def run_container_interactive(
+        self,
+        image_name: str,
+        tag: str,
+        container_name: str,
+        command: str | None = None,
+        volumes: dict[str, dict[str, str]] | None = None,
+        ports: dict[int, int] | None = None,
+    ) -> None:
+        # Remove existing container
+        try:
+            container: Container = self.client.containers.get(container_name)
+            container.remove(force=True)
+        except docker.errors.NotFound:
+            pass
+        try:
+            docker_command: list[str] = [
+                "docker",
+                "run",
+                "-it",
+                "--rm",
+                "--name",
+                container_name,
+            ]
+            if volumes:
+                for host_dir, mount in volumes.items():
+                    docker_command.extend(["-v", f"{host_dir}:{mount['bind']}"])
+            if ports:
+                for host_port, container_port in ports.items():
+                    docker_command.extend(["-p", f"{host_port}:{container_port}"])
+            docker_command.append(f"{image_name}:{tag}")
+            if command:
+                docker_command.append(command)
+            cmd_str: str = subprocess.list2cmdline(docker_command)
+            print(f"Running command: {cmd_str}")
+            subprocess.run(docker_command, check=True)
+        except subprocess.CalledProcessError as e:
+            print(f"Error running Docker command: {e}")
+            raise
+
     def attach_and_run(self, container: Container | str) -> RunningContainer:
         """
         Attach to a running container and monitor its logs in a background thread.
@@ -499,7 +549,7 @@ def main():
         # docker_manager.tag_image(image_name, tag, new_tag)
 
         # Step 3: Run the container
-        container = docker_manager.run_container(
+        container = docker_manager.run_container_detached(
             image_name, tag, container_name, command
         )
 

{fastled-1.1.25.dist-info → fastled-1.1.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastled
-Version: 1.1.25
+Version: 1.1.27
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -165,6 +165,7 @@ A: A big chunk of space is being used by unnecessary javascript `emscripten` is
 
 # Revisions
   
+  * 1.1.27 - Fixed `--interactive` so that it now works correctly.
   * 1.1.25 - Improved detecting which sketch directory the user means by fuzzy matching.
   * 1.1.24 - Adds progress spinning bar for pulling images, which take a long time.
   * 1.1.23 - Various fixes for MacOS

{fastled-1.1.25.dist-info → fastled-1.1.27.dist-info}/RECORD

@@ -1,10 +1,10 @@
-fastled/__init__.py,sha256=e5n65cupSlM41aRjoBsTReaO1NiY5it6yu3XFaYSbBQ,64
-fastled/app.py,sha256=VZP65zT1qLQLcOXA8oElPdZiladIAMvW9MVnqy5QTRM,6806
+fastled/__init__.py,sha256=mjC0WCvol1btJDkCz8i8NbyHnPxX7MoKjTnKk6sCQxo,61
+fastled/app.py,sha256=oL_IXsYxDRaw9eU2aSkCZ57xAUedbNWT4-WwCsJT2Sc,6978
 fastled/build_mode.py,sha256=joMwsV4K1y_LijT4gEAcjx69RZBoe_KmFmHZdPYbL_4,631
 fastled/cli.py,sha256=CNR_pQR0sNVPNuv8e_nmm-0PI8sU-eUBUgnWgWkzW9c,237
 fastled/client_server.py,sha256=KdjgAiYJ2mKXIfYVFcVZtVDtbZhzkjqrzatAwNa_QWw,11437
-fastled/compile_server.py,sha256=aBdpILSRrDsCJ5e9g5uwIqt9bcqE_8FrSddCV2ygtrI,5401
-fastled/docker_manager.py,sha256=awQCAB0XfHMy6y1jfdEZx1qyzXTtYBmAwVyuQjxwuf0,20157
+fastled/compile_server.py,sha256=Adb2lvJ_p6Ui7UMxijRtYJhbO4YPTERKVQeuoQgibSE,6724
+fastled/docker_manager.py,sha256=Ok8TC1JXMoNMWt4P9clFFEVE29Xd-4C_MvIMIfvNo78,22134
 fastled/env.py,sha256=8wctQwl5qE4CI8NBugHtgMmUfEfHZ869JX5lGdSOJxc,304
 fastled/filewatcher.py,sha256=5dVmjEG23kMeJa29tRVm5XKSr9sTD4ME2boo-CFDuUM,6910
 fastled/keyboard.py,sha256=Zz_ggxOUTX2XQEy6K6kAoorVlUev4wEk9Awpvv9aStA,3241
@@ -18,9 +18,9 @@ fastled/types.py,sha256=dDIsGHJkHNJ7B61wNp6X0JSLs_nrHiq7RlNqNWbwFec,194
 fastled/util.py,sha256=t4M3NFMhnCzfYbLvIyJi0RdFssZqbTN_vVIaej1WV-U,265
 fastled/web_compile.py,sha256=KuvKGdX6SSUUqC7YgX4T9SMSP5wdcPUhpg9-K9zPoTI,10378
 fastled/assets/example.txt,sha256=lTBovRjiz0_TgtAtbA1C5hNi2ffbqnNPqkKg6UiKCT8,54
-fastled-1.1.25.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-fastled-1.1.25.dist-info/METADATA,sha256=ZC9sOPn37oR4i96ddFOlgtiy_wfI2OOK7FXGruZif_I,14256
-fastled-1.1.25.dist-info/WHEEL,sha256=0VNUDWQJzfRahYI3neAhz2UVbRCtztpN5dPHAGvmGXc,109
-fastled-1.1.25.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
-fastled-1.1.25.dist-info/top_level.txt,sha256=xfG6Z_ol9V5YmBROkZq2QTRwjbS2ouCUxaTJsOwfkOo,14
-fastled-1.1.25.dist-info/RECORD,,
+fastled-1.1.27.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+fastled-1.1.27.dist-info/METADATA,sha256=XOkF-RbQNvRne_R6BEM2jDvR8Wma3RlhENXMk8dyxHI,14324
+fastled-1.1.27.dist-info/WHEEL,sha256=0VNUDWQJzfRahYI3neAhz2UVbRCtztpN5dPHAGvmGXc,109
+fastled-1.1.27.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
+fastled-1.1.27.dist-info/top_level.txt,sha256=xfG6Z_ol9V5YmBROkZq2QTRwjbS2ouCUxaTJsOwfkOo,14
+fastled-1.1.27.dist-info/RECORD,,