types: updated Tuple by currying

Author: BitterB0NG0

scripts/inp_data.py

@@ -18,9 +18,9 @@ class Inp(_object.McnpFile):
     def __init__(
         self,
         title: types.String,
-        cells: types.Tuple[inp.Cell | inp.Like],
-        surfaces: types.Tuple[inp.Surface],
-        data: types.Tuple[inp.Data],
+        cells: types.Tuple(inp.Cell | inp.Like),
+        surfaces: types.Tuple(inp.Surface),
+        data: types.Tuple(inp.Data),
         message: types.String = None,
         other: types.String = None,
     ):
@@ -43,9 +43,9 @@ def __init__(
         """
 
         self.title: types.String = title
-        self.cells: types.Tuple[inp.Cell | inp.Like | inp.Comment] = cells
-        self.surfaces: types.Tuple[inp.Surface | inp.Comment] = surfaces
-        self.data: types.Tuple[inp.Data | inp.Comment] = data
+        self.cells: types.Tuple(inp.Cell | inp.Like | inp.Comment) = cells
+        self.surfaces: types.Tuple(inp.Surface | inp.Comment) = surfaces
+        self.data: types.Tuple(inp.Data | inp.Comment) = data
         self.message: types.String = message
         self.other: types.String = other
 
@@ -242,7 +242,7 @@ def cells(self, cells: list[str] | list[inp.Cell | inp.Like | inp.Comment]) -> N
                     else:
                         array.append(inp.Cell.from_mcnp(item))
 
-            cells = types.Tuple(array)
+            cells = types.Tuple(inp.Card)(array)
 
         if cells is None or None in cells:
             raise errors.InpError(errors.InpCode.SEMANTICS_FILE, cells)
@@ -289,7 +289,7 @@ def surfaces(self, surfaces: list[str] | list[inp.Surface | inp.Comment]) -> Non
                         pass
                     array.append(inp.Surface.from_mcnp(item))
 
-            surfaces = types.Tuple(array)
+            surfaces = types.Tuple(inp.Card)(array)
 
         if surfaces is None or None in surfaces:
             raise errors.InpError(errors.InpCode.SEMANTICS_FILE, surfaces)
@@ -337,7 +337,7 @@ def data(self, data: list[str] | list[inp.Data | inp.Comment]) -> None:
 
                     array.append(inp.Data.from_mcnp(item))
 
-            data = types.Tuple(array)
+            data = types.Tuple(inp.Card)(array)
 
         if data is None or None in data:
             raise errors.InpError(errors.InpCode.SEMANTICS_FILE, data)

scripts/inp_tests.py

@@ -23,7 +23,7 @@ class Outp(_object.McnpFile):
     def __init__(
         self,
         header: outp.Header,
-        blocks: types.Tuple[outp.Block],
+        blocks: types.Tuple(outp.Block),
     ):
         """
         Initializes ``Outp``.
@@ -44,7 +44,7 @@ def __init__(
             raise errors.OutpError(errors.OutpCode.SEMANTICS_FILE, blocks)
 
         self.header: typing.Final[outp.Header] = header
-        self.blocks: typing.Final[types.Tuple[outp.Block]] = blocks
+        self.blocks: typing.Final[types.Tuple(outp.Block)] = blocks
 
     @staticmethod
     def from_mcnp(source: str):
@@ -78,7 +78,7 @@ def from_mcnp(source: str):
 
             blocks.append(block)
 
-        blocks = types.Tuple(blocks)
+        blocks = types.Tuple(outp.Block)(blocks)
 
         return Outp(
             header,

src/pymcnp/Inp.py

@@ -65,7 +65,7 @@ def from_mcnp(source: str):
             raise errors.PtracError(errors.PtracCode.SYNTAX_FILE, source)
 
         header = ptrac.Header.from_mcnp(tokens[1])
-        histories = types.Tuple(ptrac.History.from_mcnp(match[0]) for match in re.finditer(ptrac.History._REGEX.pattern[2:-2], tokens[2]))
+        histories = types.Tuple(ptrac.History)([ptrac.History.from_mcnp(match[0]) for match in re.finditer(ptrac.History._REGEX.pattern[2:-2], tokens[2])])
 
         return Ptrac(header, histories)
 
@@ -77,4 +77,4 @@ def to_mcnp(self):
             PTRAC for ``Ptrac``.
         """
 
-        return self.header.to_mcnp() + ''.join(map(str, self.histories))
+        return self.header.to_mcnp() + ''.join(history.to_mcnp() for history in self.histories)

src/pymcnp/Outp.py

@@ -17,7 +17,7 @@ class Cell(_card.Card):
         'material': types.Integer,
         'density': types.Real,
         'geometry': cell.Geometry,
-        'options': types.Tuple[cell.CellOption],
+        'options': types.Tuple(cell.CellOption),
     }
 
     _REGEX = re.compile(rf'\A(\S+)( \S+)((?<! 0) \S+|(?<= 0))( [^a-z]+)((?: (?:{cell.CellOption._REGEX.pattern[2:-2]}))+?)?\Z')
@@ -28,7 +28,7 @@ def __init__(
         material: types.Integer,
         geometry: cell.Geometry,
         density: types.Real = None,
-        options: types.Tuple[cell.CellOption] = None,
+        options: types.Tuple(cell.CellOption) = None,
     ):
         """
         Initializes ``Cell``.
@@ -48,7 +48,7 @@ def __init__(
         self.material: types.Integer = material
         self.density: types.Real = density
         self.geometry: cell.Geometry = geometry
-        self.options: types.Tuple[cell.CellOption] = options
+        self.options: types.Tuple(cell.CellOption) = options
 
     def to_mcnp(self):
         """
@@ -58,6 +58,8 @@ def to_mcnp(self):
             INP cell card.
         """
 
+        print(type(self.options))
+
         source = f'{self.number} {self.material} {self.density or ""} {self.geometry} {self.options or ""}'
         source, comments = _parser.preprocess_inp(source)
         source = _parser.postprocess_inp(source)
@@ -235,7 +237,7 @@ def geometry(self, geometry: str | cell.Geometry) -> None:
         self._geometry: cell.Geometry = geometry
 
     @property
-    def options(self) -> types.Tuple[cell.CellOption]:
+    def options(self) -> types.Tuple(cell.CellOption):
         """
         Cell options.
 
@@ -266,7 +268,6 @@ def options(self, options: list[str] | list[cell.CellOption] = None) -> None:
                     array.append(item)
                 elif isinstance(item, str):
                     array.append(cell.CellOption.from_mcnp(item))
+            options = types.Tuple(cell.CellOption)(array)
 
-            options = types.Tuple(array)
-
-        self._options: types.Tuple[cell.CellOption] = options
+        self._options: types.Tuple(cell.CellOption) = options

src/pymcnp/Ptrac.py

@@ -15,7 +15,7 @@ class Like(_card.Card):
     _ATTRS = {
         'number': types.Integer,
         'cell': types.Integer,
-        'options': types.Tuple[like.LikeOption],
+        'options': types.Tuple(like.LikeOption),
     }
 
     _REGEX = re.compile(rf'\A(\S+) like (\S+) but((?: (?:{like.LikeOption._REGEX.pattern[2:-2]}))+?)?\Z')
@@ -24,7 +24,7 @@ def __init__(
         self,
         number: types.Integer,
         cell: types.Integer,
-        options: types.Tuple[like.LikeOption] = None,
+        options: types.Tuple(like.LikeOption) = None,
     ):
         """
         Initializes ``Like``.
@@ -40,7 +40,7 @@ def __init__(
 
         self.number: types.Integer = number
         self.cell: types.Integer = cell
-        self.options: types.Tuple[like.LikeOption] = options
+        self.options: types.Tuple(like.LikeOption) = options
 
     def to_mcnp(self):
         """
@@ -133,7 +133,7 @@ def cell(self, cell: str | int | types.Integer) -> None:
         self._cell: types.Integer = cell
 
     @property
-    def options(self) -> types.Tuple[like.LikeOption]:
+    def options(self) -> types.Tuple(like.LikeOption):
         """
         Cell options.
 
@@ -165,6 +165,6 @@ def options(self, options: list[str] | list[like.LikeOption] = None) -> None:
                 elif isinstance(item, str):
                     array.append(like.LikeOption.from_mcnp(item))
 
-            options = types.Tuple(array)
+            options = types.Tuple(like.LikeOption)(array)
 
-        self._options: types.Tuple[like.LikeOption] = options
+        self._options: types.Tuple(like.LikeOption) = options

src/pymcnp/inp/Cell.py

@@ -1,5 +1,3 @@
-import types
-
 from .. import errors
 from ..utils import _object
 from ..utils import _parser
@@ -42,10 +40,7 @@ def from_mcnp(cls, source: str):
 
         attrs = {}
         for i, (name, attr) in enumerate(subclass._ATTRS.items()):
-            if isinstance(attr, types.GenericAlias):
-                attrs[name] = attr.from_mcnp(tokens[i + 1].strip(), attr.__args__[0]) if tokens[i + 1] else None
-            else:
-                attrs[name] = attr.from_mcnp(tokens[i + 1].strip()) if tokens[i + 1] else None
+            attrs[name] = attr.from_mcnp(tokens[i + 1].strip()) if tokens[i + 1] else None
 
         return subclass(**attrs)
 

src/pymcnp/inp/Like.py

@@ -17,7 +17,7 @@ class Fill_0(_option.CellOption):
         'i': types.Index,
         'j': types.Index,
         'k': types.Index,
-        'universes': types.Tuple[types.Integer],
+        'universes': types.Tuple(types.Integer),
         'm': types.Integer,
     }
 
@@ -51,7 +51,7 @@ def __init__(
         self.i: types.Index = i
         self.j: types.Index = j
         self.k: types.Index = k
-        self.universes: types.Tuple[types.Integer] = universes
+        self.universes: types.Tuple(types.Integer) = universes
         self.m: types.Integer = m
 
     @property
@@ -199,7 +199,7 @@ def k(self, k: str | types.Index) -> None:
         self._k: types.Index = k
 
     @property
-    def universes(self) -> types.Tuple[types.Integer]:
+    def universes(self) -> types.Tuple(types.Integer):
         """
         Fill universe numbers
 
@@ -232,12 +232,12 @@ def universes(self, universes: list[str] | list[int] | list[types.Integer]) -> N
                     array.append(types.Integer(item))
                 elif isinstance(item, str):
                     array.append(types.Integer.from_mcnp(item))
-            universes = types.Tuple(array)
+            universes = types.Tuple(types.Integer)(array)
 
         if universes is None:
             raise errors.InpError(errors.InpCode.SEMANTICS_OPTION, universes)
 
-        self._universes: types.Tuple[types.Integer] = universes
+        self._universes: types.Tuple(types.Integer) = universes
 
     @property
     def m(self) -> types.Integer:

src/pymcnp/inp/_option.py

@@ -14,7 +14,7 @@ class Tmp(_option.CellOption):
 
     _ATTRS = {
         'suffix': types.Integer,
-        'temperature': types.Tuple[types.Real],
+        'temperature': types.Tuple(types.Real),
     }
 
     _REGEX = re.compile(rf'\Atmp(\d+)((?: {types.Real._REGEX.pattern[2:-2]})+?)\Z')
@@ -32,7 +32,7 @@ def __init__(self, temperature: list[str] | list[float] | list[types.Real], suff
         """
 
         self.suffix: types.Integer = suffix
-        self.temperature: types.Tuple[types.Real] = temperature
+        self.temperature: types.Tuple(types.Real) = temperature
 
     @property
     def suffix(self) -> types.Integer:
@@ -70,7 +70,7 @@ def suffix(self, suffix: str | int | types.Integer) -> None:
         self._suffix: types.Integer = suffix
 
     @property
-    def temperature(self) -> types.Tuple[types.Real]:
+    def temperature(self) -> types.Tuple(types.Real):
         """
         Temperature at time index
 
@@ -103,9 +103,9 @@ def temperature(self, temperature: list[str] | list[float] | list[types.Real]) -
                     array.append(types.Real(item))
                 elif isinstance(item, str):
                     array.append(types.Real.from_mcnp(item))
-            temperature = types.Tuple(array)
+            temperature = types.Tuple(types.Real)(array)
 
         if temperature is None or not (min(map(lambda temp: temp, temperature)) > 0):
             raise errors.InpError(errors.InpCode.SEMANTICS_OPTION, temperature)
 
-        self._temperature: types.Tuple[types.Real] = temperature
+        self._temperature: types.Tuple(types.Real) = temperature