fmu-settings 0.5.1__tar.gz → 0.5.3__tar.gz

{fmu_settings-0.5.1 → fmu_settings-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmu-settings
-Version: 0.5.1
+Version: 0.5.3
 Summary: A library for managing FMU settings
 Author-email: Equinor <fg-fmu_atlas@equinor.com>
 License: GPL-3.0

{fmu_settings-0.5.1 → fmu_settings-0.5.3}/src/fmu/settings/_resources/lock_manager.py

@@ -32,6 +32,10 @@ class LockError(Exception):
     """Raised when the lock cannot be acquired."""
 
 
+class LockNotFoundError(FileNotFoundError):
+    """Raised when the lock cannot be found."""
+
+
 class LockManager(PydanticResourceManager[LockInfo]):
     """Manages the .lock file."""
 
@@ -194,7 +198,9 @@ class LockManager(PydanticResourceManager[LockInfo]):
             LockError: If we don't hold the lock or it's invalid
         """
         if not self.exists:
-            raise LockError("Cannot refresh: lock file does not exist")
+            if self.is_acquired():
+                self.release()
+            raise LockNotFoundError("Cannot refresh: lock file does not exist")
 
         lock_info = self._safe_load()
         if not lock_info or not self._is_mine(lock_info):

{fmu_settings-0.5.1 → fmu_settings-0.5.3}/src/fmu/settings/_resources/pydantic_resource_manager.py

@@ -112,21 +112,21 @@ class PydanticResourceManager(Generic[PydanticResource]):
 
 
 class MutablePydanticResourceManager(PydanticResourceManager[MutablePydanticResource]):
-    """Manages the .fmu configuration file."""
+    """Manages the .fmu resource file."""
 
     def __init__(
-        self: Self, fmu_dir: FMUDirectoryBase, config: type[MutablePydanticResource]
+        self: Self, fmu_dir: FMUDirectoryBase, resource: type[MutablePydanticResource]
     ) -> None:
-        """Initializes the Config resource manager."""
-        super().__init__(fmu_dir, config)
+        """Initializes the resource manager."""
+        super().__init__(fmu_dir, resource)
 
     def _get_dot_notation_key(
-        self: Self, config_dict: dict[str, Any], key: str, default: Any = None
+        self: Self, resource_dict: dict[str, Any], key: str, default: Any = None
     ) -> Any:
         """Sets the value to a dot-notation key.
 
         Args:
-            config_dict: The configuration dictionary we are modifying (by reference)
+            resource_dict: The resource dictionary we are modifying (by reference)
             key: The key to set
             default: Value to return if key is not found. Default None
 
@@ -134,7 +134,7 @@ class MutablePydanticResourceManager(PydanticResourceManager[MutablePydanticReso
             The value or default
         """
         parts = key.split(".")
-        value = config_dict
+        value = resource_dict
         for part in parts:
             if isinstance(value, dict) and part in value:
                 value = value[part]
@@ -144,28 +144,28 @@ class MutablePydanticResourceManager(PydanticResourceManager[MutablePydanticReso
         return value
 
     def get(self: Self, key: str, default: Any = None) -> Any:
-        """Gets a configuration value by key.
+        """Gets a resource value by key.
 
         Supports dot notation for nested values (e.g., "foo.bar")
 
         Args:
-            key: The configuration key
+            key: The resource key
             default: Value to return if key is not found. Default None
 
         Returns:
-            The configuration value or default
+            The resource value or default
         """
         try:
-            config = self.load()
+            resource = self.load()
 
             if "." in key:
-                return self._get_dot_notation_key(config.model_dump(), key, default)
+                return self._get_dot_notation_key(resource.model_dump(), key, default)
 
-            if hasattr(config, key):
-                return getattr(config, key)
+            if hasattr(resource, key):
+                return getattr(resource, key)
 
-            config_dict = config.model_dump()
-            return config_dict.get(key, default)
+            resource_dict = resource.model_dump()
+            return resource_dict.get(key, default)
         except FileNotFoundError as e:
             raise FileNotFoundError(
                 f"Resource file for '{self.__class__.__name__}' not found "
@@ -173,17 +173,17 @@ class MutablePydanticResourceManager(PydanticResourceManager[MutablePydanticReso
             ) from e
 
     def _set_dot_notation_key(
-        self: Self, config_dict: dict[str, Any], key: str, value: Any
+        self: Self, resource_dict: dict[str, Any], key: str, value: Any
     ) -> None:
         """Sets the value to a dot-notation key.
 
         Args:
-            config_dict: The configuration dictionary we are modifying (by reference)
+            resource_dict: The resource dictionary we are modifying (by reference)
             key: The key to set
             value: The value to set
         """
         parts = key.split(".")
-        target = config_dict
+        target = resource_dict
 
         for part in parts[:-1]:
             if part not in target or not isinstance(target[part], dict):
@@ -193,27 +193,27 @@ class MutablePydanticResourceManager(PydanticResourceManager[MutablePydanticReso
         target[parts[-1]] = value
 
     def set(self: Self, key: str, value: Any) -> None:
-        """Sets a configuration value by key.
+        """Sets a resource value by key.
 
         Args:
-            key: The configuration key
+            key: The resource key
             value: The value to set
 
         Raises:
-            FileNotFoundError: If config file doesn't exist
-            ValueError: If the updated config is invalid
+            FileNotFoundError: If resource file doesn't exist
+            ValueError: If the updated resource is invalid
         """
         try:
-            config = self.load()
-            config_dict = config.model_dump()
+            resource = self.load()
+            resource_dict = resource.model_dump()
 
             if "." in key:
-                self._set_dot_notation_key(config_dict, key, value)
+                self._set_dot_notation_key(resource_dict, key, value)
             else:
-                config_dict[key] = value
+                resource_dict[key] = value
 
-            updated_config = config.model_validate(config_dict)
-            self.save(updated_config)
+            updated_resource = resource.model_validate(resource_dict)
+            self.save(updated_resource)
         except ValidationError as e:
             raise ValueError(
                 f"Invalid value set for '{self.__class__.__name__}' with "
@@ -226,31 +226,31 @@ class MutablePydanticResourceManager(PydanticResourceManager[MutablePydanticReso
             ) from e
 
     def update(self: Self, updates: dict[str, Any]) -> MutablePydanticResource:
-        """Updates multiple configuration values at once.
+        """Updates multiple resource values at once.
 
         Args:
             updates: Dictionary of key-value pairs to update
 
         Returns:
-            The updated Config object
+            The updated Resource object
 
         Raises:
-            FileNotFoundError: If config file doesn't exist
-            ValueError: If the updates config is invalid
+            FileNotFoundError: If resource file doesn't exist
+            ValueError: If the updates resource is invalid
         """
         try:
-            config = self.load()
-            config_dict = config.model_dump()
+            resource = self.load()
+            resource_dict = resource.model_dump()
 
             flat_updates = {k: v for k, v in updates.items() if "." not in k}
-            config_dict.update(flat_updates)
+            resource_dict.update(flat_updates)
 
             for key, value in updates.items():
                 if "." in key:
-                    self._set_dot_notation_key(config_dict, key, value)
+                    self._set_dot_notation_key(resource_dict, key, value)
 
-                updated_config = config.model_validate(config_dict)
-            self.save(updated_config)
+            updated_resource = resource.model_validate(resource_dict)
+            self.save(updated_resource)
         except ValidationError as e:
             raise ValueError(
                 f"Invalid value set for '{self.__class__.__name__}' with "
@@ -262,14 +262,14 @@ class MutablePydanticResourceManager(PydanticResourceManager[MutablePydanticReso
                 f"at: '{self.path}' when setting updates {updates}"
             ) from e
 
-        return updated_config
+        return updated_resource
 
     def reset(self: Self) -> MutablePydanticResource:
-        """Resets the configuration to defaults.
+        """Resets the resources to defaults.
 
         Returns:
-            The new default config object
+            The new default resource object
         """
-        config = self.model_class.reset()
-        self.save(config)
-        return config
+        resource = self.model_class.reset()
+        self.save(resource)
+        return resource

{fmu_settings-0.5.1 → fmu_settings-0.5.3}/src/fmu/settings/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.5.1'
-__version_tuple__ = version_tuple = (0, 5, 1)
+__version__ = version = '0.5.3'
+__version_tuple__ = version_tuple = (0, 5, 3)
 
-__commit_id__ = commit_id = 'g6786842d9'
+__commit_id__ = commit_id = 'g7953e1c0f'

{fmu_settings-0.5.1 → fmu_settings-0.5.3}/src/fmu_settings.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmu-settings
-Version: 0.5.1
+Version: 0.5.3
 Summary: A library for managing FMU settings
 Author-email: Equinor <fg-fmu_atlas@equinor.com>
 License: GPL-3.0

{fmu_settings-0.5.1 → fmu_settings-0.5.3}/tests/test_resources/test_lock_manager.py

@@ -19,6 +19,7 @@ from fmu.settings._resources.lock_manager import (
     DEFAULT_LOCK_TIMEOUT,
     LockError,
     LockManager,
+    LockNotFoundError,
 )
 from fmu.settings.models.lock_info import LockInfo
 
@@ -493,15 +494,21 @@ def test_refresh_works_as_expected(
 def test_refresh_without_lock_file(
     fmu_dir: ProjectFMUDirectory, monkeypatch: MonkeyPatch
 ) -> None:
-    """Tests refresh when lock file is not present."""
-    lock = LockManager(fmu_dir)
-    with pytest.raises(LockError, match="does not exist"):
-        lock.refresh()
+    """Tests that if a user deletes anothers lock it's invalidated on a refresh."""
+    with pytest.raises(LockNotFoundError, match="does not exist"):
+        fmu_dir._lock.refresh()
 
-    lock.acquire()
-    lock.path.unlink()  # It was deleted or something.
-    with pytest.raises(LockError, match="does not exist"):
-        lock.refresh()
+    fmu_dir._lock.acquire()
+    assert fmu_dir._lock.is_acquired() is True
+
+    # Someone deletes the lock
+    fmu_dir._lock.path.unlink()
+
+    with pytest.raises(
+        LockNotFoundError, match="Cannot refresh: lock file does not exist"
+    ):
+        fmu_dir._lock.refresh()
+    assert fmu_dir._lock.is_acquired() is False
 
 
 def test_refresh_without_owning_lock(