Merge pull request #230 from AllenNeuralDynamics:fix-imports

Cleanup import logic

Author: bruno-f-cruz

src/clabe/data_mapper/_base.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import abc
 import logging
 from typing import Any, Generic, Optional, TypeVar

src/clabe/data_mapper/helpers.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 import os
 import xml.etree.ElementTree as ET
@@ -8,9 +6,7 @@
 from typing import Dict, List, Union
 
 import pydantic
-from aind_behavior_services import (
-    AindBehaviorRigModel,
-)
+from aind_behavior_services import AindBehaviorRigModel
 from aind_behavior_services.rig.cameras import CameraController, CameraTypes
 from aind_behavior_services.utils import get_fields_of_type
 

src/clabe/data_transfer/_base.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import abc
 import logging
 from typing import Generic, TypeVar

src/clabe/launcher/_base.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import asyncio
 import hashlib
 import logging

src/clabe/resource_monitor/_base.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 from dataclasses import dataclass, field
 from typing import Callable, List, Optional
@@ -25,7 +23,7 @@ class ResourceMonitor(Service):
 
     def __init__(
         self,
-        constrains: Optional[List[Constraint]] = None,
+        constrains: Optional[List["Constraint"]] = None,
     ) -> None:
         """
         Initializes the ResourceMonitor.
@@ -51,7 +49,7 @@ def run(self) -> bool:
             raise RuntimeError("Resource monitor constraints failed.")
         return result
 
-    def add_constraint(self, constraint: Constraint) -> None:
+    def add_constraint(self, constraint: "Constraint") -> None:
         """
         Adds a new constraint to the monitor.
 
@@ -81,7 +79,7 @@ def check_memory():
         """
         self.constraints.append(constraint)
 
-    def remove_constraint(self, constraint: Constraint) -> None:
+    def remove_constraint(self, constraint: "Constraint") -> None:
         """
         Removes a constraint from the monitor.
 

src/clabe/resource_monitor/_constraints.py

@@ -116,7 +116,7 @@ def remote_dir_exists_constraint_factory(dir_path: os.PathLike) -> Constraint:
     """
     return Constraint(
         name="remote_dir_exists",
-        constraint=lambda dir_path: os.path.exists(dir_path),
+        constraint=os.path.exists,
         args=[],
         kwargs={"dir_path": dir_path},
         fail_msg_handler=lambda dir_path: f"Directory {dir_path} does not exist.",

src/clabe/utils/aind_auth.py

@@ -1,5 +1,4 @@
 import concurrent.futures
-import getpass
 import logging
 import platform
 from typing import Optional
@@ -12,8 +11,6 @@
 
 
 if platform.system() == "Windows":
-    import ldap3
-    import ms_active_directory
 
     def validate_aind_username(
         username: str,
@@ -46,6 +43,10 @@ def validate_aind_username(
             is_valid = validate_aind_username("j.doe")
             ```
         """
+        import getpass  # type: ignore[import]
+
+        import ldap3  # type: ignore[import]
+        import ms_active_directory  # type: ignore[import]
 
         def _helper(username: str, domain: str, domain_username: Optional[str]) -> bool:
             """A function submitted to a thread pool to validate the username."""

src/clabe/xml_rpc/_client.py

@@ -7,9 +7,8 @@
 
 from pydantic import BaseModel, Field, HttpUrl, SecretStr
 
