pysdmx 1.10.0__tar.gz → 1.10.0rc1__tar.gz

{pysdmx-1.10.0 → pysdmx-1.10.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pysdmx
-Version: 1.10.0
+Version: 1.10.0rc1
 Summary: Your opinionated Python SDMX library
 License: Apache-2.0
 License-File: LICENSE

{pysdmx-1.10.0 → pysdmx-1.10.0rc1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pysdmx"
-version = "1.10.0"
+version = "1.10.0rc1"
 description = "Your opinionated Python SDMX library"
 license = { text = "Apache-2.0" }
 readme = "README.rst"

{pysdmx-1.10.0 → pysdmx-1.10.0rc1}/src/pysdmx/__init__.py

@@ -1,3 +1,3 @@
 """Your opinionated Python SDMX library."""
 
-__version__ = "1.10.0"
+__version__ = "1.10.0rc1"

{pysdmx-1.10.0 → pysdmx-1.10.0rc1}/src/pysdmx/api/fmr/__init__.py

@@ -44,7 +44,6 @@ from pysdmx.model import (
     Metadataflow,
     MetadataProvisionAgreement,
     MetadataReport,
-    MetadataStructure,
     MultiRepresentationMap,
     ProvisionAgreement,
     RepresentationMap,
@@ -768,7 +767,7 @@ class RegistryClient(__BaseRegistryClient):
         agency: str = "*",
         id: str = "*",
         version: str = "+",
-    ) -> Sequence[MetadataStructure]:
+    ) -> Sequence[Dataflow]:
         """Get the metadata structures (MSD) matching the supplied parameters.
 
         Args:
@@ -1342,7 +1341,7 @@ class AsyncRegistryClient(__BaseRegistryClient):
         agency: str = "*",
         id: str = "*",
         version: str = "+",
-    ) -> Sequence[MetadataStructure]:
+    ) -> Sequence[Dataflow]:
         """Get the metadata structures (MSD) matching the supplied parameters.
 
         Args:

{pysdmx-1.10.0 → pysdmx-1.10.0rc1}/src/pysdmx/io/json/sdmxjson2/messages/__init__.py

@@ -12,9 +12,6 @@ from pysdmx.io.json.sdmxjson2.messages.code import (
     JsonHierarchyMessage,
 )
 from pysdmx.io.json.sdmxjson2.messages.concept import JsonConceptSchemeMessage
-from pysdmx.io.json.sdmxjson2.messages.constraint import (
-    JsonDataConstraintMessage,
-)
 from pysdmx.io.json.sdmxjson2.messages.dataflow import (
     JsonDataflowMessage,
     JsonDataflowsMessage,
@@ -53,7 +50,6 @@ __all__ = [
     "JsonCategorySchemeMessage",
     "JsonCodelistMessage",
     "JsonConceptSchemeMessage",
-    "JsonDataConstraintMessage",
     "JsonDataflowMessage",
     "JsonDataflowsMessage",
     "JsonDataStructuresMessage",

{pysdmx-1.10.0 → pysdmx-1.10.0rc1}/src/pysdmx/io/json/sdmxjson2/messages/code.py

@@ -231,7 +231,7 @@ class JsonCodelists(Struct, frozen=True, omit_defaults=True):
     """SDMX-JSON payload for lists of codes."""
 
     codelists: Sequence[JsonCodelist] = ()
-    valueLists: Sequence[JsonValuelist] = ()
+    valuelists: Sequence[JsonValuelist] = ()
 
 
 class JsonCodelistMessage(Struct, frozen=True, omit_defaults=True):
@@ -244,7 +244,7 @@ class JsonCodelistMessage(Struct, frozen=True, omit_defaults=True):
         if self.data.codelists:
             return self.data.codelists[0].to_model()
         else:
-            return self.data.valueLists[0].to_model()
+            return self.data.valuelists[0].to_model()
 
 
 class JsonHierarchicalCode(Struct, frozen=True, omit_defaults=True):
@@ -329,10 +329,10 @@ class JsonHierarchicalCode(Struct, frozen=True, omit_defaults=True):
             code=code.urn,
             validFrom=code.rel_valid_from,
             validTo=code.rel_valid_to,
-            annotations=tuple(annotations) if annotations else None,
-            hierarchicalCodes=tuple(
-                [JsonHierarchicalCode.from_model(c) for c in code.codes]
-            ),
+            annotations=tuple(annotations),
+            hierarchicalCodes=[
+                JsonHierarchicalCode.from_model(c) for c in code.codes
+            ],
         )
 
 
@@ -475,15 +475,6 @@ class JsonHierarchyAssociation(
                 "SDMX-JSON hierarchy associations must reference a context",
                 {"hierarchy_association": ha.id},
             )
-        lnk = (
-            JsonLink(
-                rel="UserDefinedOperator",
-                type="sdmx_artefact",
-                urn=ha.operator,
-            )
-            if ha.operator
-            else None
-        )
         return JsonHierarchyAssociation(
             agency=(
                 ha.agency.id if isinstance(ha.agency, Agency) else ha.agency
@@ -501,7 +492,6 @@ class JsonHierarchyAssociation(
             linkedHierarchy=href,
             linkedObject=ha.component_ref,
             contextObject=ha.context_ref,
-            links=[lnk] if lnk else (),
         )
 
 

pysdmx-1.10.0rc1/src/pysdmx/io/json/sdmxjson2/messages/constraint.py

@@ -0,0 +1,53 @@
+"""Collection of SDMX-JSON schemas for content constraints."""
+
+from typing import Dict, Literal, Optional, Sequence
+
+from msgspec import Struct
+
+from pysdmx.io.json.sdmxjson2.messages.core import MaintainableType
+
+
+class JsonValue(Struct, frozen=True, omit_defaults=True):
+    """SDMX-JSON payload for an allowed value."""
+
+    value: str
+
+
+class JsonKeyValue(Struct, frozen=True, omit_defaults=True):
+    """SDMX-JSON payload for the list of allowed values per component."""
+
+    id: str
+    values: Sequence[JsonValue]
+
+    def to_model(self) -> Sequence[str]:
+        """Returns the requested list of values."""
+        return [v.value for v in self.values]
+
+
+class JsonCubeRegion(Struct, frozen=True, omit_defaults=True):
+    """SDMX-JSON payload for a cube region."""
+
+    keyValues: Sequence[JsonKeyValue]
+
+    def to_map(self) -> Dict[str, Sequence[str]]:
+        """Gets the list of allowed values for a component."""
+        return {kv.id: kv.to_model() for kv in self.keyValues}
+
+
+class JsonConstraintAttachment(Struct, frozen=True, omit_defaults=True):
+    """SDMX-JSON payload for a constraint attachment."""
+
+    dataProvider: Optional[str]
+    simpleDataSources: Optional[Sequence[str]] = None
+    dataStructures: Optional[Sequence[str]] = None
+    dataflows: Optional[Sequence[str]] = None
+    provisionAgreements: Optional[Sequence[str]] = None
+    queryableDataSources: Optional[Sequence[str]] = None
+
+
+class JsonDataConstraint(MaintainableType, frozen=True, omit_defaults=True):
+    """SDMX-JSON payload for a content constraint."""
+
+    role: Optional[Literal["Allowed", "Actual"]] = None
+    constraintAttachment: Optional[JsonConstraintAttachment] = None
+    cubeRegions: Optional[Sequence[JsonCubeRegion]] = None

{pysdmx-1.10.0 → pysdmx-1.10.0rc1}/src/pysdmx/io/json/sdmxjson2/messages/dsd.py

@@ -265,17 +265,12 @@ 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,
         )
 
 
@@ -452,42 +447,19 @@ 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:
-            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 = {}
+        if constraints and constraints[0].cubeRegions:
+            cons = constraints[0].cubeRegions[0].to_map()
         else:
             cons = {}
-        comps.extend(
-            self.dimensionList.to_model(
-                cs,
-                enums,
-                cons,  # type: ignore[arg-type]
-            )
-        )
+        comps.extend(self.dimensionList.to_model(cs, enums, cons))
         if self.measureList:
-            comps.extend(
-                self.measureList.to_model(
-                    cs,
-                    enums,
-                    cons,  # type: ignore[arg-type]
-                )
-            )
+            comps.extend(self.measureList.to_model(cs, enums, cons))
         if self.attributeList:
             comps.extend(
                 self.attributeList.to_model(
                     cs,
                     enums,
-                    cons,  # type: ignore[arg-type]
+                    cons,
                     self.groups,
                 )
             )
@@ -584,7 +556,7 @@ class JsonDataStructures(Struct, frozen=True, omit_defaults=True):
     conceptSchemes: Sequence[JsonConceptScheme] = ()
     valuelists: Sequence[JsonValuelist] = ()
     codelists: Sequence[JsonCodelist] = ()
-    dataConstraints: Sequence[JsonDataConstraint] = ()
+    contentConstraints: Sequence[JsonDataConstraint] = ()
 
     def to_model(self) -> Sequence[DataStructureDefinition]:
         """Returns the requested dsds."""
@@ -593,7 +565,7 @@ class JsonDataStructures(Struct, frozen=True, omit_defaults=True):
                 self.conceptSchemes,
                 self.codelists,
                 self.valuelists,
-                self.dataConstraints,
+                self.contentConstraints,
             )
             for dsd in self.dataStructures
         ]

{pysdmx-1.10.0 → pysdmx-1.10.0rc1}/src/pysdmx/io/json/sdmxjson2/messages/map.py

@@ -87,20 +87,19 @@ 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(fmt) if vm.valid_from else None,
-                vm.valid_to.strftime(fmt) if vm.valid_to else None,
+                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,
             )
         else:
             return JsonRepresentationMapping(
                 [JsonSourceValue.from_model(s) for s in vm.source],
                 vm.target,
-                vm.valid_from.strftime(fmt) if vm.valid_from else None,
-                vm.valid_to.strftime(fmt) if vm.valid_to else None,
+                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,
             )
 
 

