ratapi 0.0.0.dev8__tar.gz → 0.0.0.dev10__tar.gz

{ratapi-0.0.0.dev8/ratapi.egg-info → ratapi-0.0.0.dev10}/PKG-INFO

@@ -1,20 +1,20 @@
 Metadata-Version: 2.1
 Name: ratapi
-Version: 0.0.0.dev8
+Version: 0.0.0.dev10
 Summary: Python extension for the Reflectivity Analysis Toolbox (RAT)
-Home-page: https://github.com/RascalSoftware/python-RAT
-Author: 
-Author-email: 
+Project-URL: Documentation, https://rascalsoftware.github.io/RAT/
+Project-URL: Repository, https://github.com/RascalSoftware/python-RAT
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Provides-Extra: Dev
-Provides-Extra: Matlab_2023a
-Provides-Extra: Matlab_2023b
-Provides-Extra: Matlab_2024a
-Provides-Extra: Matlab_2024b
-Provides-Extra: Matlab_2025a
-Provides-Extra: Matlab_latest
-Provides-Extra: Orso
+Provides-Extra: dev
+Provides-Extra: matlab_2023a
+Provides-Extra: matlab_2023b
+Provides-Extra: matlab_2024a
+Provides-Extra: matlab_2024b
+Provides-Extra: matlab_2025a
+Provides-Extra: matlab_2025b
+Provides-Extra: matlab_latest
+Provides-Extra: orso
 
 python-RAT
 ==========
@@ -30,11 +30,11 @@ To install in local directory:
 
 matlabengine is an optional dependency only required for Matlab custom functions. The version of matlabengine should match the version of Matlab installed on the machine. This can be installed as shown below:
 
-    pip install -e .[Matlab-2023a]
+    pip install -e .[matlab-2023a]
 
 Development dependencies can be installed as shown below
 
-    pip install -e .[Dev]    
+    pip install -e .[dev]
 
 To build wheel:
 

{ratapi-0.0.0.dev8 → ratapi-0.0.0.dev10}/README.md

@@ -12,11 +12,11 @@ To install in local directory:
 
 matlabengine is an optional dependency only required for Matlab custom functions. The version of matlabengine should match the version of Matlab installed on the machine. This can be installed as shown below:
 
-    pip install -e .[Matlab-2023a]
+    pip install -e .[matlab-2023a]
 
 Development dependencies can be installed as shown below
 
-    pip install -e .[Dev]    
+    pip install -e .[dev]
 
 To build wheel:
 

{ratapi-0.0.0.dev8 → ratapi-0.0.0.dev10}/cpp/RAT/groupLayersMod.cpp

@@ -139,11 +139,7 @@ namespace RAT
         }
       }
     } else {
-      outputLayers.set_size(1, 4);
-      outputLayers[0] = 0.0;
-      outputLayers[outputLayers.size(0)] = 0.0;
-      outputLayers[outputLayers.size(0) * 2] = 0.0;
-      outputLayers[outputLayers.size(0) * 3] = 0.0;
+      outputLayers.set_size(0, 4);
     }
 
     return ssubs;

ratapi-0.0.0.dev10/pyproject.toml

