fmu-settings 0.0.1__py3-none-any.whl → 0.2.0__py3-none-any.whl

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/_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/{resources → _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
@@ -73,7 +73,7 @@ class ConfigManager(PydanticResourceManager[T]):
             default: Value to return if key is not found. Default None
 
         Returns:
-            The configuration value or deafult
+            The configuration value or default
         """
         try:
             config = self.load()

fmu/settings/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.1'
-__version_tuple__ = version_tuple = (0, 0, 1)
+__version__ = version = '0.2.0'
+__version_tuple__ = version_tuple = (0, 2, 0)
+
+__commit_id__ = commit_id = None

fmu/settings/models/_mappings.py

@@ -6,7 +6,7 @@ from uuid import UUID
 
 from pydantic import BaseModel, RootModel
 
-from fmu.dataio._models.enums import Content  # type: ignore
+from fmu.datamodels.enums import Content  # type: ignore
 
 from ._enums import (
     DataEntrySource,

fmu/settings/models/project_config.py

@@ -3,25 +3,13 @@
 import getpass
 from datetime import UTC, datetime
 from typing import Self
-from uuid import UUID  # noqa TC003
 
-from pydantic import AwareDatetime, BaseModel, Field
+from pydantic import AwareDatetime, Field
 
+from fmu.datamodels.fmu_results.fields import Access, Masterdata, Model
 from fmu.settings import __version__
 from fmu.settings.types import ResettableBaseModel, VersionStr  # noqa TC001
 
-from .smda import Smda
-
-
-class Masterdata(BaseModel):
-    """The ``masterdata`` block contains information related to masterdata.
-
-    Currently, SMDA holds the masterdata.
-    """
-
-    smda: Smda | None = Field(default=None)
-    """Block containing SMDA-related attributes. See :class:`Smda`."""
-
 
 class ProjectConfig(ResettableBaseModel):
     """The configuration file in a .fmu directory.
@@ -32,7 +20,9 @@ class ProjectConfig(ResettableBaseModel):
     version: VersionStr
     created_at: AwareDatetime
     created_by: str
-    masterdata: Masterdata
+    masterdata: Masterdata | None = Field(default=None)
+    model: Model | None = Field(default=None)
+    access: Access | None = Field(default=None)
 
     @classmethod
     def reset(cls: type[Self]) -> Self:
@@ -45,5 +35,7 @@ class ProjectConfig(ResettableBaseModel):
             version=__version__,
             created_at=datetime.now(UTC),
             created_by=getpass.getuser(),
-            masterdata=Masterdata(),
+            masterdata=None,
+            model=None,
+            access=None,
         )

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.0.1.dist-info → fmu_settings-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmu-settings
-Version: 0.0.1
+Version: 0.2.0
 Summary: A library for managing FMU settings
 Author-email: Equinor <fg-fmu_atlas@equinor.com>
 License: GPL-3.0
@@ -18,7 +18,7 @@ Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: annotated_types
-Requires-Dist: fmu-dataio
+Requires-Dist: fmu-datamodels
 Requires-Dist: pydantic
 Provides-Extra: dev
 Requires-Dist: mypy; extra == "dev"

fmu_settings-0.2.0.dist-info/RECORD

@@ -0,0 +1,21 @@
+fmu/__init__.py,sha256=htx6HlMme77I6pZ8U256-2B2cMJuELsu3JN3YM2Efh4,144
+fmu/settings/__init__.py,sha256=x96dVVR-2n2lYD84LGbL7W8l3-r7W_0reUTKZlE7S34,331
+fmu/settings/_fmu_dir.py,sha256=E8ULohZKwMixkuw9cXK20IxaHaRXmWQ1vbE02QAX_YU,10573
+fmu/settings/_init.py,sha256=5CT7tV2XHz5wuLh97XozyLiKpwogrsfjpxm2dpn7KWE,4097
+fmu/settings/_logging.py,sha256=nEdmZlNCBsB1GfDmFMKCjZmeuRp3CRlbz1EYUemc95Y,1104
+fmu/settings/_version.py,sha256=Dg8AmJomLVpjKL6prJylOONZAPRtB86LOce7dorQS_A,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=b8DUtRHti1n2pSuw5eCQko7e7NKOzP2BH6dNPJFd2ck,6869
+fmu/settings/_resources/pydantic_resource_manager.py,sha256=t4Rp6MOSIq85iKfDHZLJxeGRj8S3SKanWHWri0p9wV8,3161
+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/project_config.py,sha256=K7y4PZMuq5wD-0Br60xfffBN6QQUV8viKGjjOcCB-7M,1098
+fmu/settings/models/user_config.py,sha256=UrRcbxJAGn1e7IeE0_v1oPWVOk-DGekRG49pXzDr83o,2701
+fmu_settings-0.2.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+fmu_settings-0.2.0.dist-info/METADATA,sha256=Kjzn1O0vvAAYoYAoC-Jo8IzN0H-V7HWwwV3Io47N41w,2024
+fmu_settings-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmu_settings-0.2.0.dist-info/top_level.txt,sha256=Z-FIY3pxn0UK2Wxi9IJ7fKoLSraaxuNGi1eokiE0ShM,4
+fmu_settings-0.2.0.dist-info/RECORD,,

fmu/settings/models/smda.py

