Merge pull request gdsfactory#4090 from abdelq/routing_port_type

Inferring port type for the cross section in route functions

Author: joamatab

gdsfactory/routing/route_bundle.py

@@ -14,7 +14,7 @@
 
 from collections.abc import Sequence
 from functools import partial
-from typing import Literal
+from typing import Literal, cast
 from warnings import warn
 
 import kfactory as kf
@@ -179,34 +179,38 @@ def route_bundle(
         c.plot()
 
     """
-    if layer and cross_section:
-        raise ValueError(
-            f"Cannot have both {layer=} and {cross_section=} provided. Choose one."
-        )
     if cross_section is None:
-        if layer is not None and route_width is not None:
-            cross_section = partial(
-                gf.cross_section.cross_section, layer=layer, width=route_width
-            )
-
-        else:
+        if layer is None or route_width is None:
             raise ValueError(
                 f"Either {cross_section=} or {layer=} and {route_width=} must be provided"
             )
+    elif layer is not None:
+        raise ValueError(
+            f"Cannot have both {layer=} and {cross_section=} provided. Choose one."
+        )
 
     c = component
     ports1_ = list(ports1)
     ports2_ = list(ports2)
     port_type = port_type or ports1_[0].port_type
 
+    if cross_section is None:
+        cross_section = partial(
+            gf.cross_section.cross_section,
+            layer=cast(LayerSpec, layer),
+            width=cast(float, route_width),
+            port_names=("e1", "e2") if port_type == "electrical" else ("o1", "o2"),
+            port_types=(port_type, port_type),
+        )
+
     if len(ports1_) != len(ports2_):
         raise ValueError(
             f"ports1={len(ports1_)} and ports2={len(ports2_)} must be equal"
         )
-    if route_width is None or route_width == 0:
-        xs = gf.get_cross_section(cross_section)
-    else:
+    if route_width:
         xs = gf.get_cross_section(cross_section, width=route_width)
+    else:
+        xs = gf.get_cross_section(cross_section)
     width = route_width or xs.width
 
     radius = radius or xs.radius

gdsfactory/routing/route_single.py

@@ -106,36 +106,33 @@ def route_single(
         gf.routing.route_single(c, mmi1.ports["o2"], mmi2.ports["o1"], radius=5, cross_section="strip")
         c.plot()
     """
-    p1 = port1
-    p2 = port2
-    c = component
-
     if cross_section is None:
         if layer is None or route_width is None:
             raise ValueError(
                 f"Either {cross_section=} or {layer=} and route_width must be provided"
             )
 
-        elif radius:
-            cross_section = gf.cross_section.cross_section(
-                layer=layer,
-                width=route_width,
-                radius=radius,
-            )
-        else:
-            cross_section = gf.cross_section.cross_section(
-                layer=layer,
-                width=route_width,
-            )
-
+    c = component
+    p1 = port1
+    p2 = port2
     port_type = port_type or p1.port_type
+
+    if cross_section is None:
+        cross_section = gf.cross_section.cross_section(
+            layer=cast(LayerSpec, layer),
+            width=cast(float, route_width),
+            port_names=("e1", "e2") if port_type == "electrical" else ("o1", "o2"),
+            port_types=(port_type, port_type),
+        )
+
     if route_width:
         xs = gf.get_cross_section(cross_section, width=route_width)
     else:
         xs = gf.get_cross_section(cross_section)
     width = route_width or xs.width
+
     radius = radius or xs.radius
-    bend90 = gf.get_component(bend, cross_section=xs, radius=radius)
+    bend90 = gf.get_component(bend, cross_section=xs, radius=radius, width=width)
     if auto_taper:
         p1 = add_auto_tapers(component, [p1], xs, layer_transitions)[0]
         p2 = add_auto_tapers(component, [p2], xs, layer_transitions)[0]

test-data-regression/test_netlists_edge_coupler_array_with_loopback_.yml

@@ -1,5 +1,5 @@
 instances:
-  bend_euler_gdsfactorypc_24164978_0_889000_A180:
+  bend_euler_gdsfactorypc_1e74d3cf_0_889000_A180:
     component: bend_euler
     info:
       dy: 30
@@ -22,9 +22,9 @@ instances:
       npoints: null
       p: 0.5
       radius: 30
-      width: null
+      width: 0.5
       with_arc_floorplan: true
-  bend_euler_gdsfactorypc_24164978_m1000_127000_A180:
+  bend_euler_gdsfactorypc_1e74d3cf_m1000_127000_A180:
     component: bend_euler
     info:
       dy: 30
@@ -47,9 +47,9 @@ instances:
       npoints: null
       p: 0.5
       radius: 30
-      width: null
+      width: 0.5
       with_arc_floorplan: true
-  bend_euler_gdsfactorypc_24164978_m30000_792000_A270:
+  bend_euler_gdsfactorypc_1e74d3cf_m30000_792000_A270:
     component: bend_euler
     info:
       dy: 30
@@ -72,9 +72,9 @@ instances:
       npoints: null
       p: 0.5
       radius: 30
-      width: null
+      width: 0.5
       with_arc_floorplan: true
-  bend_euler_gdsfactorypc_24164978_m31000_30000_A270:
+  bend_euler_gdsfactorypc_1e74d3cf_m31000_30000_A270:
     component: bend_euler
     info:
       dy: 30
@@ -97,7 +97,7 @@ instances:
       npoints: null
       p: 0.5
       radius: 30
-      width: null
+      width: 0.5
       with_arc_floorplan: true
   extend_ports_gdsfactory_a22b19de_0_0:
     component: extend_ports
@@ -147,39 +147,39 @@ instances:
       width: null
 name: edge_coupler_array_with_76837e7b
 nets:
-- p1: bend_euler_gdsfactorypc_24164978_0_889000_A180,o1
+- p1: bend_euler_gdsfactorypc_1e74d3cf_0_889000_A180,o1
   p2: extend_ports_gdsfactory_a22b19de_0_0,o8
-- p1: bend_euler_gdsfactorypc_24164978_0_889000_A180,o2
+- p1: bend_euler_gdsfactorypc_1e74d3cf_0_889000_A180,o2
   p2: straight_gdsfactorypcom_602f5a09_m30000_792000_A90,o2
-- p1: bend_euler_gdsfactorypc_24164978_m1000_127000_A180,o1
+- p1: bend_euler_gdsfactorypc_1e74d3cf_m1000_127000_A180,o1
   p2: extend_ports_gdsfactory_a22b19de_0_0,o2
-- p1: bend_euler_gdsfactorypc_24164978_m1000_127000_A180,o2
+- p1: bend_euler_gdsfactorypc_1e74d3cf_m1000_127000_A180,o2
   p2: straight_gdsfactorypcom_602f5a09_m31000_30000_A90,o2
-- p1: bend_euler_gdsfactorypc_24164978_m30000_792000_A270,o1
+- p1: bend_euler_gdsfactorypc_1e74d3cf_m30000_792000_A270,o1
   p2: straight_gdsfactorypcom_602f5a09_m30000_792000_A90,o1
-- p1: bend_euler_gdsfactorypc_24164978_m30000_792000_A270,o2
+- p1: bend_euler_gdsfactorypc_1e74d3cf_m30000_792000_A270,o2
   p2: extend_ports_gdsfactory_a22b19de_0_0,o7
-- p1: bend_euler_gdsfactorypc_24164978_m31000_30000_A270,o1
+- p1: bend_euler_gdsfactorypc_1e74d3cf_m31000_30000_A270,o1
   p2: straight_gdsfactorypcom_602f5a09_m31000_30000_A90,o1
-- p1: bend_euler_gdsfactorypc_24164978_m31000_30000_A270,o2
+- p1: bend_euler_gdsfactorypc_1e74d3cf_m31000_30000_A270,o2
   p2: extend_ports_gdsfactory_a22b19de_0_0,o1
 placements:
-  bend_euler_gdsfactorypc_24164978_0_889000_A180:
+  bend_euler_gdsfactorypc_1e74d3cf_0_889000_A180:
     mirror: false
     rotation: 180
     x: 0
     y: 889
-  bend_euler_gdsfactorypc_24164978_m1000_127000_A180:
+  bend_euler_gdsfactorypc_1e74d3cf_m1000_127000_A180:
     mirror: false
     rotation: 180
     x: -1
     y: 127
-  bend_euler_gdsfactorypc_24164978_m30000_792000_A270:
+  bend_euler_gdsfactorypc_1e74d3cf_m30000_792000_A270:
     mirror: false
     rotation: 270
     x: -30
     y: 792
-  bend_euler_gdsfactorypc_24164978_m31000_30000_A270:
+  bend_euler_gdsfactorypc_1e74d3cf_m31000_30000_A270:
     mirror: false
     rotation: 270
     x: -31