fastled 1.2.46__py3-none-any.whl → 1.2.48__py3-none-any.whl

fastled/docker_manager.py

@@ -18,6 +18,7 @@ import docker
 from appdirs import user_data_dir
 from disklru import DiskLRUCache
 from docker.client import DockerClient
+from docker.errors import DockerException, NotFound
 from docker.models.containers import Container
 from docker.models.images import Image
 from filelock import FileLock
@@ -57,7 +58,9 @@ def get_lock(image_name: str) -> FileLock:
     print(CONFIG_DIR)
     if not lock_file.parent.exists():
         lock_file.parent.mkdir(parents=True, exist_ok=True)
-    return FileLock(str(lock_file))
+    out: FileLock
+    out = FileLock(str(lock_file))  # type: ignore
+    return out
 
 
 class RunningContainer:
@@ -181,10 +184,6 @@ class DockerManager:
             )
             return False
 
-        except subprocess.CalledProcessError as e:
-            print(f"Error occurred: {e}")
-            return False
-
         except subprocess.CalledProcessError as e:
             print(f"Failed to switch to Linux containers: {e}")
             if e.stdout:
@@ -199,6 +198,7 @@ class DockerManager:
     @staticmethod
     def is_running() -> bool:
         """Check if Docker is running by pinging the Docker daemon."""
+
         if not DockerManager.is_docker_installed():
             return False
         try:
@@ -207,7 +207,7 @@ class DockerManager:
             client.ping()
             print("Docker is running.")
             return True
-        except docker.errors.DockerException as e:
+        except DockerException as e:
             print(f"Docker is not running: {str(e)}")
             return False
         except Exception as e:
@@ -289,8 +289,10 @@ class DockerManager:
                     remote_image_hash = remote_image.id
 
                     try:
+                        local_image_id = local_image.id
+                        assert local_image_id is not None
                         remote_image_hash_from_local_image = DISK_CACHE.get(
-                            local_image.id
+                            local_image_id
                         )
                     except KeyboardInterrupt:
                         raise
@@ -455,14 +457,14 @@ class DockerManager:
             if remove_previous:
                 print(f"Removing existing container {container_name}...")
                 container.remove(force=True)
-                raise docker.errors.NotFound("Container removed due to remove_previous")
+                raise NotFound("Container removed due to remove_previous")
             # Check if configuration matches
             elif not self._container_configs_match(container, command, volumes, ports):
                 print(
                     f"Container {container_name} exists but with different configuration. Removing and recreating..."
                 )
                 container.remove(force=True)
-                raise docker.errors.NotFound("Container removed due to config mismatch")
+                raise NotFound("Container removed due to config mismatch")
             print(f"Container {container_name} found with matching configuration.")
 
             # Existing container with matching config - handle various states
@@ -492,7 +494,7 @@ class DockerManager:
                 print(f"Starting existing container {container_name}.")
                 self.first_run = True
                 container.start()
-        except docker.errors.NotFound:
+        except NotFound:
             print(f"Creating and starting {container_name}")
             out_msg = f"# Running in container: {command}"
             msg_len = len(out_msg)
@@ -524,7 +526,7 @@ class DockerManager:
         try:
             container: Container = self.client.containers.get(container_name)
             container.remove(force=True)
-        except docker.errors.NotFound:
+        except NotFound:
             pass
         start_time = time.time()
         try:
@@ -615,7 +617,7 @@ class DockerManager:
         """
         try:
             return self.client.containers.get(container_name)
-        except docker.errors.NotFound:
+        except NotFound:
             return None
 
     def is_container_running(self, container_name: str) -> bool:
@@ -625,7 +627,7 @@ class DockerManager:
         try:
             container = self.client.containers.get(container_name)
             return container.status == "running"
-        except docker.errors.NotFound:
+        except NotFound:
             print(f"Container {container_name} not found.")
             return False
 

fastled/filewatcher.py

@@ -15,6 +15,8 @@ from watchdog.events import FileSystemEvent, FileSystemEventHandler
 from watchdog.observers import Observer
 from watchdog.observers.api import BaseObserver
 
+_WATCHER_TIMEOUT = 0.1
+
 
 def file_watcher_enabled() -> bool:
     """Check if watchdog is disabled"""
@@ -120,7 +122,7 @@ class FileChangedNotifier(threading.Thread):
         finally:
             self.stop()
 
-    def get_next_change(self, timeout: float = 0.001) -> str | None:
+    def get_next_change(self, timeout: float = _WATCHER_TIMEOUT) -> str | None:
         """Get the next file change event from the queue
 
         Args:
@@ -148,7 +150,7 @@ class FileChangedNotifier(threading.Thread):
         except queue.Empty:
             return None
 
-    def get_all_changes(self, timeout: float = 0.001) -> list[str]:
+    def get_all_changes(self, timeout: float = _WATCHER_TIMEOUT) -> list[str]:
         """Get all file change events from the queue
 
         Args:
@@ -185,12 +187,22 @@ def _process_wrapper(root: Path, excluded_patterns: list[str], queue: Queue):
             watcher.stop()
 
 
+class ProcessWraperTask:
+    def __init__(self, root: Path, excluded_patterns: list[str], queue: Queue) -> None:
+        self.root = root
+        self.excluded_patterns = excluded_patterns
+        self.queue = queue
+
+    def run(self):
+        _process_wrapper(self.root, self.excluded_patterns, self.queue)
+
+
 class FileWatcherProcess:
     def __init__(self, root: Path, excluded_patterns: list[str]) -> None:
         self.queue: Queue = Queue()
+        task = ProcessWraperTask(root, excluded_patterns, self.queue)
         self.process = Process(
-            target=_process_wrapper,
-            args=(root, excluded_patterns, self.queue),
+            target=task.run,
             daemon=True,
         )
         self.process.start()

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()