Merge main and resolve conflicts (#2287)

* Reduce rich methods (#2283)

remove rich

Signed-off-by: Ashwin Vaidya <[email protected]>

* Refactor BaseThreshold to Threshold (#2278)

* Refactor BaseThreshold to Threshold

* Add relative import and add tests

Signed-off-by: Samet Akcay <[email protected]>

* Revert threshold.py to base.py

Signed-off-by: Samet Akcay <[email protected]>

* Revert threshold imports

Signed-off-by: Samet Akcay <[email protected]>

* Update tests/unit/metrics/threshold/test_threshold.py

Co-authored-by: Ashwin Vaidya <[email protected]>

---------

Signed-off-by: Samet Akcay <[email protected]>
Co-authored-by: Ashwin Vaidya <[email protected]>

* Enable Ruff Rules: PLW1514 and PLR6201 (#2284)

* pre-commit autoupdate

Signed-off-by: Samet Akcay <[email protected]>

* Enable preview feautures, and disable some of the updated features

* Add missing copyrights

Signed-off-by: Samet Akcay <[email protected]>

* Ignore copyrights in notebooks

* "PLW1514", # Add explicit encoding argument

Signed-off-by: Samet Akcay <[email protected]>

* "PLR6201", # Convert to set

Signed-off-by: Samet Akcay <[email protected]>

---------

Signed-off-by: Samet Akcay <[email protected]>

---------

Signed-off-by: Ashwin Vaidya <[email protected]>
Signed-off-by: Samet Akcay <[email protected]>
Co-authored-by: Ashwin Vaidya <[email protected]>
Co-authored-by: Ashwin Vaidya <[email protected]>

Author: samet-akcay

pyproject.toml

@@ -166,8 +166,6 @@ lint.ignore = [
     "A005", # Module is shadowing a Python built-in
     "B909", # Mutation to loop iterable during iteration
     "PLR6301", # could be a function, class method or static method
-    "PLW1514", # Add explicit encoding argument
-    "PLR6201", # Convert to set
     "PLC2701", # Private name import
     "PLC0415", # import should be at the top of the file
     "PLR0917", # Too many positional arguments

src/anomalib/callbacks/checkpoint.py

@@ -35,10 +35,10 @@ def _should_skip_saving_checkpoint(self, trainer: Trainer) -> bool:
         Overrides the parent method to allow saving during both the ``FITTING`` and ``VALIDATING`` states, and to allow
         saving when the global step and last_global_step_saved are both 0 (only for zero-/few-shot models).
         """
-        is_zero_or_few_shot = trainer.lightning_module.learning_type in [LearningType.ZERO_SHOT, LearningType.FEW_SHOT]
+        is_zero_or_few_shot = trainer.lightning_module.learning_type in {LearningType.ZERO_SHOT, LearningType.FEW_SHOT}
         return (
             bool(trainer.fast_dev_run)  # disable checkpointing with fast_dev_run
-            or trainer.state.fn not in [TrainerFn.FITTING, TrainerFn.VALIDATING]  # don't save anything during non-fit
+            or trainer.state.fn not in {TrainerFn.FITTING, TrainerFn.VALIDATING}  # don't save anything during non-fit
             or trainer.sanity_checking  # don't save anything during sanity check
             or (self._last_global_step_saved == trainer.global_step and not is_zero_or_few_shot)
         )
@@ -52,7 +52,7 @@ def _should_save_on_train_epoch_end(self, trainer: Trainer) -> bool:
         if self._save_on_train_epoch_end is not None:
             return self._save_on_train_epoch_end
 
-        if trainer.lightning_module.learning_type in [LearningType.ZERO_SHOT, LearningType.FEW_SHOT]:
+        if trainer.lightning_module.learning_type in {LearningType.ZERO_SHOT, LearningType.FEW_SHOT}:
             return False
 
         return super()._should_save_on_train_epoch_end(trainer)

src/anomalib/cli/cli.py

@@ -149,7 +149,7 @@ def add_arguments_to_parser(self, parser: ArgumentParser) -> None:
         parser.add_argument("--metrics.image", type=list[str] | str | None, default=None)
         parser.add_argument("--metrics.pixel", type=list[str] | str | None, default=None, required=False)
         parser.add_argument("--logging.log_graph", type=bool, help="Log the model to the logger", default=False)
-        if hasattr(parser, "subcommand") and parser.subcommand not in ("export", "predict"):
+        if hasattr(parser, "subcommand") and parser.subcommand not in {"export", "predict"}:
             parser.link_arguments("task", "data.init_args.task")
         parser.add_argument(
             "--default_root_dir",
@@ -273,7 +273,7 @@ def _set_install_subcommand(self, action_subcommand: _ActionSubCommands) -> None
     def before_instantiate_classes(self) -> None:
         """Modify the configuration to properly instantiate classes and sets up tiler."""
         subcommand = self.config["subcommand"]
-        if subcommand in (*self.subcommands(), "train", "predict"):
+        if subcommand in {*self.subcommands(), "train", "predict"}:
             self.config[subcommand] = update_config(self.config[subcommand])
 
     def instantiate_classes(self) -> None:
@@ -283,7 +283,7 @@ def instantiate_classes(self) -> None:
         But for subcommands we do not want to instantiate any trainer specific classes such as datamodule, model, etc
         This is because the subcommand is responsible for instantiating and executing code based on the passed config
         """
-        if self.config["subcommand"] in (*self.subcommands(), "predict"):  # trainer commands
+        if self.config["subcommand"] in {*self.subcommands(), "predict"}:  # trainer commands
             # since all classes are instantiated, the LightningCLI also creates an unused ``Trainer`` object.
             # the minor change here is that engine is instantiated instead of trainer
             self.config_init = self.parser.instantiate_classes(self.config)
@@ -296,7 +296,7 @@ def instantiate_classes(self) -> None:
         else:
             self.config_init = self.parser.instantiate_classes(self.config)
             subcommand = self.config["subcommand"]
-            if subcommand in ("train", "export"):
+            if subcommand in {"train", "export"}:
                 self.instantiate_engine()
             if "model" in self.config_init[subcommand]:
                 self.model = self._get(self.config_init, "model")
@@ -352,7 +352,7 @@ def _run_subcommand(self) -> None:
 
             install_kwargs = self.config.get("install", {})
             anomalib_install(**install_kwargs)
-        elif self.config["subcommand"] in (*self.subcommands(), "train", "export", "predict"):
+        elif self.config["subcommand"] in {*self.subcommands(), "train", "export", "predict"}:
             fn = getattr(self.engine, self.subcommand)
             fn_kwargs = self._prepare_subcommand_kwargs(self.subcommand)
             fn(**fn_kwargs)

src/anomalib/cli/install.py

@@ -54,12 +54,12 @@ def anomalib_install(option: str = "full", verbose: bool = False) -> int:
 
     # Parse requirements into torch and other requirements.
     # This is done to parse the correct version of torch (cpu/cuda).
-    torch_requirement, other_requirements = parse_requirements(requirements, skip_torch=option not in ("full", "core"))
+    torch_requirement, other_requirements = parse_requirements(requirements, skip_torch=option not in {"full", "core"})
 
     # Get install args for torch to install it from a specific index-url
     install_args: list[str] = []
     torch_install_args = []
-    if option in ("full", "core") and torch_requirement is not None:
+    if option in {"full", "core"} and torch_requirement is not None:
         torch_install_args = get_torch_install_args(torch_requirement)
 
     # Combine torch and other requirements.

src/anomalib/cli/utils/help_formatter.py

@@ -65,7 +65,7 @@ def get_verbosity_subcommand() -> dict:
         {'subcommand': 'train', 'help': True, 'verbosity': 1}
     """
     arguments: dict = {"subcommand": None, "help": False, "verbosity": 2}
-    if len(sys.argv) >= 2 and sys.argv[1] not in ("--help", "-h"):
+    if len(sys.argv) >= 2 and sys.argv[1] not in {"--help", "-h"}:
         arguments["subcommand"] = sys.argv[1]
     if "--help" in sys.argv or "-h" in sys.argv:
         arguments["help"] = True
@@ -252,7 +252,7 @@ def format_help(self) -> str:
         """
         with self.console.capture() as capture:
             section = self._root_section
-            if self.subcommand in REQUIRED_ARGUMENTS and self.verbosity_level in (0, 1) and len(section.rich_items) > 1:
+            if self.subcommand in REQUIRED_ARGUMENTS and self.verbosity_level in {0, 1} and len(section.rich_items) > 1:
                 contents = render_guide(self.subcommand)
                 for content in contents:
                     self.console.print(content)

src/anomalib/cli/utils/installation.py

@@ -134,7 +134,7 @@ def get_cuda_version() -> str | None:
         # Check $CUDA_HOME/version.json file.
         version_file = Path(cuda_home) / "version.json"
         if version_file.is_file():
-            with Path(version_file).open() as file:
+            with Path(version_file).open(encoding="utf-8") as file:
                 data = json.load(file)
                 cuda_version = data.get("cuda", {}).get("version", None)
                 if cuda_version is not None:
@@ -319,7 +319,7 @@ def get_torch_install_args(requirement: str | Requirement) -> list[str]:
         )
     install_args: list[str] = []
 
-    if platform.system() in ("Linux", "Windows"):
+    if platform.system() in {"Linux", "Windows"}:
         # Get the hardware suffix (eg., +cpu, +cu116 and +cu118 etc.)
         hardware_suffix = get_hardware_suffix(with_available_torch_build=True, torch_version=version)
 
@@ -339,7 +339,7 @@ def get_torch_install_args(requirement: str | Requirement) -> list[str]:
             torch_version,
             torchvision_requirement,
         ]
-    elif platform.system() in ("macos", "Darwin"):
+    elif platform.system() in {"macos", "Darwin"}:
         torch_version = str(requirement)
         install_args += [torch_version]
     else:

src/anomalib/cli/utils/openvino.py

@@ -25,7 +25,7 @@ def add_openvino_export_arguments(parser: ArgumentParser) -> None:
         ov_parser = get_common_cli_parser()
         # remove redundant keys from mo keys
         for arg in ov_parser._actions:  # noqa: SLF001
-            if arg.dest in ("help", "input_model", "output_dir"):
+            if arg.dest in {"help", "input_model", "output_dir"}:
                 continue
             group.add_argument(f"--ov_args.{arg.dest}", type=arg.type, default=arg.default, help=arg.help)
     else:

src/anomalib/data/image/btech.py

@@ -81,7 +81,7 @@ def make_btech_dataset(path: Path, split: str | Split | None = None) -> DataFram
     path = validate_path(path)
 
     samples_list = [
-        (str(path),) + filename.parts[-3:] for filename in path.glob("**/*") if filename.suffix in (".bmp", ".png")
+        (str(path),) + filename.parts[-3:] for filename in path.glob("**/*") if filename.suffix in {".bmp", ".png"}
     ]
     if not samples_list:
         msg = f"Found 0 images in {path}"

src/anomalib/data/utils/download.py

@@ -299,7 +299,7 @@ def extract(file_name: Path, root: Path) -> None:
                     zip_file.extract(file_info, root)
 
     # Safely extract tar files.
-    elif file_name.suffix in (".tar", ".gz", ".xz", ".tgz"):
+    elif file_name.suffix in {".tar", ".gz", ".xz", ".tgz"}:
         with tarfile.open(file_name) as tar_file:
             members = tar_file.getmembers()
             safe_members = [member for member in members if not is_file_potentially_dangerous(member.name)]

src/anomalib/data/utils/tiler.py

@@ -181,7 +181,7 @@ def __init__(
                 msg,
             )
 
-        if self.mode not in (ImageUpscaleMode.PADDING, ImageUpscaleMode.INTERPOLATION):
+        if self.mode not in {ImageUpscaleMode.PADDING, ImageUpscaleMode.INTERPOLATION}:
             msg = f"Unknown tiling mode {self.mode}. Available modes are padding and interpolation"
             raise ValueError(msg)