kicad-sch-api 0.4.0__py3-none-any.whl → 0.4.1__py3-none-any.whl

kicad_sch_api/core/factories/element_factory.py

@@ -0,0 +1,276 @@
+"""
+Element Factory for creating schematic elements from dictionaries.
+
+Centralizes object creation logic that was previously duplicated in Schematic.__init__.
+"""
+
+import uuid
+from typing import Any, Dict, List
+
+from ..types import (
+    HierarchicalLabelShape,
+    Junction,
+    Label,
+    LabelType,
+    Net,
+    NoConnect,
+    Point,
+    Text,
+    Wire,
+    WireType,
+)
+
+
+def point_from_dict_or_tuple(position: Any) -> Point:
+    """Convert position data (dict or tuple) to Point object."""
+    if isinstance(position, dict):
+        return Point(position.get("x", 0), position.get("y", 0))
+    elif isinstance(position, (list, tuple)):
+        return Point(position[0], position[1])
+    elif isinstance(position, Point):
+        return position
+    else:
+        return Point(0, 0)
+
+
+class ElementFactory:
+    """Factory for creating schematic elements from dictionary data."""
+
+    @staticmethod
+    def create_wire(wire_dict: Dict[str, Any]) -> Wire:
+        """
+        Create Wire object from dictionary.
+
+        Args:
+            wire_dict: Dictionary containing wire data
+
+        Returns:
+            Wire object
+        """
+        points = []
+        for point_data in wire_dict.get("points", []):
+            if isinstance(point_data, dict):
+                points.append(Point(point_data["x"], point_data["y"]))
+            elif isinstance(point_data, (list, tuple)):
+                points.append(Point(point_data[0], point_data[1]))
+            else:
+                points.append(point_data)
+
+        return Wire(
+            uuid=wire_dict.get("uuid", str(uuid.uuid4())),
+            points=points,
+            wire_type=WireType(wire_dict.get("wire_type", "wire")),
+            stroke_width=wire_dict.get("stroke_width", 0.0),
+            stroke_type=wire_dict.get("stroke_type", "default"),
+        )
+
+    @staticmethod
+    def create_junction(junction_dict: Dict[str, Any]) -> Junction:
+        """
+        Create Junction object from dictionary.
+
+        Args:
+            junction_dict: Dictionary containing junction data
+
+        Returns:
+            Junction object
+        """
+        position = junction_dict.get("position", {"x": 0, "y": 0})
+        pos = point_from_dict_or_tuple(position)
+
+        return Junction(
+            uuid=junction_dict.get("uuid", str(uuid.uuid4())),
+            position=pos,
+            diameter=junction_dict.get("diameter", 0),
+            color=junction_dict.get("color", (0, 0, 0, 0)),
+        )
+
+    @staticmethod
+    def create_text(text_dict: Dict[str, Any]) -> Text:
+        """
+        Create Text object from dictionary.
+
+        Args:
+            text_dict: Dictionary containing text data
+
+        Returns:
+            Text object
+        """
+        position = text_dict.get("position", {"x": 0, "y": 0})
+        pos = point_from_dict_or_tuple(position)
+
+        return Text(
+            uuid=text_dict.get("uuid", str(uuid.uuid4())),
+            position=pos,
+            text=text_dict.get("text", ""),
+            rotation=text_dict.get("rotation", 0.0),
+            size=text_dict.get("size", 1.27),
+            exclude_from_sim=text_dict.get("exclude_from_sim", False),
+        )
+
+    @staticmethod
+    def create_label(label_dict: Dict[str, Any]) -> Label:
+        """
+        Create Label object from dictionary.
+
+        Args:
+            label_dict: Dictionary containing label data
+
+        Returns:
+            Label object
+        """
+        position = label_dict.get("position", {"x": 0, "y": 0})
+        pos = point_from_dict_or_tuple(position)
+
+        return Label(
+            uuid=label_dict.get("uuid", str(uuid.uuid4())),
+            position=pos,
+            text=label_dict.get("text", ""),
+            label_type=LabelType(label_dict.get("label_type", "local")),
+            rotation=label_dict.get("rotation", 0.0),
+            size=label_dict.get("size", 1.27),
+            shape=(
+                HierarchicalLabelShape(label_dict.get("shape"))
+                if label_dict.get("shape")
+                else None
+            ),
+        )
+
+    @staticmethod
+    def create_no_connect(no_connect_dict: Dict[str, Any]) -> NoConnect:
+        """
+        Create NoConnect object from dictionary.
+
+        Args:
+            no_connect_dict: Dictionary containing no-connect data
+
+        Returns:
+            NoConnect object
+        """
+        position = no_connect_dict.get("position", {"x": 0, "y": 0})
+        pos = point_from_dict_or_tuple(position)
+
+        return NoConnect(
+            uuid=no_connect_dict.get("uuid", str(uuid.uuid4())),
+            position=pos,
+        )
+
+    @staticmethod
+    def create_net(net_dict: Dict[str, Any]) -> Net:
+        """
+        Create Net object from dictionary.
+
+        Args:
+            net_dict: Dictionary containing net data
+
+        Returns:
+            Net object
+        """
+        return Net(
+            name=net_dict.get("name", ""),
+            components=net_dict.get("components", []),
+            wires=net_dict.get("wires", []),
+            labels=net_dict.get("labels", []),
+        )
+
+    @staticmethod
+    def create_wires_from_list(wire_data: List[Any]) -> List[Wire]:
+        """
+        Create list of Wire objects from list of dictionaries.
+
+        Args:
+            wire_data: List of wire dictionaries
+
+        Returns:
+            List of Wire objects
+        """
+        wires = []
+        for wire_dict in wire_data:
+            if isinstance(wire_dict, dict):
+                wires.append(ElementFactory.create_wire(wire_dict))
+        return wires
+
+    @staticmethod
+    def create_junctions_from_list(junction_data: List[Any]) -> List[Junction]:
+        """
+        Create list of Junction objects from list of dictionaries.
+
+        Args:
+            junction_data: List of junction dictionaries
+
+        Returns:
+            List of Junction objects
+        """
+        junctions = []
+        for junction_dict in junction_data:
+            if isinstance(junction_dict, dict):
+                junctions.append(ElementFactory.create_junction(junction_dict))
+        return junctions
+
+    @staticmethod
+    def create_texts_from_list(text_data: List[Any]) -> List[Text]:
+        """
+        Create list of Text objects from list of dictionaries.
+
+        Args:
+            text_data: List of text dictionaries
+
+        Returns:
+            List of Text objects
+        """
+        texts = []
+        for text_dict in text_data:
+            if isinstance(text_dict, dict):
+                texts.append(ElementFactory.create_text(text_dict))
+        return texts
+
+    @staticmethod
+    def create_labels_from_list(label_data: List[Any]) -> List[Label]:
+        """
+        Create list of Label objects from list of dictionaries.
+
+        Args:
+            label_data: List of label dictionaries
+
+        Returns:
+            List of Label objects
+        """
+        labels = []
+        for label_dict in label_data:
+            if isinstance(label_dict, dict):
+                labels.append(ElementFactory.create_label(label_dict))
+        return labels
+
+    @staticmethod
+    def create_no_connects_from_list(no_connect_data: List[Any]) -> List[NoConnect]:
+        """
+        Create list of NoConnect objects from list of dictionaries.
+
+        Args:
+            no_connect_data: List of no-connect dictionaries
+
+        Returns:
+            List of NoConnect objects
+        """
+        no_connects = []
+        for no_connect_dict in no_connect_data:
+            if isinstance(no_connect_dict, dict):
+                no_connects.append(ElementFactory.create_no_connect(no_connect_dict))
+        return no_connects
+
+    @staticmethod
+    def create_nets_from_list(net_data: List[Any]) -> List[Net]:
+        """
+        Create list of Net objects from list of dictionaries.
+
+        Args:
+            net_data: List of net dictionaries
+
+        Returns:
+            List of Net objects
+        """
+        nets = []
+        for net_dict in net_data:
+            if isinstance(net_dict, dict):
+                nets.append(ElementFactory.create_net(net_dict))
+        return nets

