fmu-settings 0.1.0__tar.gz → 0.2.0__tar.gz

{fmu_settings-0.1.0 → fmu_settings-0.2.0}/PKG-INFO

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

{fmu_settings-0.1.0 → fmu_settings-0.2.0}/src/fmu/settings/_fmu_dir.py

@@ -4,12 +4,12 @@ from pathlib import Path
 from typing import Any, Final, Self, TypeAlias, cast
 
 from ._logging import null_logger
-from .models.project_config import ProjectConfig
-from .models.user_config import UserConfig
-from .resources.config_managers import (
+from ._resources.config_managers import (
     ProjectConfigManager,
     UserConfigManager,
 )
+from .models.project_config import ProjectConfig
+from .models.user_config import UserConfig
 
 logger: Final = null_logger(__name__)
 

fmu_settings-0.2.0/src/fmu/settings/_resources/__init__.py

@@ -0,0 +1,5 @@
+"""Contains resources used in this package.
+
+Some resources contained here may also be used
+outside this package.
+"""

{fmu_settings-0.1.0/src/fmu/settings/resources → fmu_settings-0.2.0/src/fmu/settings/_resources}/config_managers.py

@@ -13,7 +13,7 @@ from fmu.settings.models.project_config import ProjectConfig
 from fmu.settings.models.user_config import UserConfig
 from fmu.settings.types import ResettableBaseModel, VersionStr  # noqa TC001
 
-from .managers import PydanticResourceManager
+from .pydantic_resource_manager import PydanticResourceManager
 
 if TYPE_CHECKING:
     # Avoid circular dependency for type hint in __init__ only

{fmu_settings-0.1.0 → fmu_settings-0.2.0}/src/fmu/settings/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.1.0'
-__version_tuple__ = version_tuple = (0, 1, 0)
+__version__ = version = '0.2.0'
+__version_tuple__ = version_tuple = (0, 2, 0)
 
-__commit_id__ = commit_id = 'gc714eb4cf'
+__commit_id__ = commit_id = 'g944134f32'

{fmu_settings-0.1.0 → fmu_settings-0.2.0}/src/fmu/settings/models/user_config.py

@@ -8,12 +8,18 @@ from typing import Annotated, Self
 from uuid import UUID  # noqa TC003
 
 import annotated_types
-from pydantic import AwareDatetime, BaseModel, SecretStr, field_serializer
+from pydantic import (
+    AwareDatetime,
+    BaseModel,
+    SecretStr,
+    field_serializer,
+    field_validator,
+)
 
 from fmu.settings import __version__
 from fmu.settings.types import ResettableBaseModel, VersionStr  # noqa TC001
 
-RecentDirectories = Annotated[set[Path], annotated_types.Len(0, 5)]
+RecentProjectDirectories = Annotated[list[Path], annotated_types.Len(0, 5)]
 
 
 class UserAPIKeys(BaseModel):
@@ -38,7 +44,7 @@ class UserConfig(ResettableBaseModel):
     version: VersionStr
     created_at: AwareDatetime
     user_api_keys: UserAPIKeys
-    recent_directories: RecentDirectories
+    recent_project_directories: RecentProjectDirectories
 
     @classmethod
     def reset(cls: type[Self]) -> Self:
@@ -47,9 +53,17 @@ class UserConfig(ResettableBaseModel):
             version=__version__,
             created_at=datetime.now(UTC),
             user_api_keys=UserAPIKeys(),
-            recent_directories=set(),
+            recent_project_directories=[],
         )
 