-from clabe.apps import Command
-from clabe.apps._base import CommandResult
-
+from ..apps import Command
+from ..apps._base import CommandResult
 from ..services import ServiceSettings
 from ._executor import XmlRpcExecutor
 from .models import (

tests/test_cached_settings.py

@@ -65,6 +65,10 @@ def test_get_latest_empty(self):
 class TestCacheManagerManualSync:
     """Tests for CacheManager with manual sync strategy."""
 
+    def setup_method(self):
+        """Reset the cache manager before each test."""
+        CacheManager.get_instance(reset=True, sync_strategy=SyncStrategy.MANUAL)
+
     def test_register_and_add(self):
         """Test registering a cache and adding values."""
         manager = CacheManager.get_instance(reset=True, sync_strategy=SyncStrategy.MANUAL)
@@ -147,6 +151,10 @@ def test_singleton_behavior(self):
 class TestCacheManagerAutoSync:
     """Tests for CacheManager with auto-sync to disk."""
 
+    def setup_method(self):
+        """Reset the cache manager before each test."""
+        CacheManager.get_instance(reset=True, sync_strategy=SyncStrategy.MANUAL)
+
     def test_auto_sync_on_add(self):
         """Test that AUTO sync saves after adding values."""
         with tempfile.TemporaryDirectory() as tmpdir:

tests/utils/test_aind_auth.py

@@ -7,35 +7,44 @@
 
 
 @pytest.mark.skipif(platform.system() != "Windows", reason="Windows-only test")
-@patch("clabe.utils.aind_auth.ms_active_directory")
-@patch("clabe.utils.aind_auth.ldap3")
-def test_validate_aind_username_windows_valid(mock_ldap3, mock_ad):
+def test_validate_aind_username_windows_valid():
     """Test validate_aind_username on Windows with a valid user."""
-    mock_session = MagicMock()
-    mock_session.find_user_by_name.return_value = True
-    mock_ad.ADDomain.return_value.create_session_as_user.return_value = mock_session
+    with (
+        patch("ms_active_directory.ADDomain") as mock_ad_domain,
+        patch("ldap3.SASL", "SASL"),
+        patch("ldap3.GSSAPI", "GSSAPI"),
+    ):
+        mock_session = MagicMock()
+        mock_session.find_user_by_name.return_value = True
+        mock_ad_domain.return_value.create_session_as_user.return_value = mock_session
 
-    assert aind_auth.validate_aind_username("testuser")
+        assert aind_auth.validate_aind_username("testuser")
 
 
 @pytest.mark.skipif(platform.system() != "Windows", reason="Windows-only test")
-@patch("clabe.utils.aind_auth.ms_active_directory")
-@patch("clabe.utils.aind_auth.ldap3")
-def test_validate_aind_username_windows_invalid(mock_ldap3, mock_ad):
+def test_validate_aind_username_windows_invalid():
     """Test validate_aind_username on Windows with an invalid user."""
-    mock_session = MagicMock()
-    mock_session.find_user_by_name.return_value = None
-    mock_ad.ADDomain.return_value.create_session_as_user.return_value = mock_session
+    with (
+        patch("ms_active_directory.ADDomain") as mock_ad_domain,
+        patch("ldap3.SASL", "SASL"),
+        patch("ldap3.GSSAPI", "GSSAPI"),
+    ):
+        mock_session = MagicMock()
+        mock_session.find_user_by_name.return_value = None
+        mock_ad_domain.return_value.create_session_as_user.return_value = mock_session
 
-    assert not aind_auth.validate_aind_username("testuser")
+        assert not aind_auth.validate_aind_username("testuser")
 
 
 @pytest.mark.skipif(platform.system() != "Windows", reason="Windows-only test")
-@patch("clabe.utils.aind_auth.ms_active_directory")
-@patch("clabe.utils.aind_auth.ldap3")
-def test_validate_aind_username_windows_timeout(mock_ldap3, mock_ad):
+def test_validate_aind_username_windows_timeout():
     """Test validate_aind_username on Windows with a timeout."""
-    with patch("concurrent.futures.ThreadPoolExecutor.submit") as mock_submit:
+    with (
+        patch("ms_active_directory.ADDomain"),
+        patch("ldap3.SASL", "SASL"),
+        patch("ldap3.GSSAPI", "GSSAPI"),
+        patch("concurrent.futures.ThreadPoolExecutor.submit") as mock_submit,
+    ):
         mock_submit.side_effect = TimeoutError
         with pytest.raises(TimeoutError):
             aind_auth.validate_aind_username("testuser")