Merge pull request #149 from gdsfactory/feat/consolidate-tags-on-decorator

refactor: consolidate cell tags onto @gf.cell decorator

Author: ThomasPluck

ihp/cells/antennas.py

@@ -131,7 +131,6 @@ def dantenna_schematic(
     guardRingDistance: float = 1.0,
 ) -> DSchematic:
     s = DSchematic()
-    s.info["tags"] = ["IHP", "diode", "antenna"]
     s.info["symbol"] = "diode"
     s.info["ports"] = [
         {"name": "1", "side": "top", "type": "electric"},
@@ -153,7 +152,7 @@ def dantenna_schematic(
     return s
 
 
-@gf.cell(schematic_function=dantenna_schematic, tags={"type": "antennas"})
+@gf.cell(schematic_function=dantenna_schematic, tags=["IHP", "diode", "antenna"])
 def dantenna(
     width: float = 0.78,
     length: float = 0.78,
@@ -269,7 +268,6 @@ def dpantenna_schematic(
     guardRingDistance: float = 1.0,
 ) -> DSchematic:
     s = DSchematic()
-    s.info["tags"] = ["IHP", "diode", "antenna"]
     s.info["symbol"] = "diode"
     s.info["ports"] = [
         {"name": "1", "side": "top", "type": "electric"},
@@ -291,7 +289,7 @@ def dpantenna_schematic(
     return s
 
 
-@gf.cell(schematic_function=dpantenna_schematic, tags={"type": "antennas"})
+@gf.cell(schematic_function=dpantenna_schematic, tags=["IHP", "diode", "antenna"])
 def dpantenna(
     width: float = 0.78,
     length: float = 0.78,

ihp/cells/bjt_transistors.py

@@ -48,7 +48,6 @@ def npn13G2_schematic(
     CMetY2: float = 0,
 ) -> DSchematic:
     s = DSchematic()
-    s.info["tags"] = ["IHP", "bjt", "npn"]
     s.info["symbol"] = "npn"
     s.info["ports"] = [
         {"name": "BN", "side": "top", "type": "electric"},
@@ -79,7 +78,7 @@ def npn13G2_schematic(
     return s
 
 
-@gf.cell(schematic_function=npn13G2_schematic, tags={"type": "bjt_transistors"})
+@gf.cell(schematic_function=npn13G2_schematic, tags=["IHP", "bjt", "npn"])
 def npn13G2(
     baspolyx: float = 0.3,
     bipwinx: float = 0.07,
@@ -781,7 +780,6 @@ def npn13G2L_schematic(
     Nx: int = 1,
 ) -> DSchematic:
     s = DSchematic()
-    s.info["tags"] = ["IHP", "bjt", "npn"]
     s.info["symbol"] = "npn"
     s.info["ports"] = [
         {"name": "BN", "side": "top", "type": "electric"},
@@ -810,7 +808,7 @@ def npn13G2L_schematic(
     return s
 
 
-@gf.cell(schematic_function=npn13G2L_schematic, tags={"type": "bjt_transistors"})
+@gf.cell(schematic_function=npn13G2L_schematic, tags=["IHP", "bjt", "npn"])
 def npn13G2L(
     emitter_length: float = 1,
     emitter_width: float = 0.07,
@@ -1374,7 +1372,6 @@ def npn13G2V_schematic(
     Nx: int = 1,
 ) -> DSchematic:
     s = DSchematic()
-    s.info["tags"] = ["IHP", "bjt", "npn"]
     s.info["symbol"] = "npn"
     s.info["ports"] = [
         {"name": "BN", "side": "top", "type": "electric"},
@@ -1403,7 +1400,7 @@ def npn13G2V_schematic(
     return s
 
 
-@gf.cell(schematic_function=npn13G2V_schematic, tags={"type": "bjt_transistors"})
+@gf.cell(schematic_function=npn13G2V_schematic, tags=["IHP", "bjt", "npn"])
 def npn13G2V(
     emitter_length: float = 1,
     emitter_width: float = 0.12,
@@ -2073,7 +2070,6 @@ def contactArray(
 
 def pnpMPA_schematic(length: float = 2, width: float = 0.7) -> DSchematic:
     s = DSchematic()
-    s.info["tags"] = ["IHP", "bjt", "pnp"]
     s.info["symbol"] = "pnp"
     s.info["ports"] = [
         {"name": "E", "side": "bottom", "type": "electric"},
@@ -2097,7 +2093,7 @@ def pnpMPA_schematic(length: float = 2, width: float = 0.7) -> DSchematic:
     return s
 
 
-@gf.cell(schematic_function=pnpMPA_schematic, tags={"type": "bjt_transistors"})
+@gf.cell(schematic_function=pnpMPA_schematic, tags=["IHP", "bjt", "pnp"])
 def pnpMPA(length: float = 2, width: float = 0.7) -> gf.Component:
     """Returns the IHP pnpMPA BJT transistor as a gdsfactory Component.
 

ihp/cells/bondpads.py

@@ -31,7 +31,6 @@ def bondpad_schematic(
 ) -> DSchematic:
     _shape_map = {"octagon": 0, "square": 1, "circle": 2}
     s = DSchematic()
-    s.info["tags"] = ["IHP", "bondpad"]
     s.info["symbol"] = "pad"
     s.info["ports"] = [{"name": "PAD", "side": "top", "type": "electric"}]
     s.info["models"] = [
@@ -53,7 +52,7 @@ def bondpad_schematic(
     return s
 
 
-@gf.cell(schematic_function=bondpad_schematic, tags={"type": "bondpads"})
+@gf.cell(schematic_function=bondpad_schematic, tags=["IHP", "bondpad"])
 def bondpad(
     shape: Literal["octagon", "square", "circle"] = "octagon",
     diameter: float = 80.0,
@@ -136,7 +135,7 @@ def bondpad(
     return c
 
 
-@gf.cell(tags={"type": "bondpads"})
+@gf.cell(tags=["IHP", "bondpad", "array"])
 def bondpad_array(
     n_pads: int = 4,
     pad_pitch: float = 100.0,

ihp/cells/capacitors.py

@@ -59,7 +59,7 @@ def cmom_extractor(
     return total_cap * (1 + fringe_field_factor)
 
 
-@gf.cell(tags={"type": "capacitors"})
+@gf.cell(tags=["IHP", "capacitor", "mom"])
 def cmom(
     nfingers: int = 1,
     length: float = 4.0,
@@ -319,7 +319,6 @@ def cmim_schematic(
     length: float = 6.0,
 ) -> DSchematic:
     s = DSchematic()
-    s.info["tags"] = ["IHP", "capacitor", "mim"]
     s.info["symbol"] = "capacitor"
     s.info["ports"] = [
         {"name": "MINUS", "side": "left", "type": "electric"},
@@ -341,7 +340,7 @@ def cmim_schematic(
     return s
 
 
-@gf.cell(schematic_function=cmim_schematic, tags={"type": "capacitors"})
+@gf.cell(schematic_function=cmim_schematic, tags=["IHP", "capacitor", "mim"])
 def cmim(
     width: float = 6.0,
     length: float = 6.0,
@@ -563,7 +562,6 @@ def rfcmim_schematic(
     length: float = 7.0,
 ) -> DSchematic:
     s = DSchematic()
-    s.info["tags"] = ["IHP", "capacitor", "mim", "rf"]
     s.info["symbol"] = "capacitor"
     s.info["ports"] = [
         {"name": "BN", "side": "bottom", "type": "electric"},
@@ -587,7 +585,7 @@ def rfcmim_schematic(
     return s
 
 
-@gf.cell(schematic_function=rfcmim_schematic, tags={"type": "capacitors"})
+@gf.cell(schematic_function=rfcmim_schematic, tags=["IHP", "capacitor", "mim", "rf"])
 def rfcmim(
     width: float = 7.0,
     length: float = 7.0,

ihp/cells/containers.py

@@ -16,7 +16,7 @@
 __all__ = ["add_pads_top", "pack_doe", "pack_doe_grid"]
 
 
-@gf.cell(tags={"type": "containers"})
+@gf.cell(tags=["IHP", "container"])
 def add_pads_top(
     component: ComponentSpec = "straight",
     port_names: Strs | None = None,
@@ -89,7 +89,7 @@ def add_pads_top(
     )
 
 
-@gf.cell(tags={"type": "containers"})
+@gf.cell(tags=["IHP", "container"])
 def pack_doe(
     doe: ComponentSpec,
     settings: dict[str, tuple[Any, ...]],
@@ -132,7 +132,7 @@ def pack_doe(
     )
 
 
-@gf.cell(tags={"type": "containers"})
+@gf.cell(tags=["IHP", "container"])
 def pack_doe_grid(
     doe: ComponentSpec,
     settings: dict[str, tuple[Any, ...]],

ihp/cells/fet_transistors.py

@@ -515,7 +515,6 @@ def nmos_schematic(
     m: int = 1,
 ) -> DSchematic:
     s = DSchematic()
-    s.info["tags"] = ["IHP", "mos", "lv"]
     s.info["symbol"] = "nmos"
     s.info["ports"] = [
         {"name": "D", "side": "top", "type": "electric"},
@@ -546,7 +545,7 @@ def nmos_schematic(
     return s
 
 
-@gf.cell(schematic_function=nmos_schematic, tags={"type": "fet_transistors"})
+@gf.cell(schematic_function=nmos_schematic, tags=["IHP", "mos", "lv"])
 def nmos(
     width: float = 0.15,
     length: float = 0.13,
@@ -591,7 +590,6 @@ def pmos_schematic(
     m: int = 1,
 ) -> DSchematic:
     s = DSchematic()
-    s.info["tags"] = ["IHP", "mos", "lv"]
     s.info["symbol"] = "pmos"
     s.info["ports"] = [
         {"name": "D", "side": "top", "type": "electric"},
@@ -617,7 +615,7 @@ def pmos_schematic(
     return s
 
 
-@gf.cell(schematic_function=pmos_schematic, tags={"type": "fet_transistors"})
+@gf.cell(schematic_function=pmos_schematic, tags=["IHP", "mos", "lv"])
 def pmos(
     width: float = 0.15,
     length: float = 0.13,
@@ -662,7 +660,6 @@ def nmos_hv_schematic(
     m: int = 1,
 ) -> DSchematic:
     s = DSchematic()
-    s.info["tags"] = ["IHP", "mos", "hv"]
     s.info["symbol"] = "nmos"
     s.info["ports"] = [
         {"name": "D", "side": "top", "type": "electric"},
@@ -688,7 +685,7 @@ def nmos_hv_schematic(
     return s
 
 
-@gf.cell(schematic_function=nmos_hv_schematic, tags={"type": "fet_transistors"})
+@gf.cell(schematic_function=nmos_hv_schematic, tags=["IHP", "mos", "hv"])
 def nmos_hv(
     width: float = 0.60,
     length: float = 0.45,
@@ -733,7 +730,6 @@ def pmos_hv_schematic(
     m: int = 1,
 ) -> DSchematic:
     s = DSchematic()
-    s.info["tags"] = ["IHP", "mos", "hv"]
     s.info["symbol"] = "pmos"
     s.info["ports"] = [
         {"name": "D", "side": "top", "type": "electric"},
@@ -759,7 +755,7 @@ def pmos_hv_schematic(
     return s
 
 
-@gf.cell(schematic_function=pmos_hv_schematic, tags={"type": "fet_transistors"})
+@gf.cell(schematic_function=pmos_hv_schematic, tags=["IHP", "mos", "hv"])
 def pmos_hv(
     width: float = 0.30,
     length: float = 0.40,

ihp/cells/inductors.py

@@ -11,7 +11,7 @@ def snap_to_grid(p, grid: float = 0.005):
     return round(p / grid) * grid
 
 
-@gf.cell(tags={"type": "inductors"})
+@gf.cell(tags=["IHP", "inductor"])
 def inductor2(
     width: float = 2.0,
     space: float = 2.1,
@@ -305,7 +305,7 @@ def inductor2(
     return c
 
 
-@gf.cell(tags={"type": "inductors"})
+@gf.cell(tags=["IHP", "inductor"])
 def inductor3(
     width: float = 2.0,
     space: float = 2.1,

ihp/cells/passives.py

@@ -23,7 +23,6 @@ def svaricap_schematic(
     nf: int = 1,
 ) -> DSchematic:
     s = DSchematic()
-    s.info["tags"] = ["IHP", "varicap", "hv"]
     s.info["symbol"] = "varicap"
     s.info["ports"] = [
         {"name": "BN", "side": "top", "type": "electric"},
@@ -49,7 +48,7 @@ def svaricap_schematic(
     return s
 
 
-@gf.cell(schematic_function=svaricap_schematic, tags={"type": "passives"})
+@gf.cell(schematic_function=svaricap_schematic, tags=["IHP", "varicap", "hv"])
 def svaricap(
     width: float = 1.0,
     length: float = 1.0,
@@ -219,7 +218,6 @@ def esd_nmos_schematic(
     nf: int = 10,
 ) -> DSchematic:
     s = DSchematic()
-    s.info["tags"] = ["IHP", "esd", "lv"]
     s.info["symbol"] = "nmos"
     s.info["ports"] = [
         {"name": "VDD", "side": "top", "type": "electric"},
@@ -241,7 +239,7 @@ def esd_nmos_schematic(
     return s
 
 
-@gf.cell(schematic_function=esd_nmos_schematic, tags={"type": "passives"})
+@gf.cell(schematic_function=esd_nmos_schematic, tags=["IHP", "esd", "lv"])
 def esd_nmos(
     width: float = 50.0,
     length: float = 0.5,
@@ -420,7 +418,6 @@ def ptap1_schematic(
     cols: int = 1,
 ) -> DSchematic:
     s = DSchematic()
-    s.info["tags"] = ["IHP", "tap", "p-type"]
     s.info["symbol"] = "tap"
     s.info["ports"] = [
         {"name": "P1", "side": "top", "type": "electric"},
@@ -442,7 +439,7 @@ def ptap1_schematic(
     return s
 
 
-@gf.cell(schematic_function=ptap1_schematic, tags={"type": "passives"})
+@gf.cell(schematic_function=ptap1_schematic, tags=["IHP", "tap", "p-type"])
 def ptap1(
     width: float = 1.0,
     length: float = 1.0,
@@ -562,7 +559,6 @@ def ntap1_schematic(
     cols: int = 1,
 ) -> DSchematic:
     s = DSchematic()
-    s.info["tags"] = ["IHP", "tap", "n-type"]
     s.info["symbol"] = "tap"
     s.info["ports"] = [
         {"name": "P1", "side": "top", "type": "electric"},
@@ -584,7 +580,7 @@ def ntap1_schematic(
     return s
 
 
-@gf.cell(schematic_function=ntap1_schematic, tags={"type": "passives"})
+@gf.cell(schematic_function=ntap1_schematic, tags=["IHP", "tap", "n-type"])
 def ntap1(
     width: float = 1.0,
     length: float = 1.0,
@@ -708,7 +704,7 @@ def ntap1(
     return c
 
 
-@gf.cell(tags={"type": "passives"})
+@gf.cell(tags=["IHP", "sealring"])
 def sealring(
     width: float = 200.0,
     height: float = 200.0,
@@ -891,7 +887,7 @@ def sealring(
     return c
 
 
-@gf.cell(tags={"type": "passives"})
+@gf.cell(tags=["IHP", "guardring"])
 def guard_ring(
     width: float = 0.5,
     guardRingSpacing: float = 0.14,