fastled 1.2.47__tar.gz → 1.2.49__tar.gz

{fastled-1.2.47 → fastled-1.2.49}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fastled
-Version: 1.2.47
+Version: 1.2.49
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies

{fastled-1.2.47 → fastled-1.2.49}/lint

@@ -14,9 +14,6 @@ isort --profile black src tests compiler
 echo Running mypy src compiler
 mypy src tests compiler
 echo Running pyright src tests compiler
-#pyright src tests compiler
-# pyright src  # later
-# pyright tests # later
-pyright compiler
+pyright src compiler tests
 echo Linting complete!
 exit 0

{fastled-1.2.47 → fastled-1.2.49}/src/fastled/__init__.py

@@ -13,7 +13,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.47"
+__version__ = "1.2.49"
 
 DOCKER_FILE = (
     "https://raw.githubusercontent.com/zackees/fastled-wasm/refs/heads/main/Dockerfile"

{fastled-1.2.47 → fastled-1.2.49}/src/fastled/client_server.py

@@ -230,13 +230,17 @@ def run_client(
         print("\nExiting from main")
         return 1
 
-    sketch_filewatcher = FileWatcherProcess(directory, excluded_patterns=["fastled_js"])
+    excluded_patterns = ["fastled_js"]
+
+    sketch_filewatcher = FileWatcherProcess(
+        directory, excluded_patterns=excluded_patterns
+    )
 
     source_code_watcher: FileWatcherProcess | None = None
     if compile_server and compile_server.using_fastled_src_dir_volume():
         assert compile_server.fastled_src_dir is not None
         source_code_watcher = FileWatcherProcess(
-            compile_server.fastled_src_dir, excluded_patterns=[]
+            compile_server.fastled_src_dir, excluded_patterns=excluded_patterns
         )
 
     def trigger_rebuild_if_sketch_changed(

{fastled-1.2.47 → fastled-1.2.49}/src/fastled/docker_manager.py

@@ -18,7 +18,7 @@ import docker
 from appdirs import user_data_dir
 from disklru import DiskLRUCache
 from docker.client import DockerClient
-from docker.errors import DockerException, NotFound
+from docker.errors import DockerException, ImageNotFound, NotFound
 from docker.models.containers import Container
 from docker.models.images import Image
 from filelock import FileLock
@@ -98,6 +98,11 @@ class RunningContainer:
         self.running = False
         self.thread.join()
 
+    def stop(self) -> None:
+        """Stop the container"""
+        self.container.stop()
+        self.detach()
+
 
 class DockerManager:
     def __init__(self) -> None:
@@ -316,11 +321,12 @@ class DockerManager:
                         subprocess.run(cmd_list, check=True)
                     print(f"Updated to newer version of {image_name}:{tag}")
                     local_image_hash = self.client.images.get(f"{image_name}:{tag}").id
+                    assert local_image_hash is not None
                     if remote_image_hash is not None:
                         DISK_CACHE.put(local_image_hash, remote_image_hash)
                     return True
 
-            except docker.errors.ImageNotFound:
+            except ImageNotFound:
                 print(f"Image {image_name}:{tag} not found.")
                 with Spinner("Loading "):
                     # We use docker cli here because it shows the download.
@@ -332,7 +338,7 @@ class DockerManager:
                     local_image = self.client.images.get(f"{image_name}:{tag}")
                     local_image_hash = local_image.id
                     print(f"Image {image_name}:{tag} downloaded successfully.")
-                except docker.errors.ImageNotFound:
+                except ImageNotFound:
                     warnings.warn(f"Image {image_name}:{tag} not found after download.")
         return True
 
@@ -354,8 +360,11 @@ class DockerManager:
         """Compare if existing container has matching configuration"""
         try:
             # Check if container is using the same image
-            container_image_id = container.image.id
-            container_image_tags = container.image.tags
+            image = container.image
+            assert image is not None
+            container_image_id = image.id
+            container_image_tags = image.tags
+            assert container_image_id is not None
 
             # Simplified image comparison - just compare the IDs directly
             if not container_image_tags:
@@ -421,7 +430,7 @@ class DockerManager:
                         return False
         except KeyboardInterrupt:
             raise
-        except docker.errors.NotFound:
+        except NotFound:
             print("Container not found.")
             return False
         except Exception as e:
@@ -502,13 +511,13 @@ class DockerManager:
             print(out_msg)
             print("#" * msg_len + "\n")
             container = self.client.containers.run(
-                image_name,
-                command,
+                image=image_name,
+                command=command,
                 name=container_name,
                 detach=True,
                 tty=True,
                 volumes=volumes,
-                ports=ports,
+                ports=ports,  # type: ignore
                 remove=True,
             )
         return container
@@ -563,7 +572,10 @@ class DockerManager:
         Returns a RunningContainer object that can be used to stop monitoring.
         """
         if isinstance(container, str):
-            container = self.get_container(container)
+            container_name = container
+            tmp = self.get_container(container)
+            assert tmp is not None, f"Container {container_name} not found."
+            container = tmp
 
         assert container is not None, "Container not found."
 
@@ -580,10 +592,13 @@ class DockerManager:
         """
         if isinstance(container, str):
             container_name = container
-            container = self.get_container(container)
-            if not container:
+            # container = self.get_container(container)
+            tmp = self.get_container(container_name)
+            if not tmp:
                 print(f"Could not put container {container_name} to sleep.")
                 return
+            container = tmp
+        assert isinstance(container, Container)
         try:
             if platform.system() == "Windows":
                 container.pause()
@@ -600,16 +615,27 @@ class DockerManager:
         """
         Resume (unpause) the container.
         """
+        container_name = "UNKNOWN"
         if isinstance(container, str):
-            container = self.get_container(container)
+            container_name = container
+            container_or_none = self.get_container(container)
+            if container_or_none is None:
+                print(f"Could not resume container {container}.")
+                return
+            container = container_or_none
+            container_name = container.name
+        elif isinstance(container, Container):
+            container_name = container.name
+        assert isinstance(container, Container)
         if not container:
             print(f"Could not resume container {container}.")
             return
         try:
+            assert isinstance(container, Container)
             container.unpause()
             print(f"Container {container.name} has been resumed.")
         except Exception as e:
-            print(f"Failed to resume container {container.name}: {e}")
+            print(f"Failed to resume container {container_name}: {e}")
 
     def get_container(self, container_name: str) -> Container | None:
         """
@@ -753,6 +779,7 @@ def main():
     # new_tag = "my-python"
     container_name = "my-python-container"
     command = "python -m http.server"
+    running_container: RunningContainer | None = None
 
     try:
         # Step 1: Validate or download the image
@@ -775,13 +802,18 @@ def main():
 
     except KeyboardInterrupt:
         print("\nStopping container...")
-        running_container.stop()
-        container = docker_manager.get_container(container_name)
-        docker_manager.suspend_container(container)
+        if isinstance(running_container, RunningContainer):
+            running_container.stop()
+        container_or_none = docker_manager.get_container(container_name)
+        if container_or_none is not None:
+            docker_manager.suspend_container(container_or_none)
+        else:
+            warnings.warn(f"Container {container_name} not found.")
 
     try:
         # Suspend and resume the container
         container = docker_manager.get_container(container_name)
+        assert container is not None, "Container not found."
         docker_manager.suspend_container(container)
 
         input("Press Enter to resume the container...")

{fastled-1.2.47 → fastled-1.2.49}/src/fastled/filewatcher.py

@@ -15,6 +15,8 @@ from watchdog.events import FileSystemEvent, FileSystemEventHandler
 from watchdog.observers import Observer
 from watchdog.observers.api import BaseObserver
 
+_WATCHER_TIMEOUT = 0.1
+
 
 def file_watcher_enabled() -> bool:
     """Check if watchdog is disabled"""
@@ -120,7 +122,7 @@ class FileChangedNotifier(threading.Thread):
         finally:
             self.stop()
 
-    def get_next_change(self, timeout: float = 0.001) -> str | None:
+    def get_next_change(self, timeout: float = _WATCHER_TIMEOUT) -> str | None:
         """Get the next file change event from the queue
 
         Args:
@@ -148,7 +150,7 @@ class FileChangedNotifier(threading.Thread):
         except queue.Empty:
             return None
 
-    def get_all_changes(self, timeout: float = 0.001) -> list[str]:
+    def get_all_changes(self, timeout: float = _WATCHER_TIMEOUT) -> list[str]:
         """Get all file change events from the queue
 
         Args:
@@ -185,12 +187,22 @@ def _process_wrapper(root: Path, excluded_patterns: list[str], queue: Queue):
             watcher.stop()
 
 
+class ProcessWraperTask:
+    def __init__(self, root: Path, excluded_patterns: list[str], queue: Queue) -> None:
+        self.root = root
+        self.excluded_patterns = excluded_patterns
+        self.queue = queue
+
+    def run(self):
+        _process_wrapper(self.root, self.excluded_patterns, self.queue)
+
+
 class FileWatcherProcess:
     def __init__(self, root: Path, excluded_patterns: list[str]) -> None:
         self.queue: Queue = Queue()
+        task = ProcessWraperTask(root, excluded_patterns, self.queue)
         self.process = Process(
-            target=_process_wrapper,
-            args=(root, excluded_patterns, self.queue),
+            target=task.run,
             daemon=True,
         )
         self.process.start()

{fastled-1.2.47 → fastled-1.2.49}/src/fastled/web_compile.py

@@ -45,6 +45,7 @@ def _test_connection(host: str, use_ipv4: bool) -> ConnectionResult:
     # Function static cache
     host = _sanitize_host(host)
     transport = httpx.HTTPTransport(local_address="0.0.0.0") if use_ipv4 else None
+    result: ConnectionResult | None = None
     try:
         with httpx.Client(
             timeout=_TIMEOUT,
@@ -56,7 +57,7 @@ def _test_connection(host: str, use_ipv4: bool) -> ConnectionResult:
             result = ConnectionResult(host, test_response.status_code == 200, use_ipv4)
     except KeyboardInterrupt:
         _thread.interrupt_main()
-
+        result = ConnectionResult(host, False, use_ipv4)
     except TimeoutError:
         result = ConnectionResult(host, False, use_ipv4)
     except Exception:

{fastled-1.2.47 → fastled-1.2.49}/src/fastled.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fastled
-Version: 1.2.47
+Version: 1.2.49
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies

{fastled-1.2.47 → fastled-1.2.49}/tests/test_http_server.py

@@ -3,6 +3,7 @@ Unit test file.
 """
 
 import random
+import time
 import unittest
 from pathlib import Path
 
@@ -18,7 +19,7 @@ assert INDEX_HTML.exists()
 
 
 # realistic range, 8021 - 8030
-PORT = random.randint(8021, 8030)
+PORT = random.randint(8030, 8040)
 PORT2 = PORT + 1
 
 
@@ -32,6 +33,7 @@ class HttpServerTester(unittest.TestCase):
         response = httpx.get(f"http://localhost:{port}", timeout=1)
         self.assertEqual(response.status_code, 200)
         proc.terminate()
+        time.sleep(1)
 
     def test_http_server_404(self) -> None:
         """Test the http server returns 404 for non-existent files."""
@@ -40,6 +42,7 @@ class HttpServerTester(unittest.TestCase):
         response = httpx.get(f"http://localhost:{port}/nonexistent.html", timeout=1)
         self.assertEqual(response.status_code, 404)
         proc.terminate()
+        time.sleep(1)
 
 
 if __name__ == "__main__":