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

kicad_sch_api/core/formatter.py

@@ -55,7 +55,7 @@ class ExactFormatter:
         self.rules["generator"] = FormatRule(inline=True, quote_indices={1})
         self.rules["generator_version"] = FormatRule(inline=True, quote_indices={1})
         self.rules["uuid"] = FormatRule(inline=True, quote_indices={1})
-        self.rules["paper"] = FormatRule(inline=True, quote_indices={1})
+        self.rules["paper"] = FormatRule(inline=True)  # No quotes for paper size (A4, A3, etc.)
 
         # Title block
         self.rules["title_block"] = FormatRule(inline=False)
@@ -112,6 +112,12 @@ class ExactFormatter:
         self.rules["junction"] = FormatRule(inline=False)
         self.rules["diameter"] = FormatRule(inline=True)
 
+        # Graphical elements
+        self.rules["rectangle"] = FormatRule(inline=False)
+        self.rules["start"] = FormatRule(inline=True)
+        self.rules["end"] = FormatRule(inline=True)
+        self.rules["fill"] = FormatRule(inline=False)
+
         # Labels
         self.rules["label"] = FormatRule(inline=False, quote_indices={1})
         self.rules["global_label"] = FormatRule(inline=False, quote_indices={1})

kicad_sch_api/core/parser.py

@@ -187,6 +187,7 @@ class SExpressionParser:
             "wires": [],
             "junctions": [],
             "labels": [],
+            "rectangles": [],
             "nets": [],
             "lib_symbols": {},
             "sheet_instances": [],
@@ -232,6 +233,10 @@ class SExpressionParser:
                 label = self._parse_label(item)
                 if label:
                     schematic_data["labels"].append(label)
+            elif element_type == "rectangle":
+                rectangle = self._parse_rectangle(item)
+                if rectangle:
+                    schematic_data["rectangles"].append(rectangle)
             elif element_type == "lib_symbols":
                 schematic_data["lib_symbols"] = self._parse_lib_symbols(item)
             elif element_type == "sheet_instances":
@@ -304,10 +309,14 @@ class SExpressionParser:
         for text_box in schematic_data.get("text_boxes", []):
             sexp_data.append(self._text_box_to_sexp(text_box))
 
-        # Add graphics (rectangles, etc.)
+        # Add graphics (rectangles from schematic.draw_bounding_box)
         for graphic in schematic_data.get("graphics", []):
             sexp_data.append(self._graphic_to_sexp(graphic))
 
+        # Add rectangles (rectangles from add_rectangle API)
+        for rectangle in schematic_data.get("rectangles", []):
+            sexp_data.append(self._rectangle_to_sexp(rectangle))
+
         # Add sheet_instances (required by KiCAD)
         sheet_instances = schematic_data.get("sheet_instances", [])
         if sheet_instances:
@@ -425,6 +434,37 @@ class SExpressionParser:
         # Implementation for label parsing
         return {}
 
+    def _parse_rectangle(self, item: List[Any]) -> Optional[Dict[str, Any]]:
+        """Parse a rectangle graphical element."""
+        rectangle = {}
+
+        for elem in item[1:]:
+            if not isinstance(elem, list):
+                continue
+
+            elem_type = str(elem[0])
+
+            if elem_type == "start" and len(elem) >= 3:
+                rectangle["start"] = {"x": float(elem[1]), "y": float(elem[2])}
+            elif elem_type == "end" and len(elem) >= 3:
+                rectangle["end"] = {"x": float(elem[1]), "y": float(elem[2])}
+            elif elem_type == "stroke":
+                for stroke_elem in elem[1:]:
+                    if isinstance(stroke_elem, list):
+                        stroke_type = str(stroke_elem[0])
+                        if stroke_type == "width" and len(stroke_elem) >= 2:
+                            rectangle["stroke_width"] = float(stroke_elem[1])
+                        elif stroke_type == "type" and len(stroke_elem) >= 2:
+                            rectangle["stroke_type"] = str(stroke_elem[1])
+            elif elem_type == "fill":
+                for fill_elem in elem[1:]:
+                    if isinstance(fill_elem, list) and str(fill_elem[0]) == "type":
+                        rectangle["fill_type"] = str(fill_elem[1]) if len(fill_elem) >= 2 else "none"
+            elif elem_type == "uuid" and len(elem) >= 2:
+                rectangle["uuid"] = str(elem[1])
+
+        return rectangle if rectangle else None
+
     def _parse_lib_symbols(self, item: List[Any]) -> Dict[str, Any]:
         """Parse lib_symbols section."""
         # Implementation for lib_symbols parsing
