Skip to content

Commit d3a08a3

Browse files
authored
FIX remove check_schema flag from config loader (forgotten in a previous diff) (#1660)
1 parent b86d92d commit d3a08a3

3 files changed

Lines changed: 0 additions & 40 deletions

File tree

.pyrit_conf_example

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,6 @@ operation: op_trash_panda
9595
# - /path/to/.env
9696
# - /path/to/.env.local
9797

98-
# Schema Migration Check
99-
# ---------------------
100-
# If true, runs database schema migration on startup to ensure the database
101-
# is up to date with the latest PyRIT version.
102-
# Set to false to skip the check (e.g., for read-only access, testing, or
103-
# when managing migrations externally).
104-
check_schema: true
105-
10698
# Silent Mode
10799
# -----------
108100
# If true, suppresses print statements during initialization.

pyrit/setup/configuration_loader.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ class ConfigurationLoader(YamlLoadable):
100100
initialization_scripts: Optional[list[str]] = None
101101
env_files: Optional[list[str]] = None
102102
silent: bool = False
103-
check_schema: bool = True
104103
operator: Optional[str] = None
105104
operation: Optional[str] = None
106105

@@ -190,7 +189,6 @@ def load_with_overrides(
190189
initializers: Optional[Sequence[Union[str, dict[str, Any]]]] = None,
191190
initialization_scripts: Optional[Sequence[str]] = None,
192191
env_files: Optional[Sequence[str]] = None,
193-
check_schema: Optional[bool] = None,
194192
) -> "ConfigurationLoader":
195193
"""
196194
Load configuration with optional overrides.
@@ -210,7 +208,6 @@ def load_with_overrides(
210208
initializers: Override for initializer list.
211209
initialization_scripts: Override for initialization script paths.
212210
env_files: Override for environment file paths.
213-
check_schema: Override for schema migration check. True to run, False to skip.
214211
215212
Returns:
216213
A merged ConfigurationLoader instance.
@@ -230,7 +227,6 @@ def load_with_overrides(
230227
"initialization_scripts": None, # None = use defaults
231228
"env_files": None, # None = use defaults
232229
"silent": False,
233-
"check_schema": True,
234230
}
235231

236232
# 1. Try loading default config file if it exists
@@ -249,7 +245,6 @@ def load_with_overrides(
249245
config_data["initialization_scripts"] = default_config.initialization_scripts
250246
config_data["env_files"] = default_config.env_files
251247
config_data["silent"] = default_config.silent
252-
config_data["check_schema"] = default_config.check_schema
253248
if default_config.operator:
254249
config_data["operator"] = default_config.operator
255250
if default_config.operation:
@@ -273,7 +268,6 @@ def load_with_overrides(
273268
config_data["initialization_scripts"] = explicit_config.initialization_scripts
274269
config_data["env_files"] = explicit_config.env_files
275270
config_data["silent"] = explicit_config.silent
276-
config_data["check_schema"] = explicit_config.check_schema
277271
if explicit_config.operator:
278272
config_data["operator"] = explicit_config.operator
279273
if explicit_config.operation:
@@ -299,9 +293,6 @@ def load_with_overrides(
299293
if env_files is not None:
300294
config_data["env_files"] = list(env_files)
301295

302-
if check_schema is not None:
303-
config_data["check_schema"] = check_schema
304-
305296
return ConfigurationLoader.from_dict(config_data)
306297

307298
@classmethod
@@ -427,7 +418,6 @@ async def initialize_pyrit_async(self) -> None:
427418
initializers=resolved_initializers if resolved_initializers else None,
428419
env_files=resolved_env_files,
429420
silent=self.silent,
430-
check_schema=self.check_schema,
431421
)
432422

433423

tests/unit/setup/test_configuration_loader.py

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -531,25 +531,3 @@ def test_load_with_overrides_preserves_silent_from_config_file(self, mock_defaul
531531
assert config.silent is True
532532
finally:
533533
config_path.unlink()
534-
535-
@mock.patch("pyrit.setup.configuration_loader.DEFAULT_CONFIG_PATH")
536-
def test_load_with_overrides_check_schema_from_default_config(self, mock_default_path):
537-
"""Test that check_schema is loaded from the default config file."""
538-
mock_default_path.exists.return_value = True
539-
540-
with mock.patch.object(ConfigurationLoader, "from_yaml_file") as mock_from_yaml:
541-
fake_config = ConfigurationLoader(memory_db_type="sqlite", check_schema=False)
542-
mock_from_yaml.return_value = fake_config
543-
544-
config = ConfigurationLoader.load_with_overrides()
545-
546-
assert config.check_schema is False
547-
548-
@mock.patch("pyrit.setup.configuration_loader.DEFAULT_CONFIG_PATH")
549-
def test_load_with_overrides_check_schema_override(self, mock_default_path):
550-
"""Test that check_schema override takes precedence."""
551-
mock_default_path.exists.return_value = False
552-
553-
config = ConfigurationLoader.load_with_overrides(check_schema=False)
554-
555-
assert config.check_schema is False

0 commit comments

Comments
 (0)