handle different kinds of facets

Author: philsv

README.md

@@ -1,6 +1,6 @@
 # myeia
 
-[![PyPI version](https://d25lcipzij17d.cloudfront.net/badge.svg?id=py&r=r&ts=1683906897&type=6e&v=0.3.5&x2=0)](https://badge.fury.io/py/myeia)
+[![PyPI version](https://d25lcipzij17d.cloudfront.net/badge.svg?id=py&r=r&ts=1683906897&type=6e&v=0.3.6&x2=0)](https://badge.fury.io/py/myeia)
 [![License: MIT](https://img.shields.io/badge/License-MIT-red.svg)](https://github.com/philsv/myeia/blob/main/LICENSE)
 [![Weekly Downloads](https://static.pepy.tech/personalized-badge/myeia?period=week&units=international_system&left_color=grey&right_color=blue&left_text=downloads/week)](https://pepy.tech/project/myeia)
 [![Monthly Downloads](https://static.pepy.tech/personalized-badge/myeia?period=month&units=international_system&left_color=grey&right_color=blue&left_text=downloads/month)](https://pepy.tech/project/myeia)

myeia/api.py

@@ -2,11 +2,13 @@
 import warnings
 from dataclasses import dataclass, field
 from datetime import datetime, timedelta
+import logging
 from typing import List, Optional, Tuple, Union
 
 import pandas as pd
 import requests
 from dotenv import load_dotenv
+from requests.exceptions import JSONDecodeError
 
 try:
     from pandas.errors import SettingWithCopyWarning
@@ -17,14 +19,23 @@
 
 load_dotenv()
 
+logging.basicConfig(
+    level=logging.INFO, format="%(asctime)s - %(message)s", datefmt="%d-%b-%y %H:%M:%S"
+)
+
+
 
 def get_json_response(url: str, headers: dict) -> pd.DataFrame:
     """
     Helper function to get JSON response from API.
     """
     response = requests.get(url, headers=headers)
     response.raise_for_status()
-    json_response = response.json()
+    try:
+        json_response = response.json()
+    except JSONDecodeError as e:
+        logging.error(f"Response: {response.text}")
+        raise ValueError(f"Error decoding JSON response ({e}). Data might be incomplete or missing. Chunking your request might help.") from e
     return pd.DataFrame(json_response["response"]["data"])
 
 
@@ -154,8 +165,8 @@ def get_series_via_route(
 
             if facet == "series":
                 df = base_df[["period", "value", "series-description", "series"]]
-            elif facet == "seriesId":
-                df = base_df[["period", "value", "seriesDescription", "seriesId"]]
+            else:
+                df = base_df[["period", "value", "seriesDescription", facet]]
 
             df.reset_index(drop=True, inplace=True)
             df.rename(columns={df.columns[1]: df[df.columns[2]][0]}, inplace=True)

myeia/version.py

@@ -1 +1 @@
-__version__ = "0.3.5"
+__version__ = "0.3.6"

tests/test_myeia.py

@@ -33,6 +33,7 @@ def test_get_series(series_id, start_date, end_date):
         ("petroleum/crd/crpdn", "MCRFPP52", "monthly", "series", None, None),
         ("petroleum/crd/crpdn", ["MCRFPP51", "MCRFPP52"], "monthly", "series", None, None),
         ("petroleum/crd/crpdn", ["MCRFPP51", "MCRFPP52"], "monthly", "series", "2021-01-01", "2021-11-31"),
+        ("total-energy", "PATWPUS", "monthly", "msn", "2020-01-01", None),
     ],
 )
 def test_get_series_via_route(route, series, frequency, facet, start_date, end_date):