fastled 1.1.16__py2.py3-none-any.whl → 1.1.17__py2.py3-none-any.whl

fastled/__init__.py

@@ -1,3 +1,3 @@
 """FastLED Wasm Compiler package."""
 
-__version__ = "1.1.16"
+__version__ = "1.1.17"

fastled/app.py

@@ -104,16 +104,32 @@ def parse_args() -> argparse.Namespace:
         action="store_true",
         help="Run the server in the current directory, volume mapping fastled if we are in the repo",
     )
-
-    build_mode.add_argument(
+    parser.add_argument(
         "--force-compile",
         action="store_true",
         help="Skips the test to see if the current directory is a valid FastLED sketch directory",
     )
+    parser.add_argument(
+        "--no-auto-updates",
+        action="store_true",
+        help="Disable automatic updates of the wasm compiler image when using docker.",
+    )
+    parser.add_argument(
+        "--update",
+        action="store_true",
+        help="Update the wasm compiler (if necessary) before running",
+    )
 
     cwd_is_fastled = looks_like_fastled_repo(Path(os.getcwd()))
 
     args = parser.parse_args()
+    if args.update:
+        args.auto_update = True
+    elif args.no_auto_updates:
+        args.auto_update = False
+    else:
+        args.auto_update = None
+
     if not cwd_is_fastled and not args.localhost and not args.web and not args.server:
         print(f"Using web compiler at {DEFAULT_URL}")
         args.web = DEFAULT_URL
@@ -199,8 +215,8 @@ def run_web_compiler(
 
 
 def _try_start_server_or_get_url(args: argparse.Namespace) -> str | CompileServer:
+    auto_update = args.auto_update
     is_local_host = "localhost" in args.web or "127.0.0.1" in args.web or args.localhost
-
     # test to see if there is already a local host server
     local_host_needs_server = False
     if is_local_host:
@@ -225,7 +241,7 @@ def _try_start_server_or_get_url(args: argparse.Namespace) -> str | CompileServe
     else:
         try:
             print("No local server found, starting one...")
-            compile_server = CompileServer()
+            compile_server = CompileServer(auto_updates=auto_update)
             print("Waiting for the local compiler to start...")
             if not compile_server.wait_for_startup():
                 print("Failed to start local compiler.")
@@ -397,7 +413,8 @@ def run_client(args: argparse.Namespace) -> int:
 
 def run_server(args: argparse.Namespace) -> int:
     interactive = args.interactive
-    compile_server = CompileServer(interactive=interactive)
+    auto_update = args.auto_update
+    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()

fastled/compile_server.py

@@ -1,5 +1,6 @@
 import subprocess
 import time
+from datetime import datetime, timezone
 from pathlib import Path
 
 import httpx
@@ -20,6 +21,7 @@ class CompileServer:
         self,
         container_name=_DEFAULT_CONTAINER_NAME,
         interactive: bool = False,
+        auto_updates: bool | None = None,
     ) -> None:
 
         cwd = Path(".").resolve()
@@ -35,6 +37,7 @@ class CompileServer:
         self.fastled_src_dir: Path | None = fastled_src_dir
         self.interactive = interactive
         self.running_container: RunningContainer | None = None
+        self.auto_updates = auto_updates
         self._port = self._start()
         # fancy print
         if not interactive:
@@ -90,26 +93,25 @@ class CompileServer:
         print("Compiling server starting")
 
         # Ensure Docker is running
-        with self.docker.get_lock():
-            if not self.docker.is_running():
-                if not self.docker.start():
-                    print("Docker could not be started. Exiting.")
-                    raise RuntimeError("Docker could not be started. Exiting.")
-            from datetime import datetime, timezone
-
-            now = datetime.now(timezone.utc)
-            now_str = now.strftime("%Y-%m-%d %H %Z")
+        if not self.docker.is_running():
+            if not self.docker.start():
+                print("Docker could not be started. Exiting.")
+                raise RuntimeError("Docker could not be started. Exiting.")
+        now = datetime.now(timezone.utc)
+        now_str = now.strftime("%Y-%m-%d %H %Z")
+
+        upgrade = False
+        if self.auto_updates is None:
             prev_date_str = DISK_CACHE.get("last-update")
-
-            upgrade = False
             if prev_date_str != now_str:
-                print("New day, upgrading Docker image")
+                print("One hour has passed, checking docker for updates")
                 upgrade = True
-
-            self.docker.validate_or_download_image(
-                image_name=_IMAGE_NAME, tag="main", upgrade=upgrade
-            )
-            DISK_CACHE.put("last-update", now_str)
+        else:
+            upgrade = self.auto_updates
+        self.docker.validate_or_download_image(
+            image_name=_IMAGE_NAME, tag="main", upgrade=upgrade
+        )
+        DISK_CACHE.put("last-update", now_str)
 
         print("Docker image now validated")
         port = SERVER_PORT

fastled/docker_manager.py

@@ -45,8 +45,10 @@ def _win32_docker_location() -> str | None:
     return None
 
 
-_HERE = Path(__file__).parent
-_FILE_LOCK = FileLock(str(_HERE / "fled.lock"))
+def get_lock(image_name: str) -> FileLock:
+    """Get the file lock for this DockerManager instance."""
+    lock_file = CONFIG_DIR / f"{image_name}.lock"
+    return FileLock(str(lock_file))
 
 
 class RunningContainer:
@@ -90,10 +92,6 @@ class DockerManager:
         self.client: DockerClient = docker.from_env()
         self.first_run = False
 
-    def get_lock(self) -> FileLock:
-        """Get the file lock for this DockerManager instance."""
-        return _FILE_LOCK
-
     @staticmethod
     def is_docker_installed() -> bool:
         """Check if Docker is installed on the system."""
@@ -179,52 +177,56 @@ class DockerManager:
         """
         print(f"Validating image {image_name}:{tag}...")
 
-        try:
-            local_image = self.client.images.get(f"{image_name}:{tag}")
-            print(f"Image {image_name}:{tag} is already available.")
-
-            if upgrade:
-                remote_image = self.client.images.get_registry_data(
-                    f"{image_name}:{tag}"
-                )
-                remote_image_hash = remote_image.id
-                try:
-                    remote_image_hash_from_local_image = DISK_CACHE.get(local_image.id)
-                except KeyboardInterrupt:
-                    raise
-                except Exception:
-                    remote_image_hash_from_local_image = None
-                    import traceback
-                    import warnings
+        with get_lock(f"{image_name}-{tag}"):
+            try:
+                local_image = self.client.images.get(f"{image_name}:{tag}")
+                print(f"Image {image_name}:{tag} is already available.")
 
-                    stack = traceback.format_exc()
-                    warnings.warn(
-                        f"Error getting remote image hash from local image: {stack}"
+                if upgrade:
+                    remote_image = self.client.images.get_registry_data(
+                        f"{image_name}:{tag}"
                     )
-                if remote_image_hash_from_local_image == remote_image_hash:
-                    print(f"Local image {image_name}:{tag} is up to date.")
-                    return
+                    remote_image_hash = remote_image.id
+                    remote_image_hash_from_local_image: str | None = None
+                    try:
+                        remote_image_hash_from_local_image = DISK_CACHE.get(
+                            local_image.id
+                        )
+                    except KeyboardInterrupt:
+                        raise
+                    except Exception:
+                        remote_image_hash_from_local_image = None
+                        import traceback
+                        import warnings
+
+                        stack = traceback.format_exc()
+                        warnings.warn(
+                            f"Error getting remote image hash from local image: {stack}"
+                        )
+                    if remote_image_hash_from_local_image == remote_image_hash:
+                        print(f"Local image {image_name}:{tag} is up to date.")
+                        return
 
-                # Quick check for latest version
+                    # Quick check for latest version
 
-                print(f"Pulling newer version of {image_name}:{tag}...")
-                _ = self.client.images.pull(image_name, tag=tag)
-                print(f"Updated to newer version of {image_name}:{tag}")
-                local_image_hash = self.client.images.get(f"{image_name}:{tag}").id
-                DISK_CACHE.put(local_image_hash, remote_image_hash)
+                    print(f"Pulling newer version of {image_name}:{tag}...")
+                    _ = self.client.images.pull(image_name, tag=tag)
+                    print(f"Updated to newer version of {image_name}:{tag}")
+                    local_image_hash = self.client.images.get(f"{image_name}:{tag}").id
+                    DISK_CACHE.put(local_image_hash, remote_image_hash)
 
-        except docker.errors.ImageNotFound:
-            print(f"Image {image_name}:{tag} not found. Downloading...")
-            self.client.images.pull(image_name, tag=tag)
-            try:
-                local_image = self.client.images.get(f"{image_name}:{tag}")
-                local_image_hash = local_image.id
-                DISK_CACHE.put(local_image_hash, remote_image_hash)
-                print(f"Image {image_name}:{tag} downloaded successfully.")
             except docker.errors.ImageNotFound:
-                import warnings
+                print(f"Image {image_name}:{tag} not found. Downloading...")
+                self.client.images.pull(image_name, tag=tag)
+                try:
+                    local_image = self.client.images.get(f"{image_name}:{tag}")
+                    local_image_hash = local_image.id
+                    DISK_CACHE.put(local_image_hash, remote_image_hash)
+                    print(f"Image {image_name}:{tag} downloaded successfully.")
+                except docker.errors.ImageNotFound:
+                    import warnings
 
-                warnings.warn(f"Image {image_name}:{tag} not found after download.")
+                    warnings.warn(f"Image {image_name}:{tag} not found after download.")
 
     def tag_image(self, image_name: str, old_tag: str, new_tag: str) -> None:
         """

{fastled-1.1.16.dist-info → fastled-1.1.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastled
-Version: 1.1.16
+Version: 1.1.17
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -161,6 +161,7 @@ A: A big chunk of space is being used by unnecessary javascript `emscripten` is
 
 # Revisions
 
+  * 1.1.17 - Added `--update` and `--no-auto-update` to control whether the compiler in docker mode will try to update.
   * 1.1.16 - Rewrote docker logic to use container suspension and resumption. Much much faster.
   * 1.1.15 - Fixed logic for considering ipv6 addresses. Auto selection of ipv6 is now restored.
   * 1.1.14 - Fixes for regression in using --server and --localhost as two instances, this is now under test.

{fastled-1.1.16.dist-info → fastled-1.1.17.dist-info}/RECORD

@@ -1,9 +1,9 @@
-fastled/__init__.py,sha256=lSQZ1Dcii_FVM8VSJksjq9KpLmMsNl8jlUnsYp7Ko7I,64
-fastled/app.py,sha256=5ZKCN8XwcK6wfbp7hQRg-hUkZOSMJgmiTksQ8oX2rME,15094
+fastled/__init__.py,sha256=eYxLUpPhHXARLnRFwdJgoCDIx4kVkzNiZ_--PzqMApE,64
+fastled/app.py,sha256=xgMl-9s3dy2TurnSusVdIAr3ZbSi5oyEAofHsa7hZho,15695
 fastled/build_mode.py,sha256=joMwsV4K1y_LijT4gEAcjx69RZBoe_KmFmHZdPYbL_4,631
 fastled/cli.py,sha256=CNR_pQR0sNVPNuv8e_nmm-0PI8sU-eUBUgnWgWkzW9c,237
-fastled/compile_server.py,sha256=IKdW82dswZSWrp8oCH4khAMYqz6Vf_65m1ad8m2aSHA,5304
-fastled/docker_manager.py,sha256=m09qpT5GnmofPGkPIV6KDJWYduRdRZhQAntBpJoV-24,19722
+fastled/compile_server.py,sha256=aBdpILSRrDsCJ5e9g5uwIqt9bcqE_8FrSddCV2ygtrI,5401
+fastled/docker_manager.py,sha256=dj6s1mT-ecURqYJH-JpZZWuFHr-dGkQIOuFm845Nz40,20042
 fastled/filewatcher.py,sha256=fJNMQRDCpihSL4nQeYPqbD4m1Jzjcz_-YRAo-wlPW6k,6518
 fastled/keyboard.py,sha256=rqndglWYzRy6oiqHgsmx1peLd0Yrpci01zGENlCzh_s,2576
 fastled/open_browser.py,sha256=RRHcsZ5Vzsw1AuZUEYuSfjKmf_9j3NGMDUR-FndHmqs,1483
@@ -12,9 +12,9 @@ fastled/sketch.py,sha256=KhhPFqlFVlBk8YrzFy7-ioe7zEzecgrVLhyFbLpBp7k,1845
 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.16.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-fastled-1.1.16.dist-info/METADATA,sha256=a7SXnewYqDzmkJF6sUkgfn0IwYH_yByh3HbUfxnhDYg,13375
-fastled-1.1.16.dist-info/WHEEL,sha256=0VNUDWQJzfRahYI3neAhz2UVbRCtztpN5dPHAGvmGXc,109
-fastled-1.1.16.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
-fastled-1.1.16.dist-info/top_level.txt,sha256=xfG6Z_ol9V5YmBROkZq2QTRwjbS2ouCUxaTJsOwfkOo,14
-fastled-1.1.16.dist-info/RECORD,,
+fastled-1.1.17.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+fastled-1.1.17.dist-info/METADATA,sha256=IX_gRsLWHvl9Fk7sbMWTmVoLqRGuDcAW_88tbfLAKuA,13496
+fastled-1.1.17.dist-info/WHEEL,sha256=0VNUDWQJzfRahYI3neAhz2UVbRCtztpN5dPHAGvmGXc,109
+fastled-1.1.17.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
+fastled-1.1.17.dist-info/top_level.txt,sha256=xfG6Z_ol9V5YmBROkZq2QTRwjbS2ouCUxaTJsOwfkOo,14
+fastled-1.1.17.dist-info/RECORD,,