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

fastled/__init__.py

@@ -14,7 +14,7 @@ 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.2.99"
+__version__ = "1.3.1"
 
 
 class Api:

fastled/app.py

@@ -51,6 +51,7 @@ def run_server(args: Args) -> int:
 
 def main() -> int:
     from fastled import __version__
+    from fastled.select_sketch_directory import select_sketch_directory
 
     args = parse_args()
     interactive: bool = args.interactive
@@ -70,14 +71,11 @@ def main() -> int:
     # then prompt the user for a sketch directory.
     # 2. Tell the user they can use --server --interactive to
     # skip this prompt.
-
-    from fastled.select_sketch_directory import select_sketch_directory
-
     if interactive and cwd_looks_like_fastled_repo and directory is None:
         answer = input(
             "No sketch directory selected, would you like to select one? (y/n): "
         )
-        if answer.lower() == "y":
+        if answer.lower()[:1] == "y" or answer.lower() == "":
             sketch_list: list[Path] = find_sketch_directories()
             if sketch_list:
                 maybe_dir: str | None = select_sketch_directory(
@@ -109,12 +107,6 @@ def main() -> int:
         # print(f"Building Docker image at {project_root}")
         from fastled import Api
 
-        # server = Docker.spawn_server_from_fastled_repo(
-        #     project_root=project_root,
-        #     interactive=interactive,
-        #     sketch_folder=directory,
-        # )
-        # assert isinstance(server, CompileServer)
         server: CompileServer = CompileServer(
             interactive=interactive,
             auto_updates=False,

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/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/server_flask.py

@@ -125,9 +125,14 @@ 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()
@@ -314,9 +319,11 @@ def _run_flask_server(
             logger.info(f"Received request for path: {path}")
 
             try:
-                if path.startswith("drawfsource/"):
+                if path.startswith("fastledsource/") or path.startswith(
+                    "sketchsource/"
+                ):
                     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/web_compile.py

@@ -100,6 +100,9 @@ def zip_files(directory: Path, build_mode: BuildMode) -> ZipResult | Exception:
                 zip_buffer, "w", zipfile.ZIP_DEFLATED, compresslevel=9
             ) as zip_file:
                 for file_path in files:
+                    if "fastled_js" in str(file_path):
+                        # These can be huge, don't send the output files back to the server!
+                        continue
                     relative_path = file_path.relative_to(directory)
                     achive_path = str(Path("wasm") / relative_path)
                     if str(relative_path).startswith("data") and ENABLE_EMBEDDED_DATA:

{fastled-1.2.99.dist-info → fastled-1.3.1.dist-info}/METADATA

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

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

@@ -1,11 +1,11 @@
-fastled/__init__.py,sha256=vYwDrL6zVfgQu7tvm1TvpWJI5cqoR7U7dmPU3zEl1V0,7044
-fastled/app.py,sha256=LyQXHmIjK8aqel9sDRmzSHjnOiaITbsnGPoz6IDXQFc,6032
+fastled/__init__.py,sha256=VvY5QdvHcJ-Lv876jDXi030MtomWs60ECdy_GqXGzRQ,7043
+fastled/app.py,sha256=1N5Q486YccaWCRqnaI2F04ktL64NAVjAN6i4c-zgm1o,5818
 fastled/cli.py,sha256=5EBsb02ueFUjlgrlg0GMdj3e5nnHVhvofmYyQRaw8uM,565
 fastled/cli_test.py,sha256=qJB9yLRFR3OwOwdIWSQ0fQsWLnA37v5pDccufiP_hTs,512
 fastled/cli_test_interactive.py,sha256=BjNhveZOk5aCffHbcrxPQQjWmAuj4ClVKKcKX5eY6yM,542
 fastled/client_server.py,sha256=falqUhGSHQpNfEXNCcQFPDAZymfncEVhIDcURBIJTFk,18390
-fastled/compile_server.py,sha256=sRiXYzw7lv9vcWJWGPUkzOGZPmvZGV_TGwbHYoRc15s,3155
-fastled/compile_server_impl.py,sha256=FxTuQTojpA7j59v7zSGh1LEeG4Yu0MFgW9SKfHpspQg,13243
+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/filewatcher.py,sha256=3qS3L7zMQhFuVrkeGn1djsB_cB6x_E2YGJmmQWVAU_w,10033
 fastled/keyboard.py,sha256=UTAsqCn1UMYnB8YDzENiLTj4GeL45tYfEcO7_5fLFEg,3556
@@ -17,7 +17,7 @@ fastled/paths.py,sha256=VsPmgu0lNSCFOoEC0BsTYzDygXqy15AHUfN-tTuzDZA,99
 fastled/print_filter.py,sha256=B0v493WAFN8DgG7aqM8iXMqI_V1EdMMvOnNQ26JNUxU,5499
 fastled/project_init.py,sha256=bBt4DwmW5hZkm9ICt9Qk-0Nr_0JQM7icCgH5Iv-bCQs,3984
 fastled/select_sketch_directory.py,sha256=-eudwCns3AKj4HuHtSkZAFwbnf005SNL07pOzs9VxnE,1383
-fastled/server_flask.py,sha256=xwoBJ0-biUGK26thUfZLtU0DK9evWz-YmhCs5z_eVz0,17456
+fastled/server_flask.py,sha256=QOH-Lo5UDFAACpA8wzbBSIFpLjM5F7tshpX5CUbvV4k,17689
 fastled/server_start.py,sha256=W9yKStkRlRNuXeV6j_6O7HjjFPyVLBHMcF9Uy2QjDWQ,479
 fastled/settings.py,sha256=dUVyJ8Mtprg0RwaS6oMWP8jBhr4C3R8fu4Hdx_Z1lCM,577
 fastled/sketch.py,sha256=Ftbh55Nt-p4hmPuPpj8Q9HrMzvnUazhoG_q9FHcxkns,3473
@@ -25,7 +25,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/web_compile.py,sha256=QTYHtcm55zsFxPhdA-qSPfL5Q4lhL3h3oNmir3m-Y3s,11345
+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
 fastled/assets/localhost.pem,sha256=QTwUtTwjYWbm9m3pHW2IlK2nFZJ8b0pppxPjhgVZqQo,1619
@@ -33,9 +33,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.2.99.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-fastled-1.2.99.dist-info/METADATA,sha256=2gaE-w-tsceFLsldUpX9ZGGfiltCAIHitZRbESYw7rI,30050
-fastled-1.2.99.dist-info/WHEEL,sha256=A8Eltl-h0W-qZDVezsLjjslosEH_pdYC2lQ0JcbgCzs,91
-fastled-1.2.99.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
-fastled-1.2.99.dist-info/top_level.txt,sha256=Bbv5kpJpZhWNCvDF4K0VcvtBSDMa8B7PTOrZa9CezHY,8
-fastled-1.2.99.dist-info/RECORD,,
+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.2.99.dist-info → fastled-1.3.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.0)
+Generator: setuptools (80.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any