@@ -529,14 +569,28 @@ class SExpressionParser:
         # Add instances section (required by KiCAD)
         from .config import config
 
-        project_name = getattr(self, "project_name", config.defaults.project_name)
-        root_uuid = schematic_uuid or symbol_data.get("root_uuid", str(uuid.uuid4()))
-        logger.debug(
-            f"🔧 Using UUID {root_uuid} for component {symbol_data.get('reference', 'unknown')}"
-        )
-        logger.debug(
-            f"🔧 Component properties keys: {list(symbol_data.get('properties', {}).keys())}"
-        )
+        # Get project name from config or properties
+        project_name = symbol_data.get("properties", {}).get("project_name")
+        if not project_name:
+            project_name = getattr(self, "project_name", config.defaults.project_name)
+
+        # CRITICAL FIX: Use the FULL hierarchy_path from properties if available
+        # For hierarchical schematics, this contains the complete path: /root_uuid/sheet_symbol_uuid/...
+        # This ensures KiCad can properly annotate components in sub-sheets
+        hierarchy_path = symbol_data.get("properties", {}).get("hierarchy_path")
+        if hierarchy_path:
+            # Use the full hierarchical path (includes root + all sheet symbols)
+            instance_path = hierarchy_path
+            logger.debug(f"🔧 Using FULL hierarchy_path: {instance_path} for component {symbol_data.get('reference', 'unknown')}")
+        else:
+            # Fallback: use root_uuid or schematic_uuid for flat designs
+            root_uuid = symbol_data.get("properties", {}).get("root_uuid") or schematic_uuid or str(uuid.uuid4())
+            instance_path = f"/{root_uuid}"
+            logger.debug(f"🔧 Using root UUID path: {instance_path} for component {symbol_data.get('reference', 'unknown')}")
+
+        logger.debug(f"🔧 Component properties keys: {list(symbol_data.get('properties', {}).keys())}")
+        logger.debug(f"🔧 Using project name: '{project_name}'")
+
         sexp.append(
             [
                 sexpdata.Symbol("instances"),
@@ -545,7 +599,7 @@ class SExpressionParser:
                     project_name,
                     [
                         sexpdata.Symbol("path"),
-                        f"/{root_uuid}",
+                        instance_path,
                         [sexpdata.Symbol("reference"), symbol_data.get("reference", "U?")],
                         [sexpdata.Symbol("unit"), symbol_data.get("unit", 1)],
                     ],
@@ -772,7 +826,10 @@ class SExpressionParser:
         effects = [sexpdata.Symbol("effects")]
         font = [sexpdata.Symbol("font"), [sexpdata.Symbol("size"), size, size]]
         effects.append(font)
-        effects.append([sexpdata.Symbol("justify"), sexpdata.Symbol("left")])
+
+        # Use justification from data if provided, otherwise default to "left"
+        justify = hlabel_data.get("justify", "left")
+        effects.append([sexpdata.Symbol("justify"), sexpdata.Symbol(justify)])
         sexp.append(effects)
 
         # Add UUID
@@ -1034,6 +1091,40 @@ class SExpressionParser:
 
         return sexp
 
+    def _rectangle_to_sexp(self, rectangle_data: Dict[str, Any]) -> List[Any]:
+        """Convert rectangle element to S-expression."""
+        sexp = [sexpdata.Symbol("rectangle")]
+
+        # Add start point
+        start = rectangle_data["start"]
+        start_x, start_y = start["x"], start["y"]
+        sexp.append([sexpdata.Symbol("start"), start_x, start_y])
+
+        # Add end point
+        end = rectangle_data["end"]
+        end_x, end_y = end["x"], end["y"]
+        sexp.append([sexpdata.Symbol("end"), end_x, end_y])
+
+        # Add stroke
+        stroke_width = rectangle_data.get("stroke_width", 0)
+        stroke_type = rectangle_data.get("stroke_type", "default")
+        stroke_sexp = [sexpdata.Symbol("stroke")]
+        stroke_sexp.append([sexpdata.Symbol("width"), stroke_width])
+        stroke_sexp.append([sexpdata.Symbol("type"), sexpdata.Symbol(stroke_type)])
+        sexp.append(stroke_sexp)
+
+        # Add fill
+        fill_type = rectangle_data.get("fill_type", "none")
+        fill_sexp = [sexpdata.Symbol("fill")]
+        fill_sexp.append([sexpdata.Symbol("type"), sexpdata.Symbol(fill_type)])
+        sexp.append(fill_sexp)
+
+        # Add UUID
+        if "uuid" in rectangle_data:
+            sexp.append([sexpdata.Symbol("uuid"), rectangle_data["uuid"]])
+
+        return sexp
+
     def _lib_symbols_to_sexp(self, lib_symbols: Dict[str, Any]) -> List[Any]:
         """Convert lib_symbols to S-expression."""
         sexp = [sexpdata.Symbol("lib_symbols")]

kicad_sch_api/core/schematic.py

@@ -1138,6 +1138,59 @@ class Schematic:
         logger.debug(f"Added text box: '{text}' at {position} size {size}")
         return text_box.uuid
 
+    def add_rectangle(
+        self,
+        start: Union[Point, Tuple[float, float]],
+        end: Union[Point, Tuple[float, float]],
+        stroke_width: float = 0.0,
+        stroke_type: str = "default",
+        fill_type: str = "none"
+    ) -> str:
+        """
+        Add a graphical rectangle element.
+
+        Args:
+            start: Rectangle start point (top-left)
+            end: Rectangle end point (bottom-right)
+            stroke_width: Border line width
+            stroke_type: Border line type (default, solid, dash, dot, etc.)
+            fill_type: Fill type (none, solid, etc.)
+
+        Returns:
+            UUID of created rectangle element
+        """
+        if isinstance(start, tuple):
+            start = Point(start[0], start[1])
+        if isinstance(end, tuple):
+            end = Point(end[0], end[1])
+
+        from .types import SchematicRectangle
+
+        rectangle = SchematicRectangle(
+            uuid=str(uuid.uuid4()),
+            start=start,
+            end=end,
+            stroke_width=stroke_width,
+            stroke_type=stroke_type,
+            fill_type=fill_type
+        )
+
+        if "rectangles" not in self._data:
+            self._data["rectangles"] = []
+
+        self._data["rectangles"].append({
+            "uuid": rectangle.uuid,
+            "start": {"x": rectangle.start.x, "y": rectangle.start.y},
+            "end": {"x": rectangle.end.x, "y": rectangle.end.y},
+            "stroke_width": rectangle.stroke_width,
+            "stroke_type": rectangle.stroke_type,
+            "fill_type": rectangle.fill_type
+        })
+        self._modified = True
+
+        logger.debug(f"Added rectangle: {start} to {end}")
+        return rectangle.uuid
+
     def set_title_block(
         self,
         title: str = "",

kicad_sch_api/core/types.py

@@ -338,6 +338,40 @@ class TextBox:
             self.uuid = str(uuid4())
 
 
+@dataclass
+class SchematicRectangle:
+    """Graphical rectangle element in schematic."""
+
+    uuid: str
+    start: Point
+    end: Point
+    stroke_width: float = 0.0
+    stroke_type: str = "default"
+    fill_type: str = "none"
+
+    def __post_init__(self):
+        if not self.uuid:
+            self.uuid = str(uuid4())
+
+    @property
+    def width(self) -> float:
+        """Rectangle width."""
+        return abs(self.end.x - self.start.x)
+
+    @property
+    def height(self) -> float:
+        """Rectangle height."""
+        return abs(self.end.y - self.start.y)
+
+    @property
+    def center(self) -> Point:
+        """Rectangle center point."""
+        return Point(
+            (self.start.x + self.end.x) / 2,
+            (self.start.y + self.end.y) / 2
+        )
+
+
 @dataclass
 class Net:
     """Electrical net connecting components."""
@@ -434,6 +468,7 @@ class Schematic:
     labels: List[Label] = field(default_factory=list)
     nets: List[Net] = field(default_factory=list)
     sheets: List[Sheet] = field(default_factory=list)
+    rectangles: List[SchematicRectangle] = field(default_factory=list)
     lib_symbols: Dict[str, Any] = field(default_factory=dict)
 
     def __post_init__(self):

{kicad_sch_api-0.2.1.dist-info → kicad_sch_api-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kicad-sch-api
-Version: 0.2.1
+Version: 0.2.2
 Summary: Professional KiCAD schematic manipulation library with exact format preservation
 Author-email: Circuit-Synth <shane@circuit-synth.com>
 Maintainer-email: Circuit-Synth <shane@circuit-synth.com>

{kicad_sch_api-0.2.1.dist-info → kicad_sch_api-0.2.2.dist-info}/RECORD

@@ -5,16 +5,16 @@ kicad_sch_api/core/__init__.py,sha256=ur_KeYBlGKl-e1hLpLdxAhGV2A-PCCGkcqd0r6KSeB
 kicad_sch_api/core/component_bounds.py,sha256=BFYJYULyzs5it2hN7bHTimyS9Vet4dxsMklRStob-F4,17509
 kicad_sch_api/core/components.py,sha256=tXRL18GObl2u94wl5jP-1ID56s_UD9F1gQ_iRIyZ_Kw,25290
 kicad_sch_api/core/config.py,sha256=itw0j3DeIEHaFVf8p3mfAS1SP6jclBwvMv7NPdkThE4,4309
-kicad_sch_api/core/formatter.py,sha256=ggOc1PZZAGkpdMMNxm1ukCCz9riYnd_sM93nB0fBYuw,20390
+kicad_sch_api/core/formatter.py,sha256=PQrZDBgezGlbqw7y3Gnhs0VUYypgc_7pO42Pxkvr-e0,20663
 kicad_sch_api/core/geometry.py,sha256=27SgN0padLbQuTi8MV6UUCp6Pyaiv8V9gmYDOhfwny8,2947
 kicad_sch_api/core/ic_manager.py,sha256=Kg0HIOMU-TGXiIkrnwcHFQ1Kfv_3rW2U1cwBKJsKopc,7219
 kicad_sch_api/core/junctions.py,sha256=Ay6BsWX_DLs-wB0eMA2CytKKq0N8Ja41ZubJWpAqNgM,6122
 kicad_sch_api/core/manhattan_routing.py,sha256=t_T2u0zsQB-a8dTijFmY-qFq-oDt2qDebYyXzD_pBWI,15989
-kicad_sch_api/core/parser.py,sha256=raQdKrJZgw3v2ZKyECK7SbzqLMD762H-lQWwxUMDwks,52992
+kicad_sch_api/core/parser.py,sha256=7bvSwwSoySYi4IjNmolukTFCymtFvOmPssQ9IOoFq4k,57356
 kicad_sch_api/core/pin_utils.py,sha256=XGEow3HzBTyT8a0B_ZC8foMvwzYaENSaqTUwDW1rz24,5417
-kicad_sch_api/core/schematic.py,sha256=5BSPVWHgj9uwzlwCBT6JSg7sjx9jlADd1aEprO_yOd0,59498
+kicad_sch_api/core/schematic.py,sha256=U9-wrhuGtgRqZJfc76Dj-g1_ZTjrT8R9LmfX-BIBH8w,61201
 kicad_sch_api/core/simple_manhattan.py,sha256=CvIHvwmfABPF-COzhblYxEgRoR_R_eD-lmBFHHjDuMI,7241
-kicad_sch_api/core/types.py,sha256=exIJ0cA1puYj09uxiq6inom2YVAs6JTDjf1ka0bKN8g,12872
+kicad_sch_api/core/types.py,sha256=UmqIvEx_Pd3B9jhvtmgZxx4SAjHUeOZBOEc8VtRILZs,13716
 kicad_sch_api/core/wire_routing.py,sha256=G-C7S-ntQxwuu1z3OaaYlkURXwKE4r4xmhbbi6cvvaI,12830
 kicad_sch_api/core/wires.py,sha256=608t9oH4UzppdGgNgUd-ABK6T-ahyETZwhO_-CuKFO8,8319
 kicad_sch_api/discovery/__init__.py,sha256=qSuCsnC-hVtaLYE8fwd-Gea6JKwEVGPQ-hSNDNJYsIU,329
@@ -23,9 +23,9 @@ kicad_sch_api/library/__init__.py,sha256=NG9UTdcpn25Bl9tPsYs9ED7bvpaVPVdtLMbnxkQ
 kicad_sch_api/library/cache.py,sha256=7na88grl465WHwUOGuOzYrrWwjsMBXhXVtxhnaJ9GBY,33208
 kicad_sch_api/utils/__init__.py,sha256=1V_yGgI7jro6MUc4Pviux_WIeJ1wmiYFID186SZwWLQ,277
 kicad_sch_api/utils/validation.py,sha256=XlWGRZJb3cOPYpU9sLQQgC_NASwbi6W-LCN7PzUmaPY,15626
-kicad_sch_api-0.2.1.dist-info/licenses/LICENSE,sha256=Em65Nvte1G9MHc0rHqtYuGkCPcshD588itTa358J6gs,1070
-kicad_sch_api-0.2.1.dist-info/METADATA,sha256=UJaikwtrjEvTIYzOZpeYA1-nP6LlQpBQf_Fc9wzHO2M,17183
-kicad_sch_api-0.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-kicad_sch_api-0.2.1.dist-info/entry_points.txt,sha256=VWKsFi2Jv7G_tmio3cNVhhIBfv_OZFaKa-T_ED84lc8,57
-kicad_sch_api-0.2.1.dist-info/top_level.txt,sha256=n0ex4gOJ1b_fARowcGqRzyOGZcHRhc5LZa6_vVgGxcI,14
-kicad_sch_api-0.2.1.dist-info/RECORD,,
+kicad_sch_api-0.2.2.dist-info/licenses/LICENSE,sha256=Em65Nvte1G9MHc0rHqtYuGkCPcshD588itTa358J6gs,1070
+kicad_sch_api-0.2.2.dist-info/METADATA,sha256=qyAs7hKSWu-Bwlrfn0yF8R4SdTw4VYOGdqfwxCn25xY,17183
+kicad_sch_api-0.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+kicad_sch_api-0.2.2.dist-info/entry_points.txt,sha256=VWKsFi2Jv7G_tmio3cNVhhIBfv_OZFaKa-T_ED84lc8,57
+kicad_sch_api-0.2.2.dist-info/top_level.txt,sha256=n0ex4gOJ1b_fARowcGqRzyOGZcHRhc5LZa6_vVgGxcI,14
+kicad_sch_api-0.2.2.dist-info/RECORD,,