dapla-toolbelt-metadata 0.6.5__py3-none-any.whl → 0.7.0__py3-none-any.whl

dapla_metadata/__init__.py

@@ -7,7 +7,7 @@ warnings.filterwarnings(
     message="As the c extension couldn't be imported, `google-crc32c` is using a pure python implementation that is significantly slower.",
 )
 
-import datadoc_model.model as datadoc_model
+import datadoc_model.all_optional.model as datadoc_model
 
 from . import dapla
 from . import datasets

dapla_metadata/datasets/core.py

@@ -9,9 +9,11 @@ import warnings
 from concurrent.futures import ThreadPoolExecutor
 from pathlib import Path
 from typing import TYPE_CHECKING
+from typing import cast
 
-from datadoc_model import model
-from datadoc_model.model import DataSetStatus
+import datadoc_model.all_optional.model as all_optional_model
+import datadoc_model.required.model as required_model
+from datadoc_model.all_optional.model import DataSetStatus
 
 from dapla_metadata._shared import config
 from dapla_metadata.dapla import user_info
@@ -30,6 +32,8 @@ from dapla_metadata.datasets.utility.constants import INCONSISTENCIES_MESSAGE
 from dapla_metadata.datasets.utility.constants import METADATA_DOCUMENT_FILE_SUFFIX
 from dapla_metadata.datasets.utility.constants import NUM_OBLIGATORY_DATASET_FIELDS
 from dapla_metadata.datasets.utility.constants import NUM_OBLIGATORY_VARIABLES_FIELDS
+from dapla_metadata.datasets.utility.utils import ExistingPseudonymizationMetadataType
+from dapla_metadata.datasets.utility.utils import OptionalDatadocMetadataType
 from dapla_metadata.datasets.utility.utils import calculate_percentage
 from dapla_metadata.datasets.utility.utils import derive_assessment_from_state
 from dapla_metadata.datasets.utility.utils import get_timestamp_now
@@ -84,8 +88,8 @@ class Datadoc:
         dataset_path: str | None = None,
         metadata_document_path: str | None = None,
         statistic_subject_mapping: StatisticSubjectMapping | None = None,
-        *,
         errors_as_warnings: bool = False,
+        validate_required_fields_on_existing_metadata: bool = False,
     ) -> None:
         """Initialize the Datadoc instance.
 
@@ -101,17 +105,23 @@ class Datadoc:
                 Defaults to None
             errors_as_warnings: Disable raising exceptions if inconsistencies
                 are found between existing and extracted metadata.
+            validate_required_fields_on_existing_metadata: Use a Pydantic model
+                which validates whether required fields are present when reading
+                in an existing metadata file.
         """
         self._statistic_subject_mapping = statistic_subject_mapping
         self.errors_as_warnings = errors_as_warnings
+        self.validate_required_fields_on_existing_metadata = (
+            validate_required_fields_on_existing_metadata
+        )
         self.metadata_document: pathlib.Path | CloudPath | None = None
-        self.container: model.MetadataContainer | None = None
+        self.container: all_optional_model.MetadataContainer | None = None
         self.dataset_path: pathlib.Path | CloudPath | None = None
-        self.dataset = model.Dataset()
+        self.dataset = all_optional_model.Dataset()
         self.variables: list = []
-        self.pseudo_variables: list[model.PseudoVariable] = []
-        self.variables_lookup: dict[str, model.Variable] = {}
-        self.pseudo_variables_lookup: dict[str, model.PseudoVariable] = {}
+        self.pseudo_variables: list[all_optional_model.PseudoVariable] = []
+        self.variables_lookup: dict[str, all_optional_model.Variable] = {}
+        self.pseudo_variables_lookup: dict[str, all_optional_model.PseudoVariable] = {}
         self.explicitly_defined_metadata_document = False
         self.dataset_consistency_status: list = []
         if metadata_document_path:
@@ -149,9 +159,9 @@ class Datadoc:
         - The 'contains_personal_data' attribute is set to False if not specified.
         - A lookup dictionary for variables is created based on their short names.
         """
-        extracted_metadata: model.DatadocMetadata | None = None
-        existing_metadata: model.DatadocMetadata | None = None
-        existing_pseudonymization: model.PseudonymizationMetadata | None = None
+        extracted_metadata: all_optional_model.DatadocMetadata | None = None
+        existing_metadata: OptionalDatadocMetadataType = None
+        existing_pseudonymization: ExistingPseudonymizationMetadataType = None
 
         if self.metadata_document and self.metadata_document.exists():
             existing_metadata = self._extract_metadata_from_existing_document(
@@ -166,11 +176,26 @@ class Datadoc:
 
         if (
             self.dataset_path is not None
-            and self.dataset == model.Dataset()
+            and self.dataset == all_optional_model.Dataset()
             and len(self.variables) == 0
         ):
             extracted_metadata = self._extract_metadata_from_dataset(self.dataset_path)
 
+        if extracted_metadata is not None:
+            existing_file_path = self._get_existing_file_path(extracted_metadata)
+            if (
+                self.dataset_path
+                and existing_file_path is not None
+                and extracted_metadata is not None
+                and existing_metadata is not None
+            ):
+                self.dataset_consistency_status = self._check_dataset_consistency(
+                    self.dataset_path,
+                    Path(existing_file_path),
+                    extracted_metadata,
+                    existing_metadata,
+                )
+
         if (
             self.dataset_path
             and self.explicitly_defined_metadata_document
@@ -179,13 +204,6 @@ class Datadoc:
             and extracted_metadata is not None
             and existing_metadata is not None
         ):
-            existing_file_path = self._get_existing_file_path(extracted_metadata)
-            self.dataset_consistency_status = self._check_dataset_consistency(
-                self.dataset_path,
-                Path(existing_file_path),
-                extracted_metadata,
-                existing_metadata,
-            )
             self._check_ready_to_merge(
                 self.dataset_consistency_status,
                 errors_as_warnings=self.errors_as_warnings,
@@ -207,14 +225,14 @@ class Datadoc:
             self._set_pseudonymization_metadata(existing_pseudonymization)
 
         set_default_values_variables(self.variables)
-        set_default_values_dataset(self.dataset)
+        set_default_values_dataset(cast("all_optional_model.Dataset", self.dataset))
         set_dataset_owner(self.dataset)
         self._create_variables_lookup()
         self._create_pseudo_variables_lookup()
 
     def _get_existing_file_path(
         self,
-        extracted_metadata: model.DatadocMetadata | None,
+        extracted_metadata: all_optional_model.DatadocMetadata | None,
     ) -> str:
         if (
             extracted_metadata is not None
@@ -227,19 +245,19 @@ class Datadoc:
 
     def _set_metadata(
         self,
-        merged_metadata: model.DatadocMetadata | None,
+        merged_metadata: OptionalDatadocMetadataType,
     ) -> None:
         if not merged_metadata or not (
             merged_metadata.dataset and merged_metadata.variables
         ):
             msg = "Could not read metadata"
             raise ValueError(msg)
-        self.dataset = merged_metadata.dataset
+        self.dataset = cast("all_optional_model.Dataset", merged_metadata.dataset)
         self.variables = merged_metadata.variables
 
     def _set_pseudonymization_metadata(
         self,
-        existing_pseudonymization: model.PseudonymizationMetadata | None,
+        existing_pseudonymization: ExistingPseudonymizationMetadataType,
     ) -> None:
         if not existing_pseudonymization or not (
             existing_pseudonymization.pseudo_variables is not None
@@ -247,7 +265,10 @@ class Datadoc:
             msg = "Error reading pseudonymization metadata"
             logger.error(msg)
             return
-        self.pseudo_variables = existing_pseudonymization.pseudo_variables
+        self.pseudo_variables = cast(
+            "list[all_optional_model.PseudoVariable]",
+            existing_pseudonymization.pseudo_variables,
+        )
 
     def _create_variables_lookup(self) -> None:
         self.variables_lookup = {
@@ -264,8 +285,8 @@ class Datadoc:
     def _check_dataset_consistency(
         new_dataset_path: Path | CloudPath,
         existing_dataset_path: Path,
-        extracted_metadata: model.DatadocMetadata,
-        existing_metadata: model.DatadocMetadata,
+        extracted_metadata: all_optional_model.DatadocMetadata,
+        existing_metadata: OptionalDatadocMetadataType,
     ) -> list[dict[str, object]]:
         """Run consistency tests.
 
