fastled 1.2.35__tar.gz → 1.2.38__tar.gz

{fastled-1.2.35 → fastled-1.2.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fastled
-Version: 1.2.35
+Version: 1.2.38
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -211,7 +211,7 @@ with Api.server() as server:
 **Build Docker Image from a local copy of the FastLED repo**
 ```python
 from fastapi import Docker, Api
-container_name: str = Docker.build_from_fastled_repo()
+container_name: str = Docker.spawn_server_from_fastled_repo()
 with Api.server(container_name=container_name) as server:
   ...
 ```
@@ -293,7 +293,6 @@ A: `delay()` will block `loop()` which blocks the main thread of the browser. Th
 Q: How can I get the compiled size of my FastLED sketch smaller?
 A: A big chunk of space is being used by unnecessary javascript `emscripten` bundling. The wasm_compiler_settings.py file in the FastLED repo can tweak this.
 
-
 # Revisions
 
   * 1.2.31 - Bunch of fixes and ease of use while compiling code in the repo.

{fastled-1.2.35 → fastled-1.2.38}/README.md

@@ -185,7 +185,7 @@ with Api.server() as server:
 **Build Docker Image from a local copy of the FastLED repo**
 ```python
 from fastapi import Docker, Api
-container_name: str = Docker.build_from_fastled_repo()
+container_name: str = Docker.spawn_server_from_fastled_repo()
 with Api.server(container_name=container_name) as server:
   ...
 ```
@@ -267,7 +267,6 @@ A: `delay()` will block `loop()` which blocks the main thread of the browser. Th
 Q: How can I get the compiled size of my FastLED sketch smaller?
 A: A big chunk of space is being used by unnecessary javascript `emscripten` bundling. The wasm_compiler_settings.py file in the FastLED repo can tweak this.
 
-
 # Revisions
 
   * 1.2.31 - Bunch of fixes and ease of use while compiling code in the repo.

{fastled-1.2.35 → fastled-1.2.38}/src/fastled/__init__.py

@@ -16,7 +16,7 @@ from .types import BuildMode, CompileResult, CompileServerError
 # 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.35"
+__version__ = "1.2.38"
 
 
 class Api:
@@ -157,10 +157,10 @@ class Docker:
         docker_mgr.purge(image_name=IMAGE_NAME)
 
     @staticmethod
-    def build_from_github(
+    def spawn_server_from_github(
         url: str = "https://github.com/fastled/fastled",
         output_dir: Path | str = Path(".cache/fastled"),
-    ) -> str:
+    ) -> CompileServer:
         """Build the FastLED WASM compiler Docker image from a GitHub repository.
 
         Args:
@@ -252,21 +252,32 @@ class Docker:
             platform_tag=platform_tag,
         )
 
-        # Run the container and return it
-        container = docker_mgr.run_container_detached(
-            image_name=IMAGE_NAME,
-            tag="main",
+        # # Run the container and return it
+        # container = docker_mgr.run_container_detached(
+        #     image_name=IMAGE_NAME,
+        #     tag="main",
+        #     container_name=CONTAINER_NAME,
+        #     command=None,  # Use default command from Dockerfile
+        #     volumes=None,  # No volumes needed for build
+        #     ports=None,  # No ports needed for build
+        #     remove_previous=True,  # Remove any existing container
+        # )
+        # name = container.name
+        # container.stop()
+
+        out: CompileServer = CompileServer(
             container_name=CONTAINER_NAME,
-            command=None,  # Use default command from Dockerfile
-            volumes=None,  # No volumes needed for build
-            ports=None,  # No ports needed for build
-            remove_previous=True,  # Remove any existing container
+            interactive=False,
+            auto_updates=False,
+            mapped_dir=None,
+            auto_start=True,
+            remove_previous=True,
         )
 
-        return container.name  # Todo, create an external docker container api.
+        return out
 
     @staticmethod
-    def build_from_fastled_repo(
+    def spawn_server_from_fastled_repo(
         project_root: Path | str = Path("."),
         interactive: bool = False,
         sketch_folder: Path | None = None,

{fastled-1.2.35 → fastled-1.2.38}/src/fastled/app.py

@@ -2,7 +2,6 @@
 Uses the latest wasm compiler image to compile the FastLED sketch.
 """
 
-import argparse
 import sys
 import time
 from pathlib import Path
@@ -10,10 +9,10 @@ from pathlib import Path
 from fastled.client_server import run_client_server
 from fastled.compile_server import CompileServer
 from fastled.filewatcher import file_watcher_set
-from fastled.parse_args import parse_args
+from fastled.parse_args import Args, parse_args
 
 
-def run_server(args: argparse.Namespace) -> int:
+def run_server(args: Args) -> int:
     interactive = args.interactive
     auto_update = args.auto_update
     mapped_dir = Path(args.directory).absolute() if args.directory else None
@@ -46,20 +45,13 @@ def run_server(args: argparse.Namespace) -> int:
 def main() -> int:
     args = parse_args()
     interactive: bool = args.interactive
-    server: str | CompileServer | None = args.server
+    has_server = args.server
     update: bool = args.update
     build: bool = args.build
     just_compile: bool = args.just_compile
     # directory: Path | None = Path(args.directory).absolute() if args.directory else None
     directory: Path | None = Path(args.directory) if args.directory else None
 
-    # broken for now
-    if directory is None and interactive:
-        # if examples/wasm exists
-        if Path("examples/wasm").exists():
-            print(f"Using {Path('examples/wasm')} as the sketch directory")
-            directory = Path("examples/wasm").absolute()
-
     if update:
         # Force auto_update to ensure update check happens
         compile_server = CompileServer(interactive=False, auto_updates=True)
@@ -74,7 +66,7 @@ def main() -> int:
             print(f"Building Docker image at {project_root}")
             from fastled import Api, Docker
 
-            server = Docker.build_from_fastled_repo(
+            server = Docker.spawn_server_from_fastled_repo(
                 project_root=project_root, interactive=interactive
             )
             assert isinstance(server, CompileServer)
@@ -103,7 +95,7 @@ def main() -> int:
             print("\nExiting from client...")
             return 1
 
-    if server:
+    if has_server:
         print("Running in server only mode.")
         return run_server(args)
     else:
@@ -114,8 +106,8 @@ def main() -> int:
 if __name__ == "__main__":
     # Note that the entry point for the exe is in cli.py
     try:
-        sys.argv.append("-b")
-        sys.argv.append("examples/wasm")
+        sys.argv.append("-i")
+        # sys.argv.append("examples/wasm")
         # sys.argv.append()
         import os
 

{fastled-1.2.35 → fastled-1.2.38}/src/fastled/client_server.py

@@ -1,4 +1,3 @@
-import argparse
 import shutil
 import tempfile
 import threading
@@ -11,6 +10,7 @@ from fastled.docker_manager import DockerManager
 from fastled.filewatcher import FileWatcherProcess
 from fastled.keyboard import SpaceBarWatcher
 from fastled.open_browser import open_browser_process
+from fastled.parse_args import Args
 from fastled.settings import DEFAULT_URL
 from fastled.sketch import looks_like_sketch_directory
 from fastled.types import BuildMode, CompileResult, CompileServerError
@@ -334,12 +334,12 @@ def run_client(
             browser_proc.kill()
 
 
-def run_client_server(args: argparse.Namespace) -> int:
+def run_client_server(args: Args) -> int:
     profile = bool(args.profile)
     web: str | bool = args.web if isinstance(args.web, str) else bool(args.web)
     auto_update = bool(args.auto_update)
     localhost = bool(args.localhost)
-    directory = Path(args.directory)
+    directory = args.directory if args.directory else Path(".")
     just_compile = bool(args.just_compile)
     interactive = bool(args.interactive)
     force_compile = bool(args.force_compile)

{fastled-1.2.35 → fastled-1.2.38}/src/fastled/parse_args.py

@@ -12,8 +12,10 @@ from fastled.sketch import (
     looks_like_fastled_repo,
     looks_like_sketch_directory,
 )
+from fastled.types import Args
 
-def _find_fastled_repo(start: Path) -> Path:
+
+def _find_fastled_repo(start: Path) -> Path | None:
     """Find the FastLED repo directory by searching upwards from the current directory."""
     current = start
     while current != current.parent:
@@ -23,7 +25,7 @@ def _find_fastled_repo(start: Path) -> Path:
     return None
 
 
-def parse_args() -> argparse.Namespace:
+def parse_args() -> Args:
     """Parse command-line arguments."""
     parser = argparse.ArgumentParser(description=f"FastLED WASM Compiler {__version__}")
     parser.add_argument("--version", action="version", version=f"{__version__}")
@@ -143,15 +145,17 @@ def parse_args() -> argparse.Namespace:
     if args.build or args.interactive:
         cwd: Path = Path(os.getcwd())
         fastled_dir: Path | None = _find_fastled_repo(cwd)
+        if args.directory is not None:
+            args.directory = str(Path(args.directory).absolute())
         if fastled_dir is None:
-            print(
-                "This command must be run from within the FastLED repo. Exiting..."
-            )
+            print("This command must be run from within the FastLED repo. Exiting...")
             sys.exit(1)
         if cwd != fastled_dir:
             print(f"Switching to FastLED repo at {fastled_dir}")
             os.chdir(fastled_dir)
-        return args
+        if args.directory is None:
+            args.directory = str(Path("examples/wasm").absolute())
+        return Args.from_namespace(args)
 
     if not args.update:
         if args.no_auto_updates:
@@ -214,4 +218,4 @@ def parse_args() -> argparse.Namespace:
                 print(f"Using sketch directory: {dir_path}")
                 args.directory = str(dir_path)
 
-    return args
+    return Args.from_namespace(args)

{fastled-1.2.35 → fastled-1.2.38}/src/fastled/sketch.py

@@ -72,7 +72,10 @@ def _lots_and_lots_of_files(directory: Path) -> bool:
     return len(get_sketch_files(directory)) > 100
 
 
-def looks_like_sketch_directory(directory: Path, quick=False) -> bool:
+def looks_like_sketch_directory(directory: Path | str | None, quick=False) -> bool:
+    if directory is None:
+        return False
+    directory = Path(directory)
     if looks_like_fastled_repo(directory):
         print("Directory looks like the FastLED repo")
         return False

fastled-1.2.38/src/fastled/types.py

@@ -0,0 +1,146 @@
+import argparse
+from dataclasses import dataclass
+from enum import Enum
+from pathlib import Path
+from typing import Any
+
+
+@dataclass
+class Args:
+    directory: Path | None
+    init: bool | str
+    just_compile: bool
+    web: str | None
+    interactive: bool
+    profile: bool
+    force_compile: bool
+    auto_update: bool | None
+    update: bool
+    localhost: bool
+    build: bool
+    server: bool
+    purge: bool
+    debug: bool
+    quick: bool
+    release: bool
+
+    @staticmethod
+    def from_namespace(args: argparse.Namespace) -> "Args":
+        assert isinstance(
+            args.directory, str | None
+        ), f"expected str | None, got {type(args.directory)}"
+        assert isinstance(
+            args.init, bool | str | None
+        ), f"expected bool, got {type(args.init)}"
+        assert isinstance(
+            args.just_compile, bool
+        ), f"expected bool, got {type(args.just_compile)}"
+        assert isinstance(
+            args.web, str | None
+        ), f"expected str | None, got {type(args.web)}"
+        assert isinstance(
+            args.interactive, bool
+        ), f"expected bool, got {type(args.interactive)}"
+        assert isinstance(
+            args.profile, bool
+        ), f"expected bool, got {type(args.profile)}"
+        assert isinstance(
+            args.force_compile, bool
+        ), f"expected bool, got {type(args.force_compile)}"
+        assert isinstance(
+            args.no_auto_updates, bool | None
+        ), f"expected bool | None, got {type(args.no_auto_updates)}"
+        assert isinstance(args.update, bool), f"expected bool, got {type(args.update)}"
+        assert isinstance(
+            args.localhost, bool
+        ), f"expected bool, got {type(args.localhost)}"
+        assert isinstance(args.build, bool), f"expected bool, got {type(args.build)}"
+        assert isinstance(args.server, bool), f"expected bool, got {type(args.server)}"
+        assert isinstance(args.purge, bool), f"expected bool, got {type(args.purge)}"
+        assert isinstance(args.debug, bool), f"expected bool, got {type(args.debug)}"
+        assert isinstance(args.quick, bool), f"expected bool, got {type(args.quick)}"
+        assert isinstance(
+            args.release, bool
+        ), f"expected bool, got {type(args.release)}"
+        init: bool | str = False
+        if args.init is None:
+            init = False
+        elif isinstance(args.init, bool):
+            init = args.init
+        elif isinstance(args.init, str):
+            init = args.init
+        return Args(
+            directory=Path(args.directory) if args.directory else None,
+            init=init,
+            just_compile=args.just_compile,
+            web=args.web,
+            interactive=args.interactive,
+            profile=args.profile,
+            force_compile=args.force_compile,
+            auto_update=not args.no_auto_updates,
+            update=args.update,
+            localhost=args.localhost,
+            build=args.build,
+            server=args.server,
+            purge=args.purge,
+            debug=args.debug,
+            quick=args.quick,
+            release=args.release,
+        )
+
+
+@dataclass
+class CompileResult:
+    success: bool
+    stdout: str
+    hash_value: str | None
+    zip_bytes: bytes
+
+    def __bool__(self) -> bool:
+        return self.success
+
+    def to_dict(self) -> dict[str, Any]:
+        return self.__dict__.copy()
+
+
+class CompileServerError(Exception):
+    """Error class for failing to instantiate CompileServer."""
+
+    pass
+
+
+class BuildMode(Enum):
+    DEBUG = "DEBUG"
+    QUICK = "QUICK"
+    RELEASE = "RELEASE"
+
+    @classmethod
+    def from_string(cls, mode_str: str) -> "BuildMode":
+        try:
+            return cls[mode_str.upper()]
+        except KeyError:
+            valid_modes = [mode.name for mode in cls]
+            raise ValueError(f"BUILD_MODE must be one of {valid_modes}, got {mode_str}")
+
+    @staticmethod
+    def from_args(args: Args) -> "BuildMode":
+        if args.debug:
+            return BuildMode.DEBUG
+        elif args.release:
+            return BuildMode.RELEASE
+        else:
+            return BuildMode.QUICK
+
+
+class Platform(Enum):
+    WASM = "WASM"
+
+    @classmethod
+    def from_string(cls, platform_str: str) -> "Platform":
+        try:
+            return cls[platform_str.upper()]
+        except KeyError:
+            valid_modes = [mode.name for mode in cls]
+            raise ValueError(
+                f"Platform must be one of {valid_modes}, got {platform_str}"
+            )

{fastled-1.2.35 → fastled-1.2.38}/src/fastled.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fastled
-Version: 1.2.35
+Version: 1.2.38
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -211,7 +211,7 @@ with Api.server() as server:
 **Build Docker Image from a local copy of the FastLED repo**
 ```python
 from fastapi import Docker, Api
-container_name: str = Docker.build_from_fastled_repo()
+container_name: str = Docker.spawn_server_from_fastled_repo()
 with Api.server(container_name=container_name) as server:
   ...
 ```
@@ -293,7 +293,6 @@ A: `delay()` will block `loop()` which blocks the main thread of the browser. Th
 Q: How can I get the compiled size of my FastLED sketch smaller?
 A: A big chunk of space is being used by unnecessary javascript `emscripten` bundling. The wasm_compiler_settings.py file in the FastLED repo can tweak this.
 
-
 # Revisions
 
   * 1.2.31 - Bunch of fixes and ease of use while compiling code in the repo.

{fastled-1.2.35 → fastled-1.2.38}/src/fastled.egg-info/SOURCES.txt

@@ -63,7 +63,6 @@ src/fastled/test/can_run_local_docker_tests.py
 src/fastled/test/examples.py
 tests/test_api.py
 tests/test_bad_ino.py
-tests/test_build.py
 tests/test_build_examples.py
 tests/test_build_from_docker.py
 tests/test_build_from_github.py

{fastled-1.2.35 → fastled-1.2.38}/tests/test_build_from_docker.py

@@ -34,7 +34,9 @@ class BuildDockerFromRepoTester(unittest.TestCase):
     @unittest.skipUnless(_enabled(), "Skipping test on non-Linux system on github")
     def test_build_docker(self) -> None:
         """Builds the docker file from the fastled repo."""
-        server: CompileServer = Docker.build_from_fastled_repo(FASTLED_SISTER_REPO)
+        server: CompileServer = Docker.spawn_server_from_fastled_repo(
+            FASTLED_SISTER_REPO
+        )
         self.assertIsNotNone(server, "Failed to build docker image")
 
         try:

{fastled-1.2.35 → fastled-1.2.38}/tests/test_build_from_github.py

@@ -5,7 +5,7 @@ Unit test file.
 import unittest
 from pathlib import Path
 
-from fastled import Api, CompileServer, Docker, Test  # type: ignore
+from fastled import CompileServer, Docker, Test  # type: ignore
 
 HERE = Path(__file__).parent
 PROJECT_ROOT = HERE.parent
@@ -35,11 +35,14 @@ class BuildDockerFromGithubTester(unittest.TestCase):
         """Builds the docker file from the fastled repo."""
         url = DEFAULT_GITHUB_URL
         print("Building from github")
-        docker_image_name = Docker.build_from_github(url=url, output_dir=OUTPUT_DIR)
-        self.assertTrue(docker_image_name, "Failed to build docker image")
-        server: CompileServer
-        with Api.server(auto_updates=True, container_name=docker_image_name) as server:
+        server: CompileServer = Docker.spawn_server_from_github(
+            url=url, output_dir=OUTPUT_DIR
+        )
+        self.assertTrue(server, "Failed to build docker image")
+        try:
             self.assertTrue(server.ping())
+        finally:
+            server.stop()
 
 
 if __name__ == "__main__":

{fastled-1.2.35 → fastled-1.2.38}/tests/test_http_server.py

@@ -2,6 +2,7 @@
 Unit test file.
 """
 
+import random
 import unittest
 from pathlib import Path
 
@@ -16,20 +17,27 @@ TIMEOUT = 120
 assert INDEX_HTML.exists()
 
 
+# realistic range, 8021 - 8030
+PORT = random.randint(8021, 8030)
+PORT2 = PORT + 1
+
+
 class HttpServerTester(unittest.TestCase):
     """Main tester class."""
 
     def test_http_server(self) -> None:
         """Test the http server."""
-        proc = Test.spawn_http_server(INDEX_HTML.parent, port=8021, open_browser=False)
-        response = httpx.get("http://localhost:8021", timeout=1)
+        port = PORT
+        proc = Test.spawn_http_server(INDEX_HTML.parent, port=port, open_browser=False)
+        response = httpx.get(f"http://localhost:{port}", timeout=1)
         self.assertEqual(response.status_code, 200)
         proc.terminate()
 
     def test_http_server_404(self) -> None:
         """Test the http server returns 404 for non-existent files."""
-        proc = Test.spawn_http_server(INDEX_HTML.parent, port=8022, open_browser=False)
-        response = httpx.get("http://localhost:8022/nonexistent.html", timeout=1)
+        port = PORT2
+        proc = Test.spawn_http_server(INDEX_HTML.parent, port=port, open_browser=False)
+        response = httpx.get(f"http://localhost:{port}/nonexistent.html", timeout=1)
         self.assertEqual(response.status_code, 404)
         proc.terminate()
 

fastled-1.2.35/src/fastled/types.py

@@ -1,61 +0,0 @@
-import argparse
-from dataclasses import dataclass
-from enum import Enum
-from typing import Any
-
-
-@dataclass
-class CompileResult:
-    success: bool
-    stdout: str
-    hash_value: str | None
-    zip_bytes: bytes
-
-    def __bool__(self) -> bool:
-        return self.success
-
-    def to_dict(self) -> dict[str, Any]:
-        return self.__dict__.copy()
-
-
-class CompileServerError(Exception):
-    """Error class for failing to instantiate CompileServer."""
-
-    pass
-
-
-class BuildMode(Enum):
-    DEBUG = "DEBUG"
-    QUICK = "QUICK"
-    RELEASE = "RELEASE"
-
-    @classmethod
-    def from_string(cls, mode_str: str) -> "BuildMode":
-        try:
-            return cls[mode_str.upper()]
-        except KeyError:
-            valid_modes = [mode.name for mode in cls]
-            raise ValueError(f"BUILD_MODE must be one of {valid_modes}, got {mode_str}")
-
-    @staticmethod
-    def from_args(args: argparse.Namespace) -> "BuildMode":
-        if args.debug:
-            return BuildMode.DEBUG
-        elif args.release:
-            return BuildMode.RELEASE
-        else:
-            return BuildMode.QUICK
-
-
-class Platform(Enum):
-    WASM = "WASM"
-
-    @classmethod
-    def from_string(cls, platform_str: str) -> "Platform":
-        try:
-            return cls[platform_str.upper()]
-        except KeyError:
-            valid_modes = [mode.name for mode in cls]
-            raise ValueError(
-                f"Platform must be one of {valid_modes}, got {platform_str}"
-            )

fastled-1.2.35/tests/test_build.py

@@ -1,57 +0,0 @@
-"""
-Unit test file.
-"""
-
-import unittest
-from pathlib import Path
-
-from fastled import Api, CompileServer, Docker, Test  # type: ignore
-
-HERE = Path(__file__).parent
-PROJECT_ROOT = HERE.parent
-FASTLED_SISTER_REPO = PROJECT_ROOT / ".." / "FastLED"
-
-DEFAULT_GITHUB_URL = "https://github.com/fastled/fastled"
-OUTPUT_DIR = Path(".cache/fastled")
-
-
-def _enabled() -> bool:
-    """Check if this system can run the tests."""
-    sister_repo_does_not_exist = not FASTLED_SISTER_REPO.exists()
-
-    if sister_repo_does_not_exist:
-        print(
-            f"This test is only enable when FastLED is a repo in the same directly as the project root folder: {FASTLED_SISTER_REPO} does not exist"
-        )
-        return False
-
-    return Test.can_run_local_docker_tests()
-
-
-class BuildDockerFromRepoTester(unittest.TestCase):
-    """Main tester class."""
-
-    @unittest.skipUnless(_enabled(), "Skipping test on non-Linux system on github")
-    def test_build_docker(self) -> None:
-        """Builds the docker file from the fastled repo."""
-
-        container = Docker.build_from_fastled_repo(FASTLED_SISTER_REPO)
-        try:
-            self.assertTrue(container.ping())
-        finally:
-            container.stop()
-
-    @unittest.skipUnless(_enabled(), "Skipping test on non-Linux system on github")
-    def test_build_docker_from_github(self) -> None:
-        """Builds the docker file from the fastled repo."""
-        url = DEFAULT_GITHUB_URL
-        print("Building from github")
-        docker_image_name = Docker.build_from_github(url=url, output_dir=OUTPUT_DIR)
-        self.assertTrue(docker_image_name, "Failed to build docker image")
-        server: CompileServer
-        with Api.server(auto_updates=True, container_name=docker_image_name) as server:
-            self.assertTrue(server.ping())
-
-
-if __name__ == "__main__":
-    unittest.main()