fastled 1.1.3__tar.gz → 1.1.6__tar.gz

{fastled-1.1.3 → fastled-1.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastled
-Version: 1.1.3
+Version: 1.1.6
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -91,6 +91,9 @@ provide shims for most of the common api points.
 
 # Revisions
 
+  * 1.1.6 - Use the fast src volume map allow quick updates to fastled when developing on the source code.
+  * 1.1.5 - Filter out hidden files and directories from being included in the sketch archive sent to the compiler.
+  * 1.1.4 - Fix regression introduced by testing out ipv4/ipv6 connections from a thread pool.
   * 1.1.3 - Live editing of *.h and *.cpp files is now possible. Sketch cache will be disabled in this mode.
   * 1.1.2 - `--server` will now volume map fastled src directory if it detects this. This was also implemented on the docker side.
   * 1.1.1 - `--interactive` is now supported to debug the container. Volume maps and better compatibilty with ipv4/v6 by concurrent connection finding.

{fastled-1.1.3 → fastled-1.1.6}/README.md

@@ -72,6 +72,9 @@ provide shims for most of the common api points.
 
 # Revisions
 
+  * 1.1.6 - Use the fast src volume map allow quick updates to fastled when developing on the source code.
+  * 1.1.5 - Filter out hidden files and directories from being included in the sketch archive sent to the compiler.
+  * 1.1.4 - Fix regression introduced by testing out ipv4/ipv6 connections from a thread pool.
   * 1.1.3 - Live editing of *.h and *.cpp files is now possible. Sketch cache will be disabled in this mode.
   * 1.1.2 - `--server` will now volume map fastled src directory if it detects this. This was also implemented on the docker side.
   * 1.1.1 - `--interactive` is now supported to debug the container. Volume maps and better compatibilty with ipv4/v6 by concurrent connection finding.

{fastled-1.1.3 → fastled-1.1.6}/pyproject.toml

@@ -19,7 +19,7 @@ dependencies = [
     "filelock",
 ]
 # Change this with the version number bump.
-version = "1.1.3"
+version = "1.1.6"
 
 [tool.setuptools]
 package-dir = {"" = "src"}

{fastled-1.1.3 → fastled-1.1.6}/src/fastled/app.py

@@ -20,6 +20,7 @@ from fastled.compile_server import CompileServer, looks_like_fastled_repo
 from fastled.docker_manager import DockerManager
 from fastled.filewatcher import FileChangedNotifier
 from fastled.open_browser import open_browser_thread
+from fastled.sketch import get_sketch_files
 from fastled.web_compile import web_compile
 
 machine = platform.machine().lower()
@@ -210,12 +211,7 @@ def _try_start_server_or_get_url(args: argparse.Namespace) -> str | CompileServe
 
 
 def _lots_and_lots_of_files(directory: Path) -> bool:
-    count = 0
-    for root, dirs, files in os.walk(directory):
-        count += len(files)
-        if count > 100:
-            return True
-    return False
+    return len(get_sketch_files(directory)) > 100
 
 
 def _looks_like_sketch_directory(directory: Path) -> bool:

{fastled-1.1.3 → fastled-1.1.6}/src/fastled/compile_server.py

@@ -151,7 +151,7 @@ class CompileServer:
                 f"Mounting FastLED source directory {self.fastled_src_dir} into container /js/fastled/src"
             )
             volumes = {
-                str(self.fastled_src_dir): {"bind": "/js/fastled/src", "mode": "rw"}
+                str(self.fastled_src_dir): {"bind": "/host/fastled/src", "mode": "ro"}
             }
             # no auto-update because the source directory is mapped in.
             server_command.append("--no-auto-update")  # stop git repo updates.

fastled-1.1.6/src/fastled/sketch.py

@@ -0,0 +1,18 @@
+import os
+from pathlib import Path
+
+
+def get_sketch_files(directory: Path) -> list[Path]:
+    files: list[Path] = []
+    for root, dirs, filenames in os.walk(directory):
+        # ignore hidden directories
+        dirs[:] = [d for d in dirs if not d.startswith(".")]
+        # ignore fastled_js directory
+        dirs[:] = [d for d in dirs if "fastled_js" not in d]
+        # ignore hidden files
+        filenames = [f for f in filenames if not f.startswith(".")]
+        for filename in filenames:
+            if "platformio.ini" in filename:
+                continue
+            files.append(Path(root) / filename)
+    return files

fastled-1.1.6/src/fastled/web_compile.py

@@ -0,0 +1,227 @@
+import io
+import shutil
+import tempfile
+import zipfile
+from concurrent.futures import ThreadPoolExecutor, as_completed
+from dataclasses import dataclass
+from pathlib import Path
+
+import httpx
+
+from fastled.build_mode import BuildMode
+from fastled.compile_server import SERVER_PORT
+from fastled.sketch import get_sketch_files
+
+DEFAULT_HOST = "https://fastled.onrender.com"
+ENDPOINT_COMPILED_WASM = "compile/wasm"
+_TIMEOUT = 60 * 4  # 2 mins timeout
+_AUTH_TOKEN = "oBOT5jbsO4ztgrpNsQwlmFLIKB"
+
+_THREAD_POOL = ThreadPoolExecutor(max_workers=8)
+
+
+@dataclass
+class TestConnectionResult:
+    host: str
+    success: bool
+    ipv4: bool
+
+
+@dataclass
+class WebCompileResult:
+    success: bool
+    stdout: str
+    hash_value: str | None
+    zip_bytes: bytes
+
+    def __bool__(self) -> bool:
+        return self.success
+
+
+def _sanitize_host(host: str) -> str:
+    if host.startswith("http"):
+        return host
+    is_local_host = "localhost" in host or "127.0.0.1" in host or "0.0.0.0" in host
+    use_https = not is_local_host
+    if use_https:
+        return host if host.startswith("https://") else f"https://{host}"
+    return host if host.startswith("http://") else f"http://{host}"
+
+
+_CONNECTION_ERROR_MAP: dict[str, TestConnectionResult] = {}
+
+
+def _test_connection(host: str, use_ipv4: bool) -> TestConnectionResult:
+    key = f"{host}-{use_ipv4}"
+    maybe_result: TestConnectionResult | None = _CONNECTION_ERROR_MAP.get(key)
+    if maybe_result is not None:
+        return maybe_result
+    transport = httpx.HTTPTransport(local_address="0.0.0.0") if use_ipv4 else None
+    try:
+        with httpx.Client(
+            timeout=_TIMEOUT,
+            transport=transport,
+        ) as test_client:
+            test_response = test_client.get(
+                f"{host}/healthz", timeout=3, follow_redirects=True
+            )
+            result = TestConnectionResult(
+                host, test_response.status_code == 200, use_ipv4
+            )
+            _CONNECTION_ERROR_MAP[key] = result
+    except Exception:
+        result = TestConnectionResult(host, False, use_ipv4)
+        _CONNECTION_ERROR_MAP[key] = result
+    return result
+
+
+def zip_files(directory: Path) -> bytes | Exception:
+    print("Zipping files...")
+    try:
+        files = get_sketch_files(directory)
+        if not files:
+            raise FileNotFoundError(f"No files found in {directory}")
+        for f in files:
+            print(f"Adding file: {f}")
+        # Create in-memory zip file
+        zip_buffer = io.BytesIO()
+        with zipfile.ZipFile(
+            zip_buffer, "w", zipfile.ZIP_DEFLATED, compresslevel=9
+        ) as zip_file:
+            for file_path in files:
+                relative_path = file_path.relative_to(directory)
+                zip_file.write(file_path, str(Path("wasm") / relative_path))
+        return zip_buffer.getvalue()
+    except Exception as e:
+        return e
+
+
+def web_compile(
+    directory: Path,
+    host: str | None = None,
+    auth_token: str | None = None,
+    build_mode: BuildMode | None = None,
+    profile: bool = False,
+) -> WebCompileResult:
+    host = _sanitize_host(host or DEFAULT_HOST)
+    print("Compiling on", host)
+    auth_token = auth_token or _AUTH_TOKEN
+
+    if not directory.exists():
+        raise FileNotFoundError(f"Directory not found: {directory}")
+
+    zip_bytes = zip_files(directory)
+    if isinstance(zip_bytes, Exception):
+        return WebCompileResult(
+            success=False, stdout=str(zip_bytes), hash_value=None, zip_bytes=b""
+        )
+    archive_size = len(zip_bytes)
+    print(f"Web compiling on {host}...")
+    try:
+
+        files = {"file": ("wasm.zip", zip_bytes, "application/x-zip-compressed")}
+        urls = [host]
+        domain = host.split("://")[-1]
+        if ":" not in domain:
+            urls.append(f"{host}:{SERVER_PORT}")
+        test_connection_result: TestConnectionResult | None = None
+
+        futures: list = []
+        ip_versions = [True, False] if "localhost" not in host else [True]
+        for ipv4 in ip_versions:
+            for url in urls:
+                f = _THREAD_POOL.submit(_test_connection, url, ipv4)
+                futures.append(f)
+
+        succeeded = False
+        for future in as_completed(futures):
+            result: TestConnectionResult = future.result()
+
+            if result.success:
+                print(f"Connection successful to {result.host}")
+                succeeded = True
+                # host = test_url
+                test_connection_result = result
+                break
+            else:
+                print(f"Ignoring {result.host} due to connection failure")
+
+        if not succeeded:
+            print("Connection failed to all endpoints")
+            return WebCompileResult(
+                success=False,
+                stdout="Connection failed",
+                hash_value=None,
+                zip_bytes=b"",
+            )
+        assert test_connection_result is not None
+        ipv4_stmt = "IPv4" if test_connection_result.ipv4 else "IPv6"
+        transport = (
+            httpx.HTTPTransport(local_address="0.0.0.0")
+            if test_connection_result.ipv4
+            else None
+        )
+        with httpx.Client(
+            transport=transport,
+            timeout=_TIMEOUT,
+        ) as client:
+            headers = {
+                "accept": "application/json",
+                "authorization": auth_token,
+                "build": (
+                    build_mode.value.lower()
+                    if build_mode
+                    else BuildMode.QUICK.value.lower()
+                ),
+                "profile": "true" if profile else "false",
+            }
+
+            url = f"{test_connection_result.host}/{ENDPOINT_COMPILED_WASM}"
+            print(f"Compiling on {url} via {ipv4_stmt}. Zip size: {archive_size} bytes")
+            response = client.post(
+                url,
+                follow_redirects=True,
+                files=files,
+                headers=headers,
+                timeout=_TIMEOUT,
+            )
+
+            if response.status_code != 200:
+                json_response = response.json()
+                detail = json_response.get("detail", "Could not compile")
+                return WebCompileResult(
+                    success=False, stdout=detail, hash_value=None, zip_bytes=b""
+                )
+
+            print(f"Response status code: {response}")
+            # Create a temporary directory to extract the zip
+            with tempfile.TemporaryDirectory() as extract_dir:
+                extract_path = Path(extract_dir)
+
+                # Write the response content to a temporary zip file
+                temp_zip = extract_path / "response.zip"
+                temp_zip.write_bytes(response.content)
+
+                # Extract the zip
+                shutil.unpack_archive(temp_zip, extract_path, "zip")
+
+                # Read stdout from out.txt if it exists
+                stdout_file = extract_path / "out.txt"
+                hash_file = extract_path / "hash.txt"
+                stdout = stdout_file.read_text() if stdout_file.exists() else ""
+                hash_value = hash_file.read_text() if hash_file.exists() else None
+
+                return WebCompileResult(
+                    success=True,
+                    stdout=stdout,
+                    hash_value=hash_value,
+                    zip_bytes=response.content,
+                )
+    except KeyboardInterrupt:
+        print("Keyboard interrupt")
+        raise
+    except httpx.HTTPError as e:
+        print(f"Error: {e}")
+        return WebCompileResult(
+            success=False, stdout=str(e), hash_value=None, zip_bytes=b""
+        )

