diff --git a/src/autoskillit/config/settings.py b/src/autoskillit/config/settings.py index beab3cc4ac..8b14f9e13e 100644 --- a/src/autoskillit/config/settings.py +++ b/src/autoskillit/config/settings.py @@ -281,6 +281,14 @@ class WorkspaceConfig: temp_dir: str | None = None # null = canonical default (see resolve_temp_dir) +@dataclass +class ProvidersConfig: + default_provider: str | None = None + profiles: dict[str, dict[str, str]] = field(default_factory=dict) + step_overrides: dict[str, str] = field(default_factory=dict) + provider_retry_limit: int = 2 + + def _field_defaults(cls: type) -> dict[str, Any]: """Extract default values from dataclass fields into a dict keyed by field name.""" defaults: dict[str, Any] = {} @@ -317,6 +325,7 @@ class AutomationConfig: subsets: SubsetsConfig = field(default_factory=SubsetsConfig) packs: PacksConfig = field(default_factory=PacksConfig) workspace: WorkspaceConfig = field(default_factory=WorkspaceConfig) + providers: ProvidersConfig = field(default_factory=ProvidersConfig) @classmethod def from_dynaconf(cls, d: Dynaconf) -> AutomationConfig: @@ -356,6 +365,7 @@ def val(section: dict[str, Any], key: str, default: Any) -> Any: _sub = sec("subsets") pk = sec("packs") ws_raw = sec("workspace") + pv = sec("providers") _tc = _field_defaults(TestCheckConfig) _cf = _field_defaults(ClassifyFixConfig) @@ -378,6 +388,7 @@ def val(section: dict[str, Any], key: str, default: Any) -> Any: _ci = _field_defaults(CIConfig) _sk = _field_defaults(SkillsConfig) _wsc = _field_defaults(WorkspaceConfig) + _pv = _field_defaults(ProvidersConfig) return cls( test_check=TestCheckConfig( @@ -520,6 +531,14 @@ def val(section: dict[str, Any], key: str, default: Any) -> Any: runs_root=val(ws_raw, "runs_root", _wsc["runs_root"]) or None, temp_dir=val(ws_raw, "temp_dir", _wsc["temp_dir"]) or None, ), + providers=ProvidersConfig( + default_provider=val(pv, "default_provider", _pv["default_provider"]) or None, + profiles={k: dict(v) for k, v in val(pv, "profiles", _pv["profiles"]).items()}, + step_overrides=dict(val(pv, "step_overrides", _pv["step_overrides"])), + provider_retry_limit=int( + val(pv, "provider_retry_limit", _pv["provider_retry_limit"]) + ), + ), ) diff --git a/tests/config/test_config.py b/tests/config/test_config.py index aa296e0056..fc4e7cb695 100644 --- a/tests/config/test_config.py +++ b/tests/config/test_config.py @@ -1131,6 +1131,78 @@ def test_write_config_layer_writes_valid_content(self, tmp_path: Path) -> None: assert data["github"]["default_repo"] == "owner/repo" +class TestProvidersConfig: + """ProvidersConfig dataclass and from_dynaconf wiring.""" + + def test_providers_config_exists_on_automation_config(self, tmp_path): + cfg = load_config(tmp_path / "settings.toml") + assert hasattr(cfg, "providers") + + def test_default_provider_defaults_to_none(self, tmp_path): + cfg = load_config(tmp_path / "settings.toml") + assert cfg.providers.default_provider is None + + def test_profiles_defaults_to_empty_dict(self, tmp_path): + cfg = load_config(tmp_path / "settings.toml") + assert cfg.providers.profiles == {} + + def test_step_overrides_defaults_to_empty_dict(self, tmp_path): + cfg = load_config(tmp_path / "settings.toml") + assert cfg.providers.step_overrides == {} + + def test_provider_retry_limit_defaults_to_two(self, tmp_path): + cfg = load_config(tmp_path / "settings.toml") + assert cfg.providers.provider_retry_limit == 2 + + def test_yaml_loads_providers_section(self, tmp_path): + config_dir = tmp_path / ".autoskillit" + config_dir.mkdir() + config_data = { + "providers": { + "default_provider": "anthropic", + "profiles": {"fast": {"model": "haiku"}, "slow": {"model": "opus"}}, + "step_overrides": {"impl": "fast"}, + "provider_retry_limit": 5, + } + } + (config_dir / "config.yaml").write_text(yaml.dump(config_data)) + cfg = load_config(tmp_path) + assert cfg.providers.default_provider == "anthropic" + assert cfg.providers.profiles == {"fast": {"model": "haiku"}, "slow": {"model": "opus"}} + assert cfg.providers.step_overrides == {"impl": "fast"} + assert cfg.providers.provider_retry_limit == 5 + + def test_partial_providers_config_preserves_defaults(self, tmp_path): + config_dir = tmp_path / ".autoskillit" + config_dir.mkdir() + config_data = {"providers": {"default_provider": "bedrock"}} + (config_dir / "config.yaml").write_text(yaml.dump(config_data)) + cfg = load_config(tmp_path) + assert cfg.providers.default_provider == "bedrock" + assert cfg.providers.profiles == {} + assert cfg.providers.step_overrides == {} + assert cfg.providers.provider_retry_limit == 2 + + def test_default_provider_none_coercion_from_empty_string(self, tmp_path): + config_dir = tmp_path / ".autoskillit" + config_dir.mkdir() + config_data = {"providers": {"default_provider": ""}} + (config_dir / "config.yaml").write_text(yaml.dump(config_data)) + cfg = load_config(tmp_path) + assert cfg.providers.default_provider is None + + def test_profiles_inner_dicts_are_independent_copies(self, tmp_path): + config_dir = tmp_path / ".autoskillit" + config_dir.mkdir() + config_data = {"providers": {"profiles": {"p1": {"model": "haiku"}}}} + (config_dir / "config.yaml").write_text(yaml.dump(config_data)) + cfg = load_config(tmp_path) + inner = cfg.providers.profiles["p1"] + inner["injected"] = "mutated" + cfg2 = load_config(tmp_path) + assert "injected" not in cfg2.providers.profiles["p1"] + + class TestWorkspaceConfig: """WorkspaceConfig section is present in AutomationConfig with correct defaults.""" diff --git a/tests/execution/test_recording_sigterm.py b/tests/execution/test_recording_sigterm.py index 0aaa21276c..cf95a1b2f9 100644 --- a/tests/execution/test_recording_sigterm.py +++ b/tests/execution/test_recording_sigterm.py @@ -31,10 +31,12 @@ def test_sigterm_writes_scenario_json(tmp_path): env = { **os.environ, + "HOME": str(tmp_path / "home"), "RECORD_SCENARIO": "1", "RECORD_SCENARIO_DIR": str(output_dir), "RECORD_SCENARIO_RECIPE": "test-recipe", } + (tmp_path / "home").mkdir() # Use sys.executable -m to ensure we run the worktree-installed version, # not a system-wide `autoskillit` binary that may lack the lifespan fix. proc = subprocess.Popen(