fastled 1.3.10__tar.gz → 1.3.13__tar.gz

fastled-1.3.13/Dockerfile

@@ -0,0 +1,58 @@
+
+# The only reason we use docker is because of the fastled-wasm-compiler.
+FROM niteris/fastled-wasm-compiler:latest
+
+
+COPY requirements.testing.txt /install/requirements.txt
+# Extract fastled-wasm-server version from requirements.txt
+RUN \
+    grep -oP '(?<=fastled-wasm-server[<>=!]=?)[^ \n#]+' /install/requirements.txt > /install/version.txt && \
+    cat /install/version.txt > /install/requirements.txt && \
+    uv pip install --system -r /install/requirements.txt --refresh || \
+    uv pip install --system -r /install/requirements.txt --refresh || \
+    uv pip install --system -r /install/requirements.txt --refresh
+
+# FIRST PRE-WARM CYCLE and initial setup: Download the fastled repo from the github and pre-warm the cache with a compilation.
+# This is by far the most expensive part of the build, because platformio needs to download initial tools. This
+# pre-warm cycle is "sticky" and tends to stay in the cache for a long time since docker is very relaxed about
+# invalidating cache layers that clone a github repo.
+
+ARG FASTLED_BUILD_DAY=echo $(date +'%Y-%m-%d')
+ENV FASTLED_BUILD_DAY=${FASTLED_BUILD_DAY}
+
+
+WORKDIR /js
+
+
+RUN mkdir -p /js/compiler
+
+
+# COPY compiler/*.py /js/compiler
+COPY entrypoint.sh /entrypoint.sh
+COPY compiler/run.py /js/run.py
+COPY compiler/debug.sh /js/debug.sh
+
+# COPY compiler/entrypoint.sh /entrypoint.sh
+# RUN chmod +x /entrypoint.sh && dos2unix /entrypoint.sh
+
+RUN cd /js && chmod +x debug.sh && dos2unix *.sh
+RUN chmod +x /entrypoint.sh && dos2unix /entrypoint.sh
+
+# RSYNC DISABLED FOR NOW
+# now sync local to the source directory.
+# RUN rsync -av /host/fastled/ /js/fastled/ && rm -rf /host/fastled
+
+# RUN python /js/init_runtime.py || true
+
+
+# SECOND PRE-WARM CYCLE: Copy the fastled repo from the host machine and pre-warm the cache with that compilation. This will
+# be much quicker than the first pre-warm cycle.
+# RUN /js/prewarm.sh --force > /logs/prewarm.log.2 || true
+
+# Now timestamp the image and store it at the end of the build.
+RUN date > /image_timestamp.txt
+
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["python", "/js/run.py", "server"]
+
+# CMD ["/bin/bash", "/entrypoint.sh"]

