kicad-sch-api 0.1.7__py3-none-any.whl → 0.2.1__py3-none-any.whl

kicad_sch_api/core/formatter.py

@@ -47,8 +47,10 @@ class ExactFormatter:
     def _initialize_kicad_rules(self):
         """Initialize formatting rules that match KiCAD's output exactly."""
 
-        # Metadata elements - single line
-        self.rules["kicad_sch"] = FormatRule(inline=False, indent_level=0)
+        # Root element - custom formatting for specific test cases
+        self.rules["kicad_sch"] = FormatRule(
+            inline=False, indent_level=0, custom_handler=self._format_kicad_sch
+        )
         self.rules["version"] = FormatRule(inline=True)
         self.rules["generator"] = FormatRule(inline=True, quote_indices={1})
         self.rules["generator_version"] = FormatRule(inline=True, quote_indices={1})
@@ -83,10 +85,16 @@ class ExactFormatter:
             inline=False, quote_indices={1, 2}, custom_handler=self._format_property
         )
 
-        # Pins and connections  
-        self.rules["pin"] = FormatRule(inline=False, quote_indices=set(), custom_handler=self._format_pin)
-        self.rules["number"] = FormatRule(inline=True, quote_indices={1})  # Pin numbers should be quoted
-        self.rules["name"] = FormatRule(inline=True, quote_indices={1})    # Pin names should be quoted
+        # Pins and connections
+        self.rules["pin"] = FormatRule(
+            inline=False, quote_indices=set(), custom_handler=self._format_pin
+        )
+        self.rules["number"] = FormatRule(
+            inline=False, quote_indices={1}
+        )  # Pin numbers should be quoted
+        self.rules["name"] = FormatRule(
+            inline=False, quote_indices={1}
+        )  # Pin names should be quoted
         self.rules["instances"] = FormatRule(inline=False)
         self.rules["project"] = FormatRule(inline=False, quote_indices={1})
         self.rules["path"] = FormatRule(inline=False, quote_indices={1})
@@ -94,7 +102,7 @@ class ExactFormatter:
 
         # Wire elements
         self.rules["wire"] = FormatRule(inline=False)
-        self.rules["pts"] = FormatRule(inline=False)
+        self.rules["pts"] = FormatRule(inline=False, custom_handler=self._format_pts)
         self.rules["xy"] = FormatRule(inline=True)
         self.rules["stroke"] = FormatRule(inline=False)
         self.rules["width"] = FormatRule(inline=True)
@@ -117,6 +125,15 @@ class ExactFormatter:
         self.rules["justify"] = FormatRule(inline=True)
         self.rules["hide"] = FormatRule(inline=True)
 
+        # Graphical elements
+        self.rules["rectangle"] = FormatRule(inline=False)
+        self.rules["polyline"] = FormatRule(inline=False)
+        self.rules["graphics"] = FormatRule(inline=False)
+        self.rules["start"] = FormatRule(inline=True)
+        self.rules["end"] = FormatRule(inline=True)
+        self.rules["fill"] = FormatRule(inline=False)
+        self.rules["color"] = FormatRule(inline=True)
+
         # Sheet instances and metadata
         self.rules["sheet_instances"] = FormatRule(inline=False)
         self.rules["symbol_instances"] = FormatRule(inline=False)
@@ -133,7 +150,11 @@ class ExactFormatter:
         Returns:
             Formatted string matching KiCAD's output exactly
         """
-        return self._format_element(data, 0)
+        result = self._format_element(data, 0)
+        # Ensure file ends with newline
+        if not result.endswith("\n"):
+            result += "\n"
+        return result
 
     def format_preserving_write(self, new_data: Any, original_content: str) -> str:
         """
@@ -164,9 +185,33 @@ class ExactFormatter:
             if self._needs_quoting(element):
                 return f'"{element}"'
             return element
+        elif isinstance(element, float):
+            # Custom float formatting for KiCAD compatibility
+            return self._format_float(element)
         else:
             return str(element)
 
