Updated Spheres to use args_checked

Author: MicahGale

montepy/surfaces/general_sphere.py

@@ -1,11 +1,12 @@
 # Copyright 2026, Battelle Energy Alliance, LLC All Rights Reserved.
+from __future__ import annotations
+
+import montepy
 from .surface_type import SurfaceType
 from .surface import Surface, InitInput
 from montepy.exceptions import *
 from montepy.utilities import *
-
-from numbers import Real
-from typing import Union
+import montepy.types as ty
 
 
 def _enforce_positive_radius(self, value):
@@ -26,10 +27,12 @@ class GeneralSphere(Surface):
         The number to set for this object.
     """
 
+    @args_checked
     def __init__(
         self,
         input: InitInput = None,
-        number: int = None,
+        number: ty.PositiveInt = None,
+        surface_type: SurfaceType | str = None,
     ):
         self._coordinates = [
             self._generate_default_node(float, None),
@@ -72,14 +75,10 @@ def coordinates(self):
         return tuple(c.value for c in self._coordinates)
 
     @coordinates.setter
-    def coordinates(self, coordinates):
-        if not isinstance(coordinates, (list, tuple)):
-            raise TypeError("coordinates must be a list")
+    @args_checked
+    def coordinates(self, coordinates: ty.Iterable[ty.Real]):
         if len(coordinates) != 3:
             raise ValueError("coordinates must have exactly three elements")
-        for val in coordinates:
-            if not isinstance(val, Real):
-                raise TypeError(f"Coordinate must be a number. {val} given.")
         for i, val in enumerate(coordinates):
             self._coordinates[i].value = val
 
@@ -90,6 +89,9 @@ def validate(self):
         if any({c is None for c in self.coordinates}):
             raise IllegalState(f"Surface: {self.number} does not have coordinates set.")
 
-    def find_duplicate_surfaces(self, surfaces, tolerance):  # pragma: no cover
+    @args_checked
+    def find_duplicate_surfaces(
+        self, surfaces: montepy.Surfaces, tolerance: ty.PositiveReal
+    ):  # pragma: no cover
         """Duplicate sphere finding is not yet implemented"""
         return []

montepy/surfaces/sphere_at_origin.py

@@ -1,4 +1,7 @@
 # Copyright 2026, Battelle Energy Alliance, LLC All Rights Reserved.
+from __future__ import annotations
+
+import montepy
 from .surface_type import SurfaceType
 from .surface import Surface, InitInput
 from montepy.exceptions import *
@@ -25,10 +28,11 @@ class SphereAtOrigin(Surface):
         The number to set for this object.
     """
 
+    @args_checked
     def __init__(
         self,
         input: InitInput = None,
-        number: int = None,
+        number: ty.PositiveInt = None,
     ):
         self._location = self._generate_default_node(float, None)
         self._radius = self._generate_default_node(float, None)
@@ -56,6 +60,9 @@ def validate(self):
         if self.radius is None:
             raise IllegalState(f"Surface: {self.number} does not have a radius set.")
 
-    def find_duplicate_surfaces(self, surfaces, tolerance):  # pragma: no cover
+    @args_checked
+    def find_duplicate_surfaces(
+        self, surfaces: montepy.Surfaces, tolerance: ty.PositiveReal
+    ):  # pragma: no cover
         """Duplicate sphere finding is not yet implemented"""
         return []

montepy/surfaces/sphere_on_axis.py

@@ -1,10 +1,12 @@
 # Copyright 2026, Battelle Energy Alliance, LLC All Rights Reserved.
+from __future__ import annotations
+
+import montepy
 from .surface_type import SurfaceType
 from .surface import Surface, InitInput
 from montepy.exceptions import *
 from montepy.utilities import *
-
-from typing import Union
+import montepy.types as ty
 
 
 def _enforce_positive_radius(self, value):
@@ -29,11 +31,12 @@ class SphereOnAxis(Surface):
 
     COORDINATE = {SurfaceType.SX: "x", SurfaceType.SY: "y", SurfaceType.SZ: "z"}
 
+    @args_checked
     def __init__(
         self,
         input: InitInput = None,
-        number: int = None,
-        surface_type: Union[SurfaceType, str] = None,
+        number: ty.PositiveInt = None,
+        surface_type: SurfaceType | str = None,
     ):
         self._location = self._generate_default_node(float, None)
         self._radius = self._generate_default_node(float, None)
@@ -81,6 +84,9 @@ def validate(self):
         if self.location is None:
             raise IllegalState(f"Surface: {self.number} does not have a location set.")
 
-    def find_duplicate_surfaces(self, surfaces, tolerance):  # pragma: no cover
+    @args_checked
+    def find_duplicate_surfaces(
+        self, surfaces: montepy.Surfaces, tolerance: ty.PositiveReal
+    ):  # pragma: no cover
         """Duplicate sphere finding is not yet implemented"""
         return []