Merge pull request #4349 from OpenBB-finance/hotfix/treasury-rates

Fix long/short issue and fix transform issue
OpenBB-finance · Feb 28, 2023 · 3a961ea · 3a961ea
2 parents 3f9db71 + b02457d
commit 3a961ea
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/openbb_terminal/economy/econdb_model.py b/openbb_terminal/economy/econdb_model.py
@@ -553,6 +553,13 @@ def get_macro_data(
 
             df = pd.DataFrame(data["dataarray"])
 
+            if code not in df.columns:
+                console.print(
+                    f"No data available for {parameter} of {country} "
+                    f"{f'with transform method {transform}' if transform else ''}"
+                )
+                return pd.DataFrame(), "NA/NA"
+
             df = df.set_index(pd.to_datetime(df["date"]))[code] * SCALES[scale]
             df = df.sort_index().dropna()
 

diff --git a/openbb_terminal/fixedincome/oecd_model.py b/openbb_terminal/fixedincome/oecd_model.py
@@ -223,6 +223,8 @@ def get_treasury(
     end_date: str
         End date of data, in YYYY-MM-DD format
     """
+    df_short, df_long = pd.DataFrame(), pd.DataFrame()
+
     if short_term:
         df_short = get_interest_rate_data(
             f"short{'_forecast' if forecast else ''}",
@@ -239,4 +241,5 @@ def get_treasury(
         )
 
     df = pd.concat([df_short, df_long], axis=1)
+
     return df