Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions pyrit/setup/configuration_loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ def load_with_overrides(
"initializers": [],
"initialization_scripts": None, # None = use defaults
"env_files": None, # None = use defaults
"silent": False,
}

# 1. Try loading default config file if it exists
Expand All @@ -239,6 +240,7 @@ def load_with_overrides(
# Preserve None vs [] distinction from config file
config_data["initialization_scripts"] = default_config.initialization_scripts
config_data["env_files"] = default_config.env_files
config_data["silent"] = default_config.silent
if default_config.operator:
config_data["operator"] = default_config.operator
if default_config.operation:
Expand All @@ -259,6 +261,7 @@ def load_with_overrides(
# Preserve None vs [] distinction from config file
config_data["initialization_scripts"] = explicit_config.initialization_scripts
config_data["env_files"] = explicit_config.env_files
config_data["silent"] = explicit_config.silent
if explicit_config.operator:
config_data["operator"] = explicit_config.operator
if explicit_config.operation:
Expand Down
19 changes: 19 additions & 0 deletions tests/unit/setup/test_configuration_loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -504,3 +504,22 @@ def test_load_with_overrides_cli_overrides_config_file(self, mock_default_path):
assert config._initializer_configs[0].name == "cli_init"
finally:
config_path.unlink()

@mock.patch("pyrit.setup.configuration_loader.DEFAULT_CONFIG_PATH")
def test_load_with_overrides_preserves_silent_from_config_file(self, mock_default_path):
"""Test that load_with_overrides preserves the silent flag from config files."""
mock_default_path.exists.return_value = False

yaml_content = """
memory_db_type: sqlite
silent: true
"""
with tempfile.NamedTemporaryFile(mode="w", suffix=".yaml", delete=False) as f:
f.write(yaml_content)
config_path = pathlib.Path(f.name)

try:
config = ConfigurationLoader.load_with_overrides(config_file=config_path)
assert config.silent is True
finally:
config_path.unlink()
Loading