build: support Python 3.13

plugins/actuators/sfttrainer/ado_actuators/sfttrainer/README.md

@@ -37,6 +37,8 @@ features.
 <!-- markdownlint-disable-next-line no-duplicate-heading -->
 ### Requirements
 
+The SFTTrainer actuator currently **supports only Python 3.10, 3.11, 3.12**.
+
 [fms-hf-tuning](https://github.com/foundation-model-stack/fms-hf-tuning) imports
 packages like `flash-attn` and `mamba-ssm`, which import `torch` during their  
 build phase. This means the base virtual environment of your Ray workers must  

plugins/actuators/sfttrainer/pyproject.toml

@@ -25,6 +25,7 @@ sfttrainer_download_hf_weights = "ado_actuators.sfttrainer.scripts.download_hf_w
 
 [project]
 name="ado-sfttrainer"
+requires-python = ">=3.10,<3.13"
 readme = "ado_actuators/sfttrainer/README.md"
 description="An actuator for benchmarking fine-tuning of foundation models" # Change to describing your actuator
 dependencies=[

plugins/actuators/vllm_performance/pyproject.toml

@@ -46,3 +46,6 @@ dev = [
     "pre-commit>=4.2.0",
     "ruff>=0.12.1",
 ]
+
+[tool.uv.sources]
+ado-core = { workspace = true }

plugins/custom_experiments/autoconf/pyproject.toml

@@ -23,7 +23,6 @@ libomp = [
   "autogluon.tabular[lightgbm]"
 ]
 
-
 [tool.hatch.build.targets.wheel]
 packages = ["autoconf"]
 
@@ -34,6 +33,9 @@ exclude = ["build", "build.*", "yamls"]
 [tool.hatch.version]
 source = "uv-dynamic-versioning"
 
+[tool.uv.sources]
+ado-core = { workspace = true }
+
 [tool.uv-dynamic-versioning]
 vcs = "git"
 style = "pep440"

pyproject.toml

@@ -20,11 +20,12 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
 ]
 
 # Deps/Build-related section
 dynamic = ["version"]
-requires-python = ">=3.10,<3.13"
+requires-python = ">=3.10,<3.14"
 dependencies = [
     "build>=1.3.0",
     "colorlog>=6.9.0",
@@ -78,9 +79,18 @@ docs = [
 resolution-helpers = [
     "urllib3>=2.5.0",
 ]
+
+# AP 2025-12-05:
+# ado-sfttrainer is currently incompatible with Python 3.13
+#   due to a dependency on aim/aimrocks
+# ado-vllm-performance is currently incompatible with macOS
+#   due to a new requirement in vllm>=0.11.1 which brings in
+#   cuda dependencies.
 test = [
+    "ado-autoconf",
     "ado-ray-tune",
-    "ado-sfttrainer",
+    "ado-sfttrainer; python_version < '3.13'",
+    "ado-vllm-performance; sys_platform != 'darwin'",
     "anomalous-series",
     "density-test",
     "optimization-test-functions",
@@ -92,27 +102,37 @@ test = [
 [tool.uv]
 default-groups = ["dev", "docs"]
 
+# Having our plugins in the workspace section makes it so
+# that dependencies are resolved considering them as well.
+# ref: https://docs.astral.sh/uv/concepts/projects/workspaces
+# Plugins that we know are incompatible for certain reasons
+# (e.g., Python version requirements) are commented out and
+# added as path-based sources.
 [tool.uv.workspace]
 members = [
-    "plugins/actuators/sfttrainer",
+    "plugins/custom_experiments/autoconf",
     "plugins/operators/ray_tune",
+#    "plugins/actuators/sfttrainer",
+    "plugins/actuators/vllm_performance",
+    "plugins/operators/anomalous_series",
+    "examples/density_example",
     "examples/optimization_test_functions/custom_experiments",
     "examples/pfas-generative-models/custom_actuator_function",
     "plugins/operators/profile_space",
-    "plugins/operators/anomalous_series",
     "plugins/actuators/example_actuator",
-    "examples/density_example",
 ]
 
 [tool.uv.sources]
-ado-sfttrainer = { workspace = true }
-ado-ray-tune = { workspace = true }
-optimization-test-functions = { workspace = true }
-pfas-custom-functions = { workspace = true }
-profile-space = { workspace = true }
-anomalous-series = { workspace = true }
-robotic-lab = { workspace = true }
-density-test = { workspace = true }
+ado-autoconf = { workspace = true, editable = true }
+ado-ray-tune = { workspace = true, editable = true }
+ado-sfttrainer = { path = "plugins/actuators/sfttrainer", editable = true }
+ado-vllm-performance = { workspace = true, editable = true }
+anomalous-series = { workspace = true, editable = true }
+density-test = { workspace = true, editable = true }
+optimization-test-functions = { workspace = true, editable = true }
+pfas-custom-functions = { workspace = true, editable = true }
+profile-space = { workspace = true, editable = true }
+robotic-lab = { workspace = true, editable = true }
 
 [project.scripts]
 ado = "orchestrator.cli.core.cli:app"

tests/actuators/test_actuators.py

@@ -104,15 +104,16 @@ def test_custom_experiments(objectiveFunctionConfiguration, experiment_catalogs)
     #  - examples/optimization_test_functions/custom_experiments
     # Locally this may not work because we might have more or less of these.
     assert (
-        len(catalog.experiments) == 3
-    ), "Expected 3 experiments in the custom_experiments catalog for testing "
+        len(catalog.experiments) == 4
+    ), "Expected 4 experiments in the custom_experiments catalog for testing "
 
     identifiers = {e.identifier for e in catalog.experiments}
     assert {
         "acid_test",
         "calculate_density",
+        "min_gpu_recommender",
         "nevergrad_opt_3d_test_func",
-    } == identifiers, f"Expected the experiments to be called - acid_test and nevergrad_opt_3d_test_func but they are called {identifiers}"
+    } == identifiers, f"Expected the experiments to be called - acid_test, calculate_density, min_gpu_recommender, and nevergrad_opt_3d_test_func but they are called {identifiers}"
     loaded = custom_experiments.loadedExperiment.remote(
         orchestrator.schema.reference.ExperimentReference(
             actuatorIdentifier="custom_experiments", experimentIdentifier="acid_test"
@@ -125,7 +126,7 @@ def test_custom_experiments(objectiveFunctionConfiguration, experiment_catalogs)
         "custom_experiments"
     )
 
-    assert len(c.experiments) == 3
+    assert len(c.experiments) == 4
 
     for e in c.experiments:
         assert catalog.experimentForReference(e.reference) is not None

tests/ado/create/test_ado_create_actuator_configuration.py

@@ -11,7 +11,7 @@
 
 def test_create_actuator_configuration_dry_run_success(tmp_path: pathlib.Path):
     actuator_configuration_file = (
-        "tests/resources/actuatorconfiguration/sfttrainer.yaml"
+        "tests/resources/actuatorconfiguration/robotic_lab.yaml"
     )
     runner = CliRunner()
     result = runner.invoke(
@@ -36,12 +36,12 @@ def test_create_actuator_configuration_dry_run_success(tmp_path: pathlib.Path):
 
 def test_create_actuator_configuration_dry_run_failure(tmp_path: pathlib.Path):
     actuator_configuration_file = pathlib.Path(
-        "tests/resources/actuatorconfiguration/sfttrainer.yaml"
+        "tests/resources/actuatorconfiguration/robotic_lab.yaml"
     )
 
     invalid_actuator_configuration_file = tmp_path / "invalid.yaml"
     actuator_configuration = yaml.safe_load(actuator_configuration_file.read_text())
-    actuator_configuration["actuatorIdentifier"] = "SFTTrainer-fake"
+    actuator_configuration["actuatorIdentifier"] = "robotic-lab-fake"
     invalid_actuator_configuration_file.write_text(
         yaml.safe_dump(actuator_configuration)
     )
@@ -70,7 +70,7 @@ def test_create_actuator_configuration(
     tmp_path: pathlib.Path, valid_ado_project_context, create_active_ado_context
 ):
     actuator_configuration_file = (
-        "tests/resources/actuatorconfiguration/sfttrainer.yaml"
+        "tests/resources/actuatorconfiguration/robotic_lab.yaml"
     )
 
     runner = CliRunner()

tests/ado/create/test_ado_create_discovery_space.py

@@ -166,7 +166,9 @@ def test_create_discovery_space_success(
 def test_create_discovery_space_success_new_sample_store(
     tmp_path: pathlib.Path, valid_ado_project_context, create_active_ado_context
 ):
-    space_configuration_file = pathlib.Path("tests/resources/space/sfttrainer.yaml")
+    space_configuration_file = pathlib.Path(
+        "plugins/actuators/example_actuator/yamls/discoveryspace.yaml"
+    )
     runner = CliRunner()
     create_active_ado_context(
         runner=runner, path=tmp_path, project_context=valid_ado_project_context
@@ -187,7 +189,7 @@ def test_create_discovery_space_success_new_sample_store(
     assert result.exit_code == 0
     expected_output = (
         "INFO:   A new sample store was requested.\n"
-        "        Sample store replace-me referenced in the space definition will be ignored.\n"
+        "        Sample store a267f0 referenced in the space definition will be ignored.\n"
         "Success! Created space with identifier:"
     )
     assert result.output.startswith(expected_output)
@@ -196,7 +198,9 @@ def test_create_discovery_space_success_new_sample_store(
 def test_create_discovery_space_success_with_latest_samplestore(
     tmp_path: pathlib.Path, valid_ado_project_context, create_active_ado_context
 ):
-    space_configuration_file = pathlib.Path("tests/resources/space/sfttrainer.yaml")
+    space_configuration_file = pathlib.Path(
+        "plugins/actuators/example_actuator/yamls/discoveryspace.yaml"
+    )
     runner = CliRunner()
     create_active_ado_context(
         runner=runner, path=tmp_path, project_context=valid_ado_project_context

tests/resources/actuatorconfiguration/robotic_lab.yaml

@@ -0,0 +1,9 @@
+# Copyright (c) IBM Corporation
+# SPDX-License-Identifier: MIT
+actuatorIdentifier: robotic_lab
+metadata:
+  description: null
+  labels: null
+  name: null
+parameters:
+  my_parameter: hello world

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist: {py37,py38,py39,p310,p311,p312}-{deploy,test}-{pipfile,pipenv}-{intel,applesilicon}{,-extras,-optimizers}
+envlist: {p310,p311,p312,p313}-{deploy,test}-{pipfile,pipenv}-{intel,applesilicon}{,-extras,-optimizers}
 #This is a hack to force pip to serialise installs
 #i.e. install a set of packages before installing the next
 #This happens particularly with numpy which MUST be installed
@@ -22,6 +22,7 @@ basepython=
     py310: python3.10
     py311: python3.11
     py312: python3.12
+    py313: python3.13
 passenv=
     CI
 setenv=
@@ -50,7 +51,7 @@ commands=
     uv pip list
     pytest -n auto --dist worksteal -rx -vv --log-level=INFO --color=yes tests/
     # Run the SFTTrainer tests
-    pytest -n auto --dist worksteal -rx -vv --log-level=INFO --color=yes plugins/actuators/sfttrainer/ado_actuators/sfttrainer/tests/
+    !py313: pytest -n auto --dist worksteal -rx -vv --log-level=INFO --color=yes plugins/actuators/sfttrainer/ado_actuators/sfttrainer/tests/
     # Basic test of custom experiment examples
     ado describe experiment calculate_density
     run_experiment examples/density_example/point.yaml