Passing pyright checks

Author: robbievanleeuwen

src/concreteproperties/analysis_section.py

@@ -427,10 +427,10 @@ def plot_mesh(
             cmap = ListedColormap(colour_array)
 
             # plot the mesh colours
-            ax.tripcolor(
+            ax.tripcolor(  # pyright: ignore
                 self.mesh_nodes[:, 0],
                 self.mesh_nodes[:, 1],
-                self.mesh_elements[:, 0:3],
+                self.mesh_elements[:, 0:3],  # pyright: ignore
                 c,
                 cmap=cmap,
             )
@@ -439,7 +439,7 @@ def plot_mesh(
             ax.triplot(
                 self.mesh_nodes[:, 0],
                 self.mesh_nodes[:, 1],
-                self.mesh_elements[:, 0:3],
+                self.mesh_elements[:, 0:3],  # pyright: ignore
                 lw=0.5,
                 color="black",
                 alpha=alpha,
@@ -467,10 +467,10 @@ def plot_shape(
         cmap = ListedColormap(colour_array)
 
         # plot the mesh colours
-        ax.tripcolor(
+        ax.tripcolor(  # pyright: ignore
             self.mesh_nodes[:, 0],
             self.mesh_nodes[:, 1],
-            self.mesh_elements[:, 0:3],
+            self.mesh_elements[:, 0:3],  # pyright: ignore
             c,
             cmap=cmap,
         )

src/concreteproperties/concrete_section.py

@@ -9,6 +9,7 @@
 import matplotlib.patches as mpatches
 import numpy as np
 import sectionproperties.pre.geometry as sp_geom
+import sectionproperties.pre.pre as sp_pre
 from rich.live import Live
 from scipy.optimize import brentq
 
@@ -83,6 +84,11 @@ def __init__(
                     cp_geom = CPGeom(geom=geom.geom, material=geom.material)
                     self.strand_geometries.append(cp_geom)
             else:
+                if isinstance(geom.material, sp_pre.Material):
+                    msg = "'material' must be a concreteproperties Material object, "
+                    msg += "not a sectionproperties Material object."
+                    raise RuntimeError(msg)
+
                 cp_geom = CPGeom(geom=geom.geom, material=geom.material)
 
                 if cp_geom.material.meshed:
@@ -330,7 +336,7 @@ def calculate_cracked_properties(
                 b=b,
                 args=(cracked_results),
                 xtol=1e-3,
-                rtol=1e-6,
+                rtol=1e-6,  # pyright: ignore [reportArgumentType]
                 full_output=True,
                 disp=False,
             )
@@ -937,7 +943,7 @@ def ultimate_bending_capacity(
                 b=b,
                 args=(n, ultimate_results),
                 xtol=1e-3,
-                rtol=1e-6,
+                rtol=1e-6,  # pyright: ignore [reportArgumentType]
                 full_output=True,
                 disp=False,
             )

src/concreteproperties/design_codes/as3600.py

@@ -147,7 +147,7 @@ def create_concrete_material(
             colour=colour,
         )
 
-    def create_steel_material(
+    def create_steel_material(  # pyright: ignore [reportIncompatibleMethodOverride]
         self,
         yield_strength: float = 500,
         ductility_class: str = "N",
@@ -338,7 +338,7 @@ def get_n_ub(
 
         return balanced_res.n
 
-    def ultimate_bending_capacity(
+    def ultimate_bending_capacity(  # pyright: ignore [reportIncompatibleMethodOverride]
         self,
         theta: float = 0,
         n_design: float = 0,
@@ -382,7 +382,7 @@ def non_linear_phi(phi_guess):
             a=phi_0,
             b=0.85,
             xtol=1e-3,
-            rtol=1e-6,
+            rtol=1e-6,  # pyright: ignore [reportArgumentType]
             full_output=True,
             disp=False,
         )
@@ -454,7 +454,7 @@ def non_linear_phi(phi_guess):
 
         return f_ult_res, ult_res, phi
 
-    def moment_interaction_diagram(
+    def moment_interaction_diagram(  # pyright: ignore [reportIncompatibleMethodOverride]
         self,
         theta: float = 0,
         limits: list[tuple[str, float]] | None = None,
@@ -580,7 +580,7 @@ def moment_interaction_diagram(
 
         return f_mi_res, mi_res, phis
 
-    def biaxial_bending_diagram(
+    def biaxial_bending_diagram(  # pyright: ignore [reportIncompatibleMethodOverride]
         self,
         n_design: float = 0,
         n_points: int = 48,

src/concreteproperties/design_codes/nzs3101.py

@@ -641,6 +641,9 @@ def max_comp_strength(
             # Calculate maximum axial compression strength for a singly reinf wall
             # member about minor axis
             max_comp = 0.06 * conc_capacity
+        else:
+            msg = "Invalid section type"
+            raise RuntimeError(msg)
 
         return max_comp
 
@@ -821,7 +824,7 @@ def check_f_c_limits(
                 msg += f"{compressive_strength:.0f} MPa was specified for this material"
                 raise ValueError(msg)
 
-    def create_concrete_material(
+    def create_concrete_material(  # pyright: ignore [reportIncompatibleMethodOverride]
         self,
         compressive_strength: float,
         ultimate_strain: float = 0.003,
@@ -963,7 +966,7 @@ def predefined_steel_materials(self) -> tuple[dict, list[str], list[str]]:
 
         return properties_dict, nom_properties, prob_properties
 
-    def create_steel_material(
+    def create_steel_material(  # pyright: ignore [reportIncompatibleMethodOverride]
         self,
         steel_grade: str | None = None,
         yield_strength: float | None = None,
@@ -1180,6 +1183,11 @@ def create_steel_material(
         if steel_grade.lower() in prob_properties and colour in ["red"]:
             colour = "steelblue"
 
+        # ensure properties are valid
+        if phi_os is None or yield_strength is None or fracture_strain is None:
+            msg = "Invalid property specification"
+            raise RuntimeError(msg)
+
         return NZS3101.SteelBarNZ(
             name=name,
             steel_grade=steel_grade,
@@ -1602,7 +1610,7 @@ def create_prob_section(
 
         return prob_concrete_section
 
-    def ultimate_bending_capacity(
+    def ultimate_bending_capacity(  # pyright: ignore [reportIncompatibleMethodOverride]
         self,
         pphr_class: str = "NDPR",
         analysis_type: str = "nom_chk",
@@ -1668,7 +1676,7 @@ def ultimate_bending_capacity(
 
         return f_ult_res, ult_res, phi
 
-    def moment_interaction_diagram(
+    def moment_interaction_diagram(  # pyright: ignore [reportIncompatibleMethodOverride]
         self,
         pphr_class: str = "NDPR",
         analysis_type: str = "nom_chk",
@@ -1786,7 +1794,7 @@ def moment_interaction_diagram(
 
         return f_mi_res, mi_res, phis
 
-    def biaxial_bending_diagram(
+    def biaxial_bending_diagram(  # pyright: ignore [reportIncompatibleMethodOverride]
         self,
         pphr_class: str = "NDPR",
         analysis_type: str = "nom_chk",

src/concreteproperties/material.py

@@ -58,7 +58,7 @@ class Concrete(Material):
 
     name: str
     density: float
-    stress_strain_profile: ssp.ConcreteServiceProfile
+    stress_strain_profile: ssp.ConcreteServiceProfile  # pyright: ignore [reportIncompatibleVariableOverride]
     ultimate_stress_strain_profile: ssp.ConcreteUltimateProfile
     flexural_tensile_strength: float
     colour: str
@@ -161,7 +161,7 @@ class SteelStrand(Steel):
 
     name: str
     density: float
-    stress_strain_profile: ssp.StrandProfile
+    stress_strain_profile: ssp.StrandProfile  # pyright: ignore [reportIncompatibleVariableOverride]
     colour: str
     prestress_stress: float = 0
     meshed: bool = field(default=False, init=False)

src/concreteproperties/post.py

@@ -60,8 +60,8 @@ def plotting_context(
 
         try:
             if axis_index is None:
-                axis_index = (0,) * ax.ndim
-            ax = ax[axis_index]
+                axis_index = (0,) * ax.ndim  # pyright: ignore
+            ax = ax[axis_index]  # pyright: ignore
         except (AttributeError, TypeError):
             pass  # only 1 axis, not an array
         except IndexError as exc:

src/concreteproperties/pre.py

@@ -12,6 +12,7 @@
 from sectionproperties.pre.geometry import Geometry
 from sectionproperties.pre.library.primitive_sections import circular_section_by_area
 from shapely import LineString, Polygon
+from shapely.geometry.base import GeometrySequence
 from shapely.ops import split
 
 from concreteproperties.material import Concrete
@@ -185,7 +186,8 @@ def split_section(
             Geometries above and below the line
         """
         # round point
-        point = np.round(point, 6)
+        pt_rounded = np.round(np.array(point), 6)
+        point = (pt_rounded[0], pt_rounded[1])
 
         # generate unit vector
         vector = np.cos(theta), np.sin(theta)
@@ -204,6 +206,10 @@ def split_section(
             polys = [self.geom]
 
         # sort geometries
+        if isinstance(polys, GeometrySequence):
+            msg = "Geometry split failure."
+            raise RuntimeError(msg)
+
         top_polys, bot_polys = self.sort_polys(polys=polys, point=point, vector=vector)
 
         # assign material properties and create cp geometry objects
@@ -339,7 +345,7 @@ def to_sp_geom(self) -> Geometry:
         Returns:
             ``sectionproperties`` geometry object
         """
-        return Geometry(geom=self.geom, material=self.material)
+        return Geometry(geom=self.geom, material=self.material)  # pyright: ignore [reportArgumentType]
 
 
 class CPGeomConcrete(CPGeom):
@@ -372,7 +378,7 @@ def add_bar(
     x: float,
     y: float,
     n: int = 4,
-) -> CompoundGeometry:
+) -> Geometry | CompoundGeometry:
     """Adds a reinforcing bar to a ``sectionproperties`` geometry.
 
     Bars are discretised by four points by default.
@@ -388,7 +394,7 @@ def add_bar(
     Returns:
         Reinforced concrete geometry with added bar
     """
-    bar = circular_section_by_area(area=area, n=n, material=material).shift_section(
+    bar = circular_section_by_area(area=area, n=n, material=material).shift_section(  # pyright: ignore [reportArgumentType]
         x_offset=x, y_offset=y
     )
 
@@ -406,7 +412,7 @@ def add_bar_rectangular_array(
     anchor: tuple[float, float] = (0, 0),
     exterior_only: bool = False,
     n: int = 4,
-) -> CompoundGeometry:
+) -> Geometry | CompoundGeometry:
     """Adds a rectangular array of reinforcing bars to a ``sectionproperties`` geometry.
 
     Bars are discretised by four points by default.
@@ -438,7 +444,7 @@ def add_bar_rectangular_array(
                 add_bar = True
 
             if add_bar:
-                bar = circular_section_by_area(area=area, n=n, material=material)
+                bar = circular_section_by_area(area=area, n=n, material=material)  # pyright: ignore [reportArgumentType]
                 x = anchor[0] + i_idx * x_s
                 y = anchor[1] + j_idx * y_s
                 bar = bar.shift_section(x_offset=x, y_offset=y)
@@ -456,7 +462,7 @@ def add_bar_circular_array(
     theta_0: float = 0,
     ctr: tuple[float, float] = (0, 0),
     n: int = 4,
-) -> CompoundGeometry:
+) -> Geometry | CompoundGeometry:
     """Adds a circular array of reinforcing bars to a ``sectionproperties`` geometry.
 
     Bars are discretised by four points by default.
@@ -478,7 +484,7 @@ def add_bar_circular_array(
     d_theta = 2 * np.pi / n_bar
 
     for idx in range(n_bar):
-        bar = circular_section_by_area(area=area, n=n, material=material)
+        bar = circular_section_by_area(area=area, n=n, material=material)  # pyright: ignore [reportArgumentType]
         theta = theta_0 + idx * d_theta
         x = ctr[0] + r_array * np.cos(theta)
         y = ctr[1] + r_array * np.sin(theta)

src/concreteproperties/prestressed_section.py

@@ -97,7 +97,7 @@ def __init__(
         self.gross_properties.n_prestress = n_prestress
         self.gross_properties.m_prestress = m_prestress
 
-    def calculate_cracked_properties(
+    def calculate_cracked_properties(  # pyright: ignore [reportIncompatibleMethodOverride]
         self,
         m_ext: float,
         n_ext: float = 0,
@@ -164,7 +164,7 @@ def calculate_cracked_properties(
                 b=b,
                 args=(cracked_results),
                 xtol=1e-3,
-                rtol=1e-6,
+                rtol=1e-6,  # pyright: ignore [reportArgumentType]
                 full_output=True,
                 disp=False,
             )
@@ -175,7 +175,7 @@ def calculate_cracked_properties(
 
         return cracked_results
 
-    def calculate_cracking_moment(
+    def calculate_cracking_moment(  # pyright: ignore [reportIncompatibleMethodOverride]
         self,
         n: float,
         m_int: float,
@@ -308,7 +308,7 @@ def calc_min_stress():
 
         return min_stress
 
-    def moment_curvature_analysis(
+    def moment_curvature_analysis(  # pyright: ignore [reportIncompatibleMethodOverride]
         self,
         positive: bool = True,
         n: float = 0,
@@ -376,7 +376,7 @@ def find_intial_curvature(kappa0):
             progress_bar=progress_bar,
         )
 
-    def ultimate_bending_capacity(
+    def ultimate_bending_capacity(  # pyright: ignore [reportIncompatibleMethodOverride]
         self,
         positive: bool = True,
         n: float = 0,
@@ -398,23 +398,23 @@ def ultimate_bending_capacity(
 
         return super().ultimate_bending_capacity(theta=theta, n=n)
 
-    def moment_interaction_diagram(self):
+    def moment_interaction_diagram(self):  # pyright: ignore [reportIncompatibleMethodOverride]
         """Generates a moment interaction diagram.
 
         Raises:
             NotImplementedError: This feature has not yet been implemented.
         """
         raise NotImplementedError
 
-    def biaxial_bending_diagram(self):
+    def biaxial_bending_diagram(self):  # pyright: ignore [reportIncompatibleMethodOverride]
         """Generates a biaxial bending diagram.
 
         Raises:
             NotImplementedError: This feature has not yet been implemented.
         """
         raise NotImplementedError
 
-    def calculate_uncracked_stress(
+    def calculate_uncracked_stress(  # pyright: ignore [reportIncompatibleMethodOverride]
         self,
         n: float = 0,
         m: float = 0,
@@ -554,7 +554,7 @@ def calculate_uncracked_stress(
             strand_forces=strand_forces,
         )
 
-    def calculate_cracked_stress(
+    def calculate_cracked_stress(  # pyright: ignore [reportIncompatibleMethodOverride]
         self,
         cracked_results: res.CrackedResults,
     ) -> res.StressResult: