gplugins 1.3.3__tar.gz → 1.3.5__tar.gz

{gplugins-1.3.3 → gplugins-1.3.5}/PKG-INFO

@@ -1,19 +1,18 @@
 Metadata-Version: 2.4
 Name: gplugins
-Version: 1.3.3
+Version: 1.3.5
 Summary: gdsfactory plugins
 Keywords: python
 Author-email: gdsfactory <contact@gdsfactory.com>
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Operating System :: OS Independent
 License-File: LICENSE
 Requires-Dist: gdsfactory>=9.3.5
 Requires-Dist: pint
-Requires-Dist: gdstk
 Requires-Dist: tqdm
 Requires-Dist: numpy
 Requires-Dist: xarray==2025.1.2
@@ -73,6 +72,7 @@ Requires-Dist: tidy3d>=2.8.2,<2.9 ; extra == "tidy3d"
 Requires-Dist: meshio ; extra == "tidy3d"
 Requires-Dist: numpy ; extra == "tidy3d"
 Requires-Dist: meshwell~=1.0.7 ; extra == "tidy3d"
+Requires-Dist: gdstk ; extra == "tidy3d"
 Requires-Dist: vlsir ; extra == "vlsir"
 Requires-Dist: vlsirtools ; extra == "vlsir"
 Provides-Extra: dev
@@ -90,7 +90,7 @@ Provides-Extra: schematic
 Provides-Extra: tidy3d
 Provides-Extra: vlsir
 
