Skip to content

chore: refactor class hierarchy to better avoid circular imports #331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mortenengen merged 3 commits into from
Mar 18, 2026
Merged

chore: refactor class hierarchy to better avoid circular imports #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff8e6db
Split base classes in separate modules
mortenengen Mar 17, 2026
cd0fca8
Update imports of base classes
mortenengen Mar 17, 2026
3cdc99d
Annotate result classes with base classes for geometry and section
mortenengen Mar 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions structuralcodes/core/_section_results.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
from numpy.typing import ArrayLike, NDArray
from shapely import Point

from .base import Geometry, Section


@dataclass
class SectionProperties:
Expand Down Expand Up @@ -154,7 +156,7 @@ def isclose(self, other, rtol=1e-5, atol=1e-8):


def _matching_geometries(
section, # For now we can't type hint the Section or even GenericSection due to circular import. #noqa: E501
section: Section,
name: t.Optional[str] = None,
group_label: t.Optional[str] = None,
case_sensitive: bool = True,
Expand Down Expand Up @@ -186,7 +188,7 @@ def _strain_from_kinematics(eps_a, chi_y, chi_z, y: float, z: float):
return eps_a - chi_z * y + chi_y * z


def _point_inside_geometry_surface(geo, y: float, z: float) -> bool:
def _point_inside_geometry_surface(geo: Geometry, y: float, z: float) -> bool:
"""Check if a point is inside or on the boundary of a surface geometry."""
p = Point(y, z)
return geo.polygon.contains(p) or geo.polygon.touches(p)
Expand All @@ -205,7 +207,7 @@ def _point_matches_geometry_point(gp, y: float, z: float) -> bool:


def _get_point_response(
section, # For now we can't type hint the Section or even GenericSection due to circular import. #noqa: E501
section: Section,
eps_a: float,
chi_y: float,
chi_z: float,
Expand Down Expand Up @@ -282,7 +284,7 @@ class MomentCurvatureResults:
m_y: ArrayLike = None # the moment
m_z: ArrayLike = None # the moment

section = None
section: Section = None

detailed_result: SectionDetailedResultState = None
seed: int = None
Expand Down
Loading
Loading