fastled 1.3.36__tar.gz → 1.3.37__tar.gz

{fastled-1.3.36 → fastled-1.3.37}/PKG-INFO

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

{fastled-1.3.36 → fastled-1.3.37}/compiler/run.py

@@ -6,7 +6,7 @@ import warnings
 from pathlib import Path
 from typing import Tuple
 
-from fastled_wasm_compiler.compiler import Compiler
+from fastled_wasm_compiler import Compiler
 from fastled_wasm_compiler.paths import VOLUME_MAPPED_SRC
 
 _PORT = os.environ.get("PORT", 80)

fastled-1.3.37/requirements.docker.txt

@@ -0,0 +1 @@
+fastled-wasm-server>=1.0.97

fastled-1.3.37/src/fastled/__main__.py

@@ -0,0 +1,14 @@
+#!/usr/bin/env python3
+"""
+FastLED Package Main Entry Point
+Enables running the package as: python -m fastled
+"""
+
+import sys
+
+from fastled.cli import main
+
+if __name__ == "__main__":
+    # Pass execution to the main function from cli.py
+    # This enables 'python -m fastled' to work the same as 'fastled' command
+    sys.exit(main())

{fastled-1.3.36 → fastled-1.3.37}/src/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.3.36"
+__version__ = "1.3.37"
 
 __version_url_latest__ = "https://raw.githubusercontent.com/zackees/fastled-wasm/refs/heads/main/src/fastled/__version__.py"

fastled-1.3.37/src/fastled/string_diff.py

@@ -0,0 +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

{fastled-1.3.36 → fastled-1.3.37}/src/fastled/web_compile.py

@@ -294,8 +294,16 @@ def web_compile(
                 # Read stdout from out.txt if it exists
                 stdout_file = extract_path / "out.txt"
                 hash_file = extract_path / "hash.txt"
-                stdout = stdout_file.read_text() if stdout_file.exists() else ""
-                hash_value = hash_file.read_text() if hash_file.exists() else None
+                stdout = (
+                    stdout_file.read_text(encoding="utf-8", errors="replace")
+                    if stdout_file.exists()
+                    else ""
+                )
+                hash_value = (
+                    hash_file.read_text(encoding="utf-8", errors="replace")
+                    if hash_file.exists()
+                    else None
+                )
 
                 # now rezip the extracted files since we added the embedded json files
                 out_buffer = io.BytesIO()

{fastled-1.3.36 → fastled-1.3.37}/src/fastled.egg-info/PKG-INFO

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

{fastled-1.3.36 → fastled-1.3.37}/src/fastled.egg-info/SOURCES.txt

@@ -46,6 +46,7 @@ demo/micdemo.html
 demo/mp3upload.html
 demo/webgl_postprocessing_unreal_bloom.html
 src/fastled/__init__.py
+src/fastled/__main__.py
 src/fastled/__version__.py
 src/fastled/app.py
 src/fastled/args.py
@@ -109,6 +110,7 @@ tests/unit/test_project_init.py
 tests/unit/test_server_and_client_seperatly.py
 tests/unit/test_session_compile.py
 tests/unit/test_string_diff.py
+tests/unit/test_string_diff_comprehensive.py
 tests/unit/test_version.py
 tests/unit/test_webcompile.py
 tests/unit/html/index.html

{fastled-1.3.36 → fastled-1.3.37}/tests/unit/test_cli_no_platformio.py

@@ -110,6 +110,8 @@ class CLINoPlatformIOTest(unittest.TestCase):
                 cwd=WORKSPACE_ROOT,
                 capture_output=True,
                 text=True,
+                encoding="utf-8",
+                errors="replace",
                 timeout=180,  # 3 minutes timeout
             )