fastled 1.1.24__py2.py3-none-any.whl → 1.1.26__py2.py3-none-any.whl

fastled/__init__.py

@@ -1,3 +1,3 @@
 """FastLED Wasm Compiler package."""
 
-__version__ = "1.1.24"
+__version__ = "1.1.26"

fastled/app.py

@@ -157,7 +157,7 @@ def run_server(args: argparse.Namespace) -> int:
     compile_server = CompileServer(interactive=interactive, auto_updates=auto_update)
     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 +192,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/client_server.py

@@ -269,13 +269,19 @@ def run_client_server(args: argparse.Namespace) -> int:
                             timeout=1.0
                         )
                         file_changes = source_code_watcher.get_all_changes()
+                        sketch_files_changed = sketch_filewatcher.get_all_changes()
 
-                        if space_bar_pressed or file_changes:
+                        if file_changes:
+                            print(
+                                f"Changes detected in {file_changes}\nHit the space bar to trigger compile."
+                            )
+
+                        if space_bar_pressed or sketch_files_changed:
                             if space_bar_pressed:
                                 print("Space bar pressed, triggering recompile...")
-                            elif file_changes:
+                            elif sketch_files_changed:
                                 print(
-                                    f"Changes detected in {','.join(file_changes)}, triggering recompile..."
+                                    f"Changes detected in {','.join(sketch_files_changed)}, triggering recompile..."
                                 )
                             last_compiled_result = compile_function(
                                 last_hash_value=None

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"
@@ -119,8 +124,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:
@@ -132,20 +135,32 @@ class CompileServer:
             }
 
         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/select_sketch_directory.py

@@ -26,7 +26,7 @@ def select_sketch_directory(
             return str(sketch_directories[index])
         except (ValueError, IndexError):
             inputs = [p for p in sketch_directories]
-            top_hits: list[tuple[int, Path]] = string_diff_paths(which, inputs)
+            top_hits: list[tuple[float, Path]] = string_diff_paths(which, inputs)
             if len(top_hits) == 1:
                 example = top_hits[0][1]
                 return str(example)

fastled/string_diff.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from rapidfuzz.distance import Levenshtein
+from rapidfuzz import fuzz
 
 
 # Returns the min distance strings. If there is a tie, it returns
@@ -8,29 +8,35 @@ from rapidfuzz.distance import Levenshtein
 # Returns a tuple of index and string.
 def string_diff(
     input_string: str, string_list: list[str], ignore_case=True
-) -> list[tuple[int, str]]:
+) -> list[tuple[float, str]]:
 
     def normalize(s: str) -> str:
         return s.lower() if ignore_case else s
 
-    distances = [
-        Levenshtein.distance(normalize(input_string), normalize(s)) for s in string_list
-    ]
+    # distances = [
+    #     #Levenshtein.distance(normalize(input_string), normalize(s)) for s in string_list
+    #     fuzz.partial_ratio(normalize(input_string), normalize(s)) for s in string_list
+    # ]
+    distances: list[float] = []
+    for s in string_list:
+        dist = fuzz.token_sort_ratio(normalize(input_string), normalize(s))
+        print("partial_ratio", dist)
+        distances.append(1.0 / (dist + 1.0))
     min_distance = min(distances)
-    out: list[tuple[int, str]] = []
+    out: list[tuple[float, str]] = []
     for i, d in enumerate(distances):
         if d == min_distance:
             out.append((i, string_list[i]))
+
     return out
 
 
 def string_diff_paths(
     input_string: str | Path, path_list: list[Path], ignore_case=True
-) -> list[tuple[int, Path]]:
+) -> list[tuple[float, Path]]:
     string_list = [str(p) for p in path_list]
     tmp = string_diff(str(input_string), string_list, ignore_case)
-    # out: list[tuple[int, Path]] = [(i, Path(path_list[j])) for i, j in tmp]
-    out: list[tuple[int, Path]] = []
+    out: list[tuple[float, Path]] = []
     for i, j in tmp:
         p = Path(j)
         out.append((i, p))

