rm 'from typing import'

Author: gituser789

femmt/component.py

@@ -3,7 +3,6 @@
 import os
 import logging
 import numpy as np
-from typing import List, Optional
 
 # Local libraries
 from femmt.enumerations import ConductorType
@@ -17,7 +16,7 @@ class FileData:
     def __init__(self, working_directory: str, electro_magnetic_folder_path: str = None, strands_coefficients_folder_path: str = None):
         if working_directory is not None:
             self.update_paths(working_directory, electro_magnetic_folder_path, strands_coefficients_folder_path)
-        self.onelab_folder_path: Optional[str] = None
+        self.onelab_folder_path: str | None = None
 
     @staticmethod
     def create_folders(*args: str) -> None:
@@ -122,16 +121,16 @@ class MeshData:
     skin_mesh_factor: float
     c_core: float
     c_window: float
-    c_conductor = List[float]
-    c_center_conductor = List[float]
+    c_conductor = list[float]
+    c_center_conductor = list[float]
     c_air_gaps: float
 
     center_factor: float
 
     mu0: float
     core_w: float
     window_w: float
-    windings: List["Conductor"]  # This is written as string because it is a forward import
+    windings: list["Conductor"]  # This is written as string because it is a forward import
 
     frequency: float
 
@@ -152,7 +151,7 @@ def __init__(self, mesh_accuracy_core: float,
         # The value 4 has good impact on the runtime and does not affect the simulation results too much.
         self.center_factor = 4
 
-    def update_spatial_data(self, core_w: float, window_w: float, windings: List["Conductor"]):
+    def update_spatial_data(self, core_w: float, window_w: float, windings: list["Conductor"]):
         """
         Update geometry data of the core of the magnetic component.
 
@@ -161,7 +160,7 @@ def update_spatial_data(self, core_w: float, window_w: float, windings: List["Co
         :param window_w: window width
         :type window_w: float
         :param windings: list of windings
-        :type windings: List["Conductor"]
+        :type windings: list["Conductor"]
         """
         self.core_w = core_w
         self.window_w = window_w

femmt/data.py

@@ -2,7 +2,6 @@
 # Python standard libraries
 import numpy as np
 import logging
-from typing import List
 
 # Local libraries
 from femmt.enumerations import *
@@ -19,7 +18,7 @@ class TwoDaxiSymmetric:
     """
 
     core: Core
-    winding_windows: List[WindingWindow]
+    winding_windows: list[WindingWindow]
     air_gaps: AirGaps
     stray_path: StrayPath
     insulation: Insulation
@@ -34,11 +33,11 @@ class TwoDaxiSymmetric:
     p_region_bound: np.ndarray
     p_window: np.ndarray
     p_air_gaps: np.ndarray
-    # p_conductor: List[List[float]]
-    p_iso_core: List[List[float]]
-    p_iso_pri_sec: List[List[float]]
+    # p_conductor: list[list[float]]
+    p_iso_core: list[list[float]]
+    p_iso_pri_sec: list[list[float]]
 
-    def __init__(self, core: Core, mesh_data: MeshData, air_gaps: AirGaps, winding_windows: List[WindingWindow],
+    def __init__(self, core: Core, mesh_data: MeshData, air_gaps: AirGaps, winding_windows: list[WindingWindow],
                  stray_path: StrayPath, insulation: Insulation, component_type: ComponentType, number_of_windings: int, verbosity: Verbosity):
         self.core = core
         self.mesh_data = mesh_data
@@ -1572,18 +1571,18 @@ def draw_model(self):
         #     self.draw_region_stacked()
 
     @staticmethod
-    def get_center_of_rect(p1: List[float], p2: List[float], p3: List[float], p4: List[float]):
+    def get_center_of_rect(p1: list[float], p2: list[float], p3: list[float], p4: list[float]):
         """
         Get center point of a rectangular conductor.
 
         :param p1: Point 1 as a x,y-List
-        :type p1: List[float]
+        :type p1: list[float]
         :param p2: Point 1 as a x,y-List
-        :type p2: List[float]
+        :type p2: list[float]
         :param p3: Point 1 as a x,y-List
-        :type p3: List[float]
+        :type p3: list[float]
         :param p4: Point 1 as a x,y-List
-        :type p4: List[float]
+        :type p4: list[float]
         """
         x_list = [p1[0], p2[0], p3[0], p4[0]]
         y_list = [p1[1], p2[1], p3[1], p4[1]]

femmt/drawing.py

@@ -1,7 +1,6 @@
 """Data transfer objects (DTOs) used by this toolbox."""
 from dataclasses import dataclass
 from femmt.enumerations import WindingTag
-from typing import Optional, List
 
 
 @dataclass
@@ -29,10 +28,10 @@ class ConductorRow:
     """Defines the conductors in one row."""
 
     number_of_conds_per_winding: int
-    number_of_conds_per_row: Optional[int]
-    row_height: Optional[float]
+    number_of_conds_per_row: int | None
+    row_height: float | None
     winding_tag: WindingTag
-    number_of_rows: Optional[int]
+    number_of_rows: int | None
     additional_bobbin: float
 
 
@@ -55,20 +54,20 @@ class ThreeWindingIsolation:
 class CenterTappedGroup:
     """Definitions for the center tapped group. A group is made of several primary and secondary rows."""
 
-    primary_number_of_rows: Optional[int]
-    secondary_number_of_rows: Optional[int]
-    primary_rest: Optional[int]
-    secondary_rest: Optional[int]
-    stack: List[WindingTag]
+    primary_number_of_rows: int | None
+    secondary_number_of_rows: int | None
+    primary_rest: int | None
+    secondary_rest: int | None
+    stack: list[WindingTag]
 
 
 @dataclass
 class ConductorStack:
     """Definitions for the conductor stack."""
 
     number_of_groups: int
-    number_of_single_rows: Optional[int]
-    order: List[int]
+    number_of_single_rows: int | None
+    order: list[int]
 
 
 @dataclass
@@ -106,16 +105,16 @@ class TransformerInductance:
 class ThreeWindingTransformerInductance:
     """Inductance definitions for a three-winding transformer."""
 
-    M_12: Optional[float]
-    M_13: Optional[float]
-    M_23: Optional[float]
-    L_s1: Optional[float]
-    L_s2: Optional[float]
-    L_s3: Optional[float]
-    L_h: Optional[float]
-    n_12: Optional[float]
-    n_13: Optional[float]
-    n_23: Optional[float]
-    L_s12: Optional[float]
-    L_s13: Optional[float]
-    L_s23: Optional[float]
+    M_12: float | None
+    M_13: float | None
+    M_23: float | None
+    L_s1: float | None
+    L_s2: float | None
+    L_s3: float | None
+    L_h: float | None
+    n_12: float | None
+    n_13: float | None
+    n_23: float | None
+    L_s12: float | None
+    L_s13: float | None
+    L_s23: float | None

femmt/dtos.py

@@ -2,9 +2,8 @@
 import matplotlib.pyplot as plt
 import femmt as fmt
 import os
-from typing import Optional
 
-def basic_example_sweep(onelab_folder: Optional[str] = None, show_visual_outputs: bool = True, is_test: bool = False):
+def basic_example_sweep(onelab_folder: str | None = None, show_visual_outputs: bool = True, is_test: bool = False):
     """
     Advanced example to demonstrate an air gap sweep for an inductor.
 

femmt/examples/advanced_inductor_air_gap_sweep.py

@@ -181,4 +181,4 @@ def example_thermal_simulation(show_thermal_visual_outputs: bool = True, flag_in
 
 
 if __name__ == "__main__":
-    basic_example_inductor(show_visual_outputs=False)
+    basic_example_inductor(show_visual_outputs=True)

femmt/examples/basic_inductor.py

@@ -10,13 +10,12 @@
 """
 import femmt as fmt
 import os
-from typing import Optional
 import logging
 
 # configure logging to show femmt terminal output
 logging.basicConfig(format='%(levelname)s:%(message)s', level=logging.INFO)
 
-def basic_example_transformer_three_winding(onelab_folder: Optional[str] = None, show_visual_outputs: bool = True,
+def basic_example_transformer_three_winding(onelab_folder: str | None = None, show_visual_outputs: bool = True,
                                             is_test: bool = False):
     """
     Run the example code for the three-winding transformer.

femmt/examples/basic_transformer_three_winding.py

@@ -2,9 +2,8 @@
 import femmt as fmt
 import os
 import numpy as np
-from typing import Optional
 
-def transformer_component_study(onelab_folder: Optional[str] = None, show_visual_outputs: bool = True, is_test: bool = False):
+def transformer_component_study(onelab_folder: str | None = None, show_visual_outputs: bool = True, is_test: bool = False):
     """
     Perform a component study.
 

femmt/examples/component_study/transformer_component_study.py

@@ -4,7 +4,6 @@
 """
 
 # Python standard libraries
-from typing import List, Optional
 from dataclasses import dataclass
 import os
 import json
@@ -41,7 +40,7 @@ class SingleBenchmark:
 
     execution_time_: float                      # all measurements summed up
 
-    flux_over_current: List[float]
+    flux_over_current: list[float]
     total_losses: float
     total_winding_losses: float
 
@@ -141,7 +140,7 @@ def to_json(self, file_path: str):
 # ------ Generic Functions ------
 
 
-def create_model(working_directory: str, mesh_accuracies=Optional[MeshAccuracies], aspect_ratio: float = 10,
+def create_model(working_directory: str, mesh_accuracies=MeshAccuracies, aspect_ratio: float = 10,
                  wwr_enabled: bool = True, number_of_conductors: int = 9):
     """
     Create the model for benchmark.
@@ -299,14 +298,14 @@ def create_rectangular_conductor_model(working_directory: str, mesh_accuracies:
 
     return geo
 
-def plot_mesh_over_precision(benchmarks, x_list: List, x_label: str, title: str):
+def plot_mesh_over_precision(benchmarks, x_list: list, x_label: str, title: str):
     """
     Plot the mesh over precision.
 
     :param benchmarks:
     :type benchmarks:
     :param x_list: list with simulation numbers
-    :type x_list: List
+    :type x_list: list
     :param x_label: x-label for the plot
     :type x_label: str
     :param title: title for the plot

femmt/examples/femmt_benchmark.py

@@ -1,6 +1,5 @@
 """Examples for the parallel simulation."""
 # Python standard libraries
-from typing import Dict
 from itertools import product
 import os
 import time
@@ -94,7 +93,7 @@ def create_parallel_example_inductor(inductor_frequency: int, air_gap_height: fl
 
     return geo
 
-def custom_hpc(parameters: Dict):
+def custom_hpc(parameters: dict):
     """Very simple example for a custom hpc_function which can be given to the hpc.run() function.
 
     :param parameters: Dictionary containing the model and the given simulation_parameters.