@@ -312,14 +333,16 @@ class Datadoc:
             {
                 "name": "Variable names",
                 "success": (
-                    {v.short_name for v in extracted_metadata.variables or []}
+                    existing_metadata is not None
+                    and {v.short_name for v in extracted_metadata.variables or []}
                     == {v.short_name for v in existing_metadata.variables or []}
                 ),
             },
             {
                 "name": "Variable datatypes",
                 "success": (
-                    [v.data_type for v in extracted_metadata.variables or []]
+                    existing_metadata is not None
+                    and [v.data_type for v in extracted_metadata.variables or []]
                     == [v.data_type for v in existing_metadata.variables or []]
                 ),
             },
@@ -353,27 +376,29 @@ class Datadoc:
 
     @staticmethod
     def _merge_metadata(
-        extracted_metadata: model.DatadocMetadata | None,
-        existing_metadata: model.DatadocMetadata | None,
-    ) -> model.DatadocMetadata:
+        extracted_metadata: all_optional_model.DatadocMetadata | None,
+        existing_metadata: OptionalDatadocMetadataType,
+    ) -> all_optional_model.DatadocMetadata:
         if not existing_metadata:
             logger.warning(
                 "No existing metadata found, no merge to perform. Continuing with extracted metadata.",
             )
-            return extracted_metadata or model.DatadocMetadata()
+            return extracted_metadata or all_optional_model.DatadocMetadata()
 
         if not extracted_metadata:
-            return existing_metadata
+            return cast("all_optional_model.DatadocMetadata", existing_metadata)
 
         # Use the extracted metadata as a base
-        merged_metadata = model.DatadocMetadata(
+        merged_metadata = all_optional_model.DatadocMetadata(
             dataset=copy.deepcopy(extracted_metadata.dataset),
             variables=[],
         )
 
         override_dataset_fields(
             merged_metadata=merged_metadata,
-            existing_metadata=existing_metadata,
+            existing_metadata=cast(
+                "all_optional_model.DatadocMetadata", existing_metadata
+            ),
         )
 
         # Merge variables.
@@ -387,7 +412,7 @@ class Datadoc:
     def _extract_metadata_from_existing_document(
         self,
         document: pathlib.Path | CloudPath,
-    ) -> model.DatadocMetadata | None:
+    ) -> OptionalDatadocMetadataType:
         """Read metadata from an existing metadata document.
 
         If an existing metadata document is available, this method reads and
@@ -402,7 +427,13 @@ class Datadoc:
 
         Raises:
             json.JSONDecodeError: If the metadata document cannot be parsed.
+            pydantic.ValidationError: If the data does not successfully validate.
         """
+        metadata_model = (
+            required_model
+            if self.validate_required_fields_on_existing_metadata
+            else all_optional_model
+        )
         fresh_metadata = {}
         try:
             with document.open(mode="r", encoding="utf-8") as file:
@@ -412,7 +443,7 @@ class Datadoc:
                 fresh_metadata,
             )
             if is_metadata_in_container_structure(fresh_metadata):