@@ -0,0 +1,94 @@
+[build-system]
+requires = [
+    'setuptools>=61',
+    'wheel',
+    'pybind11>=2.4',
+]
+build-backend = 'setuptools.build_meta'
+
+[project]
+name = "ratapi"
+version = "0.0.0.dev10"
+description = "Python extension for the Reflectivity Analysis Toolbox (RAT)"
+readme = "README.md"
+requires-python = ">=3.10"
+dependencies = [
+    "matplotlib>=3.8.3",
+    "numpy>=1.20",
+    "prettytable>=3.9.0",
+    "pydantic>=2.7.2",
+    "scipy>=1.13.1",
+    "strenum>=0.4.15 ; python_full_version < '3.11'",
+    "tqdm>=4.66.5",
+]
+
+[project.urls]
+Documentation = "https://rascalsoftware.github.io/RAT/"
+Repository = "https://github.com/RascalSoftware/python-RAT"
+
+[project.optional-dependencies]
+dev = [
+    "pytest>=7.4.0",
+    "pytest-cov>=4.1.0",
+    "ruff>=0.4.10"
+]
+orso = [
+    "orsopy>=1.2.1",
+    "pint>=0.24.4"
+]
+matlab_latest = ["matlabengine"]
+matlab_2025b = ["matlabengine == 25.2.*"]
+matlab_2025a = ["matlabengine == 25.1.2"]
+matlab_2024b = ["matlabengine == 24.2.2"]
+matlab_2024a = ["matlabengine == 24.1.4"]
+matlab_2023b = ["matlabengine == 23.2.3"]
+matlab_2023a = ["matlabengine == 9.14.3"]
+
+[tool.uv]
+conflicts = [
+    [
+        { extra = "matlab_latest" },
+        { extra = "matlab_2025b" },
+        { extra = "matlab_2025a" },
+        { extra = "matlab_2024b" },
+        { extra = "matlab_2024a" },
+        { extra = "matlab_2023b" },
+        { extra = "matlab_2023a" },
+    ],
+]
+
+[tool.ruff]
+line-length = 120
+extend-exclude = ["*.ipynb"]
+
+[tool.ruff.lint]
+select = ["E",   # pycodestyle errors
+          "F",   # pyflakes
+          "UP",  # pyupgrade
+          "B",   # flake8-bugbear
+          "SIM", # flake8-simplify
+          "I",   # isort
+          "D"]  # pydocstyle
+
+ignore = ["SIM103", # needless bool
+          "SIM108", # if-else block instead of ternary operator
+          "D105",   # undocumented __init__
+          "D107",   # undocumented magic method
+          "D203",   # blank line before class docstring
+          "D213",   # multi line summary should start at second line
+          "UP038"]  # non pep604 isinstance - to be removed
+
+# ignore docstring lints in the tests and install script
+[tool.ruff.lint.per-file-ignores]
+"tests/*" = ["D"]
+"setup.py" = ["D"]
+
+[tool.ruff.lint.flake8-pytest-style]
+fixture-parentheses = false
+mark-parentheses = false
+
+[tool.ruff.lint.pydocstyle]
+convention = "numpy"
+
+[tool.ruff.lint.isort]
+known-first-party = ["ratapi.rat_core"]

{ratapi-0.0.0.dev8 → ratapi-0.0.0.dev10}/ratapi/classlist.py

@@ -5,7 +5,7 @@ import contextlib
 import importlib
 import warnings
 from collections.abc import Sequence
-from typing import Any, Generic, TypeVar, Union
+from typing import Any, Generic, TypeVar
 
 import numpy as np
 import prettytable
@@ -38,7 +38,7 @@ class ClassList(collections.UserList, Generic[T]):
 
     """
 
-    def __init__(self, init_list: Union[Sequence[T], T] = None, name_field: str = "name") -> None:
+    def __init__(self, init_list: Sequence[T] | T = None, name_field: str = "name") -> None:
         self.name_field = name_field
 
         # Set input as list if necessary
@@ -114,7 +114,7 @@ class ClassList(collections.UserList, Generic[T]):
                 output = str(self.data)
         return output
 
-    def __getitem__(self, index: Union[int, slice, str, T]) -> T:
+    def __getitem__(self, index: int | slice | str | T) -> T:
         """Get an item by its index, name, a slice, or the object itself."""
         if isinstance(index, (int, slice)):
             return self.data[index]
@@ -262,12 +262,12 @@ class ClassList(collections.UserList, Generic[T]):
             self._validate_name_field(kwargs)
             self.data.insert(index, self._class_handle(**kwargs))
 
-    def remove(self, item: Union[T, str]) -> None:
+    def remove(self, item: T | str) -> None:
         """Remove an object from the ClassList using either the object itself or its ``name_field`` value."""
         item = self._get_item_from_name_field(item)
         self.data.remove(item)
 
-    def count(self, item: Union[T, str]) -> int:
+    def count(self, item: T | str) -> int:
         """Return the number of times an object appears in the ClassList.
 
         This method can use either the object itself or its ``name_field`` value.
@@ -276,7 +276,7 @@ class ClassList(collections.UserList, Generic[T]):
         item = self._get_item_from_name_field(item)
         return self.data.count(item)
 
-    def index(self, item: Union[T, str], offset: bool = False, *args) -> int:
+    def index(self, item: T | str, offset: bool = False, *args) -> int:
         """Return the index of a particular object in the ClassList.
 
         This method can use either the object itself or its ``name_field`` value.
@@ -309,7 +309,7 @@ class ClassList(collections.UserList, Generic[T]):
             ]
         )
 
-    def set_fields(self, index: Union[int, slice, str, T], **kwargs) -> None:
+    def set_fields(self, index: int | slice | str | T, **kwargs) -> None:
         """Assign the values of an existing object's attributes using keyword arguments."""
         self._validate_name_field(kwargs)
         pydantic_object = False
@@ -519,7 +519,7 @@ class ClassList(collections.UserList, Generic[T]):
                 f"In the input list:\n{newline.join(error for error in error_list)}\n"
             )
 
-    def _get_item_from_name_field(self, value: Union[T, str]) -> Union[T, str]:
+    def _get_item_from_name_field(self, value: T | str) -> T | str:
         """Return the object with the given value of the ``name_field`` attribute in the ClassList.
 
         Parameters
@@ -577,11 +577,12 @@ class ClassList(collections.UserList, Generic[T]):
     @classmethod
     def __get_pydantic_core_schema__(cls, source: Any, handler):
         # import here so that the ClassList can be instantiated and used without Pydantic installed
+        from typing import get_args, get_origin
+
         from pydantic import ValidatorFunctionWrapHandler
         from pydantic.types import (
             core_schema,  # import core_schema through here rather than making pydantic_core a dependency
         )
-        from typing_extensions import get_args, get_origin
 
         # if annotated with a class, get the item type of that class
         origin = get_origin(source)

{ratapi-0.0.0.dev8 → ratapi-0.0.0.dev10}/ratapi/controls.py

@@ -5,7 +5,6 @@ import os
 import tempfile
 import warnings
 from pathlib import Path
-from typing import Union
 
 import prettytable
 from pydantic import (
@@ -207,7 +206,7 @@ class Controls(BaseModel, validate_assignment=True, extra="forbid", use_attribut
     def initialise_IPC(self):
         """Set up the inter-process communication file."""
         IPC_obj, self._IPCFilePath = tempfile.mkstemp()
-        os.write(IPC_obj, b"0")
+        os.write(IPC_obj, b"\x00")
         os.close(IPC_obj)
         return None
 
@@ -222,7 +221,7 @@ class Controls(BaseModel, validate_assignment=True, extra="forbid", use_attribut
         """
         if os.path.isfile(self._IPCFilePath):
             with open(self._IPCFilePath, "wb") as f:
-                f.write(b"1")
+                f.write(b"\x01")
         else:
             warnings.warn("An IPC file was not initialised.", UserWarning, stacklevel=2)
         return None