kicad_sch_api/core/junctions.py

@@ -9,55 +9,34 @@ import logging
 import uuid as uuid_module
 from typing import Any, Dict, List, Optional, Tuple, Union
 
+from .collections import BaseCollection
 from .types import Junction, Point
 
 logger = logging.getLogger(__name__)
 
 
-class JunctionCollection:
+class JunctionCollection(BaseCollection[Junction]):
     """
     Professional junction collection with enhanced management features.
 
+    Inherits from BaseCollection for standard operations and adds junction-specific
+    functionality.
+
     Features:
-    - Fast UUID-based lookup and indexing
+    - Fast UUID-based lookup and indexing (inherited)
     - Position-based junction queries
-    - Bulk operations for performance
+    - Bulk operations for performance (inherited)
     - Validation and conflict detection
     """
 
-    def __init__(self, junctions: Optional[List[Junction]] = None):
+    def __init__(self, junctions: Optional[List[Junction]] = None) -> None:
         """
         Initialize junction collection.
 
         Args:
             junctions: Initial list of junctions
         """
-        self._junctions: List[Junction] = junctions or []
-        self._uuid_index: Dict[str, int] = {}
-        self._modified = False
-
-        # Build UUID index
-        self._rebuild_index()
-
-        logger.debug(f"JunctionCollection initialized with {len(self._junctions)} junctions")
-
-    def _rebuild_index(self):
-        """Rebuild UUID index for fast lookups."""
-        self._uuid_index = {junction.uuid: i for i, junction in enumerate(self._junctions)}
-
-    def __len__(self) -> int:
-        """Number of junctions in collection."""
-        return len(self._junctions)
-
-    def __iter__(self):
-        """Iterate over junctions."""
-        return iter(self._junctions)
-
-    def __getitem__(self, uuid: str) -> Junction:
-        """Get junction by UUID."""
-        if uuid not in self._uuid_index:
-            raise KeyError(f"Junction with UUID '{uuid}' not found")
-        return self._junctions[self._uuid_index[uuid]]
+        super().__init__(junctions, collection_name="junctions")
 
     def add(
         self,
@@ -94,35 +73,12 @@ class JunctionCollection:
         # Create junction
         junction = Junction(uuid=uuid, position=position, diameter=diameter, color=color)
 
-        # Add to collection
-        self._junctions.append(junction)
-        self._uuid_index[uuid] = len(self._junctions) - 1
-        self._modified = True
+        # Add to collection using base class method
+        self._add_item(junction)
 
         logger.debug(f"Added junction at {position}, UUID={uuid}")
         return uuid
 
-    def remove(self, uuid: str) -> bool:
-        """
-        Remove junction by UUID.
-
-        Args:
-            uuid: Junction UUID to remove
-
-        Returns:
-            True if junction was removed, False if not found
-        """
-        if uuid not in self._uuid_index:
-            return False
-
-        index = self._uuid_index[uuid]
-        del self._junctions[index]
-        self._rebuild_index()
-        self._modified = True
-
-        logger.debug(f"Removed junction: {uuid}")
-        return True
-
     def get_at_position(
         self, position: Union[Point, Tuple[float, float]], tolerance: float = 0.01
     ) -> Optional[Junction]:
@@ -139,7 +95,7 @@ class JunctionCollection:
         if isinstance(position, tuple):
             position = Point(position[0], position[1])
 
-        for junction in self._junctions:
+        for junction in self._items:
             if junction.position.distance_to(position) <= tolerance:
                 return junction
 
@@ -162,40 +118,35 @@ class JunctionCollection:
             point = Point(point[0], point[1])
 
         matching_junctions = []
-        for junction in self._junctions:
+        for junction in self._items:
             if junction.position.distance_to(point) <= tolerance:
                 matching_junctions.append(junction)
 
         return matching_junctions
 
     def get_statistics(self) -> Dict[str, Any]:
-        """Get junction collection statistics."""
-        if not self._junctions:
-            return {"total_junctions": 0, "avg_diameter": 0, "positions": []}
+        """Get junction collection statistics (extends base statistics)."""
+        base_stats = super().get_statistics()
+        if not self._items:
+            return {**base_stats, "total_junctions": 0, "avg_diameter": 0, "positions": []}
 
-        avg_diameter = sum(j.diameter for j in self._junctions) / len(self._junctions)
-        positions = [(j.position.x, j.position.y) for j in self._junctions]
+        avg_diameter = sum(j.diameter for j in self._items) / len(self._items)
+        positions = [(j.position.x, j.position.y) for j in self._items]
 
         return {
-            "total_junctions": len(self._junctions),
+            **base_stats,
+            "total_junctions": len(self._items),
             "avg_diameter": avg_diameter,
             "positions": positions,
-            "unique_diameters": len(set(j.diameter for j in self._junctions)),
-            "unique_colors": len(set(j.color for j in self._junctions)),
+            "unique_diameters": len(set(j.diameter for j in self._items)),
+            "unique_colors": len(set(j.color for j in self._items)),
         }
 
-    def clear(self):
-        """Remove all junctions from collection."""
-        self._junctions.clear()
-        self._uuid_index.clear()
-        self._modified = True
-        logger.debug("Cleared all junctions")
-
     @property
     def modified(self) -> bool:
         """Check if collection has been modified."""
-        return self._modified
+        return self.is_modified()
 
-    def mark_saved(self):
+    def mark_saved(self) -> None:
         """Mark collection as saved (reset modified flag)."""
-        self._modified = False
+        self.reset_modified_flag()

kicad_sch_api/core/labels.py

@@ -10,6 +10,7 @@ import uuid
 from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple, Union
 
 from ..utils.validation import SchematicValidator, ValidationError, ValidationIssue
+from .collections import BaseCollection
 from .types import Label, Point
 
 logger = logging.getLogger(__name__)
@@ -114,10 +115,13 @@ class LabelElement:
         return f"<Label '{self.text}' @ {self.position}>"
 
 
-class LabelCollection:
+class LabelCollection(BaseCollection[LabelElement]):
     """
     Collection class for efficient label element management.
 
+    Inherits from BaseCollection for standard operations and adds label-specific
+    functionality including text-based indexing.
+
     Provides fast lookup, filtering, and bulk operations for schematic label elements.
     """
 
@@ -128,18 +132,17 @@ class LabelCollection:
         Args:
             labels: Initial list of label data
         """
-        self._labels: List[LabelElement] = []
-        self._uuid_index: Dict[str, LabelElement] = {}
+        # Initialize base collection
+        super().__init__([], collection_name="labels")
+
+        # Additional label-specific index
         self._text_index: Dict[str, List[LabelElement]] = {}
-        self._modified = False
 
         # Add initial labels
         if labels:
             for label_data in labels:
                 self._add_to_indexes(LabelElement(label_data, self))
 
-        logger.debug(f"LabelCollection initialized with {len(self._labels)} labels")
-
     def add(
         self,
         text: str,
@@ -201,9 +204,7 @@ class LabelCollection:
         logger.debug(f"Added label: {label_element}")
         return label_element
 
-    def get(self, label_uuid: str) -> Optional[LabelElement]:
-        """Get label by UUID."""
-        return self._uuid_index.get(label_uuid)
+    # get() method inherited from BaseCollection
 
     def get_by_text(self, text: str) -> List[LabelElement]:
         """Get all labels with the given text."""
@@ -219,13 +220,19 @@ class LabelCollection:
         Returns:
             True if label was removed, False if not found
         """
-        label_element = self._uuid_index.get(label_uuid)
+        label_element = self.get(label_uuid)
         if not label_element:
             return False
 
-        # Remove from indexes
-        self._remove_from_indexes(label_element)
-        self._mark_modified()
+        # Remove from text index
+        text = label_element.text
+        if text in self._text_index:
+            self._text_index[text].remove(label_element)
+            if not self._text_index[text]:
+                del self._text_index[text]
+
+        # Remove using base class method
+        super().remove(label_uuid)
 
         logger.debug(f"Removed label: {label_element}")
         return True
@@ -245,7 +252,7 @@ class LabelCollection:
             return self._text_index.get(text, []).copy()
         else:
             matches = []
-            for label_element in self._labels:
+            for label_element in self._items:
                 if text.lower() in label_element.text.lower():
                     matches.append(label_element)
             return matches
@@ -260,7 +267,7 @@ class LabelCollection:
         Returns:
             List of labels matching predicate
         """
-        return [label for label in self._labels if predicate(label)]
+        return [label for label in self._items if predicate(label)]
 
     def bulk_update(self, criteria: Callable[[LabelElement], bool], updates: Dict[str, Any]):
         """
@@ -271,7 +278,7 @@ class LabelCollection:
             updates: Dictionary of property updates
         """
         updated_count = 0
-        for label_element in self._labels:
+        for label_element in self._items:
             if criteria(label_element):
                 for prop, value in updates.items():
                     if hasattr(label_element, prop):
@@ -284,15 +291,12 @@ class LabelCollection:
 
     def clear(self):
         """Remove all labels from collection."""
-        self._labels.clear()
-        self._uuid_index.clear()
         self._text_index.clear()
-        self._mark_modified()
+        super().clear()
 
     def _add_to_indexes(self, label_element: LabelElement):
-        """Add label to internal indexes."""
-        self._labels.append(label_element)
-        self._uuid_index[label_element.uuid] = label_element
+        """Add label to internal indexes (base + text index)."""
+        self._add_item(label_element)
 
         # Add to text index
         text = label_element.text
@@ -300,18 +304,6 @@ class LabelCollection:
             self._text_index[text] = []
         self._text_index[text].append(label_element)
 
-    def _remove_from_indexes(self, label_element: LabelElement):
-        """Remove label from internal indexes."""
-        self._labels.remove(label_element)
-        del self._uuid_index[label_element.uuid]
-
-        # Remove from text index
-        text = label_element.text
-        if text in self._text_index:
-            self._text_index[text].remove(label_element)
-            if not self._text_index[text]:
-                del self._text_index[text]
-
     def _update_text_index(self, old_text: str, label_element: LabelElement):
         """Update text index when label text changes."""
         # Remove from old text index
@@ -326,23 +318,7 @@ class LabelCollection:
             self._text_index[new_text] = []
         self._text_index[new_text].append(label_element)
 
-    def _mark_modified(self):
-        """Mark collection as modified."""
-        self._modified = True
-
-    # Collection interface methods
-    def __len__(self) -> int:
-        """Return number of labels."""
-        return len(self._labels)
-
-    def __iter__(self) -> Iterator[LabelElement]:
-        """Iterate over labels."""
-        return iter(self._labels)
-
-    def __getitem__(self, index: int) -> LabelElement:
-        """Get label by index."""
-        return self._labels[index]
-
+    # Collection interface methods - __len__, __iter__, __getitem__ inherited from BaseCollection
     def __bool__(self) -> bool:
         """Return True if collection has labels."""
-        return len(self._labels) > 0
+        return len(self._items) > 0

kicad_sch_api/core/managers/file_io.py

@@ -11,6 +11,7 @@ from pathlib import Path
 from typing import Any, Dict, Optional, Union
 
 from ...utils.validation import ValidationError
+from ..config import config
 from ..formatter import ExactFormatter
 from ..parser import SExpressionParser
 
@@ -219,9 +220,9 @@ class FileIOManager:
         return {
             "kicad_sch": {
                 "version": 20230819,
-                "generator": "kicad-sch-api",
+                "generator": config.file_format.generator_default,
                 "uuid": None,  # Will be set by calling code
-                "paper": "A4",
+                "paper": config.paper.default,
                 "lib_symbols": {},
                 "symbol": [],
                 "wire": [],

kicad_sch_api/core/managers/metadata.py

@@ -39,10 +39,10 @@ class MetadataManager:
         Args:
             paper: Paper size (e.g., "A4", "A3", "Letter", "Legal")
         """
-        valid_sizes = ["A4", "A3", "A2", "A1", "A0", "Letter", "Legal", "Tabloid"]
+        from ..config import config
 
-        if paper not in valid_sizes:
-            logger.warning(f"Unusual paper size: {paper}. Valid sizes: {valid_sizes}")
+        if paper not in config.paper.valid_sizes:
+            logger.warning(f"Unusual paper size: {paper}. Valid sizes: {config.paper.valid_sizes}")
 
         self._data["paper"] = paper
         logger.debug(f"Set paper size: {paper}")
@@ -260,9 +260,10 @@ class MetadataManager:
             issues.append("Title block missing title")
 
         # Check paper size
+        from ..config import config
+
         paper = self.get_paper_size()
-        valid_sizes = ["A4", "A3", "A2", "A1", "A0", "Letter", "Legal", "Tabloid"]
-        if paper and paper not in valid_sizes:
+        if paper and paper not in config.paper.valid_sizes:
             issues.append(f"Non-standard paper size: {paper}")
 
         return issues

kicad_sch_api/core/managers/validation.py

@@ -274,9 +274,10 @@ class ValidationManager:
             )
 
         # Check paper size
+        from ..config import config
+
         paper = self._data.get("paper")
-        valid_papers = ["A4", "A3", "A2", "A1", "A0", "Letter", "Legal", "Tabloid"]
-        if paper and paper not in valid_papers:
+        if paper and paper not in config.paper.valid_sizes:
             issues.append(
                 ValidationIssue(
                     category="metadata",

kicad_sch_api/core/managers/wire.py

@@ -305,7 +305,13 @@ class WireManager:
                 return True
 
         # TODO: Implement more sophisticated connectivity analysis
-        # This would involve following wire networks through junctions
+        # NOTE: Current implementation only checks for direct wire connections between pins.
+        # A full implementation would:
+        # 1. Follow wire networks through junctions (connection points)
+        # 2. Trace through labels (global/hierarchical net connections)
+        # 3. Build a complete net connectivity graph
+        # This is a known limitation - use ValidationManager for full electrical rule checking.
+        # Priority: MEDIUM - Would enable better automated wiring validation
         return False
 
     def connect_pins_with_wire(