pysdmx 1.10.0rc1__py3-none-any.whl → 1.10.0rc2__py3-none-any.whl

pysdmx/io/json/sdmxjson2/messages/dsd.py

@@ -265,12 +265,17 @@ class JsonAttribute(Struct, frozen=True, omit_defaults=True):
             attribute.attachment_level  # type: ignore[arg-type]
         )
         repr = _get_json_representation(attribute)
+        # The line below will need to be changed when we work on
+        # Measure Relationship (cf. issue #467)
+        mr = ["OBS_VALUE"] if attribute.attachment_level == "O" else None
+
         return JsonAttribute(
             id=attribute.id,
             conceptIdentity=concept,
             attributeRelationship=level,
             usage=usage,
             localRepresentation=repr,
+            measureRelationship=mr,
         )
 
 
@@ -447,19 +452,42 @@ class JsonComponents(Struct, frozen=True, omit_defaults=True):
         enums = [cl.to_model() for cl in cls]
         enums.extend([vl.to_model() for vl in vls])
         comps = []
-        if constraints and constraints[0].cubeRegions:
-            cons = constraints[0].cubeRegions[0].to_map()
+        if constraints:
+            incl_cubes = []
+            for const in constraints:
+                incl_cubes.extend(
+                    [cr for cr in (const.cubeRegions or []) if cr.include]
+                )
+            if len(incl_cubes) == 1:
+                cons = {
+                    kv.id: [v.value for v in kv.values]
+                    for kv in incl_cubes[0].keyValues
+                }
+            else:
+                cons = {}
         else:
             cons = {}
-        comps.extend(self.dimensionList.to_model(cs, enums, cons))
+        comps.extend(
+            self.dimensionList.to_model(
+                cs,
+                enums,
+                cons,  # type: ignore[arg-type]
+            )
+        )
         if self.measureList:
-            comps.extend(self.measureList.to_model(cs, enums, cons))
+            comps.extend(
+                self.measureList.to_model(
+                    cs,
+                    enums,
+                    cons,  # type: ignore[arg-type]
+                )
+            )
         if self.attributeList:
             comps.extend(
                 self.attributeList.to_model(
                     cs,
                     enums,
-                    cons,
+                    cons,  # type: ignore[arg-type]
                     self.groups,
                 )
             )
@@ -556,7 +584,7 @@ class JsonDataStructures(Struct, frozen=True, omit_defaults=True):
     conceptSchemes: Sequence[JsonConceptScheme] = ()
     valuelists: Sequence[JsonValuelist] = ()
     codelists: Sequence[JsonCodelist] = ()
-    contentConstraints: Sequence[JsonDataConstraint] = ()
+    dataConstraints: Sequence[JsonDataConstraint] = ()
 
     def to_model(self) -> Sequence[DataStructureDefinition]:
         """Returns the requested dsds."""
@@ -565,7 +593,7 @@ class JsonDataStructures(Struct, frozen=True, omit_defaults=True):
                 self.conceptSchemes,
                 self.codelists,
                 self.valuelists,
-                self.contentConstraints,
+                self.dataConstraints,
             )
             for dsd in self.dataStructures
         ]

pysdmx/io/json/sdmxjson2/messages/map.py

@@ -87,19 +87,20 @@ class JsonRepresentationMapping(Struct, frozen=True, omit_defaults=True):
         self, vm: Union[MultiValueMap, ValueMap]
     ) -> "JsonRepresentationMapping":
         """Converts a value map to an SDMX-JSON JsonRepresentationMapping."""
+        fmt = r"%Y-%m-%dT%H:%M:%S"
         if isinstance(vm, ValueMap):
             return JsonRepresentationMapping(
                 [JsonSourceValue.from_model(vm.source)],
                 [vm.target],
-                vm.valid_from.strftime("%Y-%m-%d") if vm.valid_from else None,
-                vm.valid_to.strftime("%Y-%m-%d") if vm.valid_to else None,
+                vm.valid_from.strftime(fmt) if vm.valid_from else None,
+                vm.valid_to.strftime(fmt) if vm.valid_to else None,
             )
         else:
             return JsonRepresentationMapping(
                 [JsonSourceValue.from_model(s) for s in vm.source],
                 vm.target,
-                vm.valid_from.strftime("%Y-%m-%d") if vm.valid_from else None,
-                vm.valid_to.strftime("%Y-%m-%d") if vm.valid_to else None,
+                vm.valid_from.strftime(fmt) if vm.valid_from else None,
+                vm.valid_to.strftime(fmt) if vm.valid_to else None,
             )
 
 

