fmu-settings 0.5.0__py3-none-any.whl → 0.5.2__py3-none-any.whl

fmu/settings/_global_config.py

@@ -145,16 +145,18 @@ def load_global_configuration_if_present(
         fmu_load: Whether or not to load in the custom 'fmu' format. Default False.
 
     Returns:
-        GlobalConfiguration instance or None.
+        GlobalConfiguration instance or None if file cannot be loaded.
+
+    Raises:
+        ValidationError: If the file is loaded but has invalid schema.
     """
     loader = "fmu" if fmu_load else "standard"
     try:
         global_variables_dict = yaml_load(path, loader=loader)
         global_config = GlobalConfiguration.model_validate(global_variables_dict)
         logger.debug(f"Global variables at {path} has valid settings data")
-    except ValidationError as e:
-        logger.debug(f"Global variables at {path} failed validation: {e}")
-        return None
+    except ValidationError:
+        raise
     except Exception as e:
         logger.debug(
             f"Failed to load global variables at {path}: {type(e).__name__}: {e}"
@@ -173,6 +175,9 @@ def _find_global_variables_file(paths: list[Path]) -> GlobalConfiguration | None
 
     Returns:
         A validated GlobalConfiguration or None.
+
+    Raises:
+        ValidationError: If a file is found but has invalid schema.
     """
     for path in paths:
         if not path.exists():
@@ -204,6 +209,9 @@ def _find_global_config_file(paths: list[Path]) -> GlobalConfiguration | None:
 
     Returns:
         A validated GlobalConfiguration or None.
+
+    Raises:
+        ValidationError: If a file is found but has invalid schema.
     """
     for path in paths:
         if not path.exists():
@@ -241,6 +249,11 @@ def find_global_config(
 
     Returns:
         A valid GlobalConfiguration instance, or None.
+
+    Raises:
+        ValidationError: If a configuration file is found but has invalid schema.
+        InvalidGlobalConfigurationError: If strict=True and configuration contains
+            disallowed content (e.g., Drogon data).
     """
     base_path = Path(base_path)
 

fmu/settings/_resources/lock_manager.py

@@ -194,6 +194,8 @@ class LockManager(PydanticResourceManager[LockInfo]):
             LockError: If we don't hold the lock or it's invalid
         """
         if not self.exists:
+            if self.is_acquired():
+                self.release()
             raise LockError("Cannot refresh: lock file does not exist")
 
         lock_info = self._safe_load()

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/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.5.0'
-__version_tuple__ = version_tuple = (0, 5, 0)
+__version__ = version = '0.5.2'
+__version_tuple__ = version_tuple = (0, 5, 2)
 
 __commit_id__ = commit_id = None

{fmu_settings-0.5.0.dist-info → fmu_settings-0.5.2.dist-info}/METADATA

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

{fmu_settings-0.5.0.dist-info → fmu_settings-0.5.2.dist-info}/RECORD

@@ -1,24 +1,24 @@
 fmu/__init__.py,sha256=htx6HlMme77I6pZ8U256-2B2cMJuELsu3JN3YM2Efh4,144
 fmu/settings/__init__.py,sha256=CkEE7al_uBCQO1lxBKN5LzyCwzzH5Aq6kkEIR7f-zTw,336
 fmu/settings/_fmu_dir.py,sha256=XeZjec78q0IUOpBq-VMkKoWtzXwBeQi2qWRIh_SIFwU,10859
-fmu/settings/_global_config.py,sha256=tYSQH_48cknaEeo8C_uraEaPXZrrN7cHYZOCX9G39yM,8916
+fmu/settings/_global_config.py,sha256=C0_o99OhOc49ynz4h6ygbbHHH8OOI5lcVFr-9FCwD0c,9331
 fmu/settings/_init.py,sha256=ucueS0BlEsM3MkX7IaRISloH4vF7-_ZKSphrORbHgJ4,4381
 fmu/settings/_logging.py,sha256=nEdmZlNCBsB1GfDmFMKCjZmeuRp3CRlbz1EYUemc95Y,1104
-fmu/settings/_version.py,sha256=fvHpBU3KZKRinkriKdtAt3crenOyysELF-M9y3ozg3U,704
+fmu/settings/_version.py,sha256=LGYtjQ6cyPZC_N0AovMIeSYYDK21050nm3HYgDanQBM,704
 fmu/settings/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fmu/settings/types.py,sha256=aeXEsznBTT1YRRY_LSRqK1j2gmMmyLYYTGYl3a9fweU,513
 fmu/settings/_resources/__init__.py,sha256=LHYR_F7lNGdv8N6R3cEwds5CJQpkOthXFqsEs24vgF8,118
 fmu/settings/_resources/config_managers.py,sha256=QcCLlSw8KdJKrkhGax5teFJzjgQG3ym7Ljs1DykjFbc,1570
-fmu/settings/_resources/lock_manager.py,sha256=zdv1BZJlgB1BO9NepAdjY-YZ1-57HEJcTApE4UVS-8M,9995
-fmu/settings/_resources/pydantic_resource_manager.py,sha256=AVvBUPnYOzmFYo9k5cA9QUme6ZOu0Q3IoLx_le7Mq20,9264
+fmu/settings/_resources/lock_manager.py,sha256=ekGE5mTcjEWRyoBSIeqaX1r53-WStpYeJYepkOPYi3Q,10061
+fmu/settings/_resources/pydantic_resource_manager.py,sha256=BUWO6IHSoT0Ma6QgseweEf7uiGeMwHBEoCyGYPYYFdA,9290
 fmu/settings/models/__init__.py,sha256=lRlXgl55ba2upmDzdvzx8N30JMq2Osnm8aa_xxTZn8A,112
 fmu/settings/models/_enums.py,sha256=SQUZ-2mQcTx4F0oefPFfuQzMKsKTSFSB-wq_CH7TBRE,734
 fmu/settings/models/_mappings.py,sha256=Z4Ex7MtmajBr6FjaNzmwDRwtJlaZZ8YKh9NDmZHRKPI,2832
 fmu/settings/models/lock_info.py,sha256=-oHDF9v9bDLCoFvEg4S6XXYLeo19zRAZ8HynCv75VWg,711
 fmu/settings/models/project_config.py,sha256=pxb54JmpXNMVAFUu_yJ89dNrYEk6hrPuFfFUpf84Jh0,1099
 fmu/settings/models/user_config.py,sha256=dWFTcZY6UnEgNTuGqB-izraJ657PecsW0e0Nt9GBDhI,2666
-fmu_settings-0.5.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-fmu_settings-0.5.0.dist-info/METADATA,sha256=5Ff9Xfr_KsWUptwWt4HlKIkfnmME7D2UqclD-qzgrSo,2116
-fmu_settings-0.5.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmu_settings-0.5.0.dist-info/top_level.txt,sha256=Z-FIY3pxn0UK2Wxi9IJ7fKoLSraaxuNGi1eokiE0ShM,4
-fmu_settings-0.5.0.dist-info/RECORD,,
+fmu_settings-0.5.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+fmu_settings-0.5.2.dist-info/METADATA,sha256=dxi2pe4SgYJwTY6beiEPoLx7lEqjzZWq9UcpX3gir_s,2116
+fmu_settings-0.5.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmu_settings-0.5.2.dist-info/top_level.txt,sha256=Z-FIY3pxn0UK2Wxi9IJ7fKoLSraaxuNGi1eokiE0ShM,4
+fmu_settings-0.5.2.dist-info/RECORD,,