Hotfix/4526

openbb_terminal/core/sdk/models/stocks_sdk_model.py

@@ -173,8 +173,6 @@ def __init__(self):
         self.arkord = lib.stocks_disc_ark_model.get_ark_orders
         self.asc = lib.stocks_disc_yahoofinance_model.get_asc
         self.dividends = lib.stocks_disc_nasdaq_model.get_dividend_cal
-        self.filings = lib.stocks_fa_fmp_model.get_filings
-        self.filings_chart = lib.stocks_disc_fmp_view.display_filings
         self.fipo = lib.stocks_disc_finnhub_model.get_future_ipo
         self.gainers = lib.stocks_disc_yahoofinance_model.get_gainers
         self.gtech = lib.stocks_disc_yahoofinance_model.get_gtech
@@ -334,8 +332,6 @@ def __init__(self):
         self.rot_chart = lib.stocks_fa_finnhub_view.rating_over_time
         self.score = lib.stocks_fa_fmp_model.get_score
         self.sec = lib.stocks_fa_marketwatch_model.get_sec_filings
-        self.sec_fmp = lib.stocks_fa_fmp_model.get_filings
-        self.sec_fmp_chart = lib.stocks_fa_fmp_view.display_filings
         self.shrs = lib.stocks_fa_yahoo_finance_model.get_shareholders
         self.similar_dfs = lib.stocks_fa_dcf_model.get_similar_dfs
         self.splits = lib.stocks_fa_yahoo_finance_model.get_splits

openbb_terminal/core/sdk/sdk_init.py

@@ -322,7 +322,6 @@
 from openbb_terminal.stocks.discovery import (
     ark_model as stocks_disc_ark_model,
     finnhub_model as stocks_disc_finnhub_model,
-    fmp_view as stocks_disc_fmp_view,
     nasdaq_model as stocks_disc_nasdaq_model,
     seeking_alpha_model as stocks_disc_seeking_alpha_model,
     shortinterest_model as stocks_disc_shortinterest_model,

openbb_terminal/core/sdk/trail_map.csv

@@ -411,7 +411,6 @@ stocks.disc.active,stocks_disc_yahoofinance_model.get_active,
 stocks.disc.arkord,stocks_disc_ark_model.get_ark_orders,
 stocks.disc.asc,stocks_disc_yahoofinance_model.get_asc,
 stocks.disc.dividends,stocks_disc_nasdaq_model.get_dividend_cal,
-stocks.disc.filings,stocks_fa_fmp_model.get_filings,stocks_disc_fmp_view.display_filings
 stocks.disc.fipo,stocks_disc_finnhub_model.get_future_ipo,
 stocks.disc.gainers,stocks_disc_yahoofinance_model.get_gainers,
 stocks.disc.gtech,stocks_disc_yahoofinance_model.get_gtech,
@@ -473,7 +472,6 @@ stocks.fa.revfc,stocks_fa_seeking_alpha_model.get_estimates_rev,
 stocks.fa.rot,stocks_fa_finnhub_model.get_rating_over_time,stocks_fa_finnhub_view.rating_over_time
 stocks.fa.score,stocks_fa_fmp_model.get_score,
 stocks.fa.sec,stocks_fa_marketwatch_model.get_sec_filings,
-stocks.fa.sec_fmp,stocks_fa_fmp_model.get_filings,stocks_fa_fmp_view.display_filings
 stocks.fa.shrs,stocks_fa_yahoo_finance_model.get_shareholders,
 stocks.fa.similar_dfs,stocks_fa_dcf_model.get_similar_dfs,
 stocks.fa.splits,stocks_fa_yahoo_finance_model.get_splits,stocks_fa_yahoo_finance_view.display_splits

openbb_terminal/miscellaneous/sources/openbb_default.json

@@ -666,8 +666,7 @@
         "AlphaVantage"
       ],
       "sec": [
-        "MarketWatch",
-        "FinancialModelingPrep"
+        "Nasdaq"
       ],
       "analysis": [
         "Elect"

openbb_terminal/stocks/discovery/disc_controller.py

@@ -25,7 +25,6 @@
     ark_view,
     finnhub_view,
     finviz_view,
-    fmp_view,
     nasdaq_view,
     seeking_alpha_view,
     shortinterest_view,
@@ -60,7 +59,6 @@ class DiscoveryController(BaseController):
         "rtat",
         "divcal",
         "heatmap",
-        "filings",
     ]
 
     arkord_sortby_choices = [
@@ -127,7 +125,6 @@ def __init__(self, queue: Optional[List[str]] = None):
     def print_help(self):
         """Print help"""
         mt = MenuText("stocks/disc/")
-        mt.add_cmd("filings", "FinancialModelingPrep")
         mt.add_cmd("pipo", "Finnhub")
         mt.add_cmd("fipo", "Finnhub")
         mt.add_cmd("gainers", "Yahoo Finance")
@@ -913,42 +910,3 @@ def call_heatmap(self, other_args: List[str]):
                 if ns_parser.sheet_name
                 else None,
             )
-
-    @log_start_end(log=logger)
-    def call_filings(self, other_args: List[str]) -> None:
-        """Process Filings command"""
-        parser = argparse.ArgumentParser(
-            add_help=False,
-            formatter_class=argparse.ArgumentDefaultsHelpFormatter,
-            prog="filings",
-            description="The most-recent filings submitted to the SEC",
-        )
-        parser.add_argument(
-            "-p",
-            "--pages",
-            dest="pages",
-            metavar="pages",
-            type=int,
-            default=1,
-            help="The number of pages to get data from (1000 entries/page; maximum 30 pages)",
-        )
-        parser.add_argument(
-            "-t",
-            "--today",
-            dest="today",
-            action="store_true",
-            default=False,
-            help="Show all filings from today",
-        )
-        if other_args and "-" not in other_args[0][0]:
-            other_args.insert(0, "-l")
-        ns_parser = self.parse_known_args_and_warn(
-            parser,
-            other_args,
-            EXPORT_ONLY_RAW_DATA_ALLOWED,
-            limit=5,
-        )
-        if ns_parser:
-            fmp_view.display_filings(
-                ns_parser.pages, ns_parser.limit, ns_parser.today, ns_parser.export
-            )

openbb_terminal/stocks/fundamental_analysis/fa_controller.py

@@ -32,6 +32,7 @@
     finviz_view,
     fmp_view,
     market_watch_view,
+    marketwatch_model,
     marketwatch_view,
     polygon_view,
     seeking_alpha_view,
@@ -2019,14 +2020,23 @@ def call_sec(self, other_args: List[str]):
             default=20,
             help="number of latest SEC filings.",
         )
-
         parser.add_argument(
-            "-p",
-            "--pages",
-            dest="pages",
+            "-y",
+            "--year",
+            action="store",
+            dest="year",
             type=check_positive,
-            default=5,
-            help="number of pages of SEC filings to search through, only relevant for FinancialModellingPrep.",
+            default=None,
+            help="year of SEC filings.",
+        )
+        parser.add_argument(
+            "-f",
+            "--form",
+            action="store",
+            dest="form",
+            type=str,
+            help="form group of SEC filings.",
+            choices=marketwatch_model.FORM_GROUP.keys(),
         )
 
         if other_args and "-" not in other_args[0][0]:
@@ -2043,25 +2053,16 @@ def call_sec(self, other_args: List[str]):
                 console.print(no_ticker_message)
                 return
 
-            if ns_parser.source == "MarketWatch":
-                marketwatch_view.sec_filings(
-                    symbol=ns_parser.ticker,
-                    limit=ns_parser.limit,
-                    export=ns_parser.export,
-                    sheet_name=" ".join(ns_parser.sheet_name)
-                    if ns_parser.sheet_name
-                    else None,
-                )
-            if ns_parser.source == "FinancialModelingPrep":
-                fmp_view.display_filings(
-                    ns_parser.ticker,
-                    ns_parser.pages,
-                    ns_parser.limit,
-                    ns_parser.export,
-                    sheet_name=" ".join(ns_parser.sheet_name)
-                    if ns_parser.sheet_name
-                    else None,
-                )
+            marketwatch_view.sec_filings(
+                symbol=ns_parser.ticker,
+                limit=ns_parser.limit,
+                export=ns_parser.export,
+                sheet_name=" ".join(ns_parser.sheet_name)
+                if ns_parser.sheet_name
+                else None,
+                year=ns_parser.year,
+                form_group=ns_parser.form,
+            )
 
     @log_start_end(log=logger)
     def call_supplier(self, other_args: List[str]):

openbb_terminal/stocks/fundamental_analysis/fmp_model.py

@@ -675,72 +675,6 @@ def clean_metrics_df(data: pd.DataFrame, num: int, mask: bool = False) -> pd.Dat
     return data
 
 
-@log_start_end(log=logger)
-@check_api_key(["API_KEY_FINANCIALMODELINGPREP"])
-def get_filings(
-    pages: int = 1,
-) -> pd.DataFrame:
-    """Get SEC Filings RSS feed, disseminated by FMP
-
-    Parameters
-    ----------
-    pages: range = 1
-        The range of most-rececnt pages to get entries from (1000 per page; maximum of 30 pages)
-
-    Returns
-    -------
-    df: pd.DataFrame
-        Dataframe of results
-
-    Examples
-    --------
-    df = openbb.stocks.filings()
-
-    df = openbb.stocks.filings(pages=30)
-    """
-    current_user = get_current_user()
-    temp = []
-    try:
-        for i in range(pages):
-            temp.append(
-                pd.read_json(
-                    "https://financialmodelingprep.com/api/v3/rss_feed?&page="
-                    f"{i}"
-                    "&apikey="
-                    f"{current_user.credentials.API_KEY_FINANCIALMODELINGPREP}"
-                )
-            )
-        df = pd.concat(temp)
-        df = df.rename(
-            columns={
-                "title": "Title",
-                "date": "Date",
-                "link": "URL",
-                "cik": "CIK",
-                "form_type": "Form Type",
-                "ticker": "Ticker",
-            },
-        )
-        df_columns = ["Date", "Ticker", "CIK", "Form Type", "Title", "URL"]
-        df = (
-            pd.DataFrame(df, columns=df_columns)
-            .set_index(keys=["Date"])
-            .copy()
-            .sort_index(ascending=False)
-        )
-
-        # Invalid API Keys
-    except ValueError as e:
-        console.print(e)
-        df = pd.DataFrame()
-        # Premium feature, API plan is not authorized
-    except HTTPError as e:
-        console.print(e)
-        df = pd.DataFrame()
-
-    return df
-
-
 @log_start_end(log=logger)
 @check_api_key(["API_KEY_FINANCIALMODELINGPREP"])
 def get_rating(symbol: str) -> pd.DataFrame: