Add more detailed exception message for bad topology graph

.github/workflows/tests.yml

@@ -26,7 +26,7 @@ jobs:
           cache: "pip"
       - run: "pip install -e '.[dev]'"
       - run: mypy src
-  black:
+  ruff-format:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
@@ -35,7 +35,7 @@ jobs:
           python-version: "3.11"
           cache: "pip"
       - run: "pip install -e '.[dev]'"
-      - run: black --check .
+      - run: ruff format --check .
   pytest:
     runs-on: ubuntu-22.04
     services:

justfile

@@ -22,7 +22,7 @@ check:
   (set -x; ruff . )
 
   echo
-  ( set -x; black --check . )
+  ( set -x; ruff format --check . )
 
   echo
   ( set -x; mypy src )
@@ -37,7 +37,7 @@ check:
 
 # Auto-fix code issues.
 fix:
-  black .
+  ruff format .
   ruff --fix .
 
 # Start a MongoDB instance in docker.

pyproject.toml

@@ -28,12 +28,13 @@ readme = "README.rst"
 
 [project.optional-dependencies]
 dev = [
-  "black",
   "ruff",
   "moldoc",
   "mypy",
   "pip-tools",
-  "pytest",
+  # TODO: Remove pin when https://github.com/TvoroG/pytest-lazy-fixture/issues/65 is resolved.
+  # pytest-lazy-fixture 0.6.0 is incompatible with pytest 8.0.0
+  "pytest<8",
   "pytest-benchmark",
   "pytest-datadir",
   "pytest-lazy-fixture",
@@ -51,11 +52,11 @@ documentation = "https://stk.readthedocs.io"
 [tool.setuptools_scm]
 write_to = "src/stk/_version.py"
 
-[tool.black]
-line-length = 79
 
 [tool.ruff]
 line-length = 79
+
+[too.ruff.lint]
 extend-select = ["I"]
 
 [tool.pytest.ini_options]

src/stk/_internal/building_block.py

@@ -50,9 +50,11 @@ class BuildingBlock(Molecule):
     def __init__(
         self,
         smiles: str,
-        functional_groups: FunctionalGroup
-        | FunctionalGroupFactory
-        | Iterable[FunctionalGroup | FunctionalGroupFactory] = (),
+        functional_groups: (
+            FunctionalGroup
+            | FunctionalGroupFactory
+            | Iterable[FunctionalGroup | FunctionalGroupFactory]
+        ) = (),
         placer_ids: Iterable[int] | None = None,
         position_matrix: np.ndarray | None = None,
     ) -> None:
@@ -137,9 +139,11 @@ def __init__(
     def init_from_molecule(
         cls,
         molecule: Molecule,
-        functional_groups: FunctionalGroup
-        | FunctionalGroupFactory
-        | Iterable[FunctionalGroup | FunctionalGroupFactory] = (),
+        functional_groups: (
+            FunctionalGroup
+            | FunctionalGroupFactory
+            | Iterable[FunctionalGroup | FunctionalGroupFactory]
+        ) = (),
         placer_ids: Iterable[int] | None = None,
     ) -> typing.Self:
         """
@@ -200,9 +204,11 @@ def init_from_molecule(
     def init_from_vabene_molecule(
         cls,
         molecule: vabene.Molecule,
-        functional_groups: FunctionalGroup
-        | FunctionalGroupFactory
-        | Iterable[FunctionalGroup | FunctionalGroupFactory] = (),
+        functional_groups: (
+            FunctionalGroup
+            | FunctionalGroupFactory
+            | Iterable[FunctionalGroup | FunctionalGroupFactory]
+        ) = (),
         placer_ids: Iterable[int] | None = None,
         position_matrix: np.ndarray | None = None,
     ) -> typing.Self:
@@ -316,9 +322,11 @@ def init(
         atoms: Iterable[Atom],
         bonds: Iterable[Bond],
         position_matrix: np.ndarray,
-        functional_groups: FunctionalGroup
-        | FunctionalGroupFactory
-        | Iterable[FunctionalGroup | FunctionalGroupFactory] = (),
+        functional_groups: (
+            FunctionalGroup
+            | FunctionalGroupFactory
+            | Iterable[FunctionalGroup | FunctionalGroupFactory]
+        ) = (),
         placer_ids: Iterable[int] | None = None,
     ) -> typing.Self:
         """
@@ -380,11 +388,13 @@ def init(
             bonds=bonds,
             position_matrix=position_matrix,
         )
-        building_block._fg_repr = repr(functional_groups)
         functional_groups = building_block._extract_functional_groups(
             functional_groups=functional_groups,
         )
         building_block._with_functional_groups(functional_groups)
+        building_block._fg_repr = repr(  # type: ignore[has-type]
+            tuple(building_block.get_functional_groups())
+        )
         building_block._placer_ids = building_block._normalize_placer_ids(
             placer_ids=placer_ids,
             functional_groups=building_block._functional_groups,
@@ -400,9 +410,11 @@ def init(
     def init_from_file(
         cls,
         path: pathlib.Path | str,
-        functional_groups: FunctionalGroup
-        | FunctionalGroupFactory
-        | Iterable[FunctionalGroup | FunctionalGroupFactory] = (),
+        functional_groups: (
+            FunctionalGroup
+            | FunctionalGroupFactory
+            | Iterable[FunctionalGroup | FunctionalGroupFactory]
+        ) = (),
         placer_ids: Iterable[int] | None = None,
     ) -> typing.Self:
         """
@@ -479,9 +491,11 @@ def init_from_file(
     def init_from_rdkit_mol(
         cls,
         molecule: rdkit.Mol,
-        functional_groups: FunctionalGroup
-        | FunctionalGroupFactory
-        | Iterable[FunctionalGroup | FunctionalGroupFactory] = (),
+        functional_groups: (
+            FunctionalGroup
+            | FunctionalGroupFactory
+            | Iterable[FunctionalGroup | FunctionalGroupFactory]
+        ) = (),
         placer_ids: Iterable[int] | None = None,
     ) -> typing.Self:
         """
@@ -548,9 +562,11 @@ def init_from_rdkit_mol(
     def _init_from_rdkit_mol(
         self,
         molecule: rdkit.Mol,
-        functional_groups: FunctionalGroup
-        | FunctionalGroupFactory
-        | Iterable[FunctionalGroup | FunctionalGroupFactory],
+        functional_groups: (
+            FunctionalGroup
+            | FunctionalGroupFactory
+            | Iterable[FunctionalGroup | FunctionalGroupFactory]
+        ),
         placer_ids: Iterable[int] | None,
     ) -> None:
         """
@@ -595,7 +611,6 @@ def _init_from_rdkit_mol(
 
         """
 
-        self._fg_repr = repr(functional_groups)
         atoms = tuple(
             Atom(a.GetIdx(), a.GetAtomicNum(), a.GetFormalCharge())
             for a in molecule.GetAtoms()
@@ -620,6 +635,7 @@ def _init_from_rdkit_mol(
                 functional_groups=functional_groups,
             )
         )
+        self._fg_repr = repr(self._functional_groups)
         self._placer_ids = self._normalize_placer_ids(
             placer_ids=placer_ids,
             functional_groups=self._functional_groups,
@@ -714,9 +730,11 @@ def _get_core_ids(
 
     def _extract_functional_groups(
         self,
-        functional_groups: FunctionalGroup
-        | FunctionalGroupFactory
-        | Iterable[FunctionalGroup | FunctionalGroupFactory],
+        functional_groups: (
+            FunctionalGroup
+            | FunctionalGroupFactory
+            | Iterable[FunctionalGroup | FunctionalGroupFactory]
+        ),
     ) -> Iterator[FunctionalGroup]:
         """
         Yield functional groups.

src/stk/_internal/ea/evolutionary_algorithm/implementations/implementation.py

@@ -138,7 +138,7 @@ def get_key(record: T) -> str:
             population, keys = dedupe(
                 items=(
                     molecule_record
-                    for molecule_record, in self._generation_selector.select(
+                    for (molecule_record,) in self._generation_selector.select(
                         population=normalized_fitness_values
                     )
                 ),

src/stk/_internal/ea/fitness_normalizers/add.py

@@ -106,9 +106,8 @@ class Add(FitnessNormalizer[T]):
     def __init__(
         self,
         number: float | Iterable[float],
-        filter: Callable[
-            [dict[T, Any], T], bool
-        ] = lambda fitness_values, record: True,
+        filter: Callable[[dict[T, Any], T], bool] = lambda fitness_values,
+        record: True,
     ) -> None:
         """
         Parameters:
@@ -134,8 +133,10 @@ def __init__(
 
     def normalize(self, fitness_values: dict[T, Any]) -> dict[T, Any]:
         return {
-            record: np.add(self._number, fitness_value)
-            if self._filter(fitness_values, record)
-            else fitness_value
+            record: (
+                np.add(self._number, fitness_value)
+                if self._filter(fitness_values, record)
+                else fitness_value
+            )
             for record, fitness_value in fitness_values.items()
         }

src/stk/_internal/ea/fitness_normalizers/divide_by_mean.py

@@ -85,9 +85,8 @@ class DivideByMean(FitnessNormalizer[T]):
 
     def __init__(
         self,
-        filter: Callable[
-            [dict[T, Any], T], bool
-        ] = lambda fitness_values, record: True,
+        filter: Callable[[dict[T, Any], T], bool] = lambda fitness_values,
+        record: True,
     ) -> None:
         """
         Parameters:
@@ -116,8 +115,10 @@ def normalize(self, fitness_values: dict[T, Any]) -> dict[T, Any]:
         logger.debug(f"Means used: {mean}")
 
         return {
-            record: np.divide(fitness_value, mean)
-            if self._filter(fitness_values, record)
-            else fitness_value
+            record: (
+                np.divide(fitness_value, mean)
+                if self._filter(fitness_values, record)
+                else fitness_value
+            )
             for record, fitness_value in fitness_values.items()
         }

src/stk/_internal/ea/fitness_normalizers/multiply.py

@@ -107,9 +107,8 @@ class Multiply(FitnessNormalizer[T]):
     def __init__(
         self,
         coefficient: float | Iterable[float],
-        filter: Callable[
-            [dict[T, Any], T], bool
-        ] = lambda fitness_values, record: True,
+        filter: Callable[[dict[T, Any], T], bool] = lambda fitness_values,
+        record: True,
     ) -> None:
         """
         Parameters:
@@ -135,8 +134,10 @@ def __init__(
 
     def normalize(self, fitness_values: dict[T, Any]) -> dict[T, Any]:
         return {
-            record: np.multiply(self._coefficient, fitness_value)
-            if self._filter(fitness_values, record)
-            else fitness_value
+            record: (
+                np.multiply(self._coefficient, fitness_value)
+                if self._filter(fitness_values, record)
+                else fitness_value
+            )
             for record, fitness_value in fitness_values.items()
         }

src/stk/_internal/ea/fitness_normalizers/power.py

@@ -141,9 +141,8 @@ class Power(FitnessNormalizer[T]):
     def __init__(
         self,
         power: float | Iterable[float],
-        filter: Callable[
-            [dict[T, Any], T], bool
-        ] = lambda fitness_values, record: True,
+        filter: Callable[[dict[T, Any], T], bool] = lambda fitness_values,
+        record: True,
     ) -> None:
         """
         Parameters:
@@ -169,8 +168,10 @@ def __init__(
 
     def normalize(self, fitness_values: dict[T, Any]) -> dict[T, Any]:
         return {
-            record: np.float_power(fitness_value, self._power)
-            if self._filter(fitness_values, record)
-            else fitness_value
+            record: (
+                np.float_power(fitness_value, self._power)
+                if self._filter(fitness_values, record)
+                else fitness_value
+            )
             for record, fitness_value in fitness_values.items()
         }

src/stk/_internal/ea/fitness_normalizers/replace_fitness.py

@@ -68,9 +68,8 @@ def get_minimum_fitness_value(fitness_values):
     def __init__(
         self,
         get_replacement: Callable[[dict[T, Any]], Any],
-        filter: Callable[
-            [dict[T, Any], T], bool
-        ] = lambda fitness_values, record: True,
+        filter: Callable[[dict[T, Any], T], bool] = lambda fitness_values,
+        record: True,
     ) -> None:
         """
         Parameters:
@@ -97,8 +96,10 @@ def __init__(
     def normalize(self, fitness_values: dict[T, Any]) -> dict[T, Any]:
         replacement = self._get_replacement(fitness_values)
         return {
-            record: replacement
-            if self._filter(fitness_values, record)
-            else fitness_value
+            record: (
+                replacement
+                if self._filter(fitness_values, record)
+                else fitness_value
+            )
             for record, fitness_value in fitness_values.items()
         }

src/stk/_internal/ea/fitness_normalizers/shift_up.py

@@ -144,9 +144,8 @@ class ShiftUp(FitnessNormalizer[T]):
 
     def __init__(
         self,
-        filter: Callable[
-            [dict[T, Any], T], bool
-        ] = lambda fitness_values, record: True,
+        filter: Callable[[dict[T, Any], T], bool] = lambda fitness_values,
+        record: True,
     ) -> None:
         """
         Parameters:
@@ -184,8 +183,10 @@ def normalize(self, fitness_values: dict[T, Any]) -> dict[T, Any]:
                 shift[i] = 1 - min_
 
         return {
-            record: fitness_value + shift
-            if self._filter(fitness_values, record)
-            else fitness_value
+            record: (
+                fitness_value + shift
+                if self._filter(fitness_values, record)
+                else fitness_value
+            )
             for record, fitness_value in fitness_values.items()
         }