pysdmx/io/json/sdmxjson2/messages/metadataflow.py

@@ -65,6 +65,7 @@ class JsonMetadataflow(MaintainableType, frozen=True, omit_defaults=True):
                 [JsonAnnotation.from_model(a) for a in df.annotations]
             ),
             structure=dsdref,
+            targets=df.targets,  # type: ignore[arg-type]
         )
 
 

pysdmx/io/json/sdmxjson2/messages/msd.py

@@ -15,7 +15,6 @@ from pysdmx.io.json.sdmxjson2.messages.core import (
 from pysdmx.io.json.sdmxjson2.messages.dsd import (
     _find_concept,
     _get_concept_reference,
-    _get_json_representation,
     _get_representation,
 )
 from pysdmx.model import (
@@ -28,6 +27,13 @@ from pysdmx.model import (
 from pysdmx.util import parse_item_urn
 
 
+def _get_attr_repr(comp: MetadataComponent) -> Optional[JsonRepresentation]:
+    enum = comp.local_enum_ref if comp.local_enum_ref else None
+    return JsonRepresentation.from_model(
+        comp.local_dtype, enum, comp.local_facets, None
+    )
+
+
 class JsonMetadataAttribute(Struct, frozen=True, omit_defaults=True):
     """SDMX-JSON payload for an attribute."""
 
@@ -80,11 +86,13 @@ class JsonMetadataAttribute(Struct, frozen=True, omit_defaults=True):
     def from_model(self, cmp: MetadataComponent) -> "JsonMetadataAttribute":
         """Converts a pysdmx metadata attribute to an SDMX-JSON one."""
         concept = _get_concept_reference(cmp)
-        repr = _get_json_representation(cmp)
+        repr = _get_attr_repr(cmp)
 
         min_occurs = cmp.array_def.min_size if cmp.array_def else 0
-        if cmp.array_def is None or cmp.array_def.max_size is None:
-            max_occurs: Union[int, Literal["unbounded"]] = "unbounded"
+        if cmp.array_def is None:
+            max_occurs: Union[int, Literal["unbounded"]] = 1
+        elif cmp.array_def.max_size is None:
+            max_occurs = "unbounded"
         else:
             max_occurs = cmp.array_def.max_size
 
@@ -95,9 +103,9 @@ class JsonMetadataAttribute(Struct, frozen=True, omit_defaults=True):
             minOccurs=min_occurs,
             maxOccurs=max_occurs,
             isPresentational=cmp.is_presentational,
-            metadataAttributes=[
-                JsonMetadataAttribute.from_model(c) for c in cmp.components
-            ],
+            metadataAttributes=tuple(
+                [JsonMetadataAttribute.from_model(c) for c in cmp.components]
+            ),
         )
 
 
@@ -119,9 +127,9 @@ class JsonMetadataAttributes(Struct, frozen=True, omit_defaults=True):
     ) -> "JsonMetadataAttributes":
         """Converts a pysdmx list of metadata attributes to SDMX-JSON."""
         return JsonMetadataAttributes(
-            metadataAttributes=[
-                JsonMetadataAttribute.from_model(a) for a in attributes
-            ]
+            metadataAttributes=tuple(
+                [JsonMetadataAttribute.from_model(a) for a in attributes]
+            )
         )
 
 

pysdmx/io/json/sdmxjson2/messages/schema.py

@@ -21,7 +21,7 @@ class JsonSchemas(msgspec.Struct, frozen=True, omit_defaults=True):
     dataStructures: Sequence[JsonDataStructure]
     valuelists: Sequence[JsonValuelist] = ()
     codelists: Sequence[JsonCodelist] = ()
-    contentConstraints: Sequence[JsonDataConstraint] = ()
+    dataConstraints: Sequence[JsonDataConstraint] = ()
 
     def to_model(
         self,
@@ -32,7 +32,7 @@ class JsonSchemas(msgspec.Struct, frozen=True, omit_defaults=True):
             self.conceptSchemes,
             self.codelists,
             self.valuelists,
-            self.contentConstraints,
+            self.dataConstraints,
         )
         return comps, grps  # type: ignore[return-value]
 

pysdmx/io/json/sdmxjson2/messages/structure.py

@@ -17,6 +17,7 @@ from pysdmx.io.json.sdmxjson2.messages.code import (
     JsonValuelist,
 )
 from pysdmx.io.json.sdmxjson2.messages.concept import JsonConceptScheme
+from pysdmx.io.json.sdmxjson2.messages.constraint import JsonDataConstraint
 from pysdmx.io.json.sdmxjson2.messages.core import JsonHeader
 from pysdmx.io.json.sdmxjson2.messages.dataflow import JsonDataflow
 from pysdmx.io.json.sdmxjson2.messages.dsd import JsonDataStructure
@@ -49,90 +50,95 @@ from pysdmx.model.message import StructureMessage
 class JsonStructures(Struct, frozen=True, omit_defaults=True):
     """The allowed strutures."""
 
-    dataStructures: Sequence[JsonDataStructure] = ()
+    agencySchemes: Sequence[JsonAgencyScheme] = ()
+    categorisations: Sequence[JsonCategorisation] = ()
     categorySchemes: Sequence[JsonCategoryScheme] = ()
-    conceptSchemes: Sequence[JsonConceptScheme] = ()
     codelists: Sequence[JsonCodelist] = ()
-    valueLists: Sequence[JsonValuelist] = ()
+    conceptSchemes: Sequence[JsonConceptScheme] = ()
+    customTypeSchemes: Sequence[JsonCustomTypeScheme] = ()
+    dataConstraints: Sequence[JsonDataConstraint] = ()
+    dataflows: Sequence[JsonDataflow] = ()
+    dataProviderSchemes: Sequence[JsonDataProviderScheme] = ()
+    dataStructures: Sequence[JsonDataStructure] = ()
     hierarchies: Sequence[JsonHierarchy] = ()
     hierarchyAssociations: Sequence[JsonHierarchyAssociation] = ()
-    agencySchemes: Sequence[JsonAgencyScheme] = ()
-    dataProviderSchemes: Sequence[JsonDataProviderScheme] = ()
-    metadataProviderSchemes: Sequence[JsonMetadataProviderScheme] = ()
-    dataflows: Sequence[JsonDataflow] = ()
-    provisionAgreements: Sequence[JsonProvisionAgreement] = ()
     metadataflows: Sequence[JsonMetadataflow] = ()
+    metadataProviderSchemes: Sequence[JsonMetadataProviderScheme] = ()
     metadataProvisionAgreements: Sequence[JsonMetadataProvisionAgreement] = ()
     metadataStructures: Sequence[JsonMetadataStructure] = ()
-    structureMaps: Sequence[JsonStructureMap] = ()
-    representationMaps: Sequence[JsonRepresentationMap] = ()
-    categorisations: Sequence[JsonCategorisation] = ()
-    customTypeSchemes: Sequence[JsonCustomTypeScheme] = ()
-    vtlMappingSchemes: Sequence[JsonVtlMappingScheme] = ()
     namePersonalisationSchemes: Sequence[JsonNamePersonalisationScheme] = ()
+    provisionAgreements: Sequence[JsonProvisionAgreement] = ()
+    representationMaps: Sequence[JsonRepresentationMap] = ()
     rulesetSchemes: Sequence[JsonRulesetScheme] = ()
+    structureMaps: Sequence[JsonStructureMap] = ()
     transformationSchemes: Sequence[JsonTransformationScheme] = ()
     userDefinedOperatorSchemes: Sequence[JsonUserDefinedOperatorScheme] = ()
+    valueLists: Sequence[JsonValuelist] = ()
+    vtlMappingSchemes: Sequence[JsonVtlMappingScheme] = ()
 
     def to_model(self) -> Sequence[MaintainableArtefact]:
         """Map to pysdmx artefacts."""
         structures = []  # type: ignore[var-annotated]
         structures.extend(
-            i.to_model(
-                self.conceptSchemes, self.codelists, self.valueLists, ()
-            )
-            for i in self.dataStructures
+            i.to_model(self.dataflows) for i in self.agencySchemes
         )
+        structures.extend(i.to_model() for i in self.categorisations)
         structures.extend(i.to_model() for i in self.categorySchemes)
-        structures.extend(
-            i.to_model(self.codelists) for i in self.conceptSchemes
-        )
         structures.extend(i.to_model() for i in self.codelists)
-        structures.extend(i.to_model() for i in self.valueLists)
-        structures.extend(i.to_model(self.codelists) for i in self.hierarchies)
         structures.extend(
-            i.to_model(self.hierarchies, self.codelists)
-            for i in self.hierarchyAssociations
+            i.to_model(self.codelists) for i in self.conceptSchemes
         )
+        structures.extend(i.to_model() for i in self.customTypeSchemes)
+        structures.extend(i.to_model() for i in self.dataConstraints)
         structures.extend(
-            i.to_model(self.dataflows) for i in self.agencySchemes
+            i.to_model(
+                self.dataStructures,
+                self.conceptSchemes,
+                self.valueLists,
+                self.codelists,
+            )
+            for i in self.dataflows
         )
         structures.extend(
             i.to_model(self.provisionAgreements)
             for i in self.dataProviderSchemes
         )
+        structures.extend(
+            i.to_model(
+                self.conceptSchemes, self.codelists, self.valueLists, ()
+            )
+            for i in self.dataStructures
+        )
+        structures.extend(i.to_model(self.codelists) for i in self.hierarchies)
+        structures.extend(
+            i.to_model(self.hierarchies, self.codelists)
+            for i in self.hierarchyAssociations
+        )
+
+        structures.extend(i.to_model() for i in self.metadataflows)
         structures.extend(
             i.to_model(self.metadataProvisionAgreements)
             for i in self.metadataProviderSchemes
         )
+        structures.extend(
+            i.to_model() for i in self.metadataProvisionAgreements
+        )
         structures.extend(
             i.to_model(self.conceptSchemes, self.codelists, self.valueLists)
             for i in self.metadataStructures
         )
         structures.extend(
-            i.to_model(
-                self.dataStructures,
-                self.conceptSchemes,
-                self.valueLists,
-                self.codelists,
-            )
-            for i in self.dataflows
+            i.to_model() for i in self.namePersonalisationSchemes
         )
         structures.extend(i.to_model() for i in self.provisionAgreements)
-        structures.extend(i.to_model() for i in self.metadataflows)
         structures.extend(
-            i.to_model() for i in self.metadataProvisionAgreements
+            i.to_model(bool(len(i.source) > 1 or len(i.target) > 1))
+            for i in self.representationMaps
         )
+        structures.extend(i.to_model() for i in self.rulesetSchemes)
         structures.extend(
             i.to_model(self.representationMaps) for i in self.structureMaps
         )
-        structures.extend(i.to_model() for i in self.categorisations)
-        structures.extend(i.to_model() for i in self.customTypeSchemes)
-        structures.extend(i.to_model() for i in self.vtlMappingSchemes)
-        structures.extend(
-            i.to_model() for i in self.namePersonalisationSchemes
-        )
-        structures.extend(i.to_model() for i in self.rulesetSchemes)
         structures.extend(
             i.to_model(
                 self.customTypeSchemes,
@@ -146,9 +152,8 @@ class JsonStructures(Struct, frozen=True, omit_defaults=True):
         structures.extend(
             i.to_model() for i in self.userDefinedOperatorSchemes
         )
-        for rm in self.representationMaps:
-            multi = bool(len(rm.source) > 1 or len(rm.target) > 1)
-            structures.append(rm.to_model(multi))
+        structures.extend(i.to_model() for i in self.valueLists)
+        structures.extend(i.to_model() for i in self.vtlMappingSchemes)
         return structures
 
     @classmethod
@@ -264,6 +269,33 @@ class JsonStructures(Struct, frozen=True, omit_defaults=True):
         hierarchies = tuple(
             [JsonHierarchy.from_model(h) for h in msg.get_hierarchies()]
         )
+        constraints = tuple(
+            [
+                JsonDataConstraint.from_model(c)
+                for c in msg.get_data_constraints()
+            ]
+        )
+        mpas = tuple(
+            [
+                JsonMetadataProvisionAgreement.from_model(c)
+                for c in msg.get_metadata_provision_agreements()
+            ]
+        )
+        mprvs = tuple(
+            [
+                JsonMetadataProviderScheme.from_model(c)
+                for c in msg.get_metadata_provider_schemes()
+            ]
+        )
+        mdfs = tuple(
+            [JsonMetadataflow.from_model(c) for c in msg.get_metadataflows()]
+        )
+        msds = tuple(
+            [
+                JsonMetadataStructure.from_model(c)
+                for c in msg.get_metadata_structures()
+            ]
+        )
         return JsonStructures(
             agencySchemes=agencies,
             categorisations=categorisations,
@@ -271,11 +303,16 @@ class JsonStructures(Struct, frozen=True, omit_defaults=True):
             codelists=codelists,
             conceptSchemes=concept_schemes,
             customTypeSchemes=custom_types,
+            dataConstraints=constraints,
             dataflows=dataflows,
             dataProviderSchemes=data_providers,
             dataStructures=data_structures,
             hierarchies=hierarchies,
             hierarchyAssociations=hier_associations,
+            metadataflows=mdfs,
+            metadataProviderSchemes=mprvs,
+            metadataProvisionAgreements=mpas,
+            metadataStructures=msds,
             namePersonalisationSchemes=name_personalisations,
             provisionAgreements=agreements,
             representationMaps=representations_maps,

pysdmx/io/json/sdmxjson2/messages/vtl.py

@@ -1,6 +1,6 @@
 """Collection of SDMX-JSON schemas for VTL artefacts."""
 
-from typing import Literal, Optional, Sequence
+from typing import Dict, Literal, Optional, Sequence
 
 from msgspec import Struct
 
@@ -506,33 +506,37 @@ class JsonRulesetScheme(ItemSchemeType, frozen=True, omit_defaults=True):
 class JsonToVtlMapping(Struct, frozen=True, omit_defaults=True):
     """SDMX-JSON payload for To VTL mappings."""
 
-    toVtlSubSpace: Sequence[str]
-    type: Optional[str] = None
+    toVtlSubSpace: Dict[str, Sequence[str]]
+    method: Optional[str] = None
 
     def to_model(self) -> ToVtlMapping:
         """Converts deserialized class to pysdmx model class."""
-        return ToVtlMapping(self.toVtlSubSpace, self.type)
+        return ToVtlMapping(self.toVtlSubSpace["keys"], self.method)
 
     @classmethod
     def from_model(cls, mapping: ToVtlMapping) -> "JsonToVtlMapping":
         """Converts a pysdmx "to VTL" mapping to an SDMX-JSON one."""
-        return JsonToVtlMapping(mapping.to_vtl_sub_space, mapping.method)
+        return JsonToVtlMapping(
+            {"keys": mapping.to_vtl_sub_space}, mapping.method
+        )
 
 
 class JsonFromVtlMapping(Struct, frozen=True, omit_defaults=True):
     """SDMX-JSON payload for from VTL mappings."""
 
-    fromVtlSuperSpace: Sequence[str]
-    type: Optional[str] = None
+    fromVtlSuperSpace: Dict[str, Sequence[str]]
+    method: Optional[str] = None
 
     def to_model(self) -> FromVtlMapping:
         """Converts deserialized class to pysdmx model class."""
-        return FromVtlMapping(self.fromVtlSuperSpace, self.type)
+        return FromVtlMapping(self.fromVtlSuperSpace["keys"], self.method)
 
     @classmethod
     def from_model(cls, mapping: FromVtlMapping) -> "JsonFromVtlMapping":
         """Converts a pysdmx "from VTL" mapping to an SDMX-JSON one."""
-        return JsonFromVtlMapping(mapping.from_vtl_sub_space, mapping.method)
+        return JsonFromVtlMapping(
+            {"keys": mapping.from_vtl_sub_space}, mapping.method
+        )
 
 
 class JsonVtlMapping(NameableType, frozen=True, omit_defaults=True):

pysdmx/io/xml/__write_data_aux.py

@@ -42,20 +42,31 @@ def check_dimension_at_observation(
     return dimension_at_observation
 
 
-def writing_validation(dataset: PandasDataset) -> None:
-    """Structural validation of the dataset."""
+def writing_validation(dataset: PandasDataset) -> Schema:
+    """Structural validation of the dataset.
+
+    Args:
+        dataset: The dataset to validate.
+
+    Returns:
+        The `Schema` from the dataset.
+
+    Raises:
+        Invalid: If the structure is not a `Schema` or validation fails.
+    """
     if not isinstance(dataset.structure, Schema):
         raise Invalid(
             "Dataset Structure is not a Schema. Cannot perform operation."
         )
+    schema = dataset.structure
     required_components = [
         comp.id
-        for comp in dataset.structure.components
+        for comp in schema.components
         if comp.role in (Role.DIMENSION, Role.MEASURE)
     ]
     required_components.extend(
         att.id
-        for att in dataset.structure.components.attributes
+        for att in schema.components.attributes
         if (
             att.required
             and att.attachment_level is not None
@@ -64,7 +75,7 @@ def writing_validation(dataset: PandasDataset) -> None:
     )
     non_required = [
         comp.id
-        for comp in dataset.structure.components
+        for comp in schema.components
         if comp.id not in required_components
     ]
     # Columns match components
@@ -80,9 +91,11 @@ def writing_validation(dataset: PandasDataset) -> None:
             f"Difference: {', '.join(difference)}"
         )
     # Check if the dataset has at least one dimension and one measure
-    if not dataset.structure.components.dimensions:
+    if not schema.components.dimensions:
         raise Invalid(
             "The dataset structure must have at least one dimension."
         )
-    if not dataset.structure.components.measures:
+    if not schema.components.measures:
         raise Invalid("The dataset structure must have at least one measure.")
+
+    return schema