prefab 1.1.4__py3-none-any.whl → 1.1.5__py3-none-any.whl

prefab/__init__.py

@@ -5,7 +5,7 @@ Usage:
     import prefab as pf
 """
 
-__version__ = "1.1.4"
+__version__ = "1.1.5"
 
 from . import compare, geometry, predict, read, shapes
 from .device import BufferSpec, Device

prefab/compare.py

@@ -24,7 +24,7 @@ def mean_squared_error(device_a: Device, device_b: Device) -> float:
     float
         The mean squared error between two devices.
     """
-    return np.mean((device_a.device_array - device_b.device_array) ** 2)
+    return float(np.mean((device_a.device_array - device_b.device_array) ** 2))
 
 
 def intersection_over_union(device_a: Device, device_b: Device) -> float:
@@ -77,7 +77,7 @@ def hamming_distance(device_a: Device, device_b: Device) -> int:
             "One or both devices are not binarized.", UserWarning, stacklevel=2
         )
 
-    return np.sum(device_a.device_array != device_b.device_array)
+    return int(np.sum(device_a.device_array != device_b.device_array))
 
 
 def dice_coefficient(device_a: Device, device_b: Device) -> float:

prefab/device.py

@@ -1,6 +1,6 @@
 """Provides the Device class for representing photonic devices."""
 
-from typing import Optional
+from typing import TYPE_CHECKING, Optional
 
 import cv2
 import gdstk
@@ -9,7 +9,7 @@ import numpy as np
 from matplotlib.axes import Axes
 from matplotlib.patches import Rectangle
 from PIL import Image
-from pydantic import BaseModel, Field, conint, root_validator, validator
+from pydantic import BaseModel, Field, root_validator, validator
 from scipy.ndimage import distance_transform_edt
 from skimage import measure
 
@@ -17,6 +17,10 @@ from . import compare, geometry
 from .models import Model
 from .predict import predict_array
 
+if TYPE_CHECKING:
+    import gdsfactory as gf
+    import tidy3d as td
+
 Image.MAX_IMAGE_PIXELS = None
 
 
@@ -36,7 +40,7 @@ class BufferSpec(BaseModel):
         ('top', 'bottom', 'left', 'right'), where 'constant' is used for isolated
         structures and 'edge' is utilized for preserving the edge, such as for waveguide
         connections.
-    thickness : dict[str, conint(gt=0)]
+    thickness : dict[str, int]
         A dictionary that defines the thickness of the buffer zone for each side of the
         device ('top', 'bottom', 'left', 'right'). Each value must be greater than 0.
 
@@ -75,7 +79,7 @@ class BufferSpec(BaseModel):
             "right": "constant",
         }
     )
-    thickness: dict[str, conint(gt=0)] = Field(
+    thickness: dict[str, int] = Field(
         default_factory=lambda: {
             "top": 128,
             "bottom": 128,
@@ -91,6 +95,12 @@ class BufferSpec(BaseModel):
             raise ValueError(f"Buffer mode must be one of {allowed_modes}, got '{v}'")
         return v
 
+    @validator("thickness")
+    def check_thickness(cls, v):
+        if not all(t > 0 for t in v.values()):
+            raise ValueError("All thickness values must be greater than 0")
+        return v
+
 
 class Device(BaseModel):
     device_array: np.ndarray = Field(...)
@@ -100,8 +110,8 @@ class Device(BaseModel):
         arbitrary_types_allowed = True
 
     @property
-    def shape(self) -> tuple[int, int]:
-        return self.device_array.shape
+    def shape(self) -> tuple[int, ...]:
+        return tuple(self.device_array.shape)
 
     def __init__(
         self, device_array: np.ndarray, buffer_spec: Optional[BufferSpec] = None
@@ -370,12 +380,14 @@ class Device(BaseModel):
         buffer_thickness = self.buffer_spec.thickness
         buffer_mode = self.buffer_spec.mode
 
-        crop_top = buffer_thickness["top"] if buffer_mode["top"] == "edge" else 0
+        crop_top = buffer_thickness["top"] if buffer_mode["top"] == "constant" else 0
         crop_bottom = (
-            buffer_thickness["bottom"] if buffer_mode["bottom"] == "edge" else 0
+            buffer_thickness["bottom"] if buffer_mode["bottom"] == "constant" else 0
+        )
+        crop_left = buffer_thickness["left"] if buffer_mode["left"] == "constant" else 0
+        crop_right = (
+            buffer_thickness["right"] if buffer_mode["right"] == "constant" else 0
         )
-        crop_left = buffer_thickness["left"] if buffer_mode["left"] == "edge" else 0
-        crop_right = buffer_thickness["right"] if buffer_mode["right"] == "edge" else 0
 
         ndarray = device_array[
             crop_top : device_array.shape[0] - crop_bottom,
@@ -529,8 +541,18 @@ class Device(BaseModel):
             polygons_to_process = hierarchy_polygons[level]
 
             if polygons_to_process:
-                center_x_nm = self.device_array.shape[1] / 2
-                center_y_nm = self.device_array.shape[0] / 2
+                buffer_thickness = self.buffer_spec.thickness
+
+                center_x_nm = (
+                    self.device_array.shape[1]
+                    - buffer_thickness["left"]
+                    - buffer_thickness["right"]
+                ) / 2
+                center_y_nm = (
+                    self.device_array.shape[0]
+                    - buffer_thickness["top"]
+                    - buffer_thickness["bottom"]
+                ) / 2
 
                 center_x_um = center_x_nm / 1000
                 center_y_um = center_y_nm / 1000
@@ -583,7 +605,7 @@ class Device(BaseModel):
         self,
         eps0: float,
         thickness: float,
-    ) -> "td.Structure":  # noqa: F821
+    ) -> "td.Structure":
         """
         Convert the device geometry to a Tidy3D Structure.
 
@@ -622,7 +644,10 @@ class Device(BaseModel):
         eps_dataset = SpatialDataArray(eps_array, coords=dict(x=X, y=Y, z=Z))
         medium = CustomMedium.from_eps_raw(eps_dataset)
         return Structure(
-            geometry=Box(center=(0, 0, 0), size=(inf, inf, thickness)), medium=medium
+            geometry=Box(center=(0, 0, 0), size=(inf, inf, thickness), attrs={}),
+            medium=medium,
+            name="device",
+            attrs={},
         )
 
     def to_3d(self, thickness_nm: int) -> np.ndarray:
@@ -678,7 +703,7 @@ class Device(BaseModel):
             If the numpy-stl package is not installed.
         """
         try:
-            from stl import mesh
+            from stl import mesh  # type: ignore
         except ImportError:
             raise ImportError(
                 "The stl package is required to use this function; "
@@ -764,7 +789,7 @@ class Device(BaseModel):
         self,
         show_buffer: bool = True,
         bounds: Optional[tuple[tuple[int, int], tuple[int, int]]] = None,
-        level: int = None,
+        level: Optional[int] = None,
         ax: Optional[Axes] = None,
         **kwargs,
     ) -> Axes:
@@ -819,7 +844,7 @@ class Device(BaseModel):
         # label: Optional[str] = "Device contour",
         show_buffer: bool = True,
         bounds: Optional[tuple[tuple[int, int], tuple[int, int]]] = None,
-        level: int = None,
+        level: Optional[int] = None,
         ax: Optional[Axes] = None,
         **kwargs,
     ):
@@ -893,7 +918,7 @@ class Device(BaseModel):
         self,
         show_buffer: bool = True,
         bounds: Optional[tuple[tuple[int, int], tuple[int, int]]] = None,
-        level: int = None,
+        level: Optional[int] = None,
         ax: Optional[Axes] = None,
         **kwargs,
     ):
@@ -956,7 +981,7 @@ class Device(BaseModel):
         ref_device: "Device",
         show_buffer: bool = True,
         bounds: Optional[tuple[tuple[int, int], tuple[int, int]]] = None,
-        level: int = None,
+        level: Optional[int] = None,
         ax: Optional[Axes] = None,
         **kwargs,
     ) -> Axes:

{prefab-1.1.4.dist-info → prefab-1.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: prefab
-Version: 1.1.4
+Version: 1.1.5
 Summary: Artificial nanofabrication of integrated photonic circuits using deep learning
 Project-URL: Homepage, https://prefabphotonics.com
 Project-URL: Repository, https://github.com/PreFab-Photonics/PreFab

{prefab-1.1.4.dist-info → prefab-1.1.5.dist-info}/RECORD

@@ -1,13 +1,13 @@
-prefab/__init__.py,sha256=7MmkG6X6FZ7c4lS8eAF5cNu_NYnwIeDVgwCiX9ysYPw,425
+prefab/__init__.py,sha256=0QHTuxxeHo3xJIUq20iQCLiC2nk-rgf2C374l-Aby-g,425
 prefab/__main__.py,sha256=aAgt1WXa44k1nJqsiSD3uAfNeGpwtjWqMUYCHN5_Qrw,2759
-prefab/compare.py,sha256=2MKUT7N2A639tUGCnJHpfF9MmS-v3oARDkTqHbWJ9OM,3239
-prefab/device.py,sha256=l0etqB0559xa9Frb0IKl5N3kU56vWHlwHc-qehINTlw,52292
+prefab/compare.py,sha256=iz0H5EvZFZ5O-N2QOQ6wFe-Hftkfyd6oMYpjfjnrMIw,3251
+prefab/device.py,sha256=kKmud8QxfSBvadeZw56W_MNXqjRIyTA16jNTQ8v69U0,53048
 prefab/geometry.py,sha256=0sa6ietUWZGkxOnUPUzD3q2QpFuOpWkSANoopGpPd6s,11035
 prefab/models.py,sha256=JpBqNFIqbo1ymKEl0NWWF4ZkhvK23rEVVBEFl05TXCI,3671
 prefab/predict.py,sha256=upGTeNC6vY9Tdko6JEM0gKQH1PGUVYXACpep1OT8EVs,10593
 prefab/read.py,sha256=MuF-cugFQ7MWBJ8DOvQuwktIk0fJ8PXBeLye0ydrB8o,14734
 prefab/shapes.py,sha256=2qaqyNzu5WG3wVdk4oQzeNXmhwXRHcPnRZlgRrM4MoA,25576
-prefab-1.1.4.dist-info/METADATA,sha256=FDqQukBN09Eg4BDhn7Q7p46nWOoLwxjWk9CP2VeRoxo,34824
-prefab-1.1.4.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-prefab-1.1.4.dist-info/licenses/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
-prefab-1.1.4.dist-info/RECORD,,
+prefab-1.1.5.dist-info/METADATA,sha256=tk_MMU6lQcjqt4FBDgjx87ziII0ulouu2zCj2Ayr-g8,34824
+prefab-1.1.5.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+prefab-1.1.5.dist-info/licenses/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
+prefab-1.1.5.dist-info/RECORD,,