fix(tests): Minor fixes

.gitignore

@@ -178,5 +178,5 @@ lightning_logs/
 mlruns
 
 # application data
-data/
-logs/
+application/data/
+application/logs/

application/ui/tests/main.spec.ts

@@ -2,7 +2,7 @@ import { expect, test } from '@geti-inspect/test-fixtures';
 
 test.describe('Geti Inspect', () => {
     test('Allows users to inspect', async ({ page }) => {
-        await page.goto('/');
+        await page.goto('/', { waitUntil: 'domcontentloaded' });
 
         await expect(page.getByText(/Geti Inspect/i)).toBeVisible();
     });

src/anomalib/cli/install.py

@@ -9,7 +9,7 @@
 
 import logging
 
-from pkg_resources import Requirement
+from packaging.requirements import Requirement
 from rich.console import Console
 from rich.logging import RichHandler
 
@@ -62,7 +62,7 @@ def anomalib_install(option: str = "full", verbose: bool = False) -> int:
     elif option in requirements_dict:
         requirements.extend(requirements_dict[option])
     elif option is not None:
-        requirements.append(Requirement.parse(option))
+        requirements.append(Requirement(option))
 
     # Parse requirements into torch and other requirements.
     # This is done to parse the correct version of torch (cpu/cuda).

src/anomalib/cli/utils/installation.py

@@ -17,7 +17,8 @@
 from pathlib import Path
 from warnings import warn
 
-from pkg_resources import Requirement
+from packaging.requirements import Requirement
+from packaging.version import Version
 
 AVAILABLE_TORCH_VERSIONS = {
     "2.0.0": {"torchvision": "0.15.1", "cuda": ("11.7", "11.8")},
@@ -66,7 +67,7 @@ def get_requirements(module: str = "anomalib") -> dict[str, list[Requirement]]:
         if isinstance(requirement_extra, list) and len(requirement_extra) > 1:
             extra = requirement_extra[-1].split("==")[-1].strip("'\"")
         requirement_name_ = requirement_extra[0]
-        requirement_ = Requirement.parse(requirement_name_)
+        requirement_ = Requirement(requirement_name_)
         if extra in extra_requirement:
             extra_requirement[extra].append(requirement_)
         else:
@@ -114,9 +115,9 @@ def parse_requirements(
     other_requirements: list[str] = []
 
     for requirement in requirements:
-        if requirement.unsafe_name == "torch":
+        if requirement.name.lower() == "torch":
             torch_requirement = str(requirement)
-            if len(requirement.specs) > 1:
+            if len(requirement.specifier) > 1:
                 warn(
                     "requirements.txt contains. Please remove other versions of torch from requirements.",
                     stacklevel=2,
@@ -333,20 +334,27 @@ def get_torch_install_args(requirement: str | Requirement) -> list[str]:
         True
     """
     if isinstance(requirement, str):
-        requirement = Requirement.parse(requirement)
+        requirement = Requirement(requirement)
 
     # NOTE: This does not take into account if the requirement has multiple versions
     #   such as torch<2.0.1,>=1.13.0
-    if len(requirement.specs) < 1:
+    if not requirement.specifier:
         return [str(requirement)]
-    select_spec_idx = 0
-    for i, spec in enumerate(requirement.specs):
-        if "=" in spec[0]:
-            select_spec_idx = i
+    preferred_operators = ("==", "<=", "<", ">=", ">")
+    selected_spec = None
+    for operator in preferred_operators:
+        for spec in requirement.specifier:
+            if spec.operator == operator:
+                selected_spec = spec
+                break
+        if selected_spec is not None:
             break
-    operator, version = requirement.specs[select_spec_idx]
+    if selected_spec is None:
+        selected_spec = next(iter(requirement.specifier))
+    operator = selected_spec.operator
+    version = selected_spec.version
     if version not in AVAILABLE_TORCH_VERSIONS:
-        version = max(AVAILABLE_TORCH_VERSIONS.keys())
+        version = max(AVAILABLE_TORCH_VERSIONS.keys(), key=Version)
         warn(
             f"Torch Version will be selected as {version}.",
             stacklevel=2,

tests/unit/cli/test_installation.py

@@ -3,12 +3,11 @@
 
 """Tests for installation utils."""
 
-import os
 import tempfile
 from pathlib import Path
 
 import pytest
-from pkg_resources import Requirement
+from packaging.requirements import Requirement
 from pytest_mock import MockerFixture
 
 from anomalib.cli.utils.installation import (
@@ -34,21 +33,23 @@ def requirements_file() -> Path:
 def test_get_requirements(mocker: MockerFixture) -> None:
     """Test that get_requirements returns the expected dictionary of requirements."""
     requirements = get_requirements("anomalib")
+
     assert isinstance(requirements, dict)
     assert len(requirements) > 0
     for reqs in requirements.values():
         assert isinstance(reqs, list)
         for req in reqs:
             assert isinstance(req, Requirement)
+
     mocker.patch("anomalib.cli.utils.installation.requires", return_value=None)
     assert get_requirements() == {}
 
 
 def test_parse_requirements() -> None:
     """Test that parse_requirements returns the expected tuple of requirements."""
     requirements = [
-        Requirement.parse("torch==2.0.0"),
-        Requirement.parse("onnx>=1.8.1"),
+        Requirement("torch==2.0.0"),
+        Requirement("onnx>=1.8.1"),
     ]
     torch_req, other_reqs = parse_requirements(requirements)
     assert isinstance(torch_req, str)
@@ -57,28 +58,30 @@ def test_parse_requirements() -> None:
     assert other_reqs == ["onnx>=1.8.1"]
 
     requirements = [
-        Requirement.parse("torch<=2.0.1, >=1.8.1"),
+        Requirement("torch<=2.0.1, >=1.8.1"),
     ]
     torch_req, other_reqs = parse_requirements(requirements)
     assert torch_req == "torch<=2.0.1,>=1.8.1"
     assert other_reqs == []
 
     requirements = [
-        Requirement.parse("onnx>=1.8.1"),
+        Requirement("onnx>=1.8.1"),
     ]
     with pytest.raises(ValueError, match=r"Could not find torch requirement."):
         parse_requirements(requirements)
 
 
 def test_get_cuda_version_with_version_file(mocker: MockerFixture, tmp_path: Path) -> None:
     """Test that get_cuda_version returns the expected CUDA version when version file exists."""
-    tmp_path = tmp_path / "cuda"
-    tmp_path.mkdir()
-    mocker.patch.dict(os.environ, {"CUDA_HOME": str(tmp_path)})
-    version_file = tmp_path / "version.json"
-    version_file.write_text('{"cuda": {"version": "11.2.0"}}')
+    mock_run = mocker.patch("anomalib.cli.utils.installation.Path.exists", return_value=False)
+    mock_run = mocker.patch("os.popen")
+    mock_run.return_value.read.return_value = "Build cuda_11.2.r11.2/compiler.00000_0"
     assert get_cuda_version() == "11.2"
 
+    mock_run = mocker.patch("os.popen")
+    mock_run.side_effect = FileNotFoundError
+    assert get_cuda_version() is None
+
 
 def test_get_cuda_version_with_nvcc(mocker: MockerFixture) -> None:
     """Test that get_cuda_version returns the expected CUDA version when nvcc is available."""
@@ -123,7 +126,7 @@ def test_get_hardware_suffix(mocker: MockerFixture) -> None:
 
 def test_get_torch_install_args(mocker: MockerFixture) -> None:
     """Test that get_torch_install_args returns the expected install arguments."""
-    requirement = Requirement.parse("torch>=2.1.1")
+    requirement = Requirement("torch>=2.1.1")
     mocker.patch("anomalib.cli.utils.installation.platform.system", return_value="Linux")
     mocker.patch("anomalib.cli.utils.installation.get_hardware_suffix", return_value="cpu")
     install_args = get_torch_install_args(requirement)
@@ -136,7 +139,7 @@ def test_get_torch_install_args(mocker: MockerFixture) -> None:
     for arg in expected_args:
         assert arg in install_args
 
-    requirement = Requirement.parse("torch>=1.13.0,<=2.0.1")
+    requirement = Requirement("torch>=1.13.0,<=2.0.1")
     mocker.patch("anomalib.cli.utils.installation.get_hardware_suffix", return_value="cu111")
     install_args = get_torch_install_args(requirement)
     expected_args = [
@@ -146,7 +149,7 @@ def test_get_torch_install_args(mocker: MockerFixture) -> None:
     for arg in expected_args:
         assert arg in install_args
 
-    requirement = Requirement.parse("torch==2.0.1")
+    requirement = Requirement("torch==2.0.1")
     expected_args = [
         "--extra-index-url",
         "https://download.pytorch.org/whl/cu111",
@@ -161,7 +164,7 @@ def test_get_torch_install_args(mocker: MockerFixture) -> None:
     assert install_args == ["torch"]
 
     mocker.patch("anomalib.cli.utils.installation.platform.system", return_value="Darwin")
-    requirement = Requirement.parse("torch==2.0.1")
+    requirement = Requirement("torch==2.0.1")
     install_args = get_torch_install_args(requirement)
     assert install_args == ["torch==2.0.1"]