added 'A13': 'Withdrawn' to docstatus

entsoe/entsoe.py

@@ -130,6 +130,7 @@ def _base_request(self, params: Dict, start: pd.Timestamp,
             if response.headers.get('content-type', '') == 'application/xml':
                 if 'No matching data found' in response.text:
                     raise NoMatchingDataError
+            print('response received')
             return response
 
     @staticmethod
@@ -1652,7 +1653,7 @@ def query_procured_balancing_capacity(
         response = super(EntsoePandasClient, self).query_procured_balancing_capacity(
             country_code=area, start=start, end=end,
             process_type=process_type, type_marketagreement_type=type_marketagreement_type)
-        df = parse_procured_balancing_capacity(response.content, area.tz)
+        df = parse_procured_balancing_capacity(response, area.tz)
         df = df.tz_convert(area.tz)
         df = df.truncate(before=start, after=end)
         return df

entsoe/mappings.py

@@ -178,6 +178,7 @@ def code(self):
              'A02': 'Final',
              'A05': 'Active',
              'A09': 'Cancelled',
+             'A13': 'Withdrawn',
              'X01': 'Estimated'}
 
 BSNTYPE = {'A29': 'Already allocated capacity (AAC)',

entsoe/parsers.py

@@ -17,6 +17,7 @@
 
 
 def find(element, tag):
+    print(tag)
     return next(element.iter('{*}'+tag)).text
 
 def findall(element, tag):
@@ -449,7 +450,7 @@ def gen_frames(archive):
             for f in arc.infolist():
                 if f.filename.endswith('xml'):
                     #TODO this should generate bytes not xml text
-                    frame = parse_imbalance_prices(xml_text=arc.read(f))
+                    frame = parse_imbalance_prices(xml_bytes=arc.read(f))
                     yield frame
 
     frames = gen_frames(zip_contents)
@@ -637,8 +638,8 @@ def _parse_generation_timeseries(element, per_plant: bool = False, include_eic:
     series.index = _parse_datetimeindex(element)
 
     # Check if there is a psrtype, if so, get it.
-    _psrtype = findall(element, 'psrType')
-    if _psrtype is not None:
+    _psrtype = list(findall(element, 'psrType'))
+    if _psrtype:
         psrtype = find(element, 'psrType')
     else:
         psrtype = None
@@ -866,7 +867,7 @@ def _unavailability_gen_ts(element) -> list:
 
 #TODO
 HEADERS_UNAVAIL_TRANSM = ['created_doc_time',
-                          'docstatus',
+                          'docStatus',
                           'businesstype',
                           'in_domain',
                           'out_domain',
@@ -949,7 +950,7 @@ def _available_period(timeseries) -> list:
 def _outage_parser(xml_file: bytes, headers, ts_func) -> pd.DataFrame:
     # xml_text = xml_file.decode()
     # soup = bs4.BeautifulSoup(xml_text, 'html.parser')
-    element = etree.iterparse(BytesIO(xml_file))
+    element = etree.parse(BytesIO(xml_file))
 
 
 
@@ -960,10 +961,11 @@ def _outage_parser(xml_file: bytes, headers, ts_func) -> pd.DataFrame:
         creation_date = pd.Timestamp(find(element, 'createdDateTime'))
     except AttributeError:
         creation_date = ""
-
-    try:
+
+    value = list(findall(element, 'value'))
+    if value:
         docstatus = DOCSTATUS[find(element, 'value')]
-    except AttributeError:
+    else:
         docstatus = None
     d = list()
     series = _extract_timeseries(xml_file)