structuretoolkit 0.0.39__tar.gz → 0.0.41__tar.gz

{structuretoolkit-0.0.39 → structuretoolkit-0.0.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: structuretoolkit
-Version: 0.0.39
+Version: 0.0.41
 Summary: build, analyse and visualise atomistic structures for materials science
 Project-URL: Homepage, https://github.com/pyiron/structuretoolkit
 Project-URL: Documentation, https://github.com/pyiron/structuretoolkit
@@ -46,30 +46,30 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering :: Physics
-Requires-Python: <3.14,>=3.10
-Requires-Dist: ase<=3.27.0,>=3.20.1
-Requires-Dist: numpy<=2.3.5,>=1.23.5
-Requires-Dist: scipy<=1.16.3,>=1.15.0
+Requires-Python: <3.15,>=3.10
+Requires-Dist: ase<=3.28.0,>=3.20.1
+Requires-Dist: numpy<=2.4.3,>=1.23.5
+Requires-Dist: scipy<=1.17.0,>=1.15.0
 Provides-Extra: clusters
-Requires-Dist: scikit-learn==1.7.2; extra == 'clusters'
+Requires-Dist: scikit-learn==1.8.0; extra == 'clusters'
 Provides-Extra: dscribe
 Requires-Dist: dscribe==2.1.2; extra == 'dscribe'
 Provides-Extra: grainboundary
 Requires-Dist: aimsgb<=1.1.1,>=1.0.2; extra == 'grainboundary'
-Requires-Dist: pymatgen<=2025.10.7,>=2022.2.1; extra == 'grainboundary'
+Requires-Dist: pymatgen<=2026.3.23,>=2022.2.1; extra == 'grainboundary'
 Provides-Extra: matplotlib
 Requires-Dist: matplotlib==3.10.8; extra == 'matplotlib'
 Provides-Extra: nglview
-Requires-Dist: nglview<=3.1.4,>=2.7.7; extra == 'nglview'
+Requires-Dist: nglview<=4.0.1,>=2.7.7; extra == 'nglview'
 Provides-Extra: phonopy
-Requires-Dist: phonopy<=2.46.1,>=2.16.2; extra == 'phonopy'
+Requires-Dist: phonopy<=3.2.1,>=2.16.2; extra == 'phonopy'
 Requires-Dist: spglib==2.7.0; extra == 'phonopy'
 Provides-Extra: plotly
-Requires-Dist: plotly<=6.5.0,>=4.14.3; extra == 'plotly'
+Requires-Dist: plotly<=6.6.0,>=4.14.3; extra == 'plotly'
 Provides-Extra: pyscal
-Requires-Dist: pyscal3<=3.3.0,>=3.2.5; extra == 'pyscal'
+Requires-Dist: pyscal3<=3.3.2,>=3.2.5; extra == 'pyscal'
 Provides-Extra: surface
-Requires-Dist: pymatgen<=2025.10.7,>=2022.2.1; extra == 'surface'
+Requires-Dist: pymatgen<=2026.3.23,>=2022.2.1; extra == 'surface'
 Requires-Dist: spglib==2.7.0; extra == 'surface'
 Provides-Extra: symmetry
 Requires-Dist: spglib==2.7.0; extra == 'symmetry'

{structuretoolkit-0.0.39 → structuretoolkit-0.0.41}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["ase", "numpy", "scipy", "hatchling==1.27.0", "hatch-vcs==0.5.0"]
+requires = ["ase", "numpy", "scipy", "hatchling==1.29.0", "hatch-vcs==0.5.0"]
 build-backend = "hatchling.build"
 
 [project]
@@ -11,7 +11,7 @@ authors = [
 readme = "README.md"
 license = { file = "LICENSE" }
 keywords = ["pyiron"]
-requires-python = ">=3.10, <3.14"
+requires-python = ">=3.10, <3.15"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Topic :: Scientific/Engineering :: Physics",
@@ -24,9 +24,9 @@ classifiers = [
     "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-    "ase>=3.20.1,<=3.27.0",
-    "numpy>=1.23.5,<=2.3.5",
-    "scipy>=1.15.0,<=1.16.3",
+    "ase>=3.20.1,<=3.28.0",
+    "numpy>=1.23.5,<=2.4.3",
+    "scipy>=1.15.0,<=1.17.0",
 ]
 dynamic = ["version"]
 
@@ -39,20 +39,20 @@ Repository = "https://github.com/pyiron/structuretoolkit"
 dscribe = ["dscribe==2.1.2"]
 grainboundary = [
     "aimsgb>=1.0.2,<=1.1.1",
-    "pymatgen>=2022.2.1,<=2025.10.7",
+    "pymatgen>=2022.2.1,<=2026.3.23",
 ]
-pyscal = ["pyscal3>=3.2.5,<=3.3.0"]
-nglview = ["nglview>=2.7.7,<=3.1.4"]
+pyscal = ["pyscal3>=3.2.5,<=3.3.2"]
+nglview = ["nglview>=2.7.7,<=4.0.1"]
 matplotlib = ["matplotlib==3.10.8"]
-plotly = ["plotly>=4.14.3,<=6.5.0"]
-clusters = ["scikit-learn==1.7.2"]
+plotly = ["plotly>=4.14.3,<=6.6.0"]
+clusters = ["scikit-learn==1.8.0"]
 symmetry = ["spglib==2.7.0"]
 surface = [
     "spglib==2.7.0",
-    "pymatgen>=2022.2.1,<=2025.10.7",
+    "pymatgen>=2022.2.1,<=2026.3.23",
 ]
 phonopy = [
-    "phonopy>=2.16.2,<=2.46.1",
+    "phonopy>=2.16.2,<=3.2.1",
     "spglib==2.7.0",
 ]
 
@@ -106,22 +106,22 @@ ignore = [
 ]
 
 [tool.hatch.build.hooks.vcs]
-version-file = "structuretoolkit/_version.py"
+version-file = "src/structuretoolkit/_version.py"
 
 [tool.hatch.build.targets.sdist]
 include = [
-    "structuretoolkit"
+    "src/structuretoolkit"
 ]
 
 [tool.hatch.build.targets.wheel]
 packages = [
-    "structuretoolkit"
+    "src/structuretoolkit"
 ]
 
 [tool.hatch.version]
 source = "vcs"
-path = "structuretoolkit/_version.py"
+path = "src/structuretoolkit/_version.py"
 
 [tool.coverage.run]
-omit = ["structuretoolkit/_version.py", "tests/*"]
+source = ["structuretoolkit"]
 command_line = "-m unittest discover tests"

{structuretoolkit-0.0.39 → structuretoolkit-0.0.41/src}/structuretoolkit/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.39'
-__version_tuple__ = version_tuple = (0, 0, 39)
+__version__ = version = '0.0.41'
+__version_tuple__ = version_tuple = (0, 0, 41)
 
 __commit_id__ = commit_id = None

{structuretoolkit-0.0.39 → structuretoolkit-0.0.41/src}/structuretoolkit/build/sqs.py

@@ -166,14 +166,8 @@ def sqs_structures(
     output_structures: int = 10,
     mode: str = "random",
     num_threads: int | None = None,
-    prefactors: float | np.ndarray | None = None,
-    pair_weights: np.ndarray | None = None,
     rtol: float | None = None,
     atol: float | None = None,
-    which: Iterable[int] | None = None,
-    shell_distances: Iterable[int] | None = None,
-    minimal: bool | None = True,
-    similar: bool | None = True,
     return_statistics: bool | None = False,
 ) -> Atoms | tuple[Atoms, dict[str, list], int, float]:
     """
@@ -188,54 +182,54 @@ def sqs_structures(
         output_structures (int): The number of output structures.
         mode (str): The mode for selecting configurations.
         num_threads (Optional[int]): The number of threads to use.
-        prefactors (Optional[Union[float, np.ndarray]]): The prefactors for each shell.
-        pair_weights (Optional[np.ndarray]): The pair weights.
         rtol (Optional[float]): The relative tolerance.
         atol (Optional[float]): The absolute tolerance.
-        which (Optional[Iterable[int]]): The indices of the shells to optimize.
-        shell_distances (Optional[Iterable[int]]): The distances for each shell.
-        minimal (Optional[bool]): Whether to minimize the objective function.
-        similar (Optional[bool]): Whether to generate similar structures.
         return_statistics (Optional[bool]): Whether to return additional statistics.
 
     Returns:
         Union[Atoms, Tuple[Atoms, Dict[str, list], int, float]]: The generated structures or a tuple containing the structures, short-range order parameters breakdown, number of iterations, and average cycle time.
 
     """
-    from sqsgenerator import sqs_optimize
+    from sqsgenerator import optimize, to_ase
 
     composition = mole_fractions_to_composition(mole_fractions, len(structure))
 
     settings = {
         "atol": atol,
         "rtol": rtol,
-        "mode": mode,
-        "which": which,
-        "structure": structure,
-        "prefactors": prefactors,
-        "shell_weights": weights,
-        "iterations": iterations,
-        "composition": composition,
-        "pair_weights": pair_weights,
+        "iteration_mode": mode,
+        "structure": {
+            "lattice": structure.cell.array.tolist(),
+            "coords": structure.get_scaled_positions().tolist(),
+            "species": structure.get_chemical_symbols(),
+        },
+        "iterations": int(iterations),
+        "composition": {k: int(v) for k, v in composition.items()},
         "target_objective": objective,
-        "shell_distances": shell_distances,
-        "threads_per_rank": num_threads or cpu_count(),
-        "max_output_configurations": output_structures,
+        "thread_config": num_threads or cpu_count(),
+        "max_results_per_objective": output_structures,
     }
+    if weights is not None:
+        settings["shell_weights"] = weights
+
     # not specifying a parameter in settings causes sqsgenerator to choose a "sensible" default,
     # hence we remove all entries with a None value
+    result = optimize({k: v for k, v in settings.items() if v is not None})
+
+    structures = []
+    sro_breakdown: list = []
+    finished = False
+    for r_lst in result:
+        if not finished:
+            for s in r_lst[1]:
+                structures.append(to_ase(s.structure()))
+                sro_breakdown.append(s.sro())
+                if len(structures) == output_structures:
+                    finished = True
+                    break
+    cycle_time = list(result.statistics.timings.values())[0]
+    num_iterations = result.config.iterations
 
-    results, timings = sqs_optimize(
-        {param: value for param, value in settings.items() if value is not None},
-        minimal=minimal,
-        similar=similar,
-        make_structures=True,
-        structure_format="ase",
-    )
-
-    structures, sro_breakdown = transpose(map(remap_sqs_results, results.values()))
-    num_iterations = iterations
-    cycle_time = np.average(list(map_dict(np.average, timings).values()))
     if not return_statistics:
         return structures
     else: