New Feature Financial Analysis, checks Yahoo if no data at Alpha Advantage.

openbb_terminal/stocks/fundamental_analysis/av_model.py

@@ -12,6 +12,7 @@
 from openbb_terminal.decorators import log_start_end
 from openbb_terminal.helper_funcs import lambda_long_number_format
 from openbb_terminal.rich_config import console
+from openbb_terminal.stocks.fundamental_analysis import yahoo_finance_model
 from openbb_terminal.stocks.stocks_helper import clean_fraction
 from openbb_terminal.stocks.fundamental_analysis.fa_helper import clean_df_index
 
@@ -45,7 +46,7 @@ def get_overview(ticker: str) -> pd.DataFrame:
     else:
         # check if json is empty
         if not result_json:
-            console.print("No data found")
+            console.print("No data found from Alpha Vantage\n")
         # Parse json data to dataframe
         elif "Note" in result_json:
             console.print(result_json["Note"], "\n")
@@ -108,7 +109,7 @@ def get_key_metrics(ticker: str) -> pd.DataFrame:
     else:
         # check if json is empty
         if not result_json or len(result_json) < 2:
-            console.print("No data found")
+            console.print("No data found from Alpha Vantage\n")
             return pd.DataFrame()
 
         df_fa = pd.json_normalize(result_json)
@@ -177,7 +178,16 @@ def get_income_statements(
     else:
         # check if json is empty
         if not response_json:
-            console.print("No data found")
+            console.print(
+                "No data found from Alpha Vantage, looking in Yahoo Finance\n"
+            )
+            if (
+                yahoo_finance_model.get_financials(ticker, financial="financials")
+                is not None
+            ):
+                return yahoo_finance_model.get_financials(
+                    ticker, financial="financials"
+                )
         else:
             statements = response_json
             df_fa = pd.DataFrame()
@@ -190,7 +200,7 @@ def get_income_statements(
                     df_fa = pd.DataFrame(statements["annualReports"])
 
             if df_fa.empty:
-                console.print("No data found")
+                console.print("No data found from Alpha Vantage\n")
                 return pd.DataFrame()
 
             df_fa = df_fa.set_index("fiscalDateEnding")
@@ -218,7 +228,7 @@ def get_balance_sheet(
     Returns
     -------
     pd.DataFrame
-        Dataframe of income statements
+        Dataframe of balance sheet statements
     """
     url = f"https://www.alphavantage.co/query?function=BALANCE_SHEET&symbol={ticker}&apikey={cfg.API_KEY_ALPHAVANTAGE}"
     r = requests.get(url)
@@ -227,29 +237,34 @@ def get_balance_sheet(
     # If the returned data was unsuccessful
     if "Error Message" in response_json:
         console.print(response_json["Error Message"])
+
+    # check if json is empty
+    if not response_json:
+        console.print("No data found from Alpha Vantage, looking in Yahoo Finance\n")
+        if (
+            yahoo_finance_model.get_financials(ticker, financial="balance-sheet")
+            is not None
+        ):
+            return yahoo_finance_model.get_financials(ticker, financial="balance-sheet")
     else:
-        # check if json is empty
-        if not response_json:
-            console.print("No data found")
-        else:
-            statements = response_json
-            df_fa = pd.DataFrame()
+        statements = response_json
+        df_fa = pd.DataFrame()
 
-            if quarterly:
-                if "quarterlyReports" in statements:
-                    df_fa = pd.DataFrame(statements["quarterlyReports"])
-            else:
-                if "annualReports" in statements:
-                    df_fa = pd.DataFrame(statements["annualReports"])
+        if quarterly:
+            if "quarterlyReports" in statements:
+                df_fa = pd.DataFrame(statements["quarterlyReports"])
+        else:
+            if "annualReports" in statements:
+                df_fa = pd.DataFrame(statements["annualReports"])
 
-            if df_fa.empty:
-                console.print("No data found")
-                return pd.DataFrame()
+        if df_fa.empty:
+            console.print("No data found from Alpha Vantage\n")
+            return pd.DataFrame()
 
-            df_fa = df_fa.set_index("fiscalDateEnding")
-            df_fa = df_fa.head(number)
-            df_fa = df_fa.applymap(lambda x: lambda_long_number_format(x))
-            return df_fa[::-1].T
+        df_fa = df_fa.set_index("fiscalDateEnding")
+        df_fa = df_fa.head(number)
+        df_fa = df_fa.applymap(lambda x: lambda_long_number_format(x))
+        return df_fa[::-1].T
     return pd.DataFrame()
 
 
@@ -269,7 +284,7 @@ def get_cash_flow(ticker: str, number: int, quarterly: bool = False) -> pd.DataF
     Returns
     -------
     pd.DataFrame
-        Dataframe of income statements
+        Dataframe of cash flow statements
     """
     url = f"https://www.alphavantage.co/query?function=CASH_FLOW&symbol={ticker}&apikey={cfg.API_KEY_ALPHAVANTAGE}"
     r = requests.get(url)
@@ -281,7 +296,15 @@ def get_cash_flow(ticker: str, number: int, quarterly: bool = False) -> pd.DataF
     else:
         # check if json is empty
         if not response_json:
-            console.print("No data found")
+            console.print(
+                "No data found from Alpha Vantage, looking in Yahoo Finance\n"
+            )
+
+            if (
+                yahoo_finance_model.get_financials(ticker, financial="cash-flow")
+                is not None
+            ):
+                return yahoo_finance_model.get_financials(ticker, financial="cash-flow")
         else:
             statements = response_json
             df_fa = pd.DataFrame()
@@ -294,7 +317,7 @@ def get_cash_flow(ticker: str, number: int, quarterly: bool = False) -> pd.DataF
                     df_fa = pd.DataFrame(statements["annualReports"])
 
             if df_fa.empty:
-                console.print("No data found")
+                console.print("No data found from Alpha Vantage\n")
                 return pd.DataFrame()
 
             df_fa = df_fa.set_index("fiscalDateEnding")
@@ -335,7 +358,7 @@ def get_earnings(ticker: str, quarterly: bool = False) -> pd.DataFrame:
     else:
         # check if json is empty
         if not result_json or len(result_json) < 2:
-            console.print("No data found")
+            console.print("No data found from Alpha Vantage\n")
         else:
 
             df_fa = pd.json_normalize(result_json)

openbb_terminal/stocks/fundamental_analysis/av_view.py

@@ -110,7 +110,7 @@ def display_income_statement(
 def display_balance_sheet(
     ticker: str, limit: int, quarterly: bool = False, export: str = ""
 ):
-    """Alpha Vantage income statement
+    """Alpha Vantage balance sheet statement
 
     Parameters
     ----------
@@ -174,7 +174,7 @@ def display_cash_flow(
     print_rich_table(
         df_cash,
         headers=list(df_cash.columns),
-        title=f"{ticker} Balance Sheet",
+        title=f"{ticker} Cash flow",
         show_index=True,
     )
 

openbb_terminal/stocks/fundamental_analysis/fa_controller.py

@@ -123,11 +123,11 @@ def print_help(self):
         mt.add_cmd("splits", "Yahoo Finance", not self.suffix)
         mt.add_cmd("web", "Yahoo Finance", not self.suffix)
         mt.add_cmd("hq", "Yahoo Finance", not self.suffix)
-        mt.add_cmd("income", "Alpha Vantage / Polygon")
-        mt.add_cmd("balance", "Alpha Vantage / Polygon")
+        mt.add_cmd("income", "Alpha Vantage / Polygon / Yahoo Finance")
+        mt.add_cmd("balance", "Alpha Vantage / Polygon / Yahoo Finance")
         mt.add_cmd("overview", "Alpha Vantage")
         mt.add_cmd("key", "Alpha Vantage")
-        mt.add_cmd("cash", "Alpha Vantage")
+        mt.add_cmd("cash", "Alpha Vantage / Yahoo Finance")
         mt.add_cmd("earnings", "Alpha Vantage")
         mt.add_cmd("fraud", "Alpha Vantage")
         mt.add_cmd("dupont", "Alpha Vantage")
@@ -197,7 +197,7 @@ def call_data(self, other_args: List[str]):
                 ROI, 52W High, Beta, Quick Ratio, Sales past 5Y, Gross Margin, 52W Low, ATR,
                 Employees, Current Ratio, Sales Q/Q, Operating Margin, RSI (14), Volatility, Optionable,
                 Debt/Eq, EPS Q/Q, Profit Margin, Rel Volume, Prev Close, Shortable, LT Debt/Eq,
-                Earnings, Payout, Avg Volume, Price, Recomendation, SMA20, SMA50, SMA200, Volume, Change.
+                Earnings, Payout, Avg Volume, Price, Recommendation, SMA20, SMA50, SMA200, Volume, Change.
                 [Source: Finviz]
             """,
         )
@@ -528,12 +528,19 @@ def call_income(self, other_args: List[str]):
             dest="b_quarter",
             help="Quarter fundamental data flag.",
         )
+        parser.add_argument(
+            "-s",
+            "--source",
+            default="av",
+            dest="source",
+            choices=["polygon", "av", "yf"],
+            help="The source to get the data from",
+        )
         ns_parser = self.parse_known_args_and_warn(
             parser,
             other_args,
             export_allowed=EXPORT_ONLY_RAW_DATA_ALLOWED,
             limit=5,
-            sources=["polygon", "av"],
         )
         if ns_parser:
             if ns_parser.source == "av":
@@ -551,6 +558,12 @@ def call_income(self, other_args: List[str]):
                     quarterly=ns_parser.b_quarter,
                     export=ns_parser.export,
                 )
+            elif ns_parser.source == "yf":
+                yahoo_finance_view.display_fundamentals(
+                    ticker=self.ticker,
+                    financial="financials",
+                    export=ns_parser.export,
+                )
 
     @log_start_end(log=logger)
     def call_balance(self, other_args: List[str]):
@@ -584,12 +597,19 @@ def call_balance(self, other_args: List[str]):
             dest="b_quarter",
             help="Quarter fundamental data flag.",
         )
+        parser.add_argument(
+            "-s",
+            "--source",
+            default="av",
+            dest="source",
+            choices=["polygon", "av", "yf"],
+            help="The source to get the data from",
+        )
         ns_parser = self.parse_known_args_and_warn(
             parser,
             other_args,
             export_allowed=EXPORT_ONLY_RAW_DATA_ALLOWED,
             limit=5,
-            sources=["polygon", "av"],
         )
         if ns_parser:
             if ns_parser.source == "av":
@@ -607,6 +627,12 @@ def call_balance(self, other_args: List[str]):
                     quarterly=ns_parser.b_quarter,
                     export=ns_parser.export,
                 )
+            elif ns_parser.source == "yf":
+                yahoo_finance_view.display_fundamentals(
+                    ticker=self.ticker,
+                    financial="balance-sheet",
+                    export=ns_parser.export,
+                )
 
     @log_start_end(log=logger)
     def call_cash(self, other_args: List[str]):
@@ -647,16 +673,41 @@ def call_cash(self, other_args: List[str]):
             dest="b_quarter",
             help="Quarter fundamental data flag.",
         )
+        parser.add_argument(
+            "-s",
+            "--source",
+            default="av",
+            dest="source",
+            choices=["polygon", "av", "yf"],
+            help="The source to get the data from",
+        )
         ns_parser = self.parse_known_args_and_warn(
-            parser, other_args, export_allowed=EXPORT_ONLY_RAW_DATA_ALLOWED
+            parser,
+            other_args,
+            export_allowed=EXPORT_ONLY_RAW_DATA_ALLOWED,
         )
         if ns_parser:
-            av_view.display_cash_flow(
-                ticker=self.ticker,
-                limit=ns_parser.limit,
-                quarterly=ns_parser.b_quarter,
-                export=ns_parser.export,
-            )
+            if ns_parser.source == "av":
+                av_view.display_cash_flow(
+                    ticker=self.ticker,
+                    limit=ns_parser.limit,
+                    quarterly=ns_parser.b_quarter,
+                    export=ns_parser.export,
+                )
+            elif ns_parser.source == "polygon":
+                polygon_view.display_fundamentals(
+                    ticker=self.ticker,
+                    financial="cash",
+                    limit=ns_parser.limit,
+                    quarterly=ns_parser.b_quarter,
+                    export=ns_parser.export,
+                )
+            elif ns_parser.source == "yf":
+                yahoo_finance_view.display_fundamentals(
+                    ticker=self.ticker,
+                    financial="cash-flow",
+                    export=ns_parser.export,
+                )
 
     @log_start_end(log=logger)
     def call_earnings(self, other_args: List[str]):
@@ -688,7 +739,9 @@ def call_earnings(self, other_args: List[str]):
             help="Number of latest info",
         )
         ns_parser = self.parse_known_args_and_warn(
-            parser, other_args, EXPORT_ONLY_RAW_DATA_ALLOWED
+            parser,
+            other_args,
+            EXPORT_ONLY_RAW_DATA_ALLOWED,
         )
         if ns_parser:
             av_view.display_earnings(