fix type hints + ruff

Author: albeanth

armi/reactor/components/component.py

@@ -331,9 +331,7 @@ def resolveLinkedDims(self, components):
                             f"Components cannot not have periods in their names: `{value}`"
                         )
                     else:
-                        raise KeyError(
-                            f"Bad component link `{dimName}` defined as `{value}` in {self}"
-                        )
+                        raise KeyError(f"Bad component link `{dimName}` defined as `{value}` in {self}")
 
     def setLink(self, key, otherComp, otherCompKey):
         """Set the dimension link."""
@@ -667,7 +665,7 @@ def getNumberDensity(self, nucName):
         """
         return self.p.numberDensities.get(nucName, 0.0)
 
-    def getNuclideNumberDensities(self, nucNames):
+    def getNuclideNumberDensities(self, nucNames: list[str]) -> list[float]:
         """Return a list of number densities for the nuc names requested."""
         return [self.p.numberDensities.get(nucName, 0.0) for nucName in nucNames]
 
@@ -831,7 +829,7 @@ def getMassEnrichment(self):
         except ZeroDivisionError:
             return 0.0
 
-    def getMass(self, nuclideNames=None):
+    def getMass(self, nuclideNames: None | str | list[str] = None) -> float:
         r"""
         Determine the mass in grams of nuclide(s) and/or elements in this object.
 

armi/reactor/composites.py

@@ -46,7 +46,6 @@
     Optional,
     Tuple,
     Type,
-    Union,
 )
 
 import numpy as np
@@ -886,7 +885,7 @@ def getMaxArea(self):
         """
         raise NotImplementedError()
 
-    def getMass(self, nuclideNames=Optional[str]) -> float:
+    def getMass(self, nuclideNames: None | str | list[str] = None) -> float:
         """
         Determine the mass in grams of nuclide(s) and/or elements in this object.
 
@@ -930,7 +929,7 @@ def getMicroSuffix(self):
             " of composite such as Blocks or Components have the concept of micro suffixes."
         )
 
-    def _getNuclidesFromSpecifier(self, nucSpec):
+    def _getNuclidesFromSpecifier(self, nucSpec: None | str | list[str]):
         """
         Convert a nuclide specification to a list of valid nuclide/element keys.
 
@@ -2175,7 +2174,7 @@ def getComponentsOfMaterial(self, material=None, materialName=None):
                 componentsWithThisMat.append(c)
         return componentsWithThisMat
 
-    def hasComponents(self, typeSpec: Union[TypeSpec, List[TypeSpec]], exact=False):
+    def hasComponents(self, typeSpec: TypeSpec | List[TypeSpec], exact=False):
         """
         Return true if components matching all TypeSpec exist in this object.
 
@@ -2214,9 +2213,7 @@ def getComponentByName(self, name: str) -> "Component":
         else:
             return components[0]
 
-    def getComponent(
-        self, typeSpec: TypeSpec, exact=False, quiet=False
-    ) -> Optional["Component"]:
+    def getComponent(self, typeSpec: TypeSpec, exact=False, quiet=False) -> Optional["Component"]:
         """
         Get a particular component from this object.
 
@@ -2253,9 +2250,7 @@ def getComponent(
                 )
             return None
         else:
-            raise ValueError(
-                f"Multiple components match in {self} match typeSpec {typeSpec}: {results}"
-            )
+            raise ValueError(f"Multiple components match in {self} match typeSpec {typeSpec}: {results}")
 
     def getNumComponents(self, typeSpec: TypeSpec, exact=False):
         """
