fastled 1.4.13__py3-none-any.whl → 1.4.15__py3-none-any.whl

fastled/__version__.py

@@ -1,6 +1,6 @@
 # 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.4.13"
+__version__ = "1.4.15"
 
 __version_url_latest__ = "https://raw.githubusercontent.com/zackees/fastled-wasm/refs/heads/main/src/fastled/__version__.py"

fastled/docker_manager.py

@@ -980,6 +980,7 @@ class DockerManager:
     def purge(self, image_name: str) -> None:
         """
         Remove all containers and images associated with the given image name.
+        Also removes FastLED containers by name pattern (including test containers).
 
         Args:
             image_name: The name of the image to purge (without tag)
@@ -990,8 +991,27 @@ class DockerManager:
         try:
             containers = self.client.containers.list(all=True)
             for container in containers:
+                should_remove = False
+
+                # Check if container uses the specified image
                 if any(image_name in tag for tag in container.image.tags):
-                    print(f"Removing container {container.name}")
+                    should_remove = True
+                    print(
+                        f"Removing container {container.name} (uses image {image_name})"
+                    )
+
+                # Also check for FastLED container name patterns (including test containers)
+                elif any(
+                    pattern in container.name
+                    for pattern in [
+                        "fastled-wasm-container",
+                        "fastled-wasm-container-test",
+                    ]
+                ):
+                    should_remove = True
+                    print(f"Removing FastLED container {container.name}")
+
+                if should_remove:
                     container.remove(force=True)
 
         except Exception as e:

fastled/print_filter.py

@@ -1,52 +1,52 @@
-import re
-from abc import ABC, abstractmethod
-from enum import Enum
-
-
-class PrintFilter(ABC):
-    """Abstract base class for filtering text output."""
-
-    def __init__(self, echo: bool = True) -> None:
-        self.echo = echo
-
-    @abstractmethod
-    def filter(self, text: str) -> str:
-        """Filter the text according to implementation-specific rules."""
-        pass
-
-    def print(self, text: str | bytes) -> str:
-        """Prints the text to the console after filtering."""
-        if isinstance(text, bytes):
-            text = text.decode("utf-8")
-        text = self.filter(text)
-        if self.echo:
-            print(text, end="")
-        return text
-
-
-def _handle_ino_cpp(line: str) -> str:
-    if ".ino.cpp" in line[0:30]:
-        # Extract the filename without path and extension
-        match = re.search(r"src/([^/]+)\.ino\.cpp", line)
-        if match:
-            filename = match.group(1)
-            # Replace with examples/Filename/Filename.ino format
-            line = line.replace(
-                f"src/{filename}.ino.cpp", f"examples/{filename}/{filename}.ino"
-            )
-        else:
-            # Fall back to simple extension replacement if regex doesn't match
-            line = line.replace(".ino.cpp", ".ino")
-    return line
-
-
-class PrintFilterDefault(PrintFilter):
-    """Provides default filtering for FastLED output."""
-
-    def filter(self, text: str) -> str:
-        return text
-
-
-class CompileOrLink(Enum):
-    COMPILE = "compile"
-    LINK = "link"
+import re
+from abc import ABC, abstractmethod
+from enum import Enum
+
+
+class PrintFilter(ABC):
+    """Abstract base class for filtering text output."""
+
+    def __init__(self, echo: bool = True) -> None:
+        self.echo = echo
+
+    @abstractmethod
+    def filter(self, text: str) -> str:
+        """Filter the text according to implementation-specific rules."""
+        pass
+
+    def print(self, text: str | bytes) -> str:
+        """Prints the text to the console after filtering."""
+        if isinstance(text, bytes):
+            text = text.decode("utf-8")
+        text = self.filter(text)
+        if self.echo:
+            print(text, end="")
+        return text
+
+
+def _handle_ino_cpp(line: str) -> str:
+    if ".ino.cpp" in line[0:30]:
+        # Extract the filename without path and extension
+        match = re.search(r"src/([^/]+)\.ino\.cpp", line)
+        if match:
+            filename = match.group(1)
+            # Replace with examples/Filename/Filename.ino format
+            line = line.replace(
+                f"src/{filename}.ino.cpp", f"examples/{filename}/{filename}.ino"
+            )
+        else:
+            # Fall back to simple extension replacement if regex doesn't match
+            line = line.replace(".ino.cpp", ".ino")
+    return line
+
+
+class PrintFilterDefault(PrintFilter):
+    """Provides default filtering for FastLED output."""
+
+    def filter(self, text: str) -> str:
+        return text
+
+
+class CompileOrLink(Enum):
+    COMPILE = "compile"
+    LINK = "link"

fastled/settings.py

@@ -1,16 +1,58 @@
 import os
 import platform
+import sys
 
 FILE_CHANGED_DEBOUNCE_SECONDS = 2.0
 MACHINE = platform.machine().lower()
 IS_ARM: bool = "arm" in MACHINE or "aarch64" in MACHINE
 PLATFORM_TAG: str = "-arm64" if IS_ARM else ""
-CONTAINER_NAME = f"fastled-wasm-container{PLATFORM_TAG}"
+
+
+def _is_running_under_pytest() -> bool:
+    """Detect if we're running under pytest."""
+    # Check if pytest is in the loaded modules
+    if "pytest" in sys.modules:
+        return True
+
+    # Check for pytest environment variables
+    if "PYTEST_CURRENT_TEST" in os.environ:
+        return True
+
+    return False
+
+
+def _get_container_name() -> str:
+    """Get the appropriate container name based on runtime context."""
+    base_name = "fastled-wasm-container"
+
+    if _is_running_under_pytest():
+        # Use test container name when running under pytest
+        return f"{base_name}-test{PLATFORM_TAG}"
+    else:
+        # Use regular container name
+        return f"{base_name}{PLATFORM_TAG}"
+
+
+def _get_server_port() -> int:
+    """Get the appropriate server port based on runtime context."""
+    if _is_running_under_pytest():
+        # Use test port when running under pytest to avoid conflicts
+        return 9022
+    else:
+        # Use regular port
+        return 9021
+
+
+CONTAINER_NAME = _get_container_name()
 DEFAULT_URL = str(os.environ.get("FASTLED_URL", "https://fastled.onrender.com"))