-# gplugins 1.3.3
+# gplugins 1.3.5
 
 [![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/)

{gplugins-1.3.3 → gplugins-1.3.5}/README.md

@@ -1,4 +1,4 @@
-# gplugins 1.3.3
+# gplugins 1.3.5
 
 [![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/)

{gplugins-1.3.3 → gplugins-1.3.5}/gplugins/__init__.py

@@ -1,6 +1,6 @@
 """gplugins - gdsfactory plugins."""
 
-__version__ = "1.3.3"
+__version__ = "1.3.5"
 
 import pathlib
 

{gplugins-1.3.3 → gplugins-1.3.5}/gplugins/common/base_models/component.py

@@ -19,6 +19,8 @@ from gplugins.gmsh.parse_gds import cleanup_component
 
 from ..types import AnyShapelyPolygon, GFComponent
 
+from gdsfactory.pdk import get_layer_stack, get_layer, get_layer_name
+
 Coordinate: TypeAlias = tuple[float, float]
 
 
@@ -223,13 +225,22 @@ class LayeredComponentBase(BaseModel):
         )
 
     def get_port_layers(self, port: gf.Port) -> tuple[str, ...]:
-        # FIXME: extract actual layer
-        # this needs to be a list of all layers and derived layers that are
-        # associated with the port layer enum
-        return ("core",)
-        return tuple(
-            k for k, v in self.layer_stack.layers.items() if port.layer in v.layer
-        )
+        layer_name = get_layer_name(port.layer)
+
+        derived_layers = []
+        for l_name, level in self.layer_stack.layers.items():
+            if layer_name in str(level.layer):
+                derived_layers.append(l_name)
+
+        return derived_layers
+
+
+
+
+        # return ("core",)
+        # return tuple(
+        #     k for k, v in self.layer_stack.layers.items() if port.layer in v.layer
+        # )
 
     def get_layer_bbox(
         self, layername: str

{gplugins-1.3.3 → gplugins-1.3.5}/gplugins/gfviz/netlist.py

@@ -1,9 +1,9 @@
 from functools import lru_cache
 
 import gdsfactory as gf
-import gdstk
 import numpy as np
 import shapely.geometry as sg
+import shapely.ops as so
 from natsort import natsorted
 
 
@@ -225,10 +225,12 @@ def get_icon_poly(name):
     polys = min(polys_priority.items(), key=lambda x: x[0])[1]
     if not polys:
         return default
-    polys = gdstk.boolean(polys, [], operation="or")
+    polys = [sg.Polygon(p) for p in polys]
+    polys = so.unary_union(polys)
+    polys = _extract_vertices(polys)
     if not polys:
         return default
-    poly = rdp(polys[0].points)
+    poly = rdp(polys[0])
     if (poly.shape[0] < 3) or (poly.shape[0] > 100):
         return default
     poly = (poly - c.bbox_np()[0:1]) / (c.bbox_np()[1:2] - c.bbox_np()[0:1])
@@ -242,6 +244,14 @@ def get_icon_poly(name):
     return poly
 
 
+def _extract_vertices(geometry):
+    if geometry.geom_type == 'Polygon':
+        return [list(geometry.exterior.coords)]
+    elif geometry.geom_type == 'MultiPolygon':
+        return [list(p.exterior.coords) for p in geometry.geoms]
+    else:
+        raise TypeError(f"Unhandled geometry type: {geometry.geom_type}")
+
 def rdp(poly, eps=0.1):
     poly = np.asarray(poly)
     if not poly.shape:

{gplugins-1.3.3 → gplugins-1.3.5}/gplugins/gmeep/get_meep_geometry.py

@@ -3,9 +3,13 @@ from __future__ import annotations
 import gdsfactory as gf
 import meep as mp
 import numpy as np
-from gdsfactory.pdk import get_layer_stack
+from kfactory import LayerEnum
+from typing import cast
+import shapely
+from gdsfactory.pdk import get_layer_stack, get_layer, get_layer_name
 from gdsfactory.technology import LayerStack
-from gdsfactory.typings import ComponentSpec, CrossSectionSpec
+from gdsfactory.technology import DerivedLayer, LayerStack, LayerViews, LogicalLayer
+from gdsfactory.typings import ComponentSpec, CrossSectionSpec, LayerSpecs
 
 from gplugins.common.utils.parse_layer_stack import order_layer_stack
 from gplugins.gmeep.get_material import get_material
@@ -18,6 +22,7 @@ def get_meep_geometry_from_component(
     wavelength: float = 1.55,
     is_3d: bool = False,
     dispersive: bool = False,
+    exclude_layers: LayerSpecs | None = None,
     **kwargs,
 ) -> list[mp.GeometricObject]:
     """Returns Meep geometry from a gdsfactory component.
@@ -32,6 +37,9 @@ def get_meep_geometry_from_component(
         kwargs: settings.
     """
     component = gf.get_component(component=component, **kwargs)
+    polygons_per_layer = component.get_polygons_points(merge=True)
+
+
     layer_stack = layer_stack or get_layer_stack()
 
     layer_to_thickness = layer_stack.get_layer_to_thickness()
@@ -41,24 +49,40 @@ def get_meep_geometry_from_component(
     component_with_booleans = layer_stack.get_component_with_derived_layers(component)
 
     geometry = []
+    exclude_layers = exclude_layers or []
     layer_to_polygons = component_with_booleans.get_polygons_points()
 
-    ordered_layer_stack_keys = order_layer_stack(layer_stack)[::-1]
+    # ordered_layer_stack_keys = order_layer_stack(layer_stack)[::-1]
+
+    for level in layer_stack.layers.values():
+        layer = level.layer
+
+        if isinstance(layer, LogicalLayer):
+            assert isinstance(layer.layer, tuple | LayerEnum)
+            layer_tuple = cast(tuple[int, int], tuple(layer.layer))
+        elif isinstance(layer, DerivedLayer):
+            assert level.derived_layer is not None
+            assert isinstance(level.derived_layer.layer, tuple | LayerEnum)
+            layer_tuple = cast(tuple[int, int], tuple(level.derived_layer.layer))
+        else:
+            raise ValueError(f"Layer {layer!r} is not a DerivedLayer or LogicalLayer")
 
-    for layername in ordered_layer_stack_keys:
-        layer = layer_stack.layers[layername].layer
+        layer_index = int(get_layer(layer_tuple))
 
-        if layer not in layer_to_polygons:
+        if layer_index in exclude_layers:
             continue
-        polygons = layer_to_polygons[layer]
-        print(f"layer: {layer}, polygons: {polygons}")
 
-        if layer in layer_to_thickness and layer in layer_to_material:
-            height = layer_to_thickness[layer] if is_3d else mp.inf
-            zmin_um = layer_to_zmin[layer] if is_3d else 0
-            # center = mp.Vector3(0, 0, (zmin_um + height) / 2)
+        if layer_index not in polygons_per_layer:
+            continue
 
+        zmin = level.zmin
+        zmin_um = layer_to_zmin[layer] if is_3d else 0
+        if zmin is not None:
+            has_polygons = True
+            polygons = polygons_per_layer[layer_index]
+            height = level.thickness
             for polygon in polygons:
+                p = shapely.geometry.Polygon(polygon)
                 vertices = [mp.Vector3(p[0], p[1], zmin_um) for p in polygon]
                 material_name = layer_to_material[layer]
 
@@ -80,6 +104,7 @@ def get_meep_geometry_from_component(
                             # center=center
                         )
                     )
+
     return geometry
 
 
@@ -163,7 +188,7 @@ if __name__ == "__main__":
 
     import gplugins.gmeep as gm
 
-    c = gf.components.taper_strip_to_ridge_trenches()
+    c = gf.components.straight()
     sp = gm.write_sparameters_meep(
         c, run=False, ymargin_top=3, ymargin_bot=3, is_3d=True
     )

{gplugins-1.3.3 → gplugins-1.3.5}/gplugins/gmeep/get_simulation.py

@@ -170,12 +170,8 @@ def get_simulation(
         else component
     )
 
-    component_extended.show()
-    # component_extended.flatten()
-
-    # geometry_center = [component_extended.x, component_extended.y]
-    # geometry_center = [0, 0]
-    # print(geometry_center)
+    component_extended = component_extended.copy()
+    component_extended.flatten()
 
     layers_thickness = [
         layer_to_thickness[layer]

{gplugins-1.3.3 → gplugins-1.3.5}/gplugins/gmeep/meep_adjoint_optimization.py

@@ -5,7 +5,6 @@ from types import LambdaType
 from typing import Any
 
 import gdsfactory as gf
-import nlopt
 import numpy as np
 from gdsfactory import Component
 from gdsfactory.technology import LayerStack
@@ -190,7 +189,7 @@ def run_meep_adjoint_optimizer(
     cost_function: LambdaType,
     update_variable: np.ndarray,
     maximize_cost_function: bool = True,
-    algorithm: int = nlopt.LD_MMA,
+    algorithm_name: str = "LD_MMA",
     lower_bound: Any = 0,
     upper_bound: Any = 1,
     maxeval: int = 10,
@@ -205,7 +204,7 @@ def run_meep_adjoint_optimizer(
         cost_function: cost function to optimize.
         update_variable: variable to update the optimization with.
         maximize_cost_function: if True, maximize the cost function, else minimize it.
-        algorithm: nlopt algorithm to use (default: nlopt.LD_MMA).
+        algorithm_name: nlopt algorithm to use (default: nlopt.LD_MMA).
         lower_bound: lower bound for the optimization.
         upper_bound: upper bound for the optimization.
         maxeval: maximum number of evaluations.
@@ -219,6 +218,9 @@ def run_meep_adjoint_optimizer(
         threshold_offset_from_max: threshold offset from max eps value.
         layer: layer to apply to the optimized component.
     """
+    import nlopt
+
+    algorithm = getattr(nlopt, algorithm_name)
     solver = nlopt.opt(algorithm, number_of_params)
     solver.set_lower_bounds(lower_bound)
     solver.set_upper_bounds(upper_bound)

{gplugins-1.3.3 → gplugins-1.3.5}/gplugins/gmeep/write_sparameters_meep.py

@@ -19,7 +19,7 @@ from gdsfactory.component import Component
 from gdsfactory.pdk import get_layer_stack
 from gdsfactory.serialization import clean_value_json
 from gdsfactory.technology import LayerStack
-from gdsfactory.typings import ComponentSpec, PathType, Port, PortSymmetries
+from gdsfactory.typings import ComponentSpec, PathType, Port, PortSymmetries, LayerSpec
 from tqdm.auto import tqdm
 
 from gplugins.common.utils import port_symmetries
@@ -151,6 +151,7 @@ def write_sparameters_meep(
     plot_args: dict | None = None,
     only_return_filepath_sim_settings=False,
     verbosity: int = 0,
+    padding_layers: tuple[LayerSpec, ...] = ("PADDING",),
     **settings,
 ) -> dict[str, np.ndarray]:
     r"""Returns Sparameters and writes them to npz filepath.
@@ -340,6 +341,7 @@ def write_sparameters_meep(
 
     component = gf.add_padding_container(
         component,
+        layers=padding_layers,
         default=0,
         top=ymargin_top,
         bottom=ymargin_bot,

{gplugins-1.3.3 → gplugins-1.3.5}/gplugins/gmeep/write_sparameters_meep_mpi.py

@@ -164,7 +164,7 @@ def write_sparameters_meep_mpi(
     with open(parameters_file, "wb") as outp:
         pickle.dump(settings, outp, pickle.HIGHEST_PROTOCOL)
 
-    # Save component to disk through gds for gdstk compatibility
+    # Save component to disk through gds
     component_file = tempfile.with_suffix(".gds")
     component.write_gds(component_file, with_metadata=True)
 

{gplugins-1.3.3 → gplugins-1.3.5}/pyproject.toml

@@ -7,15 +7,14 @@ requires = ["flit_core >=3.2,<4"]
 [project]
 authors = [{name = "gdsfactory", email = "contact@gdsfactory.com"}]
 classifiers = [
-  "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
   "Operating System :: OS Independent"
 ]
 dependencies = [
   "gdsfactory>=9.3.5",
   "pint",
-  "gdstk",
   "tqdm",
   "numpy",
   "xarray==2025.1.2"
@@ -26,7 +25,7 @@ license = {file = "LICENSE"}
 name = "gplugins"
 readme = "README.md"
 requires-python = ">=3.11"
-version = "1.3.3"
+version = "1.3.5"
 
 [project.optional-dependencies]
 dev = [
@@ -71,7 +70,7 @@ sax = [
   "ray"
 ]
 schematic = ["bokeh", "ipywidgets", "natsort"]
-tidy3d = ["tidy3d>=2.8.2,<2.9", "meshio", "numpy", "meshwell~=1.0.7"]
+tidy3d = ["tidy3d>=2.8.2,<2.9", "meshio", "numpy", "meshwell~=1.0.7", "gdstk"]
 vlsir = ["vlsir", "vlsirtools"]
 
 [tool.codespell]
@@ -193,7 +192,7 @@ message_template = "Bump to {new_version}"
 tag_template = "v{new_version}"
 
 [tool.tbump.version]
-current = "1.3.3"
+current = "1.3.5"
 regex = '''
   (?P<major>\d+)
   \.

gplugins-1.3.3/gplugins/common/utils/get_component_with_local_layers.py

@@ -1,128 +0,0 @@
-import copy
-from dataclasses import dataclass
-
-import gdsfactory as gf
-import gdstk
-from gdsfactory.component import Component
-from gdsfactory.pdk import get_layer
-from gdsfactory.typings import Layer
-from gdstk import Polygon
-
-
-@dataclass
-class LocalMapping:
-    """Dataclass to map polygons to new layers.
-
-    Arguments:
-        new_layer_name: new layer name for the updated LayerStack
-        new_layer_number: new layer number for the updated LayerStack and GDS
-        old_layer_name: original LayerStack key entry
-        domains: list of gdstk polygons; Component polygons inside these domains are mapped to new_layer
-    """
-
-    new_layer_name: str
-    new_layer_number: Layer
-    old_layer_name: str
-    domains: list[Polygon]
-
-
-def get_component_with_local_layers(
-    component,
-    layer_stack,
-    mappings: list[LocalMapping],
-    precision: float = 1e-4,
-) -> Component:
-    """Returns a component where polygons within "domains" belonging to "old_layer_name" are remapped to "new_layer_name" (with layer details copied from old_layer), and polygons outside the domain are kept on "old_layer_name".
-
-    Args:
-        component: to process.
-        layer_stack: to process.
-        mappings: list of LocalMapping objects.
-        precision: of the boolean operations.
-    """
-    # Initialize returned component and layerstack
-    local_component = component.copy()
-    local_component.flatten()
-    local_layer_stack = layer_stack.model_copy()
-
-    for mapping in mappings:
-        # Create the new layer
-        old_layer_number = layer_stack.layers[mapping.old_layer_name].layer
-        new_layer = copy.deepcopy(layer_stack.layers[mapping.old_layer_name])
-        new_layer.layer = mapping.new_layer_number
-        local_layer_stack.layers[mapping.new_layer_name] = new_layer
-
-        # Assign the polygons
-        for domain in mapping.domains:
-            layer_polygons = local_component.get_polygons(by_spec=True)[
-                old_layer_number
-            ]
-            local_component.remove_layers([old_layer_number])
-            gds_layer, gds_datatype = tuple(get_layer(old_layer_number))
-            for layer_polygon in layer_polygons:
-                # Polygons inside the domain
-                p_inside = gdstk.boolean(
-                    operand1=gdstk.Polygon(layer_polygon),
-                    operand2=domain,
-                    operation="and",
-                    precision=precision,
-                    layer=gds_layer,
-                    datatype=gds_datatype,
-                )
-                # Outside the domain
-                p_outside = gdstk.boolean(
-                    operand1=gdstk.Polygon(layer_polygon),
-                    operand2=domain,
-                    operation="not",
-                    precision=precision,
-                    layer=gds_layer,
-                    datatype=gds_datatype,
-                )
-                if p_inside:
-                    local_component.add_polygon(
-                        p_inside, layer=mapping.new_layer_number
-                    )
-                if p_outside:
-                    local_component.add_polygon(p_outside, layer=old_layer_number)
-
-    return local_component, local_layer_stack
-
-
-if __name__ == "__main__":
-    c = gf.components.spiral_racetrack_heater_metal()
-
-    layer_stack = gf.generic_tech.LAYER_STACK
-
-    mapping1 = LocalMapping(
-        new_layer_name="test1",
-        old_layer_name="heater",
-        domains=[
-            gdstk.rectangle(
-                corner1=(0, -15),
-                corner2=(10, -60),
-            ),
-            gdstk.rectangle(
-                corner1=(20, -15),
-                corner2=(30, -60),
-            ),
-        ],
-        new_layer_number=(10002, 0),
-    )
-
-    mapping2 = LocalMapping(
-        new_layer_name="test2",
-        old_layer_name="heater",
-        domains=[gdstk.ellipse(center=(30, 10), radius=10)],
-        new_layer_number=(10003, 0),
-    )
-
-    c_local, layer_stack_local = get_component_with_local_layers(
-        c,
-        layer_stack,
-        mappings=[mapping1, mapping2],
-    )
-
-    print(layer_stack_local.layers.keys())
-    print(layer_stack_local.layers["test1"])
-
-    c_local.show()