fastled 1.3.0__tar.gz → 1.3.3__tar.gz

{fastled-1.3.0 → fastled-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastled
-Version: 1.3.0
+Version: 1.3.3
 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.22
+Requires-Dist: fastled-wasm-server>=1.0.25
 Dynamic: home-page
 Dynamic: license-file
 Dynamic: maintainer

{fastled-1.3.0 → fastled-1.3.3}/compiler/pyproject.toml

@@ -15,7 +15,7 @@ dependencies = [
     "disklru==2.0.0",
     "psutil==6.1.1",
     "wormhole-tx",
-    "fastled-wasm-server>=1.0.22",  # Also versions fastled-wasm-compiler dependency.
+    "fastled-wasm-server>=1.0.25",  # Also versions fastled-wasm-compiler dependency.
 ]
 
 [tool.setuptools]

{fastled-1.3.0 → fastled-1.3.3}/pyproject.toml

@@ -24,7 +24,7 @@ dependencies = [
     "Flask>=3.0.0",
     "livereload",
     ###### WASM SERVER ######
-    "fastled-wasm-server>=1.0.22",  # Enforced by unit test to match project <--> docker.
+    "fastled-wasm-server>=1.0.25",  # Enforced by unit test to match project <--> docker.
 ]
 
 dynamic = ["version"]

{fastled-1.3.0 → fastled-1.3.3}/src/fastled/__init__.py

@@ -5,17 +5,13 @@ from multiprocessing import Process
 from pathlib import Path
 from typing import Generator
 
+from .__version__ import __version__
 from .compile_server import CompileServer
 from .live_client import LiveClient
 from .settings import DOCKER_FILE, IMAGE_NAME
 from .site.build import build
 from .types import BuildMode, CompileResult, CompileServerError, FileResponse
 
-# 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.0"
-
 
 class Api:
     @staticmethod
@@ -224,4 +220,5 @@ __all__ = [
     "BuildMode",
     "FileResponse",
     "DOCKER_FILE",
+    "__version__",
 ]

fastled-1.3.3/src/fastled/__version__.py

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

{fastled-1.3.0 → fastled-1.3.3}/src/fastled/compile_server.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from fastled.types import BuildMode, CompileResult, FileResponse, Platform
+from fastled.types import BuildMode, CompileResult, Platform
 
 
 class CompileServer:
@@ -53,10 +53,6 @@ class CompileServer:
 
         project_init(example=example, outputdir=outputdir)
 
-    def fetch_source_file(self, filepath: str) -> FileResponse | Exception:
-        """Get the source file from the server."""
-        return self.impl.fetch_source_file(filepath)
-
     @property
     def name(self) -> str:
         return self.impl.container_name

{fastled-1.3.0 → fastled-1.3.3}/src/fastled/compile_server_impl.py

@@ -17,7 +17,7 @@ from fastled.docker_manager import (
 )
 from fastled.settings import DEFAULT_CONTAINER_NAME, IMAGE_NAME, SERVER_PORT
 from fastled.sketch import looks_like_fastled_repo
-from fastled.types import BuildMode, CompileResult, CompileServerError, FileResponse
+from fastled.types import BuildMode, CompileResult, CompileServerError
 from fastled.util import port_is_free
 
 SERVER_OPTIONS = [
@@ -183,29 +183,6 @@ class CompileServerImpl:
                 return False
         return False
 
-    def fetch_source_file(self, filepath: str) -> FileResponse | Exception:
-        """Get the source file from the server."""
-        if not self._port:
-            raise RuntimeError("Server has not been started yet")
-        try:
-            httpx_client = httpx.Client()
-            url = f"http://localhost:{self._port}/sourcefiles/{filepath}"
-            response = httpx_client.get(url, follow_redirects=True)
-            if response.status_code == 200:
-                content = response.text
-                mimetype: str = response.headers.get("Content-Type", "text/plain")
-                return FileResponse(
-                    content=content,
-                    mimetype=mimetype,
-                    filename=filepath,
-                )
-            else:
-                return CompileServerError(
-                    f"Error fetching file {filepath}: {response.status_code}"
-                )
-        except httpx.RequestError as e:
-            return CompileServerError(f"Error fetching file {filepath}: {e}")
-
     def _start(self) -> int:
         print("Compiling server starting")
 

{fastled-1.3.0 → fastled-1.3.3}/src/fastled/docker_manager.py

@@ -366,7 +366,7 @@ class DockerManager:
         Returns:
             A tuple of (has_newer_version, message)
             has_newer_version: True if a newer version is available, False otherwise
-            message: A message describing the result
+            message: A message describing the result, including the date of the newer version if available
         """
         try:
             # Get the local image
@@ -388,6 +388,24 @@ class DockerManager:
             if remote_image_hash_from_local_image == remote_image_hash:
                 return False, f"Local image {image_name}:{tag} is up to date."
             else:
+                # Get the creation date of the remote image if possible
+                try:
+                    # Try to get detailed image info including creation date
+                    remote_image_details = self.client.api.inspect_image(
+                        f"{image_name}:{tag}"
+                    )
+                    if "Created" in remote_image_details:
+                        created_date = remote_image_details["Created"].split("T")[
+                            0
+                        ]  # Extract just the date part
+                        return (
+                            True,
+                            f"Newer version of {image_name}:{tag} is available (published on {created_date}).",
+                        )
+                except Exception:
+                    pass
+
+                # Fallback if we couldn't get the date
                 return True, f"Newer version of {image_name}:{tag} is available."
 
         except ImageNotFound:

{fastled-1.3.0 → fastled-1.3.3}/src/fastled/print_filter.py

@@ -94,8 +94,65 @@ class BuildArtifact:
     compile_or_link: CompileOrLink
     hash: int
 
+    def flags_pretty(self) -> str:
+        """
+        Returns the flags in a pretty format.
+        This is used for printing the flags to the console.
+        """
+        flags = self.build_flags
+        flags = flags.replace(" -I", "\n-I")
+        flags = flags.replace(" -D", "\n-D")
+        flags = flags.replace(" -l", "\n-l")
+        flags = flags.replace(" -L", "\n-L")
+        flags = flags.replace(" -o", "\n-o")
+        flags = flags.replace(" -W", "\n-W")
+        flags = flags.replace(" -f", "\n-f")
+        flags = flags.replace(" -g", "\n-g")
+
+        # break into lines and sort
+        lines = flags.splitlines()
+        first_line = lines[0]
+        lines.pop(0)  # remove first line
+        lines = sorted(lines)
+        # remove duplicates
+        lines = list(dict.fromkeys(lines))
+        # remove empty lines
+        lines = [line for line in lines if line.strip() != ""]
+        # remove leading and trailing whitespace
+        lines = [line.strip() for line in lines]
+        lines = sorted(lines)
+        lines = [first_line] + lines  # add first line back to the beginning
+        # stringify
+        flags = "\n".join(lines)
+        return flags
+
     def __str__(self) -> str:
-        return f"{self.timestamp} {self.output_artifact} {self.build_flags} {self.compile_or_link} {self.hash}"
+        return f"{self.brief()} {self.build_flags} {self.compile_or_link} {self.hash}"
+
+    def brief(self) -> str:
+        return f"{self.timestamp:.2f} {self.output_artifact}"
+
+    def begin_flags(self) -> str:
+        """
+        Returns the flags that are used to begin a build.
+        This is the flags that are used for the first compile or link.
+        """
+
+        out: str = (
+            "\n################ NEW COMPILE/LINK FLAG GROUP #####################\n\n"
+        )
+        out += f"{self.flags_pretty()}\n"
+        return out
+
+    def end_flags(self) -> str:
+        """
+        Returns the flags that are used to end a build.
+        This is the flags that are used for the last compile or link.
+        """
+        out: str = (
+            "\n################ END COMPILE/LINK FLAG GROUP #####################\n"
+        )
+        return out
 
     @staticmethod
     def parse(input_str: str) -> "BuildArtifact | None":

{fastled-1.3.0 → fastled-1.3.3}/src/fastled/server_flask.py

@@ -26,6 +26,16 @@ else:
     logger.disabled = True
 
 
+def _is_dwarf_source(path: str) -> bool:
+    """Check if the path is a dwarf source file."""
+    # Check if the path starts with "fastledsource/" or "sketchsource/"
+    return (
+        path.startswith("fastledsource/")
+        or path.startswith("sketchsource/")
+        or path.startswith("dwarfsource")
+    )
+
+
 def _run_flask_server(
     fastled_js: Path,
     port: int,
@@ -125,22 +135,20 @@ def _run_flask_server(
                 logger.error(f"Error forwarding request: {e}", exc_info=True)
                 return Response(f"Error: {str(e)}", status=500)
 
-        def handle_dwarfsource(path: str) -> Response:
-            """Handle requests to /drawfsource/js/fastled/src/
-            or /drawfsource/js/drawfsource/emsdk/*"""
+        def handle_fastledsource(path: str) -> Response:
+            """Handle requests to
+            /fastledsource/js/fastledsource/git/fastled/src/
+            or
+            /sketchsource/js/src/Blink.ino
+
+            The names are a bit mangled due to the way C++ prefixing works near the root directory.
+            """
             from flask import request
 
             start_time = time.time()
             logger.info(f"Processing request: {request.method} {request.url}")
-
-            if "../" in path:
-                # Prevent directory traversal attacks
-                error_msg = "Directory traversal attack detected"
-                logger.error(error_msg)
-                return Response(error_msg, status=400)
-
             # Forward the request to the compile server
-            target_url = f"http://localhost:{compile_server_port}/{path}"
+            target_url = f"http://localhost:{compile_server_port}/dwarfsource/{path}"
             logger.info(f"Requesting: {target_url}")
             logger.info(f"Processing dwarfsource request for {path}")
 
@@ -309,14 +317,27 @@ def _run_flask_server(
                     return Response(f"File not found: {path}", status=404)
                 return Response(f"Error serving file: {str(e)}", status=500)
 
+        @app.route("/fastapi")
+        def server_backend_redirect():
+            """Redirect to the compile server"""
+            logger.info("Redirecting to compile server")
+            target_url = f"http://localhost:{compile_server_port}/docs"
+            logger.info(f"Redirecting to: {target_url}")
+            return Response(
+                f"Redirecting to compile server: <a href='{target_url}'>{target_url}</a>",
+                status=302,
+                headers={"Location": target_url},
+            )
+
         @app.route("/<path:path>")
         def serve_files(path: str):
             logger.info(f"Received request for path: {path}")
 
             try:
-                if path.startswith("drawfsource/"):
+                is_debug_src_code_request = _is_dwarf_source(path)
+                if is_debug_src_code_request:
                     logger.info(f"Handling as drawfsource: {path}")
-                    return handle_dwarfsource(path)
+                    return handle_fastledsource(path)
                 elif path.startswith("sourcefiles/"):
                     logger.info(f"Handling as sourcefiles: {path}")
                     return handle_sourcefile(path)

fastled-1.3.3/src/fastled/version.py

@@ -0,0 +1,41 @@
+from concurrent.futures import Future, ThreadPoolExecutor
+
+import httpx
+
+from fastled.__version__ import __version_url_latest__
+
+
+def _fetch_version() -> str | Exception:
+    """
+    Helper function to fetch the latest version from the GitHub repository.
+    """
+    try:
+        response = httpx.get(__version_url_latest__)
+        response.raise_for_status()
+        # Extract the version string from the response text
+        version_line = response.text.split("__version__ = ")[1].split('"')[1]
+        return version_line
+    except Exception as e:
+        return e
+
+
+def get_latest_version() -> Future[str | Exception]:
+    """
+    Fetch the latest version from the GitHub repository.
+    Returns a future that will resolve with the version string or an exception.
+    """
+    executor = ThreadPoolExecutor()
+    return executor.submit(_fetch_version)
+
+
+def unit_test() -> None:
+    future = get_latest_version()
+    latest_version = future.result()  # Wait for the future to complete
+    if isinstance(latest_version, Exception):
+        print(f"Error fetching latest version: {latest_version}")
+    else:
+        print(f"Latest version: {latest_version}")
+
+
+if __name__ == "__main__":
+    unit_test()

{fastled-1.3.0 → fastled-1.3.3}/src/fastled.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastled
-Version: 1.3.0
+Version: 1.3.3
 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.22
+Requires-Dist: fastled-wasm-server>=1.0.25
 Dynamic: home-page
 Dynamic: license-file
 Dynamic: maintainer

{fastled-1.3.0 → fastled-1.3.3}/src/fastled.egg-info/SOURCES.txt

@@ -51,6 +51,7 @@ demo/micdemo.html
 demo/mp3upload.html
 demo/webgl_postprocessing_unreal_bloom.html
 src/fastled/__init__.py
+src/fastled/__version__.py
 src/fastled/app.py
 src/fastled/cli.py
 src/fastled/cli_test.py
@@ -77,6 +78,7 @@ src/fastled/spinner.py
 src/fastled/string_diff.py
 src/fastled/types.py
 src/fastled/util.py
+src/fastled/version.py
 src/fastled/web_compile.py
 src/fastled.egg-info/PKG-INFO
 src/fastled.egg-info/SOURCES.txt
@@ -100,7 +102,7 @@ tests/unit/test_compile_server.py
 tests/unit/test_docker_linux_on_windows.py
 tests/unit/test_embedded_data.py
 tests/unit/test_experimental_cpp_filter.py
-tests/unit/test_fetch_source_files.py
+tests/unit/test_fetch_debug_source_files.py
 tests/unit/test_filechanger.py
 tests/unit/test_http_server.py
 tests/unit/test_print_filter.py

{fastled-1.3.0 → fastled-1.3.3}/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.22
+fastled-wasm-server>=1.0.25

{fastled-1.3.0 → fastled-1.3.3}/tests/unit/test_experimental_cpp_filter.py

@@ -124,43 +124,89 @@ src/third_party/cq_kernel/kiss_fft.c
 """
 
 
-class ExperimentalPrintFitlerCppTester(unittest.TestCase):
-    """Main tester class."""
+class Filter:
+    def __init__(self):
+        self._prev_broken_line: str | None = None
+        self._last_build_artifact: BuildArtifact | None = None
+
+    def filter(self, line: str) -> str | None:
+        if not line:
+            return None
+        maybe_prev_broken_line: str | None = self._prev_broken_line
+        self._prev_broken_line = None
+        # if the line starts with a digit, it's a build artifact
+        ba: BuildArtifact | None = BuildArtifact.parse(line)
+
+        if ba is not None:  # Successfully parsed a build artifact.
+            # if we have a build artifact, we need to check if it's the same as the last one
+            if (
+                self._last_build_artifact is not None
+                and ba.hash == self._last_build_artifact.hash
+            ):
+                # No change in build settings.
+                out = ba.brief()
+                self._last_build_artifact = ba
+                return out
+            if self._last_build_artifact is None:
+                self._last_build_artifact = ba
+                return ba.begin_flags() + "\n" + ba.brief()
+            # we have a new build artifact, so we need to print out the build settings
+            # and the line
+            out = self._last_build_artifact.end_flags() + "\n\n\n"
+            out += ba.begin_flags()
+            out += "\n" + ba.brief()
+            self._last_build_artifact = ba
+            return out
+
+        # We couldn't parse this line so store it in stead.
+        if maybe_prev_broken_line is None:
+            self._prev_broken_line = line
+            return None
+        # we have a previous line, so we can try to merge them because this typically happens
+        # for line breaks.
+        new_line = maybe_prev_broken_line + line
+        ba = BuildArtifact.parse(new_line)
+        if ba is None:
+            return None
+        # we have a build artifact, so we can use it.
+
+        if self._last_build_artifact and (ba.hash == self._last_build_artifact.hash):
+            # No change in build settings.
+            out = ba.brief()
+            return out
+        out = ""
+        # different build settings so we need to print out the new build settings and then the line
+        if self._last_build_artifact is not None:
+            out += "\n" + self._last_build_artifact.end_flags() + "\n\n"
+        out += ba.begin_flags()
+        out += ba.brief() + "\n"
+        self._last_build_artifact = ba
+        return out
 
-    # def test_print_filter_no_build(self) -> None:
-    #     """Tests that a project can be filtered"""
-    #     # Test the PrintFilter class
-    #     cbc = ChunkedBuildConfigGrouper()
+    def end(self) -> str:
+        """Returns the end of the build artifact."""
+        if self._last_build_artifact is None:
+            return ""
+        # we have a build artifact, so we can use it.
+        out = self._last_build_artifact.end_flags()
+        self._last_build_artifact = None
+        return out
 
-    #     print(f"\n###Filtering:\n\n{_BUILD_CONFIG_SAMPLE}")
-    #     out = cbc.filter(_BUILD_CONFIG_SAMPLE)
-    #     #print(out)
-    #     print(f"###Filtered: result was {out}")
-    #     print("Done")
+
+class ExperimentalPrintFitlerCppTester(unittest.TestCase):
+    """Main tester class."""
 
     def test_build_artifact_parsing(self) -> None:
         """Tests that a project can be filtered"""
         # Test the PrintFilter class
         lines = _BUILD_CONFIG_SAMPLE.splitlines()
         lines = [line.strip() for line in lines if line.strip()]
-        last_hash: int | None = None
+        filter: Filter = Filter()
         for line in lines:
-            ba = BuildArtifact.parse(line)
-            if ba is None:
-                print("!!")
-                continue
-
-            if last_hash is None or ba.hash != last_hash:
-                # print out the build flags
-                print("Found new build flags:")
-                print(ba.build_flags)
-                # now set the hash to the new value
-                last_hash = ba.hash
-
-            # print the time and build output
-            print(f"{ba.timestamp} {ba.output_artifact}")
-
-        print("Done")
+            str_or_none = filter.filter(line)
+            if str_or_none is not None:
+                print(str_or_none)
+        print(filter.end())
 
 
 if __name__ == "__main__":

fastled-1.3.0/tests/unit/test_fetch_source_files.py → fastled-1.3.3/tests/unit/test_fetch_debug_source_files.py

@@ -15,13 +15,12 @@ HERE = Path(__file__).parent
 TEST_INO_WASM = HERE / "test_ino" / "wasm"
 
 # New refactor has broken this test. Good news, we got the sketch to output debug symbols!!!!!!
-_ENABLED = False
+_ENABLED = True
 
 _DWARF_SRC_EXAMPLE1 = "http://localhost:{http_port}/fastledsource/js/src/fastledsource/git/fastled/src/FastLED.h"
 _DWARF_SRC_EXAMPLE2 = (
     "http://localhost:{http_port}/sketchsource/js/sketchsource/headers/FastLED.h"
 )
-# _DWARF_SRC_EXAMPLES = "http://localhost:{http_port}/drawfsource/js/src/direct.h"
 
 _DWARF_SRC_EXAMPLES = [
     _DWARF_SRC_EXAMPLE1,
@@ -54,21 +53,6 @@ def wait_for_server(url: str, timeout: int = 10) -> bool:
 class FetchSourceFileTester(unittest.TestCase):
     """Main tester class."""
 
-    @unittest.skipUnless(
-        _enabled(),
-        "Skipping test because either this is on non-Linux system on github or embedded data is disabled",
-    )
-    def test_backend_server_for_src_file_fetch(self) -> None:
-        """Tests that embedded data is round tripped correctly."""
-        # Todo: make this only run on a local build. Otherwise there are sync issues
-        # with the docker version of this app and will generate false positives until
-        # the docker version is updated - Frustrating.
-        with Api.server() as server:
-            resp = server.fetch_source_file("FastLED.h")
-            if isinstance(resp, Exception):
-                raise resp
-            print("Done")
-
     @unittest.skipUnless(
         _enabled(),
         "Skipping test because either this is on non-Linux system on github or embedded data is disabled",
@@ -83,11 +67,18 @@ class FetchSourceFileTester(unittest.TestCase):
             http_port=http_port,
         )
         with client:
-            # TODO Make faster.
             wait_for_server(f"http://localhost:{http_port}", timeout=100)
+            backend_host = client.url()
+
+            # This url should proxy back to the server at /dwarfsource/fastledsource/git/fastled/src/FastLED.h
+            url = (
+                f"http://localhost:{http_port}/fastledsource/git/fastled/src/FastLED.h"
+            )
 
             resp = httpx.get(
-                f"http://localhost:{http_port}/sourcefiles/FastLED.h",
+                # This type of request will come from the server during debug mode to
+                # enable debugging.
+                url,
                 timeout=100,
             )
             if resp.status_code != 200:
@@ -96,6 +87,20 @@ class FetchSourceFileTester(unittest.TestCase):
             if content_length == 0:
                 raise Exception("Content-Length is 0")
 
+            backend_url = (
+                backend_host
+                + "/dwarfsource"
+                + "/fastledsource/git/fastled/src/FastLED.h"
+            )
+            resp = httpx.get(
+                backend_url,
+                timeout=100,
+            )
+            if resp.status_code != 200:
+                raise Exception(
+                    f"Failed to fetch source file from the backend server: {resp.status_code}"
+                )
+
             for ds in _DWARF_SRC_EXAMPLES:
                 # now get something similar at static/js/fastled/src/platforms/wasm/js.cpp
                 url = ds.format(http_port=http_port)
@@ -104,6 +109,17 @@ class FetchSourceFileTester(unittest.TestCase):
                     timeout=100,
                 )
                 self.assertTrue(resp.status_code == 200, resp.status_code)
+                content_length = int(resp.headers["Content-Length"])
+                self.assertTrue(content_length > 0, "Content-Length is 0")
+                backend_url = backend_host + "/dwarfsource/" + url.split("/")[-1]
+                resp = httpx.get(
+                    backend_url,
+                    timeout=100,
+                )
+                if resp.status_code != 200:
+                    raise Exception(
+                        f"Failed to fetch source file from the backend server: {resp.status_code}"
+                    )
 
             print("Done")