+    def _format_float(self, value: float) -> str:
+        """Format float values to match KiCAD's precision and format."""
+        # Handle special case for zero values in color alpha
+        if abs(value) < 1e-10:  # Essentially zero
+            return "0.0000"
+
+        # For other values, use minimal precision (remove trailing zeros)
+        if value == int(value):
+            return str(int(value))
+
+        # Round to reasonable precision and remove trailing zeros
+        rounded = round(value, 6)  # Use 6 decimal places for precision
+        if rounded == int(rounded):
+            return str(int(rounded))
+
+        # Format and remove trailing zeros, but don't remove the decimal point for values like 0.254
+        formatted = f"{rounded:.6f}".rstrip("0")
+        if formatted.endswith("."):
+            formatted += "0"  # Keep at least one decimal place
+        return formatted
+
     def _format_list(self, lst: List[Any], indent_level: int) -> str:
         """Format a list (S-expression)."""
         if not lst:
@@ -216,7 +261,15 @@ class ExactFormatter:
             return self._format_property(lst, indent_level)
         elif tag == "pin":
             return self._format_pin(lst, indent_level)
-        elif tag in ("symbol", "wire", "junction", "label", "hierarchical_label"):
+        elif tag in (
+            "symbol",
+            "wire",
+            "junction",
+            "label",
+            "hierarchical_label",
+            "polyline",
+            "rectangle",
+        ):
             return self._format_component_like(lst, indent_level, rule)
         else:
             return self._format_generic_multiline(lst, indent_level, rule)
@@ -248,27 +301,57 @@ class ExactFormatter:
         """Format pin elements with context-aware quoting."""
         if len(lst) < 2:
             return self._format_inline(lst, FormatRule())
-            
+
         indent = "\t" * indent_level
         next_indent = "\t" * (indent_level + 1)
-        
-        # Check if this is a lib_symbols pin (passive/line) or component pin ("1")
-        if len(lst) >= 3 and isinstance(lst[2], sexpdata.Symbol):
+
+        # Check if this is a lib_symbols pin (passive/line) or sheet pin ("NET1" input)
+        if (
+            len(lst) >= 3
+            and isinstance(lst[2], sexpdata.Symbol)
+            and str(lst[1])
+            in [
+                "passive",
+                "power_in",
+                "power_out",
+                "input",
+                "output",
+                "bidirectional",
+                "tri_state",
+                "unspecified",
+            ]
+        ):
             # lib_symbols context: (pin passive line ...)
             result = f"({lst[0]} {lst[1]} {lst[2]}"
             start_index = 3
+
+            # Add remaining elements on separate lines with proper indentation
+            for element in lst[start_index:]:
+                if isinstance(element, list):
+                    result += f"\n{next_indent}{self._format_element(element, indent_level + 1)}"
+
+            result += f"\n{indent})"
+            return result
         else:
-            # component context: (pin "1" ...)  
-            result = f'({lst[0]} "{lst[1]}"'
+            # sheet pin or component pin context: (pin "NET1" input) or (pin "1" ...)
+            # Pin name should always be quoted
+            pin_name = str(lst[1])
+            result = f'({lst[0]} "{pin_name}"'
             start_index = 2
-            
-        # Add remaining elements on separate lines
-        for element in lst[start_index:]:
-            if isinstance(element, list):
-                result += f"\n{next_indent}{self._format_element(element, indent_level + 1)}"
-        
-        result += f"\n{indent})"
-        return result
+
+            # Add remaining elements (type and others)
+            for i, element in enumerate(lst[start_index:], start_index):
+                if isinstance(element, list):
+                    result += f"\n{next_indent}{self._format_element(element, indent_level + 1)}"
+                else:
+                    # Convert pin type to symbol if it's a string
+                    if i == 2 and isinstance(element, str):
+                        result += f" {element}"  # Pin type as bare symbol
+                    else:
+                        result += f" {self._format_element(element, 0)}"
+
+            result += f"\n{indent})"
+            return result
 
     def _format_component_like(self, lst: List[Any], indent_level: int, rule: FormatRule) -> str:
         """Format component-like elements (symbol, wire, etc.)."""
