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

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/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.8.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.8
+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.8.dist-info → dapla_toolbelt_metadata-0.9.9.dist-info}/RECORD

@@ -6,9 +6,9 @@ dapla_metadata/_shared/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 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
@@ -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.8.dist-info/METADATA,sha256=jBwnT3Vs5w-JIXTjzcMDmzhDr8XPlkkdU24zxTNaz4w,4854
-dapla_toolbelt_metadata-0.9.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dapla_toolbelt_metadata-0.9.8.dist-info/licenses/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
-dapla_toolbelt_metadata-0.9.8.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,,