{pysdmx-1.10.0 → pysdmx-1.10.0rc1}/src/pysdmx/io/json/sdmxjson2/messages/metadataflow.py

@@ -65,7 +65,6 @@ 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-1.10.0 → pysdmx-1.10.0rc1}/src/pysdmx/io/json/sdmxjson2/messages/msd.py

@@ -15,6 +15,7 @@ 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 (
@@ -27,13 +28,6 @@ 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."""
 
@@ -86,13 +80,11 @@ 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_attr_repr(cmp)
+        repr = _get_json_representation(cmp)
 
         min_occurs = cmp.array_def.min_size if cmp.array_def else 0
-        if cmp.array_def is None:
-            max_occurs: Union[int, Literal["unbounded"]] = 1
-        elif cmp.array_def.max_size is None:
-            max_occurs = "unbounded"
+        if cmp.array_def is None or cmp.array_def.max_size is None:
+            max_occurs: Union[int, Literal["unbounded"]] = "unbounded"
         else:
             max_occurs = cmp.array_def.max_size
 
@@ -103,9 +95,9 @@ class JsonMetadataAttribute(Struct, frozen=True, omit_defaults=True):
             minOccurs=min_occurs,
             maxOccurs=max_occurs,
             isPresentational=cmp.is_presentational,
-            metadataAttributes=tuple(
-                [JsonMetadataAttribute.from_model(c) for c in cmp.components]
-            ),
+            metadataAttributes=[
+                JsonMetadataAttribute.from_model(c) for c in cmp.components
+            ],
         )
 
 
@@ -127,9 +119,9 @@ class JsonMetadataAttributes(Struct, frozen=True, omit_defaults=True):
     ) -> "JsonMetadataAttributes":
         """Converts a pysdmx list of metadata attributes to SDMX-JSON."""
         return JsonMetadataAttributes(
-            metadataAttributes=tuple(
-                [JsonMetadataAttribute.from_model(a) for a in attributes]
-            )
+            metadataAttributes=[
+                JsonMetadataAttribute.from_model(a) for a in attributes
+            ]
         )
 
 

{pysdmx-1.10.0 → pysdmx-1.10.0rc1}/src/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] = ()
-    dataConstraints: Sequence[JsonDataConstraint] = ()
+    contentConstraints: 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.dataConstraints,
+            self.contentConstraints,
         )
         return comps, grps  # type: ignore[return-value]
 

{pysdmx-1.10.0 → pysdmx-1.10.0rc1}/src/pysdmx/io/json/sdmxjson2/messages/structure.py

@@ -17,7 +17,6 @@ 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
@@ -50,95 +49,90 @@ from pysdmx.model.message import StructureMessage
 class JsonStructures(Struct, frozen=True, omit_defaults=True):
     """The allowed strutures."""
 
-    agencySchemes: Sequence[JsonAgencyScheme] = ()
-    categorisations: Sequence[JsonCategorisation] = ()
+    dataStructures: Sequence[JsonDataStructure] = ()
     categorySchemes: Sequence[JsonCategoryScheme] = ()
-    codelists: Sequence[JsonCodelist] = ()
     conceptSchemes: Sequence[JsonConceptScheme] = ()
-    customTypeSchemes: Sequence[JsonCustomTypeScheme] = ()
-    dataConstraints: Sequence[JsonDataConstraint] = ()
-    dataflows: Sequence[JsonDataflow] = ()
-    dataProviderSchemes: Sequence[JsonDataProviderScheme] = ()
-    dataStructures: Sequence[JsonDataStructure] = ()
+    codelists: Sequence[JsonCodelist] = ()
+    valueLists: Sequence[JsonValuelist] = ()
     hierarchies: Sequence[JsonHierarchy] = ()
     hierarchyAssociations: Sequence[JsonHierarchyAssociation] = ()
-    metadataflows: Sequence[JsonMetadataflow] = ()
+    agencySchemes: Sequence[JsonAgencyScheme] = ()
+    dataProviderSchemes: Sequence[JsonDataProviderScheme] = ()
     metadataProviderSchemes: Sequence[JsonMetadataProviderScheme] = ()
+    dataflows: Sequence[JsonDataflow] = ()
+    provisionAgreements: Sequence[JsonProvisionAgreement] = ()
+    metadataflows: Sequence[JsonMetadataflow] = ()
     metadataProvisionAgreements: Sequence[JsonMetadataProvisionAgreement] = ()
     metadataStructures: Sequence[JsonMetadataStructure] = ()
-    namePersonalisationSchemes: Sequence[JsonNamePersonalisationScheme] = ()
-    provisionAgreements: Sequence[JsonProvisionAgreement] = ()
+    structureMaps: Sequence[JsonStructureMap] = ()
     representationMaps: Sequence[JsonRepresentationMap] = ()
+    categorisations: Sequence[JsonCategorisation] = ()
+    customTypeSchemes: Sequence[JsonCustomTypeScheme] = ()
+    vtlMappingSchemes: Sequence[JsonVtlMappingScheme] = ()
+    namePersonalisationSchemes: Sequence[JsonNamePersonalisationScheme] = ()
     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.dataflows) for i in self.agencySchemes
+            i.to_model(
+                self.conceptSchemes, self.codelists, self.valueLists, ()
+            )
+            for i in self.dataStructures
         )
-        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() for i in self.codelists)
         structures.extend(
             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.dataStructures,
-                self.conceptSchemes,
-                self.valueLists,
-                self.codelists,
-            )
-            for i in self.dataflows
-        )
+        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.provisionAgreements)
-            for i in self.dataProviderSchemes
+            i.to_model(self.hierarchies, self.codelists)
+            for i in self.hierarchyAssociations
         )
         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(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.provisionAgreements)
+            for i in self.dataProviderSchemes
         )
-
-        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() for i in self.namePersonalisationSchemes
+            i.to_model(
+                self.dataStructures,
+                self.conceptSchemes,
+                self.valueLists,
+                self.codelists,
+            )
+            for i in self.dataflows
         )
         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(bool(len(i.source) > 1 or len(i.target) > 1))
-            for i in self.representationMaps
+            i.to_model() for i in self.metadataProvisionAgreements
         )
-        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,
@@ -152,8 +146,9 @@ class JsonStructures(Struct, frozen=True, omit_defaults=True):
         structures.extend(
             i.to_model() for i in self.userDefinedOperatorSchemes
         )
-        structures.extend(i.to_model() for i in self.valueLists)
-        structures.extend(i.to_model() for i in self.vtlMappingSchemes)
+        for rm in self.representationMaps:
+            multi = bool(len(rm.source) > 1 or len(rm.target) > 1)
+            structures.append(rm.to_model(multi))
         return structures
 
     @classmethod
@@ -269,33 +264,6 @@ 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,
@@ -303,16 +271,11 @@ 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-1.10.0 → pysdmx-1.10.0rc1}/src/pysdmx/io/json/sdmxjson2/messages/vtl.py

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

{pysdmx-1.10.0 → pysdmx-1.10.0rc1}/src/pysdmx/io/json/sdmxjson2/reader/doc_validation.py

@@ -88,10 +88,6 @@ def validate_sdmx_json(input_str: str) -> None:
                     lambda m: f"does not match required"
                     f" pattern {m.group(1)!r}",
                 ),
-                (
-                    r"\[\]\s+is\s+too\s+short",
-                    lambda _m: "[] should be non-empty",
-                ),
             ]
 
             msg: Optional[str] = next(