+    @field_validator("recent_project_directories", mode="before")
+    @classmethod
+    def ensure_unique(cls, recent_projects: list[Path]) -> list[Path]:
+        """Ensures that recent_project_directories contains unique entries."""
+        if len(recent_projects) != len(set(recent_projects)):
+            raise ValueError("recent_project_directories must contain unique entries")
+        return recent_projects
+
     def obfuscate_secrets(self: Self) -> Self:
         """Returns a copy of the model with obfuscated secrets.
 

{fmu_settings-0.1.0 → fmu_settings-0.2.0}/src/fmu_settings.egg-info/PKG-INFO

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

{fmu_settings-0.1.0 → fmu_settings-0.2.0}/src/fmu_settings.egg-info/SOURCES.txt

@@ -17,13 +17,14 @@ src/fmu/settings/_logging.py
 src/fmu/settings/_version.py
 src/fmu/settings/py.typed
 src/fmu/settings/types.py
+src/fmu/settings/_resources/__init__.py
+src/fmu/settings/_resources/config_managers.py
+src/fmu/settings/_resources/pydantic_resource_manager.py
 src/fmu/settings/models/__init__.py
 src/fmu/settings/models/_enums.py
 src/fmu/settings/models/_mappings.py
 src/fmu/settings/models/project_config.py
 src/fmu/settings/models/user_config.py
-src/fmu/settings/resources/config_managers.py
-src/fmu/settings/resources/managers.py
 src/fmu_settings.egg-info/PKG-INFO
 src/fmu_settings.egg-info/SOURCES.txt
 src/fmu_settings.egg-info/dependency_links.txt

{fmu_settings-0.1.0 → fmu_settings-0.2.0}/tests/conftest.py

@@ -126,7 +126,7 @@ def user_config_dict(unix_epoch_utc: datetime) -> dict[str, Any]:
         "user_api_keys": {
             "smda_subscription": None,
         },
-        "recent_directories": [],
+        "recent_project_directories": [],
     }
 
 

{fmu_settings-0.1.0 → fmu_settings-0.2.0}/tests/test_fmu_dir.py

@@ -288,30 +288,41 @@ def test_update_user_config(user_fmu_dir: UserFMUDirectory) -> None:
     """Tests update_config updates and saves the user config for multiple values."""
     recent_dir = "/foo/bar"
     updated_config = user_fmu_dir.update_config(
-        {"version": "2.0.0", "recent_directories": [recent_dir]}
+        {"version": "2.0.0", "recent_project_directories": [recent_dir]}
     )
 
     assert updated_config.version == "2.0.0"
-    assert updated_config.recent_directories == {Path(recent_dir)}
+    assert updated_config.recent_project_directories == [Path(recent_dir)]
 
     assert user_fmu_dir.config.load() is not None
     assert user_fmu_dir.get_config_value("version", None) == "2.0.0"
-    assert user_fmu_dir.get_config_value("recent_directories") == {Path(recent_dir)}
+    assert user_fmu_dir.get_config_value("recent_project_directories") == [
+        Path(recent_dir)
+    ]
 
     config_file = user_fmu_dir.config.path
     with open(config_file, encoding="utf-8") as f:
         saved_config = json.load(f)
 
     assert saved_config["version"] == "2.0.0"
-    assert saved_config["recent_directories"] == [recent_dir]
+    assert saved_config["recent_project_directories"] == [recent_dir]
 
 
 def test_update_user_config_invalid_data(user_fmu_dir: UserFMUDirectory) -> None:
     """Tests that update_config raises ValidationError on bad data."""
-    updates = {"recent_directories": [123]}
+    updates = {"recent_project_directories": [123]}
     with pytest.raises(
         ValueError,
         match="Invalid value set for 'UserConfigManager' with updates "
-        "'{'recent_directories':",
+        "'{'recent_project_directories':",
     ):
         user_fmu_dir.update_config(updates)
+
+
+def test_update_user_config_non_unique_recent_projects(
+    user_fmu_dir: UserFMUDirectory,
+) -> None:
+    """Tests that update_config raises on non-unique recent_project_directories."""
+    updates = {"recent_project_directories": [Path("/foo/bar"), Path("/foo/bar")]}
+    with pytest.raises(ValueError, match="unique entries"):
+        user_fmu_dir.update_config(updates)

{fmu_settings-0.1.0 → fmu_settings-0.2.0}/tests/test_init.py

@@ -134,7 +134,7 @@ def test_init_user_fmu_directory(
     assert config_json["version"] == __version__
     assert config_json["created_at"] != str(unix_epoch_utc)
     assert config_json["user_api_keys"] == {"smda_subscription": None}
-    assert config_json["recent_directories"] == []
+    assert config_json["recent_project_directories"] == []
 
     created_at = datetime.fromisoformat(config_json["created_at"])
     now = datetime.now(UTC)

{fmu_settings-0.1.0 → fmu_settings-0.2.0}/tests/test_resources/test_project_config.py

@@ -9,12 +9,12 @@ import pytest
 
 from fmu.datamodels.fmu_results.fields import Access, Model, Smda
 from fmu.settings._fmu_dir import ProjectFMUDirectory, UserFMUDirectory
-from fmu.settings.models.project_config import ProjectConfig
-from fmu.settings.models.user_config import UserConfig
-from fmu.settings.resources.config_managers import (
+from fmu.settings._resources.config_managers import (
     ProjectConfigManager,
     UserConfigManager,
 )
+from fmu.settings.models.project_config import ProjectConfig
+from fmu.settings.models.user_config import UserConfig
 
 
 @pytest.fixture

{fmu_settings-0.1.0 → fmu_settings-0.2.0}/tests/test_resources/test_resource_managers.py

@@ -8,7 +8,7 @@ import pytest
 from pydantic import BaseModel
 
 from fmu.settings._fmu_dir import ProjectFMUDirectory
-from fmu.settings.resources.managers import PydanticResourceManager
+from fmu.settings._resources.pydantic_resource_manager import PydanticResourceManager
 
 
 class A(BaseModel):