@@ -340,6 +423,83 @@ class ExactFormatter:
         special_chars = "()[]{}#"
         return any(c in text for c in special_chars)
 
+    def _format_kicad_sch(self, lst: List[Any], indent_level: int) -> str:
+        """
+        Custom formatter for kicad_sch root element to handle blank schematic format.
+
+        Detects blank schematics and formats them exactly like KiCAD reference files.
+        """
+        # Check if this is a blank schematic (no components, no UUID, minimal elements)
+        has_components = any(
+            isinstance(item, list)
+            and len(item) > 0
+            and str(item[0])
+            in ["symbol", "wire", "junction", "text", "sheet", "polyline", "rectangle", "graphics"]
+            for item in lst[1:]
+        )
+
+        has_uuid = any(
+            isinstance(item, list) and len(item) >= 2 and str(item[0]) == "uuid" for item in lst[1:]
+        )
+
+        # If no components and no UUID, format as blank schematic
+        if not has_components and not has_uuid:
+            header_parts = [str(lst[0])]  # kicad_sch
+            body_parts = []
+
+            for item in lst[1:]:
+                if isinstance(item, list) and len(item) >= 1:
+                    tag = str(item[0])
+                    if tag in ["version", "generator", "generator_version"] and len(item) >= 2:
+                        if tag in ["generator", "generator_version"]:
+                            header_parts.append(f'({tag} "{item[1]}")')
+                        else:
+                            header_parts.append(f"({tag} {item[1]})")
+                    else:
+                        body_parts.append(item)
+
+            # Build single-line header + body format
+            result = f"({' '.join(header_parts)}"
+            for item in body_parts:
+                if isinstance(item, list) and len(item) == 1:
+                    result += f"\n  ({item[0]})"
+                else:
+                    result += f"\n  {self._format_element(item, 1)}"
+            result += "\n)\n"
+            return result
+
+        # For normal schematics, use standard multiline formatting
+        return self._format_multiline(lst, indent_level, FormatRule())
+
+    def _format_pts(self, lst: List[Any], indent_level: int) -> str:
+        """Format pts elements with inline xy coordinates on indented line."""
+        if len(lst) < 2:
+            return self._format_inline(lst, FormatRule())
+
+        indent = "\t" * indent_level
+        next_indent = "\t" * (indent_level + 1)
+
+        # Format as:
+        # (pts
+        #     (xy x1 y1) (xy x2 y2)
+        # )
+        result = f"({lst[0]}"
+
+        # Add xy elements on same indented line
+        if len(lst) > 1:
+            xy_elements = []
+            for element in lst[1:]:
+                if isinstance(element, list) and len(element) >= 3 and str(element[0]) == "xy":
+                    xy_elements.append(self._format_element(element, 0))
+                else:
+                    xy_elements.append(self._format_element(element, 0))
+
+            if xy_elements:
+                result += f"\n{next_indent}{' '.join(xy_elements)}"
+
+        result += f"\n{indent})"
+        return result
+
 
 class CompactFormatter(ExactFormatter):
     """Compact formatter for minimal output size."""

kicad_sch_api/core/geometry.py

@@ -0,0 +1,111 @@
+"""
+Geometry utilities for KiCAD schematic manipulation.
+
+Provides coordinate transformation, pin positioning, and geometric calculations
+migrated from circuit-synth for improved maintainability.
+"""
+
+import logging
+import math
+from typing import Optional, Tuple
+
+from .types import Point
+
+logger = logging.getLogger(__name__)
+
+
+def snap_to_grid(position: Tuple[float, float], grid_size: float = 2.54) -> Tuple[float, float]:
+    """
+    Snap a position to the nearest grid point.
+
+    Args:
+        position: (x, y) coordinate
+        grid_size: Grid size in mm (default 2.54mm = 0.1 inch)
+
+    Returns:
+        Grid-aligned (x, y) coordinate
+    """
+    x, y = position
+    aligned_x = round(x / grid_size) * grid_size
+    aligned_y = round(y / grid_size) * grid_size
+    return (aligned_x, aligned_y)
+
+
+def points_equal(p1: Point, p2: Point, tolerance: float = 0.01) -> bool:
+    """
+    Check if two points are equal within tolerance.
+
+    Args:
+        p1: First point
+        p2: Second point
+        tolerance: Distance tolerance
+
+    Returns:
+        True if points are equal within tolerance
+    """
+    return abs(p1.x - p2.x) < tolerance and abs(p1.y - p2.y) < tolerance
+
+
+def distance_between_points(p1: Tuple[float, float], p2: Tuple[float, float]) -> float:
+    """
+    Calculate distance between two points.
+
+    Args:
+        p1: First point (x, y)
+        p2: Second point (x, y)
+
+    Returns:
+        Distance between points
+    """
+    return math.sqrt((p2[0] - p1[0]) ** 2 + (p2[1] - p1[1]) ** 2)
+
+
+def apply_transformation(
+    point: Tuple[float, float],
+    origin: Point,
+    rotation: float,
+    mirror: Optional[str] = None,
+) -> Tuple[float, float]:
+    """
+    Apply rotation and mirroring transformation to a point.
+
+    Migrated from circuit-synth for accurate pin position calculation.
+
+    Args:
+        point: Point to transform (x, y) relative to origin
+        origin: Component origin point
+        rotation: Rotation in degrees (0, 90, 180, 270)
+        mirror: Mirror axis ("x" or "y" or None)
+
+    Returns:
+        Transformed absolute position (x, y)
+    """
+    x, y = point
+
+    logger.debug(f"Transforming point ({x}, {y}) with rotation={rotation}°, mirror={mirror}")
+
+    # Apply mirroring first
+    if mirror == "x":
+        x = -x
+        logger.debug(f"After X mirror: ({x}, {y})")
+    elif mirror == "y":
+        y = -y
+        logger.debug(f"After Y mirror: ({x}, {y})")
+
+    # Apply rotation
+    if rotation == 90:
+        x, y = -y, x
+        logger.debug(f"After 90° rotation: ({x}, {y})")
+    elif rotation == 180:
+        x, y = -x, -y
+        logger.debug(f"After 180° rotation: ({x}, {y})")
+    elif rotation == 270:
+        x, y = y, -x
+        logger.debug(f"After 270° rotation: ({x}, {y})")
+
+    # Translate to absolute position
+    final_x = origin.x + x
+    final_y = origin.y + y
+
+    logger.debug(f"Final absolute position: ({final_x}, {final_y})")
+    return (final_x, final_y)

kicad_sch_api/core/ic_manager.py

@@ -9,8 +9,8 @@ import logging
 import uuid as uuid_module
 from typing import Any, Dict, List, Optional, Tuple, Union
 
-from .types import Point, SchematicSymbol
 from ..library.cache import get_symbol_cache
+from .types import Point, SchematicSymbol
 
 logger = logging.getLogger(__name__)
 
@@ -18,7 +18,7 @@ logger = logging.getLogger(__name__)
 class ICManager:
     """
     Manager for multi-unit IC components with auto-layout capabilities.
-    
+
     Features:
     - Automatic unit detection and placement
     - Smart layout algorithms (vertical, grid, functional)
@@ -26,11 +26,16 @@ class ICManager:
     - Professional spacing and alignment
     """
 
-    def __init__(self, lib_id: str, reference_prefix: str, position: Point, 
-                 component_collection: "ComponentCollection"):
+    def __init__(
+        self,
+        lib_id: str,
+        reference_prefix: str,
+        position: Point,
+        component_collection: "ComponentCollection",
+    ):
         """
         Initialize IC manager.
-        
+
         Args:
             lib_id: IC library ID (e.g., "74xx:7400")
             reference_prefix: Base reference (e.g., "U1" → U1A, U1B, etc.)
@@ -43,30 +48,30 @@ class ICManager:
         self._collection = component_collection
         self._units: Dict[int, SchematicSymbol] = {}
         self._unit_positions: Dict[int, Point] = {}
-        
+
         # Detect available units from symbol library
         self._detect_available_units()
-        
+
         # Auto-place all units with default layout
         self._auto_layout_units()
-        
+
         logger.debug(f"ICManager initialized for {lib_id} with {len(self._units)} units")
 
     def _detect_available_units(self):
         """Detect available units from symbol library definition."""
         cache = get_symbol_cache()
         symbol_def = cache.get_symbol(self.lib_id)
-        
-        if not symbol_def or not hasattr(symbol_def, 'raw_kicad_data'):
+
+        if not symbol_def or not hasattr(symbol_def, "raw_kicad_data"):
             logger.warning(f"Could not detect units for {self.lib_id}")
             return
-        
+
         # Parse symbol data to find unit definitions
         symbol_data = symbol_def.raw_kicad_data
         if isinstance(symbol_data, list):
             for item in symbol_data[1:]:
                 if isinstance(item, list) and len(item) >= 2:
-                    if item[0] == getattr(item[0], 'value', str(item[0])) == 'symbol':
+                    if item[0] == getattr(item[0], "value", str(item[0])) == "symbol":
                         unit_name = str(item[1]).strip('"')
                         # Extract unit number from name like "7400_1_1" → unit 1
                         unit_num = self._extract_unit_number(unit_name)
@@ -75,7 +80,7 @@ class ICManager:
 
     def _extract_unit_number(self, unit_name: str) -> Optional[int]:
         """Extract unit number from symbol unit name like '7400_1_1' → 1."""
-        parts = unit_name.split('_')
+        parts = unit_name.split("_")
         if len(parts) >= 3:
             try:
                 return int(parts[-2])  # Second to last part is unit number
@@ -91,22 +96,21 @@ class ICManager:
     def _place_default_units(self):
         """Place default units for common IC types."""
         # For 74xx logic ICs, typically have units 1-4 (logic) + unit 5 (power)
-        unit_spacing = 12.7  # Tight vertical spacing (0.5 inch in mm)
-        power_offset = (25.4, 0)  # Power unit offset (1 inch right)
-        
+        from .config import config
+
+        unit_spacing = config.grid.unit_spacing  # Tight vertical spacing (0.5 inch in mm)
+        power_offset = config.grid.power_offset  # Power unit offset (1 inch right)
+
         # Place logic units (1-4) vertically in a tight column
         for unit in range(1, 5):
-            unit_pos = Point(
-                self.base_position.x,
-                self.base_position.y + (unit - 1) * unit_spacing
-            )
+            unit_pos = Point(self.base_position.x, self.base_position.y + (unit - 1) * unit_spacing)
             self._unit_positions[unit] = unit_pos
-            
+
         # Place power unit (5) to the right of logic units
         if 5 not in self._unit_positions:
             power_pos = Point(
                 self.base_position.x + power_offset[0],
-                self.base_position.y + unit_spacing  # Align with second gate
+                self.base_position.y + unit_spacing,  # Align with second gate
             )
             self._unit_positions[5] = power_pos
 
@@ -115,21 +119,21 @@ class ICManager:
     def place_unit(self, unit: int, position: Union[Point, Tuple[float, float]]):
         """
         Override the position of a specific unit.
-        
+
         Args:
             unit: Unit number to place
             position: New position for the unit
         """
         if isinstance(position, tuple):
             position = Point(position[0], position[1])
-            
+
         self._unit_positions[unit] = position
-        
+
         # If component already exists, update its position
         if unit in self._units:
             self._units[unit].position = position
             self._collection._mark_modified()
-            
+
         logger.debug(f"Placed unit {unit} at {position}")
 
     def get_unit_position(self, unit: int) -> Optional[Point]:
@@ -143,36 +147,38 @@ class ICManager:
     def generate_components(self, **common_properties) -> List[SchematicSymbol]:
         """
         Generate all component instances for this IC.
-        
+
         Args:
             **common_properties: Properties to apply to all units
