From f7d003d3148993288a81060fe41a2bfa51f97e68 Mon Sep 17 00:00:00 2001 From: Igor Radovanovic <74266147+IgorWounds@users.noreply.github.com> Date: Mon, 24 Jul 2023 13:08:45 +0200 Subject: [PATCH] More fixes --- .../fmp/openbb_fmp/dividend_calendar.py | 5 +- .../fmp/openbb_fmp/historical_employees.py | 4 +- .../openbb_core/app/static/package/app.py | 1 + .../openbb_core/app/static/package/economy.py | 58 +++++++++---------- 4 files changed, 37 insertions(+), 31 deletions(-) diff --git a/openbb_sdk/providers/fmp/openbb_fmp/dividend_calendar.py b/openbb_sdk/providers/fmp/openbb_fmp/dividend_calendar.py index 2f7a3bcb7e8..943abbb35f6 100644 --- a/openbb_sdk/providers/fmp/openbb_fmp/dividend_calendar.py +++ b/openbb_sdk/providers/fmp/openbb_fmp/dividend_calendar.py @@ -77,8 +77,11 @@ class FMPDividendCalendarFetcher( @staticmethod def extract_data( - query: FMPDividendCalendarQueryParams, api_key: str + query: FMPDividendCalendarQueryParams, credentials: Optional[Dict[str, str]] ) -> List[FMPDividendCalendarData]: + if credentials: + api_key = credentials.get("fmp_api_key") + base_url = "https://financialmodelingprep.com/api/v3" query_str = get_querystring(query.dict(), []) query_str = query_str.replace("start_date", "from").replace("end_date", "to") diff --git a/openbb_sdk/providers/fmp/openbb_fmp/historical_employees.py b/openbb_sdk/providers/fmp/openbb_fmp/historical_employees.py index 03c011dc8ed..4ca11964664 100644 --- a/openbb_sdk/providers/fmp/openbb_fmp/historical_employees.py +++ b/openbb_sdk/providers/fmp/openbb_fmp/historical_employees.py @@ -4,6 +4,8 @@ from datetime import date, datetime from typing import Dict, List, Optional +from openbb_provider.abstract.data import Data + # IMPORT INTERNAL from openbb_provider.abstract.fetcher import Fetcher from openbb_provider.helpers import data_transformer @@ -30,7 +32,7 @@ class FMPHistoricalEmployeesQueryParams(HistoricalEmployeesQueryParams): """ -class FMPHistoricalEmployeesData(HistoricalEmployeesData): +class FMPHistoricalEmployeesData(Data): """FMP Historical Employees data.""" symbol: str = Field(min_length=1) diff --git a/openbb_sdk/sdk/core/openbb_core/app/static/package/app.py b/openbb_sdk/sdk/core/openbb_core/app/static/package/app.py index ee43e2858d0..6069317f43e 100644 --- a/openbb_sdk/sdk/core/openbb_core/app/static/package/app.py +++ b/openbb_sdk/sdk/core/openbb_core/app/static/package/app.py @@ -1,6 +1,7 @@ ### THIS FILE IS AUTO-GENERATED. DO NOT EDIT. ### + from openbb_core.app.static.container import Container diff --git a/openbb_sdk/sdk/core/openbb_core/app/static/package/economy.py b/openbb_sdk/sdk/core/openbb_core/app/static/package/economy.py index b4f51806230..11df89bf756 100644 --- a/openbb_sdk/sdk/core/openbb_core/app/static/package/economy.py +++ b/openbb_sdk/sdk/core/openbb_core/app/static/package/economy.py @@ -19,7 +19,7 @@ class CLASS_economy(Container): def corecpi( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """CORECPI.""" inputs = filter_inputs( @@ -248,7 +248,7 @@ class CLASS_economy(Container): def cpi_options( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """Get the options for v3 cpi(options=True)""" inputs = filter_inputs( @@ -448,7 +448,7 @@ class CLASS_economy(Container): def macro( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """Query EconDB for macro data.""" inputs = filter_inputs( @@ -470,7 +470,7 @@ class CLASS_economy(Container): def macro_countries( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """MACRO_COUNTRIES.""" inputs = filter_inputs( @@ -492,7 +492,7 @@ class CLASS_economy(Container): def macro_parameters( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """MACRO_PARAMETERS.""" inputs = filter_inputs( @@ -514,7 +514,7 @@ class CLASS_economy(Container): def balance( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """BALANCE.""" inputs = filter_inputs( @@ -536,7 +536,7 @@ class CLASS_economy(Container): def bigmac( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """BIGMAC.""" inputs = filter_inputs( @@ -558,7 +558,7 @@ class CLASS_economy(Container): def country_codes( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """COUNTRY_CODES.""" inputs = filter_inputs( @@ -580,7 +580,7 @@ class CLASS_economy(Container): def currencies( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """CURRENCIES.""" inputs = filter_inputs( @@ -602,7 +602,7 @@ class CLASS_economy(Container): def debt( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """DEBT.""" inputs = filter_inputs( @@ -624,7 +624,7 @@ class CLASS_economy(Container): def events( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """EVENTS.""" inputs = filter_inputs( @@ -646,7 +646,7 @@ class CLASS_economy(Container): def fgdp( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """FGDP.""" inputs = filter_inputs( @@ -668,7 +668,7 @@ class CLASS_economy(Container): def fred( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """FRED.""" inputs = filter_inputs( @@ -690,7 +690,7 @@ class CLASS_economy(Container): def fred_search( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """FRED Search (was fred_notes).""" inputs = filter_inputs( @@ -712,7 +712,7 @@ class CLASS_economy(Container): def futures( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """FUTURES. 2 sources""" inputs = filter_inputs( @@ -734,7 +734,7 @@ class CLASS_economy(Container): def gdp( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """GDP.""" inputs = filter_inputs( @@ -756,7 +756,7 @@ class CLASS_economy(Container): def glbonds( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """GLBONDS.""" inputs = filter_inputs( @@ -778,7 +778,7 @@ class CLASS_economy(Container): def indices( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """INDICES.""" inputs = filter_inputs( @@ -800,7 +800,7 @@ class CLASS_economy(Container): def overview( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """OVERVIEW.""" inputs = filter_inputs( @@ -822,7 +822,7 @@ class CLASS_economy(Container): def perfmap( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """PERFMAP.""" inputs = filter_inputs( @@ -844,7 +844,7 @@ class CLASS_economy(Container): def performance( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """PERFORMANCE.""" inputs = filter_inputs( @@ -866,7 +866,7 @@ class CLASS_economy(Container): def revenue( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """REVENUE.""" inputs = filter_inputs( @@ -888,7 +888,7 @@ class CLASS_economy(Container): def rgdp( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """RGDP.""" inputs = filter_inputs( @@ -910,7 +910,7 @@ class CLASS_economy(Container): def rtps( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """RTPS.""" inputs = filter_inputs( @@ -932,7 +932,7 @@ class CLASS_economy(Container): def search_index( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """SEARCH_INDEX.""" inputs = filter_inputs( @@ -954,7 +954,7 @@ class CLASS_economy(Container): def spending( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """SPENDING.""" inputs = filter_inputs( @@ -976,7 +976,7 @@ class CLASS_economy(Container): def trust( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """TRUST.""" inputs = filter_inputs( @@ -998,7 +998,7 @@ class CLASS_economy(Container): def usbonds( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """USBONDS.""" inputs = filter_inputs( @@ -1020,7 +1020,7 @@ class CLASS_economy(Container): def valuation( self, chart: bool = False, - provider: Optional[Literal["benzinga", "fmp", "fred", "polygon"]] = None, + provider: Optional[Literal["fmp", "fred", "benzinga", "polygon"]] = None, ) -> CommandOutput[openbb_core.app.model.results.empty.Empty]: """VALUATION.""" inputs = filter_inputs(