@@ -231,24 +230,22 @@ class Controls(BaseModel, validate_assignment=True, extra="forbid", use_attribut
         """Delete the inter-process communication file."""
         with contextlib.suppress(FileNotFoundError):
             os.remove(self._IPCFilePath)
+        self._IPCFilePath = ""
         return None
 
-    def save(self, path: Union[str, Path], filename: str = "controls"):
+    def save(self, filepath: str | Path = "./controls.json"):
         """Save a controls object to a JSON file.
 
         Parameters
         ----------
-        path : str or Path
-            The directory in which the controls object will be written.
-        filename : str
-            The name for the JSON file containing the controls object.
-
+        filepath : str or Path
+            The path to where the controls file will be written.
         """
-        file = Path(path, f"{filename.removesuffix('.json')}.json")
-        file.write_text(self.model_dump_json())
+        filepath = Path(filepath).with_suffix(".json")
+        filepath.write_text(self.model_dump_json())
 
     @classmethod
-    def load(cls, path: Union[str, Path]) -> "Controls":
+    def load(cls, path: str | Path) -> "Controls":
         """Load a controls object from file.
 
         Parameters

{ratapi-0.0.0.dev8 → ratapi-0.0.0.dev10}/ratapi/events.py

@@ -1,12 +1,12 @@
 """Hooks for connecting to run callback events."""
 
 import os
-from typing import Callable, Union
+from collections.abc import Callable
 
 from ratapi.rat_core import EventBridge, EventTypes, PlotEventData, ProgressEventData
 
 
-def notify(event_type: EventTypes, data: Union[str, PlotEventData, ProgressEventData]) -> None:
+def notify(event_type: EventTypes, data: str | PlotEventData | ProgressEventData) -> None:
     """Call registered callbacks with data when event type has been triggered.
 
     Parameters
@@ -22,7 +22,7 @@ def notify(event_type: EventTypes, data: Union[str, PlotEventData, ProgressEvent
         callback(data)
 
 
-def get_event_callback(event_type: EventTypes) -> list[Callable[[Union[str, PlotEventData, ProgressEventData]], None]]:
+def get_event_callback(event_type: EventTypes) -> list[Callable[[str | PlotEventData | ProgressEventData], None]]:
     """Return all callbacks registered for the given event type.
 
     Parameters
@@ -39,7 +39,7 @@ def get_event_callback(event_type: EventTypes) -> list[Callable[[Union[str, Plot
     return list(__event_callbacks[event_type])
 
 
-def register(event_type: EventTypes, callback: Callable[[Union[str, PlotEventData, ProgressEventData]], None]) -> None:
+def register(event_type: EventTypes, callback: Callable[[str | PlotEventData | ProgressEventData], None]) -> None:
     """Register a new callback for the event type.
 
     Parameters

{ratapi-0.0.0.dev8 → ratapi-0.0.0.dev10}/ratapi/examples/domains/domains_XY_model.py

@@ -1,8 +1,9 @@
 """Custom model file for the domains custom XY example."""
 
-import math
+from math import sqrt
 
 import numpy as np
+from scipy.special import erf
 
 
 def domains_XY_model(params, bulk_in, bulk_out, contrast, domain):
@@ -19,13 +20,13 @@ def domains_XY_model(params, bulk_in, bulk_out, contrast, domain):
     z = np.arange(0, 141)
 
     # Make the volume fraction distribution for our Silicon substrate
-    [vfSilicon, siSurf] = makeLayer(z, -25, 50, 1, subRough, subRough)
+    [vfSilicon, siSurf] = make_layer(z, -25, 50, 1, subRough, subRough)
 
     # ... and the Oxide ...
-    [vfOxide, oxSurface] = makeLayer(z, siSurf, oxideThick, 1, subRough, subRough)
+    [vfOxide, oxSurface] = make_layer(z, siSurf, oxideThick, 1, subRough, subRough)
 
     # ... and also our layer.
-    [vfLayer, laySurface] = makeLayer(z, oxSurface, layerThick, 1, subRough, layerRough)
+    [vfLayer, laySurface] = make_layer(z, oxSurface, layerThick, 1, subRough, layerRough)
 
     # Everything that is not already occupied will be filled will water
     totalVF = vfSilicon + vfOxide + vfLayer
@@ -53,7 +54,7 @@ def domains_XY_model(params, bulk_in, bulk_out, contrast, domain):
     return SLD, subRough
 
 
-def makeLayer(z, prevLaySurf, thickness, height, Sigma_L, Sigma_R):
+def make_layer(z, prevLaySurf, thickness, height, Sigma_L, Sigma_R):
     """Produce a layer, with a defined thickness, height and roughness.
 
     Each side of the layer has its own roughness value.
@@ -63,12 +64,9 @@ def makeLayer(z, prevLaySurf, thickness, height, Sigma_L, Sigma_R):
     right = prevLaySurf + thickness
 
     # Make our heaviside
-    a = (z - left) / ((2**0.5) * Sigma_L)
-    b = (z - right) / ((2**0.5) * Sigma_R)
+    erf_left = erf((z - left) / (sqrt(2) * Sigma_L))
+    erf_right = erf((z - right) / (sqrt(2) * Sigma_R))
 
-    erf_a = np.array([math.erf(value) for value in a])
-    erf_b = np.array([math.erf(value) for value in b])
-
-    VF = np.array((height / 2) * (erf_a - erf_b))
+    VF = np.array((0.5 * height) * (erf_left - erf_right))
 
     return VF, right

{ratapi-0.0.0.dev8 → ratapi-0.0.0.dev10}/ratapi/examples/normal_reflectivity/custom_XY_DSPC.py

@@ -1,8 +1,9 @@
 """A custom XY model for a supported DSPC bilayer."""
 
-import math
+from math import sqrt
 
 import numpy as np
+from scipy.special import erf
 
 
 def custom_XY_DSPC(params, bulk_in, bulk_out, contrast):
@@ -51,10 +52,10 @@ def custom_XY_DSPC(params, bulk_in, bulk_out, contrast):
     z = np.arange(0, 141)
 
     # Make our Silicon substrate
-    vfSilicon, siSurf = layer(z, -25, 50, 1, subRough, subRough)
+    vfSilicon, siSurf = make_layer(z, -25, 50, 1, subRough, subRough)
 
     # Add the Oxide
-    vfOxide, oxSurface = layer(z, siSurf, oxideThick, 1, subRough, subRough)
+    vfOxide, oxSurface = make_layer(z, siSurf, oxideThick, 1, subRough, subRough)
 
     # We fill in the water at the end, but there may be a hydration layer between the bilayer and the oxide,
     # so we start the bilayer stack an appropriate distance away
@@ -65,15 +66,15 @@ def custom_XY_DSPC(params, bulk_in, bulk_out, contrast):
     headThick = vHead / lipidAPM
 
     # ... and make a box for the volume fraction (1 for now, we correct for coverage later)
-    vfHeadL, headLSurface = layer(z, watSurface, headThick, 1, bilayerRough, bilayerRough)
+    vfHeadL, headLSurface = make_layer(z, watSurface, headThick, 1, bilayerRough, bilayerRough)
 
     # ... also do the same for the tails
     # We'll make both together, so the thickness will be twice the volume
     tailsThick = (2 * vTail) / lipidAPM
-    vfTails, tailsSurf = layer(z, headLSurface, tailsThick, 1, bilayerRough, bilayerRough)
+    vfTails, tailsSurf = make_layer(z, headLSurface, tailsThick, 1, bilayerRough, bilayerRough)
 
     # Finally the upper head ...
-    vfHeadR, headSurface = layer(z, tailsSurf, headThick, 1, bilayerRough, bilayerRough)
+    vfHeadR, headSurface = make_layer(z, tailsSurf, headThick, 1, bilayerRough, bilayerRough)
 
     # Making the model
     # We've created the volume fraction profiles corresponding to each of the groups.
@@ -114,12 +115,12 @@ def custom_XY_DSPC(params, bulk_in, bulk_out, contrast):
     totSLD = sldSilicon + sldOxide + sldHeadL + sldTails + sldHeadR + sldWat
 
     # Make the SLD array for output
-    SLD = [[a, b] for (a, b) in zip(z, totSLD)]
+    SLD = np.column_stack((z, totSLD))
 
     return SLD, subRough
 
 
-def layer(z, prevLaySurf, thickness, height, Sigma_L, Sigma_R):
+def make_layer(z, prevLaySurf, thickness, height, Sigma_L, Sigma_R):
     """Produce a layer, with a defined thickness, height and roughness.
 
     Each side of the layer has its own roughness value.
@@ -129,12 +130,9 @@ def layer(z, prevLaySurf, thickness, height, Sigma_L, Sigma_R):
     right = prevLaySurf + thickness
 
     # Make our heaviside
-    a = (z - left) / ((2**0.5) * Sigma_L)
-    b = (z - right) / ((2**0.5) * Sigma_R)
+    erf_left = erf((z - left) / (sqrt(2) * Sigma_L))
+    erf_right = erf((z - right) / (sqrt(2) * Sigma_R))
 
-    erf_a = np.array([math.erf(value) for value in a])
-    erf_b = np.array([math.erf(value) for value in b])
-
-    VF = np.array((height / 2) * (erf_a - erf_b))
+    VF = np.array((0.5 * height) * (erf_left - erf_right))
 
     return VF, right

{ratapi-0.0.0.dev8 → ratapi-0.0.0.dev10}/ratapi/inputs.py

@@ -3,7 +3,7 @@
 import importlib
 import os
 import pathlib
-from typing import Callable, Union
+from collections.abc import Callable
 
 import numpy as np
 
@@ -23,7 +23,7 @@ parameter_field = {
 }
 
 
-def get_python_handle(file_name: str, function_name: str, path: Union[str, pathlib.Path] = "") -> Callable:
+def get_python_handle(file_name: str, function_name: str, path: str | pathlib.Path = "") -> Callable:
     """Get the function handle from a function defined in a python module located anywhere within the filesystem.
 
     Parameters

{ratapi-0.0.0.dev8 → ratapi-0.0.0.dev10}/ratapi/outputs.py

@@ -3,7 +3,7 @@
 import json
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Optional, Union
+from typing import Any, Union
 
 import numpy as np
 
@@ -244,7 +244,7 @@ class Results:
             output += get_field_string(key, value, 100)
         return output
 
-    def save(self, filepath: Union[str, Path] = "./results.json"):
+    def save(self, filepath: str | Path = "./results.json"):
         """Save the Results object to a JSON file.
 
         Parameters
@@ -258,7 +258,7 @@ class Results:
         filepath.write_text(json.dumps(json_dict))
 
     @classmethod
-    def load(cls, path: Union[str, Path]) -> Union["Results", "BayesResults"]:
+    def load(cls, path: str | Path) -> Union["Results", "BayesResults"]:
         """Load a Results object from file.
 
         Parameters
@@ -538,7 +538,20 @@ class BayesResults(Results):
     nestedSamplerOutput: NestedSamplerOutput
     chain: np.ndarray
 
-    def save(self, filepath: Union[str, Path] = "./results.json"):
+    def from_procedure(self) -> Procedures:
+        """Return the procedure that created the result.
+
+        Returns
+        -------
+        procedure: Procedures
+            The procedure that created the result.
+        """
+        samples = self.nestedSamplerOutput.nestSamples
+        if samples.shape == (1, 2) and not np.any(samples):
+            return Procedures.DREAM
+        return Procedures.NS
+
+    def save(self, filepath: str | Path = "./results.json"):
         """Save the BayesResults object to a JSON file.
 
         Parameters
@@ -574,7 +587,7 @@ class BayesResults(Results):
         filepath.write_text(json.dumps(json_dict))
 
 
-def write_core_results_fields(results: Union[Results, BayesResults], json_dict: Optional[dict] = None) -> dict:
+def write_core_results_fields(results: Results | BayesResults, json_dict: dict | None = None) -> dict:
     """Modify the values of the fields that appear in both Results and BayesResults when saving to a json file.
 
     Parameters
@@ -684,8 +697,8 @@ def read_bayes_results_fields(results_dict: dict) -> dict:
 def make_results(
     procedure: Procedures,
     output_results: ratapi.rat_core.OutputResult,
-    bayes_results: Optional[ratapi.rat_core.OutputBayesResult] = None,
-) -> Union[Results, BayesResults]:
+    bayes_results: ratapi.rat_core.OutputBayesResult | None = None,
+) -> Results | BayesResults:
     """Initialise a python Results or BayesResults object using the outputs from a RAT calculation.
 
     Parameters

{ratapi-0.0.0.dev8 → ratapi-0.0.0.dev10}/ratapi/project.py

@@ -5,10 +5,11 @@ import copy
 import functools
 import json
 import warnings
+from collections.abc import Callable
 from enum import Enum
 from pathlib import Path
 from textwrap import indent
-from typing import Annotated, Any, Callable, Union
+from typing import Annotated, Any, get_args, get_origin
 
 import numpy as np
 from pydantic import (
@@ -21,7 +22,6 @@ from pydantic import (
     field_validator,
     model_validator,
 )
-from typing_extensions import get_args, get_origin
 
 import ratapi.models
 from ratapi.classlist import ClassList
@@ -248,10 +248,10 @@ class Project(BaseModel, validate_assignment=True, extra="forbid", use_attribute
     data: ClassList[ratapi.models.Data] = ClassList()
     """Experimental data for a model."""
 
-    layers: Union[
-        Annotated[ClassList[ratapi.models.Layer], Tag("no_abs")],
-        Annotated[ClassList[ratapi.models.AbsorptionLayer], Tag("abs")],
-    ] = Field(
+    layers: (
+        Annotated[ClassList[ratapi.models.Layer], Tag("no_abs")]
+        | Annotated[ClassList[ratapi.models.AbsorptionLayer], Tag("abs")]
+    ) = Field(
         default=ClassList(),
         discriminator=Discriminator(
             discriminate_layers,
@@ -265,10 +265,10 @@ class Project(BaseModel, validate_assignment=True, extra="forbid", use_attribute
     domain_contrasts: ClassList[ratapi.models.DomainContrast] = ClassList()
     """The groups of layers required by each domain in a domains model."""
 
-    contrasts: Union[
-        Annotated[ClassList[ratapi.models.Contrast], Tag("no_ratio")],
-        Annotated[ClassList[ratapi.models.ContrastWithRatio], Tag("ratio")],
-    ] = Field(
+    contrasts: (
+        Annotated[ClassList[ratapi.models.Contrast], Tag("no_ratio")]
+        | Annotated[ClassList[ratapi.models.ContrastWithRatio], Tag("ratio")]
+    ) = Field(
         default=ClassList(),
         discriminator=Discriminator(
             discriminate_contrasts,
@@ -577,7 +577,7 @@ class Project(BaseModel, validate_assignment=True, extra="forbid", use_attribute
             old_names = self._all_names[class_list]
             new_names = getattr(self, class_list).get_names()
             if len(old_names) == len(new_names):
-                name_diff = [(old, new) for (old, new) in zip(old_names, new_names) if old != new]
+                name_diff = [(old, new) for (old, new) in zip(old_names, new_names, strict=False) if old != new]
                 for old_name, new_name in name_diff:
                     for field in fields_to_update:
                         project_field = getattr(self, field.attribute)
@@ -927,7 +927,7 @@ from numpy import array, empty, inf
             + "\n)"
         )
 
-    def save(self, filepath: Union[str, Path] = "./project.json"):
+    def save(self, filepath: str | Path = "./project.json"):
         """Save a project to a JSON file.
 
         Parameters
@@ -973,7 +973,7 @@ from numpy import array, empty, inf
         filepath.write_text(json.dumps(json_dict))
 
     @classmethod
-    def load(cls, path: Union[str, Path]) -> "Project":
+    def load(cls, path: str | Path) -> "Project":
         """Load a project from file.
 
         Parameters