Fixed small bug on data_read with no attached attributes. Removed att…

…ributes from dedicated test. Signed-off-by: javier.hernandez <javier.hernandez@meaningfuldata.eu>
bis-med-it · Jul 8, 2024 · 4d30a78 · 4d30a78
1 parent e8ba36d
commit 4d30a78
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 19 deletions.
diff --git a/src/pysdmx/io/xml/sdmx21/reader/data_read.py b/src/pysdmx/io/xml/sdmx21/reader/data_read.py
@@ -104,9 +104,7 @@ def __reading_generic_series(dataset: Dict[str, Any]) -> pd.DataFrame:
 
         for data in series[OBS]:
             obs = {OBS_DIM: data[OBS_DIM][VALUE.lower()],
-                   OBSVALUE.upper(): None}
-            if OBSVALUE in data:
-                obs[OBSVALUE.upper()] = data[OBSVALUE][VALUE.lower()]
+                   OBSVALUE.upper(): data[OBSVALUE][VALUE.lower()]}
             if ATTRIBUTES in data:
                 obs = {**obs, **__get_element_to_list(data, mode=ATTRIBUTES)}
             test_list.append({**keys, **obs})
@@ -124,11 +122,8 @@ def __reading_generic_all(dataset: Dict[str, Any]) -> pd.DataFrame:
     dataset[OBS] = add_list(dataset[OBS])
     for data in dataset[OBS]:
         obs: Dict[str, Any] = {}
-        obs = {**obs, **__get_element_to_list(data, mode=OBSKEY)}
-        if ID in data[OBSVALUE]:
-            obs[data[OBSVALUE][ID]] = data[OBSVALUE][VALUE.lower()]
-        else:
-            obs[OBSVALUE.upper()] = data[OBSVALUE][VALUE.lower()]
+        obs = {**obs, **__get_element_to_list(data, mode=OBSKEY),
+               OBSVALUE.upper(): data[OBSVALUE][VALUE.lower()]}
         if ATTRIBUTES in data:
             obs = {**obs, **__get_element_to_list(data, mode=ATTRIBUTES)}
         test_list.append({**obs})
@@ -182,7 +177,9 @@ def __get_at_att_str(dataset: Dict[str, Any]) -> Dict[str, Any]:
 
 def __get_at_att_gen(dataset: Dict[str, Any]) -> Dict[str, Any]:
     """Gets all the elements if it is Generic data."""
-    attached_attributes = {}
+    attached_attributes: Dict[str, Any] = {}
+    if ATTRIBUTES not in dataset:
+        return attached_attributes
     dataset[ATTRIBUTES][VALUE] = add_list(dataset[ATTRIBUTES][VALUE])
     for k in dataset[ATTRIBUTES][VALUE]:
         attached_attributes[k[ID]] = k[VALUE.lower()]

diff --git a/tests/io/xml/sdmx21/reader/samples/gen_all_no_atts.xml b/tests/io/xml/sdmx21/reader/samples/gen_all_no_atts.xml
@@ -36,12 +36,6 @@
                 <generic:Value id="TIME_PERIOD" value="2002"/>
             </generic:ObsKey>
             <generic:ObsValue value=""/>
-            <generic:Attributes>
-                <generic:Value id="AVAILABILITY" value="K"/>
-                <generic:Value id="COLLECTION" value="S"/>
-                <generic:Value id="OBS_STATUS" value="M"/>
-                <generic:Value id="OBS_CONF" value="F"/>
-            </generic:Attributes>
         </generic:Obs>
     </message:DataSet>
 </message:GenericData>
diff --git a/tests/io/xml/sdmx21/reader/test_reader.py b/tests/io/xml/sdmx21/reader/test_reader.py
@@ -244,13 +244,11 @@ def test_gen_all_no_atts(samples_folder):
     data_path = samples_folder / "gen_all_no_atts.xml"
     input_str, filetype = process_string_to_read(data_path)
     assert filetype == "xml"
-    with pytest.raises(KeyError, match="Attributes"):
-        read_xml(input_str, validate=True)
+    read_xml(input_str, validate=True)
 
 
 def test_gen_ser_no_atts(samples_folder):
     data_path = samples_folder / "gen_ser_no_atts.xml"
     input_str, filetype = process_string_to_read(data_path)
     assert filetype == "xml"
-    with pytest.raises(KeyError, match="Attributes"):
-        read_xml(input_str, validate=True)
+    read_xml(input_str, validate=True)