rebase fixes

Author: yaugenst-flex

tests/test_components/test_autograd.py

@@ -1280,7 +1280,7 @@ def test_broadband_adjoint_src_width():
     for f0 in f0_adj_all:
         f = np.array([f0])
 
-        coords = dict(x=x, y=y, z=z, f=f)
+        coords = {"x": x, "y": y, "z": z, "f": f}
 
         dataset = td.FieldDataset(Ex=td.ScalarFieldDataArray(np.ones((1, 1, 1, 1)), coords=coords))
 

tests/test_components/test_heat.py

@@ -260,7 +260,9 @@ def make_heat_source():
 def make_custom_heat_source():
     return HeatSource(
         structures=["solid_structure"],
-        rate=td.SpatialDataArray(np.ones((1, 2, 3)), coords=dict(x=[0], y=[1, 2], z=[3, 4, 5])),
+        rate=td.SpatialDataArray(
+            np.ones((1, 2, 3)), coords={"x": [0], "y": [1, 2], "z": [3, 4, 5]}
+        ),
     )
 
 

tidy3d/components/data/monitor_data.py

@@ -1908,7 +1908,7 @@ def time_reversed_copy(self) -> FieldData:
         new_data["monitor"] = mnt.updated_copy(store_fields_direction=new_dir)
         return self.copy(update=new_data)
 
-    def _colocated_propagation_axes_field(self, field_name: Literal[E, H]) -> DataArray:
+    def _colocated_propagation_axes_field(self, field_name: Literal["E", "H"]) -> DataArray:
         """Collect a field DataArray containing all 3 field components and rotate from frame
         with normal axis along z to frame with propagation axis along z.
         """

tidy3d/components/grid/grid_spec.py

@@ -2483,14 +2483,8 @@ def _make_grid_and_snapping_lines(
             [None, None],
             [None, None],
         ],
-<<<<<<< HEAD
         structure_priority_mode: PriorityMode = "equal",
-    ) -> Tuple[Grid, List[CoordinateOptional]]:
-||||||| parent of ed17965f (Upgrade all (compatible) generics to built-in types)
-    ) -> Tuple[Grid, List[CoordinateOptional]]:
-=======
     ) -> tuple[Grid, list[CoordinateOptional]]:
->>>>>>> ed17965f (Upgrade all (compatible) generics to built-in types)
         """Make the entire simulation grid based on some simulation parameters.
         Also return snappiung point resulted from iterative gap meshing.
 

tidy3d/components/scene.py

@@ -259,7 +259,7 @@ def medium_map(self) -> dict[StructureMediumType, pd.NonNegativeInt]:
         return {medium: index for index, medium in enumerate(self.mediums)}
 
     @cached_property
-    def sorted_structures(self) -> List[Structure]:
+    def sorted_structures(self) -> list[Structure]:
         """Returns a list of sorted structures based on their priority.In the sorted list,
         latter added structures take higher priority.
 
@@ -1821,13 +1821,7 @@ def doping_bounds(self):
         acceptors_lims = [1e50, -1e50]
         donors_lims = [1e50, -1e50]
 
-<<<<<<< HEAD
         for struct in self.all_structures:
-||||||| parent of 7d108065 (Prefer tuple unpacking over concatenation)
-        for struct in [self.background_structure] + list(self.structures):
-=======
-        for struct in [self.background_structure, *list(self.structures)]:
->>>>>>> 7d108065 (Prefer tuple unpacking over concatenation)
             if isinstance(struct.medium.charge, SemiconductorMedium):
                 electric_spec = struct.medium.charge
                 for doping, limits in zip(

tidy3d/components/tcad/data/sim_data.py

@@ -149,9 +149,9 @@ class HeatChargeSimulationData(AbstractSimulationData):
     def plot_field(
         self,
         monitor_name: str,
-        field_name: Optional[Literal[temperature, potential]] = None,
+        field_name: Optional[Literal["temperature", "potential"]] = None,
         val: RealFieldVal = "real",
-        scale: Literal[lin, log] = "lin",
+        scale: Literal["lin", "log"] = "lin",
         structures_alpha: float = 0.2,
         robust: bool = True,
         vmin: Optional[float] = None,