fastled 1.2.80__tar.gz → 1.2.81__tar.gz

{fastled-1.2.80 → fastled-1.2.81}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastled
-Version: 1.2.80
+Version: 1.2.81
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies

{fastled-1.2.80 → fastled-1.2.81}/compiler/compile.py

@@ -86,7 +86,7 @@ def copy_files(src_dir: Path, js_src: Path) -> None:
             print(f"Copying file: {item}")
             shutil.copy2(item, js_src / item.name)
     else:
-        warnings.warn("No files found in the mapped directory.")
+        warnings.warn(f"No files found in the mapped directory: {src_dir.absolute()}")
 
 
 def _banner(msg: str) -> str:

{fastled-1.2.80 → fastled-1.2.81}/compiler/server.py

@@ -598,6 +598,40 @@ def project_init_example(
     )
 
 
+@app.get("/sourcefiles/{filepath:path}")
+def source_file(filepath: str) -> FileResponse:
+    """Get the source file from the server."""
+    print(f"Endpoint accessed: /sourcefiles/{filepath}")
+    if ".." in filepath:
+        raise HTTPException(status_code=400, detail="Invalid file path.")
+    full_path = Path(FASTLED_SRC / filepath)
+    if not full_path.exists():
+        raise HTTPException(status_code=404, detail="File not found.")
+    if not full_path.is_file():
+        raise HTTPException(status_code=400, detail="Not a file.")
+    if not full_path.is_relative_to(FASTLED_SRC):
+        raise HTTPException(status_code=400, detail="Invalid file path.")
+
+    suffix = full_path.suffix
+    if suffix in [".h", ".cpp"]:
+        media_type = "text/plain"
+    elif suffix == ".html":
+        media_type = "text/html"
+    elif suffix == ".js":
+        media_type = "application/javascript"
+    elif suffix == ".css":
+        media_type = "text/css"
+    else:
+        media_type = "application/octet-stream"
+
+    fr = FileResponse(
+        path=full_path,
+        media_type=media_type,
+        filename=filepath,
+    )
+    return fr
+
+
 @app.get("/static/{file_path:path}")
 async def static_files(file_path: str) -> Response:
     """Serve static files."""

{fastled-1.2.80 → fastled-1.2.81}/docker-compose.yml

@@ -4,6 +4,7 @@ services:
     build:
       context: .
     ports:
-      - "80:80"
+      - "8234:80"
     environment:
       - ENVIRONMENT=dev
+    image: niteris/fastled-wasm:latest

{fastled-1.2.80 → fastled-1.2.81}/src/fastled/__init__.py

@@ -9,12 +9,12 @@ 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
+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.80"
+__version__ = "1.2.81"
 
 
 class Api:
@@ -218,5 +218,6 @@ __all__ = [
     "CompileResult",
     "CompileServerError",
     "BuildMode",
+    "FileResponse",
     "DOCKER_FILE",
 ]

{fastled-1.2.80 → fastled-1.2.81}/src/fastled/compile_server.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from fastled.types import BuildMode, CompileResult, Platform
+from fastled.types import BuildMode, CompileResult, FileResponse, Platform
 
 
 class CompileServer:
@@ -53,6 +53,10 @@ 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.2.80 → fastled-1.2.81}/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
+from fastled.types import BuildMode, CompileResult, CompileServerError, FileResponse
 
 SERVER_OPTIONS = [
     "--allow-shutdown",  # Allow the server to be shut down without a force kill.
@@ -204,6 +204,29 @@ 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.2.80 → fastled-1.2.81}/src/fastled/types.py

@@ -151,3 +151,12 @@ class Platform(Enum):
             raise ValueError(
                 f"Platform must be one of {valid_modes}, got {platform_str}"
             )
+
+
+@dataclass
+class FileResponse:
+    """File response from the server."""
+
+    filename: str
+    content: str
+    mimetype: str

{fastled-1.2.80 → fastled-1.2.81}/src/fastled.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastled
-Version: 1.2.80
+Version: 1.2.81
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies

{fastled-1.2.80 → fastled-1.2.81}/src/fastled.egg-info/SOURCES.txt

@@ -113,12 +113,14 @@ tests/unit/test_cli.py
 tests/unit/test_compile_server.py
 tests/unit/test_docker_linux_on_windows.py
 tests/unit/test_embedded_data.py
+tests/unit/test_fastled_source_get.py
 tests/unit/test_filechanger.py
 tests/unit/test_http_server.py
 tests/unit/test_print_filter.py
 tests/unit/test_project_init.py
 tests/unit/test_server_and_client_seperatly.py
 tests/unit/test_string_diff.py
+tests/unit/test_version.py
 tests/unit/test_webcompile.py
 tests/unit/html/index.html
 tests/unit/test_ino/bad/bad.ino

fastled-1.2.81/tests/unit/test_fastled_source_get.py

@@ -0,0 +1,32 @@
+import unittest
+
+from fastled import Api
+
+_DISABLE = False
+
+
+def _enabled() -> bool:
+    """Check if this system can run the tests."""
+    from fastled import Test
+
+    return Test.can_run_local_docker_tests() and not _DISABLE
+
+
+class WebCompilerTester(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_server_big_data_roundtrip(self) -> None:
+        """Tests that embedded data is round tripped correctly."""
+        with Api.server() as server:
+            resp = server.fetch_source_file("platforms/wasm/js.cpp")
+            if isinstance(resp, Exception):
+                raise resp
+            print("Done")
+
+
+if __name__ == "__main__":
+    unittest.main()

fastled-1.2.81/tests/unit/test_version.py

@@ -0,0 +1,27 @@
+"""
+Unit test file.
+"""
+
+import subprocess
+import unittest
+
+from fastled import __version__
+
+COMMAND = "fastled --version"
+
+
+class MainTester(unittest.TestCase):
+    """Main tester class."""
+
+    def test_command(self) -> None:
+        """Test command line interface (CLI)."""
+        stdout = subprocess.check_output(COMMAND, shell=True)
+        self.assertEqual(
+            stdout.decode("utf-8").strip(),
+            "1.2.80",
+            f"Version mismatch: {stdout.decode('utf-8').strip()} != {__version__}",
+        )
+
+
+if __name__ == "__main__":
+    unittest.main()