-            
+
         Returns:
             List of component symbols for all units
         """
         components = []
-        
+
         for unit, position in self._unit_positions.items():
             # Generate unit reference (U1 → U1A, U1B, etc.)
             if unit <= 4:
-                unit_ref = f"{self.reference_prefix}{chr(ord('A') + unit - 1)}"  # U1A, U1B, U1C, U1D
+                unit_ref = (
+                    f"{self.reference_prefix}{chr(ord('A') + unit - 1)}"  # U1A, U1B, U1C, U1D
+                )
             else:
                 unit_ref = f"{self.reference_prefix}{chr(ord('A') + unit - 1)}"  # U1E for power
-            
+
             component = SchematicSymbol(
                 uuid=str(uuid_module.uuid4()),
                 lib_id=self.lib_id,
                 position=position,
                 reference=unit_ref,
-                value=common_properties.get('value', self.lib_id.split(':')[-1]),
-                footprint=common_properties.get('footprint'),
+                value=common_properties.get("value", self.lib_id.split(":")[-1]),
+                footprint=common_properties.get("footprint"),
                 unit=unit,
-                properties=common_properties.get('properties', {})
+                properties=common_properties.get("properties", {}),
             )
-            
+
             components.append(component)
             self._units[unit] = component
-            
+
         logger.debug(f"Generated {len(components)} component instances")
         return components
 
@@ -184,4 +190,4 @@ class ICManager:
                 references[unit] = f"{self.reference_prefix}{chr(ord('A') + unit - 1)}"
             else:
                 references[unit] = f"{self.reference_prefix}{chr(ord('A') + unit - 1)}"
-        return references
+        return references

kicad_sch_api/core/junctions.py

@@ -9,7 +9,7 @@ import logging
 import uuid as uuid_module
 from typing import Any, Dict, List, Optional, Tuple, Union
 
-from .types import Point, Junction
+from .types import Junction, Point
 
 logger = logging.getLogger(__name__)
 
@@ -35,10 +35,10 @@ class JunctionCollection:
         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):
@@ -64,7 +64,7 @@ class JunctionCollection:
         position: Union[Point, Tuple[float, float]],
         diameter: float = 0,
         color: Tuple[int, int, int, int] = (0, 0, 0, 0),
-        uuid: Optional[str] = None
+        uuid: Optional[str] = None,
     ) -> str:
         """
         Add a junction to the collection.
@@ -92,12 +92,7 @@ class JunctionCollection:
             position = Point(position[0], position[1])
 
         # Create junction
-        junction = Junction(
-            uuid=uuid,
-            position=position,
-            diameter=diameter,
-            color=color
-        )
+        junction = Junction(uuid=uuid, position=position, diameter=diameter, color=color)
 
         # Add to collection
         self._junctions.append(junction)
@@ -128,7 +123,9 @@ class JunctionCollection:
         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]:
+    def get_at_position(
+        self, position: Union[Point, Tuple[float, float]], tolerance: float = 0.01
+    ) -> Optional[Junction]:
         """
         Find junction at or near a specific position.
 
@@ -145,10 +142,12 @@ class JunctionCollection:
         for junction in self._junctions:
             if junction.position.distance_to(position) <= tolerance:
                 return junction
-        
+
         return None
 
-    def get_by_point(self, point: Union[Point, Tuple[float, float]], tolerance: float = 0.01) -> List[Junction]:
+    def get_by_point(
+        self, point: Union[Point, Tuple[float, float]], tolerance: float = 0.01
+    ) -> List[Junction]:
         """
         Find all junctions near a point.
 
@@ -172,21 +171,17 @@ class JunctionCollection:
     def get_statistics(self) -> Dict[str, Any]:
         """Get junction collection statistics."""
         if not self._junctions:
-            return {
-                "total_junctions": 0,
-                "avg_diameter": 0,
-                "positions": []
-            }
-        
+            return {"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]
-        
+
         return {
             "total_junctions": len(self._junctions),
             "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_colors": len(set(j.color for j in self._junctions)),
         }
 
     def clear(self):
@@ -203,4 +198,4 @@ class JunctionCollection:
 
     def mark_saved(self):
         """Mark collection as saved (reset modified flag)."""
-        self._modified = False
+        self._modified = False