{fastled-1.1.24.dist-info → fastled-1.1.26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastled
-Version: 1.1.24
+Version: 1.1.26
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -161,8 +161,12 @@ 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` is  bundling. This can be tweeked by the wasm_compiler_settings.py file in the FastLED repo.
 
-# Revisions
 
+
+# Revisions
+  
+  * 1.1.26 - 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
   * 1.1.22 - Selecting sketch now allows strings and narrowing down paths if ambiguity

{fastled-1.1.24.dist-info → fastled-1.1.26.dist-info}/RECORD

@@ -1,26 +1,26 @@
-fastled/__init__.py,sha256=KmpV56lsAg31rlm1PyvbeZuohDl5DpIlQpi9SDuldc4,64
-fastled/app.py,sha256=VZP65zT1qLQLcOXA8oElPdZiladIAMvW9MVnqy5QTRM,6806
+fastled/__init__.py,sha256=5-jQK-HR_0kUeBf2hyQ72AApd6GSPIjapr6fk2DY-Dg,64
+fastled/app.py,sha256=U8JN0VGC2adw6BKC7INco4iDG5zLj4L2Etzr9smWyeQ,6861
 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=CBgicRyunn96tVeAHQOuo4q2gkDFAtLEPxhTf2EnQ_0,11113
-fastled/compile_server.py,sha256=aBdpILSRrDsCJ5e9g5uwIqt9bcqE_8FrSddCV2ygtrI,5401
-fastled/docker_manager.py,sha256=awQCAB0XfHMy6y1jfdEZx1qyzXTtYBmAwVyuQjxwuf0,20157
+fastled/client_server.py,sha256=KdjgAiYJ2mKXIfYVFcVZtVDtbZhzkjqrzatAwNa_QWw,11437
+fastled/compile_server.py,sha256=rtAW9zllb8WOSzhoRUMtdMGDzYFL4CtyoWVa7Y-jK24,5810
+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
 fastled/open_browser.py,sha256=RRHcsZ5Vzsw1AuZUEYuSfjKmf_9j3NGMDUR-FndHmqs,1483
 fastled/paths.py,sha256=VsPmgu0lNSCFOoEC0BsTYzDygXqy15AHUfN-tTuzDZA,99
-fastled/select_sketch_directory.py,sha256=ih8Voua8ecMIZ9m0ZEBp_EuuBzz8xGfMxC_UhAKuoA0,1312
+fastled/select_sketch_directory.py,sha256=TZdCjl1D7YMKjodMTvDRurPcpAmN3x0TcJxffER2NfM,1314
 fastled/sketch.py,sha256=5nRjg281lMH8Bo9wKjbcpTQCfEP574ZCG-lukvFmyQ8,2656
 fastled/spinner.py,sha256=ZGFXona3SJxmuHIzMGa6tqB0IVDSRr8W_dju09Z1Hwg,901
-fastled/string_diff.py,sha256=svtaQFGp4a6r2Qjx-Gxhna94wK-d8LKV4OCpKMXiHso,1164
+fastled/string_diff.py,sha256=1AbgAxPFl7F_K4HunwQr0em8WZSvwxJ1MOOLA-ylFbM,1391
 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.24.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-fastled-1.1.24.dist-info/METADATA,sha256=tiMyoOLRhVYmwuoqohRRk5xxTBD9M41cqyL_g1cE24o,14160
-fastled-1.1.24.dist-info/WHEEL,sha256=0VNUDWQJzfRahYI3neAhz2UVbRCtztpN5dPHAGvmGXc,109
-fastled-1.1.24.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
-fastled-1.1.24.dist-info/top_level.txt,sha256=xfG6Z_ol9V5YmBROkZq2QTRwjbS2ouCUxaTJsOwfkOo,14
-fastled-1.1.24.dist-info/RECORD,,
+fastled-1.1.26.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+fastled-1.1.26.dist-info/METADATA,sha256=Sp3HqgomtVTcvohI_6j5V1z6xt7GpKWZjgmhRSPOjLs,14324
+fastled-1.1.26.dist-info/WHEEL,sha256=0VNUDWQJzfRahYI3neAhz2UVbRCtztpN5dPHAGvmGXc,109
+fastled-1.1.26.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
+fastled-1.1.26.dist-info/top_level.txt,sha256=xfG6Z_ol9V5YmBROkZq2QTRwjbS2ouCUxaTJsOwfkOo,14
+fastled-1.1.26.dist-info/RECORD,,