From c38e3908a87c24a600bc0d1ca681d0d88151a6a8 Mon Sep 17 00:00:00 2001 From: Igor Radovanovic <74266147+IgorWounds@users.noreply.github.com> Date: Fri, 18 Aug 2023 14:48:13 +0200 Subject: [PATCH] Fix more mypy warnings --- .../openbb_charting/core/openbb_figure_table.py | 3 +++ .../providers/cboe/openbb_cboe/models/stock_info.py | 4 ++-- .../fmp/openbb_fmp/models/financial_ratios.py | 4 +++- .../providers/fmp/openbb_fmp/models/stock_peers.py | 5 ++--- .../providers/fmp/openbb_fmp/models/stock_quote.py | 5 ++--- .../polygon/openbb_polygon/models/cash_flow.py | 2 +- .../polygon/openbb_polygon/models/crypto_eod.py | 2 +- .../polygon/openbb_polygon/models/income_statement.py | 8 ++++---- .../polygon/openbb_polygon/models/major_indices_eod.py | 2 +- .../polygon/openbb_polygon/models/stock_news.py | 2 +- .../sdk/core/openbb_core/app/logs/utils/utils.py | 6 +++--- openbb_sdk/sdk/core/openbb_core/app/router.py | 10 ++++++---- .../openbb_provider/standard_models/stock_quote.py | 4 +--- 13 files changed, 30 insertions(+), 27 deletions(-) diff --git a/openbb_sdk/extensions/charting/openbb_charting/core/openbb_figure_table.py b/openbb_sdk/extensions/charting/openbb_charting/core/openbb_figure_table.py index aad63f1a374..9c2fa38c138 100644 --- a/openbb_sdk/extensions/charting/openbb_charting/core/openbb_figure_table.py +++ b/openbb_sdk/extensions/charting/openbb_charting/core/openbb_figure_table.py @@ -29,6 +29,7 @@ class OpenBBFigureTable(OpenBBFigure): if not self._backend.isatty: tmp_fig = self.to_table() tmp_fig.show() + return None else: # Make a copy of the dataframe to avoid SettingWithCopyWarning df = self._tabular_data.copy() @@ -81,6 +82,8 @@ class OpenBBFigureTable(OpenBBFigure): theme=self._charting_settings.table_style, ) + return None + def to_table( self, print_index: bool = True, diff --git a/openbb_sdk/providers/cboe/openbb_cboe/models/stock_info.py b/openbb_sdk/providers/cboe/openbb_cboe/models/stock_info.py index f751bb0b8ac..38ffd825740 100644 --- a/openbb_sdk/providers/cboe/openbb_cboe/models/stock_info.py +++ b/openbb_sdk/providers/cboe/openbb_cboe/models/stock_info.py @@ -101,7 +101,7 @@ class CboeStockInfoFetcher( return get_info(query.symbol).to_dict() @staticmethod - def transform_data(data: dict) -> CboeStockInfoData: + def transform_data(data: dict) -> List[CboeStockInfoData]: """Transform the data to the standard format""" - return CboeStockInfoData.parse_obj(data) + return [CboeStockInfoData.parse_obj(data)] diff --git a/openbb_sdk/providers/fmp/openbb_fmp/models/financial_ratios.py b/openbb_sdk/providers/fmp/openbb_fmp/models/financial_ratios.py index 983af71fe96..07f2de2123c 100644 --- a/openbb_sdk/providers/fmp/openbb_fmp/models/financial_ratios.py +++ b/openbb_sdk/providers/fmp/openbb_fmp/models/financial_ratios.py @@ -111,7 +111,9 @@ class FMPFinancialRatiosFetcher( api_key = credentials.get("fmp_api_key") if credentials else "" - query.period = "annual" if query.period == "annually" else "quarter" + query.period = ( + "annual" if query.period == "annually" else "quarter" # mypy: ignore + ) base_url = "https://financialmodelingprep.com/api/v3" data: List[Dict] = [] diff --git a/openbb_sdk/providers/fmp/openbb_fmp/models/stock_peers.py b/openbb_sdk/providers/fmp/openbb_fmp/models/stock_peers.py index a7da197b7ef..d40dc4e7a3c 100644 --- a/openbb_sdk/providers/fmp/openbb_fmp/models/stock_peers.py +++ b/openbb_sdk/providers/fmp/openbb_fmp/models/stock_peers.py @@ -58,7 +58,6 @@ class FMPStockPeersFetcher( return get_data_one(url, **kwargs) @staticmethod - def transform_data(data: Dict) -> StockPeersData: + def transform_data(data: Dict) -> FMPStockPeersData: """Return the transformed data.""" - - return StockPeersData(**data) + return FMPStockPeersData(**data) diff --git a/openbb_sdk/providers/fmp/openbb_fmp/models/stock_quote.py b/openbb_sdk/providers/fmp/openbb_fmp/models/stock_quote.py index 4b7d19c583b..a1cdee346e9 100644 --- a/openbb_sdk/providers/fmp/openbb_fmp/models/stock_quote.py +++ b/openbb_sdk/providers/fmp/openbb_fmp/models/stock_quote.py @@ -80,7 +80,6 @@ class FMPStockQuoteFetcher( return get_data_many(url, **kwargs) @staticmethod - def transform_data(data: List[Dict]) -> List[StockQuoteData]: + def transform_data(data: List[Dict]) -> List[FMPStockQuoteData]: """Return the transformed data.""" - - return [StockQuoteData(**d) for d in data] + return [FMPStockQuoteData(**d) for d in data] diff --git a/openbb_sdk/providers/polygon/openbb_polygon/models/cash_flow.py b/openbb_sdk/providers/polygon/openbb_polygon/models/cash_flow.py index 367a804c505..70bf46e90d9 100644 --- a/openbb_sdk/providers/polygon/openbb_polygon/models/cash_flow.py +++ b/openbb_sdk/providers/polygon/openbb_polygon/models/cash_flow.py @@ -61,7 +61,7 @@ class PolygonCashFlowStatementFetcher( @staticmethod def transform_data( data: dict, - ) -> List[CashFlowStatementData]: + ) -> List[PolygonCashFlowStatementData]: FIELDS = [ "net_cash_flow_from_financing_activities", "net_cash_flow_from_investing_activities", diff --git a/openbb_sdk/providers/polygon/openbb_polygon/models/crypto_eod.py b/openbb_sdk/providers/polygon/openbb_polygon/models/crypto_eod.py index 26fe1b9af9a..178b7efee36 100644 --- a/openbb_sdk/providers/polygon/openbb_polygon/models/crypto_eod.py +++ b/openbb_sdk/providers/polygon/openbb_polygon/models/crypto_eod.py @@ -106,5 +106,5 @@ class PolygonCryptoEODFetcher( return data @staticmethod - def transform_data(data: dict) -> List[CryptoEODData]: + def transform_data(data: dict) -> List[PolygonCryptoEODData]: return [PolygonCryptoEODData.parse_obj(d) for d in data.get("results", [])] diff --git a/openbb_sdk/providers/polygon/openbb_polygon/models/income_statement.py b/openbb_sdk/providers/polygon/openbb_polygon/models/income_statement.py index 47754f85008..a80238fa470 100644 --- a/openbb_sdk/providers/polygon/openbb_polygon/models/income_statement.py +++ b/openbb_sdk/providers/polygon/openbb_polygon/models/income_statement.py @@ -34,9 +34,9 @@ class PolygonIncomeStatementData(IncomeStatementData): # tickers: Optional[List[str]] cik: Optional[str] filing_date: Optional[dateType] - cost_of_revenue: Optional[float] - gross_profit: Optional[float] - operating_expenses: Optional[float] + cost_of_revenue: Optional[int] + gross_profit: Optional[int] + operating_expenses: Optional[int] income_loss_from_continuing_operations_after_tax: Optional[float] benefits_costs_expenses: Optional[float] net_income_loss_attributable_to_noncontrolling_interest: Optional[int] @@ -87,7 +87,7 @@ class PolygonIncomeStatementFetcher( @staticmethod def transform_data( data: dict, - ) -> List[IncomeStatementData]: + ) -> List[PolygonIncomeStatementData]: FIELDS = [ "revenues", "cost_of_revenue", diff --git a/openbb_sdk/providers/polygon/openbb_polygon/models/major_indices_eod.py b/openbb_sdk/providers/polygon/openbb_polygon/models/major_indices_eod.py index 0d743aaa94f..8e3165432bd 100644 --- a/openbb_sdk/providers/polygon/openbb_polygon/models/major_indices_eod.py +++ b/openbb_sdk/providers/polygon/openbb_polygon/models/major_indices_eod.py @@ -104,7 +104,7 @@ class PolygonMajorIndicesEODFetcher( @staticmethod def transform_data( data: dict, - ) -> List[MajorIndicesEODData]: + ) -> List[PolygonMajorIndicesEODData]: return [ PolygonMajorIndicesEODData.parse_obj(d) for d in data.get("results", []) ] diff --git a/openbb_sdk/providers/polygon/openbb_polygon/models/stock_news.py b/openbb_sdk/providers/polygon/openbb_polygon/models/stock_news.py index ec6727a3c79..617315ef15c 100644 --- a/openbb_sdk/providers/polygon/openbb_polygon/models/stock_news.py +++ b/openbb_sdk/providers/polygon/openbb_polygon/models/stock_news.py @@ -115,5 +115,5 @@ class PolygonStockNewsFetcher( @staticmethod def transform_data( data: dict, - ) -> List[StockNewsData]: + ) -> List[PolygonStockNewsData]: return [PolygonStockNewsData(**d) for d in data] diff --git a/openbb_sdk/sdk/core/openbb_core/app/logs/utils/utils.py b/openbb_sdk/sdk/core/openbb_core/app/logs/utils/utils.py index 500ee3f08e5..4cdd9fe168b 100644 --- a/openbb_sdk/sdk/core/openbb_core/app/logs/utils/utils.py +++ b/openbb_sdk/sdk/core/openbb_core/app/logs/utils/utils.py @@ -1,7 +1,7 @@ # IMPORT STANDARD import time import uuid -from pathlib import Path +from pathlib import Path, PosixPath # IMPORT THIRD-PARTY # IMPORT INTERNAL @@ -31,7 +31,7 @@ def get_app_id(contextual_user_data_directory: str) -> str: return app_id -def get_log_dir(contextual_user_data_directory: str) -> str: +def get_log_dir(contextual_user_data_directory: str) -> PosixPath: """Retrieve application's log directory.""" log_dir = create_log_dir_if_not_exists(contextual_user_data_directory) @@ -64,7 +64,7 @@ def get_log_id(log_dir): return (log_dir / ".logid").absolute() -def create_uuid_dir_if_not_exists(log_dir, logging_id) -> str: +def create_uuid_dir_if_not_exists(log_dir, logging_id) -> PosixPath: uuid_log_dir = (log_dir / logging_id).absolute() if not uuid_log_dir.is_dir(): diff --git a/openbb_sdk/sdk/core/openbb_core/app/router.py b/openbb_sdk/sdk/core/openbb_core/app/router.py index a6facb3e056..30dc10361b2 100644 --- a/openbb_sdk/sdk/core/openbb_core/app/router.py +++ b/openbb_sdk/sdk/core/openbb_core/app/router.py @@ -389,9 +389,9 @@ class CommandMap: coverage_map[provider] = [] if hasattr(route, "path"): rp = ( - route.path + route.path # type: ignore if sep is None - else route.path.replace("/", sep) + else route.path.replace("/", sep) # type: ignore ) coverage_map[provider].append(rp) @@ -416,8 +416,10 @@ class CommandMap: providers.remove("openbb") if hasattr(route, "path"): - rp = route.path if sep is None else route.path.replace("/", sep) - if route.path not in coverage_map: + rp = ( + route.path if sep is None else route.path.replace("/", sep) # type: ignore + ) + if route.path not in coverage_map: # type: ignore coverage_map[rp] = [] coverage_map[rp] = providers return coverage_map diff --git a/openbb_sdk/sdk/provider/openbb_provider/standard_models/stock_quote.py b/openbb_sdk/sdk/provider/openbb_provider/standard_models/stock_quote.py index e7e8c9cd518..81a5394ac16 100644 --- a/openbb_sdk/sdk/provider/openbb_provider/standard_models/stock_quote.py +++ b/openbb_sdk/sdk/provider/openbb_provider/standard_models/stock_quote.py @@ -21,9 +21,7 @@ class StockQuoteQueryParams(QueryParams, BaseSymbol): Comma separated list of symbols. """ - symbol: Optional[str] = Field( - default=None, description="Comma separated list of symbols." - ) + symbol: str = Field(default=None, description="Comma separated list of symbols.") class StockQuoteData(Data):