dapla-toolbelt-metadata 0.9.7__py3-none-any.whl → 0.9.9__py3-none-any.whl

dapla_metadata/_shared/config.py

@@ -13,9 +13,6 @@ from dotenv import load_dotenv
 from dapla_metadata._shared.enums import DaplaEnvironment
 from dapla_metadata._shared.enums import DaplaRegion
 from dapla_metadata._shared.enums import DaplaService
-from dapla_metadata.datasets.utility.constants import (
-    DATADOC_STATISTICAL_SUBJECT_SOURCE_URL,
-)
 
 logger = logging.getLogger(__name__)
 
@@ -28,6 +25,12 @@ DAPLA_SERVICE = "DAPLA_SERVICE"
 DAPLA_GROUP_CONTEXT = "DAPLA_GROUP_CONTEXT"
 OIDC_TOKEN = "OIDC_TOKEN"  # noqa: S105
 
+
+DATADOC_STATISTICAL_SUBJECT_SOURCE_URL_DEFAULT = (
+    "https://www.ssb.no/xp/_/service/mimir/subjectStructurStatistics"
+)
+
+
 env_loaded = False
 
 
@@ -73,7 +76,7 @@ def get_statistical_subject_source_url() -> str | None:
     """Get the URL to the statistical subject source."""
     return (
         get_config_item("DATADOC_STATISTICAL_SUBJECT_SOURCE_URL")
-        or DATADOC_STATISTICAL_SUBJECT_SOURCE_URL
+        or DATADOC_STATISTICAL_SUBJECT_SOURCE_URL_DEFAULT
     )
 
 

dapla_metadata/datasets/_merge.py

@@ -78,7 +78,7 @@ class DatasetConsistencyStatus:
 
 def check_dataset_consistency(
     new_dataset_path: Path | CloudPath,
-    existing_dataset_path: Path,
+    existing_dataset_path: Path | CloudPath,
 ) -> list[DatasetConsistencyStatus]:
     """Run consistency tests.
 

dapla_metadata/datasets/core.py

@@ -6,7 +6,6 @@ import copy
 import json
 import logging
 from concurrent.futures import ThreadPoolExecutor
-from pathlib import Path
 from typing import TYPE_CHECKING
 from typing import cast
 
@@ -175,7 +174,7 @@ class Datadoc:
         ):
             self.dataset_consistency_status = check_dataset_consistency(
                 self.dataset_path,
-                Path(self.metadata_document),
+                self.metadata_document,
             )
             self.dataset_consistency_status.extend(
                 check_variables_consistency(

dapla_metadata/datasets/utility/constants.py

@@ -94,10 +94,6 @@ DATASET_FIELDS_FROM_EXISTING_METADATA = [
 
 METADATA_DOCUMENT_FILE_SUFFIX = "__DOC.json"
 
-DATADOC_STATISTICAL_SUBJECT_SOURCE_URL = (
-    "https://www.ssb.no/xp/_/service/mimir/subjectStructurStatistics"
-)
-
 PAPIS_STABLE_IDENTIFIER_TYPE = "FREG_SNR"
 PAPIS_ENCRYPTION_KEY_REFERENCE = "papis-common-key-1"
 DAEAD_ENCRYPTION_KEY_REFERENCE = "ssb-common-key-1"

dapla_metadata/datasets/utility/urn.py

@@ -6,9 +6,12 @@ from collections.abc import Iterable
 from dataclasses import dataclass
 from enum import Enum
 from enum import auto
+from typing import Literal
 
 from pydantic import AnyUrl
 
+from dapla_metadata._shared.config import get_dapla_environment
+from dapla_metadata._shared.enums import DaplaEnvironment
 from dapla_metadata.datasets.utility.utils import VariableListType
 
 logger = logging.getLogger(__name__)
@@ -44,6 +47,9 @@ class ReferenceUrlTypes(Enum):
     FRONTEND = auto()
 
 
+UrlVisibility = Literal["public", "internal"]
+
+
 @dataclass
 class UrnConverter:
     """Converts URLs to URNs and vice versa.
