Skip to content

armgit / cua

Public Imported from GitHub
0

Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.

fix(cua-s1): reopen checkpoint locators returned by save (#4218)

Kevin Rajand3faca1d9d65
diff --git a/libs/cua-s1/python/src/cua_s1/checkpoint.py b/libs/cua-s1/python/src/cua_s1/checkpoint.py
index 9705900894..013411dfd0 100644
--- a/libs/cua-s1/python/src/cua_s1/checkpoint.py
+++ b/libs/cua-s1/python/src/cua_s1/checkpoint.py
@@ -47,9 +47,19 @@ def resolve_checkpoint_paths(directory_or_path: str | Path) -> tuple[Path, Path]
"to a safetensors file plus JSON configuration in a trusted environment"
)
if suffix == ".safetensors":
- return path, path.with_suffix(".json")
+ same_stem_config = path.with_suffix(".json")
+ if path.name == "model.safetensors":
+ canonical_config = path.with_name("config.json")
+ if canonical_config.exists() or not same_stem_config.exists():
+ return path, canonical_config
+ return path, same_stem_config
if suffix == ".json":
- return path.with_suffix(".safetensors"), path
+ same_stem_weights = path.with_suffix(".safetensors")
+ if path.name == "config.json":
+ canonical_weights = path.with_name("model.safetensors")
+ if canonical_weights.exists() or not same_stem_weights.exists():
+ return canonical_weights, path
+ return same_stem_weights, path
if suffix:
raise ValueError("checkpoint path must be a directory, .safetensors file, or .json file")
return path / "model.safetensors", path / "config.json"
diff --git a/libs/cua-s1/python/tests/test_checkpoint.py b/libs/cua-s1/python/tests/test_checkpoint.py
index 789ac9f6d2..109b278790 100644
--- a/libs/cua-s1/python/tests/test_checkpoint.py
+++ b/libs/cua-s1/python/tests/test_checkpoint.py
@@ -26,6 +26,14 @@ def test_checkpoint_path_resolution_is_explicit(tmp_path):
tmp_path / "named.safetensors",
tmp_path / "named.json",
)
+ assert resolve_checkpoint_paths(tmp_path / "run" / "model.safetensors") == (
+ tmp_path / "run" / "model.safetensors",
+ tmp_path / "run" / "config.json",
+ )
+ assert resolve_checkpoint_paths(tmp_path / "run" / "config.json") == (
+ tmp_path / "run" / "model.safetensors",
+ tmp_path / "run" / "config.json",
+ )
def test_safetensors_checkpoint_round_trip_uses_data_only_files(tmp_path):
@@ -42,15 +50,16 @@ def test_safetensors_checkpoint_round_trip_uses_data_only_files(tmp_path):
{"encoder": "tiny", "width": 3},
{"epoch": 2},
)
- loaded_state, config, metadata = load_checkpoint_files(tmp_path / "checkpoint")
+ assert weights_path == tmp_path / "checkpoint" / "model.safetensors"
+ assert config_path == tmp_path / "checkpoint" / "config.json"
- assert weights_path.suffix == ".safetensors"
- assert config_path.suffix == ".json"
- assert config == {"encoder": "tiny", "width": 3}
- assert metadata == {"epoch": 2}
- assert set(loaded_state) == set(state)
- for name, tensor in state.items():
- assert torch.equal(loaded_state[name], tensor)
+ for locator in (tmp_path / "checkpoint", weights_path, config_path):
+ loaded_state, config, metadata = load_checkpoint_files(locator)
+ assert config == {"encoder": "tiny", "width": 3}
+ assert metadata == {"epoch": 2}
+ assert set(loaded_state) == set(state)
+ for name, tensor in state.items():
+ assert torch.equal(loaded_state[name], tensor)
def test_checkpoint_rejects_malformed_or_wrong_format_json(tmp_path):
@@ -110,3 +119,58 @@ def test_checkpoint_rejects_config_tampering_even_when_shapes_match(tmp_path):
with pytest.raises(ValueError, match="state signature mismatch"):
load_checkpoint_files(checkpoint)
+
+
+def test_named_checkpoint_pair_round_trips_through_returned_paths(tmp_path):
+ torch = pytest.importorskip("torch")
+ pytest.importorskip("safetensors")
+ state = {"weight": torch.tensor([1.0, 2.0])}
+
+ weights_path, config_path = save_checkpoint_files(
+ tmp_path / "named.safetensors",
+ state,
+ {"width": 2},
+ {"source": "named"},
+ )
+
+ assert weights_path == tmp_path / "named.safetensors"
+ assert config_path == tmp_path / "named.json"
+
+ for locator in (weights_path, config_path):
+ loaded_state, config, metadata = load_checkpoint_files(locator)
+ assert config == {"width": 2}
+ assert metadata == {"source": "named"}
+ assert torch.equal(loaded_state["weight"], state["weight"])
+
+
+def test_existing_ambiguous_same_stem_pairs_remain_compatible(tmp_path):
+ model_weights = tmp_path / "model.safetensors"
+ model_json = tmp_path / "model.json"
+ model_json.write_text("{}", encoding="utf-8")
+ assert resolve_checkpoint_paths(model_weights) == (model_weights, model_json)
+
+ config_weights = tmp_path / "config.safetensors"
+ config_json = tmp_path / "config.json"
+ config_weights.write_bytes(b"placeholder")
+ assert resolve_checkpoint_paths(config_json) == (config_weights, config_json)
+
+
+def test_canonical_pair_wins_over_stale_same_stem_siblings(tmp_path):
+ torch = pytest.importorskip("torch")
+ pytest.importorskip("safetensors")
+ checkpoint_dir = tmp_path / "checkpoint"
+ checkpoint_dir.mkdir()
+ (checkpoint_dir / "model.json").write_text('{"stale": true}', encoding="utf-8")
+ (checkpoint_dir / "config.safetensors").write_bytes(b"stale")
+ state = {"layer.weight": torch.tensor([[1.0, 2.0], [3.0, 4.0]])}
+
+ weights_path, config_path = save_checkpoint_files(
+ checkpoint_dir, state, {"width": 2}, {"version": 1}
+ )
+
+ assert resolve_checkpoint_paths(weights_path) == (weights_path, config_path)
+ assert resolve_checkpoint_paths(config_path) == (weights_path, config_path)
+ for locator in (checkpoint_dir, weights_path, config_path):
+ loaded_state, config, _ = load_checkpoint_files(locator)
+ assert config == {"width": 2}
+ assert torch.equal(loaded_state["layer.weight"], state["layer.weight"])