fmu-settings 0.3.1__tar.gz → 0.3.2__tar.gz

{fmu_settings-0.3.1 → fmu_settings-0.3.2}/PKG-INFO

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

{fmu_settings-0.3.1 → fmu_settings-0.3.2}/src/fmu/settings/_resources/pydantic_resource_manager.py

@@ -48,11 +48,14 @@ class PydanticResourceManager(Generic[T]):
         """Returns whether or not the resource exists."""
         return self.path.exists()
 
-    def load(self: Self, force: bool = False) -> T:
-        """Loads the resources from disk and validates it as a Pydantic model.
+    def load(self: Self, force: bool = False, store_cache: bool = True) -> T:
+        """Loads the resource from disk and validates it as a Pydantic model.
 
         Args:
-            force: Force a re-read even if the file is already cached
+            force: Force a re-read even if the file is already cached.
+            store_cache: Whether or not to cache the loaded model internally. This is
+                best used with 'force=True' because if a model is already stored in
+                _cache it will be returned without re-loading. Default True.
 
         Returns:
             Validated Pydantic model
@@ -71,7 +74,11 @@ class PydanticResourceManager(Generic[T]):
             try:
                 content = self.fmu_dir.read_text_file(self.relative_path)
                 data = json.loads(content)
-                self._cache = self.model_class.model_validate(data)
+                validated_model = self.model_class.model_validate(data)
+                if store_cache:
+                    self._cache = validated_model
+                else:
+                    return validated_model
             except ValidationError as e:
                 raise ValueError(
                     f"Invalid content in resource file for '{self.__class__.__name__}: "

{fmu_settings-0.3.1 → fmu_settings-0.3.2}/src/fmu/settings/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.3.1'
-__version_tuple__ = version_tuple = (0, 3, 1)
+__version__ = version = '0.3.2'
+__version_tuple__ = version_tuple = (0, 3, 2)
 
-__commit_id__ = commit_id = 'g7197724f6'
+__commit_id__ = commit_id = 'g9ea88b68f'

{fmu_settings-0.3.1 → fmu_settings-0.3.2}/src/fmu_settings.egg-info/PKG-INFO

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

{fmu_settings-0.3.1 → fmu_settings-0.3.2}/tests/test_resources/test_resource_managers.py

@@ -87,6 +87,62 @@ def test_pydantic_resource_manager_load(fmu_dir: ProjectFMUDirectory) -> None:
     assert a._cache == a_model
 
 
+def test_pydantic_resource_manager_load_force_true(
+    fmu_dir: ProjectFMUDirectory,
+) -> None:
+    """Tests loading a Pydantic resource with force=True."""
+    a = AManager(fmu_dir)
+    a_model = A(foo="bar")
+    a.save(a_model)
+    assert a.load() == a_model
+    assert a._cache == a_model
+
+    a_shadow = AManager(fmu_dir)
+    a_shadow_model = A(foo="baz")
+    a_shadow.save(a_shadow_model)
+
+    assert a_shadow.load() == a_shadow_model
+    assert a_shadow._cache == a_shadow_model
+
+    assert a.load() == a_model
+    assert a._cache == a_model
+
+    assert a.load(force=True) == a_shadow_model
+    assert a._cache == a_shadow_model
+
+
+def test_pydantic_resource_manager_load_cache_false(
+    fmu_dir: ProjectFMUDirectory,
+) -> None:
+    """Tests loading a Pydantic resource with cache=False."""
+    a = AManager(fmu_dir)
+    a_model = A(foo="bar")
+    a.save(a_model)
+
+    a_shadow = AManager(fmu_dir)
+    assert a_shadow.load(store_cache=False) == a_model
+    assert a_shadow._cache is None
+
+    assert a_shadow.load(store_cache=True) == a_model
+    assert a_shadow._cache == a_model
+
+
+def test_pydantic_resource_manager_load_force_true_cache_false(
+    fmu_dir: ProjectFMUDirectory,
+) -> None:
+    """Tests loading a Pydantic resource with force=True, cache=False."""
+    a = AManager(fmu_dir)
+    a_model = A(foo="bar")
+    a.save(a_model)
+
+    a_shadow = AManager(fmu_dir)
+    a_shadow_model = A(foo="baz")
+    a_shadow.save(a_shadow_model)
+
+    assert a.load(force=True, store_cache=False) == a_shadow_model
+    assert a._cache is a_model
+
+
 def test_pydantic_resource_manager_loads_invalid_model(
     fmu_dir: ProjectFMUDirectory,
 ) -> None: