Made infl.get_cp() and infl.get_inflation()

Author: fzhulitov

main.py

@@ -1,10 +1,10 @@
 import ons
 
 
-val = ons.gdp.get_gdp()
+val = ons.infl.get_cp()
 print(val)
 
-val = ons.gdp.get_infl_from_gdp(val)
+val = ons.infl.get_inflation()
 print(val)
 
-print(ons.__version__)
+

ons/__init__.py

@@ -2,5 +2,6 @@
 
 from ons.request_data import get_data_frame
 from ons.gdp import get_gdp
+from ons.infl import (get_cp, get_inflation)
 
 __version__ = version("ons")

ons/gdp.py

@@ -3,11 +3,12 @@
 
 import ons
 
+base_key = "regional-gdp-by-quarter"
 def get_gdp() -> pd.Series:
-    jresp = ons.request_data.get_data_frame()
+    jresp = ons.request_data.get_data_frame(key=base_key)
     df = pd.read_csv(StringIO(jresp), engine='python', encoding='utf-8',
-                     usecols=["V4_1", "Time", "nuts", "sic-unofficial", "GrowthRate"],
-                     dtype={"V4_1": float},
+                     usecols=["v4_1", "Time", "nuts", "sic-unofficial", "GrowthRate"],
+                     dtype={"v4_1": float},
                      parse_dates=["Time"],
                      )
     df = df[df['nuts'] == 'UK0']

ons/infl.py

@@ -0,0 +1,25 @@
+import pandas as pd
+from io import StringIO
+import  ons
+
+cp_add_str = "cpih01/editions/time-series/versions/29.csv"
+base_link = "https://api.beta.ons.gov.uk/v1/datasets/cpih01"
+key_cp = "cpih01"
+
+def get_cp():
+    jresp = ons.request_data.get_data_frame(key=key_cp)
+    df = pd.read_csv(StringIO(jresp), engine='python', encoding='utf-8')
+    df = df[df['Aggregate'] == 'Overall Index']
+    df = df.iloc[:, [0, 1]]
+    df.iloc[:, 1] = pd.to_datetime(df.iloc[:, 1], format='%b-%y')
+    df.iloc[:, 0] = df.iloc[:, 0].astype('float', copy=False)
+    df.set_index(list(df.columns[[1]]), inplace=True)
+    df.sort_index(ascending=True, inplace=True)
+    return df
+
+def get_inflation():
+    df = get_cp()
+    df = df.iloc[:, 0].pct_change().round(4)
+    df.dropna(inplace=True)
+    return df
+

ons/request_data.py

@@ -1,22 +1,26 @@
 import requests
-from requests import Response
+import json
 
-URL_BASE = "https://download.beta.ons.gov.uk/downloads/datasets/regional-gdp-by-quarter/editions/time-series/versions/4.csv"
 
+URL_BASE = "https://api.beta.ons.gov.uk/v1/datasets/"
 
-def get_data_frame(
-    start_period: str = "1900-01-01",
-    end_period: str = None,
-) -> str:
-    request_url = URL_BASE
 
-    try:
-        abc: Response = requests.get(request_url)
-    except requests.exceptions.HTTPError as err:
-        raise requests.exceptions.HTTPError(
-            f"HTTP error fetching data for {URL_BASE}:",
-            abc.status_code,
-            abc.reason,
-            URL_BASE,
-        ) from err
-    return abc.text
+def get_data_frame(key: str = "regional-gdp-by-quarter") :
+    request_url = URL_BASE+key
+    d = _connect_to_uk_api(request_url)
+    url_ts = d['links']['latest_version']['href']
+    csv_link = _connect_to_uk_api(url_ts)['downloads']['csv']['href']
+    df = _connect_to_uk_api(csv_link, request_type='csv')
+    return df
+
+
+def _connect_to_uk_api(url: str, request_type: str = 'json') -> dict:
+    session = requests.session()
+    r = session.get(url=url)
+    if r.status_code != requests.codes.ok:
+        raise Exception(r.status_code, r.reason, url)
+    session.close()
+    if request_type == 'json':
+        return json.loads(r.text)
+    elif request_type == 'csv':
+        return r.text