@@ -1,90 +0,0 @@
-"""Models for SMDA masterdata."""
-
-from uuid import UUID
-
-from pydantic import BaseModel, Field
-
-from fmu.settings.types import VersionStr  # noqa TC001
-
-
-class SmdaIdentifier(BaseModel):
-    """The identifier for something known to SMDA."""
-
-    identifier: str
-    """Identifier known to SMDA."""
-
-    uuid: UUID
-    """Identifier known to SMDA."""
-
-
-class CountryItem(SmdaIdentifier):
-    """A single country in the list of countries known to SMDA."""
-
-    identifier: str = Field(examples=["Norway"])
-    """Identifier known to SMDA."""
-
-    uuid: UUID = Field(examples=["15ce3b84-766f-4c93-9050-b154861f9100"])
-    """Identifier known to SMDA."""
-
-
-class FieldItem(SmdaIdentifier):
-    """A single field in the list of fields known to SMDA."""
-
-    identifier: str = Field(examples=["OseFax"])
-    """Identifier known to SMDA."""
-
-    uuid: UUID = Field(examples=["15ce3b84-766f-4c93-9050-b154861f9100"])
-    """Identifier known to SMDA."""
-
-
-class CoordinateSystem(SmdaIdentifier):
-    """Contains the coordinate system known to SMDA."""
-
-    identifier: str = Field(examples=["ST_WGS84_UTM37N_P32637"])
-    """Identifier known to SMDA."""
-
-    uuid: UUID = Field(examples=["15ce3b84-766f-4c93-9050-b154861f9100"])
-    """Identifier known to SMDA."""
-
-
-class StratigraphicColumn(SmdaIdentifier):
-    """Contains the stratigraphic column known to SMDA."""
-
-    identifier: str = Field(examples=["DROGON_2020"])
-    """Identifier known to SMDA."""
-
-    uuid: UUID = Field(examples=["15ce3b84-766f-4c93-9050-b154861f9100"])
-    """Identifier known to SMDA."""
-
-
-class DiscoveryItem(BaseModel):
-    """A single discovery in the list of discoveries known to SMDA."""
-
-    short_identifier: str = Field(examples=["SomeDiscovery"])
-    """Identifier known to SMDA."""
-
-    uuid: UUID = Field(examples=["15ce3b84-766f-4c93-9050-b154861f9100"])
-    """Identifier known to SMDA."""
-
-
-class Smda(BaseModel):
-    """Contains SMDA-related attributes."""
-
-    coordinate_system: CoordinateSystem
-    """Reference to coordinate system known to SMDA.  See :class:`CoordinateSystem`."""
-
-    country: list[CountryItem]
-    """A list referring to countries known to SMDA. First item is primary.
-    See :class:`CountryItem`."""
-
-    discovery: list[DiscoveryItem]
-    """A list referring to discoveries known to SMDA. First item is primary.
-    See :class:`DiscoveryItem`."""
-
-    field: list[FieldItem]
-    """A list referring to fields known to SMDA. First item is primary.
-    See :class:`FieldItem`."""
-
-    stratigraphic_column: StratigraphicColumn
-    """Reference to stratigraphic column known to SMDA.
-    See :class:`StratigraphicColumn`."""

fmu_settings-0.0.1.dist-info/RECORD

@@ -1,21 +0,0 @@
-fmu/__init__.py,sha256=htx6HlMme77I6pZ8U256-2B2cMJuELsu3JN3YM2Efh4,144
-fmu/settings/__init__.py,sha256=x96dVVR-2n2lYD84LGbL7W8l3-r7W_0reUTKZlE7S34,331
-fmu/settings/_fmu_dir.py,sha256=-w3cB0_2WCKYkXTmoOQtZHI_fHfCDbnzEtTF_lcYod8,10572
-fmu/settings/_init.py,sha256=5CT7tV2XHz5wuLh97XozyLiKpwogrsfjpxm2dpn7KWE,4097
-fmu/settings/_logging.py,sha256=nEdmZlNCBsB1GfDmFMKCjZmeuRp3CRlbz1EYUemc95Y,1104
-fmu/settings/_version.py,sha256=vgltXBYF55vNcC2regxjGN0_cbebmm8VgcDdQaDapWQ,511
-fmu/settings/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fmu/settings/types.py,sha256=aeXEsznBTT1YRRY_LSRqK1j2gmMmyLYYTGYl3a9fweU,513
-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=uaSAE_0y88Gvv-vM3VR5xx7yuXn9mio_8V3YC1t9wLI,2836
-fmu/settings/models/project_config.py,sha256=vImpk_rPrMEn3G9NZj83Recq9YzqAABQS7ZVUlBa0vM,1207
-fmu/settings/models/smda.py,sha256=nQ3-EI2VDRappwHgipLLXnWbEVQCsLrtJn14lES2Q6g,2639
-fmu/settings/models/user_config.py,sha256=JhMeSmWcE4GrBRkM_D5QVnUbRKfVy_XakHeKqJrYxvE,2217
-fmu/settings/resources/config_managers.py,sha256=4rA2xXS8BoNkM-RCfhJ6FNiwRGW_jTckZzpT_llkqlY,6852
-fmu/settings/resources/managers.py,sha256=t4Rp6MOSIq85iKfDHZLJxeGRj8S3SKanWHWri0p9wV8,3161
-fmu_settings-0.0.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-fmu_settings-0.0.1.dist-info/METADATA,sha256=_Jt3s4v_3G-lhNAd4S8ocOYZ0_KoRQEdCRCIvaQqO68,2020
-fmu_settings-0.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmu_settings-0.0.1.dist-info/top_level.txt,sha256=Z-FIY3pxn0UK2Wxi9IJ7fKoLSraaxuNGi1eokiE0ShM,4
-fmu_settings-0.0.1.dist-info/RECORD,,