{fastled-1.1.3 → fastled-1.1.6}/src/fastled.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastled
-Version: 1.1.3
+Version: 1.1.6
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -91,6 +91,9 @@ provide shims for most of the common api points.
 
 # Revisions
 
+  * 1.1.6 - Use the fast src volume map allow quick updates to fastled when developing on the source code.
+  * 1.1.5 - Filter out hidden files and directories from being included in the sketch archive sent to the compiler.
+  * 1.1.4 - Fix regression introduced by testing out ipv4/ipv6 connections from a thread pool.
   * 1.1.3 - Live editing of *.h and *.cpp files is now possible. Sketch cache will be disabled in this mode.
   * 1.1.2 - `--server` will now volume map fastled src directory if it detects this. This was also implemented on the docker side.
   * 1.1.1 - `--interactive` is now supported to debug the container. Volume maps and better compatibilty with ipv4/v6 by concurrent connection finding.

{fastled-1.1.3 → fastled-1.1.6}/src/fastled.egg-info/SOURCES.txt

@@ -70,6 +70,7 @@ src/fastled/docker_manager.py
 src/fastled/filewatcher.py
 src/fastled/open_browser.py
 src/fastled/paths.py
+src/fastled/sketch.py
 src/fastled/web_compile.py
 src/fastled.egg-info/PKG-INFO
 src/fastled.egg-info/SOURCES.txt

fastled-1.1.3/src/fastled/web_compile.py

@@ -1,220 +0,0 @@
-import shutil
-import tempfile
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from dataclasses import dataclass
-from pathlib import Path
-
-import httpx
-
-from fastled.build_mode import BuildMode
-from fastled.compile_server import SERVER_PORT
-
-DEFAULT_HOST = "https://fastled.onrender.com"
-ENDPOINT_COMPILED_WASM = "compile/wasm"
-_TIMEOUT = 60 * 4  # 2 mins timeout
-_AUTH_TOKEN = "oBOT5jbsO4ztgrpNsQwlmFLIKB"
-
-
-@dataclass
-class TestConnectionResult:
-    host: str
-    success: bool
-    ipv4: bool
-
-
-@dataclass
-class WebCompileResult:
-    success: bool
-    stdout: str
-    hash_value: str | None
-    zip_bytes: bytes
-
-    def __bool__(self) -> bool:
-        return self.success
-
-
-def _sanitize_host(host: str) -> str:
-    if host.startswith("http"):
-        return host
-    is_local_host = "localhost" in host or "127.0.0.1" in host or "0.0.0.0" in host
-    use_https = not is_local_host
-    if use_https:
-        return host if host.startswith("https://") else f"https://{host}"
-    return host if host.startswith("http://") else f"http://{host}"
-
-
-_CONNECTION_ERROR_MAP: dict[str, TestConnectionResult] = {}
-
-
-def _test_connection(host: str, use_ipv4: bool) -> TestConnectionResult:
-    key = f"{host}-{use_ipv4}"
-    maybe_result: TestConnectionResult | None = _CONNECTION_ERROR_MAP.get(key)
-    if maybe_result is not None:
-        return maybe_result
-    transport = httpx.HTTPTransport(local_address="0.0.0.0") if use_ipv4 else None
-    try:
-        with httpx.Client(
-            timeout=_TIMEOUT,
-            transport=transport,
-        ) as test_client:
-            test_response = test_client.get(
-                f"{host}/healthz", timeout=_TIMEOUT, follow_redirects=True
-            )
-            result = TestConnectionResult(
-                host, test_response.status_code == 200, use_ipv4
-            )
-            _CONNECTION_ERROR_MAP[key] = result
-    except Exception:
-        result = TestConnectionResult(host, False, use_ipv4)
-        _CONNECTION_ERROR_MAP[key] = result
-    return result
-
-
-def web_compile(
-    directory: Path,
-    host: str | None = None,
-    auth_token: str | None = None,
-    build_mode: BuildMode | None = None,
-    profile: bool = False,
-) -> WebCompileResult:
-    host = _sanitize_host(host or DEFAULT_HOST)
-    print("Compiling on", host)
-    auth_token = auth_token or _AUTH_TOKEN
-    # zip up the files
-    print("Zipping files...")
-
-    # Create a temporary zip file
-    with tempfile.NamedTemporaryFile(suffix=".zip", delete=False) as tmp_zip:
-        # Create temporary directory for organizing files
-        with tempfile.TemporaryDirectory() as temp_dir:
-            # Create wasm subdirectory
-            wasm_dir = Path(temp_dir) / "wasm"
-
-            # Copy all files from source to wasm subdirectory, excluding fastled_js
-            def ignore_fastled_js(dir: str, files: list[str]) -> list[str]:
-                if "fastled_js" in dir:
-                    return files
-                if dir.startswith("."):
-                    return files
-                return []
-
-            shutil.copytree(directory, wasm_dir, ignore=ignore_fastled_js)
-            # Create zip archive from the temp directory
-            shutil.make_archive(tmp_zip.name[:-4], "zip", temp_dir)
-
-    print(f"Web compiling on {host}...")
-
-    try:
-        with open(tmp_zip.name, "rb") as zip_file:
-            files = {"file": ("wasm.zip", zip_file, "application/x-zip-compressed")}
-            urls = [host]
-            domain = host.split("://")[-1]
-            if ":" not in domain:
-                urls.append(f"{host}:{SERVER_PORT}")
-            test_connection_result: TestConnectionResult | None = None
-
-            with ThreadPoolExecutor(max_workers=len(urls)) as executor:
-                futures: list = []
-                ip_versions = [True, False] if "localhost" not in host else [True]
-                for ipv4 in ip_versions:
-                    for url in urls:
-                        f = executor.submit(_test_connection, url, ipv4)
-                        futures.append(f)
-
-                succeeded = False
-                for future in as_completed(futures):
-                    result: TestConnectionResult = future.result()
-
-                    if result.success:
-                        print(f"Connection successful to {result.host}")
-                        succeeded = True
-                        # host = test_url
-                        test_connection_result = result
-                        break
-                    else:
-                        print(f"Ignoring {result.host} due to connection failure")
-
-                if not succeeded:
-                    print("Connection failed to all endpoints")
-                    return WebCompileResult(
-                        success=False,
-                        stdout="Connection failed",
-                        hash_value=None,
-                        zip_bytes=b"",
-                    )
-            assert test_connection_result is not None
-            ipv4_stmt = "IPv4" if test_connection_result.ipv4 else "IPv6"
-            transport = (
-                httpx.HTTPTransport(local_address="0.0.0.0")
-                if test_connection_result.ipv4
-                else None
-            )
-            with httpx.Client(
-                transport=transport,
-                timeout=_TIMEOUT,
-            ) as client:
-                headers = {
-                    "accept": "application/json",
-                    "authorization": auth_token,
-                    "build": (
-                        build_mode.value.lower()
-                        if build_mode
-                        else BuildMode.QUICK.value.lower()
-                    ),
-                    "profile": "true" if profile else "false",
-                }
-
-                url = f"{test_connection_result.host}/{ENDPOINT_COMPILED_WASM}"
-                print(f"Compiling on {url} via {ipv4_stmt}")
-                response = client.post(
-                    url,
-                    follow_redirects=True,
-                    files=files,
-                    headers=headers,
-                    timeout=_TIMEOUT,
-                )
-
-                if response.status_code != 200:
-                    json_response = response.json()
-                    detail = json_response.get("detail", "Could not compile")
-                    return WebCompileResult(
-                        success=False, stdout=detail, hash_value=None, zip_bytes=b""
-                    )
-
-                print(f"Response status code: {response}")
-                # Create a temporary directory to extract the zip
-                with tempfile.TemporaryDirectory() as extract_dir:
-                    extract_path = Path(extract_dir)
-
-                    # Write the response content to a temporary zip file
-                    temp_zip = extract_path / "response.zip"
-                    temp_zip.write_bytes(response.content)
-
-                    # Extract the zip
-                    shutil.unpack_archive(temp_zip, extract_path, "zip")
-
-                    # Read stdout from out.txt if it exists
-                    stdout_file = extract_path / "out.txt"
-                    hash_file = extract_path / "hash.txt"
-                    stdout = stdout_file.read_text() if stdout_file.exists() else ""
-                    hash_value = hash_file.read_text() if hash_file.exists() else None
-
-                    return WebCompileResult(
-                        success=True,
-                        stdout=stdout,
-                        hash_value=hash_value,
-                        zip_bytes=response.content,
-                    )
-    except KeyboardInterrupt:
-        print("Keyboard interrupt")
-        raise
-    except httpx.HTTPError as e:
-        print(f"Error: {e}")
-        return WebCompileResult(
-            success=False, stdout=str(e), hash_value=None, zip_bytes=b""
-        )
-    finally:
-        try:
-            Path(tmp_zip.name).unlink()
-        except PermissionError:
-            print("Warning: Could not delete temporary zip file")