fastled 1.2.96__tar.gz → 1.3.0__tar.gz

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

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

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

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

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

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

{fastled-1.2.96 → fastled-1.3.0}/src/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.96"
+__version__ = "1.3.0"
 
 
 class Api:

{fastled-1.2.96 → fastled-1.3.0}/src/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-1.2.96 → fastled-1.3.0}/src/fastled/cli.py

@@ -3,14 +3,23 @@ Main entry point.
 """
 
 import multiprocessing
+import os
 import sys
 
-from fastled.app import main as app_main
+
+def run_app() -> int:
+    """Run the application."""
+    from fastled.app import main as app_main
+
+    return app_main()
 
 
 def main() -> int:
     """Main entry point for the template_python_cmd package."""
-    return app_main()
+    if "--debug" in sys.argv:
+        # Debug mode
+        os.environ["FLASK_SERVER_LOGGING"] = "1"
+    return run_app()
 
 
 # Cli entry point for the pyinstaller generated exe

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

@@ -1,5 +1,6 @@
 import argparse
 import logging
+import os
 import time
 from multiprocessing import Process
 from pathlib import Path
@@ -8,7 +9,8 @@ import httpx
 from livereload import Server
 
 # Logging configuration
-_ENABLE_LOGGING = True  # Set to False to disable logging
+_ENABLE_LOGGING = os.environ.get("FLASK_SERVER_LOGGING", "0") == "1"
+
 
 if _ENABLE_LOGGING:
     logging.basicConfig(
@@ -23,22 +25,6 @@ else:
     logger = logging.getLogger("flask_server")
     logger.disabled = True
 
-_DRAWF_SOURCE_FASTLED = "drawfsource/src/drawfsource/git/fastled/src"
-_DRAWF_SOURCE_EMSDK = "drawfsource/js/drawfsource/emsdk/"
-
-# Mirrors what's on the server.
-_PATTERNS_FASTLED_SRC = [
-    "drawfsource/js/src/drawfsource/git/fastled/src/",
-    "drawfsource/js/drawfsource/headers/",
-]
-
-
-def _resolve_fastled_src(drawfsource: str) -> str | None:
-    for pattern in _PATTERNS_FASTLED_SRC:
-        if drawfsource.startswith(pattern):
-            return drawfsource[len(pattern) :]
-    return None
-
 
 def _run_flask_server(
     fastled_js: Path,
@@ -153,14 +139,8 @@ def _run_flask_server(
                 logger.error(error_msg)
                 return Response(error_msg, status=400)
 
-            resolved: str | None = _resolve_fastled_src(path)
-            if resolved is None:
-                # If the path does not match the expected patterns, return a 404
-                logger.error(f"Path does not match expected patterns: {path}")
-                return Response("Not Found", status=404)
-
             # Forward the request to the compile server
-            target_url = f"http://localhost:{compile_server_port}/drawfsource/{path}"
+            target_url = f"http://localhost:{compile_server_port}/{path}"
             logger.info(f"Requesting: {target_url}")
             logger.info(f"Processing dwarfsource request for {path}")
 
@@ -219,7 +199,7 @@ def _run_flask_server(
             logger.info(f"Processing sourcefile request for {path}")
 
             # Forward the request to the compile server
-            target_url = f"http://localhost:{compile_server_port}/sourcefiles/{path}"
+            target_url = f"http://localhost:{compile_server_port}/{path}"
             logger.info(f"Forwarding to: {target_url}")
 
             # Log request headers

{fastled-1.2.96 → fastled-1.3.0}/src/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.96 → fastled-1.3.0}/src/fastled.egg-info/PKG-INFO

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

{fastled-1.2.96 → fastled-1.3.0}/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.18
+fastled-wasm-server>=1.0.22

{fastled-1.2.96 → fastled-1.3.0}/tests/unit/test_fetch_source_files.py

@@ -1,3 +1,7 @@
+import os
+
+os.environ["FLASK_SERVER_LOGGING"] = "1"
+
 import time
 import unittest
 import warnings
@@ -11,20 +15,18 @@ 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 = True
+_ENABLED = False
 
-_DWARF_SRC_EXAMPLE1 = "http://localhost:{http_port}/drawfsource/js/src/drawfsource/git/fastled/src/FastLED.h"
+_DWARF_SRC_EXAMPLE1 = "http://localhost:{http_port}/fastledsource/js/src/fastledsource/git/fastled/src/FastLED.h"
 _DWARF_SRC_EXAMPLE2 = (
-    "http://localhost:{http_port}/drawfsource/js/drawfsource/headers/FastLED.h"
+    "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,
     _DWARF_SRC_EXAMPLE2,
-    # _DWARF_SRC_EXAMPLES
 ]
-# _DWARF_SRC_EXAMPLE_SKETCH = "http://localhost:{http_port}/drawfsource/js/src/src/wave.cpp"
 
 
 def _enabled() -> bool: