Fix pyrefly errors

Author: barisgit

kicad_lib_manager/config.py

@@ -274,16 +274,9 @@ def _normalize_libraries_field(self) -> None:
         # Validate and clean up each library entry
         normalized_libraries: List[LibraryDict] = []
         for lib in libraries:
-            if isinstance(lib, dict) and all(
-                key in lib for key in ["name", "path", "type"]
-            ):
-                # Ensure all values are strings
-                normalized_lib = _make_library_dict(
-                    name=str(lib["name"]),
-                    path=str(lib["path"]),
-                    type_=str(lib["type"]),
-                )
-                normalized_libraries.append(normalized_lib)
+            validated_lib = _validate_library_entry(lib)
+            if validated_lib is not None:
+                normalized_libraries.append(validated_lib)
             else:
                 click.echo(f"Warning: Skipping invalid library entry: {lib}", err=True)
 
@@ -312,16 +305,9 @@ def _get_normalized_libraries(self) -> List[LibraryDict]:
         needs_save = False
 
         for lib in libraries_raw:
-            if isinstance(lib, dict) and all(
-                key in lib for key in ["name", "path", "type"]
-            ):
-                # Ensure all values are strings
-                normalized_lib = _make_library_dict(
-                    name=str(lib["name"]),
-                    path=str(lib["path"]),
-                    type_=str(lib["type"]),
-                )
-                normalized_libraries.append(normalized_lib)
+            validated_lib = _validate_library_entry(lib)
+            if validated_lib is not None:
+                normalized_libraries.append(validated_lib)
             else:
                 click.echo(f"Warning: Skipping invalid library entry: {lib}", err=True)
                 needs_save = True
@@ -336,4 +322,17 @@ def _get_normalized_libraries(self) -> List[LibraryDict]:
 
 def _make_library_dict(name: str, path: str, type_: str) -> LibraryDict:
     """Typed constructor for `LibraryDict` to satisfy type checker."""
-    return cast("LibraryDict", {"name": name, "path": path, "type": type_})
+    return LibraryDict(name=name, path=path, type=type_)
+
+
+def _validate_library_entry(
+    lib: Union[Dict[str, str], LibraryDict],
+) -> Optional[LibraryDict]:
+    """Validate and normalize a library entry."""
+    if isinstance(lib, dict) and all(key in lib for key in ["name", "path", "type"]):
+        return _make_library_dict(
+            name=str(lib["name"]),
+            path=str(lib["path"]),
+            type_=str(lib["type"]),
+        )
+    return None

kicad_lib_manager/utils/template.py

@@ -276,7 +276,8 @@ def create_template_metadata(
         metadata["extends"] = extends
 
     if dependencies:
-        metadata["dependencies"] = {"recommended": dependencies}
+        deps_dict: Dict[str, Any] = {"recommended": dependencies}
+        metadata["dependencies"] = deps_dict
 
     return metadata
 
@@ -409,9 +410,9 @@ def create_template_structure(
     MAX_PATH_LENGTH = 512
 
     # Track main KiCad files
-    main_project_file = None
-    main_schematic_file = None
-    main_pcb_file = None
+    main_project_file: Optional[str] = None
+    main_schematic_file: Optional[str] = None
+    main_pcb_file: Optional[str] = None
 
     # First scan to find main KiCad files
     click.echo("Scanning for main KiCad files...")
@@ -430,31 +431,32 @@ def create_template_structure(
             continue
 
         # Look for KiCad files in the root directory
-        for file in files:
-            rel_path = str(Path(rel_root) / file)
-            git_path = rel_path.replace(os.sep, "/")
+        for file_name in files:
+            file_path = Path(rel_root) / file_name
+            rel_path_str = str(file_path)
+            git_path = rel_path_str.replace(os.sep, "/")
 
             # Skip gitignored files
-            if gitignore_spec and gitignore_spec.match_file(git_path):
+            if gitignore_spec is not None and gitignore_spec.match_file(git_path):
                 continue
 
             # Look for main files in the root directory or top-level folders
             if rel_root == "." or len(Path(rel_root).parts) <= 1:
-                file_lower = file.lower()
+                file_lower = file_name.lower()
 
                 if file_lower.endswith(KICAD_PROJECT_EXT) and not main_project_file:
-                    main_project_file = str(Path(root) / file)
-                    click.echo(f"Found main project file: {file}")
+                    main_project_file = str(Path(root) / file_name)
+                    click.echo(f"Found main project file: {file_name}")
 
                 elif (
                     file_lower.endswith(KICAD_SCHEMATIC_EXT) and not main_schematic_file
                 ):
-                    main_schematic_file = str(Path(root) / file)
-                    click.echo(f"Found main schematic file: {file}")
+                    main_schematic_file = str(Path(root) / file_name)
+                    click.echo(f"Found main schematic file: {file_name}")
 
                 elif file_lower.endswith(KICAD_PCB_EXT) and not main_pcb_file:
-                    main_pcb_file = str(Path(root) / file)
-                    click.echo(f"Found main PCB file: {file}")
+                    main_pcb_file = str(Path(root) / file_name)
+                    click.echo(f"Found main PCB file: {file_name}")
 
     # Copy files from source to template
     for root, dirs, files in os.walk(source_directory):
@@ -476,7 +478,7 @@ def create_template_structure(
 
             # Ensure proper path format for gitignore matching
             # (pathspec expects paths with forward slashes and trailing slash for directories)
-            git_path = rel_path.replace(os.sep, "/")
+            git_path = str(rel_path).replace(os.sep, "/")
             if not git_path.endswith("/"):
                 git_path += "/"
 
@@ -516,7 +518,7 @@ def create_template_structure(
             rel_path = Path(rel_root) / file
 
             # Ensure proper path format for gitignore matching
-            git_path = rel_path.replace(os.sep, "/")
+            git_path = str(rel_path).replace(os.sep, "/")
 
             # Skip gitignored files and additional excluded files
             if gitignore_spec and gitignore_spec.match_file(git_path):

tests/test_config_commands.py

@@ -2,16 +2,18 @@
 Tests for KiCad Library Manager config commands.
 """
 
+from typing import List
+
 import pytest
 from click.testing import CliRunner
 
 from kicad_lib_manager.cli import main
-from kicad_lib_manager.config import Config
+from kicad_lib_manager.config import Config, LibraryDict
 
 # Sample test data
-TEST_LIBRARIES = [
-    {"name": "test-github-lib", "path": "/path/to/github/library", "type": "github"},
-    {"name": "test-cloud-lib", "path": "/path/to/cloud/library", "type": "cloud"},
+TEST_LIBRARIES: List[LibraryDict] = [
+    LibraryDict(name="test-github-lib", path="/path/to/github/library", type="github"),
+    LibraryDict(name="test-cloud-lib", path="/path/to/cloud/library", type="cloud"),
 ]