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

pysdmx/io/xml/{sdmx21/reader/header.py → header.py}

@@ -4,7 +4,8 @@ import warnings
 from datetime import datetime
 from typing import Any, Dict, Optional, Union
 
-from pysdmx.io.xml.sdmx21.__tokens import (
+from pysdmx.io.xml.__parse_xml import parse_xml
+from pysdmx.io.xml.__tokens import (
     AGENCY_ID,
     DATASET_ACTION,
     DATASET_ID,
@@ -17,6 +18,7 @@ from pysdmx.io.xml.sdmx21.__tokens import (
     ID,
     NAME,
     PREPARED,
+    PROV_AGREEMENT,
     PROV_AGREMENT,
     RECEIVER,
     REF,
@@ -29,7 +31,6 @@ from pysdmx.io.xml.sdmx21.__tokens import (
     URN,
     VERSION,
 )
-from pysdmx.io.xml.sdmx21.reader.__parse_xml import parse_xml
 from pysdmx.model import Organisation, Reference
 from pysdmx.model.dataset import ActionType
 from pysdmx.model.message import Header
@@ -98,7 +99,12 @@ def __parse_structure(
     elif STR_USAGE in structure:
         structure_info = structure[STR_USAGE]
         sdmx_type = DFW
+    elif PROV_AGREEMENT in structure:
+        structure_info = structure[PROV_AGREEMENT]
+        sdmx_type = PROV_AGREEMENT
     else:
+        # Provision Agrement is a typo in the SDMX 2.1 schema,
+        # and it is later solved in SDMX 3.0
         structure_info = structure[PROV_AGREMENT]
         sdmx_type = PROV_AGREMENT
 
@@ -113,8 +119,10 @@ def __parse_structure(
             id=structure_id,
             version=version,
         )
-    else:
+    elif URN in structure_info:
         ref_obj = parse_maintainable_urn(structure_info[URN])
+    else:
+        ref_obj = parse_maintainable_urn(structure_info)
     return {str(ref_obj): dim_at_obs}
 
 

pysdmx/io/xml/sdmx21/reader/error.py

@@ -1,13 +1,13 @@
 """SDMX 2.1 XML error reader."""
 
 from pysdmx.errors import Invalid
-from pysdmx.io.xml.sdmx21.__tokens import (
+from pysdmx.io.xml.__parse_xml import parse_xml
+from pysdmx.io.xml.__tokens import (
     ERROR,
     ERROR_CODE,
     ERROR_MESSAGE,
     ERROR_TEXT,
 )
-from pysdmx.io.xml.sdmx21.reader.__parse_xml import parse_xml
 
 
 def read(input_str: str, validate: bool = True) -> None:

pysdmx/io/xml/sdmx21/reader/generic.py

@@ -6,7 +6,12 @@ import pandas as pd
 
 from pysdmx.errors import Invalid
 from pysdmx.io.pd import PandasDataset
-from pysdmx.io.xml.sdmx21.__tokens import (
+from pysdmx.io.xml.__data_aux import (
+    __process_df,
+    get_data_objects,
+)
+from pysdmx.io.xml.__parse_xml import parse_xml
+from pysdmx.io.xml.__tokens import (
     ATTRIBUTES,
     GENERIC,
     ID,
@@ -20,11 +25,6 @@ from pysdmx.io.xml.sdmx21.__tokens import (
     STR_REF,
     VALUE,
 )
-from pysdmx.io.xml.sdmx21.reader.__data_aux import (
-    __process_df,
-    get_data_objects,
-)
-from pysdmx.io.xml.sdmx21.reader.__parse_xml import parse_xml
 from pysdmx.io.xml.utils import add_list
 from pysdmx.model.dataset import ActionType
 
@@ -58,7 +58,9 @@ def __reading_generic_series(dataset: Dict[str, Any]) -> pd.DataFrame:
             for data in series[OBS]:
                 obs = {
                     OBS_DIM: data[OBS_DIM][VALUE.lower()],
-                    OBS_VALUE_ID: data[OBS_VALUE_XML_TAG][VALUE.lower()],
+                    OBS_VALUE_ID: data[OBS_VALUE_XML_TAG][VALUE.lower()]
+                    if OBS_VALUE_XML_TAG in data
+                    else "",
                 }
                 if ATTRIBUTES in data:
                     obs = {
@@ -87,7 +89,9 @@ def __reading_generic_all(dataset: Dict[str, Any]) -> pd.DataFrame:
         obs = {
             **obs,
             **__get_element_to_list(data, mode=OBS_KEY),
-            OBS_VALUE_ID: data[OBS_VALUE_XML_TAG][VALUE.lower()],
+            OBS_VALUE_ID: data[OBS_VALUE_XML_TAG][VALUE.lower()]
+            if OBS_VALUE_XML_TAG in data
+            else "",
         }
         if ATTRIBUTES in data:
             obs = {**obs, **__get_element_to_list(data, mode=ATTRIBUTES)}