Merge branch 'main' into exports

gdsfactory · Jan 30, 2025 · f5de0ae · f5de0ae
2 parents 1e92587 + 6168530
commit f5de0ae
Show file tree

Hide file tree

Showing 9 changed files with 409 additions and 121 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 
 ## New
 
+- Add tests for Instance Ports [#593](https://github.com/gdsfactory/kfactory/pull/593)
 - Add ruff bugbear rule [#592](https://github.com/gdsfactory/kfactory/pull/592)
 - Add to_itype, to_dtype to dbu, um classes [#589](https://github.com/gdsfactory/kfactory/pull/589)
 - Make vinstance connect take ProtoPort [#587](https://github.com/gdsfactory/kfactory/pull/587)

diff --git a/docs/source/notebooks/01_references.py b/docs/source/notebooks/01_references.py
@@ -211,7 +211,7 @@ class LayerInfos(kf.LayerInfos):
 c = kf.cells.straight.straight(length=10, width=0.6, layer=LAYER.WG)
 c3 = kf.KCell()  # Create a new blank Cell
 aref = c3.create_inst(
-    c, na=1, nb=3, a=kf.kdb.Vector(20000, 0), b=kf.kdb.Vector(0, 15000)
+    c, na=1, nb=3, a=(20000, 0), b=(0, 15000)
 )  # instance the Cell "c" 3 instances in it with a 3 rows, 1 columns array
 
 c3.add_ports(aref.ports)

diff --git a/src/kfactory/grid.py b/src/kfactory/grid.py
@@ -481,7 +481,7 @@ def grid(
     shape: tuple[int, int] | None = None,
     align_x: Literal["origin", "xmin", "xmax", "center"] = "center",
     align_y: Literal["origin", "ymin", "ymax", "center"] = "center",
-    rotation: Literal[0, 1, 2, 3] = 0,
+    rotation: float = 0,
     mirror: bool = False,
 ) -> DInstanceGroup:
     """Create a grid of instances.
@@ -565,7 +565,7 @@ def grid(
 
         insts = [
             [
-                target.create_inst(kcell, kdb.ICplxTrans(1, rotation, mirror, 0, 0))
+                target.create_inst(kcell, kdb.DCplxTrans(1, rotation, mirror, 0, 0))
                 for kcell in array
             ]
             for array in kcell_array
@@ -637,7 +637,7 @@ def grid(
         _insts = [
             None
             if kcell is None
-            else target.create_inst(kcell, kdb.ICplxTrans(1, rotation, mirror, 0, 0))
+            else target.create_inst(kcell, kdb.DCplxTrans(1, rotation, mirror, 0, 0))
             for kcell in _kcells
         ]
 
@@ -704,7 +704,7 @@ def flexgrid(
     shape: tuple[int, int] | None = None,
     align_x: Literal["origin", "xmin", "xmax", "center"] = "center",
     align_y: Literal["origin", "ymin", "ymax", "center"] = "center",
-    rotation: Literal[0, 1, 2, 3] = 0,
+    rotation: float = 0,
     mirror: bool = False,
 ) -> DInstanceGroup:
     """Create a grid of instances.
@@ -786,7 +786,7 @@ def flexgrid(
                 None
                 if kcell is None
                 else target.create_inst(
-                    kcell, kdb.ICplxTrans(1, rotation, mirror, 0, 0)
+                    kcell, kdb.DCplxTrans(1, rotation, mirror, 0, 0)
                 )
                 for kcell in array
             ]
@@ -867,7 +867,7 @@ def flexgrid(
         _insts = [
             None
             if kcell is None
-            else target.create_inst(kcell, kdb.ICplxTrans(1, rotation, mirror, 0, 0))
+            else target.create_inst(kcell, kdb.DCplxTrans(1, rotation, mirror, 0, 0))
             for kcell in _kcells
         ]
 

diff --git a/src/kfactory/instance_group.py b/src/kfactory/instance_group.py
@@ -23,9 +23,9 @@
 class ProtoInstanceGroup(Generic[TUnit, TInstance], GeometricObject[TUnit]):
     insts: list[TInstance]
 
-    def __init__(self, insts: Sequence[TInstance]) -> None:
+    def __init__(self, insts: Sequence[TInstance] | None = None) -> None:
         """Initialize the InstanceGroup."""
-        self.insts = list(insts)
+        self.insts = list(insts) if insts is not None else []
 
     @property
     def kcl(self) -> KCLayout:

diff --git a/src/kfactory/instance_ports.py b/src/kfactory/instance_ports.py
@@ -87,7 +87,7 @@ def bases(self) -> list[BasePort]:
 
     def filter(
         self,
-        angle: TUnit | None = None,
+        angle: int | None = None,
         orientation: float | None = None,
         layer: LayerEnum | int | None = None,
         port_type: str | None = None,
@@ -111,7 +111,7 @@ def filter(
         if port_type:
             ports = filter_port_type(ports, port_type)
         if angle is not None:
-            ports = filter_direction(ports, round(angle / 90))
+            ports = filter_direction(ports, angle)
         if orientation is not None:
             ports = filter_orientation(ports, orientation)
         return list(ports)
@@ -355,7 +355,7 @@ def cell_ports(self) -> DPorts:
 
     def filter(
         self,
-        angle: float | None = None,
+        angle: int | None = None,
         orientation: float | None = None,
         layer: LayerEnum | int | None = None,
         port_type: str | None = None,