-SERVER_PORT = 9021
+SERVER_PORT = _get_server_port()
 
 IMAGE_NAME = "niteris/fastled-wasm"
-DEFAULT_CONTAINER_NAME = "fastled-wasm-container"
+DEFAULT_CONTAINER_NAME = (
+    "fastled-wasm-container-test"
+    if _is_running_under_pytest()
+    else "fastled-wasm-container"
+)
 # IMAGE_TAG = "latest"
 
 DOCKER_FILE = (

fastled/string_diff.py

@@ -1,165 +1,165 @@
-from pathlib import Path
-
-from rapidfuzz import fuzz
-
-
-def _filter_out_obvious_bad_choices(
-    input_str: str, string_list: list[str]
-) -> list[str]:
-    """
-    Filter out strings that are too different from the input string.
-    This is a heuristic and may not be perfect.
-    """
-    if not input_str.strip():  # Handle empty input
-        return string_list
-
-    input_chars = set(input_str.lower())
-    filtered_list = []
-    for s in string_list:
-        # Check if at least half of the input characters are in the string
-        s_chars = set(s.lower())
-        common_chars = input_chars.intersection(s_chars)
-        if len(common_chars) >= len(input_chars) / 2:
-            filtered_list.append(s)
-    return filtered_list
-
-
-def is_in_order_match(input_str: str, other: str) -> bool:
-    """
-    Check if the input string is an in-order match for any string in the list.
-    An in-order match means that the characters of the input string appear
-    in the same order in the string from the list, ignoring spaces in the input.
-    """
-
-    # Remove spaces from input string for matching
-    input_chars = [c.lower() for c in input_str if c != " "]
-    other_chars = [c.lower() for c in other]
-    input_index = 0
-    other_index = 0
-    while input_index < len(input_chars) and other_index < len(other_chars):
-        if input_chars[input_index] == other_chars[other_index]:
-            input_index += 1
-        other_index += 1
-    # If we reached the end of the input string, it means all characters were found in order
-    if input_index == len(input_chars):
-        return True
-    return False
-
-
-# Returns the min distance strings. If there is a tie, it returns
-# all the strings that have the same min distance.
-# Returns a tuple of index and string.
-def string_diff(
-    input_string: str, string_list: list[str], ignore_case=True
-) -> list[tuple[float, str]]:
-
-    def normalize(s: str) -> str:
-        return s.lower() if ignore_case else s
-
-    # Handle empty input or empty list
-    if not input_string.strip():
-        # Return all strings with equal distance for empty input
-        return [(i, s) for i, s in enumerate(string_list)]
-
-    if not string_list:
-        return []
-
-    map_string: dict[str, str] = {}
-
-    if ignore_case:
-        map_string = {s.lower(): s for s in string_list}
-    else:
-        map_string = {s: s for s in string_list}
-
-    original_string_list = string_list.copy()
-    if ignore_case:
-        string_list = [s.lower() for s in string_list]
-        input_string = input_string.lower()
-
-    # Check for exact matches, but also check if there are other substring matches
-    exact_matches = [s for s in string_list if s == input_string]
-    substring_matches = [s for s in string_list if input_string in s]
-
-    # If there's an exact match AND other substring matches, return all substring matches
-    # This provides better user experience for partial matching
-    if exact_matches and len(substring_matches) > 1:
-        out: list[tuple[float, str]] = []
-        for i, s in enumerate(substring_matches):
-            s_mapped = map_string.get(s, s)
-            out.append((i, s_mapped))
-        return out
-
-    # If there's only an exact match and no other substring matches, return just the exact match
-    if exact_matches and len(substring_matches) == 1:
-        out: list[tuple[float, str]] = []
-        for i, s in enumerate(exact_matches):
-            s_mapped = map_string.get(s, s)
-            out.append((i, s_mapped))
-        return out
-
-    # Apply set membership filtering for queries with 3+ characters
-    if len(input_string.strip()) >= 3:
-        filtered = _filter_out_obvious_bad_choices(input_string, string_list)
-        if filtered:  # Only apply filter if it doesn't eliminate everything
-            string_list = filtered
-
-    # Second filter: exact substring filtering if applicable
-    if substring_matches:
-        string_list = substring_matches
-        # Return all substring matches
-        out: list[tuple[float, str]] = []
-        for i, s in enumerate(string_list):
-            s_mapped = map_string.get(s, s)
-            out.append((i, s_mapped))
-        return out
-
-    # Third filter: in order exact match filtering if applicable.
-    in_order_matches = [s for s in string_list if is_in_order_match(input_string, s)]
-    if in_order_matches:
-        string_list = in_order_matches
-
-    # Calculate distances
-    distances: list[float] = []
-    for s in string_list:
-        dist = fuzz.token_sort_ratio(normalize(input_string), normalize(s))
-        distances.append(1.0 / (dist + 1.0))
-
-    # Handle case where no strings remain after filtering
-    if not distances:
-        # Fall back to original list and calculate distances
-        string_list = original_string_list.copy()
-        if ignore_case:
-            string_list = [s.lower() for s in string_list]
-
-        distances = []
-        for s in string_list:
-            dist = fuzz.token_sort_ratio(normalize(input_string), normalize(s))
-            distances.append(1.0 / (dist + 1.0))
-
-    min_distance = min(distances)
-    out: list[tuple[float, str]] = []
-    for i, d in enumerate(distances):
-        if d == min_distance:
-            s = string_list[i]
-            s_mapped = map_string.get(s, s)
-            out.append((i, s_mapped))
-
-    return out
-
-
-def string_diff_paths(
-    input_string: str | Path, path_list: list[Path], ignore_case=True
-) -> list[tuple[float, Path]]:
-    # Normalize path separators to forward slashes for consistent comparison
-    string_list = [str(p).replace("\\", "/") for p in path_list]
-    input_str = str(input_string).replace("\\", "/")
-
-    tmp = string_diff(input_str, string_list, ignore_case)
-    out: list[tuple[float, Path]] = []
-    for i, j in tmp:
-        # Find the original path that matches the normalized result
-        for idx, orig_path in enumerate(path_list):
-            if str(orig_path).replace("\\", "/") == j:
-                out.append((i, orig_path))
-                break
-    return out
+from pathlib import Path
+
+from rapidfuzz import fuzz
+
+
+def _filter_out_obvious_bad_choices(
+    input_str: str, string_list: list[str]
+) -> list[str]:
+    """
+    Filter out strings that are too different from the input string.
+    This is a heuristic and may not be perfect.
+    """
+    if not input_str.strip():  # Handle empty input
+        return string_list
+
+    input_chars = set(input_str.lower())
+    filtered_list = []
+    for s in string_list:
+        # Check if at least half of the input characters are in the string
+        s_chars = set(s.lower())
+        common_chars = input_chars.intersection(s_chars)
+        if len(common_chars) >= len(input_chars) / 2:
+            filtered_list.append(s)
+    return filtered_list
+
+
+def is_in_order_match(input_str: str, other: str) -> bool:
+    """
+    Check if the input string is an in-order match for any string in the list.
+    An in-order match means that the characters of the input string appear
+    in the same order in the string from the list, ignoring spaces in the input.
+    """
+
+    # Remove spaces from input string for matching
+    input_chars = [c.lower() for c in input_str if c != " "]
+    other_chars = [c.lower() for c in other]
+    input_index = 0
+    other_index = 0
+    while input_index < len(input_chars) and other_index < len(other_chars):
+        if input_chars[input_index] == other_chars[other_index]:
+            input_index += 1
+        other_index += 1
+    # If we reached the end of the input string, it means all characters were found in order
+    if input_index == len(input_chars):
+        return True
+    return False
+
+
+# Returns the min distance strings. If there is a tie, it returns
+# all the strings that have the same min distance.
+# Returns a tuple of index and string.
+def string_diff(
+    input_string: str, string_list: list[str], ignore_case=True
+) -> list[tuple[float, str]]:
+
+    def normalize(s: str) -> str:
+        return s.lower() if ignore_case else s
+
+    # Handle empty input or empty list
+    if not input_string.strip():
+        # Return all strings with equal distance for empty input
+        return [(i, s) for i, s in enumerate(string_list)]
+
+    if not string_list:
+        return []
+
+    map_string: dict[str, str] = {}
+
+    if ignore_case:
+        map_string = {s.lower(): s for s in string_list}
+    else:
+        map_string = {s: s for s in string_list}
+
+    original_string_list = string_list.copy()
+    if ignore_case:
+        string_list = [s.lower() for s in string_list]
+        input_string = input_string.lower()
+
+    # Check for exact matches, but also check if there are other substring matches
+    exact_matches = [s for s in string_list if s == input_string]
+    substring_matches = [s for s in string_list if input_string in s]
+
+    # If there's an exact match AND other substring matches, return all substring matches
+    # This provides better user experience for partial matching
+    if exact_matches and len(substring_matches) > 1:
+        out: list[tuple[float, str]] = []
+        for i, s in enumerate(substring_matches):
+            s_mapped = map_string.get(s, s)
+            out.append((i, s_mapped))
+        return out
+
+    # If there's only an exact match and no other substring matches, return just the exact match
+    if exact_matches and len(substring_matches) == 1:
+        out: list[tuple[float, str]] = []
+        for i, s in enumerate(exact_matches):
+            s_mapped = map_string.get(s, s)
+            out.append((i, s_mapped))
+        return out
+
+    # Apply set membership filtering for queries with 3+ characters
+    if len(input_string.strip()) >= 3:
+        filtered = _filter_out_obvious_bad_choices(input_string, string_list)
+        if filtered:  # Only apply filter if it doesn't eliminate everything
+            string_list = filtered
+
+    # Second filter: exact substring filtering if applicable
+    if substring_matches:
+        string_list = substring_matches
+        # Return all substring matches
+        out: list[tuple[float, str]] = []
+        for i, s in enumerate(string_list):
+            s_mapped = map_string.get(s, s)
+            out.append((i, s_mapped))
+        return out
+
+    # Third filter: in order exact match filtering if applicable.
+    in_order_matches = [s for s in string_list if is_in_order_match(input_string, s)]
+    if in_order_matches:
+        string_list = in_order_matches
+
+    # Calculate distances
+    distances: list[float] = []
+    for s in string_list:
+        dist = fuzz.token_sort_ratio(normalize(input_string), normalize(s))
+        distances.append(1.0 / (dist + 1.0))
+
+    # Handle case where no strings remain after filtering
+    if not distances:
+        # Fall back to original list and calculate distances
+        string_list = original_string_list.copy()
+        if ignore_case:
+            string_list = [s.lower() for s in string_list]
+
+        distances = []
+        for s in string_list:
+            dist = fuzz.token_sort_ratio(normalize(input_string), normalize(s))
+            distances.append(1.0 / (dist + 1.0))
+
+    min_distance = min(distances)
+    out: list[tuple[float, str]] = []
+    for i, d in enumerate(distances):
+        if d == min_distance:
+            s = string_list[i]
+            s_mapped = map_string.get(s, s)
+            out.append((i, s_mapped))
+
+    return out
+
+
+def string_diff_paths(
+    input_string: str | Path, path_list: list[Path], ignore_case=True
+) -> list[tuple[float, Path]]:
+    # Normalize path separators to forward slashes for consistent comparison
+    string_list = [str(p).replace("\\", "/") for p in path_list]
+    input_str = str(input_string).replace("\\", "/")
+
+    tmp = string_diff(input_str, string_list, ignore_case)
+    out: list[tuple[float, Path]] = []
+    for i, j in tmp:
+        # Find the original path that matches the normalized result
+        for idx, orig_path in enumerate(path_list):
+            if str(orig_path).replace("\\", "/") == j:
+                out.append((i, orig_path))
+                break
+    return out

fastled/version.py

@@ -1,41 +1,41 @@
-from concurrent.futures import Future, ThreadPoolExecutor
-
-import httpx
-
-from fastled.__version__ import __version_url_latest__
-
-
-def _fetch_version() -> str | Exception:
-    """
-    Helper function to fetch the latest version from the GitHub repository.
-    """
-    try:
-        response = httpx.get(__version_url_latest__)
-        response.raise_for_status()
-        # Extract the version string from the response text
-        version_line = response.text.split("__version__ = ")[1].split('"')[1]
-        return version_line
-    except Exception as e:
-        return e
-
-
-def get_latest_version() -> Future[str | Exception]:
-    """
-    Fetch the latest version from the GitHub repository.
-    Returns a future that will resolve with the version string or an exception.
-    """
-    executor = ThreadPoolExecutor()
-    return executor.submit(_fetch_version)
-
-
-def unit_test() -> None:
-    future = get_latest_version()
-    latest_version = future.result()  # Wait for the future to complete
-    if isinstance(latest_version, Exception):
-        print(f"Error fetching latest version: {latest_version}")
-    else:
-        print(f"Latest version: {latest_version}")
-
-
-if __name__ == "__main__":
-    unit_test()
+from concurrent.futures import Future, ThreadPoolExecutor
+
+import httpx
+
+from fastled.__version__ import __version_url_latest__
+
+
+def _fetch_version() -> str | Exception:
+    """
+    Helper function to fetch the latest version from the GitHub repository.
+    """
+    try:
+        response = httpx.get(__version_url_latest__)
+        response.raise_for_status()
+        # Extract the version string from the response text
+        version_line = response.text.split("__version__ = ")[1].split('"')[1]
+        return version_line
+    except Exception as e:
+        return e
+
+
+def get_latest_version() -> Future[str | Exception]:
+    """
+    Fetch the latest version from the GitHub repository.
+    Returns a future that will resolve with the version string or an exception.
+    """
+    executor = ThreadPoolExecutor()
+    return executor.submit(_fetch_version)
+
+
+def unit_test() -> None:
+    future = get_latest_version()
+    latest_version = future.result()  # Wait for the future to complete
+    if isinstance(latest_version, Exception):
+        print(f"Error fetching latest version: {latest_version}")
+    else:
+        print(f"Latest version: {latest_version}")
+
+
+if __name__ == "__main__":
+    unit_test()

fastled/web_compile.py

@@ -47,10 +47,10 @@ def _check_embedded_http_status(response_content: bytes) -> tuple[bool, int | No
         lines = content_str.strip().split("\n")
         if lines:
             last_line = lines[-1].strip()
-            if last_line.startswith("HTTP_STATUS:"):
-                # Extract the status code
+            if "HTTP_STATUS:" in last_line:
                 try:
-                    status_code = int(last_line.split(":", 1)[1].strip())
+                    right = last_line.split("HTTP_STATUS:")[-1].strip()
+                    status_code = int(right)
                     return True, status_code
                 except (ValueError, IndexError):
                     # Malformed status line
@@ -296,10 +296,20 @@ def web_compile(
 
                 # Check HTTP response status first
                 if libfastled_response.status_code != 200:
-                    print(
-                        f"Warning: libfastled compilation failed with HTTP status {libfastled_response.status_code}"
+                    msg = f"Error: libfastled compilation failed with HTTP status {libfastled_response.status_code}"
+
+                    # Error out here, this is a critical error
+                    stdout = libfastled_response.content
+                    if stdout is not None:
+                        stdout = stdout.decode("utf-8", errors="replace") + "\n" + msg
+                    else:
+                        stdout = msg
+                    return CompileResult(
+                        success=False,
+                        stdout=stdout,
+                        hash_value=None,
+                        zip_bytes=b"",
                     )
-                    # Continue with sketch compilation even if libfastled fails
                 else:
                     # Check for embedded HTTP status in response content
                     has_embedded_status, embedded_status = _check_embedded_http_status(