@@ -2670,9 +2665,7 @@ def getChildren(
     def getComponents(self, typeSpec: TypeSpec = None, exact=False):
         return list(self.iterComponents(typeSpec, exact))
 
-    def iterComponents(
-        self, typeSpec: TypeSpec = None, exact=False
-    ) -> Iterator["Component"]:
+    def iterComponents(self, typeSpec: TypeSpec = None, exact=False) -> Iterator["Component"]:
         """
         Return an iterator of armi.reactor.component.Component objects within this Composite.
 

armi/reactor/converters/axialExpansionChanger/axialExpansionChanger.py

@@ -423,11 +423,7 @@ def _checkBlockHeight(b):
     3cm is a presumptive lower threshold for DIF3D
     """
     if b.getHeight() < 3.0:
-        runLog.debug(
-            f"Block {b.name} ({str(b.p.flags)}) has a height less than 3.0 cm. ({b.getHeight():.12e})"
-        )
+        runLog.debug(f"Block {b.name} ({str(b.p.flags)}) has a height less than 3.0 cm. ({b.getHeight():.12e})")
 
     if b.getHeight() < 0.0:
-        raise ArithmeticError(
-            f"Block {b.name} ({str(b.p.flags)}) has a negative height! ({b.getHeight():.12e})"
-        )
+        raise ArithmeticError(f"Block {b.name} ({str(b.p.flags)}) has a negative height! ({b.getHeight():.12e})")

armi/reactor/converters/axialExpansionChanger/expansionData.py

@@ -117,8 +117,7 @@ def setExpansionFactors(self, components: list["Component"], expFrac: list[float
         for exp in expFrac:
             if exp <= 0.0:
                 raise RuntimeError(
-                    f"Expansion factor {exp}, L1/L0, is not physical. Expansion fractions "
-                    "should be greater than 0.0."
+                    f"Expansion factor {exp}, L1/L0, is not physical. Expansion fractions should be greater than 0.0."
                 )
         for c, p in zip(components, expFrac):
             self._expansionFactors[c] = p

armi/reactor/converters/tests/test_assemblyAxialLinkage.py

@@ -147,13 +147,9 @@ def test_multiIndexLocation(self):
             lowerFuel1, lowerFuel2 = lowerB.getComponents(Flags.FUEL)
             upperFuel1, _upperFuel2 = upperB.getComponents(Flags.FUEL)
             # same grid locs, are linked
-            self.assertTrue(
-                AssemblyAxialLinkage.areAxiallyLinked(lowerFuel1, upperFuel1)
-            )
+            self.assertTrue(AssemblyAxialLinkage.areAxiallyLinked(lowerFuel1, upperFuel1))
             # different grid locs, are not linked
-            self.assertFalse(
-                AssemblyAxialLinkage.areAxiallyLinked(lowerFuel2, upperFuel1)
-            )
+            self.assertFalse(AssemblyAxialLinkage.areAxiallyLinked(lowerFuel2, upperFuel1))
 
 
 class TestCheckOverlap(AxialExpansionTestBase):
@@ -249,9 +245,7 @@ def test_thinAnnularPinOverlappingWithThickAnnulus(self):
         self.runTest(componentTypesToTest, self.assertTrue)
 
     def test_AnnularHexOverlappingThickAnnularHex(self):
-        componentTypesToTest = {
-            Hexagon: [{"op": 1.0, "ip": 0.8}, {"op": 1.2, "ip": 0.8}]
-        }
+        componentTypesToTest = {Hexagon: [{"op": 1.0, "ip": 0.8}, {"op": 1.2, "ip": 0.8}]}
         self.runTest(componentTypesToTest, self.assertTrue)
 
 
@@ -302,9 +296,7 @@ def test_multiBlock(self):
 
     def test_emptyBlocks(self):
         """Test even smaller edge case when no blocks are passed."""
-        with self.assertRaisesRegex(
-            ValueError, "No blocks passed. Cannot determine links"
-        ):
+        with self.assertRaisesRegex(ValueError, "No blocks passed. Cannot determine links"):
             AssemblyAxialLinkage.getLinkedBlocks([])
 
     def test_onAssembly(self):

armi/reactor/converters/tests/test_axialExpansionChanger.py

@@ -678,9 +678,7 @@ def test_updateCompTempsBy1DTempFieldValError(self):
     def test_updateCompTempsBy1DTempFieldError(self):
         tempGrid = [5.0, 15.0, 35.0]
         tempField = linspace(25.0, 310.0, 10)
-        with self.assertRaisesRegex(
-            RuntimeError, "tempGrid and tempField must have the same length."
-        ):
+        with self.assertRaisesRegex(RuntimeError, "tempGrid and tempField must have the same length."):
             self.obj.expansionData.updateComponentTempsBy1DTempField(tempGrid, tempField)
 
     def test_AssemblyAxialExpansionException(self):
@@ -714,9 +712,7 @@ def test_isFuelLocked(self):
         }
         shield = Circle("shield", "FakeMat", **shieldDims)
         bNoFuel.add(shield)
-        with self.assertRaisesRegex(
-            RuntimeError, f"No fuel component within {bNoFuel}!"
-        ):
+        with self.assertRaisesRegex(RuntimeError, f"No fuel component within {bNoFuel}!"):
             expdata._isFuelLocked(bNoFuel)
 
 
@@ -966,9 +962,7 @@ def checkColdHeightBlockMass(self, bStd: HexBlock, bExp: HexBlock, nuclide: str)
         self.assertGreater(bExp.getMass(nuclide), bStd.getMass(nuclide))
 
 
-def checkColdBlockHeight(
-    bStd: HexBlock, bExp: HexBlock, assertType: Callable, strForAssertion: str
-):
+def checkColdBlockHeight(bStd: HexBlock, bExp: HexBlock, assertType: Callable, strForAssertion: str):
     assertType(
         bStd.getHeight(),
         bExp.getHeight(),