{fastled-1.3.10 → fastled-1.3.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastled
-Version: 1.3.10
+Version: 1.3.13
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -20,7 +20,7 @@ Requires-Dist: progress>=1.6
 Requires-Dist: watchfiles>=1.0.5
 Requires-Dist: Flask>=3.0.0
 Requires-Dist: livereload
-Requires-Dist: fastled-wasm-server>=1.0.27
+Requires-Dist: disklru>=2.0.4
 Dynamic: home-page
 Dynamic: license-file
 Dynamic: maintainer
@@ -389,12 +389,14 @@ A: A big chunk of space is being used by unnecessary javascript `emscripten` bun
 
 
 
+
   live-server --https --port=8416 --host=localhost .  --cert=C:/Users/niteris/dev/fastled-wasm/src/fastled/assets/localhost-key.pem --key=C:/Users/niteris/dev/fastled-wasm/src/fastled/assets/localhost.pem --no-browser
 
 
   live-server --https --cert=src/fastled/assets/localhost.pem --key=src/fastled/assets/localhost-key.pem --port=5500
 
 
+
 ## Performance
 
 ```

{fastled-1.3.10 → fastled-1.3.13}/README.md

@@ -362,12 +362,14 @@ A: A big chunk of space is being used by unnecessary javascript `emscripten` bun
 
 
 
+
   live-server --https --port=8416 --host=localhost .  --cert=C:/Users/niteris/dev/fastled-wasm/src/fastled/assets/localhost-key.pem --key=C:/Users/niteris/dev/fastled-wasm/src/fastled/assets/localhost.pem --no-browser
 
 
   live-server --https --cert=src/fastled/assets/localhost.pem --key=src/fastled/assets/localhost-key.pem --port=5500
 
 
+
 ## Performance
 
 ```

{fastled-1.3.10 → fastled-1.3.13}/clean

@@ -19,3 +19,4 @@ find . -name "*.pyc" -exec rm -rf {} \;
 # remove all *.egg files
 find . -name "*.egg" -exec rm -rf {} \;
 
+rm -f uv.lock

{fastled-1.3.10 → fastled-1.3.13}/compiler/run.py

@@ -6,8 +6,8 @@ import warnings
 from pathlib import Path
 from typing import Tuple
 
-from fastled_wasm_server.code_sync import CodeSync
-from fastled_wasm_server.paths import VOLUME_MAPPED_SRC
+from fastled_wasm_compiler.compiler import Compiler
+from fastled_wasm_compiler.paths import VOLUME_MAPPED_SRC
 
 _PORT = os.environ.get("PORT", 80)
 
@@ -16,33 +16,6 @@ _CHOICES = ["compile", "server"]
 HERE = Path(__file__).parent
 
 
-def _update_fastled() -> None:
-    # NOT ENABLED YET
-    if True:
-        return
-    is_render = os.environ.get("RENDER", "false") == "true"
-    if not is_render:
-        print("Skipping finalprewarm...")
-        return
-    git_path = "/git/fastled"
-    fastled_path = "/js/fastled"
-    subprocess.run(["git", "fetch", "origin"], cwd=git_path)
-    subprocess.run(["git", "reset", "--hard", "origin/master"], cwd=git_path)
-    subprocess.run(
-        [
-            "rsync",
-            "-av",
-            "--info=NAME",
-            "--delete",
-            f"{git_path}/",
-            f"{fastled_path}/",
-            "--exclude",
-            ".git",
-        ],
-        cwd="/js",
-    )
-
-
 def _parse_args() -> Tuple[argparse.Namespace, list[str]]:
     parser = argparse.ArgumentParser(
         description="Run compile.py with additional arguments"
@@ -102,16 +75,16 @@ def _run_compile(unknown_args: list[str]) -> int:
 def main() -> int:
     print("Running...")
     args, unknown_args = _parse_args()
-    _update_fastled()
-
-    code_sync = CodeSync(
+    compiler = Compiler(
         volume_mapped_src=VOLUME_MAPPED_SRC,
-        rsync_dest=Path("/invalid/path"),
     )
-    code_sync.sync_source_directory_if_volume_is_mapped()
+    compiler.update_src()
 
     try:
         if args.mode == "compile":
+            warnings.warn(
+                "The compile mode is deprecated and may fail. Use server mode instead."
+            )
             rtn = _run_compile(unknown_args)
             return rtn
         elif args.mode == "server":

{fastled-1.3.10 → fastled-1.3.13}/docker-compose.yml

@@ -7,4 +7,4 @@ services:
       - "8234:80"
     environment:
       - ENVIRONMENT=dev
-    image: niteris/fastled-wasm:local
+    image: niteris/fastled-wasm:latest

{fastled-1.3.10/compiler → fastled-1.3.13}/entrypoint.sh

@@ -4,12 +4,9 @@
 source /emsdk/emsdk_env.sh
 export PATH="$PATH:/emsdk/upstream/bin"
 
-# initialize runtime
-python init_runtime.py
-
 # only do the final prewarm if RUNTIME_PREWARM is set to "1"
 if [[ "${RUNTIME_PREWARM:-0}" == "1" ]]; then
-  ./final_prewarm.sh
+    uv run -m fastled_wasm_compiler.cli_update_from_master
 fi
 
 # hand off to the main command

{fastled-1.3.10 → fastled-1.3.13}/pyproject.toml

@@ -23,8 +23,7 @@ dependencies = [
     "watchfiles>=1.0.5",
     "Flask>=3.0.0",
     "livereload",
-    ###### WASM SERVER ######
-    "fastled-wasm-server>=1.0.27",  # Enforced by unit test to match project <--> docker.
+    "disklru>=2.0.4",
 ]
 
 dynamic = ["version"]

{fastled-1.3.10 → fastled-1.3.13}/requirements.testing.txt

@@ -5,4 +5,5 @@ pytest
 ruff
 pytest-xdist
 pyinstaller
-pyright
+pyright
+fastled-wasm-server>=1.0.55

{fastled-1.3.10 → fastled-1.3.13}/src/fastled/__version__.py

@@ -1,6 +1,6 @@
 # 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.3.10"
+__version__ = "1.3.13"
 
 __version_url_latest__ = "https://raw.githubusercontent.com/zackees/fastled-wasm/refs/heads/main/src/fastled/__version__.py"

{fastled-1.3.10 → fastled-1.3.13}/src/fastled/app.py

@@ -2,6 +2,7 @@
 Uses the latest wasm compiler image to compile the FastLED sketch.
 """
 
+import os
 import sys
 import time
 from pathlib import Path
@@ -12,12 +13,6 @@ from fastled.filewatcher import file_watcher_set
 from fastled.parse_args import Args, parse_args
 from fastled.sketch import find_sketch_directories, looks_like_fastled_repo
 
-# from fastled.sketch import (
-#     find_sketch_directories,
-#     looks_like_fastled_repo,
-#     looks_like_sketch_directory,
-# )
-
 
 def run_server(args: Args) -> int:
     interactive = args.interactive

{fastled-1.3.10 → fastled-1.3.13}/src/fastled/args.py

@@ -62,6 +62,7 @@ class Args:
         assert isinstance(
             args.release, bool
         ), f"expected bool, got {type(args.release)}"
+
         init: bool | str = False
         if args.init is None:
             init = False

{fastled-1.3.10 → fastled-1.3.13}/src/fastled/cli.py

@@ -3,7 +3,6 @@ Main entry point.
 """
 
 import multiprocessing
-import os
 import sys
 
 
@@ -16,9 +15,9 @@ def run_app() -> int:
 
 def main() -> int:
     """Main entry point for the template_python_cmd package."""
-    if "--debug" in sys.argv:
-        # Debug mode
-        os.environ["FLASK_SERVER_LOGGING"] = "1"
+    # if "--debug" in sys.argv:
+    #     # Debug mode
+    #     os.environ["FLASK_SERVER_LOGGING"] = "1"
     return run_app()
 
 

{fastled-1.3.10 → fastled-1.3.13}/src/fastled/compile_server_impl.py

@@ -249,22 +249,6 @@ class CompileServerImpl:
                 # to allow for interactive compilation
                 # interactive_sources = list(INTERACTIVE_SOURCES)
                 interactive_sources: list[tuple[Path, str]] = []
-                init_runtime_py = (
-                    Path(self.fastled_src_dir)
-                    / ".."
-                    / ".."
-                    / "fastled-wasm"
-                    / "compiler"
-                    / "init_runtime.py"
-                )
-                if init_runtime_py.exists():
-                    # fastled-wasm is in a sister directory, mapping this in to the container.
-                    mapping = (
-                        init_runtime_py,
-                        "/js/init_runtime.py",
-                    )
-                    interactive_sources.append(mapping)
-
                 src_host: Path
                 dst_container: str
                 for src_host, dst_container in interactive_sources:

{fastled-1.3.10 → fastled-1.3.13}/src/fastled/docker_manager.py

@@ -36,7 +36,7 @@ _IS_GITHUB = "GITHUB_ACTIONS" in os.environ
 _DEFAULT_BUILD_DIR = "/js/.pio/build"
 
 
-os.environ.get("FASTLED_FORCE_CLEAR", "0") == "1"
+FORCE_CLEAR: bool = bool(os.environ.get("FASTLED_FORCE_CLEAR", "0") == "1")
 
 
 # Docker uses datetimes in UTC but without the timezone info. If we pass in a tz
@@ -68,6 +68,11 @@ def get_ramdisk_size() -> str | None:
         return None  # Defaults to off
 
 
+def get_force_remove_image_previous() -> bool:
+    """Get the force remove image previous value."""
+    return os.environ.get("FASTLED_FORCE_CLEAR", "0") == "1"
+
+
 def set_clear() -> None:
     os.environ["FASTLED_FORCE_CLEAR"] = "1"
 
@@ -218,6 +223,18 @@ def _hack_to_fix_mac(volumes: list[Volume] | None) -> list[Volume] | None:
     return volumes
 
 
+def set_force_remove_image_previous(new_value: str | None = None) -> None:
+    if new_value is not None:
+        os.environ["FASTLED_FORCE_CLEAR"] = new_value
+    else:
+        os.environ["FASTLED_FORCE_CLEAR"] = "1"
+
+
+def force_image_removal() -> bool:
+    """Get the force remove image previous value."""
+    return os.environ.get("FASTLED_FORCE_CLEAR", "0") == "1"
+
+
 class DockerManager:
     def __init__(self) -> None:
         from docker.errors import DockerException
@@ -635,6 +652,13 @@ class DockerManager:
             ports: Dict mapping host ports to container ports
                     Example: {8080: 80} maps host port 8080 to container port 80
         """
+        remove_previous = remove_previous or get_force_remove_image_previous()
+        if get_force_remove_image_previous():
+            # make a banner print
+            print(
+                "Force removing previous image due to FASTLED_FORCE_CLEAR environment variable."
+            )
+
         tmpfs_size = tmpfs_size or get_ramdisk_size()
         sys_admin = tmpfs_size is not None and tmpfs_size != "0"
         volumes = _hack_to_fix_mac(volumes)

{fastled-1.3.10 → fastled-1.3.13}/src/fastled/parse_args.py

@@ -146,12 +146,17 @@ def parse_args() -> Args:
         help="Remove all FastLED containers and images",
     )
 
+    parser.add_argument(
+        "--clear",
+        action="store_true",
+        help="Remove all FastLED containers and images",
+    )
+
     build_mode = parser.add_mutually_exclusive_group()
     build_mode.add_argument("--debug", action="store_true", help="Build in debug mode")
     build_mode.add_argument(
         "--quick",
         action="store_true",
-        default=True,
         help="Build in quick mode (default)",
     )
     build_mode.add_argument(
@@ -162,13 +167,24 @@ def parse_args() -> Args:
 
     args = parser.parse_args()
 
-    if args.ram_disk_size != "0":
-        from fastled.docker_manager import set_ramdisk_size
-        from fastled.util import banner_string
+    # TODO: propagate the library.
+    # from fastled.docker_manager import force_remove_previous
 
-        msg = banner_string(f"Setting tmpfs size to {args.ram_disk_size}")
-        print(msg)
-        set_ramdisk_size(args.ram_disk_size)
+    # if force_remove_previous():
+    #     print("Removing previous containers...")
+    # do itinfront he camer
+    # nonw invoke via the
+    #
+    # Work in progress.
+    # set_ramdisk_size("50mb")
+
+    # if args.ram_disk_size != "0":
+    #     from fastled.docker_manager import set_ramdisk_size
+    #     from fastled.util import banner_string
+
+    #     msg = banner_string(f"Setting tmpfs size to {args.ram_disk_size}")
+    #     print(msg)
+    #     set_ramdisk_size(args.ram_disk_size)
 
     if args.purge:
         from fastled.docker_manager import DockerManager
@@ -188,15 +204,26 @@ def parse_args() -> Args:
         print(f"Use 'fastled {args.directory}' to compile the project.")
         sys.exit(0)
 
+    cwd: Path = Path(os.getcwd())
+    fastled_dir: Path | None = _find_fastled_repo(cwd)
+    is_fastled_dir: bool = fastled_dir is not None
+
+    if not (args.debug or args.quick or args.release):
+        if is_fastled_dir:
+            # if --quick, --debug, --release are not specified then default to --debug
+            args.quick = True
+            print("Defaulting to --quick mode in fastled repo")
+        else:
+            args.quick = True
+            print("Defaulting to --quick mode")
+
     if args.build or args.interactive:
-        cwd: Path = Path(os.getcwd())
-        fastled_dir: Path | None = _find_fastled_repo(cwd)
         if args.directory is not None:
             args.directory = str(Path(args.directory).absolute())
-        if fastled_dir is None:
+        if not is_fastled_dir:
             print("This command must be run from within the FastLED repo. Exiting...")
             sys.exit(1)
-        if cwd != fastled_dir:
+        if cwd != fastled_dir and fastled_dir is not None:
             print(f"Switching to FastLED repo at {fastled_dir}")
             os.chdir(fastled_dir)
         if args.directory is None:

{fastled-1.3.10 → fastled-1.3.13}/src/fastled.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastled
-Version: 1.3.10
+Version: 1.3.13
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -20,7 +20,7 @@ Requires-Dist: progress>=1.6
 Requires-Dist: watchfiles>=1.0.5
 Requires-Dist: Flask>=3.0.0
 Requires-Dist: livereload
-Requires-Dist: fastled-wasm-server>=1.0.27
+Requires-Dist: disklru>=2.0.4
 Dynamic: home-page
 Dynamic: license-file
 Dynamic: maintainer
@@ -389,12 +389,14 @@ A: A big chunk of space is being used by unnecessary javascript `emscripten` bun
 
 
 
+
   live-server --https --port=8416 --host=localhost .  --cert=C:/Users/niteris/dev/fastled-wasm/src/fastled/assets/localhost-key.pem --key=C:/Users/niteris/dev/fastled-wasm/src/fastled/assets/localhost.pem --no-browser
 
 
   live-server --https --cert=src/fastled/assets/localhost.pem --key=src/fastled/assets/localhost-key.pem --port=5500
 
 
+
 ## Performance
 
 ```

{fastled-1.3.10 → fastled-1.3.13}/src/fastled.egg-info/SOURCES.txt

@@ -13,6 +13,7 @@ build_local_docker.py
 build_site.py
 clean
 docker-compose.yml
+entrypoint.sh
 install
 install_linux.sh
 lint
@@ -33,18 +34,8 @@ upload_package.sh
 .vscode/launch.json
 .vscode/settings.json
 .vscode/tasks.json
-compiler/CMakeLists.txt
-compiler/arduino-pre-process.sh
 compiler/debug.sh
-compiler/entrypoint.sh
-compiler/final_prewarm.sh
-compiler/init_runtime.py
-compiler/install-arduino-cli.sh
-compiler/prewarm.sh
-compiler/process-ino.py
-compiler/pyproject.toml
 compiler/run.py
-compiler/libcompile/CMakeLists.txt
 demo/100dots.html
 demo/demo_threejs.html
 demo/micdemo.html
@@ -111,7 +102,6 @@ tests/unit/test_project_init.py
 tests/unit/test_server_and_client_seperatly.py
 tests/unit/test_string_diff.py
 tests/unit/test_version.py
-tests/unit/test_version_matches.py
 tests/unit/test_webcompile.py
 tests/unit/html/index.html
 tests/unit/test_ino/bad/bad.ino

{fastled-1.3.10 → fastled-1.3.13}/src/fastled.egg-info/requires.txt

@@ -8,4 +8,4 @@ progress>=1.6
 watchfiles>=1.0.5
 Flask>=3.0.0
 livereload
-fastled-wasm-server>=1.0.27
+disklru>=2.0.4

{fastled-1.3.10 → fastled-1.3.13}/test

@@ -19,8 +19,8 @@ if [[ "$*" == *"--full"* ]]; then
     uv run build_local_docker.py
 fi
 
-
-
+# If the test fails, then purge and try again
 pytest -x -v -s --durations=0 tests/unit "$@"
+
 # uv run pytest -n auto tests -v
 

{fastled-1.3.10 → fastled-1.3.13}/tests/unit/test_version.py

@@ -16,10 +16,11 @@ class MainTester(unittest.TestCase):
     def test_command(self) -> None:
         """Test command line interface (CLI)."""
         stdout = subprocess.check_output(COMMAND, shell=True)
+        version_stdout = stdout.decode("utf-8").strip()
         self.assertEqual(
-            stdout.decode("utf-8").strip(),
+            version_stdout,
             __version__,
-            f"Version mismatch: {stdout.decode('utf-8').strip()} != {__version__}",
+            f"FastLED Version mismatch: {version_stdout} (tool output) != {__version__} (package version)",
         )
 
 

fastled-1.3.10/Dockerfile

@@ -1,85 +0,0 @@
-
-# The only reason we use docker is because of the fastled-wasm-compiler.
-FROM niteris/fastled-wasm-compiler:latest
-
-
-# Get the compiler requirements and install them.
-COPY compiler/pyproject.toml /install/pyproject.toml
-RUN uv pip install --system -r /install/pyproject.toml
-
-# FIRST PRE-WARM CYCLE and initial setup: Download the fastled repo from the github and pre-warm the cache with a compilation.
-# This is by far the most expensive part of the build, because platformio needs to download initial tools. This
-# pre-warm cycle is "sticky" and tends to stay in the cache for a long time since docker is very relaxed about
-# invalidating cache layers that clone a github repo.
-
-RUN echo "force update4"
-ARG FASTLED_BUILD_DAY=echo $(date +'%Y-%m-%d')
-ENV FASTLED_BUILD_DAY=${FASTLED_BUILD_DAY}
-
-# ARG FASTLED_VERSION=master
-# ENV FASTLED_VERSION=${FASTLED_VERSION}
-# RUN mkdir -p /js/fastled && \
-#     rsync -a /git/fastled/ /js/fastled/ --exclude='.git'
-
-# Create symlinks for wasm platform files.
-COPY compiler/init_runtime.py /js/init_runtime.py
-#COPY compiler/prewarm.sh /js/prewarm.sh
-
-WORKDIR /js
-
-#ARG NO_PREWARM=0
-#ENV NO_PREWARM=${NO_PREWARM}
-
-#RUN python /js/init_runtime.py || true
-
-
-# First pre-warm cycle - always do it as part of the build.
-# RUN mkdir -p /logs
-
-# Force a build if the compiler flags change.
-#COPY compiler/CMakeLists.txt /trash/CMakeLists.txt
-#RUN rm -rf /trash
-
-#RUN chmod +x /js/prewarm.sh && \
-#    cat /js/prewarm.sh >> /logs/prewarm.log.0
-#RUN /js/prewarm.sh --force >> /logs/prewarm.log.1 || true
-
-
-
-# # Copy the fastled repo from the host machine and prepare for pre-warm
-# # Make sure and delete files that have been removed so that we don't get
-# # duplicate symbols from stale files.
-# COPY *.json /host/fastled/
-# COPY src/*.* /host/fastled/src/
-# COPY examples /host/fastled/examples
-# COPY src/fx /host/fastled/src/fx
-# COPY src/fl /host/fastled/src/fl
-# COPY src/lib8tion /host/fastled/src/lib8tion
-# COPY src/third_party /host/fastled/src/third_party
-# COPY src/sensors /host/fastled/src/sensors
-# COPY src/platforms /host/fastled/src/platforms
-
-RUN echo "force update"
-COPY compiler /js/compiler
-
-COPY compiler/entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh && dos2unix /entrypoint.sh
-
-# RSYNC DISABLED FOR NOW
-# now sync local to the source directory.
-# RUN rsync -av /host/fastled/ /js/fastled/ && rm -rf /host/fastled
-
-# RUN python /js/init_runtime.py || true
-
-
-# SECOND PRE-WARM CYCLE: Copy the fastled repo from the host machine and pre-warm the cache with that compilation. This will
-# be much quicker than the first pre-warm cycle.
-# RUN /js/prewarm.sh --force > /logs/prewarm.log.2 || true
-
-# Now timestamp the image and store it at the end of the build.
-RUN date > /image_timestamp.txt
-
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["python", "/js/run.py", "server"]
-
-# CMD ["/bin/bash", "/entrypoint.sh"]