@@ -70,11 +76,81 @@ class UrnConverter:
     def _build_pattern(self, url_base: str) -> re.Pattern[str]:
         return re.compile(f"^{url_base}/{self.id_pattern}")
 
-    def build_urn(self, identifier: str) -> str:
+    def get_urn(self, identifier: str) -> str:
         """Build a URN for the given identifier."""
         return f"{self.urn_base}:{identifier}"
 
-    def convert_to_urn(self, url: str | AnyUrl) -> AnyUrl | None:
+    def get_url(
+        self,
+        identifier: str,
+        url_type: ReferenceUrlTypes,
+        visibility: Literal["public", "internal"] = "public",
+    ) -> str | None:
+        """Build concrete URL to reference a resource.
+
+        There are typically multiple URLs used to refer to one resource, this method attempts to support known variations.
+
+        Args:
+            identifier (str): The identifier of the resource the URL refers to.
+            url_type (ReferenceUrlTypes): The representation type of the URL
+            visibility (UrlVisibility, optional): Whether the URL should be that which is publicly available or not. Defaults to "public".
+
+        Returns:
+            str | None: The concrete URL. None if we cannot satisfy the supplied requirements.
+        """
+        candidates = [base[-1] for base in self.url_bases if base[0] == url_type]
+
+        def matches_visibility(url: str, visibility: UrlVisibility):
+            return (".intern." in url) is (visibility == "internal")
+
+        def matches_environment(url: str):
+            current_environment = get_dapla_environment()
+            if current_environment == DaplaEnvironment.TEST:
+                return ".test." in url
+            return ".test." not in url
+
+        if url := next(
+            (
+                url
+                for url in candidates
+                if matches_visibility(url, visibility) and matches_environment(url)
+            ),
+            None,
+        ):
+            return url + "/" + identifier
+        return None
+
+    def get_id(self, urn_or_url: str | AnyUrl) -> str | None:
+        """Get an identifier from a URN or URL.
+
+        Args:
+            urn_or_url (str | AnyUrl): The URN or URL refering to a particular resource
+
+        Returns:
+            str | None: The identifier for the resource, or None if it cannot be extracted.
+        """
+        if str(urn_or_url).startswith(self.urn_base):
+            return str(urn_or_url).removeprefix(self.urn_base + ":")
+        return self._extract_id_from_url(urn_or_url)
+
+    def is_id(self, value: str) -> bool:
+        """Check if the value is an identifier for this URN type.
+
+        Args:
+            value (str): The value to check.
+        """
+        if not isinstance(value, str):
+            # Mypy thinks it's impossible to reach this branch, but there are no guarantees in Python.
+            return False  # type: ignore [unreachable]
+        pattern = re.compile(f"^{self.id_pattern}$")
+        return bool(pattern.match(value))
+
+    def _extract_id_from_url(self, url: str | AnyUrl) -> str | None:
+        patterns = (self._build_pattern(url[-1]) for url in self.url_bases)
+        matches = (self._extract_id(str(url), p) for p in patterns)
+        return next((m for m in matches if m), None)
+
+    def convert_url_to_urn(self, url: str | AnyUrl) -> AnyUrl | None:
         """Convert a URL to a generalized URN for that same resource.
 
         Args:
@@ -86,11 +162,8 @@ class UrnConverter:
         if str(url).startswith(self.urn_base):
             # In this case the value is already in the expected format and nothing needs to be done.
             return AnyUrl(url)
-        patterns = (self._build_pattern(url[-1]) for url in self.url_bases)
-        matches = (self._extract_id(str(url), p) for p in patterns)
-        identifier = next((m for m in matches if m), None)
-        if identifier:
-            return AnyUrl(self.build_urn(identifier))
+        if identifier := self._extract_id_from_url(url):
+            return AnyUrl(self.get_urn(identifier))
 
         return None
 
@@ -149,7 +222,7 @@ def convert_uris_to_urns(
     for v in variables:
         field = getattr(v, field_name, None)
         if field:
-            if urn := next((c.convert_to_urn(field) for c in converters), None):
+            if urn := next((c.convert_url_to_urn(field) for c in converters), None):
                 setattr(v, field_name, urn)
             else:
                 logger.error(

dapla_metadata/variable_definitions/vardok_id.py

@@ -33,7 +33,11 @@ class VardokId(VardokIdResponse):
         model: VardokIdResponse,
     ) -> "VardokId":
         """Create a VariableDefinition instance from a CompleteResponse."""
-        return VardokId.model_construct(**model.model_dump())
+        self = VardokId.from_dict(model.model_dump())
+        if not self:
+            msg = f"Could not construct a VardokId instance from {model}"
+            raise ValueError(msg)
+        return self
 
     def __str__(self) -> str:
         """Format as indented YAML."""

dapla_metadata/variable_definitions/vardok_vardef_id_pair.py

@@ -32,7 +32,11 @@ class VardokVardefIdPair(VardokVardefIdPairResponse):
         model: VardokVardefIdPairResponse,
     ) -> "VardokVardefIdPair":
         """Create a VardokVardefIdPair instance from a VardokVardefIdPairResponse."""
-        return VardokVardefIdPair.model_construct(**model.model_dump())
+        self = VardokVardefIdPair.from_dict(model.model_dump())
+        if not self:
+            msg = f"Could not construct a VardokVardefIdPair instance from {model}"
+            raise ValueError(msg)
+        return self
 
     def __str__(self) -> str:
         """Format as indented YAML."""

dapla_metadata/variable_definitions/variable_definition.py

@@ -82,7 +82,11 @@ class VariableDefinition(CompleteResponse):
         model: CompleteResponse,
     ) -> "VariableDefinition":
         """Create a VariableDefinition instance from a CompleteResponse."""
-        return VariableDefinition.model_construct(**model.model_dump())
+        self = VariableDefinition.from_dict(model.model_dump())
+        if not self:
+            msg = f"Could not construct a VariableDefinition instance from {model}"
+            raise ValueError(msg)
+        return self
 
     @vardef_exception_handler
     def list_validity_periods(self) -> list["VariableDefinition"]:

{dapla_toolbelt_metadata-0.9.7.dist-info → dapla_toolbelt_metadata-0.9.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dapla-toolbelt-metadata
-Version: 0.9.7
+Version: 0.9.9
 Summary: Dapla Toolbelt Metadata
 Project-URL: homepage, https://github.com/statisticsnorway/dapla-toolbelt-metadata
 Project-URL: repository, https://github.com/statisticsnorway/dapla-toolbelt-metadata

{dapla_toolbelt_metadata-0.9.7.dist-info → dapla_toolbelt_metadata-0.9.9.dist-info}/RECORD

@@ -1,14 +1,14 @@
 dapla_metadata/__init__.py,sha256=37yh9XWYQoLIVIS_fDdwNN8OXzbYY-6kMYwvjQrLMJQ,428
 dapla_metadata/_shared/__init__.py,sha256=qUFgnVhBVlPRQP0ePmY76c8FvWRrJ-9c5GvzibwERnQ,103
-dapla_metadata/_shared/config.py,sha256=QqXcmP66AfXF8wi6FMsa7et7kH2k4EJPOF4IELKuQig,3213
+dapla_metadata/_shared/config.py,sha256=xRAXDULS85lAi5XyAirh1acDbf7_0xPhElssXvQQk3Y,3245
 dapla_metadata/_shared/enums.py,sha256=WHkH1d8xw41gOly6au_izZB1_-6XTcKu5rhBWUImjp8,509
 dapla_metadata/_shared/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dapla_metadata/dapla/__init__.py,sha256=tkapF-YwmruPPrKvN3pEoCZqb7xvJx_ogBM8XyGMuJI,130
 dapla_metadata/dapla/user_info.py,sha256=bENez-ICt9ySR8orYebO68Q3_2LkIW9QTL58DTctmEQ,4833
 dapla_metadata/datasets/__init__.py,sha256=an-REJgi7N8-S1SCz-MYO_8as6fMe03WvhjRP_hWWkg,293
-dapla_metadata/datasets/_merge.py,sha256=Tk5wQz6xZGr8veUAHZb42O8HARU8ObBJ_E4afvVWdlo,12993
+dapla_metadata/datasets/_merge.py,sha256=hoNBqiPi1an2mF9ZFnl4K-E7eg9xhlzG3986iPwHAj0,13005
 dapla_metadata/datasets/code_list.py,sha256=JtCE-5Q8grAKvkn0KKjzeGhO-96O7yGsastbuoakreg,9057
-dapla_metadata/datasets/core.py,sha256=OMMCnKADTZGTqenu8_F4lwjQ1sVg4JSgqv5CNBv8eGk,20902
+dapla_metadata/datasets/core.py,sha256=zofQ4MwCPCdStPXXjO9GUwpBVEmqGbzabmef-jmGvyw,20871
 dapla_metadata/datasets/dapla_dataset_path_info.py,sha256=WPeV_mwKk2B9sXd14SaP-kTb1bOQ_8W2KtrqOG7sJIY,26867
 dapla_metadata/datasets/dataset_parser.py,sha256=3dtRXNy1C8SfG8zTYWdY26nV4l-dG25IC_0J5t2bYwI,8285
 dapla_metadata/datasets/model_validation.py,sha256=6qqq1ueTWRWBPTwEGJD49Pv7ksMEaq0iDtuOXelaw-s,7223
@@ -21,9 +21,9 @@ dapla_metadata/datasets/compatibility/model_backwards_compatibility.py,sha256=W5
 dapla_metadata/datasets/external_sources/__init__.py,sha256=qvIdXwqyEmXNUCB94ZtZXRzifdW4hiXASFFPtC70f6E,83
 dapla_metadata/datasets/external_sources/external_sources.py,sha256=9eIcOIUbaodNX1w9Tj2wl4U4wUmr5kF1R0i01fKUzGs,2974
 dapla_metadata/datasets/utility/__init__.py,sha256=pp6tUcgUbo8iq9OPtFKQrTbLuI3uY7NHptwWSTpasOU,33
-dapla_metadata/datasets/utility/constants.py,sha256=YKsn6GfNIkwLoBp0yq209o0TbsEhsA_jGaZLVR984JU,2933
+dapla_metadata/datasets/utility/constants.py,sha256=4ixDvz5nErQwXa3BEtaGZb2AFUUUldJtNZV46SKwUBc,2817
 dapla_metadata/datasets/utility/enums.py,sha256=i6dcxWya5k4LjLdGGIM_H37rRndizug3peaAgoE5UdM,652
-dapla_metadata/datasets/utility/urn.py,sha256=Y_4wYwWWaFDffIN3uXjCodi-uUUQ7zkX1qEFSwGlVqs,5317
+dapla_metadata/datasets/utility/urn.py,sha256=1NtM9OkTUe4_T5Iy8cR-ofwuR0gUlrtA7oQqEmgWKOc,8141
 dapla_metadata/datasets/utility/utils.py,sha256=q76UJI8W4j2aHSq1jz_AfYnJmLfygEflgUrQpqQEPnY,20157
 dapla_metadata/standards/__init__.py,sha256=n8jnMrudLuScSdfQ4UMJorc-Ptg3Y1-ilT8zAaQnM70,179
 dapla_metadata/standards/name_validator.py,sha256=6-DQE_EKVd6UjL--EXpFcZDQtusVbSFaWaUY-CfOV2c,9184
@@ -33,9 +33,9 @@ dapla_metadata/standards/utils/constants.py,sha256=mhWNFnS6NMsRl0c_deIdzY7_bD_wK
 dapla_metadata/variable_definitions/__init__.py,sha256=z48vevGb8UuQ8mwkqCtBGoyM-Ts53vUcKo7Ag5rE_Wc,482
 dapla_metadata/variable_definitions/exceptions.py,sha256=ImB81bne-h45kX9lE5hIh80QAWkOPS52uzcOftuoouM,10118
 dapla_metadata/variable_definitions/vardef.py,sha256=WUpiKfvgFGPhMdjYSFSmdlXQKAolmRgW4-t-EocddQs,13934
-dapla_metadata/variable_definitions/vardok_id.py,sha256=8T23BUHyVQr5hovTVc2E4HVY7f7e_jdi3YL1qzMQgFw,1268
-dapla_metadata/variable_definitions/vardok_vardef_id_pair.py,sha256=8MDdd2-9L30MXkoQrk7NDcueaoxdeYie-TJhgoskTzk,1389
-dapla_metadata/variable_definitions/variable_definition.py,sha256=tsTo_BObHgppSNf6lGbt_Vh88PypPF4pwA-vWDgFy9A,14869
+dapla_metadata/variable_definitions/vardok_id.py,sha256=hHX3muzz-cJD7fPJbt5QPwIWlUbuoxWxXXz-sn_s92k,1409
+dapla_metadata/variable_definitions/vardok_vardef_id_pair.py,sha256=E4UEddg6VjcL3wdf2DbIu0v6071m7M6ll2MifegPwNA,1540
+dapla_metadata/variable_definitions/variable_definition.py,sha256=CFy5i53zFp6rCoWlALe5HLCx-QaOg5fj3YeUnfWYQ6I,15020
 dapla_metadata/variable_definitions/_generated/.openapi-generator-ignore,sha256=x9lryVB5wtVEuKQ5GcZ94b10RgtkVXbtvWXOArO1XsM,169
 dapla_metadata/variable_definitions/_generated/README.md,sha256=Y4et1oAhZTCr7a-CZfLbIpyYnhKzpygNg-gj7qJ09Eg,7650
 dapla_metadata/variable_definitions/_generated/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -91,7 +91,7 @@ dapla_metadata/variable_definitions/_utils/constants.py,sha256=zr5FNVCEz6TM9PVEr
 dapla_metadata/variable_definitions/_utils/files.py,sha256=JbPgPNQ7iA38juMqGEdcg5OjZZUwCb6NQtPL0AEspD0,10933
 dapla_metadata/variable_definitions/_utils/template_files.py,sha256=7fcc7yEHOl5JUZ698kqj4IiikXPHBi3SrAVOk4wqQtw,3308
 dapla_metadata/variable_definitions/_utils/variable_definition_files.py,sha256=sGhcSpckR9NtYGNh2oVkiCd5SI3bbJEBhc1PA2uShs0,4701
-dapla_toolbelt_metadata-0.9.7.dist-info/METADATA,sha256=yb6SMXPh6nMfUPfOMyicbrcConcCoWgEtcgsUsl2jJ0,4854
-dapla_toolbelt_metadata-0.9.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dapla_toolbelt_metadata-0.9.7.dist-info/licenses/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
-dapla_toolbelt_metadata-0.9.7.dist-info/RECORD,,
+dapla_toolbelt_metadata-0.9.9.dist-info/METADATA,sha256=nCdEjXMl-6rGQNmpxCxEFrNBGk4KfT28xqyGSEK9BTc,4854
+dapla_toolbelt_metadata-0.9.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dapla_toolbelt_metadata-0.9.9.dist-info/licenses/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
+dapla_toolbelt_metadata-0.9.9.dist-info/RECORD,,