fastled 1.2.6__tar.gz → 1.2.7__tar.gz

{fastled-1.2.6 → fastled-1.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastled
-Version: 1.2.6
+Version: 1.2.7
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -186,6 +186,14 @@ with Api.server() as server:
     client.stop()
 ```
 
+**Build Docker Image from a local copy of the FastLED repo**
+```python
+from fastapi import Docker, Api
+container_name: str = Docker.build_from_fastled_repo()
+with Api.server(container_name=container_name) as server:
+  ...
+```
+
 # Features
 
 ## Hot reload by default
@@ -266,6 +274,7 @@ A: A big chunk of space is being used by unnecessary javascript `emscripten` bun
 
 # Revisions
 
+  * 1.2.7 - A bunch of fixes for MacOS and probably linux.
   * 1.2.6 - Now builds image from the project root of FastLED.
   * 1.1.25 - Fix up paths for `--init`
   * 1.1.24 - Mac/Linux now properly responds to ctrl-c when waiting for a key event.

{fastled-1.2.6 → fastled-1.2.7}/README.md

@@ -163,6 +163,14 @@ with Api.server() as server:
     client.stop()
 ```
 
+**Build Docker Image from a local copy of the FastLED repo**
+```python
+from fastapi import Docker, Api
+container_name: str = Docker.build_from_fastled_repo()
+with Api.server(container_name=container_name) as server:
+  ...
+```
+
 # Features
 
 ## Hot reload by default
@@ -243,6 +251,7 @@ A: A big chunk of space is being used by unnecessary javascript `emscripten` bun
 
 # Revisions
 
+  * 1.2.7 - A bunch of fixes for MacOS and probably linux.
   * 1.2.6 - Now builds image from the project root of FastLED.
   * 1.1.25 - Fix up paths for `--init`
   * 1.1.24 - Mac/Linux now properly responds to ctrl-c when waiting for a key event.

{fastled-1.2.6 → fastled-1.2.7}/src/fastled/__init__.py

@@ -1,6 +1,7 @@
 """FastLED Wasm Compiler package."""
 
 # context
+import subprocess
 from contextlib import contextmanager
 from pathlib import Path
 from typing import Generator
@@ -13,7 +14,7 @@ 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.6"
+__version__ = "1.2.7"
 
 
 class Api:
@@ -138,10 +139,10 @@ class Docker:
     @staticmethod
     def purge() -> None:
         from fastled.docker_manager import DockerManager
-        from fastled.settings import CONTAINER_NAME
+        from fastled.settings import IMAGE_NAME
 
         docker_mgr = DockerManager()
-        docker_mgr.purge(CONTAINER_NAME)
+        docker_mgr.purge(image_name=IMAGE_NAME)
 
     @staticmethod
     def build_from_github(
@@ -157,7 +158,6 @@ class Docker:
         Returns:
             Container name.
         """
-        import subprocess
 
         from fastled.docker_manager import DockerManager
         from fastled.settings import CONTAINER_NAME, IMAGE_NAME
@@ -197,6 +197,14 @@ class Docker:
 
         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,
@@ -204,6 +212,7 @@ class Docker:
             dockerfile_path=dockerfile_path,
             build_context=output_dir,
             build_args={"NO_PREWARM": "1"},
+            platform_tag=platform_tag,
         )
 
         # Run the container and return it
@@ -223,7 +232,7 @@ class Docker:
     def build_from_fastled_repo(
         project_root: Path | str = Path("."), platform_tag: str = ""
     ) -> str:
-        """Build the FastLED WASM compiler Docker image, which will be tagged as "latest".
+        """Build the FastLED WASM compiler Docker image, which will be tagged as "main".
 
         Args:
             project_root: Path to the FastLED project root directory
@@ -244,6 +253,17 @@ class Docker:
 
         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,

{fastled-1.2.6 → fastled-1.2.7}/src/fastled/docker_manager.py

@@ -4,6 +4,7 @@ New abstraction for Docker management with improved Ctrl+C handling.
 
 import _thread
 import os
+import platform
 import subprocess
 import sys
 import threading
@@ -477,7 +478,7 @@ class DockerManager:
                     print(
                         f"Container {container_name} did not restart within {timeout} seconds."
                     )
-                    container.stop()
+                    container.stop(timeout=0)
                     print(f"Container {container_name} has been stopped.")
                     container.start()
             elif container.status == "paused":
@@ -503,6 +504,7 @@ class DockerManager:
                 tty=True,
                 volumes=volumes,
                 ports=ports,
+                remove=True,
             )
         return container
 
@@ -554,6 +556,8 @@ class DockerManager:
         if isinstance(container, str):
             container = self.get_container(container)
 
+        assert container is not None, "Container not found."
+
         print(f"Attaching to container {container.name}...")
 
         first_run = self.first_run
@@ -572,7 +576,11 @@ class DockerManager:
                 print(f"Could not put container {container_name} to sleep.")
                 return
         try:
-            container.pause()
+            if platform.system() == "Windows":
+                container.pause()
+            else:
+                container.stop()
+                container.remove()
             print(f"Container {container.name} has been suspended.")
         except KeyboardInterrupt:
             print(f"Container {container.name} interrupted by keyboard interrupt.")
@@ -585,21 +593,23 @@ class DockerManager:
         """
         if isinstance(container, str):
             container = self.get_container(container)
+        if not container:
+            print(f"Could not resume container {container}.")
+            return
         try:
             container.unpause()
             print(f"Container {container.name} has been resumed.")
         except Exception as e:
             print(f"Failed to resume container {container.name}: {e}")
 
-    def get_container(self, container_name: str) -> Container:
+    def get_container(self, container_name: str) -> Container | None:
         """
         Get a container by name.
         """
         try:
             return self.client.containers.get(container_name)
         except docker.errors.NotFound:
-            print(f"Container {container_name} not found.")
-            raise
+            return None
 
     def is_container_running(self, container_name: str) -> bool:
         """
@@ -689,11 +699,13 @@ class DockerManager:
                 if any(image_name in tag for tag in container.image.tags):
                     print(f"Removing container {container.name}")
                     container.remove(force=True)
+
         except Exception as e:
             print(f"Error removing containers: {e}")
 
         # Remove all images with this name
         try:
+            self.client.images.prune(filters={"dangling": False})
             images = self.client.images.list()
             for image in images:
                 if any(image_name in tag for tag in image.tags):

{fastled-1.2.6 → fastled-1.2.7}/src/fastled/keyboard.py

@@ -6,12 +6,10 @@ import time
 from queue import Empty, Queue
 from threading import Thread
 
-_WHITE_SPACE = [" ", "\r", "\n"]
+_WHITE_SPACE = {" ", "\n", "\r"}  # Including Enter key as whitespace
 
 
-# Original space bar, but now also enter key.
 class SpaceBarWatcher:
-
     @classmethod
     def watch_space_bar_pressed(cls, timeout: float = 0) -> bool:
         watcher = cls()
@@ -32,9 +30,7 @@ class SpaceBarWatcher:
         self.process.start()
 
     def _watch_for_space(self) -> None:
-        # Set stdin to non-blocking mode
         fd = sys.stdin.fileno()
-
         if os.name == "nt":  # Windows
             import msvcrt
 
@@ -51,14 +47,13 @@ class SpaceBarWatcher:
                     char = msvcrt.getch().decode()  # type: ignore
                     if char in _WHITE_SPACE:
                         self.queue.put(ord(" "))
-
         else:  # Unix-like systems
             import termios
             import tty
 
             old_settings = termios.tcgetattr(fd)  # type: ignore
             try:
-                tty.setraw(fd)  # type: ignore
+                tty.setcbreak(fd)  # Use cbreak mode to avoid console issues
                 while True:
                     # Check for cancel signal
                     try:
@@ -70,21 +65,22 @@ class SpaceBarWatcher:
                     # Check if there's input ready
                     if select.select([sys.stdin], [], [], 0.1)[0]:
                         char = sys.stdin.read(1)
-                        if ord(char) == 3:  # ctrl+c on mac, maybe also linux?
+                        if ord(char) == 3:  # Ctrl+C
                             _thread.interrupt_main()
                             break
-
                         if char in _WHITE_SPACE:
                             self.queue.put(ord(" "))
             finally:
-                termios.tcsetattr(fd, termios.TCSADRAIN, old_settings)  # type: ignore
+                termios.tcsetattr(
+                    fd, termios.TCSADRAIN, old_settings
+                )  # Restore terminal settings
 
     def space_bar_pressed(self) -> bool:
         found = False
         while not self.queue.empty():
             try:
-                key = self.queue.get(block=False, timeout=0.1)
-                if key == ord(" "):
+                key = self.queue.get(block=False)
+                if key == ord(" "):  # Spacebar
                     found = True
                 self.queue.task_done()
             except Empty:

{fastled-1.2.6 → fastled-1.2.7}/src/fastled/open_browser.py

@@ -17,7 +17,8 @@ def _open_browser_python(fastled_js: Path) -> None:
         subprocess.run(
             [sys.executable, "-m", "nodejs.npm", "install", "-g", "live-server"]
         )
-    os.system(f"cd {fastled_js} && live-server")
+    proc = subprocess.Popen(["cd", fastled_js, "&&", "live-server"])
+    proc.wait()
 
 
 def _find_open_port(start_port: int) -> int:

{fastled-1.2.6 → fastled-1.2.7}/src/fastled/site/build.py

@@ -189,21 +189,53 @@ INDEX_TEMPLATE = """<!DOCTYPE html>
             const splashScreen = document.querySelector('.splash-screen');
             const splashText = document.querySelector('.splash-text');
             
-            // Wait for font to load
-            document.fonts.ready.then(() => {{
-                // Fade in the text
-                splashText.style.opacity = '1';
-                
-                // Wait for page load plus fade-in time before starting fade-out sequence
-                window.addEventListener('load', () => {{
-                    setTimeout(() => {{
-                        splashScreen.style.opacity = '0';
-                        setTimeout(() => {{
-                            splashScreen.style.display = 'none';
-                        }}, 500); // Remove from DOM after fade completes
-                    }}, 1500); // Wait for load + 1.5s (giving time for fade-in)
+            // Ensure splash screen always gets removed
+            const removeSplashScreen = () => {{
+                splashScreen.style.opacity = '0';
+                setTimeout(() => {{
+                    splashScreen.style.display = 'none';
+                }}, 500);
+            }};
+
+            // Set a maximum time the splash screen can stay
+            const maxSplashTime = setTimeout(removeSplashScreen, 2000); // Reduced from 5000ms to 2000ms
+
+            // Try to do nice fade-in/fade-out when possible
+            try {{
+                // Add a fallback timer in case font loading fails silently
+                const fontTimeout = setTimeout(() => {{
+                    splashText.style.opacity = '1';
+                    setTimeout(removeSplashScreen, 1000);
+                }}, 1000);
+
+                Promise.all([
+                    // Wrap font loading in a timeout promise
+                    Promise.race([
+                        document.fonts.ready,
+                        new Promise((_, reject) => setTimeout(reject, 1500))
+                    ]),
+                    new Promise(resolve => {{
+                        if (document.readyState === 'complete') {{
+                            resolve();
+                        }} else {{
+                            window.addEventListener('load', resolve);
+                        }}
+                    }})
+                ]).then(() => {{
+                    clearTimeout(maxSplashTime);
+                    clearTimeout(fontTimeout);
+                    splashText.style.opacity = '1';
+                    setTimeout(removeSplashScreen, 1500);
+                }}).catch(() => {{
+                    // If either promise fails, ensure splash screen is removed
+                    clearTimeout(maxSplashTime);
+                    removeSplashScreen();
                 }});
-            }});
+            }} catch (e) {{
+                // Final fallback if anything goes wrong
+                console.warn('Splash screen error:', e);
+                removeSplashScreen();
+            }}
             const links = document.querySelectorAll('.example-link');
             const iframe = document.getElementById('example-frame');
             const navPane = document.querySelector('.nav-pane');

{fastled-1.2.6 → fastled-1.2.7}/src/fastled.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastled
-Version: 1.2.6
+Version: 1.2.7
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -186,6 +186,14 @@ with Api.server() as server:
     client.stop()
 ```
 
+**Build Docker Image from a local copy of the FastLED repo**
+```python
+from fastapi import Docker, Api
+container_name: str = Docker.build_from_fastled_repo()
+with Api.server(container_name=container_name) as server:
+  ...
+```
+
 # Features
 
 ## Hot reload by default
@@ -266,6 +274,7 @@ A: A big chunk of space is being used by unnecessary javascript `emscripten` bun
 
 # Revisions
 
+  * 1.2.7 - A bunch of fixes for MacOS and probably linux.
   * 1.2.6 - Now builds image from the project root of FastLED.
   * 1.1.25 - Fix up paths for `--init`
   * 1.1.24 - Mac/Linux now properly responds to ctrl-c when waiting for a key event.

{fastled-1.2.6 → fastled-1.2.7}/tests/test_ino/bad/bad.ino

@@ -75,15 +75,15 @@ XYMap xyMap = XYMap::constructRectangularGrid(MATRIX_WIDTH, MATRIX_HEIGHT);
 NoisePalette noisePalette = NoisePalette(xyMap);
 
 
-Slider brightness("Brightness", 255, 0, 255);
-Slider speed("Speed", 15, 1, 50);
-Checkbox isOff("Set Black", false);
-Checkbox changePallete("Auto Next", true);
-Slider changePalletTime("Change Palette Time", 5, 1, 100);
-Slider scale( "Scale", 20, 1, 100);
-Button changePalette("Next Palette");
-Button changeFx("Next Fx");
-NumberField fxIndex("Fx index", 0, 0, NUM_ANIMATIONS);
+UISlider brightness("Brightness", 255, 0, 255);
+UISlider speed("Speed", 15, 1, 50);
+UICheckbox isOff("Set Black", false);
+UICheckbox changePallete("Auto Next", true);
+UISlider changePalletTime("Change Palette Time", 5, 1, 100);
+UISlider scale( "Scale", 20, 1, 100);
+UIButton changePalette("Next Palette");
+UIButton changeFx("Next Fx");
+UINumberField fxIndex("Fx index", 0, 0, NUM_ANIMATIONS);
 
 Animartrix animartrix(xyMap, POLAR_WAVES);
 FxEngine fxEngine(NUM_LEDS);

{fastled-1.2.6 → fastled-1.2.7}/tests/test_ino/embedded/wasm.ino

@@ -73,15 +73,15 @@ XYMap xyMap = XYMap::constructRectangularGrid(MATRIX_WIDTH, MATRIX_HEIGHT);
 NoisePalette noisePalette = NoisePalette(xyMap);
 
 
-Slider brightness("Brightness", 255, 0, 255);
-Slider speed("Speed", 15, 1, 50);
-Checkbox isOff("Set Black", false);
-Checkbox changePallete("Auto Next", true);
-Slider changePalletTime("Change Palette Time", 5, 1, 100);
-Slider scale( "Scale", 20, 1, 100);
-Button changePalette("Next Palette");
-Button changeFx("Next Fx");
-NumberField fxIndex("Fx index", 0, 0, NUM_ANIMATIONS);
+UISlider brightness("Brightness", 255, 0, 255);
+UISlider speed("Speed", 15, 1, 50);
+UICheckbox isOff("Set Black", false);
+UICheckbox changePallete("Auto Next", true);
+UISlider changePalletTime("Change Palette Time", 5, 1, 100);
+UISlider scale( "Scale", 20, 1, 100);
+UIButton changePalette("Next Palette");
+UIButton changeFx("Next Fx");
+UINumberField fxIndex("Fx index", 0, 0, NUM_ANIMATIONS);
 
 Animartrix animartrix(xyMap, POLAR_WAVES);
 FxEngine fxEngine(NUM_LEDS);

{fastled-1.2.6 → fastled-1.2.7}/tests/test_ino/wasm/wasm.ino

@@ -73,15 +73,15 @@ XYMap xyMap = XYMap::constructRectangularGrid(MATRIX_WIDTH, MATRIX_HEIGHT);
 NoisePalette noisePalette = NoisePalette(xyMap);
 
 
-Slider brightness("Brightness", 255, 0, 255);
-Slider speed("Speed", 15, 1, 50);
-Checkbox isOff("Set Black", false);
-Checkbox changePallete("Auto Next", true);
-Slider changePalletTime("Change Palette Time", 5, 1, 100);
-Slider scale( "Scale", 20, 1, 100);
-Button changePalette("Next Palette");
-Button changeFx("Next Fx");
-NumberField fxIndex("Fx index", 0, 0, NUM_ANIMATIONS);
+UISlider brightness("Brightness", 255, 0, 255);
+UISlider speed("Speed", 15, 1, 50);
+UICheckbox isOff("Set Black", false);
+UICheckbox changePallete("Auto Next", true);
+UISlider changePalletTime("Change Palette Time", 5, 1, 100);
+UISlider scale( "Scale", 20, 1, 100);
+UIButton changePalette("Next Palette");
+UIButton changeFx("Next Fx");
+UINumberField fxIndex("Fx index", 0, 0, NUM_ANIMATIONS);
 
 Animartrix animartrix(xyMap, POLAR_WAVES);
 FxEngine fxEngine(NUM_LEDS);