fastled 1.3.1__py3-none-any.whl → 1.3.3__py3-none-any.whl

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.1"
-
 
 class Api:
     @staticmethod
@@ -224,4 +220,5 @@ __all__ = [
     "BuildMode",
     "FileResponse",
     "DOCKER_FILE",
+    "__version__",
 ]

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/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/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/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,
@@ -137,15 +147,8 @@ def _run_flask_server(
 
             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}")
 
@@ -314,14 +317,25 @@ 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("fastledsource/") or path.startswith(
-                    "sketchsource/"
-                ):
+                is_debug_src_code_request = _is_dwarf_source(path)
+                if is_debug_src_code_request:
                     logger.info(f"Handling as drawfsource: {path}")
                     return handle_fastledsource(path)
                 elif path.startswith("sourcefiles/"):

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.1.dist-info → fastled-1.3.3.dist-info}/METADATA

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

{fastled-1.3.1.dist-info → fastled-1.3.3.dist-info}/RECORD

@@ -1,4 +1,5 @@
-fastled/__init__.py,sha256=VvY5QdvHcJ-Lv876jDXi030MtomWs60ECdy_GqXGzRQ,7043
+fastled/__init__.py,sha256=YLikXGRWKlKAqj7bpvGmJLejGTFF-FC1lv2z1jwRinA,6852
+fastled/__version__.py,sha256=fo92Jlm3mAbIQsRDibjNwlWY6pHOmbsGtSCn2n2BU0k,372
 fastled/app.py,sha256=1N5Q486YccaWCRqnaI2F04ktL64NAVjAN6i4c-zgm1o,5818
 fastled/cli.py,sha256=5EBsb02ueFUjlgrlg0GMdj3e5nnHVhvofmYyQRaw8uM,565
 fastled/cli_test.py,sha256=qJB9yLRFR3OwOwdIWSQ0fQsWLnA37v5pDccufiP_hTs,512
@@ -6,7 +7,7 @@ fastled/cli_test_interactive.py,sha256=BjNhveZOk5aCffHbcrxPQQjWmAuj4ClVKKcKX5eY6
 fastled/client_server.py,sha256=falqUhGSHQpNfEXNCcQFPDAZymfncEVhIDcURBIJTFk,18390
 fastled/compile_server.py,sha256=rkXvrvdav5vDG8lv_OlBX3YSCHtnHMt25nXbfeg_r78,2960
 fastled/compile_server_impl.py,sha256=MIe-GvKenoDaqX8VhCJ7KNIWTOHHcLPgUQ7kO6lsa38,12199
-fastled/docker_manager.py,sha256=6zg1JcrBFj0fbFc1adPoT6_8GE0YFAPHG80Cf7ytYGE,37139
+fastled/docker_manager.py,sha256=xtBGZUiz4UfFVik2eJYl6qD2BUGj4Jj6o-T0LY1iDYI,38052
 fastled/filewatcher.py,sha256=3qS3L7zMQhFuVrkeGn1djsB_cB6x_E2YGJmmQWVAU_w,10033
 fastled/keyboard.py,sha256=UTAsqCn1UMYnB8YDzENiLTj4GeL45tYfEcO7_5fLFEg,3556
 fastled/keyz.py,sha256=LO-8m_7CpNDiZLM-FXhQ30f9gN1bUYz5lOsUPTIbI-c,4020
@@ -14,10 +15,10 @@ fastled/live_client.py,sha256=yoAul8tVgbbPf1oEC79SUZSHkLECxlrXxgWR9XaBIp4,2957
 fastled/open_browser.py,sha256=DFyMrc1qic4Go7eLNPqMaLuMvTaE73NixdfSKV0yyp8,3709
 fastled/parse_args.py,sha256=tP8-AiVxEsZ5xvsL8YFfkd5L1whM3wzLS37IX2HCNrk,9454
 fastled/paths.py,sha256=VsPmgu0lNSCFOoEC0BsTYzDygXqy15AHUfN-tTuzDZA,99
-fastled/print_filter.py,sha256=B0v493WAFN8DgG7aqM8iXMqI_V1EdMMvOnNQ26JNUxU,5499
+fastled/print_filter.py,sha256=oomBjrouWNPCgJY2guCpljTijFvNKRBVbipDrxIsszA,7426
 fastled/project_init.py,sha256=bBt4DwmW5hZkm9ICt9Qk-0Nr_0JQM7icCgH5Iv-bCQs,3984
 fastled/select_sketch_directory.py,sha256=-eudwCns3AKj4HuHtSkZAFwbnf005SNL07pOzs9VxnE,1383
