pysdmx 1.4.0rc1__py3-none-any.whl → 1.5.0__py3-none-any.whl

pysdmx/__init__.py

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

pysdmx/api/qb/service.py

@@ -24,6 +24,7 @@ from pysdmx.api.qb.schema import SchemaFormat, SchemaQuery
 from pysdmx.api.qb.structure import StructureFormat, StructureQuery
 from pysdmx.api.qb.util import ApiVersion
 from pysdmx.io.format import GDS_FORMAT
+from pysdmx.util._net_utils import map_httpx_errors
 
 
 class _CoreRestService:
@@ -66,38 +67,6 @@ class _CoreRestService:
         }
         self._timeout = timeout
 
-    def _map_error(
-        self, e: Union[httpx.RequestError, httpx.HTTPStatusError]
-    ) -> NoReturn:
-        q = e.request.url
-        if isinstance(e, httpx.HTTPStatusError):
-            s = e.response.status_code
-            t = e.response.text
-            if s == 404:
-                msg = (
-                    "The requested resource(s) could not be found in the "
-                    f"targeted service. The query was `{q}`"
-                )
-                raise errors.NotFound("Not found", msg) from e
-            elif s < 500:
-                msg = (
-                    f"The query returned a {s} error code. The query "
-                    f"was `{q}`. The error message was: `{t}`."
-                )
-                raise errors.Invalid(f"Client error {s}", msg) from e
-            else:
-                msg = (
-                    f"The service returned a {s} error code. The query "
-                    f"was `{q}`. The error message was: `{t}`."
-                )
-                raise errors.InternalError(f"Service error {s}", msg) from e
-        else:
-            msg = (
-                f"There was an issue connecting to the targeted service. "
-                f"The query was `{q}`. The error message was: `{e}`."
-            )
-            raise errors.Unavailable("Connection error", msg) from e
-
 
 class RestService(_CoreRestService):
     """Synchronous connector to SDMX-REST services.
@@ -206,7 +175,7 @@ class RestService(_CoreRestService):
                 r.raise_for_status()
                 return r.content
             except (httpx.RequestError, httpx.HTTPStatusError) as e:
-                self._map_error(e)
+                map_httpx_errors(e)
 
 
 class AsyncRestService(_CoreRestService):
@@ -322,7 +291,7 @@ class AsyncRestService(_CoreRestService):
                 r.raise_for_status()
                 return r.content
             except (httpx.RequestError, httpx.HTTPStatusError) as e:
-                self._map_error(e)
+                map_httpx_errors(e)
 
 
 class _CoreGdsRestService:

pysdmx/io/format.py

@@ -19,20 +19,25 @@ class Format(Enum):
         f"{_BASE}structurespecifictimeseriesdata+xml;version=2.1"
     )
     DATA_SDMX_ML_3_0 = f"{_BASE}data+xml;version=3.0.0"
+    DATA_SDMX_ML_3_1 = f"{_BASE}data+xml;version=3.1.0"
     GDS_JSON = "application/json"
     REFMETA_SDMX_CSV_2_0_0 = f"{_BASE}metadata+csv;version=2.0.0"
     REFMETA_SDMX_JSON_2_0_0 = f"{_BASE}metadata+json;version=2.0.0"
     REFMETA_SDMX_ML_3_0 = f"{_BASE}metadata+xml;version=3.0.0"
+    REFMETA_SDMX_ML_3_1 = f"{_BASE}metadata+xml;version=3.1.0"
     REGISTRY_SDMX_ML_2_1 = f"{_BASE}registry+xml;version=2.1"
-    REGISTRY_SDMX_ML_3_0 = f"{_BASE}registry+xml;version=3.0"
+    REGISTRY_SDMX_ML_3_0 = f"{_BASE}registry+xml;version=3.0.0"
+    REGISTRY_SDMX_ML_3_1 = f"{_BASE}registry+xml;version=3.1.0"
     SCHEMA_SDMX_JSON_1_0_0 = f"{_BASE}schema+json;version=1.0.0"
     SCHEMA_SDMX_JSON_2_0_0 = f"{_BASE}schema+json;version=2.0.0"
     SCHEMA_SDMX_ML_2_1 = f"{_BASE}schema+xml;version=2.1"
     SCHEMA_SDMX_ML_3_0 = f"{_BASE}schema+xml;version=3.0.0"
+    SCHEMA_SDMX_ML_3_1 = f"{_BASE}schema+xml;version=3.1.0"
     STRUCTURE_SDMX_JSON_1_0_0 = f"{_BASE}structure+json;version=1.0.0"
     STRUCTURE_SDMX_JSON_2_0_0 = f"{_BASE}structure+json;version=2.0.0"
     STRUCTURE_SDMX_ML_2_1 = f"{_BASE}structure+xml;version=2.1"
     STRUCTURE_SDMX_ML_3_0 = f"{_BASE}structure+xml;version=3.0.0"
+    STRUCTURE_SDMX_ML_3_1 = f"{_BASE}structure+xml;version=3.1.0"
     ERROR_SDMX_ML_2_1 = "application/error.xml"
     FUSION_JSON = "application/vnd.fusion.json"
 
@@ -44,6 +49,7 @@ class AvailabilityFormat(Enum):
     SDMX_JSON_2_0_0 = Format.STRUCTURE_SDMX_JSON_2_0_0.value
     SDMX_ML_2_1 = Format.STRUCTURE_SDMX_ML_2_1.value
     SDMX_ML_3_0 = Format.STRUCTURE_SDMX_ML_3_0.value
+    SDMX_ML_3_1 = Format.STRUCTURE_SDMX_ML_3_1.value
 
 
 class DataFormat(Enum):
@@ -58,6 +64,7 @@ class DataFormat(Enum):
     SDMX_ML_2_1_STR = Format.DATA_SDMX_ML_2_1_STR.value
     SDMX_ML_2_1_STRTS = Format.DATA_SDMX_ML_2_1_STRTS.value
     SDMX_ML_3_0 = Format.DATA_SDMX_ML_3_0.value
+    SDMX_ML_3_1 = Format.DATA_SDMX_ML_3_1.value
 
 
 class RefMetaFormat(Enum):
@@ -66,6 +73,7 @@ class RefMetaFormat(Enum):
     SDMX_CSV_2_0_0 = Format.REFMETA_SDMX_CSV_2_0_0.value
     SDMX_JSON_2_0_0 = Format.REFMETA_SDMX_JSON_2_0_0.value
     SDMX_ML_3_0 = Format.REFMETA_SDMX_ML_3_0.value
+    SDMX_ML_3_1 = Format.REFMETA_SDMX_ML_3_1.value
     FUSION_JSON = Format.FUSION_JSON.value
 
 
@@ -80,6 +88,8 @@ class SchemaFormat(Enum):
     SDMX_ML_3_0_SCHEMA = Format.SCHEMA_SDMX_ML_3_0.value
     SDMX_ML_2_1_STRUCTURE = Format.STRUCTURE_SDMX_ML_2_1.value
     SDMX_ML_3_0_STRUCTURE = Format.STRUCTURE_SDMX_ML_3_0.value
+    SDMX_ML_3_1_STRUCTURE = Format.STRUCTURE_SDMX_ML_3_1.value
+
     FUSION_JSON = Format.FUSION_JSON.value
 
 
@@ -90,6 +100,7 @@ class StructureFormat(Enum):
     SDMX_JSON_2_0_0 = Format.STRUCTURE_SDMX_JSON_2_0_0.value
     SDMX_ML_2_1 = Format.STRUCTURE_SDMX_ML_2_1.value
     SDMX_ML_3_0 = Format.STRUCTURE_SDMX_ML_3_0.value
+    SDMX_ML_3_1 = Format.STRUCTURE_SDMX_ML_3_1.value
     FUSION_JSON = Format.FUSION_JSON.value
 
 
@@ -98,6 +109,7 @@ class RegistryFormat(Enum):
 
     SDMX_ML_2_1 = Format.REGISTRY_SDMX_ML_2_1.value
     SDMX_ML_3_0 = Format.REGISTRY_SDMX_ML_3_0.value
+    SDMX_ML_3_1 = Format.REGISTRY_SDMX_ML_3_1.value
     FUSION_JSON = Format.FUSION_JSON.value
 
 

pysdmx/io/input_processor.py

@@ -6,12 +6,15 @@ from io import BytesIO, StringIO, TextIOWrapper
 from json import JSONDecodeError, loads
 from os import PathLike
 from pathlib import Path
-from typing import Tuple, Union
+from typing import Optional, Tuple, Union
 
-from httpx import get as httpx_get
+from httpx import Client as httpx_Client
+from httpx import HTTPStatusError, create_ssl_context
 
 from pysdmx.errors import Invalid, NotImplemented
 from pysdmx.io.format import Format
+from pysdmx.io.xml.__parse_xml import SCHEMA_ROOT_31
+from pysdmx.util import map_httpx_errors
 
 
 def __remove_bom(input_string: str) -> str:
@@ -58,11 +61,15 @@ def __get_sdmx_ml_flavour(input_str: str) -> Tuple[str, Format]:
     if ":structurespecificdata" in flavour_check:
         if SCHEMA_ROOT_30 in flavour_check:
             return input_str, Format.DATA_SDMX_ML_3_0
+        elif SCHEMA_ROOT_31 in flavour_check:
+            return input_str, Format.DATA_SDMX_ML_3_1
         else:
             return input_str, Format.DATA_SDMX_ML_2_1_STR
     if ":structure" in flavour_check:
         if SCHEMA_ROOT_30 in flavour_check:
             return input_str, Format.STRUCTURE_SDMX_ML_3_0
+        elif SCHEMA_ROOT_31 in flavour_check:
+            return input_str, Format.STRUCTURE_SDMX_ML_3_1
         else:
             return input_str, Format.STRUCTURE_SDMX_ML_2_1
     if ":registryinterface" in flavour_check:
@@ -92,8 +99,9 @@ def __check_sdmx_str(input_str: str) -> Tuple[str, Format]:
     raise Invalid("Validation Error", "Cannot parse input as SDMX.")
 
 
-def process_string_to_read(
+def process_string_to_read(  # noqa: C901
     sdmx_document: Union[str, Path, BytesIO],
+    pem: Optional[Union[str, Path]] = None,
 ) -> Tuple[str, Format]:
     """Processes the input that comes into read_sdmx function.
 
@@ -102,6 +110,7 @@ def process_string_to_read(
 
     Args:
         sdmx_document: Path to file, URL, or string.
+        pem: Path to a PEM file for SSL verification when reading from a URL.
 
     Returns:
         tuple: Tuple containing the parsed input and the format of the input.
@@ -127,19 +136,39 @@ def process_string_to_read(
 
     elif isinstance(sdmx_document, str):
         if sdmx_document.startswith("http"):
+            if pem is not None and isinstance(pem, Path):
+                pem = str(pem)
+            if pem is not None and pem and not os.path.exists(pem):
+                raise Invalid(
+                    "Validation Error",
+                    f"PEM file {pem} does not exist.",
+                )
+            # Read from URL
+            ssl_context = (
+                create_ssl_context(
+                    verify=pem,
+                )
+                if pem
+                else create_ssl_context()
+            )
             try:
-                response = httpx_get(sdmx_document, timeout=60)
-                if (
-                    response.status_code != 200
-                    and "<?xml" not in response.text
-                ):
-                    raise Exception("Invalid URL, no SDMX Error found")
-                out_str = response.text
-            except Exception:
+                out_str = ""
+                with httpx_Client(verify=ssl_context) as client:
+                    response = client.get(sdmx_document, timeout=60)
+                    try:
+                        response.raise_for_status()
+                    except HTTPStatusError as e:
+                        if "<?xml" in e.response.text:
+                            out_str = e.response.text
+                        else:
+                            map_httpx_errors(e)
+                    else:
+                        out_str = response.text
+            except Exception as e:
                 raise Invalid(
                     "Validation Error",
                     f"Cannot retrieve a SDMX Message "
-                    f"from URL: {sdmx_document}.",
+                    f"from URL: {sdmx_document}. Error message: {e}",
                 ) from None
         else:
             out_str = sdmx_document

pysdmx/io/reader.py

@@ -20,6 +20,7 @@ from pysdmx.util._model_utils import schema_generator
 def read_sdmx(  # noqa: C901
     sdmx_document: Union[str, Path, BytesIO],
     validate: bool = True,
+    pem: Optional[Union[str, Path]] = None,
 ) -> Message:
     """Reads any SDMX message and extracts its content.
 
@@ -30,11 +31,15 @@ def read_sdmx(  # noqa: C901
           (`pathlib.Path <https://docs.python.org/3/library/pathlib.html>`_),
           URL, or string.
         validate: Validate the input file (only for SDMX-ML).
+        pem: When using a URL, in case the service exposed
+          a certificate created by an unknown certificate
+          authority, you can pass a PEM file for this
+          authority using this parameter.
 
     Raises:
         Invalid: If the file is empty or the format is not supported.
     """
-    input_str, read_format = process_string_to_read(sdmx_document)
+    input_str, read_format = process_string_to_read(sdmx_document, pem=pem)
 
     header = None
     result_data: Sequence[Dataset] = []
@@ -60,6 +65,15 @@ def read_sdmx(  # noqa: C901
         header = read_header(input_str, validate=validate)
         # SDMX-ML 3.0 Structure
         result_structures = read_structure(input_str, validate=validate)
+    elif read_format == Format.STRUCTURE_SDMX_ML_3_1:
+        from pysdmx.io.xml.header import read as read_header
+        from pysdmx.io.xml.sdmx31.reader.structure import (
+            read as read_structure,
+        )
+
+        header = read_header(input_str, validate=validate)
+        # SDMX-ML 3.1 Structure
+        result_structures = read_structure(input_str, validate=validate)
     elif read_format == Format.DATA_SDMX_ML_2_1_GEN:
         from pysdmx.io.xml.header import read as read_header
         from pysdmx.io.xml.sdmx21.reader.generic import read as read_generic
@@ -97,6 +111,16 @@ def read_sdmx(  # noqa: C901
 
         # SDMX-ML 3.0 Structure Specific Data
         result_data = read_str_spe(input_str, validate=validate)
+    elif read_format == Format.DATA_SDMX_ML_3_1:
+        from pysdmx.io.xml.header import read as read_header
+        from pysdmx.io.xml.sdmx31.reader.structure_specific import (
+            read as read_str_spe,
+        )
+
+        header = read_header(input_str, validate=validate)
+
+        # SDMX-ML 3.1 Structure Specific Data
+        result_data = read_str_spe(input_str, validate=validate)
     elif read_format == Format.DATA_SDMX_CSV_1_0_0:
         from pysdmx.io.csv.sdmx10.reader import read as read_csv_v1
 
@@ -118,6 +142,7 @@ def read_sdmx(  # noqa: C901
         Format.DATA_SDMX_ML_2_1_GEN,
         Format.DATA_SDMX_ML_2_1_STR,
         Format.DATA_SDMX_ML_3_0,
+        Format.DATA_SDMX_ML_3_1,
     ):
         # TODO: Add here the Schema download for Datasets, based on structure
         # TODO: Ensure we have changed the signature of the data readers
@@ -170,6 +195,7 @@ def get_datasets(
     data: Union[str, Path, BytesIO],
     structure: Optional[Union[str, Path, BytesIO]] = None,
     validate: bool = True,
+    pem: Optional[Union[str, Path]] = None,
 ) -> Sequence[Dataset]:
     """Reads a data message and a structure message and returns a dataset.
 
@@ -194,6 +220,10 @@ def get_datasets(
           (`pathlib.Path <https://docs.python.org/3/library/pathlib.html>`_),
           URL, or string for the structure message, if needed.
         validate: Validate the input file (only for SDMX-ML).
+        pem: When using a URL, in case the service exposed
+            a certificate created by an unknown certificate
+            authority, you can pass a PEM file for this
+            authority using this parameter.
 
     Raises:
         Invalid:
@@ -203,13 +233,13 @@ def get_datasets(
             If the related data structure (or dataflow with its children)
             is not found.
     """
-    data_msg = read_sdmx(data, validate=validate)
+    data_msg = read_sdmx(data, validate=validate, pem=pem)
     if not data_msg.data:
         raise Invalid("No data found in the data message")
 
     if structure is None:
         return data_msg.data
-    structure_msg = read_sdmx(structure, validate=validate)
+    structure_msg = read_sdmx(structure, validate=validate, pem=pem)
     if structure_msg.structures is None:
         raise Invalid("No structure found in the structure message")
 

pysdmx/io/writer.py

@@ -19,11 +19,15 @@ WRITERS = {
     Format.DATA_SDMX_ML_3_0: "pysdmx.io.xml.sdmx30.writer."
     "structure_specific",
     Format.STRUCTURE_SDMX_ML_3_0: "pysdmx.io.xml.sdmx30.writer.structure",
+    Format.DATA_SDMX_ML_3_1: "pysdmx.io.xml.sdmx31.writer."
+    "structure_specific",
+    Format.STRUCTURE_SDMX_ML_3_1: "pysdmx.io.xml.sdmx31.writer.structure",
 }
 
 STRUCTURE_WRITERS = (
     Format.STRUCTURE_SDMX_ML_2_1,
     Format.STRUCTURE_SDMX_ML_3_0,
+    Format.STRUCTURE_SDMX_ML_3_1,
 )
 
 

pysdmx/io/xml/__parse_xml.py

@@ -41,6 +41,24 @@ XML_OPTIONS_30 = {
     "dict_constructor": dict,
     "attr_prefix": "",
 }
+SCHEMA_ROOT_31 = "http://www.sdmx.org/resources/sdmxml/schemas/v3_1/"
+NAMESPACES_31 = {
+    SCHEMA_ROOT_31 + "message": None,
+    SCHEMA_ROOT_31 + "common": None,
+    SCHEMA_ROOT_31 + "structure": None,
+    "http://www.w3.org/2001/XMLSchema-instance": "xsi",
+    "http://www.w3.org/XML/1998/namespace": None,
+    SCHEMA_ROOT_31 + "data/structurespecific": None,
+    SCHEMA_ROOT_31 + "registry": None,
+    "http://schemas.xmlsoap.org/soap/envelope/": None,
+}
+
+XML_OPTIONS_31 = {
+    "process_namespaces": True,
+    "namespaces": NAMESPACES_31,
+    "dict_constructor": dict,
+    "attr_prefix": "",
+}
 
 
 def parse_xml(
@@ -61,7 +79,12 @@ def parse_xml(
     """
     if validate:
         validate_doc(input_str)
-    if SCHEMA_ROOT_30 in input_str:
+    if SCHEMA_ROOT_31 in input_str:
+        dict_info = xmltodict.parse(
+            input_str,
+            **XML_OPTIONS_31,  # type: ignore[arg-type]
+        )
+    elif SCHEMA_ROOT_30 in input_str:
         dict_info = xmltodict.parse(
             input_str,
             **XML_OPTIONS_30,  # type: ignore[arg-type]

pysdmx/io/xml/__structure_aux_reader.py

@@ -51,6 +51,7 @@ from pysdmx.io.xml.__tokens import (
     DFWS,
     DIM,
     DIM_LIST,
+    DIM_REF,
     DSD,
     DSD_COMPS,
     DSDS,
@@ -64,6 +65,7 @@ from pysdmx.io.xml.__tokens import (
     FAXES,
     GROUP,
     GROUP_DIM,
+    GROUPS_LOW,
     ID,
     IS_EXTERNAL_REF,
     IS_EXTERNAL_REF_LOW,
@@ -82,6 +84,7 @@ from pysdmx.io.xml.__tokens import (
     ME_REL,
     MEASURE,
     METADATA,
+    MSR,
     NAME,
     NAME_PER,
     NAME_PER_SCHEME,
@@ -91,7 +94,6 @@ from pysdmx.io.xml.__tokens import (
     ORGS,
     PAR_ID,
     PAR_VER,
-    PRIM_MEASURE,
     REF,
     REQUIRED,
     ROLE,
@@ -131,6 +133,7 @@ from pysdmx.io.xml.__tokens import (
     VALID_TO_LOW,
     VALUE_ITEM,
     VALUE_LIST,
+    VALUE_LIST_LOW,
     VALUE_LISTS,
     VERSION,
     VTL_CL_MAPP,
@@ -167,6 +170,7 @@ from pysdmx.model.dataflow import (
     Components,
     Dataflow,
     DataStructureDefinition,
+    GroupDimension,
     Role,
 )
 from pysdmx.model.vtl import (
@@ -216,13 +220,13 @@ ITEMS_CLASSES = {
     CUSTOM_TYPE: CustomType,
 }
 
-COMP_TYPES = [DIM, ATT, PRIM_MEASURE, MEASURE, GROUP_DIM]
+COMP_TYPES = [DIM, ATT, MEASURE, MSR, GROUP_DIM]
 
 ROLE_MAPPING = {
     DIM: Role.DIMENSION,
     ATT: Role.ATTRIBUTE,
-    PRIM_MEASURE: Role.MEASURE,
     MEASURE: Role.MEASURE,
+    MSR: Role.MEASURE,
 }
 
 FACETS_MAPPING = {
@@ -291,6 +295,7 @@ class StructureParser(Struct):
 
     agencies: Dict[str, AgencyScheme] = {}
     codelists: Dict[str, Codelist] = {}
+    valuelists: Dict[str, Codelist] = {}
     concepts: Dict[str, ConceptScheme] = {}
     datastructures: Dict[str, DataStructureDefinition] = {}
     dataflows: Dict[str, Dataflow] = {}
@@ -466,20 +471,28 @@ class StructureParser(Struct):
         if TEXT_FORMAT in json_rep:
             self.__format_facets(json_rep[TEXT_FORMAT], json_obj)
 
-        if ENUM in json_rep and len(self.codelists) > 0:
+        if ENUM in json_rep and (
+            len(self.codelists) > 0 or len(self.valuelists) > 0
+        ):
             enum = json_rep[ENUM]
             if isinstance(enum, str):
                 ref = parse_urn(enum)
             else:
                 ref = enum.get(REF, enum)
-
             if isinstance(ref, dict) and "URN" in ref:
                 codelist = find_by_urn(
                     list(self.codelists.values()), ref["URN"]
                 )
 
             elif isinstance(ref, Reference):
-                codelist = find_by_urn(list(self.codelists.values()), str(ref))
+                codelist = find_by_urn(
+                    list(
+                        self.codelists.values()
+                        if ref.sdmx_type == CL
+                        else self.valuelists.values()
+                    ),
+                    str(ref),
+                )
             else:
                 short_urn = str(
                     Reference(
@@ -541,7 +554,7 @@ class StructureParser(Struct):
         for con in concept_scheme.concepts:
             if isinstance(concept_ref, str):
                 if con.id == item_reference.item_id:
-                    rep[CON] = con
+                    rep[CON] = parse_urn(concept_ref)
                     break
             elif con.id == concept_ref[ID]:
                 rep[CON] = con
@@ -551,7 +564,9 @@ class StructureParser(Struct):
         return rep
 
     @staticmethod
-    def __get_attachment_level(attribute: Dict[str, Any]) -> str:
+    def __get_attachment_level(  # noqa: C901
+        attribute: Dict[str, Any], element_info: Dict[str, Any]
+    ) -> str:
         if DIM in attribute:
             dims = add_list(attribute[DIM])
             if dims and isinstance(dims[0], dict):
@@ -561,15 +576,39 @@ class StructureParser(Struct):
             # therefore we need to check first if a Dimension is present,
             # then the AttachmentGroup
             if ATTACH_GROUP in attribute:
-                raise NotImplementedError(
-                    "Attribute relationships with Dimension "
-                    "and AttachmentGroup is not supported."
-                )
+                att_grp = add_list(attribute[ATTACH_GROUP])
+                att_grp = [att[REF][ID] for att in att_grp]
+                for grp in att_grp:
+                    group_dims: List[str] = next(
+                        (
+                            g.dimensions
+                            for g in element_info[GROUPS_LOW]
+                            if g.id == grp
+                        ),
+                        [],
+                    )
+                    att_level += (
+                        "," + ",".join(group_dims)
+                        if len(group_dims) > 0
+                        else ""
+                    )
         elif GROUP in attribute:
-            raise NotImplementedError(
-                "Attribute relationships with Group is not supported."
+            if REF in attribute[GROUP]:
+                group_id = attribute[GROUP][REF][ID]
+            else:
+                group_id = attribute[GROUP]
+            group_dimensions: List[str] = next(
+                (
+                    g.dimensions
+                    for g in element_info[GROUPS_LOW]
+                    if g.id == group_id
+                ),
+                [],
             )
-        elif OBSERVATION in attribute or PRIM_MEASURE in attribute:
+            att_level = (
+                ",".join(group_dimensions) if len(group_dimensions) > 0 else ""
+            )
+        elif OBSERVATION in attribute or MEASURE in attribute:
             att_level = "O"
         else:
             # For None (SDMX-2.1) or Dataflow (SDMX-3.0), attribute is
@@ -682,7 +721,7 @@ class StructureParser(Struct):
                     json_obj[DFW_LOW] = dataflow
 
     def __format_component(
-        self, comp: Dict[str, Any], role: Role
+        self, comp: Dict[str, Any], role: Role, element_info: Dict[str, Any]
     ) -> Component:
         comp[ROLE.lower()] = role
         comp[REQUIRED] = True
@@ -700,7 +739,9 @@ class StructureParser(Struct):
 
         # Attribute Handling
         if ATT_REL in comp:
-            comp[ATT_LVL] = self.__get_attachment_level(comp[ATT_REL])
+            comp[ATT_LVL] = self.__get_attachment_level(
+                comp[ATT_REL], element_info
+            )
             del comp[ATT_REL]
 
         if ME_REL in comp:
@@ -727,7 +768,7 @@ class StructureParser(Struct):
         return Component(**comp)
 
     def __format_component_lists(
-        self, element: Dict[str, Any]
+        self, element: Dict[str, Any], element_info: Dict[str, Any]
     ) -> List[Component]:
         comp_list = []
 
@@ -744,6 +785,7 @@ class StructureParser(Struct):
             formatted_comp = self.__format_component(
                 comp,
                 role,
+                element_info,
             )
             comp_list.append(formatted_comp)
 
@@ -754,12 +796,11 @@ class StructureParser(Struct):
             element[COMPS] = []
             comps = element[DSD_COMPS]
 
-            for comp_list in [DIM_LIST, ME_LIST, GROUP, ATT_LIST]:
-                if comp_list == GROUP and comp_list in comps:
-                    del comps[GROUP]
-
-                elif comp_list in comps:
-                    fmt_comps = self.__format_component_lists(comps[comp_list])
+            for comp_list in [DIM_LIST, ME_LIST, ATT_LIST]:
+                if comp_list in comps:
+                    fmt_comps = self.__format_component_lists(
+                        comps[comp_list], element
+                    )
                     element[COMPS].extend(fmt_comps)
 
             element[COMPS] = Components(element[COMPS])
@@ -892,6 +933,32 @@ class StructureParser(Struct):
 
         return ITEMS_CLASSES[item_name_class](**item_json_info)
 
+    @staticmethod
+    def __format_groups(element: Dict[str, Any]) -> Dict[str, Any]:
+        if DSD_COMPS in element:
+            dsd_comps = element[DSD_COMPS]
+            if GROUP in dsd_comps:
+                groups = (
+                    dsd_comps[GROUP]
+                    if isinstance(dsd_comps[GROUP], list)
+                    else [dsd_comps[GROUP]]
+                )
+                for group in groups:
+                    group_dimensions = group.pop(GROUP_DIM, [])
+                    if isinstance(group_dimensions, dict):
+                        group_dimensions = [group_dimensions]
+
+                    group["dimensions"] = [
+                        d[DIM_REF]
+                        if isinstance(d[DIM_REF], str)
+                        else d[DIM_REF][REF][ID]
+                        for d in group_dimensions
+                    ]
+
+                element[GROUPS_LOW] = [GroupDimension(**g) for g in groups]
+                del element[DSD_COMPS][GROUP]
+        return element
+
     def __format_is_final_30(
         self, json_elem: Dict[str, Any]
     ) -> Dict[str, Any]:
@@ -940,7 +1007,7 @@ class StructureParser(Struct):
                 del element["xmlns"]
             # Dynamic creation with specific class
             if scheme == VALUE_LIST:
-                element["sdmx_type"] = "valuelist"
+                element["sdmx_type"] = VALUE_LIST_LOW
             element = self.__format_is_final_30(element)
             result: ItemScheme = STRUCTURES_MAPPING[scheme](**element)
             elements[result.short_urn] = result
@@ -980,6 +1047,7 @@ class StructureParser(Struct):
             element = self.__format_urls(element)
             element = self.__format_agency(element)
             element = self.__format_validity(element)
+            element = self.__format_groups(element)
             element = self.__format_components(element)
 
             if "xmlns" in element:
@@ -1060,6 +1128,7 @@ class StructureParser(Struct):
                 lambda data: self.__format_scheme(
                     data, VALUE_LIST, VALUE_ITEM
                 ),
+                "valuelists",
             ),
             CON_SCHEMES: process_structure(
                 CON_SCHEMES,