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
8 changes: 0 additions & 8 deletions .pyrit_conf_example
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,6 @@ operation: op_trash_panda
# - /path/to/.env
# - /path/to/.env.local

# Schema Migration Check
# ---------------------
# If true, runs database schema migration on startup to ensure the database
# is up to date with the latest PyRIT version.
# Set to false to skip the check (e.g., for read-only access, testing, or
# when managing migrations externally).
check_schema: true

# Silent Mode
# -----------
# If true, suppresses print statements during initialization.
Expand Down
10 changes: 0 additions & 10 deletions pyrit/setup/configuration_loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ class ConfigurationLoader(YamlLoadable):
initialization_scripts: Optional[list[str]] = None
env_files: Optional[list[str]] = None
silent: bool = False
check_schema: bool = True
operator: Optional[str] = None
operation: Optional[str] = None

Expand Down Expand Up @@ -190,7 +189,6 @@ def load_with_overrides(
initializers: Optional[Sequence[Union[str, dict[str, Any]]]] = None,
initialization_scripts: Optional[Sequence[str]] = None,
env_files: Optional[Sequence[str]] = None,
check_schema: Optional[bool] = None,
) -> "ConfigurationLoader":
"""
Load configuration with optional overrides.
Expand All @@ -210,7 +208,6 @@ def load_with_overrides(
initializers: Override for initializer list.
initialization_scripts: Override for initialization script paths.
env_files: Override for environment file paths.
check_schema: Override for schema migration check. True to run, False to skip.

Returns:
A merged ConfigurationLoader instance.
Expand All @@ -230,7 +227,6 @@ def load_with_overrides(
"initialization_scripts": None, # None = use defaults
"env_files": None, # None = use defaults
"silent": False,
"check_schema": True,
}

# 1. Try loading default config file if it exists
Expand All @@ -249,7 +245,6 @@ def load_with_overrides(
config_data["initialization_scripts"] = default_config.initialization_scripts
config_data["env_files"] = default_config.env_files
config_data["silent"] = default_config.silent
config_data["check_schema"] = default_config.check_schema
if default_config.operator:
config_data["operator"] = default_config.operator
if default_config.operation:
Expand All @@ -273,7 +268,6 @@ def load_with_overrides(
config_data["initialization_scripts"] = explicit_config.initialization_scripts
config_data["env_files"] = explicit_config.env_files
config_data["silent"] = explicit_config.silent
config_data["check_schema"] = explicit_config.check_schema
if explicit_config.operator:
config_data["operator"] = explicit_config.operator
if explicit_config.operation:
Expand All @@ -299,9 +293,6 @@ def load_with_overrides(
if env_files is not None:
config_data["env_files"] = list(env_files)

if check_schema is not None:
config_data["check_schema"] = check_schema

return ConfigurationLoader.from_dict(config_data)

@classmethod
Expand Down Expand Up @@ -427,7 +418,6 @@ async def initialize_pyrit_async(self) -> None:
initializers=resolved_initializers if resolved_initializers else None,
env_files=resolved_env_files,
silent=self.silent,
check_schema=self.check_schema,
)


Expand Down
22 changes: 0 additions & 22 deletions tests/unit/setup/test_configuration_loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -531,25 +531,3 @@ def test_load_with_overrides_preserves_silent_from_config_file(self, mock_defaul
assert config.silent is True
finally:
config_path.unlink()

@mock.patch("pyrit.setup.configuration_loader.DEFAULT_CONFIG_PATH")
def test_load_with_overrides_check_schema_from_default_config(self, mock_default_path):
"""Test that check_schema is loaded from the default config file."""
mock_default_path.exists.return_value = True

with mock.patch.object(ConfigurationLoader, "from_yaml_file") as mock_from_yaml:
fake_config = ConfigurationLoader(memory_db_type="sqlite", check_schema=False)
mock_from_yaml.return_value = fake_config

config = ConfigurationLoader.load_with_overrides()

assert config.check_schema is False

@mock.patch("pyrit.setup.configuration_loader.DEFAULT_CONFIG_PATH")
def test_load_with_overrides_check_schema_override(self, mock_default_path):
"""Test that check_schema override takes precedence."""
mock_default_path.exists.return_value = False

config = ConfigurationLoader.load_with_overrides(check_schema=False)

assert config.check_schema is False
Loading