-fastled/server_flask.py,sha256=QOH-Lo5UDFAACpA8wzbBSIFpLjM5F7tshpX5CUbvV4k,17689
+fastled/server_flask.py,sha256=HR7WNQWcxsOoKVvEc0Gs8YQQhEcwHZNwZ0gALuryioI,18271
 fastled/server_start.py,sha256=W9yKStkRlRNuXeV6j_6O7HjjFPyVLBHMcF9Uy2QjDWQ,479
 fastled/settings.py,sha256=dUVyJ8Mtprg0RwaS6oMWP8jBhr4C3R8fu4Hdx_Z1lCM,577
 fastled/sketch.py,sha256=Ftbh55Nt-p4hmPuPpj8Q9HrMzvnUazhoG_q9FHcxkns,3473
@@ -25,6 +26,7 @@ fastled/spinner.py,sha256=VHxmvB92P0Z_zYxRajb5HiNmkHHvZ5dG7hKtZltzpcs,867
 fastled/string_diff.py,sha256=NbtYxvBFxTUdmTpMLizlgZj2ULJ-7etj72GBdWDTGws,2496
 fastled/types.py,sha256=k1j1y5h1zpRonp1mqRXy797mSbLqzf5K1QEgl8f27jQ,4822
 fastled/util.py,sha256=hw3gxS1qGc5LL_QN88_VIjut6T0-61ImDQpxGp11DXY,1189
+fastled/version.py,sha256=TpBMiEVdO3_sUZEu6wmwN8Q4AgX2BiCxStCsnPKh6E0,1209
 fastled/web_compile.py,sha256=R159Od1VqeXTW6y3rQY0_P9f0CJYbPuBiMLqb-zBCUQ,11526
 fastled/assets/example.txt,sha256=lTBovRjiz0_TgtAtbA1C5hNi2ffbqnNPqkKg6UiKCT8,54
 fastled/assets/localhost-key.pem,sha256=Q-CNO_UoOd8fFNN4ljcnqwUeCMhzTplRjLO2x0pYRlU,1704
@@ -33,9 +35,9 @@ fastled/site/build.py,sha256=2YKU_UWKlJdGnjdbAbaL0co6kceFMSTVYwH1KCmgPZA,13987
 fastled/site/examples.py,sha256=s6vj2zJc6BfKlnbwXr1QWY1mzuDBMt6j5MEBOWjO_U8,155
 fastled/test/can_run_local_docker_tests.py,sha256=LEuUbHctRhNNFWcvnz2kEGmjDJeXO4c3kNpizm3yVJs,400
 fastled/test/examples.py,sha256=GfaHeY1E8izBl6ZqDVjz--RHLyVR4NRnQ5pBesCFJFY,1673
-fastled-1.3.1.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-fastled-1.3.1.dist-info/METADATA,sha256=p2QjWihOI6WOjdqcCoItvChi9O-hcvR0IYbN80pHJPg,30049
-fastled-1.3.1.dist-info/WHEEL,sha256=QZxptf4Y1BKFRCEDxD4h2V0mBFQOVFLFEpvxHmIs52A,91
-fastled-1.3.1.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
-fastled-1.3.1.dist-info/top_level.txt,sha256=Bbv5kpJpZhWNCvDF4K0VcvtBSDMa8B7PTOrZa9CezHY,8
-fastled-1.3.1.dist-info/RECORD,,
+fastled-1.3.3.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+fastled-1.3.3.dist-info/METADATA,sha256=IkuFr7qUUMc4tgoPJIi-CcqN_Gj9h4J_IMzliYkBqoM,30049
+fastled-1.3.3.dist-info/WHEEL,sha256=QZxptf4Y1BKFRCEDxD4h2V0mBFQOVFLFEpvxHmIs52A,91
+fastled-1.3.3.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
+fastled-1.3.3.dist-info/top_level.txt,sha256=Bbv5kpJpZhWNCvDF4K0VcvtBSDMa8B7PTOrZa9CezHY,8
+fastled-1.3.3.dist-info/RECORD,,