Isort and mypy tidyup

paramak/parametric_components/blanket_constant_thickness_arc_h.py

@@ -1,5 +1,6 @@
 
-from typing import Optional, Tuple
+from typing import Tuple
+
 from paramak import RotateMixedShape
 
 

paramak/parametric_components/blanket_constant_thickness_arc_v.py

@@ -1,5 +1,6 @@
 
 from typing import Optional, Tuple
+
 from paramak import RotateMixedShape
 
 

paramak/parametric_components/blanket_cutter_parallels.py

@@ -1,5 +1,6 @@
 
 from typing import Optional
+
 from paramak import ExtrudeStraightShape
 from paramak.utils import cut_solid
 

paramak/parametric_components/blanket_cutters_star.py

@@ -1,5 +1,6 @@
 
-from typing import Optional
+from typing import Optional, List, Union
+
 from paramak import ExtrudeStraightShape
 
 
@@ -25,7 +26,7 @@ def __init__(
             distance: float,
             height: Optional[float] = 2000.,
             width: Optional[float] = 2000.,
-            azimuth_placement_angle: Optional[float] = [
+            azimuth_placement_angle: Optional[Union[float, List[float]]] = [
                 0.,
                 36.,
                 72.,

paramak/parametric_components/blanket_fp.py

@@ -4,12 +4,13 @@
 
 import mpmath
 import numpy as np
-import paramak
 import sympy as sp
+from scipy.interpolate import interp1d
+
+import paramak
 from paramak import RotateMixedShape, diff_between_angles
 from paramak.parametric_components.tokamak_plasma_plasmaboundaries import \
     PlasmaBoundaries
-from scipy.interpolate import interp1d
 
 
 class BlanketFP(RotateMixedShape):

paramak/parametric_components/blanket_poloidal_segment.py

@@ -1,12 +1,13 @@
 
 import warnings
-from typing import List, Optional, Tuple, Union, Callable
+from typing import Callable, List, Optional, Tuple, Union
 
 import numpy as np
+from scipy.optimize import minimize
+
 from paramak import BlanketFP, RotateStraightShape
 from paramak.utils import (cut_solid, distance_between_two_points, extend,
                            rotate)
-from scipy.optimize import minimize
 
 
 class BlanketFPPoloidalSegments(BlanketFP):

paramak/parametric_components/capsule_vacuum_vessel.py

@@ -1,6 +1,7 @@
+import math
 from typing import Optional, Tuple
+
 from paramak import RotateMixedShape
-import math
 
 
 class CapsuleVacuumVessel(RotateMixedShape):

paramak/parametric_components/center_column_circular.py

@@ -1,5 +1,5 @@
+from typing import Optional, Union, Tuple
 
-from typing import Optional, Tuple
 from paramak import RotateMixedShape
 
 
@@ -16,21 +16,23 @@ class CenterColumnShieldCircular(RotateMixedShape):
         name: Defaults to "center_column_shield".
     """
 
-    def __init__(
-        self,
-        height: float,
-        inner_radius: float,
-        mid_radius: float,
-        outer_radius: float,
-        color: Optional[Tuple[float, float, float,
-                              Optional[float]]] = (0., 0.333, 0.),
-        **kwargs
-    ) -> None:
-
-        super().__init__(
-            color=color,
-            **kwargs
-        )
+    def __init__(self,
+                 height: float,
+                 inner_radius: float,
+                 mid_radius: float,
+                 outer_radius: float,
+                 color: Optional[Union[Tuple[float,
+                                             float,
+                                             float],
+                                       Tuple[float,
+                                             float,
+                                             float,
+                                             float]]] = (0.0,
+                                                         0.333,
+                                                         0.0),
+                 **kwargs) -> None:
+
+        super().__init__(color=color, **kwargs)
 
         self.height = height
         self.inner_radius = inner_radius
@@ -79,7 +81,7 @@ def find_points(self):
             (self.outer_radius, self.height / 2, "circle"),
             (self.mid_radius, 0, "circle"),
             (self.outer_radius, -self.height / 2, "straight"),
-            (self.inner_radius, -self.height / 2, "straight")
+            (self.inner_radius, -self.height / 2, "straight"),
         ]
 
         self.points = points

paramak/parametric_components/center_column_cylinder.py

@@ -1,4 +1,5 @@
 from typing import Optional, Tuple
+
 from paramak import RotateStraightShape
 
 

paramak/parametric_components/center_column_flat_top_circular.py

@@ -1,5 +1,6 @@
 
 from typing import Optional, Tuple
+
 from paramak import RotateMixedShape
 
 

paramak/parametric_components/center_column_flat_top_hyperbola.py

@@ -1,5 +1,6 @@
 
 from typing import Optional, Tuple
+
 from paramak import RotateMixedShape
 
 

paramak/parametric_components/center_column_hyperbola.py

@@ -1,5 +1,6 @@
 
 from typing import Optional, Tuple
+
 from paramak import RotateMixedShape
 
 

paramak/parametric_components/center_column_plasma_dependant.py

@@ -1,5 +1,6 @@
 
 from typing import Optional
+
 from paramak import Plasma, RotateMixedShape
 
 

paramak/parametric_components/coolant_channel_ring_curved.py

@@ -1,6 +1,8 @@
 
 from typing import Optional
+
 import numpy as np
+
 from paramak import SweepCircleShape
 
 

paramak/parametric_components/coolant_channel_ring_straight.py

@@ -1,6 +1,8 @@
 
 from typing import Optional
+
 import numpy as np
+
 from paramak import ExtrudeCircleShape
 
 

paramak/parametric_components/cutting_wedge.py

@@ -1,5 +1,6 @@
 
 from typing import Optional
+
 from paramak import RotateStraightShape
 
 

paramak/parametric_components/divertor_ITER.py

@@ -2,6 +2,7 @@
 import math
 
 import numpy as np
+
 from paramak import (RotateMixedShape, distance_between_two_points, extend,
                      rotate)
 

paramak/parametric_components/extrude_rectangle.py

@@ -1,5 +1,6 @@
 
 from typing import Optional, Tuple
+
 from paramak import ExtrudeStraightShape
 
 

paramak/parametric_components/hollow_cube.py

@@ -1,5 +1,6 @@
 
 import cadquery as cq
+
 from paramak import Shape
 
 

paramak/parametric_components/inboard_firstwall_fccs.py

@@ -2,12 +2,12 @@
 from collections.abc import Iterable
 from typing import List, Optional, Tuple
 
+import paramak
 from paramak import (CenterColumnShieldCircular, CenterColumnShieldCylinder,
                      CenterColumnShieldFlatTopCircular,
                      CenterColumnShieldFlatTopHyperbola,
                      CenterColumnShieldHyperbola,
                      CenterColumnShieldPlasmaHyperbola, RotateMixedShape)
-import paramak
 
 
 class InboardFirstwallFCCS(RotateMixedShape):

paramak/parametric_components/inner_tf_coils_circular.py

@@ -1,7 +1,9 @@
 
 import math
 from typing import Optional
+
 import numpy as np
+
 from paramak import ExtrudeMixedShape
 
 

paramak/parametric_components/inner_tf_coils_flat.py

@@ -1,7 +1,9 @@
 
 import math
 from typing import Optional
+
 import numpy as np
+
 from paramak import ExtrudeStraightShape
 
 

paramak/parametric_components/poloidal_field_coil.py

@@ -1,5 +1,6 @@
 
 from typing import Optional, Tuple
+
 from paramak import RotateStraightShape
 
 

paramak/parametric_components/poloidal_field_coil_case_set.py

@@ -2,6 +2,7 @@
 from typing import Optional, Tuple
 
 import cadquery as cq
+
 from paramak import RotateStraightShape
 
 

paramak/parametric_components/poloidal_field_coil_case_set_fc.py

@@ -2,6 +2,7 @@
 from typing import Optional, Tuple
 
 import cadquery as cq
+
 from paramak import PoloidalFieldCoilSet, RotateStraightShape
 
 

paramak/parametric_components/poloidal_field_coil_set.py

@@ -1,5 +1,6 @@
 
 import cadquery as cq
+
 from paramak import RotateStraightShape
 
 

paramak/parametric_components/poloidal_segmenter.py

@@ -2,6 +2,7 @@
 import math
 
 import cadquery as cq
+
 from paramak import RotateStraightShape
 from paramak.utils import (coefficients_of_line_from_points, intersect_solid,
                            rotate)

paramak/parametric_components/shell_fs.py

@@ -1,5 +1,6 @@
 
 import cadquery as cq
+
 from paramak import CuttingWedgeFS, Shape
 
 

paramak/parametric_components/tokamak_plasma.py

@@ -1,5 +1,6 @@
 
 import numpy as np
+
 from paramak import RotateSplineShape
 
 

paramak/parametric_components/tokamak_plasma_plasmaboundaries.py

@@ -1,7 +1,8 @@
 
-from paramak import Plasma
 from plasmaboundaries import get_separatrix_coordinates
 
+from paramak import Plasma
+
 
 class PlasmaBoundaries(Plasma):
     """Creates a double null tokamak plasma shape that is controlled

paramak/parametric_components/toroidal_field_coil_coat_hanger.py

@@ -1,9 +1,10 @@
 
 import math
-
 from typing import Optional, Tuple
+
 import cadquery as cq
 import numpy as np
+
 from paramak import ExtrudeStraightShape
 from paramak.utils import calculate_wedge_cut, rotate
 

paramak/parametric_components/toroidal_field_coil_princeton_d.py

@@ -2,11 +2,12 @@
 from typing import Optional, Tuple
 
 import numpy as np
-from paramak import ExtrudeMixedShape
-from paramak.utils import add_thickness
 from scipy import integrate
 from scipy.optimize import minimize
 
+from paramak import ExtrudeMixedShape
+from paramak.utils import add_thickness
+
 
 class ToroidalFieldCoilPrincetonD(ExtrudeMixedShape):
     """Toroidal field coil based on Princeton-D curve

paramak/parametric_components/toroidal_field_coil_rectangle.py

@@ -1,7 +1,9 @@
 
 from typing import Optional, Tuple
+
 import cadquery as cq
 import numpy as np
+
 from paramak import ExtrudeStraightShape
 from paramak.utils import calculate_wedge_cut
 

paramak/parametric_components/toroidal_field_coil_round_corners.py

@@ -2,6 +2,7 @@
 
 import cadquery as cq
 import numpy as np
+
 from paramak.parametric_shapes.extruded_mixed_shape import ExtrudeMixedShape
 from paramak.utils import calculate_wedge_cut
 

paramak/parametric_components/toroidal_field_coil_triple_arc.py

@@ -1,6 +1,8 @@
 
 from typing import Optional, Tuple
+
 import numpy as np
+
 from paramak import ExtrudeMixedShape
 
 

paramak/parametric_components/vacuum_vessel_inner_leg.py

@@ -2,6 +2,7 @@
 from typing import Optional
 
 import cadquery as cq
+
 from paramak import RotateStraightShape
 
 

paramak/parametric_reactors/ball_reactor.py

@@ -132,7 +132,7 @@ def __init__(
         self.rotation_angle = rotation_angle
 
         # adds self.input_variable_names from the Reactor class
-        self.input_variable_names = self.input_variable_names + [
+        self.input_variable_names: List[str] = self.input_variable_names + [
             'inner_bore_radial_thickness',
             'inboard_tf_leg_radial_thickness',
             'center_column_shield_radial_thickness',

paramak/parametric_reactors/center_column_study_reactor.py

@@ -1,5 +1,6 @@
 
 import warnings
+from typing import List
 
 import paramak
 
@@ -85,7 +86,7 @@ def __init__(
         self.triangularity = triangularity
 
         # adds self.input_variable_names from the Reactor class
-        self.input_variable_names = self.input_variable_names + [
+        self.input_variable_names: List[str] = self.input_variable_names + [
             'inner_bore_radial_thickness',
             'inboard_tf_leg_radial_thickness',
             'center_column_shield_radial_thickness_mid',