-                self.container = model.MetadataContainer.model_validate_json(
+                self.container = metadata_model.MetadataContainer.model_validate_json(
                     json.dumps(fresh_metadata),
                 )
                 datadoc_metadata = fresh_metadata["datadoc"]
@@ -420,7 +451,7 @@ class Datadoc:
                 datadoc_metadata = fresh_metadata
             if datadoc_metadata is None:
                 return None
-            return model.DatadocMetadata.model_validate_json(
+            return metadata_model.DatadocMetadata.model_validate_json(
                 json.dumps(datadoc_metadata),
             )
         except json.JSONDecodeError:
@@ -435,7 +466,11 @@ class Datadoc:
     def _extract_pseudonymization_from_existing_document(
         self,
         document: pathlib.Path | CloudPath,
-    ) -> model.PseudonymizationMetadata | None:
+    ) -> (
+        all_optional_model.PseudonymizationMetadata
+        | required_model.PseudonymizationMetadata
+        | None
+    ):
         """Read pseudo metadata from an existing metadata document.
 
         If there is pseudo metadata in the document supplied, the method validates and returns the pseudonymization structure.
@@ -445,7 +480,14 @@ class Datadoc:
 
         Raises:
             json.JSONDecodeError: If the metadata document cannot be parsed.
+            pydantic.ValidationError: If the data does not successfully validate.
         """
+        metadata_model = (
+            required_model
+            if self.validate_required_fields_on_existing_metadata
+            else all_optional_model
+        )
+
         try:
             with document.open(mode="r", encoding="utf-8") as file:
                 fresh_metadata = json.load(file)
@@ -464,7 +506,7 @@ class Datadoc:
         if pseudonymization_metadata is None:
             return None
 
-        return model.PseudonymizationMetadata.model_validate_json(
+        return metadata_model.PseudonymizationMetadata.model_validate_json(
             json.dumps(pseudonymization_metadata),
         )
 
@@ -500,7 +542,7 @@ class Datadoc:
     def _extract_metadata_from_dataset(
         self,
         dataset: pathlib.Path | CloudPath,
-    ) -> model.DatadocMetadata:
+    ) -> all_optional_model.DatadocMetadata:
         """Obtain what metadata we can from the dataset itself.
 
         This makes it easier for the user by 'pre-filling' certain fields.
@@ -520,9 +562,9 @@ class Datadoc:
                 - variables: A list of fields extracted from the dataset schema.
         """
         dapla_dataset_path_info = DaplaDatasetPathInfo(dataset)
-        metadata = model.DatadocMetadata()
+        metadata = all_optional_model.DatadocMetadata()
 
-        metadata.dataset = model.Dataset(
+        metadata.dataset = all_optional_model.Dataset(
             short_name=dapla_dataset_path_info.dataset_short_name,
             dataset_state=dapla_dataset_path_info.dataset_state,
             dataset_status=DataSetStatus.DRAFT,
@@ -586,12 +628,14 @@ class Datadoc:
         if self.container:
             self.container.datadoc = datadoc
             if not self.container.pseudonymization:
-                self.container.pseudonymization = model.PseudonymizationMetadata(
-                    pseudo_dataset=model.PseudoDataset()
+                self.container.pseudonymization = (
+                    all_optional_model.PseudonymizationMetadata(
+                        pseudo_dataset=all_optional_model.PseudoDataset()
+                    )
                 )
             self.container.pseudonymization.pseudo_variables = self.pseudo_variables
         else:
-            self.container = model.MetadataContainer(datadoc=datadoc)
+            self.container = all_optional_model.MetadataContainer(datadoc=datadoc)
         if self.metadata_document:
             content = self.container.model_dump_json(indent=4)
             self.metadata_document.write_text(content)
@@ -623,12 +667,14 @@ class Datadoc:
     def add_pseudo_variable(self, variable_short_name: str) -> None:
         """Adds a new pseudo variable to the list of pseudonymized variables."""
         if self.variables_lookup[variable_short_name] is not None:
-            pseudo_variable = model.PseudoVariable(short_name=variable_short_name)
+            pseudo_variable = all_optional_model.PseudoVariable(
+                short_name=variable_short_name
+            )
             self.pseudo_variables.append(pseudo_variable)
             self.pseudo_variables_lookup[variable_short_name] = pseudo_variable
 
     def get_pseudo_variable(
         self, variable_short_name: str
-    ) -> model.PseudoVariable | None:
+    ) -> all_optional_model.PseudoVariable | None:
         """Finds a pseudo variable by shortname."""
         return self.pseudo_variables_lookup.get(variable_short_name)

dapla_metadata/datasets/dapla_dataset_path_info.py

@@ -14,7 +14,7 @@ from typing import Literal
 
 import arrow
 from cloudpathlib import GSPath
-from datadoc_model.model import DataSetState
+from datadoc_model.all_optional.model import DataSetState
 
 if TYPE_CHECKING:
     import datetime

dapla_metadata/datasets/dataset_parser.py

@@ -12,10 +12,10 @@ from abc import abstractmethod
 from typing import TYPE_CHECKING
 
 import pandas as pd
-from datadoc_model.model import DataType
-from datadoc_model.model import LanguageStringType
-from datadoc_model.model import LanguageStringTypeItem
-from datadoc_model.model import Variable
+from datadoc_model.all_optional.model import DataType
+from datadoc_model.all_optional.model import LanguageStringType
+from datadoc_model.all_optional.model import LanguageStringTypeItem
+from datadoc_model.all_optional.model import Variable
 from pyarrow import parquet as pq
 
 from dapla_metadata.datasets.utility.enums import SupportedLanguages

dapla_metadata/datasets/statistic_subject_mapping.py

@@ -140,7 +140,11 @@ class StatisticSubjectMapping(GetExternalSource):
                 SecondarySubject(
                     self._extract_titles(s.titler),
                     s["emnekode"],
-                    [statistikk["kortnavn"] for statistikk in s.find_all("Statistikk")],
+                    [
+                        statistikk["kortnavn"]
+                        for statistikk in s.find_all("Statistikk")
+                        if statistikk["isPrimaerPlassering"] == "true"
+                    ],
                 )
                 for s in p.find_all("delemne")
             ]

dapla_metadata/datasets/utility/constants.py

@@ -1,7 +1,7 @@
 """Repository for constant values in Datadoc backend."""
 
-from datadoc_model.model import LanguageStringType
-from datadoc_model.model import LanguageStringTypeItem
+from datadoc_model.all_optional.model import LanguageStringType
+from datadoc_model.all_optional.model import LanguageStringTypeItem
 
 VALIDATION_ERROR = "Validation error: "
 

dapla_metadata/datasets/utility/utils.py

@@ -4,15 +4,19 @@ import datetime  # import is needed in xdoctest
 import logging
 import pathlib
 import uuid
+from typing import cast
 
+import datadoc_model
+import datadoc_model.all_optional.model as all_optional_model
+import datadoc_model.required.model as required_model
 import google.auth
 from cloudpathlib import CloudPath
 from cloudpathlib import GSClient
 from cloudpathlib import GSPath
 from datadoc_model import model
-from datadoc_model.model import Assessment
-from datadoc_model.model import DataSetState
-from datadoc_model.model import VariableRole
+from datadoc_model.all_optional.model import Assessment
+from datadoc_model.all_optional.model import DataSetState
+from datadoc_model.all_optional.model import VariableRole
 
 from dapla_metadata.dapla import user_info
 from dapla_metadata.datasets.utility.constants import (
@@ -34,6 +38,17 @@ from dapla_metadata.datasets.utility.constants import (
 
 logger = logging.getLogger(__name__)
 
+DatadocMetadataType = (
+    all_optional_model.DatadocMetadata | required_model.DatadocMetadata
+)
+DatasetType = all_optional_model.Dataset | required_model.Dataset
+OptionalDatadocMetadataType = DatadocMetadataType | None
+ExistingPseudonymizationMetadataType = (
+    all_optional_model.PseudonymizationMetadata
+    | required_model.PseudonymizationMetadata
+    | None
+)
+
 
 def get_timestamp_now() -> datetime.datetime:
     """Return a timestamp for the current moment."""
@@ -119,7 +134,9 @@ def set_default_values_variables(variables: list) -> None:
             v.variable_role = VariableRole.MEASURE
 
 
-def set_default_values_dataset(dataset: model.Dataset) -> None:
+def set_default_values_dataset(
+    dataset: DatasetType,
+) -> None:
     """Set default values on dataset.
 
     Args:
@@ -140,7 +157,9 @@ def set_default_values_dataset(dataset: model.Dataset) -> None:
         dataset.contains_personal_data = False
 
 
-def set_dataset_owner(dataset: model.Dataset) -> None:
+def set_dataset_owner(
+    dataset: DatasetType,
+) -> None:
     """Sets the owner of the dataset from the DAPLA_GROUP_CONTEXT enviornment variable.
 
     Args:
@@ -153,7 +172,7 @@ def set_dataset_owner(dataset: model.Dataset) -> None:
 
 
 def set_variables_inherit_from_dataset(
-    dataset: model.Dataset,
+    dataset: DatasetType,
     variables: list,
 ) -> None:
     """Set specific dataset values on a list of variable objects.
@@ -283,7 +302,9 @@ def _is_missing_metadata(
     )
 
 
-def num_obligatory_dataset_fields_completed(dataset: model.Dataset) -> int:
+def num_obligatory_dataset_fields_completed(
+    dataset: DatasetType,
+) -> int:
     """Count the number of completed obligatory dataset fields.
 
     This function returns the total count of obligatory fields in the dataset that
@@ -345,7 +366,9 @@ def num_obligatory_variable_fields_completed(variable: model.Variable) -> int:
     return NUM_OBLIGATORY_VARIABLES_FIELDS - len(missing_metadata)
 
 
-def get_missing_obligatory_dataset_fields(dataset: model.Dataset) -> list:
+def get_missing_obligatory_dataset_fields(
+    dataset: DatasetType,
+) -> list:
     """Identify all obligatory dataset fields that are missing values.
 
     This function checks for obligatory fields that are either directly missing
@@ -422,8 +445,9 @@ def running_in_notebook() -> bool:
 
 
 def override_dataset_fields(
-    merged_metadata: model.DatadocMetadata,
-    existing_metadata: model.DatadocMetadata,
+    merged_metadata: all_optional_model.DatadocMetadata,
+    existing_metadata: all_optional_model.DatadocMetadata
+    | required_model.DatadocMetadata,
 ) -> None:
     """Overrides specific fields in the dataset of `merged_metadata` with values from the dataset of `existing_metadata`.
 
@@ -449,10 +473,10 @@ def override_dataset_fields(
 
 
 def merge_variables(
-    existing_metadata: model.DatadocMetadata,
-    extracted_metadata: model.DatadocMetadata,
-    merged_metadata: model.DatadocMetadata,
-) -> model.DatadocMetadata:
+    existing_metadata: OptionalDatadocMetadataType,
+    extracted_metadata: all_optional_model.DatadocMetadata,
+    merged_metadata: all_optional_model.DatadocMetadata,
+) -> all_optional_model.DatadocMetadata:
     """Merges variables from the extracted metadata into the existing metadata and updates the merged metadata.
 
     This function compares the variables from `extracted_metadata` with those in `existing_metadata`.
@@ -466,11 +490,12 @@ def merge_variables(
         merged_metadata: The metadata object that will contain the result of the merge.
 
     Returns:
-        model.DatadocMetadata: The `merged_metadata` object containing variables from both `existing_metadata`
+        all_optional_model.DatadocMetadata: The `merged_metadata` object containing variables from both `existing_metadata`
         and `extracted_metadata`.
     """
     if (
-        existing_metadata.variables is not None
+        existing_metadata is not None
+        and existing_metadata.variables is not None
         and extracted_metadata is not None
         and extracted_metadata.variables is not None
         and merged_metadata.variables is not None
@@ -494,7 +519,9 @@ def merge_variables(
                 existing.contains_data_until = (
                     extracted.contains_data_until or existing.contains_data_until
                 )
-                merged_metadata.variables.append(existing)
+                merged_metadata.variables.append(
+                    cast("datadoc_model.all_optional.model.Variable", existing)
+                )
             else:
                 # If there is no existing metadata for this variable, we just use what we have extracted
                 merged_metadata.variables.append(extracted)

dapla_metadata/variable_definitions/_utils/config.py

@@ -9,24 +9,6 @@ from dapla_metadata.variable_definitions._generated.vardef_client.configuration
 
 VARDEF_HOST_TEST = "https://metadata.intern.test.ssb.no"
 WORKSPACE_DIR = "WORKSPACE_DIR"
-VARDEF_DESCRIPTIONS_FILE_PATH = "VARDEF_DESCRIPTIONS_FILE_PATH"
-VARDEF_DEFAULT_DESCRIPTION_PATH = (
-    "variable_definitions/resources/vardef_model_descriptions_nb.yaml"
-)
-
-
-def get_descriptions_path() -> str:
-    """Get the relative file path from the repo root to the Norwegian descriptions.
-
-    First checks the `VARDEF_DESCRIPTIONS_FILE_PATH` environment variable; if not set, returns a default path.
-
-    Returns:
-        str: The file path to the descriptions.
-    """
-    return (
-        get_config_item(VARDEF_DESCRIPTIONS_FILE_PATH)
-        or VARDEF_DEFAULT_DESCRIPTION_PATH
-    )
 
 
 def get_workspace_dir() -> str | None:

dapla_metadata/variable_definitions/_utils/constants.py

@@ -24,8 +24,6 @@ TEMPLATE_SECTION_HEADER_MACHINE_GENERATED_EN = (
     "\n--- Machine generated fields. Do not edit ---\n"
 )
 
-NORWEGIAN_DESCRIPTIONS = "norwegian_description"
-
 DEFAULT_DATE = date(1000, 1, 1)
 
 MACHINE_GENERATED_FIELDS = [

dapla_metadata/variable_definitions/_utils/files.py

@@ -3,12 +3,8 @@
 import logging
 from datetime import datetime
 from pathlib import Path
-from typing import TYPE_CHECKING
-from typing import Any
-from typing import cast
 
 import pytz
-from pydantic.config import JsonDict
 from ruamel.yaml import YAML
 from ruamel.yaml import CommentedMap
 from ruamel.yaml import RoundTripRepresenter
@@ -27,10 +23,7 @@ from dapla_metadata.variable_definitions._utils.constants import DOUBLE_QUOTE_FI
 from dapla_metadata.variable_definitions._utils.constants import (
     MACHINE_GENERATED_FIELDS,
 )
-from dapla_metadata.variable_definitions._utils.constants import NORWEGIAN_DESCRIPTIONS
-from dapla_metadata.variable_definitions._utils.constants import OPTIONAL_FIELD
 from dapla_metadata.variable_definitions._utils.constants import OWNER_FIELD_NAME
-from dapla_metadata.variable_definitions._utils.constants import REQUIRED_FIELD
 from dapla_metadata.variable_definitions._utils.constants import (
     TEMPLATE_SECTION_HEADER_MACHINE_GENERATED,
 )
@@ -47,14 +40,8 @@ from dapla_metadata.variable_definitions._utils.constants import (
     VARIABLE_STATUS_FIELD_NAME,
 )
 from dapla_metadata.variable_definitions._utils.constants import YAML_STR_TAG
-from dapla_metadata.variable_definitions._utils.descriptions import (
-    apply_norwegian_descriptions_to_model,
-)
 from dapla_metadata.variable_definitions.exceptions import VardefFileError
 
-if TYPE_CHECKING:
-    from pydantic import JsonValue
-
 logger = logging.getLogger(__name__)
 
 
@@ -119,41 +106,6 @@ def _get_variable_definitions_dir():
     return folder_path
 
 
-def _set_field_requirement(field_name: str, field: Any) -> str | None:
-    """Determine the field requirement status."""
-    if field_name not in MACHINE_GENERATED_FIELDS:
-        if field.is_required() or field_name == VARIABLE_STATUS_FIELD_NAME:
-            return REQUIRED_FIELD
-        return OPTIONAL_FIELD
-    return None
-
-
-def _populate_commented_map(
-    field_name: str,
-    value: str,
-    commented_map: CommentedMap,
-    model_instance: CompleteResponse,
-) -> None:
-    """Add data to a CommentedMap."""
-    commented_map[field_name] = value
-    field = type(model_instance).model_fields[field_name]
-    description: JsonValue = cast(
-        JsonDict,
-        field.json_schema_extra,
-    )[NORWEGIAN_DESCRIPTIONS]
-    field_requirement: str | None = _set_field_requirement(field_name, field)
-    if description is not None:
-        new_description = (
-            ("\n" + field_requirement + "\n" + str(description))
-            if field_requirement
-            else ("\n" + str(description))
-        )
-        commented_map.yaml_set_comment_before_after_key(
-            field_name,
-            before=new_description,
-        )
-
-
 def _validate_and_create_directory(custom_directory: Path) -> Path:
     """Ensure that the given path is a valid directory, creating it if necessary.
 
@@ -290,9 +242,9 @@ def _model_to_yaml_with_comments(
     start_comment: str,
     custom_directory: Path | None = None,
 ) -> Path:
-    """Convert a model instance to a structured YAML file with Norwegian descriptions as comments.
+    """Convert a model instance to a structured YAML file.
 
-    Adds Norwegian descriptions to the model, organizes fields into sections, and saves
+    Organizes fields into sections with headers and saves
     the YAML file with a structured format and timestamped filename.
 
     Args:
@@ -307,13 +259,6 @@ def _model_to_yaml_with_comments(
     yaml = YAML()
     configure_yaml(yaml)
 
-    from dapla_metadata.variable_definitions.variable_definition import (
-        VariableDefinition,
-    )
-
-    # Apply new fields to model
-    apply_norwegian_descriptions_to_model(VariableDefinition)
-
     # Convert Pydantic model instance to dictionary
     data = model_instance.model_dump(
         serialize_as_any=True,
@@ -326,21 +271,16 @@ def _model_to_yaml_with_comments(
     status_map = CommentedMap()
     owner_map = CommentedMap()
 
-    # Loop through all fields in the model and populate the commented maps
+    # Loop through all fields in the model and assigne to commented maps
     for field_name, value in data.items():
         if field_name == VARIABLE_STATUS_FIELD_NAME:
-            _populate_commented_map(field_name, value, status_map, model_instance)
+            status_map[field_name] = value
         elif field_name == OWNER_FIELD_NAME:
-            _populate_commented_map(field_name, value, owner_map, model_instance)
+            owner_map[field_name] = value
         elif field_name in MACHINE_GENERATED_FIELDS:
-            _populate_commented_map(
-                field_name,
-                value,
-                machine_generated_map,
-                model_instance,
-            )
-        elif field_name not in {VARIABLE_STATUS_FIELD_NAME, OWNER_FIELD_NAME}:
-            _populate_commented_map(field_name, value, commented_map, model_instance)
+            machine_generated_map[field_name] = value
+        else:
+            commented_map[field_name] = value
 
     base_path = (
         _get_variable_definitions_dir()

{dapla_toolbelt_metadata-0.6.5.dist-info → dapla_toolbelt_metadata-0.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dapla-toolbelt-metadata
-Version: 0.6.5
+Version: 0.7.0
 Summary: Dapla Toolbelt Metadata
 License: MIT
 Author: Team Metadata
@@ -24,7 +24,7 @@ Requires-Dist: pyjwt (>=2.8.0)
 Requires-Dist: python-dotenv (>=1.0.1)
 Requires-Dist: requests (>=2.31.0)
 Requires-Dist: ruamel-yaml (>=0.18.10)
-Requires-Dist: ssb-datadoc-model (==6.0.0)
+Requires-Dist: ssb-datadoc-model (==6.1.0)
 Requires-Dist: ssb-klass-python (>=1.0.1)
 Requires-Dist: typing-extensions (>=4.12.2)
 Project-URL: Changelog, https://github.com/statisticsnorway/dapla-toolbelt-metadata/releases

{dapla_toolbelt_metadata-0.6.5.dist-info → dapla_toolbelt_metadata-0.7.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-dapla_metadata/__init__.py,sha256=LI-qV1Vq1nKw8KkO0uppNwjOoXwd8niQFCx9jECn6Aw,415
+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/enums.py,sha256=WHkH1d8xw41gOly6au_izZB1_-6XTcKu5rhBWUImjp8,509
@@ -7,19 +7,19 @@ dapla_metadata/dapla/__init__.py,sha256=tkapF-YwmruPPrKvN3pEoCZqb7xvJx_ogBM8XyGM
 dapla_metadata/dapla/user_info.py,sha256=bENez-ICt9ySR8orYebO68Q3_2LkIW9QTL58DTctmEQ,4833
 dapla_metadata/datasets/__init__.py,sha256=TvzskpdFC6hGcC9_55URT5jr5wNAPzXuISd2UjJWM_8,280
 dapla_metadata/datasets/code_list.py,sha256=kp1O6sUiUAP9WKlWY8IgHWx_1IOzJA63WveHqolgKmg,9082
-dapla_metadata/datasets/core.py,sha256=AGnGTYF7JV8hySu-_Cd4PvxOMlgX1ICpkiWi9GGLlRg,25778
-dapla_metadata/datasets/dapla_dataset_path_info.py,sha256=zdkVjxlqXMBe7eTAneUrTDP0_fx7JsEQ_0JrKjREhfU,26854
-dapla_metadata/datasets/dataset_parser.py,sha256=bc3KOIDQGgdZMPh3XVHhiKMsY6FxIY9glvGlwTM4g7I,8233
+dapla_metadata/datasets/core.py,sha256=Kc248-U1XoyjFgGo2uOAiOrHrCIo-2-4P53SM8FDKHo,28090
+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/external_sources/__init__.py,sha256=qvIdXwqyEmXNUCB94ZtZXRzifdW4hiXASFFPtC70f6E,83
 dapla_metadata/datasets/external_sources/external_sources.py,sha256=9eIcOIUbaodNX1w9Tj2wl4U4wUmr5kF1R0i01fKUzGs,2974
 dapla_metadata/datasets/model_backwards_compatibility.py,sha256=RKhi6cjqmPKW8lTYQ0mIXTAwhMGo_X-QMad4Y5tvq_0,19136
 dapla_metadata/datasets/model_validation.py,sha256=pGT-jqaQQY4z7jz-7UQd0BQoTWDxDWPYAnDoRC2vd_c,6818
 dapla_metadata/datasets/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dapla_metadata/datasets/statistic_subject_mapping.py,sha256=QdC22DUBOdRgsfmTTEUr9CKCE8fKjMq6-Ezdr6Eof_A,6254
+dapla_metadata/datasets/statistic_subject_mapping.py,sha256=ovT-bZv6eGPD3L0UIs5nIw4AjJrfZn0hyWyD72JBmhs,6395
 dapla_metadata/datasets/utility/__init__.py,sha256=pp6tUcgUbo8iq9OPtFKQrTbLuI3uY7NHptwWSTpasOU,33
-dapla_metadata/datasets/utility/constants.py,sha256=SqZMc1v8rO2b_nRFJR7frVd0TAGvvxzIPEIzkqOuBSw,2444
+dapla_metadata/datasets/utility/constants.py,sha256=YEs2ECLNJMM1SSORPTDnzNep_Qut5YbJ5JJx_oP3ios,2470
 dapla_metadata/datasets/utility/enums.py,sha256=SpV4xlmP1YMaJPbmX03hqRLHUOhXIk5gquTeJ8G_5OE,432
-dapla_metadata/datasets/utility/utils.py,sha256=fAevz9X0PHw-JL0_4V0geTkoBV31qoO7-dVLFJaIfbo,18370
+dapla_metadata/datasets/utility/utils.py,sha256=JpJuvYEXmNUXTgaxPhUg24aiiZS201wRNnAOWyH_DO0,19210
 dapla_metadata/standards/__init__.py,sha256=n8jnMrudLuScSdfQ4UMJorc-Ptg3Y1-ilT8zAaQnM70,179
 dapla_metadata/standards/name_validator.py,sha256=6-DQE_EKVd6UjL--EXpFcZDQtusVbSFaWaUY-CfOV2c,9184
 dapla_metadata/standards/standard_validators.py,sha256=tcCiCI76wUVtMzXA2oCgdauZc0uGgUi11FKu-t7KGwQ,3767
@@ -73,17 +73,15 @@ dapla_metadata/variable_definitions/_generated/vardef_client/py.typed,sha256=47D
 dapla_metadata/variable_definitions/_generated/vardef_client/rest.py,sha256=x4PWmg3IYQBr8OgnrWr3l4Ke2rElHP3zAEVxk2U-mOc,12022
 dapla_metadata/variable_definitions/_utils/__init__.py,sha256=qAhRLJoTBqtR3f9xRXTRhD7-5Xg0Opk1Ks5F4AUYnpA,45
 dapla_metadata/variable_definitions/_utils/_client.py,sha256=v1-9VjrdPI6-sroam5vXMPEV1dQMPsYk7KyGd48HjYw,971
-dapla_metadata/variable_definitions/_utils/config.py,sha256=BpLrnuqgtqz_kxBc_Kd-I1QNL7y2RxRXgX-IVbMIclQ,2416
-dapla_metadata/variable_definitions/_utils/constants.py,sha256=BGITkRNYtRDySM-anDMQDvO2JrXm3lDjw7ZmYfhFlXU,1884
-dapla_metadata/variable_definitions/_utils/descriptions.py,sha256=bB5QHNc4eOhmpLQHCty-CP5_aA82chkICifXw430suI,2746
-dapla_metadata/variable_definitions/_utils/files.py,sha256=qdO9D0l-6FnSGZImTtyMsrFfauFqvQyCWz0knLSklbo,13193
+dapla_metadata/variable_definitions/_utils/config.py,sha256=h5MtmueCdAgg82c5upvQUC9QSzK0TOs40KwQj5mTrE8,1822
+dapla_metadata/variable_definitions/_utils/constants.py,sha256=Jy9xFa4ZpTUxpDZ_vdUaFlB-cPnQpFArwS9VtEIG0SY,1834
+dapla_metadata/variable_definitions/_utils/files.py,sha256=JbPgPNQ7iA38juMqGEdcg5OjZZUwCb6NQtPL0AEspD0,10933
 dapla_metadata/variable_definitions/_utils/template_files.py,sha256=-PgYs4TG4vrXLQgk47pow9ZsqlZqhtO755LnEmvN4MA,3405
 dapla_metadata/variable_definitions/_utils/variable_definition_files.py,sha256=PbqsFdHxsq0EWBg9s2Y57LqVP7aPmGD5-FZfnzuOw2Q,4078
 dapla_metadata/variable_definitions/exceptions.py,sha256=z6Gtd84FboDu7vWjC3wathIF7I0gF0imtRhwMkr16lY,7851
-dapla_metadata/variable_definitions/resources/vardef_model_descriptions_nb.yaml,sha256=VNglLU6jBLbfoM12fc2fiby_pi2GAgA-4t30yKypeuY,5474
 dapla_metadata/variable_definitions/vardef.py,sha256=KYd31nCGhxuzC0hpKR6foQjO39Tlb3vu9IDqUoMvTeY,11352
 dapla_metadata/variable_definitions/variable_definition.py,sha256=sj49uot0e4UJW4QJ3dEJGgjY4yfCHOkxS2NdD2t60b8,14883
-dapla_toolbelt_metadata-0.6.5.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
-dapla_toolbelt_metadata-0.6.5.dist-info/METADATA,sha256=nCYM7_zMNUogDtfXGQirVfghQwc4KDnE1GRNQqO-Grw,4905
-dapla_toolbelt_metadata-0.6.5.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-dapla_toolbelt_metadata-0.6.5.dist-info/RECORD,,
+dapla_toolbelt_metadata-0.7.0.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
+dapla_toolbelt_metadata-0.7.0.dist-info/METADATA,sha256=BvUM_PyKUxWsZcS1wBYh1n6aC0nEA9A14NQUbphZwIw,4905
+dapla_toolbelt_metadata-0.7.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+dapla_toolbelt_metadata-0.7.0.dist-info/RECORD,,

dapla_metadata/variable_definitions/_utils/descriptions.py

@@ -1,89 +0,0 @@
-"""Utilities for dynamically adding extra fields to Pydantic models, specifically Norwegian descriptions."""
-
-import logging
-from pathlib import Path
-from typing import TYPE_CHECKING
-from typing import cast
-
-import ruamel.yaml
-from pydantic import BaseModel
-from pydantic import Field
-
-from dapla_metadata.variable_definitions._utils.config import get_descriptions_path
-
-if TYPE_CHECKING:
-    from pydantic.config import JsonDict
-
-logger = logging.getLogger(__name__)
-
-
-def get_package_root() -> Path:
-    """Get an absolute Path to the root of the package (dapla_metadata)."""
-    number_of_directories_up_from_descriptions_file = 2
-    return (
-        Path(__file__)
-        .resolve()
-        .parents[number_of_directories_up_from_descriptions_file]
-    )
-
-
-def load_descriptions(file_path: Path) -> dict:
-    """Load and return the contents of a YAML file as a dictionary.
-
-    Args:
-        file_path (Path): Path to the YAML file.
-
-    Returns:
-    dict: Parsed contents of the YAML file.
-    """
-    with Path.open(file_path, encoding="utf-8") as f:
-        return ruamel.yaml.YAML().load(f)
-
-
-def apply_norwegian_descriptions_to_model(
-    model: type[BaseModel],
-) -> None:
-    """Add Norwegian descriptions to the fields of a Pydantic model.
-
-    This function globally modifies the model fields by inserting a Norwegian description
-    from a predefined dictionary. If a field does not have a corresponding
-    Norwegian description, a default message is used.
-
-    Args:
-        model (BaseModel): A Pydantic model instance to be updated.
-
-    Returns:
-        None: The function modifies the model in place.
-    """
-    new_fields = {}
-
-    descriptions = load_descriptions(
-        get_package_root() / get_descriptions_path(),
-    )
-
-    for field_name, field_info in model.model_fields.items():
-        new_description: str = descriptions.get(
-            field_name,
-            f"No description in norwegian found for {field_name}",
-        )
-        if "No description in norwegian found" in new_description:
-            logger.warning("Missing description for %s", field_name)
-        else:
-            logger.debug("Field %s: %s", field_name, new_description)
-
-        new_fields[field_name] = Field(  # type: ignore[call-overload]
-            default=field_info.default,
-            alias=field_info.alias,
-            title=field_info.title,
-            description=field_info.description,
-            json_schema_extra=cast(
-                "JsonDict",
-                {
-                    "norwegian_description": new_description,
-                    "annotation": field_info.annotation,
-                },
-            ),
-        )
-
-    model.model_fields.update(new_fields)  # Apply changes
-    model.model_rebuild()

dapla_metadata/variable_definitions/resources/vardef_model_descriptions_nb.yaml

@@ -1,109 +0,0 @@
-# --- Variabel definisjoner ---
-# ref: https://statistics-norway.atlassian.net/wiki/spaces/MPD/pages/3009839199/VarDef+-+Krav+til+dokumentasjon+av+variabler
-name: |
-  Variabelens navn. Dette skal ikke være en mer “teknisk” forkortelse, men et navn som er forståelig for mennesker.
-  -------------------------
-  >>> EKSEMPEL:
-  name:
-      nb: |-
-          Lønnsinntekter
-short_name: |
-  Dette er variabelens kortnavn, som kan være en mer “teknisk” forkortelse, f.eks. wlonn (kortnavnet til Lønnsinntekter). Kortnavnet til en variabel i Vardef skal være unikt.
-  Kravet til kortnavnet er at det kan inneholde a-z (kun små bokstaver), 0-9 og _ (understrek). Minimumslengden på kortnavnet er 2 tegn.
-  Bokstavene “æ”, “ø” og “å” kan ikke brukes. Disse anbefales erstattet med hhv. “ae”, “oe” og “aa"
-definition: |
-  En definisjon skal beskrive hva variabelen betyr og være så kort og presis som mulig. Mer utfyllende opplysninger kan legges i Merknad-feltet.
-  -------------------------
-  >>> EKSEMPEL:
-  definition:
-      nb: |-
-          Yrkesinntekter, kapitalinntekter, skattepliktige og skattefrie overføringer, i løpet av kalenderåret.
-classification_reference: |
-  ID av en klassifikasjon eller kodeliste fra KLASS som beskriver verdiene variabelen kan anta.
-  For eksempel vil variabelen 'Sivilstand' ha klassifikasjon 'Standard for sivilstand' (kan vises på https://www.ssb.no/klass/klassifikasjoner/19 ) som har ID 19.
-  -------------------------
-  >>> EKSEMPEL:
-  classification_reference: "19"
-unit_types: |
-  Enhetstyper - enhetene som beskrives av denne variabelen. Variabelen “sivilstand” vil f.eks. ha enhetstypen person,
-  mens f.eks. “Produsentpris for tjenester” vil ha både foretak og bedrift som enhetstyper siden variabelen kan beskrive begge.
-  Verdier skal være koder fra: https://www.ssb.no/klass/klassifikasjoner/702.
-  -------------------------
-  >>> EKSEMPEL:
-  unit_types:
-      - "20"
-subject_fields: |
-  Statistikkområder som variabelen brukes innenfor. For eksempel tilhører variabelen “Sivilstand” statistikkområdet “Befolkning”.
-  Verdier skal være koder fra https://www.ssb.no/klass/klassifikasjoner/618.
-  -------------------------
-  >>> EKSEMPEL:
-  subject_fields:
-      - "bf"
-      - "be"
-contains_special_categories_of_personal_data: |
-  Viser om variabelen inneholder spesielt sensitive personopplysninger.
-  -------------------------
-  >>> EKSEMPEL:
-  contains_special_categories_of_personal_data: true
-measurement_type: |
-  Måletype som en kvantitativ variabelen tilhører, f.eks.  valuta, areal osv.
-  Verdien skal være en kode fra: https://www.ssb.no/klass/klassifikasjoner/303
-  -------------------------
-  >>> EKSEMPEL:
-  measurement_type: "03"
-valid_from: |
-  Datoen variabeldefinisjonen er gyldig f.o.m.
-  -------------------------
-  >>> EKSEMPEL:
-  valid_from: 1999-01-30
-valid_until: |
-  Datoen variabeldefinisjonens var gyldig t.o.m. Settes hvis definisjonen skal erstattet av en ny definisjon (med en ny gyldighetsperiode), eller variabelen ikke lenger skal brukes.
-  -------------------------
-  >>> EKSEMPEL:
-  valid_until: 2024-10-23
-external_reference_uri:  |
-  En peker (URI) til ekstern definisjon/dokumentasjon, f.eks. ei webside som er relevant for variabelen.
-  -----------------------------------------------------
-  >>> EKSEMPEL:
-  external_reference_uri: "https://www.landbruksdirektoratet.com"
-comment: |
-  Her kan en sette inn eventuelle tilleggsopplysninger som ikke hører hjemme i selve definisjonen.
-  Variabelen “Landbakgrunn” har f.eks. merknaden “Fra og med 1.1.2003 ble definisjon endret til også å trekke inn besteforeldrenes fødeland”.
-  -----------------------------------------------------------------------------------------------
-  >>> EKSEMPEL:
-  comment:
-      nb: |-
-          Fra og med 1.1.2003 ble definisjon endret til også å trekke inn besteforeldrenes fødeland.
-related_variable_definition_uris: |
-  Her kan en legge inn URIer til andre variabler som er relevante. Eksempelvis er variabelen “Inntekt etter skatt” en beregnet variabel der  “Yrkesinntekter” og “Kapitalinntekter” inngår i beregningen.
-  En kan da legge inn deres URI-er i dette feltet.
-  -------------------------
-  >>> EKSEMPEL:
-  related_variable_definition_uris:
-      - "https://example.com/"
-contact: |
-  Her dokumenterer en navn og epost for person eller gruppe som kan svare på spørsmål.
-  -------------------------
-  >>> EKSEMPEL:
-  contact:
-      title:
-          nb: |-
-              Seksjonsleder
-      email: leder@ssb.no
-variable_status: |
-  Livssyklus for variabelen.
-id: |
-  Unik SSB identifikator for variabeldefinisjonen. Denne blir maskingenerert.
-  Variabeldefinisjoner med ulike gyldighetsperioder har samme ID (og samme kortnavn).
-patch_id: |
-  Løpenummer som identifiserer en patch, endring, for en variabeldefinisjon.
-owner: |
-  Eier av variabelen dvs. ansvarlig Dapla-team (statistikk-team) og informasjon om tilgangsstyringsgrupper. Team-tilhørighet settes automatisk til det samme som teamtilhørigheten til den som oppretter variabelen.
-created_at: |
-  Tidsstempelet da variabelen ble opprettet. Denne er maskingenerert.
-created_by: |
-  Personen som har opprettet variabelen. Dette er maskingenerert.
-last_updated_at: |
-  Tidsstempelet da variabelen sist ble oppdatert. Denne er maskingenerert.
-last_updated_by: |
-  Personen som sist utførte en endring i variabelen. Denne er maskingenerert.