gplugins 1.1.4__tar.gz → 1.2.0__tar.gz

{gplugins-1.1.4 → gplugins-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: gplugins
-Version: 1.1.4
+Version: 1.2.0
 Summary: gdsfactory plugins
 Keywords: python
 Author-email: gdsfactory <contact@gdsfactory.com>
@@ -14,28 +14,23 @@ Requires-Dist: gdsfactory>=8.5.3
 Requires-Dist: pint
 Requires-Dist: gdstk
 Requires-Dist: tqdm
-Requires-Dist: numpy<2
+Requires-Dist: numpy
 Requires-Dist: dagster ; extra == "dagster"
 Requires-Dist: dagit ; extra == "dagster"
 Requires-Dist: pre-commit ; extra == "dev"
 Requires-Dist: pytest ; extra == "dev"
 Requires-Dist: pytest-cov ; extra == "dev"
 Requires-Dist: pytest_regressions ; extra == "dev"
-Requires-Dist: jsondiff ; extra == "dev"
-Requires-Dist: mypy ; extra == "dev"
 Requires-Dist: pyswarms ; extra == "dev"
-Requires-Dist: autograd ; extra == "dev"
-Requires-Dist: hyperopt ; extra == "dev"
-Requires-Dist: tbump ; extra == "dev"
-Requires-Dist: towncrier ; extra == "dev"
 Requires-Dist: ray ; extra == "dev"
+Requires-Dist: autograd ; extra == "dev"
 Requires-Dist: devsim ; extra == "devsim"
 Requires-Dist: pyvista<=0.43.8 ; extra == "devsim"
-Requires-Dist: tidy3d>=2.5.2,<2.8 ; extra == "devsim"
+Requires-Dist: tidy3d>=2.7.8,<2.8 ; extra == "devsim"
 Requires-Dist: jupytext ; extra == "docs"
 Requires-Dist: matplotlib ; extra == "docs"
 Requires-Dist: jupyter-book~=1.0 ; extra == "docs"
-Requires-Dist: pyvista[all, trame]<=0.43.8 ; extra == "docs"
+Requires-Dist: pyvista[all]<=0.43.8 ; extra == "docs"
 Requires-Dist: femwell~=0.1.11 ; extra == "femwell"
 Requires-Dist: meshwell~=1.0.7 ; extra == "femwell"
 Requires-Dist: jinja2 ; extra == "gfviz"
@@ -55,11 +50,16 @@ Requires-Dist: klayout ; extra == "klayout"
 Requires-Dist: pyvis<=0.3.1 ; extra == "klayout"
 Requires-Dist: vlsir~=6.0 ; extra == "klayout"
 Requires-Dist: vlsirtools~=6.0 ; extra == "klayout"
+Requires-Dist: luminescent~=0.2.12 ; extra == "luminescent"
+Requires-Dist: sortedcontainers ; extra == "luminescent"
+Requires-Dist: mypy ; extra == "maintainer"
+Requires-Dist: tbump ; extra == "maintainer"
+Requires-Dist: towncrier ; extra == "maintainer"
 Requires-Dist: jax>=0.4.26 ; extra == "meow"
 Requires-Dist: jaxlib>=0.4.26 ; extra == "meow"
 Requires-Dist: flax>=0.8.2 ; extra == "meow"
 Requires-Dist: meow-sim~=0.11.0 ; extra == "meow"
-Requires-Dist: tidy3d>=2.5.2,<2.8 ; extra == "meow"
+Requires-Dist: tidy3d>=2.7.8,<2.8 ; extra == "meow"
 Requires-Dist: jax>=0.4.26 ; extra == "sax"
 Requires-Dist: jaxlib>=0.4.26 ; extra == "sax"
 Requires-Dist: flax>=0.8.2 ; extra == "sax"
@@ -69,9 +69,9 @@ Requires-Dist: pyvis<=0.3.1 ; extra == "sax"
 Requires-Dist: bokeh ; extra == "schematic"
 Requires-Dist: ipywidgets ; extra == "schematic"
 Requires-Dist: natsort ; extra == "schematic"
-Requires-Dist: tidy3d>=2.5.2,<2.8 ; extra == "tidy3d"
+Requires-Dist: tidy3d>=2.7.8,<2.8 ; extra == "tidy3d"
 Requires-Dist: meshio ; extra == "tidy3d"
-Requires-Dist: numpy<2 ; extra == "tidy3d"
+Requires-Dist: numpy ; extra == "tidy3d"
 Requires-Dist: meshwell~=1.0.7 ; extra == "tidy3d"
 Requires-Dist: vlsir~=6.0 ; extra == "vlsir"
 Requires-Dist: vlsirtools~=6.0 ; extra == "vlsir"
@@ -83,13 +83,15 @@ Provides-Extra: femwell
 Provides-Extra: gfviz
 Provides-Extra: gmsh
 Provides-Extra: klayout
+Provides-Extra: luminescent
+Provides-Extra: maintainer
 Provides-Extra: meow
 Provides-Extra: sax
 Provides-Extra: schematic
 Provides-Extra: tidy3d
 Provides-Extra: vlsir
 
-# gplugins 1.1.4
+# gplugins 1.2.0
 
 [![docs](https://github.com/gdsfactory/gplugins/actions/workflows/pages.yml/badge.svg)](https://gdsfactory.github.io/gplugins/)
 [![PyPI](https://img.shields.io/pypi/v/gplugins)](https://pypi.org/project/gplugins/)
@@ -97,7 +99,7 @@ Provides-Extra: vlsir
 [![MIT](https://img.shields.io/github/license/gdsfactory/gplugins)](https://choosealicense.com/licenses/mit/)
 [![codecov](https://img.shields.io/codecov/c/github/gdsfactory/gplugins)](https://codecov.io/gh/gdsfactory/gdsfactory/tree/main/gplugins)
 
-gdsfactory plugins:
+GDSFactory plugins:
 
 - `devsim` TCAD device simulator.
 - `meow` Eigen Mode Expansion (EME).
@@ -107,13 +109,15 @@ gdsfactory plugins:
 - `lumerical` For Ansys FDTD and Circuit interconnect.
 - `klayout` for fill, dataprep and testing.
 - `ray` for distributed computing and optimization.
-- `sax` S-parameter circuit solver.
 - `schematic`: for bokeh schematic editor and `path_length_analysis`.
 - `meep` for FDTD.
 - `mpb` for MPB mode solver.
 - `elmer` for electrostatic (capacitive) simulations.
 - `palace` for full-wave driven (S parameter) and electrostatic (capacitive) simulations.
+- `sax` S-parameter circuit solver.
 - `vlsir` for parsing GDS-extracted circuit netlists into Cadence Spectre, NgSpice and Xyce Schematic File formats.
+- `luminescent` for FDTD simulations.
+
 
 ## Installation
 
@@ -144,6 +148,27 @@ The following plugins require special installation as they can't be installed wi
 - For Elmer, refer to [Elmer FEM – Installation](https://www.elmerfem.org/blog/binaries/) for installation or compilation instructions each platform. Gplugins assumes `ElmerSolver`, `ElmerSolver_mpi`, and `ElmerGrid` are available in your PATH environment variable.
 - For Palace, refer to [Palace – Installation](https://awslabs.github.io/palace/stable/install/) for compilation instructions using Spack or Singularity. Gplugins assumes `palace` is available in your PATH environment variable.
 
+## Installation for contributors
+
+We recommend `uv` for installing GDSFactory:
+
+```bash
+# On macOS and Linux.
+curl -LsSf https://astral.sh/uv/install.sh | sh
+```
+
+```bash
+# On Windows.
+powershell -ExecutionPolicy ByPass -c "irm https://astral.sh/uv/install.ps1 | iex"
+```
+
+Then you can install gdsfactory with:
+
+```bash
+uv venv --python 3.11
+uv sync --extra docs --extra dev
+```
+
 
 ## Getting started
 

{gplugins-1.1.4 → gplugins-1.2.0}/README.md

@@ -1,4 +1,4 @@
-# gplugins 1.1.4
+# gplugins 1.2.0
 
 [![docs](https://github.com/gdsfactory/gplugins/actions/workflows/pages.yml/badge.svg)](https://gdsfactory.github.io/gplugins/)
 [![PyPI](https://img.shields.io/pypi/v/gplugins)](https://pypi.org/project/gplugins/)
@@ -6,7 +6,7 @@
 [![MIT](https://img.shields.io/github/license/gdsfactory/gplugins)](https://choosealicense.com/licenses/mit/)
 [![codecov](https://img.shields.io/codecov/c/github/gdsfactory/gplugins)](https://codecov.io/gh/gdsfactory/gdsfactory/tree/main/gplugins)
 
-gdsfactory plugins:
+GDSFactory plugins:
 
 - `devsim` TCAD device simulator.
 - `meow` Eigen Mode Expansion (EME).
@@ -16,13 +16,15 @@ gdsfactory plugins:
 - `lumerical` For Ansys FDTD and Circuit interconnect.
 - `klayout` for fill, dataprep and testing.
 - `ray` for distributed computing and optimization.
-- `sax` S-parameter circuit solver.
 - `schematic`: for bokeh schematic editor and `path_length_analysis`.
 - `meep` for FDTD.
 - `mpb` for MPB mode solver.
 - `elmer` for electrostatic (capacitive) simulations.
 - `palace` for full-wave driven (S parameter) and electrostatic (capacitive) simulations.
+- `sax` S-parameter circuit solver.
 - `vlsir` for parsing GDS-extracted circuit netlists into Cadence Spectre, NgSpice and Xyce Schematic File formats.
+- `luminescent` for FDTD simulations.
+
 
 ## Installation
 
@@ -53,6 +55,27 @@ The following plugins require special installation as they can't be installed wi
 - For Elmer, refer to [Elmer FEM – Installation](https://www.elmerfem.org/blog/binaries/) for installation or compilation instructions each platform. Gplugins assumes `ElmerSolver`, `ElmerSolver_mpi`, and `ElmerGrid` are available in your PATH environment variable.
 - For Palace, refer to [Palace – Installation](https://awslabs.github.io/palace/stable/install/) for compilation instructions using Spack or Singularity. Gplugins assumes `palace` is available in your PATH environment variable.
 
+## Installation for contributors
+
+We recommend `uv` for installing GDSFactory:
+
+```bash
+# On macOS and Linux.
+curl -LsSf https://astral.sh/uv/install.sh | sh
+```
+
+```bash
+# On Windows.
+powershell -ExecutionPolicy ByPass -c "irm https://astral.sh/uv/install.ps1 | iex"
+```
+
+Then you can install gdsfactory with:
+
+```bash
+uv venv --python 3.11
+uv sync --extra docs --extra dev
+```
+
 
 ## Getting started
 

{gplugins-1.1.4 → gplugins-1.2.0}/gplugins/__init__.py

@@ -1,6 +1,6 @@
 """gplugins - gdsfactory plugins."""
 
-__version__ = "1.1.4"
+__version__ = "1.2.0"
 
 import pathlib
 
@@ -20,4 +20,4 @@ class Paths:
 
 PATH = Paths()
 
-__all__ = ["plot", "get_effective_indices", "port_symmetries"]
+__all__ = ["get_effective_indices", "plot", "port_symmetries"]

{gplugins-1.1.4 → gplugins-1.2.0}/gplugins/common/utils/get_component_with_net_layers.py

@@ -1,8 +1,8 @@
 import copy
 
 import gdsfactory as gf
-from gdsfactory.technology import LogicalLayer
-from gdsfactory.typings import Component, LayerStack
+from gdsfactory import Component
+from gdsfactory.technology import LayerStack, LogicalLayer
 
 
 def get_component_layer_stack(

{gplugins-1.1.4 → gplugins-1.2.0}/gplugins/femwell/__init__.py

@@ -2,4 +2,4 @@ from __future__ import annotations
 
 from .mode_solver import compute_component_slice_modes, compute_cross_section_modes
 
-__all__ = ("compute_cross_section_modes", "compute_component_slice_modes")
+__all__ = ("compute_component_slice_modes", "compute_cross_section_modes")

{gplugins-1.1.4 → gplugins-1.2.0}/gplugins/gmsh/get_mesh.py

@@ -3,7 +3,8 @@ from pathlib import Path
 import gdsfactory as gf
 import meshio
 from gdsfactory import Component
-from gdsfactory.typings import ComponentSpec, Layer, LayerStack
+from gdsfactory.technology import LayerStack
+from gdsfactory.typings import ComponentSpec, Layer
 
 from gplugins.gmsh.uz_xsection_mesh import uz_xsection_mesh
 from gplugins.gmsh.xy_xsection_mesh import xy_xsection_mesh
@@ -47,7 +48,9 @@ def get_mesh(
         xsection_bounds: used to define in-plane line for uz meshing.
         wafer_padding: padding beyond bbox to add to WAFER layers.
         wafer_layer: layer to use for WAFER padding.
+        default_characteristic_length: default characteristic length for meshing.
         background_remeshing_file: .pos file to use as a remeshing field. Overrides resolutions if not None.
+        kwargs: additional arguments for the target meshing function in gplugins.gmsh.
 
     Keyword Args:
         Arguments for the target meshing function in gplugins.gmsh

{gplugins-1.1.4 → gplugins-1.2.0}/gplugins/gmsh/uz_xsection_mesh.py

@@ -123,8 +123,8 @@ def get_uz_bounds_layers(
         z_min_sim = z_bounds[0]
         z_max_sim = z_bounds[1]
     else:
-        z_min_sim = -np.Inf
-        z_max_sim = np.Inf
+        z_min_sim = -np.inf
+        z_max_sim = np.inf
 
     # Get in-plane cross-sections
     inplane_bounds_dict = get_u_bounds_layers(layer_polygons_dict, xsection_bounds)

{gplugins-1.1.4 → gplugins-1.2.0}/gplugins/klayout/dataprep/regions.py

@@ -28,10 +28,7 @@ def _is_layer(value: any) -> bool:
         layer, datatype = value
     except Exception:
         return False
-    if isinstance(layer, int) and isinstance(datatype, int):
-        return True
-    else:
-        return False
+    return isinstance(layer, int) and isinstance(datatype, int)
 
 
 def _assert_is_layer(value: any) -> None:
@@ -129,10 +126,10 @@ class RegionCollection:
         """Write gds.
 
         Args:
-            gdspath: output gds path
-            top_cell_name: name to use for the top cell of the output library
+            gdspath: output gds path.
+            top_cell_name: name to use for the top cell of the output library.
             keep_original: if True, keeps all original cells (and hierarchy, to the extent possible) in the output. If false, only explicitly defined layers are output.
-            save_options: if provided, specified KLayout SaveLayoutOptions are used when writing the GDS
+            save_options: if provided, specified KLayout SaveLayoutOptions are used when writing the GDS.
         """
         # use the working top cell name if not provided
         if top_cell_name is None:

{gplugins-1.1.4 → gplugins-1.2.0}/gplugins/klayout/tests/test_dataprep_regions.py

@@ -2,7 +2,7 @@ from unittest.mock import MagicMock
 
 import gdsfactory as gf
 import pytest
-from gdsfactory.generic_tech.layer_map import LAYER as l
+from gdsfactory.generic_tech.layer_map import LAYER
 from kfactory import kdb
 
 import gplugins.klayout.dataprep.regions as dp
@@ -23,7 +23,7 @@ def mock_region() -> kdb.Region:
 def region_collection() -> dp.RegionCollection:
     c = gf.Component()
     ring = c << gf.components.coupler_ring()
-    c << gf.components.bbox(ring, layer=l.FLOORPLAN)
+    c << gf.components.bbox(ring, layer=LAYER.FLOORPLAN)
     gdspath = c.write_gds()
     return dp.RegionCollection(gdspath)
 
@@ -93,10 +93,6 @@ def test_RegionCollection_init(region_collection) -> None:
     assert region_collection[(1, 0)]
 
 
-def test_region_collection_contains(region_collection) -> None:
-    assert l.FLOORPLAN in region_collection
-
-
 if __name__ == "__main__":
     import pathlib
 

{gplugins-1.1.4 → gplugins-1.2.0}/gplugins/klayout/tests/test_global_density.py

@@ -58,7 +58,7 @@ expected_global_densities = [
         small_rect1_size=small_rect1_sizes[0],
         small_rect2_size=small_rect2_sizes[0],
     ),
-] * 3 + [0.5]
+] * 3 + [0.125]
 
 
 @pytest.mark.parametrize(

{gplugins-1.1.4 → gplugins-1.2.0}/gplugins/meow/meow_eme.py

@@ -1,3 +1,4 @@
+import itertools
 import pathlib
 import pprint
 import time
@@ -326,7 +327,7 @@ class MEOW:
             ez_interfaces=True,
         )
         cells = []
-        for z_min, z_max in zip(zs[:-1], zs[1:]):
+        for z_min, z_max in itertools.pairwise(zs):
             cell = mw.Cell(
                 structures=self.structs,
                 mesh=mesh,

{gplugins-1.1.4 → gplugins-1.2.0}/gplugins/modes/find_coupling_vs_gap.py

@@ -7,7 +7,7 @@ import meep as mp
 import numpy as np
 import pandas as pd
 import pydantic
-from gdsfactory.typings import Optional, PathType
+from gdsfactory.typings import PathType
 from tqdm.auto import tqdm
 
 from gplugins.modes.find_modes import find_modes_coupler
@@ -65,7 +65,7 @@ def find_coupling_vs_gap(
     nmodes: int = 4,
     wavelength: float = 1.55,
     parity=mp.NO_PARITY,
-    filepath: Optional[PathType] = None,
+    filepath: PathType | None = None,
     overwrite: bool = False,
     **kwargs,
 ) -> pd.DataFrame:
@@ -129,6 +129,7 @@ def find_coupling_vs_gap(
 
 
 def plot_coupling_vs_gap(df: pd.DataFrame, **kwargs) -> None:
+    """Plots coupling vs gap."""
     plt.plot(df.gap, df.lc, ".-")
     plt.ylabel("100% coupling length (um)")
     plt.xlabel("gap (um)")

{gplugins-1.1.4 → gplugins-1.2.0}/gplugins/modes/find_neff_vs_width.py

@@ -7,7 +7,7 @@ import meep as mp
 import numpy as np
 import pandas as pd
 import pydantic
-from gdsfactory.typings import Optional, PathType
+from gdsfactory.typings import PathType
 from tqdm.auto import tqdm
 
 from gplugins.modes.find_modes import find_modes_waveguide
@@ -21,7 +21,7 @@ def find_neff_vs_width(
     nmodes: int = 4,
     wavelength: float = 1.55,
     parity=mp.NO_PARITY,
-    filepath: Optional[PathType] = None,
+    filepath: PathType | None = None,
     overwrite: bool = False,
     **kwargs,
 ) -> pd.DataFrame:

{gplugins-1.1.4 → gplugins-1.2.0}/gplugins/path_length_analysis/path_length_analysis_from_gds.py

@@ -244,7 +244,7 @@ def centerline_single_poly_2_ports(poly, under_sampling, port_list) -> np.ndarra
 
 
 def extract_paths(
-    component: gf.typings.Component | kf.Instance,
+    component: gf.Component | kf.Instance,
     layer: tuple[int, int] = (1, 0),
     plot: bool = False,
     filter_function: Callable | None = None,
@@ -294,12 +294,12 @@ def extract_paths(
 
     if consider_ports is not None:
         # Only ports in the specified list
-        consider_ports = [component.ports[port_name] for port_name in consider_ports]
+        ports_list = [component.ports[port_name] for port_name in consider_ports]
     else:
         # All ports
-        consider_ports = component.ports
+        ports_list = component.ports
 
-    n_ports = len(consider_ports)
+    n_ports = len(ports_list)
     if n_ports == 0:
         raise ValueError(
             "The specified component does not have ports - path length extraction will not work."
@@ -328,15 +328,15 @@ def extract_paths(
             # This is the simplest case - a straight or a bend
 
             if poly[0].is_box():  # only 4 points, no undersampling
-                centerline = centerline_single_poly_2_ports(poly, 1, consider_ports)
+                centerline = centerline_single_poly_2_ports(poly, 1, ports_list)
             else:
                 centerline = centerline_single_poly_2_ports(
-                    poly, under_sampling, consider_ports
+                    poly, under_sampling, ports_list
                 )
             if filter_function is not None:
                 centerline = filter_function(centerline)
             p = gf.Path(centerline)
-            paths[f"{consider_ports[0].name};{consider_ports[1].name}"] = p
+            paths[f"{ports_list[0].name};{ports_list[1].name}"] = p
 
         else:
             # Single polygon and more than 2 ports - MMI
@@ -373,15 +373,15 @@ def extract_paths(
     if len(polys) > 1:
         # Multiple polygons - iterate through each one
 
-        all_ports = list()
+        all_ports = []
 
         for poly in polys:
             # Need to check how many ports does that specific polygon contain
-            ports_poly = list()
+            ports_poly = []
 
-            for port in consider_ports:
+            for port in ports_list:
                 if poly.sized(0.005).inside(DPoint(port.center[0], port.center[1])):
-                    ports_poly.append(port)
+                    ports_poly.append(port)  # noqa: PERF401
 
             if len(ports_poly) == 2:
                 # Each polygon has two ports - simple case
@@ -568,7 +568,7 @@ def extract_paths(
 
 def get_min_radius_and_length_path_dict(path_dict: dict) -> dict:
     """Get the minimum radius of curvature and the length of all paths in the dictionary."""
-    curv_and_len_dict = dict()
+    curv_and_len_dict = {}
     for key, val in path_dict.items():
         curv_and_len_dict[key] = get_min_radius_and_length(val)
 
@@ -683,7 +683,7 @@ if __name__ == "__main__":
         plot=True,
         under_sampling=1,
         evanescent_coupling=ev_coupling,
-        # consider_ports=["o2", "o3"],
+        consider_ports=["o1", "o2"],
         # port_positions=[(-10.0, -1.6), (30.0, -1.6)],
     )
     r_and_l_dict = get_min_radius_and_length_path_dict(path_dict)

{gplugins-1.1.4 → gplugins-1.2.0}/gplugins/sax/__init__.py

@@ -3,4 +3,4 @@ from __future__ import annotations
 from gplugins.sax import models, read
 from gplugins.sax.plot_model import plot_model
 
-__all__ = ["read", "plot_model", "models"]
+__all__ = ["models", "plot_model", "read"]

{gplugins-1.1.4 → gplugins-1.2.0}/gplugins/sax/build_model.py

@@ -38,6 +38,7 @@ class Model:
         **kwargs,
     ) -> None:
         """Utility class which simplifies the execution of simulations to build compact models for circuit simulations.
+
         Aims to be agnostic to the specific simulator being used.
 
         It contains shared utilities for the different types of Models:

{gplugins-1.1.4 → gplugins-1.2.0}/gplugins/sax/plot_model.py

@@ -27,6 +27,7 @@ def plot_model(
         port1: input port name.
         ports2: list of ports.
         logscale: plots in dB logarithmic scale.
+        fig: matplotlib figure.
         wavelength_start: wavelength min (um).
         wavelength_stop: wavelength max (um).
         wavelength_points: number of wavelength steps.

{gplugins-1.1.4 → gplugins-1.2.0}/gplugins/spice/spice_to_yaml.py

@@ -1,3 +1,4 @@
+# type: ignore
 import os
 import pathlib
 import re
@@ -420,17 +421,15 @@ def get_instances(netlist: str, models: dict) -> list:
     grouped_instances = group_instance_str(netlist)
     instances = []
     non_pdk = []
-    model_names = []
-    for model in models:
-        model_names.append(str(model))
+    model_names = [str(model) for model in models]
+    # Get params using regular expressions
+    pattern = r'(\w+|"[^"]*")\s*=\s*({.*?}|-[0-9.]+|[0-9.]+|f+|y+|x+|"[^"]*")'
     for inst_line in grouped_instances:
         instance = {}
         # Get preamble before parameters (instance name, nets, model name)
         fields = inst_line.split(" ")
         instance["name"] = fields[0]
 
-        # Get params using regular expressions
-        pattern = r'(\w+|"[^"]*")\s*=\s*({.*?}|-[0-9.]+|[0-9.]+|f+|y+|x+|"[^"]*")'
         matches = re.findall(pattern, inst_line)
 
         # Get fields before params
@@ -459,7 +458,7 @@ def get_instances(netlist: str, models: dict) -> list:
                 match = re.match(r"([\d.]+)([un])", value)
                 if match:
                     instance["params"][param] = (
-                        float(match.group(1)) * CONVERSION[match.group(2)]
+                        float(match[1]) * CONVERSION[match.group(2)]
                     )
                 else:
                     try:
@@ -477,12 +476,10 @@ def get_instances(netlist: str, models: dict) -> list:
             instances.append(instance)
         except KeyError:
             non_pdk.append(instance["name"])
-            pass
-
-    if len(non_pdk) > 0:
+    if non_pdk:
         print(
             "LOG: Non-PDK elements detected! Removing instances {"
-            + ", ".join(x for x in non_pdk)
+            + ", ".join(non_pdk)
             + "} from netlist."
         )
     return instances
@@ -540,6 +537,7 @@ def get_instances_info(
                             .
                         }
                     }
+        ignore_electrical: Flag to ignore electrical routes and bundles.
         ignored_info: Ignored param names that will not be put into the 'settings' or 'info' fields (list of str)
 
     Returns:
@@ -671,19 +669,13 @@ def group_instance_str(netlist: str) -> list:
             i
         ].strip().startswith("+"):
             instances.append(lines[i].strip())
-        i = i + 1
+        i += 1
 
         while i < len(lines) and lines[i].strip().startswith("+") and instances:
             instances[-1] = instances[-1] + lines[i].strip()[1:-1]
-            i = i + 1
-
-    # Check that each instance has params. If not, remove them
-    filtered_instances = []
-    for inst in instances:
-        if "=" in inst:
-            filtered_instances.append(inst)
+            i += 1
 
-    return filtered_instances
+    return [inst for inst in instances if "=" in inst]
 
 
 def get_placements(instances: list, mapping: dict, ignore_electrical: bool) -> dict:
@@ -921,10 +913,10 @@ def get_routes(instances, mapping, layers, ignore_electrical):
     """Extract routing information from instances using provided mapping and layers.
 
     Args:
-        - instances: list of instance dictionaries with port and net information.
-        - mapping: dictionary mapping model names to layout cells and their properties.
-        - layers: dictionary defining parameters for different routing layers.
-        - ignore_electrical: boolean indicating whether to ignore electrical routes.
+        instances: list of instance dictionaries with port and net information.
+        mapping: dictionary mapping model names to layout cells and their properties.
+        layers: dictionary defining parameters for different routing layers.
+        ignore_electrical: boolean indicating whether to ignore electrical routes.
 
     Returns:
         - A dictionary of routes organized by bundle types.

{gplugins-1.1.4 → gplugins-1.2.0}/gplugins/tidy3d/component.py

@@ -1,4 +1,5 @@
 """This module contains the Tidy3DComponent class which is used to model 3D components in the Tidy3D simulation environment.
+
 It extends the LayeredComponentBase class and adds additional properties and methods specific to the Tidy3D environment.
 
 Classes:
@@ -207,7 +208,7 @@ class Tidy3DComponent(LayeredComponentBase):
         """
         sim_center = (*self.center[:2], center_z)
         sim_size = (*self.size[:2], sim_size_z)
-        sim = td.Simulation(
+        return td.Simulation(
             size=sim_size,
             center=sim_center,
             structures=self.structures,
@@ -219,7 +220,6 @@ class Tidy3DComponent(LayeredComponentBase):
             symmetry=symmetry,
             **kwargs,
         )
-        return sim
 
     def get_component_modeler(
         self,
@@ -308,7 +308,7 @@ class Tidy3DComponent(LayeredComponentBase):
 
         ports = self.get_ports(mode_spec, port_size_mult, grid_eps=grid_eps)
 
-        modeler = ComponentModeler(
+        return ComponentModeler(
             simulation=sim,
             ports=ports,
             freqs=tuple(freqs),
@@ -319,8 +319,6 @@ class Tidy3DComponent(LayeredComponentBase):
             verbose=verbose,
         )
 
-        return modeler
-
     @td.components.viz.add_ax_if_none
     def plot_slice(
         self,
@@ -495,6 +493,7 @@ def write_sparameters(
         plot_simulation_x: which x coordinate to plot. Defaults to None.
         plot_mode_index: which mode index to plot. Defaults to 0.
         plot_mode_port_name: which port name to plot. Defaults to None.
+        plot_epsilon: whether to plot epsilon. Defaults to False.
         filepath: Optional file path for the S-parameters. If None, uses hash of simulation.
         overwrite: Whether to overwrite existing S-parameters. Defaults to False.
         kwargs: Additional keyword arguments for the tidy3d Simulation constructor.