fastled 1.3.0__tar.gz → 1.3.1__tar.gz

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

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

{fastled-1.3.0 → fastled-1.3.1}/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.23",  # Also versions fastled-wasm-compiler dependency.
 ]
 
 [tool.setuptools]

{fastled-1.3.0 → fastled-1.3.1}/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.23",  # Enforced by unit test to match project <--> docker.
 ]
 
 dynamic = ["version"]

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

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

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

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

@@ -100,7 +100,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.1}/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.23

fastled-1.3.0/tests/unit/test_fetch_source_files.py → fastled-1.3.1/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,13 @@ class FetchSourceFileTester(unittest.TestCase):
             http_port=http_port,
         )
         with client:
-            # TODO Make faster.
             wait_for_server(f"http://localhost:{http_port}", timeout=100)
+            url = f"http://localhost:{http_port}/dwarfsource/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: