fastled 1.2.62__py3-none-any.whl → 1.2.63__py3-none-any.whl

fastled/__init__.py

@@ -13,7 +13,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.62"
+__version__ = "1.2.63"
 
 DOCKER_FILE = (
     "https://raw.githubusercontent.com/zackees/fastled-wasm/refs/heads/main/Dockerfile"

fastled/project_init.py

@@ -1,129 +1,129 @@
-import _thread
-import threading
-import time
-import zipfile
-from pathlib import Path
-
-import httpx
-
-from fastled.settings import DEFAULT_URL
-from fastled.spinner import Spinner
-
-DEFAULT_EXAMPLE = "wasm"
-
-
-def get_examples(host: str | None = None) -> list[str]:
-    host = host or DEFAULT_URL
-    url_info = f"{host}/info"
-    response = httpx.get(url_info, timeout=4)
-    response.raise_for_status()
-    examples: list[str] = response.json()["examples"]
-    return sorted(examples)
-
-
-def _prompt_for_example() -> str:
-    examples = get_examples()
-    while True:
-        print("Available examples:")
-        for i, example in enumerate(examples):
-            print(f"  [{i+1}]: {example}")
-        answer = input("Enter the example number or name: ").strip()
-        if answer.isdigit():
-            example_num = int(answer) - 1
-            if example_num < 0 or example_num >= len(examples):
-                print("Invalid example number")
-                continue
-            return examples[example_num]
-        elif answer in examples:
-            return answer
-
-
-class DownloadThread(threading.Thread):
-    def __init__(self, url: str, json: str):
-        super().__init__(daemon=True)
-        self.url = url
-        self.json = json
-        self.bytes_downloaded = 0
-        self.content: bytes | None = None
-        self.error: Exception | None = None
-        self.success = False
-
-    def run(self) -> None:
-        timeout = httpx.Timeout(5.0, connect=5.0, read=120.0, write=30.0)
-        try:
-            with httpx.Client(timeout=timeout) as client:
-                with client.stream("POST", self.url, json=self.json) as response:
-                    response.raise_for_status()
-                    content = b""
-                    for chunk in response.iter_bytes():
-                        content += chunk
-                        self.bytes_downloaded += len(chunk)
-                    self.content = content
-                    self.success = True
-        except KeyboardInterrupt:
-            self.error = RuntimeError("Download cancelled")
-            _thread.interrupt_main()
-        except Exception as e:
-            self.error = e
-
-
-def project_init(
-    example: str | None = "PROMPT",  # prompt for example
-    outputdir: Path | None = None,
-    host: str | None = None,
-) -> Path:
-    """
-    Initialize a new FastLED project.
-    """
-    host = host or DEFAULT_URL
-    outputdir = Path(outputdir) if outputdir is not None else Path("fastled")
-    outputdir.mkdir(exist_ok=True, parents=True)
-    if example == "PROMPT" or example is None:
-        try:
-            example = _prompt_for_example()
-        except httpx.HTTPStatusError:
-            print(
-                f"Failed to fetch examples, using default example '{DEFAULT_EXAMPLE}'"
-            )
-            example = DEFAULT_EXAMPLE
-    assert example is not None
-    endpoint_url = f"{host}/project/init"
-    json = example
-    print(f"Initializing project with example '{example}', url={endpoint_url}")
-
-    # Start download thread
-    download_thread = DownloadThread(endpoint_url, json)
-    # spinner = Spinner("Downloading project...")
-    with Spinner(f"Downloading project {example}..."):
-        download_thread.start()
-        while download_thread.is_alive():
-            time.sleep(0.1)
-
-    print()  # New line after progress
-    download_thread.join()
-
-    # Check for errors
-    if not download_thread.success:
-        assert download_thread.error is not None
-        raise download_thread.error
-
-    content = download_thread.content
-    assert content is not None
-    tmpzip = outputdir / "fastled.zip"
-    outputdir.mkdir(exist_ok=True)
-    tmpzip.write_bytes(content)
-    with zipfile.ZipFile(tmpzip, "r") as zip_ref:
-        zip_ref.extractall(outputdir)
-    tmpzip.unlink()
-    out = outputdir / example
-    print(f"Project initialized at {out}")
-    assert out.exists()
-    return out
-
-
-def unit_test() -> None:
-    project_init()
-
-
-if __name__ == "__main__":
-    unit_test()
+import _thread
+import threading
+import time
+import zipfile
+from pathlib import Path
+
+import httpx
+
+from fastled.settings import DEFAULT_URL
+from fastled.spinner import Spinner
+
+DEFAULT_EXAMPLE = "wasm"
+
+
+def get_examples(host: str | None = None) -> list[str]:
+    host = host or DEFAULT_URL
+    url_info = f"{host}/info"
+    response = httpx.get(url_info, timeout=4)
+    response.raise_for_status()
+    examples: list[str] = response.json()["examples"]
+    return sorted(examples)
+
+
+def _prompt_for_example() -> str:
+    examples = get_examples()
+    while True:
+        print("Available examples:")
+        for i, example in enumerate(examples):
+            print(f"  [{i+1}]: {example}")
+        answer = input("Enter the example number or name: ").strip()
+        if answer.isdigit():
+            example_num = int(answer) - 1
+            if example_num < 0 or example_num >= len(examples):
+                print("Invalid example number")
+                continue
+            return examples[example_num]
+        elif answer in examples:
+            return answer
+
+
+class DownloadThread(threading.Thread):
+    def __init__(self, url: str, json: str):
+        super().__init__(daemon=True)
+        self.url = url
+        self.json = json
+        self.bytes_downloaded = 0
+        self.content: bytes | None = None
+        self.error: Exception | None = None
+        self.success = False
+
+    def run(self) -> None:
+        timeout = httpx.Timeout(5.0, connect=5.0, read=120.0, write=30.0)
+        try:
+            with httpx.Client(timeout=timeout) as client:
+                with client.stream("POST", self.url, json=self.json) as response:
+                    response.raise_for_status()
+                    content = b""
+                    for chunk in response.iter_bytes():
+                        content += chunk
+                        self.bytes_downloaded += len(chunk)
+                    self.content = content
+                    self.success = True
+        except KeyboardInterrupt:
+            self.error = RuntimeError("Download cancelled")
+            _thread.interrupt_main()
+        except Exception as e:
+            self.error = e
+
+
+def project_init(
+    example: str | None = "PROMPT",  # prompt for example
+    outputdir: Path | None = None,
+    host: str | None = None,
+) -> Path:
+    """
+    Initialize a new FastLED project.
+    """
+    host = host or DEFAULT_URL
+    outputdir = Path(outputdir) if outputdir is not None else Path("fastled")
+    outputdir.mkdir(exist_ok=True, parents=True)
+    if example == "PROMPT" or example is None:
+        try:
+            example = _prompt_for_example()
+        except httpx.HTTPStatusError:
+            print(
+                f"Failed to fetch examples, using default example '{DEFAULT_EXAMPLE}'"
+            )
+            example = DEFAULT_EXAMPLE
+    assert example is not None
+    endpoint_url = f"{host}/project/init"
+    json = example
+    print(f"Initializing project with example '{example}', url={endpoint_url}")
+
+    # Start download thread
+    download_thread = DownloadThread(endpoint_url, json)
+    # spinner = Spinner("Downloading project...")
+    with Spinner(f"Downloading project {example}..."):
+        download_thread.start()
+        while download_thread.is_alive():
+            time.sleep(0.1)
+
+    print()  # New line after progress
+    download_thread.join()
+
+    # Check for errors
+    if not download_thread.success:
+        assert download_thread.error is not None
+        raise download_thread.error
+
+    content = download_thread.content
+    assert content is not None
+    tmpzip = outputdir / "fastled.zip"
+    outputdir.mkdir(exist_ok=True)
+    tmpzip.write_bytes(content)
+    with zipfile.ZipFile(tmpzip, "r") as zip_ref:
+        zip_ref.extractall(outputdir)
+    tmpzip.unlink()
+    out = outputdir / example
+    print(f"Project initialized at {out}")
+    assert out.exists()
+    return out
+
+
+def unit_test() -> None:
+    project_init()
+
+
+if __name__ == "__main__":
+    unit_test()

fastled/server_fastapi_cli.py

@@ -32,7 +32,7 @@ def _run_fastapi_server(
         "fastled.server_fastapi:app",
         host="127.0.0.1",
         port=port,
-        reload=True,
+        reload=False,
         # reload_includes=["index.html"],
         ssl_certfile=certfile,
         ssl_keyfile=keyfile,

fastled/server_flask.py

@@ -5,8 +5,20 @@ from pathlib import Path
 from livereload import Server
 
 
-def _run_flask_server(fastled_js: Path, port: int) -> None:
-    """Run Flask server with live reload in a subprocess"""
+def _run_flask_server(
+    fastled_js: Path,
+    port: int,
+    certfile: Path | None = None,
+    keyfile: Path | None = None,
+) -> None:
+    """Run Flask server with live reload in a subprocess
+
+    Args:
+        fastled_js: Path to the fastled_js directory
+        port: Port to run the server on
+        certfile: Path to the SSL certificate file
+        keyfile: Path to the SSL key file
+    """
     try:
         from flask import Flask, send_from_directory
 
@@ -70,10 +82,12 @@ def _run_flask_server(fastled_js: Path, port: int) -> None:
         _thread.interrupt_main()
 
 
-def run(port: int, cwd: Path) -> None:
+def run(
+    port: int, cwd: Path, certfile: Path | None = None, keyfile: Path | None = None
+) -> None:
     """Run the Flask server."""
     try:
-        _run_flask_server(cwd, port)
+        _run_flask_server(cwd, port, certfile, keyfile)
         import warnings
 
         warnings.warn("Flask server has stopped")
@@ -99,20 +113,30 @@ def parse_args() -> argparse.Namespace:
         required=True,
         help="Port to run the server on (default: %(default)s)",
     )
+    parser.add_argument(
+        "--certfile",
+        type=Path,
+        help="Path to the SSL certificate file for HTTPS",
+    )
+    parser.add_argument(
+        "--keyfile",
+        type=Path,
+        help="Path to the SSL key file for HTTPS",
+    )
     return parser.parse_args()
 
 
 def run_flask_server_process(
     port: int,
     cwd: Path | None = None,
-    certfile: Path | None = None,  # type: ignore[unused-argument]
-    keyfile: Path | None = None,  # type: ignore[unused-argument]
+    certfile: Path | None = None,
+    keyfile: Path | None = None,
 ) -> Process:
-    """Run the FastAPI server in a separate process."""
+    """Run the Flask server in a separate process."""
     cwd = cwd or Path(".")
     process = Process(
         target=run,
-        args=(port, cwd),
+        args=(port, cwd, certfile, keyfile),
     )
     process.start()
     return process
@@ -121,7 +145,7 @@ def run_flask_server_process(
 def main() -> None:
     """Main function."""
     args = parse_args()
-    run(args.fastled_js, args.port)
+    run(args.port, args.fastled_js, args.certfile, args.keyfile)
 
 
 if __name__ == "__main__":

fastled/server_start.py

@@ -1,14 +1,34 @@
 import argparse
 import importlib.resources as pkg_resources
+from dataclasses import dataclass
+from multiprocessing import Process
 from pathlib import Path
 
 from fastled.server_fastapi_cli import run_fastapi_server_process
 from fastled.server_flask import run_flask_server_process
 
-if True:
-    run_server_process = run_flask_server_process
-else:
-    run_server_process = run_fastapi_server_process
+
+def run_server_process(
+    port: int, cwd: Path, certfile: Path | None = None, keyfile: Path | None = None
+) -> Process:
+    """Run the server in a separate process."""
+    if True:
+        # Use Flask server
+        process = run_flask_server_process(
+            port=port,
+            cwd=cwd,
+            certfile=certfile,
+            keyfile=keyfile,
+        )
+    else:
+        # Use FastAPI server
+        process = run_fastapi_server_process(
+            port=port,
+            cwd=cwd,
+            certfile=certfile,
+            keyfile=keyfile,
+        )
+    return process
 
 
 def get_asset_path(filename: str) -> Path | None:
@@ -22,12 +42,12 @@ def get_asset_path(filename: str) -> Path | None:
         return None
 
 
-def run(
+def start_process(
     path: Path,
     port: int,
     certfile: Path | None = None,
     keyfile: Path | None = None,
-) -> None:
+) -> Process:
     """Run the server, using package assets if explicit paths are not provided"""
     # Use package resources if no explicit path
     if certfile is None:
@@ -38,15 +58,24 @@ def run(
     # _run_flask_server(path, port, certfile, keyfile)
     # run_fastapi_server_process(port=port, path=path, certfile=certfile, keyfile=keyfile)
     proc = run_server_process(port=port, cwd=path)
-    try:
-        proc.join()
-    except KeyboardInterrupt:
-        import _thread
+    # try:
+    #     proc.join()
+    # except KeyboardInterrupt:
+    #     import _thread
 
-        _thread.interrupt_main()
+    #     _thread.interrupt_main()
+    return proc
+
+
+@dataclass
+class Args:
+    fastled_js: Path
+    port: int
+    cert: Path | None
+    key: Path | None
 
 
-def parse_args() -> argparse.Namespace:
+def parse_args() -> Args:
     parser = argparse.ArgumentParser(
         description="Open a browser to the fastled_js directory"
     )
@@ -66,21 +95,37 @@ def parse_args() -> argparse.Namespace:
     parser.add_argument(
         "--key", type=Path, help="(Optional) Path to SSL private key (PEM format)"
     )
-    return parser.parse_args()
+    args = parser.parse_args()
+    out: Args = Args(
+        fastled_js=args.fastled_js,
+        port=args.port,
+        cert=args.cert,
+        key=args.key,
+    )
+    if args.fastled_js is None:
+        raise ValueError("fastled_js directory is required")
+    return out
 
 
 def main() -> None:
-    args = parse_args()
+    args: Args = parse_args()
     fastled_js: Path = args.fastled_js
     port: int = args.port
     cert: Path | None = args.cert
     key: Path | None = args.key
-    run(
+    proc = start_process(
         path=fastled_js,
         port=port,
         certfile=cert,
         keyfile=key,
     )
+    try:
+        proc.join()
+    except KeyboardInterrupt:
+        import _thread
+
+        _thread.interrupt_main()
+        pass
 
 
 if __name__ == "__main__":