From d89600768cc9d7f7c1ed97cb6fbafb6f18a25126 Mon Sep 17 00:00:00 2001 From: colin99d Date: Wed, 1 Feb 2023 14:05:09 -0500 Subject: [PATCH 1/3] Fixed isort --- custom_pre_commit/check_reserved_args.py | 6 +- jupyterlab/documentation/setup.py | 2 +- jupyterlab/openbb-settings/setup.py | 2 +- jupyterlab/openbb/setup.py | 2 +- openbb_terminal/alternative/alt_controller.py | 7 +- .../alternative/covid/covid_controller.py | 4 +- .../alternative/covid/covid_view.py | 7 +- .../alternative/hackernews_model.py | 4 +- .../alternative/oss/github_model.py | 5 +- .../alternative/oss/github_view.py | 15 ++-- .../alternative/oss/oss_controller.py | 10 +-- openbb_terminal/alternative/oss/runa_view.py | 11 +-- openbb_terminal/base_helpers.py | 2 +- .../behavioural_analysis/finbrain_model.py | 2 +- .../behavioural_analysis/finbrain_view.py | 9 +-- .../behavioural_analysis/finnhub_model.py | 2 +- .../behavioural_analysis/finnhub_view.py | 3 +- .../behavioural_analysis/google_view.py | 10 +-- .../behavioural_analysis/reddit_helpers.py | 2 +- .../behavioural_analysis/reddit_model.py | 2 +- .../behavioural_analysis/reddit_view.py | 7 +- .../behavioural_analysis/twitter_model.py | 2 +- .../behavioural_analysis/twitter_view.py | 6 +- openbb_terminal/common/common_model.py | 4 +- openbb_terminal/common/feedparser_model.py | 2 + openbb_terminal/common/feedparser_view.py | 2 +- openbb_terminal/common/newsapi_model.py | 5 +- openbb_terminal/common/newsapi_view.py | 8 +- .../common/quantitative_analysis/qa_model.py | 5 +- .../common/quantitative_analysis/qa_view.py | 14 ++-- .../quantitative_analysis/rolling_view.py | 6 +- .../custom_indicators_model.py | 2 +- .../custom_indicators_view.py | 11 ++- .../technical_analysis/momentum_model.py | 2 +- .../technical_analysis/momentum_view.py | 13 ++-- .../common/technical_analysis/overlap_view.py | 6 +- .../common/technical_analysis/ta_helpers.py | 2 +- .../trend_indicators_model.py | 2 +- .../trend_indicators_view.py | 9 +-- .../technical_analysis/volatility_model.py | 2 +- .../technical_analysis/volatility_view.py | 9 +-- .../common/technical_analysis/volume_model.py | 2 +- .../common/technical_analysis/volume_view.py | 9 +-- openbb_terminal/core/completer/choices.py | 1 + openbb_terminal/core/config/paths.py | 3 +- openbb_terminal/core/config/paths_helper.py | 6 +- openbb_terminal/core/library/breadcrumb.py | 11 ++- openbb_terminal/core/library/operation.py | 6 +- openbb_terminal/core/library/trail_map.py | 1 - .../core/log/collection/log_sender.py | 14 ++-- .../core/log/generation/directories.py | 1 + .../core/log/generation/expired_files.py | 1 - .../generation/formatter_with_exceptions.py | 1 - .../generation/path_tracking_file_handler.py | 7 +- .../core/log/generation/settings_logger.py | 7 +- openbb_terminal/core/scripts/sdk_audit.py | 9 ++- .../cryptocurrency/coinpaprika_helpers.py | 1 + .../cryptocurrency/crypto_controller.py | 8 +- .../cryptocurrency/crypto_models.py | 13 ++-- .../cryptocurrency/crypto_views.py | 2 +- .../cryptocurrency/cryptocurrency_helpers.py | 2 +- .../cryptocurrency/dataframe_helpers.py | 4 +- .../cryptocurrency/defi/coindix_model.py | 4 +- .../cryptocurrency/defi/cryptosaurio_model.py | 4 +- .../cryptocurrency/defi/cryptosaurio_view.py | 5 +- .../cryptocurrency/defi/defi_controller.py | 7 +- .../cryptocurrency/defi/graph_model.py | 2 +- .../cryptocurrency/defi/llama_model.py | 5 +- .../cryptocurrency/defi/llama_view.py | 2 +- .../cryptocurrency/defi/smartstake_model.py | 7 +- .../cryptocurrency/defi/smartstake_view.py | 14 ++-- .../cryptocurrency/defi/substack_model.py | 2 +- .../cryptocurrency/defi/terraengineer_view.py | 4 +- .../defi/terramoney_fcd_model.py | 6 +- .../defi/terramoney_fcd_view.py | 4 +- .../discovery/coinmarketcap_model.py | 2 +- .../discovery/coinmarketcap_view.py | 3 +- .../discovery/dappradar_model.py | 2 +- .../discovery/dappradar_view.py | 1 + .../discovery/discovery_controller.py | 6 +- .../discovery/pycoingecko_model.py | 2 + .../cryptocurrency/discovery/sdk_helpers.py | 1 + .../due_diligence/binance_model.py | 2 +- .../cryptocurrency/due_diligence/ccxt_view.py | 3 +- .../due_diligence/coinbase_view.py | 4 +- .../due_diligence/coinglass_view.py | 9 +-- .../due_diligence/coinpaprika_model.py | 2 +- .../due_diligence/cryptopanic_view.py | 5 +- .../due_diligence/dd_controller.py | 17 ++--- .../due_diligence/finbrain_crypto_view.py | 8 +- .../due_diligence/glassnode_model.py | 9 ++- .../due_diligence/glassnode_view.py | 7 +- .../due_diligence/messari_view.py | 16 ++-- .../due_diligence/pycoingecko_view.py | 2 + .../due_diligence/santiment_model.py | 4 +- .../due_diligence/santiment_view.py | 8 +- .../due_diligence/sdk_helper.py | 1 + .../due_diligence/tokenterminal_model.py | 5 +- .../due_diligence/tokenterminal_view.py | 13 ++-- .../cryptocurrency/nft/nftpricefloor_model.py | 2 +- .../cryptocurrency/nft/opensea_model.py | 2 +- .../cryptocurrency/onchain/bitquery_model.py | 4 +- .../cryptocurrency/onchain/bitquery_view.py | 5 +- .../onchain/blockchain_model.py | 2 +- .../cryptocurrency/onchain/blockchain_view.py | 6 +- .../onchain/ethgasstation_model.py | 2 +- .../cryptocurrency/onchain/ethplorer_model.py | 5 +- .../cryptocurrency/onchain/ethplorer_view.py | 3 +- .../onchain/onchain_controller.py | 5 +- .../cryptocurrency/onchain/shroom_model.py | 10 +-- .../cryptocurrency/onchain/shroom_view.py | 7 +- .../onchain/whale_alert_model.py | 6 +- .../onchain/whale_alert_view.py | 3 +- .../overview/blockchaincenter_model.py | 3 +- .../overview/blockchaincenter_view.py | 6 +- .../cryptocurrency/overview/coinbase_model.py | 2 + .../cryptocurrency/overview/coinbase_view.py | 3 +- .../overview/cryptopanic_model.py | 6 +- .../overview/cryptopanic_view.py | 3 +- .../overview/glassnode_model.py | 6 +- .../cryptocurrency/overview/glassnode_view.py | 7 +- .../cryptocurrency/overview/loanscan_view.py | 10 ++- .../overview/overview_controller.py | 19 +++-- .../overview/pycoingecko_view.py | 9 ++- .../cryptocurrency/overview/sdk_helpers.py | 3 +- .../overview/tokenterminal_model.py | 5 +- .../overview/tokenterminal_view.py | 11 ++- .../overview/withdrawalfees_model.py | 1 - .../cryptocurrency/pycoingecko_helpers.py | 11 +-- openbb_terminal/cryptocurrency/pyth_model.py | 5 +- .../quantitative_analysis/qa_controller.py | 7 +- .../technical_analysis/ta_controller.py | 7 +- .../cryptocurrency/tools/tools_controller.py | 7 +- .../cryptocurrency/tools/tools_view.py | 2 +- openbb_terminal/custom_prompt_toolkit.py | 8 +- .../dashboards/dashboards_controller.py | 2 +- openbb_terminal/dashboards/stream/forecast.py | 12 +-- openbb_terminal/dashboards/widget_helpers.py | 1 + openbb_terminal/decorators.py | 1 + .../econometrics/econometrics_model.py | 2 +- .../econometrics/regression_view.py | 2 +- openbb_terminal/economy/alphavantage_model.py | 2 +- openbb_terminal/economy/alphavantage_view.py | 10 +-- openbb_terminal/economy/commodity_view.py | 2 +- openbb_terminal/economy/econ_data_helper.py | 3 +- openbb_terminal/economy/econdb_model.py | 8 +- openbb_terminal/economy/econdb_view.py | 4 +- openbb_terminal/economy/economy_controller.py | 33 ++++---- openbb_terminal/economy/finnhub_model.py | 3 +- openbb_terminal/economy/finnhub_view.py | 3 +- openbb_terminal/economy/finviz_model.py | 4 +- openbb_terminal/economy/fred_model.py | 9 +-- openbb_terminal/economy/fred_view.py | 7 +- openbb_terminal/economy/investingcom_model.py | 9 +-- openbb_terminal/economy/investingcom_view.py | 11 ++- openbb_terminal/economy/nasdaq_model.py | 4 +- openbb_terminal/economy/nasdaq_view.py | 7 +- openbb_terminal/economy/plot_view.py | 4 +- .../quantitative_analysis/qa_controller.py | 9 +-- openbb_terminal/economy/sdk_helpers.py | 3 +- openbb_terminal/economy/yfinance_model.py | 2 +- openbb_terminal/economy/yfinance_view.py | 6 +- .../etf/discovery/disc_controller.py | 5 +- openbb_terminal/etf/etf_controller.py | 10 +-- .../etf/screener/screener_controller.py | 4 +- .../etf/screener/screener_model.py | 2 +- openbb_terminal/etf/stockanalysis_model.py | 2 +- .../etf/technical_analysis/ta_controller.py | 7 +- openbb_terminal/etf/yfinance_view.py | 6 +- openbb_terminal/featflags_controller.py | 2 +- openbb_terminal/forecast/anom_model.py | 8 +- openbb_terminal/forecast/anom_view.py | 13 ++-- openbb_terminal/forecast/autoarima_model.py | 9 +-- openbb_terminal/forecast/autoarima_view.py | 7 +- openbb_terminal/forecast/autoces_model.py | 10 +-- openbb_terminal/forecast/autoces_view.py | 7 +- openbb_terminal/forecast/autoets_model.py | 9 +-- openbb_terminal/forecast/autoets_view.py | 7 +- openbb_terminal/forecast/autoselect_model.py | 15 ++-- openbb_terminal/forecast/autoselect_view.py | 7 +- openbb_terminal/forecast/brnn_model.py | 6 +- openbb_terminal/forecast/brnn_view.py | 7 +- openbb_terminal/forecast/expo_model.py | 13 ++-- openbb_terminal/forecast/expo_view.py | 7 +- openbb_terminal/forecast/forecast_model.py | 14 ++-- openbb_terminal/forecast/forecast_view.py | 11 +-- openbb_terminal/forecast/helpers.py | 40 +++++----- openbb_terminal/forecast/linregr_model.py | 6 +- openbb_terminal/forecast/linregr_view.py | 7 +- openbb_terminal/forecast/mstl_model.py | 9 +-- openbb_terminal/forecast/mstl_view.py | 7 +- openbb_terminal/forecast/nbeats_model.py | 7 +- openbb_terminal/forecast/nbeats_view.py | 7 +- openbb_terminal/forecast/nhits_model.py | 7 +- openbb_terminal/forecast/nhits_view.py | 7 +- openbb_terminal/forecast/regr_model.py | 6 +- openbb_terminal/forecast/regr_view.py | 7 +- openbb_terminal/forecast/rnn_model.py | 6 +- openbb_terminal/forecast/rnn_view.py | 7 +- openbb_terminal/forecast/rwd_model.py | 9 +-- openbb_terminal/forecast/rwd_view.py | 7 +- .../forecast/seasonalnaive_model.py | 10 +-- .../forecast/seasonalnaive_view.py | 7 +- openbb_terminal/forecast/tcn_model.py | 6 +- openbb_terminal/forecast/tcn_view.py | 7 +- openbb_terminal/forecast/tft_model.py | 8 +- openbb_terminal/forecast/tft_view.py | 7 +- openbb_terminal/forecast/theta_model.py | 10 +-- openbb_terminal/forecast/theta_view.py | 7 +- openbb_terminal/forecast/trans_model.py | 6 +- openbb_terminal/forecast/trans_view.py | 7 +- openbb_terminal/forex/av_model.py | 2 +- openbb_terminal/forex/av_view.py | 3 +- openbb_terminal/forex/forex_controller.py | 16 ++-- openbb_terminal/forex/forex_helper.py | 24 +++--- openbb_terminal/forex/fxempire_model.py | 1 + openbb_terminal/forex/fxempire_view.py | 5 +- .../forex/oanda/oanda_controller.py | 2 +- openbb_terminal/forex/oanda/oanda_view.py | 9 +-- openbb_terminal/forex/polygon_model.py | 4 +- .../quantitative_analysis/qa_controller.py | 6 +- openbb_terminal/forex/sdk_helpers.py | 1 + .../forex/technical_analysis/ta_controller.py | 11 ++- openbb_terminal/futures/futures_controller.py | 12 ++- openbb_terminal/futures/yfinance_model.py | 10 +-- openbb_terminal/futures/yfinance_view.py | 10 +-- openbb_terminal/helper_classes.py | 6 +- openbb_terminal/helper_funcs.py | 49 ++++++------ openbb_terminal/helpers_denomination.py | 3 +- openbb_terminal/keys_controller.py | 6 +- openbb_terminal/keys_model.py | 33 ++++---- openbb_terminal/keys_view.py | 2 +- openbb_terminal/loggers.py | 16 ++-- openbb_terminal/menu.py | 4 +- openbb_terminal/mutual_funds/avanza_view.py | 2 +- .../mutual_funds/investpy_model.py | 2 +- openbb_terminal/mutual_funds/investpy_view.py | 4 +- .../mutual_funds/mutual_fund_controller.py | 7 +- openbb_terminal/parent_classes.py | 12 +-- .../portfolio/attribution_model.py | 6 +- .../portfolio/brokers/ally/ally_controller.py | 5 +- .../portfolio/brokers/bro_controller.py | 2 +- .../portfolio/brokers/brokers_helpers.py | 1 + .../brokers/coinbase/coinbase_controller.py | 5 +- .../brokers/coinbase/coinbase_model.py | 4 +- .../brokers/coinbase/coinbase_view.py | 3 +- .../brokers/degiro/degiro_controller.py | 3 +- .../portfolio/brokers/degiro/degiro_model.py | 4 +- .../portfolio/brokers/degiro/degiro_view.py | 5 +- .../brokers/robinhood/robinhood_controller.py | 8 +- .../brokers/robinhood/robinhood_view.py | 2 +- openbb_terminal/portfolio/metrics_model.py | 8 +- .../portfolio_analysis/reportlab_helpers.py | 2 +- .../portfolio_analysis/yfinance_model.py | 5 +- .../portfolio/portfolio_controller.py | 18 ++--- openbb_terminal/portfolio/portfolio_engine.py | 15 ++-- openbb_terminal/portfolio/portfolio_helper.py | 10 +-- openbb_terminal/portfolio/portfolio_model.py | 8 +- .../optimizer_helper.py | 3 +- .../parameters/params_controller.py | 10 +-- .../parameters/params_helpers.py | 9 ++- .../parameters/params_view.py | 6 +- .../portfolio_optimization/po_controller.py | 11 ++- .../portfolio_optimization/po_engine.py | 4 +- .../portfolio_optimization/statics.py | 2 +- .../yahoo_finance_model.py | 2 +- openbb_terminal/portfolio/portfolio_view.py | 75 +++++++++---------- openbb_terminal/reports/reports_controller.py | 4 +- openbb_terminal/reports/reports_model.py | 13 ++-- openbb_terminal/reports/widget_helpers.py | 3 +- openbb_terminal/rich_config.py | 8 +- openbb_terminal/sdk.py | 12 ++- openbb_terminal/settings_controller.py | 9 ++- openbb_terminal/sources_controller.py | 5 +- .../stocks/backtesting/bt_controller.py | 10 +-- .../stocks/backtesting/bt_model.py | 2 +- openbb_terminal/stocks/backtesting/bt_view.py | 4 +- .../behavioural_analysis/ba_controller.py | 7 +- .../behavioural_analysis/cramer_model.py | 7 +- .../behavioural_analysis/cramer_view.py | 14 ++-- .../behavioural_analysis/finnhub_model.py | 5 +- .../behavioural_analysis/finnhub_view.py | 14 ++-- openbb_terminal/stocks/cboe_model.py | 2 +- openbb_terminal/stocks/cboe_view.py | 3 +- .../comparison_analysis/ca_controller.py | 7 +- .../comparison_analysis/finbrain_model.py | 2 +- .../comparison_analysis/finbrain_view.py | 4 +- .../comparison_analysis/finnhub_model.py | 3 +- .../comparison_analysis/marketwatch_view.py | 4 +- .../comparison_analysis/polygon_model.py | 2 +- .../stocks/comparison_analysis/sdk_helpers.py | 3 +- .../yahoo_finance_model.py | 2 +- .../comparison_analysis/yahoo_finance_view.py | 4 +- .../stocks/dark_pool_shorts/dps_controller.py | 9 +-- .../stocks/dark_pool_shorts/finra_model.py | 2 +- .../stocks/dark_pool_shorts/finra_view.py | 4 +- .../stocks/dark_pool_shorts/ibkr_model.py | 4 +- .../stocks/dark_pool_shorts/quandl_view.py | 9 +-- .../stocks/dark_pool_shorts/sec_view.py | 8 +- .../dark_pool_shorts/stockgrid_model.py | 4 +- .../stocks/dark_pool_shorts/stockgrid_view.py | 4 +- .../dark_pool_shorts/stocksera_model.py | 3 +- .../stocks/dark_pool_shorts/stocksera_view.py | 11 ++- openbb_terminal/stocks/discovery/ark_view.py | 2 +- .../stocks/discovery/disc_controller.py | 9 +-- .../stocks/discovery/disc_helpers.py | 2 + .../stocks/discovery/fidelity_view.py | 2 +- .../stocks/discovery/finnhub_model.py | 2 +- .../stocks/discovery/finnhub_view.py | 3 +- .../stocks/discovery/finviz_model.py | 1 + .../stocks/discovery/finviz_view.py | 4 +- .../stocks/discovery/nasdaq_model.py | 3 +- .../stocks/discovery/nasdaq_view.py | 5 +- .../stocks/discovery/shortinterest_view.py | 3 +- .../stocks/discovery/yahoofinance_model.py | 2 +- .../due_diligence/business_insider_view.py | 4 +- .../stocks/due_diligence/dd_controller.py | 5 +- .../stocks/due_diligence/finnhub_model.py | 2 +- .../stocks/due_diligence/finnhub_view.py | 7 +- .../stocks/due_diligence/finviz_view.py | 2 +- .../stocks/due_diligence/fmp_view.py | 1 + .../stocks/fundamental_analysis/av_model.py | 4 +- .../stocks/fundamental_analysis/av_view.py | 13 ++-- .../stocks/fundamental_analysis/dcf_model.py | 2 +- .../stocks/fundamental_analysis/dcf_static.py | 3 +- .../fundamental_analysis/eclect_us_view.py | 2 +- .../fundamental_analysis/eodhd_model.py | 4 +- .../stocks/fundamental_analysis/eodhd_view.py | 4 +- .../fundamental_analysis/fa_controller.py | 13 ++-- .../stocks/fundamental_analysis/fmp_model.py | 9 +-- .../stocks/fundamental_analysis/fmp_view.py | 13 ++-- .../market_watch_model.py | 2 +- .../fundamental_analysis/polygon_model.py | 2 +- .../fundamental_analysis/polygon_view.py | 8 +- .../fundamental_analysis/sdk_helpers.py | 7 +- .../seeking_alpha_model.py | 3 +- .../seeking_alpha_view.py | 5 +- .../yahoo_finance_view.py | 17 ++--- .../stocks/government/gov_controller.py | 5 +- .../stocks/government/quiverquant_model.py | 2 +- .../stocks/government/quiverquant_view.py | 6 +- .../stocks/options/alphaquery_model.py | 2 +- .../stocks/options/hedge/hedge_controller.py | 2 +- .../stocks/options/nasdaq_model.py | 2 +- openbb_terminal/stocks/options/op_helpers.py | 6 +- .../stocks/options/options_controller.py | 16 ++-- .../stocks/options/options_sdk_helper.py | 2 +- .../stocks/options/options_view.py | 7 +- .../stocks/options/screen/syncretism_model.py | 2 +- .../stocks/options/tradier_model.py | 2 +- .../quantitative_analysis/beta_model.py | 1 + .../stocks/quantitative_analysis/beta_view.py | 3 +- .../quantitative_analysis/qa_controller.py | 9 +-- .../stocks/quantitative_analysis/qa_model.py | 2 +- .../stocks/research/res_controller.py | 5 +- .../stocks/screener/finviz_model.py | 4 +- .../stocks/screener/finviz_view.py | 4 +- .../stocks/screener/screener_controller.py | 13 ++-- .../stocks/screener/screener_helper.py | 3 +- .../stocks/screener/screener_view.py | 4 +- .../stocks/screener/yahoofinance_model.py | 8 +- .../stocks/screener/yahoofinance_view.py | 4 +- .../financedatabase_model.py | 2 +- .../financedatabase_view.py | 6 +- .../sia_controller.py | 5 +- .../stockanalysis_model.py | 4 +- .../stockanalysis_view.py | 10 +-- openbb_terminal/stocks/stocks_controller.py | 9 +-- openbb_terminal/stocks/stocks_helper.py | 16 ++-- openbb_terminal/stocks/stocks_model.py | 8 +- openbb_terminal/stocks/stocks_view.py | 3 +- .../technical_analysis/finbrain_model.py | 2 +- .../stocks/technical_analysis/finviz_view.py | 4 +- .../stocks/technical_analysis/rsp_model.py | 1 - .../stocks/technical_analysis/rsp_view.py | 3 +- .../technical_analysis/ta_controller.py | 6 +- .../technical_analysis/tradingview_view.py | 3 +- .../stocks/tradinghours/bursa_model.py | 3 +- .../stocks/tradinghours/bursa_view.py | 2 +- .../tradinghours/pandas_market_cal_model.py | 3 +- .../tradinghours/pandas_market_cal_view.py | 3 +- .../tradinghours/tradinghours_controller.py | 19 +++-- .../tradinghours/tradinghours_helper.py | 2 +- openbb_terminal/terminal_controller.py | 40 +++++----- openbb_terminal/terminal_helper.py | 13 ++-- pyproject.toml | 4 +- terminal.py | 1 + tests/conftest.py | 3 +- tests/formatting/test_best_practices.py | 3 +- .../covid/test_covid_controller.py | 1 + .../alternative/oss/test_oss_controller.py | 1 + .../alternative/test_alt_controller.py | 1 + .../test_finbrain_view.py | 3 +- .../quantitative_analysis/test_qa_view.py | 3 +- .../core/log/collection/test_logging_clock.py | 3 +- .../core/log/collection/test_s3_sender.py | 5 +- tests/openbb_terminal/core/log/conftest.py | 3 +- .../core/log/generation/test_directories.py | 2 +- .../core/log/generation/test_expired_files.py | 3 +- .../test_path_tracking_file_handler.py | 5 +- .../defi/test_defi_controller.py | 1 + .../discovery/test_discovery_controller.py | 1 + .../due_diligence/test_dd_controller.py | 2 +- .../due_diligence/test_pycoingecko_view.py | 8 +- .../cryptocurrency/nft/test_nft_controller.py | 1 + .../onchain/test_onchain_controller.py | 1 + .../overview/test_coinbase_view.py | 9 +-- .../overview/test_pycoingecko_view.py | 5 +- .../test_cryptocurrency_helpers.py | 4 +- .../tools/test_tools_controller.py | 1 + .../test_econometrics_controller.py | 3 +- .../econometrics/test_econometrics_model.py | 3 +- .../econometrics/test_econometrics_view.py | 3 +- .../economy/test_economy_controller.py | 6 +- .../economy/test_economy_helpers.py | 1 + .../economy/test_finviz_view.py | 3 +- .../economy/test_fred_model.py | 2 +- .../economy/test_investingcom_model.py | 1 + .../economy/test_investingcom_view.py | 1 + .../openbb_terminal/economy/test_wsj_view.py | 3 +- .../etf/discovery/test_wsj_view.py | 3 +- .../etf/screener/test_screener_view.py | 3 +- .../etf/test_financedatabase_view.py | 3 +- .../etf/test_stockanalysis_view.py | 3 +- tests/openbb_terminal/forecast/conftest.py | 3 +- .../forecast/test_NBEATS_model.py | 1 + .../forecast/test_TCN_model.py | 1 + .../forecast/test_anom_model.py | 1 + .../forecast/test_autoarima_model.py | 1 + .../forecast/test_autoces_model.py | 1 + .../forecast/test_autoets_model.py | 1 + .../forecast/test_autoselect_model.py | 1 + .../forecast/test_brnn_model.py | 1 + .../forecast/test_expo_model.py | 1 + .../forecast/test_forecast_controller.py | 4 +- .../forecast/test_forecast_model.py | 4 +- .../forecast/test_linear_model.py | 1 + .../forecast/test_mstl_model.py | 1 + .../forecast/test_nhits_model.py | 1 + .../forecast/test_regr_model.py | 1 + .../forecast/test_rnn_model.py | 1 + .../forecast/test_rwd_model.py | 1 + .../forecast/test_seasonalnaive_model.py | 1 + .../forecast/test_tft_model.py | 1 + .../forecast/test_theta_model.py | 1 + .../forecast/test_trans_model.py | 1 + .../test_qa_controller.py | 1 - .../forex/test_fxempire_model.py | 1 + .../forex/test_fxempire_view.py | 1 + .../coinbase/test_coinbase_controller.py | 1 + .../brokers/coinbase/test_coinbase_model.py | 1 + .../brokers/degiro/test_degiro_controller.py | 1 + .../brokers/degiro/test_degiro_view.py | 1 - .../portfolio_analysis/test_pa_controller.py | 1 + .../portfolio/test_portfolio_controller.py | 1 + .../portfolio/test_portfolio_model.py | 1 + .../stocks/backtesting/test_bt_model.py | 5 +- .../test_ba_controller.py | 3 +- .../behavioural_analysis/test_cramer_view.py | 3 +- .../test_finviz_compare_view.py | 3 +- .../stocks/dark_pool_shorts/test_sec_view.py | 1 - .../dark_pool_shorts/test_stocksera_view.py | 2 +- .../stocks/discovery/test_disc_controller.py | 1 + .../discovery/test_financedatabase_view.py | 3 +- .../stocks/discovery/test_finnhub_view.py | 2 +- .../stocks/discovery/test_nasdaq_view.py | 3 +- .../stocks/due_diligence/test_ark_model.py | 2 +- .../due_diligence/test_dd_controller.py | 1 + .../fundamental_analysis/test_av_view.py | 3 +- .../test_business_insider_view.py | 3 +- .../fundamental_analysis/test_dcf_model.py | 2 +- .../fundamental_analysis/test_dcf_view.py | 2 +- .../test_eclect_us_view.py | 2 +- .../test_fa_controller.py | 1 + .../fundamental_analysis/test_finviz_model.py | 2 +- .../fundamental_analysis/test_finviz_view.py | 3 +- .../fundamental_analysis/test_fmp_model.py | 2 +- .../fundamental_analysis/test_fmp_view.py | 3 +- .../fundamental_analysis/test_polygon_view.py | 1 + .../stocks/government/test_gov_controller.py | 3 +- .../stocks/insider/test_openinsider_view.py | 3 +- .../stocks/options/test_chartexchange_view.py | 3 +- .../stocks/options/test_fdscanner_view.py | 4 +- .../stocks/options/test_options_controller.py | 2 +- .../stocks/options/test_options_view.py | 10 +-- .../stocks/options/test_syncretism_view.py | 2 +- .../stocks/options/test_tradier_view.py | 1 + .../test_qa_controller.py | 3 +- .../stocks/screener/test_finviz_view.py | 3 +- .../test_stockanalysis_model.py | 2 +- .../technical_analysis/test_rsp_view.py | 1 + .../technical_analysis/test_ta_controller.py | 3 +- .../openbb_terminal/stocks/test_cboe_model.py | 1 + .../openbb_terminal/stocks/test_cboe_view.py | 1 + .../stocks/test_stocks_helper.py | 8 +- tests/openbb_terminal/test_helper_funcs.py | 2 +- .../test_helpers_denomination.py | 6 +- tests/openbb_terminal/test_keys_model.py | 4 +- tests/openbb_terminal/test_loggers.py | 4 +- .../test_terminal_controller.py | 2 + tests/openbb_terminal/test_terminal_helper.py | 1 + .../test_thought_of_the_day.py | 3 +- tests/website/test_generate_docs.py | 7 +- website/generate_sdk_markdown.py | 4 +- website/generate_terminal_markdown.py | 2 +- 505 files changed, 1369 insertions(+), 1382 deletions(-) diff --git a/custom_pre_commit/check_reserved_args.py b/custom_pre_commit/check_reserved_args.py index a688c64dc219..9e9354ddb985 100644 --- a/custom_pre_commit/check_reserved_args.py +++ b/custom_pre_commit/check_reserved_args.py @@ -1,9 +1,9 @@ """Check reserved command arguments in Controllers""" -import os -import sys import glob +import os import re -from typing import Optional, Any +import sys +from typing import Any, Optional RESERVED_ARGS = { "f": "file", diff --git a/jupyterlab/documentation/setup.py b/jupyterlab/documentation/setup.py index 09a640e1000e..babcbbaddaaf 100644 --- a/jupyterlab/documentation/setup.py +++ b/jupyterlab/documentation/setup.py @@ -63,7 +63,7 @@ ) try: - from jupyter_packaging import wrap_installers, npm_builder, get_data_files + from jupyter_packaging import get_data_files, npm_builder, wrap_installers post_develop = npm_builder( build_cmd="install:extension", source_dir="src", build_dir=lab_path diff --git a/jupyterlab/openbb-settings/setup.py b/jupyterlab/openbb-settings/setup.py index e23ff466294e..a14650e7662a 100644 --- a/jupyterlab/openbb-settings/setup.py +++ b/jupyterlab/openbb-settings/setup.py @@ -63,7 +63,7 @@ ) try: - from jupyter_packaging import wrap_installers, npm_builder, get_data_files + from jupyter_packaging import get_data_files, npm_builder, wrap_installers post_develop = npm_builder( build_cmd="install:extension", source_dir="src", build_dir=lab_path diff --git a/jupyterlab/openbb/setup.py b/jupyterlab/openbb/setup.py index e0aaf793c3d1..67507c07550f 100644 --- a/jupyterlab/openbb/setup.py +++ b/jupyterlab/openbb/setup.py @@ -61,7 +61,7 @@ ) try: - from jupyter_packaging import wrap_installers, npm_builder, get_data_files + from jupyter_packaging import get_data_files, npm_builder, wrap_installers post_develop = npm_builder( build_cmd="install:extension", source_dir="src", build_dir=lab_path diff --git a/openbb_terminal/alternative/alt_controller.py b/openbb_terminal/alternative/alt_controller.py index b4c4882a6d67..ae5ce72e9adb 100644 --- a/openbb_terminal/alternative/alt_controller.py +++ b/openbb_terminal/alternative/alt_controller.py @@ -5,17 +5,16 @@ import logging from typing import List -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff +from openbb_terminal.alternative import hackernews_view +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_ONLY_RAW_DATA_ALLOWED, ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText -from openbb_terminal.alternative import hackernews_view +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) # pylint:disable=import-outside-toplevel diff --git a/openbb_terminal/alternative/covid/covid_controller.py b/openbb_terminal/alternative/covid/covid_controller.py index c0e5a0f313fd..8f3b4dfb2655 100644 --- a/openbb_terminal/alternative/covid/covid_controller.py +++ b/openbb_terminal/alternative/covid/covid_controller.py @@ -7,10 +7,10 @@ from typing import List import pandas as pd -from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal import feature_flags as obbff from openbb_terminal.alternative.covid import covid_view +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_BOTH_RAW_DATA_AND_FIGURES, @@ -19,7 +19,7 @@ ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/alternative/covid/covid_view.py b/openbb_terminal/alternative/covid/covid_view.py index 4e26e3d4904a..ceca6ead5ef5 100644 --- a/openbb_terminal/alternative/covid/covid_view.py +++ b/openbb_terminal/alternative/covid/covid_view.py @@ -3,24 +3,23 @@ import logging import os -from typing import Optional, List +from typing import List, Optional import matplotlib.pyplot as plt import pandas as pd -from openbb_terminal.config_terminal import theme from openbb_terminal.alternative.covid import covid_model from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, plot_autoscale, print_rich_table, - is_valid_axes_count, ) from openbb_terminal.rich_config import console - logger = logging.getLogger(__name__) diff --git a/openbb_terminal/alternative/hackernews_model.py b/openbb_terminal/alternative/hackernews_model.py index a01a50ff02d6..e622a4751d76 100644 --- a/openbb_terminal/alternative/hackernews_model.py +++ b/openbb_terminal/alternative/hackernews_model.py @@ -3,9 +3,11 @@ import logging + import pandas as pd -from openbb_terminal.helper_funcs import request + from openbb_terminal.decorators import log_start_end +from openbb_terminal.helper_funcs import request logger = logging.getLogger(__name__) diff --git a/openbb_terminal/alternative/oss/github_model.py b/openbb_terminal/alternative/oss/github_model.py index 63ec3517310c..a4f1e19a9a30 100644 --- a/openbb_terminal/alternative/oss/github_model.py +++ b/openbb_terminal/alternative/oss/github_model.py @@ -3,15 +3,16 @@ # pylint: disable=C0201,W1401 import logging -from typing import Any, Dict, Optional import math from datetime import datetime +from typing import Any, Dict, Optional + import pandas as pd from openbb_terminal import config_terminal as cfg from openbb_terminal.decorators import check_api_key, log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.helper_funcs import get_user_agent, request +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/alternative/oss/github_view.py b/openbb_terminal/alternative/oss/github_view.py index 4b2858ad3d18..2cc80b930b22 100644 --- a/openbb_terminal/alternative/oss/github_view.py +++ b/openbb_terminal/alternative/oss/github_view.py @@ -3,22 +3,23 @@ import logging import os -from typing import Optional, List +from typing import List, Optional from matplotlib import pyplot as plt from matplotlib import ticker -from openbb_terminal.config_terminal import theme + +from openbb_terminal.alternative.oss import github_model from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme +from openbb_terminal.cryptocurrency.dataframe_helpers import ( + lambda_long_number_format_with_type_check, +) from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, plot_autoscale, print_rich_table, - is_valid_axes_count, -) -from openbb_terminal.alternative.oss import github_model -from openbb_terminal.cryptocurrency.dataframe_helpers import ( - lambda_long_number_format_with_type_check, ) logger = logging.getLogger(__name__) diff --git a/openbb_terminal/alternative/oss/oss_controller.py b/openbb_terminal/alternative/oss/oss_controller.py index 95bb1db0dacc..0f5313b61239 100644 --- a/openbb_terminal/alternative/oss/oss_controller.py +++ b/openbb_terminal/alternative/oss/oss_controller.py @@ -5,21 +5,19 @@ import logging from typing import List -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff -from openbb_terminal.alternative.oss import github_view -from openbb_terminal.alternative.oss import runa_view, runa_model +from openbb_terminal.alternative.oss import github_view, runa_model, runa_view +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_BOTH_RAW_DATA_AND_FIGURES, EXPORT_ONLY_RAW_DATA_ALLOWED, - valid_repo, parse_and_split_input, + valid_repo, ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/alternative/oss/runa_view.py b/openbb_terminal/alternative/oss/runa_view.py index e6f1989b137c..0d0f8a9118b0 100644 --- a/openbb_terminal/alternative/oss/runa_view.py +++ b/openbb_terminal/alternative/oss/runa_view.py @@ -1,21 +1,22 @@ """Rekt view""" import logging import os -from typing import Optional, List +from typing import List, Optional from matplotlib import pyplot as plt from matplotlib import ticker + from openbb_terminal.alternative.oss import runa_model +from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, - plot_autoscale, + is_valid_axes_count, lambda_long_number_format, + plot_autoscale, print_rich_table, - is_valid_axes_count, ) -from openbb_terminal.config_terminal import theme -from openbb_terminal.config_plot import PLOT_DPI from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/base_helpers.py b/openbb_terminal/base_helpers.py index b58ada0383ff..82bf8d32839c 100644 --- a/openbb_terminal/base_helpers.py +++ b/openbb_terminal/base_helpers.py @@ -1,6 +1,6 @@ # This is for helpers that do NOT import any OpenBB Modules -from typing import Callable, Any, Literal import os +from typing import Any, Callable, Literal from rich.console import Console diff --git a/openbb_terminal/common/behavioural_analysis/finbrain_model.py b/openbb_terminal/common/behavioural_analysis/finbrain_model.py index 49adf7facd7c..b4a2854058c9 100644 --- a/openbb_terminal/common/behavioural_analysis/finbrain_model.py +++ b/openbb_terminal/common/behavioural_analysis/finbrain_model.py @@ -4,9 +4,9 @@ import logging import pandas as pd -from openbb_terminal.helper_funcs import request from openbb_terminal.decorators import log_start_end +from openbb_terminal.helper_funcs import request logger = logging.getLogger(__name__) diff --git a/openbb_terminal/common/behavioural_analysis/finbrain_view.py b/openbb_terminal/common/behavioural_analysis/finbrain_view.py index 35fba6a310b0..7d0ee33ce973 100644 --- a/openbb_terminal/common/behavioural_analysis/finbrain_view.py +++ b/openbb_terminal/common/behavioural_analysis/finbrain_view.py @@ -3,25 +3,24 @@ import logging import os -from typing import Optional, List +from typing import List, Optional import numpy as np import pandas as pd from matplotlib import pyplot as plt -from openbb_terminal.config_terminal import theme +from openbb_terminal import rich_config from openbb_terminal.common.behavioural_analysis import finbrain_model from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, plot_autoscale, print_rich_table, - is_valid_axes_count, ) from openbb_terminal.rich_config import console -from openbb_terminal import rich_config - logger = logging.getLogger(__name__) diff --git a/openbb_terminal/common/behavioural_analysis/finnhub_model.py b/openbb_terminal/common/behavioural_analysis/finnhub_model.py index 9423fcf7adc7..8b8c2f120d2f 100644 --- a/openbb_terminal/common/behavioural_analysis/finnhub_model.py +++ b/openbb_terminal/common/behavioural_analysis/finnhub_model.py @@ -5,9 +5,9 @@ import pandas as pd -from openbb_terminal.helper_funcs import request from openbb_terminal import config_terminal as cfg from openbb_terminal.decorators import check_api_key, log_start_end +from openbb_terminal.helper_funcs import request from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/common/behavioural_analysis/finnhub_view.py b/openbb_terminal/common/behavioural_analysis/finnhub_view.py index ee22329b3d46..0cdaf3b7d09a 100644 --- a/openbb_terminal/common/behavioural_analysis/finnhub_view.py +++ b/openbb_terminal/common/behavioural_analysis/finnhub_view.py @@ -7,10 +7,9 @@ import pandas as pd from openbb_terminal.common.behavioural_analysis import finnhub_model -from openbb_terminal.decorators import log_start_end +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import export_data from openbb_terminal.rich_config import console -from openbb_terminal.decorators import check_api_key logger = logging.getLogger(__name__) diff --git a/openbb_terminal/common/behavioural_analysis/google_view.py b/openbb_terminal/common/behavioural_analysis/google_view.py index 0c924085e1c1..0350337f4677 100644 --- a/openbb_terminal/common/behavioural_analysis/google_view.py +++ b/openbb_terminal/common/behavioural_analysis/google_view.py @@ -3,20 +3,20 @@ import logging import os -from typing import Optional, List -import pandas as pd +from typing import List, Optional import matplotlib.pyplot as plt +import pandas as pd -from openbb_terminal.config_terminal import theme -from openbb_terminal.config_plot import PLOT_DPI from openbb_terminal.common.behavioural_analysis import google_model +from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, plot_autoscale, print_rich_table, - is_valid_axes_count, ) logger = logging.getLogger(__name__) diff --git a/openbb_terminal/common/behavioural_analysis/reddit_helpers.py b/openbb_terminal/common/behavioural_analysis/reddit_helpers.py index 1dab1dd6ce87..40b9bcaebd1b 100644 --- a/openbb_terminal/common/behavioural_analysis/reddit_helpers.py +++ b/openbb_terminal/common/behavioural_analysis/reddit_helpers.py @@ -1,8 +1,8 @@ """Reddit Helpers""" __docformat__ = "numpy" -from typing import List import re +from typing import List import praw diff --git a/openbb_terminal/common/behavioural_analysis/reddit_model.py b/openbb_terminal/common/behavioural_analysis/reddit_model.py index 43f782ce3f51..f01f3b54885f 100644 --- a/openbb_terminal/common/behavioural_analysis/reddit_model.py +++ b/openbb_terminal/common/behavioural_analysis/reddit_model.py @@ -3,9 +3,9 @@ # pylint:disable=too-many-lines import logging +import warnings from datetime import datetime, timedelta from typing import List, Tuple -import warnings import finviz import pandas as pd diff --git a/openbb_terminal/common/behavioural_analysis/reddit_view.py b/openbb_terminal/common/behavioural_analysis/reddit_view.py index 843da940cf95..06f1e6b7e30c 100644 --- a/openbb_terminal/common/behavioural_analysis/reddit_view.py +++ b/openbb_terminal/common/behavioural_analysis/reddit_view.py @@ -14,15 +14,14 @@ import seaborn as sns from openbb_terminal.common.behavioural_analysis import reddit_model -from openbb_terminal.config_terminal import theme from openbb_terminal.config_plot import PLOT_DPI -from openbb_terminal.decorators import check_api_key -from openbb_terminal.decorators import log_start_end +from openbb_terminal.config_terminal import theme +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, plot_autoscale, print_rich_table, - is_valid_axes_count, ) from openbb_terminal.rich_config import console diff --git a/openbb_terminal/common/behavioural_analysis/twitter_model.py b/openbb_terminal/common/behavioural_analysis/twitter_model.py index 449c90d71ef0..179d359fd597 100644 --- a/openbb_terminal/common/behavioural_analysis/twitter_model.py +++ b/openbb_terminal/common/behavioural_analysis/twitter_model.py @@ -1,8 +1,8 @@ """Twitter Model""" __docformat__ = "numpy" -from datetime import datetime, timedelta import logging +from datetime import datetime, timedelta from typing import Optional import pandas as pd diff --git a/openbb_terminal/common/behavioural_analysis/twitter_view.py b/openbb_terminal/common/behavioural_analysis/twitter_view.py index 7352aa131ca7..b78438a12ed1 100644 --- a/openbb_terminal/common/behavioural_analysis/twitter_view.py +++ b/openbb_terminal/common/behavioural_analysis/twitter_view.py @@ -3,7 +3,7 @@ import logging import os -from typing import Optional, List +from typing import List, Optional import matplotlib.pyplot as plt import numpy as np @@ -11,14 +11,14 @@ from dateutil import parser as dparse import openbb_terminal.config_plot as cfg_plot -from openbb_terminal.config_terminal import theme from openbb_terminal.common.behavioural_analysis import twitter_model +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, - plot_autoscale, get_closing_price, is_valid_axes_count, + plot_autoscale, ) from openbb_terminal.rich_config import console diff --git a/openbb_terminal/common/common_model.py b/openbb_terminal/common/common_model.py index c5a77390003e..47fb214f1f0c 100644 --- a/openbb_terminal/common/common_model.py +++ b/openbb_terminal/common/common_model.py @@ -3,12 +3,12 @@ import logging from pathlib import Path -from typing import Dict, Any, Optional +from typing import Any, Dict, Optional import pandas as pd import statsmodels.api as sm -from pandas import errors from linearmodels.datasets import wage_panel +from pandas import errors from openbb_terminal.decorators import log_start_end from openbb_terminal.rich_config import console diff --git a/openbb_terminal/common/feedparser_model.py b/openbb_terminal/common/feedparser_model.py index 92a55c831179..22de3d514aff 100644 --- a/openbb_terminal/common/feedparser_model.py +++ b/openbb_terminal/common/feedparser_model.py @@ -4,9 +4,11 @@ import os from typing import List from urllib.parse import quote + import certifi import feedparser import pandas as pd + from openbb_terminal.rich_config import console diff --git a/openbb_terminal/common/feedparser_view.py b/openbb_terminal/common/feedparser_view.py index fcafa0c00421..5343fba8f0fa 100644 --- a/openbb_terminal/common/feedparser_view.py +++ b/openbb_terminal/common/feedparser_view.py @@ -4,10 +4,10 @@ import logging import os +from openbb_terminal.common import feedparser_model from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import export_data from openbb_terminal.rich_config import console -from openbb_terminal.common import feedparser_model logger = logging.getLogger(__name__) diff --git a/openbb_terminal/common/newsapi_model.py b/openbb_terminal/common/newsapi_model.py index e239e45dabcc..826ffb9d766f 100644 --- a/openbb_terminal/common/newsapi_model.py +++ b/openbb_terminal/common/newsapi_model.py @@ -2,14 +2,15 @@ __docformat__ = "numpy" import logging - from datetime import datetime, timedelta from typing import Any, List, Optional, Tuple + import pandas as pd + from openbb_terminal import config_terminal as cfg from openbb_terminal.decorators import check_api_key, log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.helper_funcs import request +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/common/newsapi_view.py b/openbb_terminal/common/newsapi_view.py index 5a939be385d8..893f4e3bf8e6 100644 --- a/openbb_terminal/common/newsapi_view.py +++ b/openbb_terminal/common/newsapi_view.py @@ -1,17 +1,15 @@ """ News View """ __docformat__ = "numpy" -import os import logging +import os from typing import Optional import pandas as pd -from openbb_terminal.decorators import check_api_key from openbb_terminal.common import newsapi_model -from openbb_terminal.decorators import log_start_end -from openbb_terminal.helper_funcs import export_data -from openbb_terminal.helper_funcs import print_rich_table +from openbb_terminal.decorators import check_api_key, log_start_end +from openbb_terminal.helper_funcs import export_data, print_rich_table logger = logging.getLogger(__name__) diff --git a/openbb_terminal/common/quantitative_analysis/qa_model.py b/openbb_terminal/common/quantitative_analysis/qa_model.py index 38310f6b77c5..cf3824359d31 100644 --- a/openbb_terminal/common/quantitative_analysis/qa_model.py +++ b/openbb_terminal/common/quantitative_analysis/qa_model.py @@ -4,13 +4,14 @@ import logging import warnings from typing import Tuple, Union + +import numpy as np import pandas as pd import statsmodels.api as sm +from scipy import stats from statsmodels.tools.sm_exceptions import MissingDataError from statsmodels.tsa.seasonal import DecomposeResult, seasonal_decompose from statsmodels.tsa.stattools import adfuller, kpss -from scipy import stats -import numpy as np from openbb_terminal.decorators import log_start_end diff --git a/openbb_terminal/common/quantitative_analysis/qa_view.py b/openbb_terminal/common/quantitative_analysis/qa_view.py index 67512911c02c..dd6830cae29a 100644 --- a/openbb_terminal/common/quantitative_analysis/qa_view.py +++ b/openbb_terminal/common/quantitative_analysis/qa_view.py @@ -8,32 +8,32 @@ import os import warnings from datetime import datetime -from typing import Any, Optional, List +from typing import Any, List, Optional import matplotlib +import matplotlib.dates as mdates import matplotlib.patches as mpatches import matplotlib.pyplot as plt -import matplotlib.dates as mdates import numpy as np import pandas as pd import seaborn as sns import statsmodels.api as sm -from scipy import stats from detecta import detect_cusum -from statsmodels.graphics.gofplots import qqplot from pandas.plotting import register_matplotlib_converters +from scipy import stats +from statsmodels.graphics.gofplots import qqplot -from openbb_terminal.config_terminal import theme from openbb_terminal.common.quantitative_analysis import qa_model from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, + lambda_long_number_format, plot_autoscale, print_rich_table, reindex_dates, - lambda_long_number_format, - is_valid_axes_count, ) from openbb_terminal.rich_config import console diff --git a/openbb_terminal/common/quantitative_analysis/rolling_view.py b/openbb_terminal/common/quantitative_analysis/rolling_view.py index 5d89861eaf08..ce84c02ce5a4 100644 --- a/openbb_terminal/common/quantitative_analysis/rolling_view.py +++ b/openbb_terminal/common/quantitative_analysis/rolling_view.py @@ -3,20 +3,20 @@ import logging import os -from typing import Optional, List +from typing import List, Optional import matplotlib.pyplot as plt import pandas as pd -from openbb_terminal.config_terminal import theme from openbb_terminal.common.quantitative_analysis import rolling_model from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, plot_autoscale, reindex_dates, - is_valid_axes_count, ) logger = logging.getLogger(__name__) diff --git a/openbb_terminal/common/technical_analysis/custom_indicators_model.py b/openbb_terminal/common/technical_analysis/custom_indicators_model.py index 3d8afa195353..911fecbc463a 100644 --- a/openbb_terminal/common/technical_analysis/custom_indicators_model.py +++ b/openbb_terminal/common/technical_analysis/custom_indicators_model.py @@ -6,9 +6,9 @@ import pandas as pd +from openbb_terminal.common.technical_analysis import ta_helpers from openbb_terminal.decorators import log_start_end from openbb_terminal.rich_config import console -from openbb_terminal.common.technical_analysis import ta_helpers logger = logging.getLogger(__name__) diff --git a/openbb_terminal/common/technical_analysis/custom_indicators_view.py b/openbb_terminal/common/technical_analysis/custom_indicators_view.py index 50de45409629..d995b35a17ba 100644 --- a/openbb_terminal/common/technical_analysis/custom_indicators_view.py +++ b/openbb_terminal/common/technical_analysis/custom_indicators_view.py @@ -3,24 +3,23 @@ import logging import os -from typing import Optional, Union, List +from typing import List, Optional, Union import matplotlib.pyplot as plt import pandas as pd -from openbb_terminal.config_terminal import theme -from openbb_terminal.common.technical_analysis import custom_indicators_model +from openbb_terminal.common.technical_analysis import custom_indicators_model, ta_helpers from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_intraday, + is_valid_axes_count, plot_autoscale, print_rich_table, reindex_dates, - is_intraday, - is_valid_axes_count, ) -from openbb_terminal.common.technical_analysis import ta_helpers logger = logging.getLogger(__name__) diff --git a/openbb_terminal/common/technical_analysis/momentum_model.py b/openbb_terminal/common/technical_analysis/momentum_model.py index 0b8992982c14..970be53513ea 100644 --- a/openbb_terminal/common/technical_analysis/momentum_model.py +++ b/openbb_terminal/common/technical_analysis/momentum_model.py @@ -9,8 +9,8 @@ import pandas_ta as ta from sklearn.linear_model import LinearRegression -from openbb_terminal.decorators import log_start_end from openbb_terminal.common.technical_analysis import ta_helpers +from openbb_terminal.decorators import log_start_end from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/common/technical_analysis/momentum_view.py b/openbb_terminal/common/technical_analysis/momentum_view.py index 6e8e3d3b7004..e9854f61f04e 100644 --- a/openbb_terminal/common/technical_analysis/momentum_view.py +++ b/openbb_terminal/common/technical_analysis/momentum_view.py @@ -3,27 +3,26 @@ import logging import os -from typing import Optional, List +from typing import List, Optional import matplotlib.pyplot as plt +import mplfinance as mpf import numpy as np import pandas as pd from pandas.plotting import register_matplotlib_converters -import mplfinance as mpf -from openbb_terminal.config_terminal import theme -from openbb_terminal.common.technical_analysis import momentum_model +from openbb_terminal.common.technical_analysis import momentum_model, ta_helpers from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, - plot_autoscale, - reindex_dates, is_valid_axes_count, + plot_autoscale, print_rich_table, + reindex_dates, ) from openbb_terminal.rich_config import console -from openbb_terminal.common.technical_analysis import ta_helpers logger = logging.getLogger(__name__) diff --git a/openbb_terminal/common/technical_analysis/overlap_view.py b/openbb_terminal/common/technical_analysis/overlap_view.py index f21eb8a491d3..98b0264e8f78 100644 --- a/openbb_terminal/common/technical_analysis/overlap_view.py +++ b/openbb_terminal/common/technical_analysis/overlap_view.py @@ -10,16 +10,16 @@ import pandas as pd from pandas.plotting import register_matplotlib_converters -from openbb_terminal.config_terminal import theme from openbb_terminal.common.technical_analysis import overlap_model from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, + lambda_long_number_format_y_axis, plot_autoscale, reindex_dates, - lambda_long_number_format_y_axis, - is_valid_axes_count, ) from openbb_terminal.rich_config import console diff --git a/openbb_terminal/common/technical_analysis/ta_helpers.py b/openbb_terminal/common/technical_analysis/ta_helpers.py index 97177ff407d3..e6cd9ce1d30e 100644 --- a/openbb_terminal/common/technical_analysis/ta_helpers.py +++ b/openbb_terminal/common/technical_analysis/ta_helpers.py @@ -1,5 +1,5 @@ -from typing import Optional import logging +from typing import Optional import pandas as pd diff --git a/openbb_terminal/common/technical_analysis/trend_indicators_model.py b/openbb_terminal/common/technical_analysis/trend_indicators_model.py index 38d7eb779645..a69628cc1740 100644 --- a/openbb_terminal/common/technical_analysis/trend_indicators_model.py +++ b/openbb_terminal/common/technical_analysis/trend_indicators_model.py @@ -6,8 +6,8 @@ import pandas as pd import pandas_ta as ta -from openbb_terminal.decorators import log_start_end from openbb_terminal.common.technical_analysis import ta_helpers +from openbb_terminal.decorators import log_start_end logger = logging.getLogger(__name__) diff --git a/openbb_terminal/common/technical_analysis/trend_indicators_view.py b/openbb_terminal/common/technical_analysis/trend_indicators_view.py index 4bd968091512..062ad619fd3d 100644 --- a/openbb_terminal/common/technical_analysis/trend_indicators_view.py +++ b/openbb_terminal/common/technical_analysis/trend_indicators_view.py @@ -3,23 +3,22 @@ import logging import os -from typing import Optional, List +from typing import List, Optional import matplotlib.pyplot as plt import pandas as pd from pandas.plotting import register_matplotlib_converters -from openbb_terminal.config_terminal import theme -from openbb_terminal.common.technical_analysis import trend_indicators_model +from openbb_terminal.common.technical_analysis import ta_helpers, trend_indicators_model from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, plot_autoscale, reindex_dates, - is_valid_axes_count, ) -from openbb_terminal.common.technical_analysis import ta_helpers logger = logging.getLogger(__name__) diff --git a/openbb_terminal/common/technical_analysis/volatility_model.py b/openbb_terminal/common/technical_analysis/volatility_model.py index b894ba4619dd..59c4a604477d 100644 --- a/openbb_terminal/common/technical_analysis/volatility_model.py +++ b/openbb_terminal/common/technical_analysis/volatility_model.py @@ -6,8 +6,8 @@ import pandas as pd import pandas_ta as ta -from openbb_terminal.decorators import log_start_end from openbb_terminal.common.technical_analysis import ta_helpers +from openbb_terminal.decorators import log_start_end logger = logging.getLogger(__name__) diff --git a/openbb_terminal/common/technical_analysis/volatility_view.py b/openbb_terminal/common/technical_analysis/volatility_view.py index 6f9cd1d1945e..77f41fcc53aa 100644 --- a/openbb_terminal/common/technical_analysis/volatility_view.py +++ b/openbb_terminal/common/technical_analysis/volatility_view.py @@ -3,22 +3,21 @@ import logging import os -from typing import Optional, List +from typing import List, Optional import matplotlib.pyplot as plt import pandas as pd -from openbb_terminal.config_terminal import theme -from openbb_terminal.common.technical_analysis import volatility_model +from openbb_terminal.common.technical_analysis import ta_helpers, volatility_model from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, plot_autoscale, reindex_dates, - is_valid_axes_count, ) -from openbb_terminal.common.technical_analysis import ta_helpers logger = logging.getLogger(__name__) diff --git a/openbb_terminal/common/technical_analysis/volume_model.py b/openbb_terminal/common/technical_analysis/volume_model.py index 47b4fcd6fae0..9be3b04a101b 100644 --- a/openbb_terminal/common/technical_analysis/volume_model.py +++ b/openbb_terminal/common/technical_analysis/volume_model.py @@ -6,8 +6,8 @@ import pandas as pd import pandas_ta as ta -from openbb_terminal.decorators import log_start_end from openbb_terminal.common.technical_analysis import ta_helpers +from openbb_terminal.decorators import log_start_end from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/common/technical_analysis/volume_view.py b/openbb_terminal/common/technical_analysis/volume_view.py index 347e0d3f80b5..2616c05a5904 100644 --- a/openbb_terminal/common/technical_analysis/volume_view.py +++ b/openbb_terminal/common/technical_analysis/volume_view.py @@ -3,23 +3,22 @@ import logging import os -from typing import Optional, List +from typing import List, Optional import matplotlib.pyplot as plt import pandas as pd -from openbb_terminal.config_terminal import theme -from openbb_terminal.common.technical_analysis import volume_model +from openbb_terminal.common.technical_analysis import ta_helpers, volume_model from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, plot_autoscale, reindex_dates, - is_valid_axes_count, ) from openbb_terminal.rich_config import console -from openbb_terminal.common.technical_analysis import ta_helpers logger = logging.getLogger(__name__) diff --git a/openbb_terminal/core/completer/choices.py b/openbb_terminal/core/completer/choices.py index db787fceb714..ba9ffbed8341 100644 --- a/openbb_terminal/core/completer/choices.py +++ b/openbb_terminal/core/completer/choices.py @@ -5,6 +5,7 @@ from types import MethodType from typing import Callable, List from unittest.mock import patch + from openbb_terminal.helper_funcs import check_file_type_saved, check_positive from openbb_terminal.rich_config import get_ordered_list_sources diff --git a/openbb_terminal/core/config/paths.py b/openbb_terminal/core/config/paths.py index a710d05e4765..6be0c0d4df5e 100644 --- a/openbb_terminal/core/config/paths.py +++ b/openbb_terminal/core/config/paths.py @@ -1,6 +1,7 @@ # IMPORTATION STANDARD -from pathlib import Path import os +from pathlib import Path + from dotenv import load_dotenv diff --git a/openbb_terminal/core/config/paths_helper.py b/openbb_terminal/core/config/paths_helper.py index 0e780d8fca06..20226a3b3f79 100644 --- a/openbb_terminal/core/config/paths_helper.py +++ b/openbb_terminal/core/config/paths_helper.py @@ -2,16 +2,16 @@ from typing import List from openbb_terminal.core.config.paths import ( + REPOSITORY_ENV_FILE, SETTINGS_DIRECTORY, + USER_CUSTOM_IMPORTS_DIRECTORY, USER_DATA_DIRECTORY, + USER_DATA_SOURCES_DEFAULT_FILE, USER_ENV_FILE, - REPOSITORY_ENV_FILE, - USER_CUSTOM_IMPORTS_DIRECTORY, USER_EXPORTS_DIRECTORY, USER_PORTFOLIO_DATA_DIRECTORY, USER_PRESETS_DIRECTORY, USER_ROUTINES_DIRECTORY, - USER_DATA_SOURCES_DEFAULT_FILE, ) # pylint: disable=W0603 diff --git a/openbb_terminal/core/library/breadcrumb.py b/openbb_terminal/core/library/breadcrumb.py index 2f263b2e2efc..42008ea1df16 100644 --- a/openbb_terminal/core/library/breadcrumb.py +++ b/openbb_terminal/core/library/breadcrumb.py @@ -1,11 +1,10 @@ -from typing import Any, Optional, List -import openbb_terminal.config_terminal as cfg +from typing import Any, List, Optional +import openbb_terminal.config_terminal as cfg +from openbb_terminal import feature_flags as obbff from openbb_terminal.core.library.metadata import Metadata -from openbb_terminal.core.library.trail_map import TrailMap from openbb_terminal.core.library.operation import Operation - -from openbb_terminal import feature_flags as obbff +from openbb_terminal.core.library.trail_map import TrailMap # pylint: disable=import-outside-toplevel @@ -159,10 +158,10 @@ def __check_initialize_logging(self): @staticmethod def __initialize_logging() -> None: - from openbb_terminal.loggers import setup_logging # pylint: disable=C0415 from openbb_terminal.core.log.generation.settings_logger import ( # pylint: disable=C0415 log_all_settings, ) + from openbb_terminal.loggers import setup_logging # pylint: disable=C0415 cfg.LOGGING_SUB_APP = "sdk" setup_logging() diff --git a/openbb_terminal/core/library/operation.py b/openbb_terminal/core/library/operation.py index 5ed89aa5c155..9dc2d664740e 100644 --- a/openbb_terminal/core/library/operation.py +++ b/openbb_terminal/core/library/operation.py @@ -1,12 +1,10 @@ import json from importlib import import_module -from logging import getLogger, Logger -from typing import Any, Callable, Dict, List, Optional - from inspect import signature +from logging import Logger, getLogger +from typing import Any, Callable, Dict, List, Optional import openbb_terminal.config_terminal as cfg - from openbb_terminal.core.library.metadata import Metadata from openbb_terminal.core.library.trail_map import TrailMap diff --git a/openbb_terminal/core/library/trail_map.py b/openbb_terminal/core/library/trail_map.py index 7d657b6988a0..05f48d950e97 100644 --- a/openbb_terminal/core/library/trail_map.py +++ b/openbb_terminal/core/library/trail_map.py @@ -8,7 +8,6 @@ from openbb_terminal.core.config.paths import MISCELLANEOUS_DIRECTORY, USER_ENV_FILE from openbb_terminal.rich_config import console - DISABLE_FORECASTING_WARNING = load_env_vars( "OPENBB_DISABLE_FORECASTING_WARNING", strtobool, False ) diff --git a/openbb_terminal/core/log/collection/log_sender.py b/openbb_terminal/core/log/collection/log_sender.py index a42a53f5e8a9..fe2fdbf162b5 100644 --- a/openbb_terminal/core/log/collection/log_sender.py +++ b/openbb_terminal/core/log/collection/log_sender.py @@ -1,21 +1,21 @@ # IMPORTATION STANDARD from copy import deepcopy -from threading import Thread -from queue import SimpleQueue from pathlib import Path +from queue import SimpleQueue +from threading import Thread -# IMPORTATION THIRDPARTY - -# IMPORTATION INTERNAL -from openbb_terminal.feature_flags import LOG_COLLECTION +from openbb_terminal.core.log.collection.s3_sender import send_to_s3 from openbb_terminal.core.log.constants import ( ARCHIVES_FOLDER_NAME, S3_FOLDER_SUFFIX, TMP_FOLDER_NAME, ) -from openbb_terminal.core.log.collection.s3_sender import send_to_s3 from openbb_terminal.core.log.generation.settings import Settings +# IMPORTATION THIRDPARTY +# IMPORTATION INTERNAL +from openbb_terminal.feature_flags import LOG_COLLECTION + # DO NOT USE THE FILE LOGGER IN THIS MODULE diff --git a/openbb_terminal/core/log/generation/directories.py b/openbb_terminal/core/log/generation/directories.py index 2fc8cb6a16d5..bf7de8b132d2 100644 --- a/openbb_terminal/core/log/generation/directories.py +++ b/openbb_terminal/core/log/generation/directories.py @@ -2,6 +2,7 @@ import os import uuid from pathlib import Path + from openbb_terminal.core.config.paths import USER_DATA_DIRECTORY # IMPORTATION THIRDPARTY diff --git a/openbb_terminal/core/log/generation/expired_files.py b/openbb_terminal/core/log/generation/expired_files.py index 5e0202f24b49..c6cc71609e52 100644 --- a/openbb_terminal/core/log/generation/expired_files.py +++ b/openbb_terminal/core/log/generation/expired_files.py @@ -3,7 +3,6 @@ from pathlib import Path from typing import List - # IMPORTATION THIRDPARTY # IMPORTATION INTERNAL diff --git a/openbb_terminal/core/log/generation/formatter_with_exceptions.py b/openbb_terminal/core/log/generation/formatter_with_exceptions.py index 58a39f1639bc..1c2dcc47ca47 100644 --- a/openbb_terminal/core/log/generation/formatter_with_exceptions.py +++ b/openbb_terminal/core/log/generation/formatter_with_exceptions.py @@ -3,7 +3,6 @@ import re # IMPORTATION THIRDPARTY - # IMPORTATION INTERNAL from openbb_terminal.core.config.paths import HOME_DIRECTORY from openbb_terminal.core.log.generation.settings import AppSettings diff --git a/openbb_terminal/core/log/generation/path_tracking_file_handler.py b/openbb_terminal/core/log/generation/path_tracking_file_handler.py index 420b76c4d984..953e90604046 100644 --- a/openbb_terminal/core/log/generation/path_tracking_file_handler.py +++ b/openbb_terminal/core/log/generation/path_tracking_file_handler.py @@ -4,19 +4,18 @@ from pathlib import Path from typing import Callable -# IMPORTATION THIRDPARTY +from openbb_terminal.core.log.collection.log_sender import LogSender +from openbb_terminal.core.log.collection.logging_clock import LoggingClock, Precision +# IMPORTATION THIRDPARTY # IMPORTATION INTERNAL from openbb_terminal.core.log.constants import ARCHIVES_FOLDER_NAME, TMP_FOLDER_NAME -from openbb_terminal.core.log.collection.log_sender import LogSender -from openbb_terminal.core.log.collection.logging_clock import LoggingClock, Precision from openbb_terminal.core.log.generation.directories import get_log_dir, get_log_sub_dir from openbb_terminal.core.log.generation.expired_files import ( get_expired_file_list, get_timestamp_from_x_days, remove_file_list, ) - from openbb_terminal.core.log.generation.settings import Settings diff --git a/openbb_terminal/core/log/generation/settings_logger.py b/openbb_terminal/core/log/generation/settings_logger.py index 8f61c84304ad..394cf24e488b 100644 --- a/openbb_terminal/core/log/generation/settings_logger.py +++ b/openbb_terminal/core/log/generation/settings_logger.py @@ -1,20 +1,17 @@ # IMPORTATION STANDARD -import platform import json import logging +import platform from types import FunctionType, ModuleType # IMPORTATION THIRDPARTY - - # IMPORTATION INTERNAL import openbb_terminal.feature_flags as obbff from openbb_terminal import config_terminal as cfg -from openbb_terminal.terminal_helper import is_packaged_application from openbb_terminal.core.log.generation.path_tracking_file_handler import ( PathTrackingFileHandler, ) - +from openbb_terminal.terminal_helper import is_packaged_application SENSITIVE_WORDS = [ "API", diff --git a/openbb_terminal/core/scripts/sdk_audit.py b/openbb_terminal/core/scripts/sdk_audit.py index 573748b1160d..24e507564226 100644 --- a/openbb_terminal/core/scripts/sdk_audit.py +++ b/openbb_terminal/core/scripts/sdk_audit.py @@ -1,9 +1,10 @@ -from inspect import getmembers, isfunction -from typing import List, Callable, Tuple -from datetime import datetime import importlib.util -from pathlib import Path import os +from datetime import datetime +from inspect import getmembers, isfunction +from pathlib import Path +from typing import Callable, List, Tuple + import pandas as pd try: diff --git a/openbb_terminal/cryptocurrency/coinpaprika_helpers.py b/openbb_terminal/cryptocurrency/coinpaprika_helpers.py index 2d15b9de036b..b4c9b871926c 100644 --- a/openbb_terminal/cryptocurrency/coinpaprika_helpers.py +++ b/openbb_terminal/cryptocurrency/coinpaprika_helpers.py @@ -2,6 +2,7 @@ __docformat__ = "numpy" from typing import Any, Optional + import requests from requests.adapters import HTTPAdapter diff --git a/openbb_terminal/cryptocurrency/crypto_controller.py b/openbb_terminal/cryptocurrency/crypto_controller.py index 8b9d5f35a997..7d77471c1ff5 100644 --- a/openbb_terminal/cryptocurrency/crypto_controller.py +++ b/openbb_terminal/cryptocurrency/crypto_controller.py @@ -6,21 +6,21 @@ import logging import os from typing import List -from openbb_terminal.custom_prompt_toolkit import NestedCompleter -from openbb_terminal.cryptocurrency import cryptocurrency_helpers, pyth_model, pyth_view from openbb_terminal import feature_flags as obbff +from openbb_terminal.cryptocurrency import cryptocurrency_helpers, pyth_model, pyth_view +from openbb_terminal.cryptocurrency.crypto_views import find from openbb_terminal.cryptocurrency.cryptocurrency_helpers import ( display_all_coins, plot_chart, ) -from openbb_terminal.cryptocurrency.crypto_views import find from openbb_terminal.cryptocurrency.due_diligence import ( binance_view, coinpaprika_view, finbrain_crypto_view, pycoingecko_view, ) +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_BOTH_RAW_DATA_AND_FIGURES, @@ -30,7 +30,7 @@ ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import CryptoBaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console # pylint: disable=import-outside-toplevel diff --git a/openbb_terminal/cryptocurrency/crypto_models.py b/openbb_terminal/cryptocurrency/crypto_models.py index ba481ca3dc58..f07e26468401 100644 --- a/openbb_terminal/cryptocurrency/crypto_models.py +++ b/openbb_terminal/cryptocurrency/crypto_models.py @@ -1,4 +1,5 @@ import difflib + import pandas as pd from openbb_terminal.rich_config import console @@ -106,12 +107,12 @@ def _find_CoinPaprika(key: str, query: str, limit: int) -> pd.DataFrame: def _find_Binance(key: str, query: str, limit: int) -> pd.DataFrame: # pylint: disable=C0415 - from openbb_terminal.cryptocurrency.discovery.pycoingecko_model import ( - get_coin_list, - ) from openbb_terminal.cryptocurrency.cryptocurrency_helpers import ( load_binance_map, ) + from openbb_terminal.cryptocurrency.discovery.pycoingecko_model import ( + get_coin_list, + ) # TODO: Fix it in future. Determine if user looks for symbol like ETH or ethereum if len(query) > 5: @@ -132,12 +133,12 @@ def _find_Binance(key: str, query: str, limit: int) -> pd.DataFrame: def _find_Coinbase(key: str, query: str, limit: int) -> pd.DataFrame: # pylint: disable=C0415 - from openbb_terminal.cryptocurrency.discovery.pycoingecko_model import ( - get_coin_list, - ) from openbb_terminal.cryptocurrency.cryptocurrency_helpers import ( load_coinbase_map, ) + from openbb_terminal.cryptocurrency.discovery.pycoingecko_model import ( + get_coin_list, + ) if len(query) > 5: key = "id" diff --git a/openbb_terminal/cryptocurrency/crypto_views.py b/openbb_terminal/cryptocurrency/crypto_views.py index 80ced4dc6690..d15d2803b645 100644 --- a/openbb_terminal/cryptocurrency/crypto_views.py +++ b/openbb_terminal/cryptocurrency/crypto_views.py @@ -1,7 +1,7 @@ import os -from openbb_terminal.helper_funcs import print_rich_table, export_data from openbb_terminal.cryptocurrency import crypto_models +from openbb_terminal.helper_funcs import export_data, print_rich_table def find( diff --git a/openbb_terminal/cryptocurrency/cryptocurrency_helpers.py b/openbb_terminal/cryptocurrency/cryptocurrency_helpers.py index cb9968156c52..a8aee527798f 100644 --- a/openbb_terminal/cryptocurrency/cryptocurrency_helpers.py +++ b/openbb_terminal/cryptocurrency/cryptocurrency_helpers.py @@ -4,9 +4,9 @@ import difflib import json import logging -from typing import Union, Optional, List import os from datetime import datetime, timedelta +from typing import List, Optional, Union import ccxt import matplotlib.pyplot as plt diff --git a/openbb_terminal/cryptocurrency/dataframe_helpers.py b/openbb_terminal/cryptocurrency/dataframe_helpers.py index 5510173e3d78..0d5abdb64bec 100644 --- a/openbb_terminal/cryptocurrency/dataframe_helpers.py +++ b/openbb_terminal/cryptocurrency/dataframe_helpers.py @@ -3,9 +3,11 @@ import math import re -from typing import Union, Any, Optional import textwrap +from typing import Any, Optional, Union + import pandas as pd + from openbb_terminal.helper_funcs import lambda_long_number_format diff --git a/openbb_terminal/cryptocurrency/defi/coindix_model.py b/openbb_terminal/cryptocurrency/defi/coindix_model.py index 17bdee0b63a5..8de8e3d2b719 100644 --- a/openbb_terminal/cryptocurrency/defi/coindix_model.py +++ b/openbb_terminal/cryptocurrency/defi/coindix_model.py @@ -4,8 +4,9 @@ import logging from typing import Optional -import urllib3 import pandas as pd +import urllib3 + from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( get_user_agent, @@ -13,7 +14,6 @@ request, ) - urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/defi/cryptosaurio_model.py b/openbb_terminal/cryptocurrency/defi/cryptosaurio_model.py index 47f9033de265..1d921181ab90 100644 --- a/openbb_terminal/cryptocurrency/defi/cryptosaurio_model.py +++ b/openbb_terminal/cryptocurrency/defi/cryptosaurio_model.py @@ -3,9 +3,11 @@ import logging from typing import Tuple + import pandas as pd -from openbb_terminal.helper_funcs import request + from openbb_terminal.decorators import log_start_end +from openbb_terminal.helper_funcs import request logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/defi/cryptosaurio_view.py b/openbb_terminal/cryptocurrency/defi/cryptosaurio_view.py index 728290065468..2be97026975f 100644 --- a/openbb_terminal/cryptocurrency/defi/cryptosaurio_view.py +++ b/openbb_terminal/cryptocurrency/defi/cryptosaurio_view.py @@ -4,20 +4,21 @@ import logging import os from typing import List, Optional + import matplotlib.pyplot as plt + from openbb_terminal import config_terminal as cfg from openbb_terminal.config_plot import PLOT_DPI from openbb_terminal.cryptocurrency.defi import cryptosaurio_model from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, plot_autoscale, print_rich_table, - is_valid_axes_count, ) from openbb_terminal.rich_config import console - logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/defi/defi_controller.py b/openbb_terminal/cryptocurrency/defi/defi_controller.py index 51a55475c28a..56b6244dd9d5 100644 --- a/openbb_terminal/cryptocurrency/defi/defi_controller.py +++ b/openbb_terminal/cryptocurrency/defi/defi_controller.py @@ -7,8 +7,6 @@ import logging from typing import List -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff from openbb_terminal.cryptocurrency.defi import ( coindix_model, @@ -18,11 +16,12 @@ graph_view, llama_model, llama_view, + smartstake_view, substack_view, terramoney_fcd_model, terramoney_fcd_view, - smartstake_view, ) +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_BOTH_RAW_DATA_AND_FIGURES, @@ -32,7 +31,7 @@ ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/defi/graph_model.py b/openbb_terminal/cryptocurrency/defi/graph_model.py index 4ff662d6e4cc..f839430d505a 100644 --- a/openbb_terminal/cryptocurrency/defi/graph_model.py +++ b/openbb_terminal/cryptocurrency/defi/graph_model.py @@ -10,8 +10,8 @@ lambda_very_long_number_formatter, ) from openbb_terminal.decorators import log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.helper_funcs import request +from openbb_terminal.rich_config import console # pylint: disable=unsupported-assignment-operation diff --git a/openbb_terminal/cryptocurrency/defi/llama_model.py b/openbb_terminal/cryptocurrency/defi/llama_model.py index cc991461d3df..093a71b68964 100644 --- a/openbb_terminal/cryptocurrency/defi/llama_model.py +++ b/openbb_terminal/cryptocurrency/defi/llama_model.py @@ -8,12 +8,11 @@ import numpy as np import pandas as pd -from openbb_terminal.helper_funcs import request -from openbb_terminal.decorators import log_start_end -from openbb_terminal.helper_funcs import lambda_long_number_format from openbb_terminal.cryptocurrency.dataframe_helpers import ( lambda_replace_underscores_in_column_names, ) +from openbb_terminal.decorators import log_start_end +from openbb_terminal.helper_funcs import lambda_long_number_format, request logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/defi/llama_view.py b/openbb_terminal/cryptocurrency/defi/llama_view.py index 842ecfbc47c4..9354e518baf1 100644 --- a/openbb_terminal/cryptocurrency/defi/llama_view.py +++ b/openbb_terminal/cryptocurrency/defi/llama_view.py @@ -15,10 +15,10 @@ from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, lambda_long_number_format, plot_autoscale, print_rich_table, - is_valid_axes_count, ) logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/defi/smartstake_model.py b/openbb_terminal/cryptocurrency/defi/smartstake_model.py index 583acf79ef9a..2fb517c9c69f 100644 --- a/openbb_terminal/cryptocurrency/defi/smartstake_model.py +++ b/openbb_terminal/cryptocurrency/defi/smartstake_model.py @@ -1,13 +1,14 @@ """SmartStake Model""" __docformat__ = "numpy" -from typing import Union, Dict +from typing import Dict, Union + import pandas as pd -from openbb_terminal.decorators import check_api_key from openbb_terminal import config_terminal as cfg -from openbb_terminal.rich_config import console +from openbb_terminal.decorators import check_api_key from openbb_terminal.helper_funcs import request +from openbb_terminal.rich_config import console @check_api_key(["API_SMARTSTAKE_KEY", "API_SMARTSTAKE_TOKEN"]) diff --git a/openbb_terminal/cryptocurrency/defi/smartstake_view.py b/openbb_terminal/cryptocurrency/defi/smartstake_view.py index 738848227265..142bd48277e0 100644 --- a/openbb_terminal/cryptocurrency/defi/smartstake_view.py +++ b/openbb_terminal/cryptocurrency/defi/smartstake_view.py @@ -1,24 +1,22 @@ """SentimentInvestor View""" __docformat__ = "numpy" -import os import logging -from typing import Optional, List +import os +from typing import List, Optional from matplotlib import pyplot as plt -from openbb_terminal.decorators import check_api_key +from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.cryptocurrency.defi import smartstake_model +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, plot_autoscale, print_rich_table, - is_valid_axes_count, ) -from openbb_terminal.config_terminal import theme -from openbb_terminal.config_plot import PLOT_DPI -from openbb_terminal.decorators import log_start_end - # pylint: disable=E1101 diff --git a/openbb_terminal/cryptocurrency/defi/substack_model.py b/openbb_terminal/cryptocurrency/defi/substack_model.py index 893c012a965f..a19d569eda15 100644 --- a/openbb_terminal/cryptocurrency/defi/substack_model.py +++ b/openbb_terminal/cryptocurrency/defi/substack_model.py @@ -11,8 +11,8 @@ from dateutil import parser from openbb_terminal.decorators import log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.helper_funcs import request +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/defi/terraengineer_view.py b/openbb_terminal/cryptocurrency/defi/terraengineer_view.py index 262f99c1f1e5..447a9e633e7e 100644 --- a/openbb_terminal/cryptocurrency/defi/terraengineer_view.py +++ b/openbb_terminal/cryptocurrency/defi/terraengineer_view.py @@ -5,7 +5,6 @@ import os from typing import List, Optional - import matplotlib.pyplot as plt from matplotlib import ticker @@ -15,13 +14,12 @@ from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, lambda_long_number_format, plot_autoscale, - is_valid_axes_count, ) from openbb_terminal.rich_config import console - logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/defi/terramoney_fcd_model.py b/openbb_terminal/cryptocurrency/defi/terramoney_fcd_model.py index 42e4f919ded5..7dcd28306e62 100644 --- a/openbb_terminal/cryptocurrency/defi/terramoney_fcd_model.py +++ b/openbb_terminal/cryptocurrency/defi/terramoney_fcd_model.py @@ -4,18 +4,18 @@ import logging import textwrap from datetime import datetime -from typing import Any, Tuple, Dict +from typing import Any, Dict, Tuple import pandas as pd from openbb_terminal.cryptocurrency.dataframe_helpers import ( denominate_number, - prettify_column_names, lambda_replace_unicode, + prettify_column_names, ) from openbb_terminal.decorators import log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.helper_funcs import request +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/defi/terramoney_fcd_view.py b/openbb_terminal/cryptocurrency/defi/terramoney_fcd_view.py index bac380d14d67..3d56552fbe61 100644 --- a/openbb_terminal/cryptocurrency/defi/terramoney_fcd_view.py +++ b/openbb_terminal/cryptocurrency/defi/terramoney_fcd_view.py @@ -11,17 +11,17 @@ from openbb_terminal import config_terminal as cfg from openbb_terminal.config_plot import PLOT_DPI from openbb_terminal.cryptocurrency.dataframe_helpers import ( - prettify_column_names, lambda_very_long_number_formatter, + prettify_column_names, ) from openbb_terminal.cryptocurrency.defi import terramoney_fcd_model from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, lambda_long_number_format, plot_autoscale, print_rich_table, - is_valid_axes_count, ) from openbb_terminal.rich_config import console diff --git a/openbb_terminal/cryptocurrency/discovery/coinmarketcap_model.py b/openbb_terminal/cryptocurrency/discovery/coinmarketcap_model.py index 2510249e8067..84979206937d 100644 --- a/openbb_terminal/cryptocurrency/discovery/coinmarketcap_model.py +++ b/openbb_terminal/cryptocurrency/discovery/coinmarketcap_model.py @@ -7,7 +7,7 @@ from coinmarketcapapi import CoinMarketCapAPI, CoinMarketCapAPIError import openbb_terminal.config_terminal as cfg -from openbb_terminal.decorators import log_start_end, check_api_key +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/discovery/coinmarketcap_view.py b/openbb_terminal/cryptocurrency/discovery/coinmarketcap_view.py index 3818bf098732..240de352ae6b 100644 --- a/openbb_terminal/cryptocurrency/discovery/coinmarketcap_view.py +++ b/openbb_terminal/cryptocurrency/discovery/coinmarketcap_view.py @@ -4,9 +4,8 @@ import logging import os -from openbb_terminal.decorators import check_api_key from openbb_terminal.cryptocurrency.discovery import coinmarketcap_model -from openbb_terminal.decorators import log_start_end +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import export_data, print_rich_table from openbb_terminal.rich_config import console diff --git a/openbb_terminal/cryptocurrency/discovery/dappradar_model.py b/openbb_terminal/cryptocurrency/discovery/dappradar_model.py index 0583933b8746..8c9902896109 100644 --- a/openbb_terminal/cryptocurrency/discovery/dappradar_model.py +++ b/openbb_terminal/cryptocurrency/discovery/dappradar_model.py @@ -2,8 +2,8 @@ __docformat__ = "numpy" # pylint: disable=C0301,E1137 -from typing import Optional import logging +from typing import Optional import pandas as pd diff --git a/openbb_terminal/cryptocurrency/discovery/dappradar_view.py b/openbb_terminal/cryptocurrency/discovery/dappradar_view.py index 0731dc5571ee..0d846fc32abd 100644 --- a/openbb_terminal/cryptocurrency/discovery/dappradar_view.py +++ b/openbb_terminal/cryptocurrency/discovery/dappradar_view.py @@ -3,6 +3,7 @@ import logging import os + import numpy as np from openbb_terminal.cryptocurrency.dataframe_helpers import ( diff --git a/openbb_terminal/cryptocurrency/discovery/discovery_controller.py b/openbb_terminal/cryptocurrency/discovery/discovery_controller.py index d16699a170f8..c23384d9dcce 100644 --- a/openbb_terminal/cryptocurrency/discovery/discovery_controller.py +++ b/openbb_terminal/cryptocurrency/discovery/discovery_controller.py @@ -6,9 +6,6 @@ import logging from typing import List -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - - from openbb_terminal import feature_flags as obbff from openbb_terminal.cryptocurrency.discovery import ( coinmarketcap_model, @@ -20,6 +17,7 @@ pycoingecko_model, pycoingecko_view, ) +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_ONLY_RAW_DATA_ALLOWED, @@ -27,7 +25,7 @@ ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText, get_ordered_list_sources +from openbb_terminal.rich_config import MenuText, console, get_ordered_list_sources logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/discovery/pycoingecko_model.py b/openbb_terminal/cryptocurrency/discovery/pycoingecko_model.py index 6f263173d385..e168194f85d0 100644 --- a/openbb_terminal/cryptocurrency/discovery/pycoingecko_model.py +++ b/openbb_terminal/cryptocurrency/discovery/pycoingecko_model.py @@ -5,8 +5,10 @@ import logging import os from typing import List + import pandas as pd from pycoingecko import CoinGeckoAPI + from openbb_terminal.decorators import log_start_end logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/discovery/sdk_helpers.py b/openbb_terminal/cryptocurrency/discovery/sdk_helpers.py index bea27febdd75..11bd9958575d 100644 --- a/openbb_terminal/cryptocurrency/discovery/sdk_helpers.py +++ b/openbb_terminal/cryptocurrency/discovery/sdk_helpers.py @@ -2,6 +2,7 @@ __docfromat__ = "numpy" import pandas as pd + from openbb_terminal.cryptocurrency.discovery import ( coinmarketcap_model, pycoingecko_model, diff --git a/openbb_terminal/cryptocurrency/due_diligence/binance_model.py b/openbb_terminal/cryptocurrency/due_diligence/binance_model.py index 816d77f36956..a38877c556b5 100644 --- a/openbb_terminal/cryptocurrency/due_diligence/binance_model.py +++ b/openbb_terminal/cryptocurrency/due_diligence/binance_model.py @@ -11,7 +11,7 @@ from binance.exceptions import BinanceAPIException import openbb_terminal.config_terminal as cfg -from openbb_terminal.decorators import log_start_end, check_api_key +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/due_diligence/ccxt_view.py b/openbb_terminal/cryptocurrency/due_diligence/ccxt_view.py index b2775e2f2f1d..a5a1d9647674 100644 --- a/openbb_terminal/cryptocurrency/due_diligence/ccxt_view.py +++ b/openbb_terminal/cryptocurrency/due_diligence/ccxt_view.py @@ -5,8 +5,9 @@ import os from typing import List, Optional -from matplotlib import pyplot as plt import numpy as np +from matplotlib import pyplot as plt + from openbb_terminal.cryptocurrency.cryptocurrency_helpers import plot_order_book from openbb_terminal.cryptocurrency.due_diligence import ccxt_model from openbb_terminal.decorators import log_start_end diff --git a/openbb_terminal/cryptocurrency/due_diligence/coinbase_view.py b/openbb_terminal/cryptocurrency/due_diligence/coinbase_view.py index 0678b6484429..f21ff0cb17c8 100644 --- a/openbb_terminal/cryptocurrency/due_diligence/coinbase_view.py +++ b/openbb_terminal/cryptocurrency/due_diligence/coinbase_view.py @@ -3,11 +3,11 @@ import logging import os -from typing import Optional, List +from typing import List, Optional +import matplotlib.pyplot as plt import pandas as pd from pandas.plotting import register_matplotlib_converters -import matplotlib.pyplot as plt from openbb_terminal.cryptocurrency.cryptocurrency_helpers import plot_order_book from openbb_terminal.cryptocurrency.due_diligence import coinbase_model diff --git a/openbb_terminal/cryptocurrency/due_diligence/coinglass_view.py b/openbb_terminal/cryptocurrency/due_diligence/coinglass_view.py index 4b4cb1f558a0..2e1cc32d25fc 100644 --- a/openbb_terminal/cryptocurrency/due_diligence/coinglass_view.py +++ b/openbb_terminal/cryptocurrency/due_diligence/coinglass_view.py @@ -6,20 +6,19 @@ from matplotlib import pyplot as plt from matplotlib import ticker -from openbb_terminal.config_terminal import theme from openbb_terminal import config_plot as cfgPlot +from openbb_terminal.config_terminal import theme from openbb_terminal.cryptocurrency.due_diligence.coinglass_model import ( - get_liquidations, get_funding_rate, + get_liquidations, get_open_interest_per_exchange, ) -from openbb_terminal.decorators import check_api_key -from openbb_terminal.decorators import log_start_end +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, lambda_long_number_format, plot_autoscale, - is_valid_axes_count, ) logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/due_diligence/coinpaprika_model.py b/openbb_terminal/cryptocurrency/due_diligence/coinpaprika_model.py index 4b9209db925c..1f45e4ba87ca 100644 --- a/openbb_terminal/cryptocurrency/due_diligence/coinpaprika_model.py +++ b/openbb_terminal/cryptocurrency/due_diligence/coinpaprika_model.py @@ -3,8 +3,8 @@ import logging import textwrap -from typing import Tuple, Optional from datetime import datetime, timedelta +from typing import Optional, Tuple import pandas as pd from dateutil import parser diff --git a/openbb_terminal/cryptocurrency/due_diligence/cryptopanic_view.py b/openbb_terminal/cryptocurrency/due_diligence/cryptopanic_view.py index cad94985de2d..efdd4b988c63 100644 --- a/openbb_terminal/cryptocurrency/due_diligence/cryptopanic_view.py +++ b/openbb_terminal/cryptocurrency/due_diligence/cryptopanic_view.py @@ -5,11 +5,10 @@ import os from typing import Optional +from openbb_terminal.cryptocurrency.dataframe_helpers import prettify_column_names from openbb_terminal.cryptocurrency.overview import cryptopanic_model -from openbb_terminal.decorators import log_start_end +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import export_data, print_rich_table -from openbb_terminal.decorators import check_api_key -from openbb_terminal.cryptocurrency.dataframe_helpers import prettify_column_names logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/due_diligence/dd_controller.py b/openbb_terminal/cryptocurrency/due_diligence/dd_controller.py index 0f34b70101db..d332762c9bdb 100644 --- a/openbb_terminal/cryptocurrency/due_diligence/dd_controller.py +++ b/openbb_terminal/cryptocurrency/due_diligence/dd_controller.py @@ -7,31 +7,30 @@ from datetime import datetime, timedelta from typing import List -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - -from openbb_terminal.cryptocurrency import cryptocurrency_helpers from openbb_terminal import feature_flags as obbff -from openbb_terminal.cryptocurrency.overview import cryptopanic_model -from openbb_terminal.cryptocurrency.due_diligence import tokenterminal_model +from openbb_terminal.cryptocurrency import cryptocurrency_helpers from openbb_terminal.cryptocurrency.due_diligence import ( binance_model, binance_view, ccxt_model, ccxt_view, + coinbase_model, coinbase_view, coinglass_model, - coinbase_model, coinglass_view, coinpaprika_view, + cryptopanic_view, glassnode_model, glassnode_view, - pycoingecko_view, messari_model, messari_view, + pycoingecko_view, santiment_view, - cryptopanic_view, + tokenterminal_model, tokenterminal_view, ) +from openbb_terminal.cryptocurrency.overview import cryptopanic_model +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_BOTH_RAW_DATA_AND_FIGURES, @@ -42,7 +41,7 @@ ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import CryptoBaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/due_diligence/finbrain_crypto_view.py b/openbb_terminal/cryptocurrency/due_diligence/finbrain_crypto_view.py index d28eca3bd655..bf0744365c14 100644 --- a/openbb_terminal/cryptocurrency/due_diligence/finbrain_crypto_view.py +++ b/openbb_terminal/cryptocurrency/due_diligence/finbrain_crypto_view.py @@ -3,26 +3,26 @@ import logging import os -from typing import Optional, List +from typing import List, Optional import numpy as np import pandas as pd from matplotlib import pyplot as plt +from openbb_terminal import rich_config from openbb_terminal.common.behavioural_analysis.finbrain_model import get_sentiment from openbb_terminal.common.behavioural_analysis.finbrain_view import ( lambda_sentiment_coloring, ) +from openbb_terminal.config_plot import PLOT_DPI from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end -from openbb_terminal.config_plot import PLOT_DPI from openbb_terminal.helper_funcs import ( export_data, - plot_autoscale, is_valid_axes_count, + plot_autoscale, ) from openbb_terminal.rich_config import console -from openbb_terminal import rich_config logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/due_diligence/glassnode_model.py b/openbb_terminal/cryptocurrency/due_diligence/glassnode_model.py index 6434f9832b5c..4aa4f097b39c 100644 --- a/openbb_terminal/cryptocurrency/due_diligence/glassnode_model.py +++ b/openbb_terminal/cryptocurrency/due_diligence/glassnode_model.py @@ -1,13 +1,14 @@ -from datetime import datetime, timedelta -import logging import json +import logging +from datetime import datetime, timedelta from typing import Optional import pandas as pd + from openbb_terminal import config_terminal as cfg -from openbb_terminal.decorators import log_start_end, check_api_key +from openbb_terminal.decorators import check_api_key, log_start_end +from openbb_terminal.helper_funcs import request, str_date_to_timestamp from openbb_terminal.rich_config import console -from openbb_terminal.helper_funcs import str_date_to_timestamp, request # pylint: disable=unsupported-assignment-operation diff --git a/openbb_terminal/cryptocurrency/due_diligence/glassnode_view.py b/openbb_terminal/cryptocurrency/due_diligence/glassnode_view.py index 501057e8e6a0..21b741cca943 100644 --- a/openbb_terminal/cryptocurrency/due_diligence/glassnode_view.py +++ b/openbb_terminal/cryptocurrency/due_diligence/glassnode_view.py @@ -8,9 +8,8 @@ from matplotlib import ticker from matplotlib.lines import Line2D -from openbb_terminal.config_terminal import theme -from openbb_terminal.decorators import check_api_key from openbb_terminal import config_plot as cfgPlot +from openbb_terminal.config_terminal import theme from openbb_terminal.cryptocurrency.due_diligence.glassnode_model import ( get_active_addresses, get_exchange_balances, @@ -18,11 +17,11 @@ get_hashrate, get_non_zero_addresses, ) -from openbb_terminal.decorators import log_start_end +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import ( export_data, - plot_autoscale, is_valid_axes_count, + plot_autoscale, ) logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/due_diligence/messari_view.py b/openbb_terminal/cryptocurrency/due_diligence/messari_view.py index cf93792f7805..f80d5c3bb7c7 100644 --- a/openbb_terminal/cryptocurrency/due_diligence/messari_view.py +++ b/openbb_terminal/cryptocurrency/due_diligence/messari_view.py @@ -7,17 +7,18 @@ import os from datetime import datetime, timedelta from typing import List, Optional -import pandas as pd + import numpy as np +import pandas as pd +from matplotlib import dates as mdates from matplotlib import pyplot as plt from matplotlib import ticker -from matplotlib import dates as mdates -from openbb_terminal.config_terminal import theme +from openbb_terminal import config_plot as cfgPlot from openbb_terminal import feature_flags as obbff +from openbb_terminal.config_terminal import theme from openbb_terminal.cryptocurrency import cryptocurrency_helpers -from openbb_terminal.decorators import check_api_key -from openbb_terminal import config_plot as cfgPlot +from openbb_terminal.cryptocurrency.dataframe_helpers import prettify_paragraph from openbb_terminal.cryptocurrency.due_diligence.messari_model import ( get_available_timeseries, get_fundraising, @@ -31,16 +32,15 @@ get_team, get_tokenomics, ) -from openbb_terminal.decorators import log_start_end +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, lambda_long_number_format, plot_autoscale, print_rich_table, - is_valid_axes_count, ) from openbb_terminal.rich_config import console -from openbb_terminal.cryptocurrency.dataframe_helpers import prettify_paragraph logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/due_diligence/pycoingecko_view.py b/openbb_terminal/cryptocurrency/due_diligence/pycoingecko_view.py index 65884cfba4fd..36792bd44b59 100644 --- a/openbb_terminal/cryptocurrency/due_diligence/pycoingecko_view.py +++ b/openbb_terminal/cryptocurrency/due_diligence/pycoingecko_view.py @@ -4,7 +4,9 @@ import logging import os from typing import Optional + from pandas.plotting import register_matplotlib_converters + import openbb_terminal.cryptocurrency.due_diligence.pycoingecko_model as gecko from openbb_terminal.cryptocurrency import cryptocurrency_helpers from openbb_terminal.cryptocurrency.dataframe_helpers import wrap_text_in_df diff --git a/openbb_terminal/cryptocurrency/due_diligence/santiment_model.py b/openbb_terminal/cryptocurrency/due_diligence/santiment_model.py index 07d54d28f93f..aed7380b4fb1 100644 --- a/openbb_terminal/cryptocurrency/due_diligence/santiment_model.py +++ b/openbb_terminal/cryptocurrency/due_diligence/santiment_model.py @@ -5,10 +5,10 @@ import pandas as pd from openbb_terminal import config_terminal as cfg -from openbb_terminal.decorators import check_api_key, log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.cryptocurrency.discovery.pycoingecko_model import read_file_data +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import request +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/due_diligence/santiment_view.py b/openbb_terminal/cryptocurrency/due_diligence/santiment_view.py index be5e96f84cfb..ec78fdf7d6d2 100644 --- a/openbb_terminal/cryptocurrency/due_diligence/santiment_view.py +++ b/openbb_terminal/cryptocurrency/due_diligence/santiment_view.py @@ -4,20 +4,18 @@ from matplotlib import pyplot as plt -from openbb_terminal.config_terminal import theme -from openbb_terminal.decorators import check_api_key from openbb_terminal import config_plot as cfgPlot +from openbb_terminal.config_terminal import theme from openbb_terminal.cryptocurrency.due_diligence.santiment_model import ( get_github_activity, ) -from openbb_terminal.decorators import log_start_end +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import ( export_data, - plot_autoscale, is_valid_axes_count, + plot_autoscale, ) - logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/due_diligence/sdk_helper.py b/openbb_terminal/cryptocurrency/due_diligence/sdk_helper.py index c2d64e19c404..9a2ae9d4063e 100644 --- a/openbb_terminal/cryptocurrency/due_diligence/sdk_helper.py +++ b/openbb_terminal/cryptocurrency/due_diligence/sdk_helper.py @@ -2,6 +2,7 @@ __docformat__ = "numpy" import pandas as pd + import openbb_terminal.cryptocurrency.due_diligence.pycoingecko_model as gecko diff --git a/openbb_terminal/cryptocurrency/due_diligence/tokenterminal_model.py b/openbb_terminal/cryptocurrency/due_diligence/tokenterminal_model.py index f3ee2bc7dd2b..5bd487cbafcb 100644 --- a/openbb_terminal/cryptocurrency/due_diligence/tokenterminal_model.py +++ b/openbb_terminal/cryptocurrency/due_diligence/tokenterminal_model.py @@ -1,11 +1,12 @@ """Token Terminal Model""" import logging +from typing import Dict, List -from typing import List, Dict import pandas as pd from tokenterminal import TokenTerminal -from openbb_terminal.decorators import log_start_end + from openbb_terminal import config_terminal as cfg +from openbb_terminal.decorators import log_start_end logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/due_diligence/tokenterminal_view.py b/openbb_terminal/cryptocurrency/due_diligence/tokenterminal_view.py index 65f4806c9c17..f7c308882eae 100644 --- a/openbb_terminal/cryptocurrency/due_diligence/tokenterminal_view.py +++ b/openbb_terminal/cryptocurrency/due_diligence/tokenterminal_view.py @@ -3,23 +3,22 @@ import os from typing import List, Optional +import pandas as pd from matplotlib import pyplot as plt -import pandas as pd -from openbb_terminal.config_terminal import theme from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.cryptocurrency.due_diligence.tokenterminal_model import ( + METRICS, + get_description, get_fundamental_metric_from_project, get_project_ids, - get_description, - METRICS, ) -from openbb_terminal.decorators import check_api_key -from openbb_terminal.decorators import log_start_end +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import ( export_data, - plot_autoscale, is_valid_axes_count, + plot_autoscale, ) from openbb_terminal.rich_config import console diff --git a/openbb_terminal/cryptocurrency/nft/nftpricefloor_model.py b/openbb_terminal/cryptocurrency/nft/nftpricefloor_model.py index 189b43ec8dd4..7cea004169cb 100644 --- a/openbb_terminal/cryptocurrency/nft/nftpricefloor_model.py +++ b/openbb_terminal/cryptocurrency/nft/nftpricefloor_model.py @@ -5,8 +5,8 @@ import pandas as pd -from openbb_terminal.helper_funcs import request from openbb_terminal.decorators import log_start_end +from openbb_terminal.helper_funcs import request logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/nft/opensea_model.py b/openbb_terminal/cryptocurrency/nft/opensea_model.py index f766979c0e70..d6e6c46ca833 100644 --- a/openbb_terminal/cryptocurrency/nft/opensea_model.py +++ b/openbb_terminal/cryptocurrency/nft/opensea_model.py @@ -5,8 +5,8 @@ import pandas as pd -from openbb_terminal.helper_funcs import request from openbb_terminal.decorators import log_start_end +from openbb_terminal.helper_funcs import request logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/onchain/bitquery_model.py b/openbb_terminal/cryptocurrency/onchain/bitquery_model.py index 3e8ac64ccf56..a38e89edbf4d 100644 --- a/openbb_terminal/cryptocurrency/onchain/bitquery_model.py +++ b/openbb_terminal/cryptocurrency/onchain/bitquery_model.py @@ -13,12 +13,12 @@ from requests.adapters import HTTPAdapter from requests.exceptions import HTTPError +from openbb_terminal import config_terminal as cfg from openbb_terminal.cryptocurrency.dataframe_helpers import ( prettify_column_names, ) -from openbb_terminal import config_terminal as cfg -from openbb_terminal.rich_config import console from openbb_terminal.decorators import check_api_key, log_start_end +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/onchain/bitquery_view.py b/openbb_terminal/cryptocurrency/onchain/bitquery_view.py index fd91f059e429..a8084e1fd5e5 100644 --- a/openbb_terminal/cryptocurrency/onchain/bitquery_view.py +++ b/openbb_terminal/cryptocurrency/onchain/bitquery_view.py @@ -6,14 +6,11 @@ from openbb_terminal.cryptocurrency.dataframe_helpers import ( lambda_very_long_number_formatter, -) -from openbb_terminal.cryptocurrency.dataframe_helpers import ( prettify_column_names, ) from openbb_terminal.cryptocurrency.onchain import bitquery_model -from openbb_terminal.decorators import log_start_end +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import export_data, print_rich_table -from openbb_terminal.decorators import check_api_key logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/onchain/blockchain_model.py b/openbb_terminal/cryptocurrency/onchain/blockchain_model.py index 0f2ace42cfb4..755915598995 100644 --- a/openbb_terminal/cryptocurrency/onchain/blockchain_model.py +++ b/openbb_terminal/cryptocurrency/onchain/blockchain_model.py @@ -5,8 +5,8 @@ import pandas as pd -from openbb_terminal.helper_funcs import request from openbb_terminal.decorators import log_start_end +from openbb_terminal.helper_funcs import request logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/onchain/blockchain_view.py b/openbb_terminal/cryptocurrency/onchain/blockchain_view.py index c990a68a09a6..d06cc0318df6 100644 --- a/openbb_terminal/cryptocurrency/onchain/blockchain_view.py +++ b/openbb_terminal/cryptocurrency/onchain/blockchain_view.py @@ -9,17 +9,17 @@ import matplotlib.pyplot as plt from matplotlib import ticker -from openbb_terminal.config_terminal import theme from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.cryptocurrency.onchain import blockchain_model from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, lambda_long_number_format, plot_autoscale, - is_valid_axes_count, - str_date_to_timestamp, print_rich_table, + str_date_to_timestamp, ) logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/onchain/ethgasstation_model.py b/openbb_terminal/cryptocurrency/onchain/ethgasstation_model.py index 751ceb6efc07..ed181a709065 100644 --- a/openbb_terminal/cryptocurrency/onchain/ethgasstation_model.py +++ b/openbb_terminal/cryptocurrency/onchain/ethgasstation_model.py @@ -4,8 +4,8 @@ import pandas as pd import requests -from openbb_terminal.helper_funcs import request from openbb_terminal.decorators import log_start_end +from openbb_terminal.helper_funcs import request logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/onchain/ethplorer_model.py b/openbb_terminal/cryptocurrency/onchain/ethplorer_model.py index 7b8366ebd061..bdb7f171d069 100644 --- a/openbb_terminal/cryptocurrency/onchain/ethplorer_model.py +++ b/openbb_terminal/cryptocurrency/onchain/ethplorer_model.py @@ -9,12 +9,11 @@ import pandas as pd - -from openbb_terminal.helper_funcs import request import openbb_terminal.config_terminal as cfg -from openbb_terminal.rich_config import console from openbb_terminal.cryptocurrency.dataframe_helpers import create_df_index from openbb_terminal.decorators import log_start_end +from openbb_terminal.helper_funcs import request +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/onchain/ethplorer_view.py b/openbb_terminal/cryptocurrency/onchain/ethplorer_view.py index 90b43729063f..a52862cf8b72 100644 --- a/openbb_terminal/cryptocurrency/onchain/ethplorer_view.py +++ b/openbb_terminal/cryptocurrency/onchain/ethplorer_view.py @@ -8,8 +8,7 @@ lambda_very_long_number_formatter, ) from openbb_terminal.cryptocurrency.onchain import ethplorer_model -from openbb_terminal.decorators import check_api_key -from openbb_terminal.decorators import log_start_end +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import export_data, print_rich_table from openbb_terminal.rich_config import console diff --git a/openbb_terminal/cryptocurrency/onchain/onchain_controller.py b/openbb_terminal/cryptocurrency/onchain/onchain_controller.py index 67e4e02de8da..408200808342 100644 --- a/openbb_terminal/cryptocurrency/onchain/onchain_controller.py +++ b/openbb_terminal/cryptocurrency/onchain/onchain_controller.py @@ -9,8 +9,6 @@ from datetime import datetime, timedelta from typing import List -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff from openbb_terminal.cryptocurrency.due_diligence.glassnode_model import ( GLASSNODE_SUPPORTED_HASHRATE_ASSETS, @@ -31,6 +29,7 @@ whale_alert_model, whale_alert_view, ) +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_BOTH_RAW_DATA_AND_FIGURES, @@ -41,7 +40,7 @@ ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/onchain/shroom_model.py b/openbb_terminal/cryptocurrency/onchain/shroom_model.py index 730dd6d9af2c..de8f503072e7 100644 --- a/openbb_terminal/cryptocurrency/onchain/shroom_model.py +++ b/openbb_terminal/cryptocurrency/onchain/shroom_model.py @@ -1,15 +1,15 @@ """Shroom model""" -import logging -from typing import List import json +import logging import time -import pandas as pd +from typing import List +import pandas as pd -from openbb_terminal.rich_config import console -from openbb_terminal.decorators import log_start_end, check_api_key from openbb_terminal import config_terminal as cfg +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import request +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/onchain/shroom_view.py b/openbb_terminal/cryptocurrency/onchain/shroom_view.py index 6b87e2669501..548699002cd1 100644 --- a/openbb_terminal/cryptocurrency/onchain/shroom_view.py +++ b/openbb_terminal/cryptocurrency/onchain/shroom_view.py @@ -7,6 +7,7 @@ from matplotlib import pyplot as plt +from openbb_terminal import config_plot as cfgPlot from openbb_terminal import config_terminal as cfg from openbb_terminal.config_terminal import theme from openbb_terminal.cryptocurrency.onchain.shroom_model import ( @@ -14,13 +15,11 @@ get_dapp_stats, get_total_value_locked, ) -from openbb_terminal.decorators import check_api_key -from openbb_terminal import config_plot as cfgPlot -from openbb_terminal.decorators import log_start_end +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import ( export_data, - plot_autoscale, is_valid_axes_count, + plot_autoscale, print_rich_table, ) from openbb_terminal.rich_config import console diff --git a/openbb_terminal/cryptocurrency/onchain/whale_alert_model.py b/openbb_terminal/cryptocurrency/onchain/whale_alert_model.py index 67b73d21dd7d..2ac271a06c8e 100644 --- a/openbb_terminal/cryptocurrency/onchain/whale_alert_model.py +++ b/openbb_terminal/cryptocurrency/onchain/whale_alert_model.py @@ -3,15 +3,15 @@ import logging import textwrap -from typing import Optional, Tuple, Any +from typing import Any, Optional, Tuple import numpy as np import pandas as pd -from openbb_terminal.helper_funcs import request import openbb_terminal.config_terminal as cfg -from openbb_terminal.rich_config import console from openbb_terminal.decorators import check_api_key, log_start_end +from openbb_terminal.helper_funcs import request +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/onchain/whale_alert_view.py b/openbb_terminal/cryptocurrency/onchain/whale_alert_view.py index 041337509afe..4590b99d032c 100644 --- a/openbb_terminal/cryptocurrency/onchain/whale_alert_view.py +++ b/openbb_terminal/cryptocurrency/onchain/whale_alert_view.py @@ -5,8 +5,7 @@ import os from openbb_terminal.cryptocurrency.onchain import whale_alert_model -from openbb_terminal.decorators import check_api_key -from openbb_terminal.decorators import log_start_end +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import ( export_data, lambda_long_number_format, diff --git a/openbb_terminal/cryptocurrency/overview/blockchaincenter_model.py b/openbb_terminal/cryptocurrency/overview/blockchaincenter_model.py index adf658bbde26..638117df1512 100644 --- a/openbb_terminal/cryptocurrency/overview/blockchaincenter_model.py +++ b/openbb_terminal/cryptocurrency/overview/blockchaincenter_model.py @@ -5,11 +5,10 @@ from typing import Optional import pandas as pd - from bs4 import BeautifulSoup from openbb_terminal.decorators import log_start_end -from openbb_terminal.helper_funcs import get_user_agent, str_date_to_timestamp, request +from openbb_terminal.helper_funcs import get_user_agent, request, str_date_to_timestamp logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/overview/blockchaincenter_view.py b/openbb_terminal/cryptocurrency/overview/blockchaincenter_view.py index 0f5b5bf451ee..19a693090dbf 100644 --- a/openbb_terminal/cryptocurrency/overview/blockchaincenter_view.py +++ b/openbb_terminal/cryptocurrency/overview/blockchaincenter_view.py @@ -1,13 +1,13 @@ """Blockchain Center View""" import logging import os -from typing import List, Optional from datetime import datetime +from typing import List, Optional from matplotlib import pyplot as plt -from openbb_terminal.config_terminal import theme from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.cryptocurrency.overview.blockchaincenter_model import ( DAYS, get_altcoin_index, @@ -15,8 +15,8 @@ from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, - plot_autoscale, is_valid_axes_count, + plot_autoscale, ) from openbb_terminal.rich_config import console diff --git a/openbb_terminal/cryptocurrency/overview/coinbase_model.py b/openbb_terminal/cryptocurrency/overview/coinbase_model.py index 5aed2f4c482f..b2f3311401ff 100644 --- a/openbb_terminal/cryptocurrency/overview/coinbase_model.py +++ b/openbb_terminal/cryptocurrency/overview/coinbase_model.py @@ -2,7 +2,9 @@ __docformat__ = "numpy" import logging + import pandas as pd + from openbb_terminal.cryptocurrency.coinbase_helpers import make_coinbase_request from openbb_terminal.decorators import log_start_end diff --git a/openbb_terminal/cryptocurrency/overview/coinbase_view.py b/openbb_terminal/cryptocurrency/overview/coinbase_view.py index 869e722d39d1..0ee472dd94fe 100644 --- a/openbb_terminal/cryptocurrency/overview/coinbase_view.py +++ b/openbb_terminal/cryptocurrency/overview/coinbase_view.py @@ -5,8 +5,7 @@ import os from openbb_terminal.cryptocurrency.overview import coinbase_model -from openbb_terminal.decorators import check_api_key -from openbb_terminal.decorators import log_start_end +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import ( export_data, print_rich_table, diff --git a/openbb_terminal/cryptocurrency/overview/cryptopanic_model.py b/openbb_terminal/cryptocurrency/overview/cryptopanic_model.py index c07a3f30bc2d..a346df125804 100644 --- a/openbb_terminal/cryptocurrency/overview/cryptopanic_model.py +++ b/openbb_terminal/cryptocurrency/overview/cryptopanic_model.py @@ -9,12 +9,12 @@ import pandas as pd -from openbb_terminal.helper_funcs import request import openbb_terminal.config_terminal as cfg -from openbb_terminal.rich_config import console -from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.cryptocurrency.cryptocurrency_helpers import prepare_all_coins_df +from openbb_terminal.decorators import check_api_key, log_start_end +from openbb_terminal.helper_funcs import request from openbb_terminal.parent_classes import CRYPTO_SOURCES +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/overview/cryptopanic_view.py b/openbb_terminal/cryptocurrency/overview/cryptopanic_view.py index 7c5fea10ae4c..a144d24176b6 100644 --- a/openbb_terminal/cryptocurrency/overview/cryptopanic_view.py +++ b/openbb_terminal/cryptocurrency/overview/cryptopanic_view.py @@ -6,9 +6,8 @@ from typing import Optional from openbb_terminal.cryptocurrency.overview import cryptopanic_model -from openbb_terminal.decorators import log_start_end +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import export_data, print_rich_table -from openbb_terminal.decorators import check_api_key logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/overview/glassnode_model.py b/openbb_terminal/cryptocurrency/overview/glassnode_model.py index 9eabf7169126..b7c18fd96fa2 100644 --- a/openbb_terminal/cryptocurrency/overview/glassnode_model.py +++ b/openbb_terminal/cryptocurrency/overview/glassnode_model.py @@ -1,11 +1,11 @@ -from datetime import datetime import logging +from datetime import datetime from typing import Optional -from pandas import DataFrame -from openbb_terminal.decorators import log_start_end +from pandas import DataFrame from openbb_terminal.cryptocurrency.due_diligence.glassnode_model import get_close_price +from openbb_terminal.decorators import log_start_end # pylint: disable=unsupported-assignment-operation diff --git a/openbb_terminal/cryptocurrency/overview/glassnode_view.py b/openbb_terminal/cryptocurrency/overview/glassnode_view.py index 5cb06b7fdd4c..21eb0e00a4ab 100644 --- a/openbb_terminal/cryptocurrency/overview/glassnode_view.py +++ b/openbb_terminal/cryptocurrency/overview/glassnode_view.py @@ -9,17 +9,16 @@ from matplotlib import dates as mdates from matplotlib import pyplot as plt -from openbb_terminal.config_terminal import theme -from openbb_terminal.decorators import check_api_key from openbb_terminal import config_plot as cfgPlot +from openbb_terminal.config_terminal import theme from openbb_terminal.cryptocurrency.overview.glassnode_model import ( get_btc_rainbow, ) -from openbb_terminal.decorators import log_start_end +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import ( export_data, - plot_autoscale, is_valid_axes_count, + plot_autoscale, ) logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/overview/loanscan_view.py b/openbb_terminal/cryptocurrency/overview/loanscan_view.py index c8df4a7a7ae1..bd524248506d 100644 --- a/openbb_terminal/cryptocurrency/overview/loanscan_view.py +++ b/openbb_terminal/cryptocurrency/overview/loanscan_view.py @@ -2,20 +2,22 @@ import logging import os from typing import List, Optional + import matplotlib.pyplot as plt -import pandas as pd import numpy as np +import pandas as pd + +from openbb_terminal import config_terminal as cfg +from openbb_terminal.config_plot import PLOT_DPI from openbb_terminal.cryptocurrency.overview import loanscan_model from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, plot_autoscale, print_rich_table, - is_valid_axes_count, ) from openbb_terminal.rich_config import console -from openbb_terminal import config_terminal as cfg -from openbb_terminal.config_plot import PLOT_DPI logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/overview/overview_controller.py b/openbb_terminal/cryptocurrency/overview/overview_controller.py index e8d715913b29..06fe28e32fab 100644 --- a/openbb_terminal/cryptocurrency/overview/overview_controller.py +++ b/openbb_terminal/cryptocurrency/overview/overview_controller.py @@ -8,11 +8,9 @@ from datetime import datetime, timedelta from typing import List -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff -from openbb_terminal.cryptocurrency.overview.glassnode_view import ( - display_btc_rainbow, +from openbb_terminal.cryptocurrency.discovery.pycoingecko_model import ( + get_categories_keys, ) from openbb_terminal.cryptocurrency.overview import ( blockchaincenter_view, @@ -28,19 +26,20 @@ pycoingecko_view, rekt_model, rekt_view, - withdrawalfees_model, - withdrawalfees_view, tokenterminal_model, tokenterminal_view, -) -from openbb_terminal.cryptocurrency.discovery.pycoingecko_model import ( - get_categories_keys, + withdrawalfees_model, + withdrawalfees_view, ) from openbb_terminal.cryptocurrency.overview.blockchaincenter_model import DAYS from openbb_terminal.cryptocurrency.overview.coinpaprika_model import ( get_all_contract_platforms, ) from openbb_terminal.cryptocurrency.overview.coinpaprika_view import CURRENCIES +from openbb_terminal.cryptocurrency.overview.glassnode_view import ( + display_btc_rainbow, +) +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_BOTH_RAW_DATA_AND_FIGURES, @@ -51,7 +50,7 @@ ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/overview/pycoingecko_view.py b/openbb_terminal/cryptocurrency/overview/pycoingecko_view.py index f8d7dc4bc2a6..797af355d824 100644 --- a/openbb_terminal/cryptocurrency/overview/pycoingecko_view.py +++ b/openbb_terminal/cryptocurrency/overview/pycoingecko_view.py @@ -4,13 +4,14 @@ import logging import os from typing import List, Optional + import squarify +from matplotlib import cm, ticker from matplotlib import pyplot as plt -from matplotlib import ticker -from matplotlib import cm from pandas.plotting import register_matplotlib_converters -from openbb_terminal import config_terminal as cfg + import openbb_terminal.cryptocurrency.overview.pycoingecko_model as gecko +from openbb_terminal import config_terminal as cfg from openbb_terminal import feature_flags as obbff from openbb_terminal.config_plot import PLOT_DPI from openbb_terminal.cryptocurrency.dataframe_helpers import ( @@ -19,9 +20,9 @@ from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, plot_autoscale, print_rich_table, - is_valid_axes_count, ) from openbb_terminal.rich_config import console diff --git a/openbb_terminal/cryptocurrency/overview/sdk_helpers.py b/openbb_terminal/cryptocurrency/overview/sdk_helpers.py index adc58275b98d..ccec6062d934 100644 --- a/openbb_terminal/cryptocurrency/overview/sdk_helpers.py +++ b/openbb_terminal/cryptocurrency/overview/sdk_helpers.py @@ -2,10 +2,11 @@ __docformat__ = "numpy" import pandas as pd -from openbb_terminal.cryptocurrency.overview import pycoingecko_model, coinpaprika_model + from openbb_terminal.cryptocurrency.dataframe_helpers import ( lambda_long_number_format_with_type_check, ) +from openbb_terminal.cryptocurrency.overview import coinpaprika_model, pycoingecko_model def globe(source: str = "CoinGecko") -> pd.DataFrame: diff --git a/openbb_terminal/cryptocurrency/overview/tokenterminal_model.py b/openbb_terminal/cryptocurrency/overview/tokenterminal_model.py index c2c5f4765c0e..4bb94d2c2f42 100644 --- a/openbb_terminal/cryptocurrency/overview/tokenterminal_model.py +++ b/openbb_terminal/cryptocurrency/overview/tokenterminal_model.py @@ -1,11 +1,12 @@ """Token Terminal Model""" import logging - from typing import List + import pandas as pd from tokenterminal import TokenTerminal -from openbb_terminal.decorators import log_start_end + from openbb_terminal import config_terminal as cfg +from openbb_terminal.decorators import log_start_end logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/overview/tokenterminal_view.py b/openbb_terminal/cryptocurrency/overview/tokenterminal_view.py index 18ceb04429c4..93c09eb9dc58 100644 --- a/openbb_terminal/cryptocurrency/overview/tokenterminal_view.py +++ b/openbb_terminal/cryptocurrency/overview/tokenterminal_view.py @@ -6,20 +6,19 @@ from matplotlib import pyplot as plt from openbb_terminal import config_terminal as cfg -from openbb_terminal.config_terminal import theme from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.cryptocurrency.overview.tokenterminal_model import ( - get_fundamental_metrics, + CATEGORIES, METRICS, TIMELINES, - CATEGORIES, + get_fundamental_metrics, ) -from openbb_terminal.decorators import check_api_key -from openbb_terminal.decorators import log_start_end +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import ( export_data, - plot_autoscale, is_valid_axes_count, + plot_autoscale, ) from openbb_terminal.rich_config import console diff --git a/openbb_terminal/cryptocurrency/overview/withdrawalfees_model.py b/openbb_terminal/cryptocurrency/overview/withdrawalfees_model.py index b5fc513c54d5..5dede437dbf3 100644 --- a/openbb_terminal/cryptocurrency/overview/withdrawalfees_model.py +++ b/openbb_terminal/cryptocurrency/overview/withdrawalfees_model.py @@ -4,7 +4,6 @@ from typing import Any, List import pandas as pd - from bs4 import BeautifulSoup from openbb_terminal.decorators import log_start_end diff --git a/openbb_terminal/cryptocurrency/pycoingecko_helpers.py b/openbb_terminal/cryptocurrency/pycoingecko_helpers.py index a145c5ac92bc..3c35b44990ad 100644 --- a/openbb_terminal/cryptocurrency/pycoingecko_helpers.py +++ b/openbb_terminal/cryptocurrency/pycoingecko_helpers.py @@ -1,20 +1,21 @@ """CoinGecko helpers""" __docformat__ = "numpy" +import datetime as dt import json +import logging import math -import datetime as dt -from datetime import timezone -from typing import Sequence, Optional, Any, Dict, Tuple, Union, List import textwrap -import logging +from datetime import timezone +from typing import Any, Dict, List, Optional, Sequence, Tuple, Union -from bs4 import BeautifulSoup import pandas as pd import requests +from bs4 import BeautifulSoup from dateutil import parser from requests.adapters import HTTPAdapter, RetryError from urllib3.util.retry import Retry + from openbb_terminal.helper_funcs import get_user_agent, request from openbb_terminal.rich_config import console diff --git a/openbb_terminal/cryptocurrency/pyth_model.py b/openbb_terminal/cryptocurrency/pyth_model.py index 64ab42f61e5a..658bd1d76d13 100644 --- a/openbb_terminal/cryptocurrency/pyth_model.py +++ b/openbb_terminal/cryptocurrency/pyth_model.py @@ -3,13 +3,12 @@ from pythclient.pythaccounts import PythPriceAccount, PythPriceStatus from pythclient.solana import ( - SolanaClient, - SolanaPublicKey, SOLANA_DEVNET_HTTP_ENDPOINT, SOLANA_DEVNET_WS_ENDPOINT, + SolanaClient, + SolanaPublicKey, ) - logger = logging.getLogger(__name__) ASSETS = { diff --git a/openbb_terminal/cryptocurrency/quantitative_analysis/qa_controller.py b/openbb_terminal/cryptocurrency/quantitative_analysis/qa_controller.py index 4de4caf2857b..c7420173a78c 100644 --- a/openbb_terminal/cryptocurrency/quantitative_analysis/qa_controller.py +++ b/openbb_terminal/cryptocurrency/quantitative_analysis/qa_controller.py @@ -8,21 +8,20 @@ import numpy as np import pandas as pd -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff from openbb_terminal.common.quantitative_analysis import qa_view, rolling_view +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_ONLY_FIGURES_ALLOWED, EXPORT_ONLY_RAW_DATA_ALLOWED, + check_list_dates, check_positive, check_proportion_range, - check_list_dates, ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import CryptoBaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/technical_analysis/ta_controller.py b/openbb_terminal/cryptocurrency/technical_analysis/ta_controller.py index 5ea032cf7eff..5c270ab75a0f 100644 --- a/openbb_terminal/cryptocurrency/technical_analysis/ta_controller.py +++ b/openbb_terminal/cryptocurrency/technical_analysis/ta_controller.py @@ -11,8 +11,6 @@ import numpy as np import pandas as pd -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff from openbb_terminal.common.technical_analysis import ( custom_indicators_view, @@ -24,18 +22,19 @@ volatility_view, volume_view, ) +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_BOTH_RAW_DATA_AND_FIGURES, check_non_negative, check_positive, - check_positive_list, check_positive_float, + check_positive_list, valid_date, ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import CryptoBaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/tools/tools_controller.py b/openbb_terminal/cryptocurrency/tools/tools_controller.py index 23dce009e5a7..3b855589eb0b 100644 --- a/openbb_terminal/cryptocurrency/tools/tools_controller.py +++ b/openbb_terminal/cryptocurrency/tools/tools_controller.py @@ -7,9 +7,9 @@ import logging from typing import List -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff +from openbb_terminal.cryptocurrency.tools import tools_view +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_ONLY_RAW_DATA_ALLOWED, @@ -17,10 +17,9 @@ check_positive, check_positive_float, ) -from openbb_terminal.cryptocurrency.tools import tools_view from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/cryptocurrency/tools/tools_view.py b/openbb_terminal/cryptocurrency/tools/tools_view.py index 72679505e80e..e427f69fdbfb 100644 --- a/openbb_terminal/cryptocurrency/tools/tools_view.py +++ b/openbb_terminal/cryptocurrency/tools/tools_view.py @@ -5,9 +5,9 @@ import os from openbb_terminal.cryptocurrency.tools.tools_model import calculate_apy, calculate_il +from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import export_data, print_rich_table from openbb_terminal.rich_config import console -from openbb_terminal.decorators import log_start_end logger = logging.getLogger(__name__) diff --git a/openbb_terminal/custom_prompt_toolkit.py b/openbb_terminal/custom_prompt_toolkit.py index 5373213e4e49..0004ac5b7740 100644 --- a/openbb_terminal/custom_prompt_toolkit.py +++ b/openbb_terminal/custom_prompt_toolkit.py @@ -1,15 +1,15 @@ """ Nestedcompleter for completion of OpenBB hierarchical data structures. """ from typing import ( Any, + Callable, Dict, - List, - Set, Iterable, + List, Mapping, Optional, - Union, Pattern, - Callable, + Set, + Union, ) from prompt_toolkit.completion import CompleteEvent, Completer, Completion diff --git a/openbb_terminal/dashboards/dashboards_controller.py b/openbb_terminal/dashboards/dashboards_controller.py index 12b750412208..e7119800e6d9 100644 --- a/openbb_terminal/dashboards/dashboards_controller.py +++ b/openbb_terminal/dashboards/dashboards_controller.py @@ -13,7 +13,7 @@ from openbb_terminal.decorators import log_start_end from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console # pylint: disable=consider-using-with diff --git a/openbb_terminal/dashboards/stream/forecast.py b/openbb_terminal/dashboards/stream/forecast.py index 35b9012d377e..f6fad8c56cc3 100644 --- a/openbb_terminal/dashboards/stream/forecast.py +++ b/openbb_terminal/dashboards/stream/forecast.py @@ -1,13 +1,15 @@ -from datetime import timedelta, datetime, date -from unittest.mock import patch -from typing import Callable, Any +from datetime import date, datetime, timedelta from inspect import signature -import streamlit as st +from typing import Any, Callable +from unittest.mock import patch + import pandas as pd +import streamlit as st import yfinance as yf -from openbb_terminal.sdk import openbb + from openbb_terminal.forecast import helpers from openbb_terminal.rich_config import console +from openbb_terminal.sdk import openbb st.set_page_config(layout="wide") diff --git a/openbb_terminal/dashboards/widget_helpers.py b/openbb_terminal/dashboards/widget_helpers.py index f3fb90169f87..665b0acd8523 100644 --- a/openbb_terminal/dashboards/widget_helpers.py +++ b/openbb_terminal/dashboards/widget_helpers.py @@ -5,6 +5,7 @@ `./widgets` folder. """ import os + from jinja2 import Template diff --git a/openbb_terminal/decorators.py b/openbb_terminal/decorators.py index 9ff3b18dd0be..f94cbb0227bb 100644 --- a/openbb_terminal/decorators.py +++ b/openbb_terminal/decorators.py @@ -4,6 +4,7 @@ import logging import os from ssl import SSLError + import pandas as pd from requests.exceptions import RequestException diff --git a/openbb_terminal/econometrics/econometrics_model.py b/openbb_terminal/econometrics/econometrics_model.py index 21c2b46f072f..3d033d667e88 100644 --- a/openbb_terminal/econometrics/econometrics_model.py +++ b/openbb_terminal/econometrics/econometrics_model.py @@ -6,7 +6,7 @@ import logging import warnings from itertools import combinations -from typing import Any, Dict, Tuple, Optional, Union +from typing import Any, Dict, Optional, Tuple, Union import pandas as pd import statsmodels.api as sm diff --git a/openbb_terminal/econometrics/regression_view.py b/openbb_terminal/econometrics/regression_view.py index 2d48edff7c98..c3cfd589b1c9 100644 --- a/openbb_terminal/econometrics/regression_view.py +++ b/openbb_terminal/econometrics/regression_view.py @@ -6,8 +6,8 @@ from typing import List, Optional import pandas as pd -from matplotlib import pyplot as plt import statsmodels +from matplotlib import pyplot as plt from openbb_terminal.config_plot import PLOT_DPI from openbb_terminal.config_terminal import theme diff --git a/openbb_terminal/economy/alphavantage_model.py b/openbb_terminal/economy/alphavantage_model.py index 060aa2de6099..f304554f2e14 100644 --- a/openbb_terminal/economy/alphavantage_model.py +++ b/openbb_terminal/economy/alphavantage_model.py @@ -6,10 +6,10 @@ import pandas as pd from alpha_vantage.sectorperformance import SectorPerformances -from openbb_terminal.rich_config import console from openbb_terminal import config_terminal as cfg from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import get_user_agent, request +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/economy/alphavantage_view.py b/openbb_terminal/economy/alphavantage_view.py index 5c9417a91b82..f086e92aa4ec 100644 --- a/openbb_terminal/economy/alphavantage_view.py +++ b/openbb_terminal/economy/alphavantage_view.py @@ -1,22 +1,22 @@ """ Alpha Vantage View """ __docformat__ = "numpy" -from typing import List, Optional import logging import os +from typing import List, Optional import matplotlib import matplotlib.pyplot as plt -from openbb_terminal.decorators import check_api_key -from openbb_terminal.config_terminal import theme + from openbb_terminal import config_plot as cfp -from openbb_terminal.decorators import log_start_end +from openbb_terminal.config_terminal import theme +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.economy import alphavantage_model from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, plot_autoscale, print_rich_table, - is_valid_axes_count, ) from openbb_terminal.rich_config import console diff --git a/openbb_terminal/economy/commodity_view.py b/openbb_terminal/economy/commodity_view.py index 33b7b1f99840..8e3c68be3d7a 100644 --- a/openbb_terminal/economy/commodity_view.py +++ b/openbb_terminal/economy/commodity_view.py @@ -1,5 +1,5 @@ -import os import logging +import os from openbb_terminal.decorators import log_start_end from openbb_terminal.economy import commodity_model diff --git a/openbb_terminal/economy/econ_data_helper.py b/openbb_terminal/economy/econ_data_helper.py index 999655c35c14..7d32d4302f07 100644 --- a/openbb_terminal/economy/econ_data_helper.py +++ b/openbb_terminal/economy/econ_data_helper.py @@ -4,8 +4,9 @@ import os import pathlib from datetime import datetime, timedelta -import pandas as pd + import mplfinance as mpf +import pandas as pd from openbb_terminal.stocks import stocks_helper diff --git a/openbb_terminal/economy/econdb_model.py b/openbb_terminal/economy/econdb_model.py index 49936bdcedfc..02a17b41c18f 100644 --- a/openbb_terminal/economy/econdb_model.py +++ b/openbb_terminal/economy/econdb_model.py @@ -4,18 +4,18 @@ # pylint: disable=no-member import logging -from typing import Dict, Any, Optional, Tuple, Union -from urllib.error import HTTPError from datetime import datetime +from typing import Any, Dict, Optional, Tuple, Union +from urllib.error import HTTPError import pandas as pd import pandas_datareader.data as web import yfinance as yf from openbb_terminal.decorators import log_start_end -from openbb_terminal.rich_config import console -from openbb_terminal.helpers_denomination import transform as transform_by_denomination from openbb_terminal.helper_funcs import request +from openbb_terminal.helpers_denomination import transform as transform_by_denomination +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/economy/econdb_view.py b/openbb_terminal/economy/econdb_view.py index 62fa8d9900b2..091f651d1f6c 100644 --- a/openbb_terminal/economy/econdb_view.py +++ b/openbb_terminal/economy/econdb_view.py @@ -4,7 +4,7 @@ import logging import os from textwrap import fill -from typing import Optional, List +from typing import List, Optional from matplotlib import pyplot as plt @@ -13,9 +13,9 @@ from openbb_terminal.decorators import log_start_end from openbb_terminal.economy import econdb_model from openbb_terminal.helper_funcs import ( + export_data, plot_autoscale, print_rich_table, - export_data, ) logger = logging.getLogger(__name__) diff --git a/openbb_terminal/economy/economy_controller.py b/openbb_terminal/economy/economy_controller.py index 13826e6ea163..c8d446ebd904 100644 --- a/openbb_terminal/economy/economy_controller.py +++ b/openbb_terminal/economy/economy_controller.py @@ -3,48 +3,47 @@ # pylint:disable=too-many-lines,R1710,R0904,C0415,too-many-branches,unnecessary-dict-index-lookup import argparse +import itertools import logging import os -import itertools -from datetime import date, datetime as dt -from typing import List, Dict, Any +from datetime import date +from datetime import datetime as dt +from typing import Any, Dict, List import pandas as pd -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - -from openbb_terminal.decorators import check_api_key from openbb_terminal import feature_flags as obbff -from openbb_terminal.decorators import log_start_end +from openbb_terminal.custom_prompt_toolkit import NestedCompleter +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.economy import ( alphavantage_view, + commodity_view, + econdb_model, + econdb_view, economy_helpers, finviz_model, finviz_view, + fred_model, + fred_view, nasdaq_model, nasdaq_view, + plot_view, wsj_view, - econdb_view, - econdb_model, - fred_view, - fred_model, yfinance_model, yfinance_view, - plot_view, - commodity_view, ) from openbb_terminal.helper_funcs import ( EXPORT_BOTH_RAW_DATA_AND_FIGURES, EXPORT_ONLY_FIGURES_ALLOWED, EXPORT_ONLY_RAW_DATA_ALLOWED, + list_from_str, + parse_and_split_input, print_rich_table, valid_date, - parse_and_split_input, - list_from_str, ) -from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText from openbb_terminal.menu import session +from openbb_terminal.parent_classes import BaseController +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/economy/finnhub_model.py b/openbb_terminal/economy/finnhub_model.py index bebf9155b656..8cc361618cda 100644 --- a/openbb_terminal/economy/finnhub_model.py +++ b/openbb_terminal/economy/finnhub_model.py @@ -4,9 +4,8 @@ from openbb_terminal import config_terminal as cfg from openbb_terminal.decorators import check_api_key, log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.helper_funcs import request - +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/economy/finnhub_view.py b/openbb_terminal/economy/finnhub_view.py index 0a4ef70b82b6..4f2fb0a183b1 100644 --- a/openbb_terminal/economy/finnhub_view.py +++ b/openbb_terminal/economy/finnhub_view.py @@ -1,8 +1,7 @@ import logging import os -from openbb_terminal.decorators import log_start_end -from openbb_terminal.decorators import check_api_key +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.economy import finnhub_model from openbb_terminal.helper_funcs import export_data, print_rich_table from openbb_terminal.rich_config import console diff --git a/openbb_terminal/economy/finviz_model.py b/openbb_terminal/economy/finviz_model.py index 1c37960d669f..70cdb32d20a2 100644 --- a/openbb_terminal/economy/finviz_model.py +++ b/openbb_terminal/economy/finviz_model.py @@ -2,16 +2,16 @@ __docformat__ = "numpy" import logging -from ast import literal_eval import webbrowser +from ast import literal_eval from typing import List import pandas as pd from finvizfinance.group import performance, spectrum, valuation -from openbb_terminal.rich_config import console from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import get_user_agent, request +from openbb_terminal.rich_config import console # pylint: disable=unsupported-assignment-operation diff --git a/openbb_terminal/economy/fred_model.py b/openbb_terminal/economy/fred_model.py index b9ebb7c22915..1303028626b4 100644 --- a/openbb_terminal/economy/fred_model.py +++ b/openbb_terminal/economy/fred_model.py @@ -1,18 +1,17 @@ """ Fred Model """ __docformat__ = "numpy" -import os import logging +import os import textwrap -from typing import List, Optional, Tuple from datetime import datetime, timedelta -from requests import HTTPError - +from typing import List, Optional, Tuple +import certifi import fred import pandas as pd from fredapi import Fred -import certifi +from requests import HTTPError from openbb_terminal import config_terminal as cfg from openbb_terminal.decorators import check_api_key, log_start_end diff --git a/openbb_terminal/economy/fred_view.py b/openbb_terminal/economy/fred_view.py index 7ff6cb95225c..c7b936978085 100644 --- a/openbb_terminal/economy/fred_view.py +++ b/openbb_terminal/economy/fred_view.py @@ -4,7 +4,7 @@ import logging import os import textwrap -from typing import Optional, List, Tuple +from typing import List, Optional, Tuple import matplotlib.pyplot as plt import numpy as np @@ -13,14 +13,13 @@ from openbb_terminal.config_plot import PLOT_DPI from openbb_terminal.config_terminal import theme -from openbb_terminal.decorators import check_api_key -from openbb_terminal.decorators import log_start_end +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.economy import fred_model from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, plot_autoscale, print_rich_table, - is_valid_axes_count, ) from openbb_terminal.rich_config import console diff --git a/openbb_terminal/economy/investingcom_model.py b/openbb_terminal/economy/investingcom_model.py index 10a60d0682f2..62e994180648 100644 --- a/openbb_terminal/economy/investingcom_model.py +++ b/openbb_terminal/economy/investingcom_model.py @@ -1,20 +1,19 @@ """ Investing.com Model """ __docformat__ = "numpy" -import logging import argparse - import datetime +import logging import math from typing import Dict, List, Tuple, Union -import pandas as pd -import pytz import investpy +import pandas as pd +import pytz from tqdm import tqdm -from openbb_terminal.decorators import log_start_end from openbb_terminal import helper_funcs +from openbb_terminal.decorators import log_start_end from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/economy/investingcom_view.py b/openbb_terminal/economy/investingcom_view.py index 470992a7161f..23f4d45b9247 100644 --- a/openbb_terminal/economy/investingcom_view.py +++ b/openbb_terminal/economy/investingcom_view.py @@ -3,16 +3,15 @@ import logging import os -from typing import Optional, List, Union -from matplotlib import ticker +from typing import List, Optional, Union import matplotlib.pyplot as plt -from matplotlib.ticker import FormatStrFormatter -from matplotlib import colors import numpy as np import pandas as pd -from pandas.plotting import register_matplotlib_converters import seaborn as sns +from matplotlib import colors, ticker +from matplotlib.ticker import FormatStrFormatter +from pandas.plotting import register_matplotlib_converters from openbb_terminal.config_plot import PLOT_DPI from openbb_terminal.config_terminal import theme @@ -21,9 +20,9 @@ from openbb_terminal.economy.economy_helpers import text_transform from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, plot_autoscale, print_rich_table, - is_valid_axes_count, ) from openbb_terminal.rich_config import console diff --git a/openbb_terminal/economy/nasdaq_model.py b/openbb_terminal/economy/nasdaq_model.py index 943ad69794e0..92eb83d138b3 100644 --- a/openbb_terminal/economy/nasdaq_model.py +++ b/openbb_terminal/economy/nasdaq_model.py @@ -4,15 +4,15 @@ import argparse import logging import os +from datetime import datetime as dt from typing import List, Optional, Union -from datetime import datetime as dt import pandas as pd from openbb_terminal.config_terminal import API_KEY_QUANDL from openbb_terminal.decorators import check_api_key, log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.helper_funcs import request +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/economy/nasdaq_view.py b/openbb_terminal/economy/nasdaq_view.py index 3a45f442f773..2da1e87dfeaf 100644 --- a/openbb_terminal/economy/nasdaq_view.py +++ b/openbb_terminal/economy/nasdaq_view.py @@ -7,16 +7,15 @@ import matplotlib.pyplot as plt -from openbb_terminal.decorators import check_api_key -from openbb_terminal.config_terminal import theme from openbb_terminal.config_plot import PLOT_DPI -from openbb_terminal.decorators import log_start_end +from openbb_terminal.config_terminal import theme +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.economy import nasdaq_model from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, plot_autoscale, print_rich_table, - is_valid_axes_count, ) from openbb_terminal.rich_config import console diff --git a/openbb_terminal/economy/plot_view.py b/openbb_terminal/economy/plot_view.py index 089c187c93b5..e877e9953809 100644 --- a/openbb_terminal/economy/plot_view.py +++ b/openbb_terminal/economy/plot_view.py @@ -1,7 +1,7 @@ """ Plot Controller """ import os -from typing import Optional, List, Dict, Any from textwrap import fill +from typing import Any, Dict, List, Optional import pandas as pd from matplotlib import pyplot as plt @@ -9,8 +9,8 @@ from openbb_terminal.config_plot import PLOT_DPI from openbb_terminal.config_terminal import theme from openbb_terminal.helper_funcs import ( - plot_autoscale, export_data, + plot_autoscale, print_rich_table, ) diff --git a/openbb_terminal/economy/quantitative_analysis/qa_controller.py b/openbb_terminal/economy/quantitative_analysis/qa_controller.py index 764fdbf7769a..4fb3e612ad59 100644 --- a/openbb_terminal/economy/quantitative_analysis/qa_controller.py +++ b/openbb_terminal/economy/quantitative_analysis/qa_controller.py @@ -3,26 +3,25 @@ import argparse import logging -from typing import List, Dict +from typing import Dict, List import numpy as np import pandas as pd -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff from openbb_terminal.common.quantitative_analysis import qa_view, rolling_view +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_ONLY_FIGURES_ALLOWED, EXPORT_ONLY_RAW_DATA_ALLOWED, + check_list_dates, check_positive, check_proportion_range, - check_list_dates, ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import StockBaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/economy/sdk_helpers.py b/openbb_terminal/economy/sdk_helpers.py index af89786ce50b..20c16fc7835c 100644 --- a/openbb_terminal/economy/sdk_helpers.py +++ b/openbb_terminal/economy/sdk_helpers.py @@ -2,7 +2,8 @@ __docformat__ = "numpy" import pandas as pd -from openbb_terminal.economy import wsj_model, finviz_model + +from openbb_terminal.economy import finviz_model, wsj_model def futures(source="WSJ", future_type: str = "Indices") -> pd.DataFrame: diff --git a/openbb_terminal/economy/yfinance_model.py b/openbb_terminal/economy/yfinance_model.py index 79595cb02b14..ecb0fd828338 100644 --- a/openbb_terminal/economy/yfinance_model.py +++ b/openbb_terminal/economy/yfinance_model.py @@ -5,9 +5,9 @@ from datetime import datetime from typing import Dict, Optional +import financedatabase as fd import pandas as pd import yfinance as yf -import financedatabase as fd from openbb_terminal.decorators import log_start_end from openbb_terminal.rich_config import console diff --git a/openbb_terminal/economy/yfinance_view.py b/openbb_terminal/economy/yfinance_view.py index fdd1c2c549a3..37cd4dd1eae1 100644 --- a/openbb_terminal/economy/yfinance_view.py +++ b/openbb_terminal/economy/yfinance_view.py @@ -4,7 +4,7 @@ import logging import os -from typing import Optional, List +from typing import List, Optional from matplotlib import pyplot as plt @@ -12,14 +12,14 @@ from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.economy.yfinance_model import ( + INDICES, get_indices, get_search_indices, - INDICES, ) from openbb_terminal.helper_funcs import ( + export_data, plot_autoscale, print_rich_table, - export_data, reindex_dates, ) diff --git a/openbb_terminal/etf/discovery/disc_controller.py b/openbb_terminal/etf/discovery/disc_controller.py index 7ea7a3e9d72a..6b38ae9c5f22 100644 --- a/openbb_terminal/etf/discovery/disc_controller.py +++ b/openbb_terminal/etf/discovery/disc_controller.py @@ -5,9 +5,8 @@ import logging from typing import List -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.etf.discovery import wsj_view from openbb_terminal.helper_funcs import ( @@ -15,7 +14,7 @@ ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/etf/etf_controller.py b/openbb_terminal/etf/etf_controller.py index b93ce303d124..fd354dc553b7 100644 --- a/openbb_terminal/etf/etf_controller.py +++ b/openbb_terminal/etf/etf_controller.py @@ -8,35 +8,35 @@ from typing import List import yfinance as yf - from thepassiveinvestor import create_ETF_report + from openbb_terminal import feature_flags as obbff from openbb_terminal.common import newsapi_view from openbb_terminal.common.quantitative_analysis import qa_view from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.etf import ( + etf_helper, financedatabase_view, stockanalysis_model, stockanalysis_view, yfinance_view, ) from openbb_terminal.etf.discovery import disc_controller -from openbb_terminal.etf import etf_helper from openbb_terminal.etf.screener import screener_controller from openbb_terminal.etf.technical_analysis import ta_controller from openbb_terminal.helper_funcs import ( EXPORT_BOTH_RAW_DATA_AND_FIGURES, EXPORT_ONLY_RAW_DATA_ALLOWED, check_positive, - export_data, - valid_date, compose_export_path, + export_data, list_from_str, + valid_date, ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console from openbb_terminal.stocks import stocks_helper from openbb_terminal.stocks.comparison_analysis import ca_controller diff --git a/openbb_terminal/etf/screener/screener_controller.py b/openbb_terminal/etf/screener/screener_controller.py index d71eda4e26f1..d84c55e56839 100644 --- a/openbb_terminal/etf/screener/screener_controller.py +++ b/openbb_terminal/etf/screener/screener_controller.py @@ -11,14 +11,14 @@ from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.etf import financedatabase_model, financedatabase_view -from openbb_terminal.etf.screener import screener_view, screener_model +from openbb_terminal.etf.screener import screener_model, screener_view from openbb_terminal.helper_funcs import ( EXPORT_ONLY_RAW_DATA_ALLOWED, check_positive, ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/etf/screener/screener_model.py b/openbb_terminal/etf/screener/screener_model.py index b53601f886b1..3715fa3a8a74 100644 --- a/openbb_terminal/etf/screener/screener_model.py +++ b/openbb_terminal/etf/screener/screener_model.py @@ -8,8 +8,8 @@ import pandas as pd -from openbb_terminal.decorators import log_start_end from openbb_terminal.core.config.paths import USER_PRESETS_DIRECTORY +from openbb_terminal.decorators import log_start_end logger = logging.getLogger(__name__) diff --git a/openbb_terminal/etf/stockanalysis_model.py b/openbb_terminal/etf/stockanalysis_model.py index 4a98a9279d1a..200959fcd8a0 100644 --- a/openbb_terminal/etf/stockanalysis_model.py +++ b/openbb_terminal/etf/stockanalysis_model.py @@ -2,8 +2,8 @@ __docformat__ = "numpy" import logging -from typing import List, Tuple import pathlib +from typing import List, Tuple import pandas as pd from bs4 import BeautifulSoup diff --git a/openbb_terminal/etf/technical_analysis/ta_controller.py b/openbb_terminal/etf/technical_analysis/ta_controller.py index df21e48bcd82..99efdf16de5b 100644 --- a/openbb_terminal/etf/technical_analysis/ta_controller.py +++ b/openbb_terminal/etf/technical_analysis/ta_controller.py @@ -11,8 +11,6 @@ import numpy as np import pandas as pd -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff from openbb_terminal.common.technical_analysis import ( custom_indicators_view, @@ -24,18 +22,19 @@ volatility_view, volume_view, ) +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_BOTH_RAW_DATA_AND_FIGURES, + EXPORT_ONLY_FIGURES_ALLOWED, check_non_negative, check_positive, check_positive_list, valid_date, - EXPORT_ONLY_FIGURES_ALLOWED, ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/etf/yfinance_view.py b/openbb_terminal/etf/yfinance_view.py index 28fecc362815..b0cdc0fba5d3 100644 --- a/openbb_terminal/etf/yfinance_view.py +++ b/openbb_terminal/etf/yfinance_view.py @@ -1,22 +1,22 @@ """Yahoo Finance view""" __docformat__ = "numpy" -from typing import Optional, List import logging import os +from typing import List, Optional import pandas as pd from matplotlib import pyplot as plt -from openbb_terminal.config_terminal import theme from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.etf import yfinance_model from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, plot_autoscale, print_rich_table, - is_valid_axes_count, ) from openbb_terminal.rich_config import console diff --git a/openbb_terminal/featflags_controller.py b/openbb_terminal/featflags_controller.py index b99a7040d832..ffe5c1ed1df4 100644 --- a/openbb_terminal/featflags_controller.py +++ b/openbb_terminal/featflags_controller.py @@ -15,7 +15,7 @@ from openbb_terminal.decorators import log_start_end from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console # pylint: disable=too-many-lines,no-member,too-many-public-methods,C0302 # pylint:disable=import-outside-toplevel diff --git a/openbb_terminal/forecast/anom_model.py b/openbb_terminal/forecast/anom_model.py index 6017c80a86a3..6cf859a40542 100644 --- a/openbb_terminal/forecast/anom_model.py +++ b/openbb_terminal/forecast/anom_model.py @@ -3,15 +3,13 @@ __docformat__ = "numpy" import logging -from typing import Tuple, Union, List +from typing import List, Tuple, Union import pandas as pd - from darts import TimeSeries -from darts.ad import KMeansScorer -from darts.ad import QuantileDetector -from openbb_terminal.decorators import log_start_end +from darts.ad import KMeansScorer, QuantileDetector +from openbb_terminal.decorators import log_start_end from openbb_terminal.forecast import helpers logger = logging.getLogger(__name__) diff --git a/openbb_terminal/forecast/anom_view.py b/openbb_terminal/forecast/anom_view.py index 04d339593ffb..85f997521ccc 100644 --- a/openbb_terminal/forecast/anom_view.py +++ b/openbb_terminal/forecast/anom_view.py @@ -2,21 +2,20 @@ __docformat__ = "numpy" import logging -from typing import Union, List, Optional from datetime import datetime +from typing import List, Optional, Union -import pandas as pd -import numpy as np import matplotlib.pyplot as plt +import numpy as np +import pandas as pd -from openbb_terminal.forecast import anom_model +from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end -from openbb_terminal.forecast import helpers +from openbb_terminal.forecast import anom_model, helpers from openbb_terminal.helper_funcs import ( plot_autoscale, ) -from openbb_terminal.config_terminal import theme -from openbb_terminal.config_plot import PLOT_DPI from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/forecast/autoarima_model.py b/openbb_terminal/forecast/autoarima_model.py index deee0b916546..5b4c2904e94c 100644 --- a/openbb_terminal/forecast/autoarima_model.py +++ b/openbb_terminal/forecast/autoarima_model.py @@ -3,18 +3,17 @@ __docformat__ = "numpy" import logging -from typing import Union, Optional, List, Tuple - import warnings +from typing import List, Optional, Tuple, Union + import pandas as pd from darts import TimeSeries -from statsforecast.models import AutoARIMA from statsforecast.core import StatsForecast +from statsforecast.models import AutoARIMA from openbb_terminal.decorators import log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.forecast import helpers - +from openbb_terminal.rich_config import console warnings.simplefilter("ignore") diff --git a/openbb_terminal/forecast/autoarima_view.py b/openbb_terminal/forecast/autoarima_view.py index 9d9b9071e6e6..fb04e8f7dbee 100644 --- a/openbb_terminal/forecast/autoarima_view.py +++ b/openbb_terminal/forecast/autoarima_view.py @@ -2,15 +2,14 @@ __docformat__ = "numpy" import logging -from typing import Union, Optional, List from datetime import datetime +from typing import List, Optional, Union -import pandas as pd import matplotlib.pyplot as plt +import pandas as pd -from openbb_terminal.forecast import autoarima_model from openbb_terminal.decorators import log_start_end -from openbb_terminal.forecast import helpers +from openbb_terminal.forecast import autoarima_model, helpers logger = logging.getLogger(__name__) # pylint: disable=too-many-arguments diff --git a/openbb_terminal/forecast/autoces_model.py b/openbb_terminal/forecast/autoces_model.py index a38ecf98f4f9..e11b7960a23c 100644 --- a/openbb_terminal/forecast/autoces_model.py +++ b/openbb_terminal/forecast/autoces_model.py @@ -3,19 +3,17 @@ __docformat__ = "numpy" import logging -from typing import Union, Optional, List, Tuple - import warnings +from typing import List, Optional, Tuple, Union + import pandas as pd from darts import TimeSeries - -from statsforecast.models import AutoCES from statsforecast.core import StatsForecast +from statsforecast.models import AutoCES from openbb_terminal.decorators import log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.forecast import helpers - +from openbb_terminal.rich_config import console warnings.simplefilter("ignore") diff --git a/openbb_terminal/forecast/autoces_view.py b/openbb_terminal/forecast/autoces_view.py index 5902bf88e78e..020bd605a8b7 100644 --- a/openbb_terminal/forecast/autoces_view.py +++ b/openbb_terminal/forecast/autoces_view.py @@ -2,15 +2,14 @@ __docformat__ = "numpy" import logging -from typing import Union, Optional, List from datetime import datetime +from typing import List, Optional, Union -import pandas as pd import matplotlib.pyplot as plt +import pandas as pd -from openbb_terminal.forecast import autoces_model from openbb_terminal.decorators import log_start_end -from openbb_terminal.forecast import helpers +from openbb_terminal.forecast import autoces_model, helpers logger = logging.getLogger(__name__) # pylint: disable=too-many-arguments diff --git a/openbb_terminal/forecast/autoets_model.py b/openbb_terminal/forecast/autoets_model.py index 457a244b94f5..26f1b508683e 100644 --- a/openbb_terminal/forecast/autoets_model.py +++ b/openbb_terminal/forecast/autoets_model.py @@ -3,18 +3,17 @@ __docformat__ = "numpy" import logging -from typing import List, Optional, Union, Tuple - import warnings +from typing import List, Optional, Tuple, Union + import pandas as pd from darts import TimeSeries -from statsforecast.models import ETS from statsforecast.core import StatsForecast +from statsforecast.models import ETS from openbb_terminal.decorators import log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.forecast import helpers - +from openbb_terminal.rich_config import console warnings.simplefilter("ignore") diff --git a/openbb_terminal/forecast/autoets_view.py b/openbb_terminal/forecast/autoets_view.py index 99920cd39a62..56452e6c34b1 100644 --- a/openbb_terminal/forecast/autoets_view.py +++ b/openbb_terminal/forecast/autoets_view.py @@ -2,15 +2,14 @@ __docformat__ = "numpy" import logging -from typing import Union, Optional, List from datetime import datetime +from typing import List, Optional, Union -import pandas as pd import matplotlib.pyplot as plt +import pandas as pd -from openbb_terminal.forecast import autoets_model from openbb_terminal.decorators import log_start_end -from openbb_terminal.forecast import helpers +from openbb_terminal.forecast import autoets_model, helpers logger = logging.getLogger(__name__) # pylint: disable=too-many-arguments diff --git a/openbb_terminal/forecast/autoselect_model.py b/openbb_terminal/forecast/autoselect_model.py index f591ae94895f..b31a8b745360 100644 --- a/openbb_terminal/forecast/autoselect_model.py +++ b/openbb_terminal/forecast/autoselect_model.py @@ -3,17 +3,16 @@ __docformat__ = "numpy" import logging -from typing import Union, Optional, List, Tuple - import warnings -from darts import TimeSeries +from typing import List, Optional, Tuple, Union + import pandas as pd +from darts import TimeSeries from statsforecast.core import StatsForecast from openbb_terminal.decorators import log_start_end -from openbb_terminal.rich_config import console, USE_COLOR from openbb_terminal.forecast import helpers - +from openbb_terminal.rich_config import USE_COLOR, console warnings.simplefilter("ignore") @@ -91,14 +90,14 @@ def get_autoselect_data( # check statsforecast dependency try: from statsforecast.models import ( # pylint: disable=import-outside-toplevel - AutoARIMA, ETS, - AutoCES, MSTL, + AutoARIMA, + AutoCES, Naive, + RandomWalkWithDrift, SeasonalNaive, SeasonalWindowAverage, - RandomWalkWithDrift, ) except Exception as e: error = str(e) diff --git a/openbb_terminal/forecast/autoselect_view.py b/openbb_terminal/forecast/autoselect_view.py index a7bab79b682b..64c4ddb5108f 100644 --- a/openbb_terminal/forecast/autoselect_view.py +++ b/openbb_terminal/forecast/autoselect_view.py @@ -2,15 +2,14 @@ __docformat__ = "numpy" import logging -from typing import Union, Optional, List from datetime import datetime +from typing import List, Optional, Union -import pandas as pd import matplotlib.pyplot as plt +import pandas as pd -from openbb_terminal.forecast import autoselect_model from openbb_terminal.decorators import log_start_end -from openbb_terminal.forecast import helpers +from openbb_terminal.forecast import autoselect_model, helpers logger = logging.getLogger(__name__) # pylint: disable=too-many-arguments diff --git a/openbb_terminal/forecast/brnn_model.py b/openbb_terminal/forecast/brnn_model.py index b7a3f1aeeea8..4a1341f0a659 100644 --- a/openbb_terminal/forecast/brnn_model.py +++ b/openbb_terminal/forecast/brnn_model.py @@ -4,17 +4,17 @@ import logging import warnings -from typing import Union, Optional, List, Tuple +from typing import List, Optional, Tuple, Union import pandas as pd - from darts import TimeSeries from darts.models import BlockRNNModel from darts.models.forecasting.torch_forecasting_model import GlobalForecastingModel from darts.utils.likelihood_models import GaussianLikelihood + +from openbb_terminal.core.config.paths import USER_FORECAST_MODELS_DIRECTORY from openbb_terminal.decorators import log_start_end from openbb_terminal.forecast import helpers -from openbb_terminal.core.config.paths import USER_FORECAST_MODELS_DIRECTORY logger = logging.getLogger(__name__) diff --git a/openbb_terminal/forecast/brnn_view.py b/openbb_terminal/forecast/brnn_view.py index ba829532d602..34b4225001d4 100644 --- a/openbb_terminal/forecast/brnn_view.py +++ b/openbb_terminal/forecast/brnn_view.py @@ -2,15 +2,14 @@ __docformat__ = "numpy" import logging -from typing import Union, Optional, List from datetime import datetime +from typing import List, Optional, Union -import pandas as pd import matplotlib.pyplot as plt +import pandas as pd -from openbb_terminal.forecast import brnn_model from openbb_terminal.decorators import log_start_end -from openbb_terminal.forecast import helpers +from openbb_terminal.forecast import brnn_model, helpers logger = logging.getLogger(__name__) # pylint: disable=too-many-arguments diff --git a/openbb_terminal/forecast/expo_model.py b/openbb_terminal/forecast/expo_model.py index 61d7f5f580c5..4c117a90f789 100644 --- a/openbb_terminal/forecast/expo_model.py +++ b/openbb_terminal/forecast/expo_model.py @@ -3,21 +3,20 @@ __docformat__ = "numpy" import logging -from typing import Union, Optional, List, Tuple - import warnings -from statsmodels.tools.sm_exceptions import ConvergenceWarning -from numpy import ndarray +from typing import List, Optional, Tuple, Union + import pandas as pd from darts import TimeSeries +from darts.metrics import mape from darts.models import ExponentialSmoothing from darts.utils.utils import ModelMode, SeasonalityMode -from darts.metrics import mape +from numpy import ndarray +from statsmodels.tools.sm_exceptions import ConvergenceWarning from openbb_terminal.decorators import log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.forecast import helpers - +from openbb_terminal.rich_config import console warnings.simplefilter("ignore", ConvergenceWarning) diff --git a/openbb_terminal/forecast/expo_view.py b/openbb_terminal/forecast/expo_view.py index 6e8cb80d6efd..de41d84f49c3 100644 --- a/openbb_terminal/forecast/expo_view.py +++ b/openbb_terminal/forecast/expo_view.py @@ -2,15 +2,14 @@ __docformat__ = "numpy" import logging -from typing import Union, Optional, List from datetime import datetime +from typing import List, Optional, Union -import pandas as pd import matplotlib.pyplot as plt +import pandas as pd -from openbb_terminal.forecast import expo_model from openbb_terminal.decorators import log_start_end -from openbb_terminal.forecast import helpers +from openbb_terminal.forecast import expo_model, helpers from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/forecast/forecast_model.py b/openbb_terminal/forecast/forecast_model.py index 06f2f687a414..1f6154562bb6 100644 --- a/openbb_terminal/forecast/forecast_model.py +++ b/openbb_terminal/forecast/forecast_model.py @@ -4,20 +4,20 @@ # pylint: disable=eval-used import logging -from pathlib import Path -from typing import Dict, Union, Any, Optional from itertools import chain +from pathlib import Path +from typing import Any, Dict, Optional, Union -import pandas as pd import numpy as np +import pandas as pd -from openbb_terminal.decorators import log_start_end -from openbb_terminal.rich_config import console +from openbb_terminal.common import common_model from openbb_terminal.core.config.paths import ( - USER_EXPORTS_DIRECTORY, USER_CUSTOM_IMPORTS_DIRECTORY, + USER_EXPORTS_DIRECTORY, ) -from openbb_terminal.common import common_model +from openbb_terminal.decorators import log_start_end +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/forecast/forecast_view.py b/openbb_terminal/forecast/forecast_view.py index 8c19809e52af..72e3dfabd062 100644 --- a/openbb_terminal/forecast/forecast_view.py +++ b/openbb_terminal/forecast/forecast_view.py @@ -3,27 +3,24 @@ import logging import os -from typing import Dict, Optional, List +from typing import Dict, List, Optional import matplotlib.pyplot as plt import pandas as pd -from pandas.plotting import register_matplotlib_converters import seaborn as sns from darts.utils.statistics import plot_acf +from pandas.plotting import register_matplotlib_converters from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end +from openbb_terminal.forecast import forecast_model, helpers from openbb_terminal.helper_funcs import ( export_data, plot_autoscale, -) -from openbb_terminal.helper_funcs import ( print_rich_table, ) from openbb_terminal.rich_config import console -from openbb_terminal.forecast import forecast_model -from openbb_terminal.config_terminal import theme -from openbb_terminal.forecast import helpers logger = logging.getLogger(__name__) diff --git a/openbb_terminal/forecast/helpers.py b/openbb_terminal/forecast/helpers.py index ee8e46d5a197..ae6fd920568c 100644 --- a/openbb_terminal/forecast/helpers.py +++ b/openbb_terminal/forecast/helpers.py @@ -1,36 +1,38 @@ # pylint: disable=too-many-arguments,too-many-lines -import os import argparse -from typing import Any, Union, Optional, List, Dict, Tuple -from datetime import timedelta, datetime, time import logging -import pandas as pd -import numpy as np +import os +from datetime import datetime, time, timedelta +from typing import Any, Dict, List, Optional, Tuple, Union + import matplotlib.pyplot as plt -from sklearn.model_selection import train_test_split -from sklearn.preprocessing import StandardScaler, MinMaxScaler, MaxAbsScaler, Normalizer -from sklearn.metrics import ( - mean_absolute_error, - r2_score, - mean_squared_error, -) -from darts.dataprocessing.transformers import MissingValuesFiller, Scaler -from darts.utils.statistics import plot_residuals_analysis +import numpy as np +import pandas as pd from darts import TimeSeries +from darts.dataprocessing.transformers import MissingValuesFiller, Scaler +from darts.explainability.shap_explainer import ShapExplainer from darts.metrics import mape from darts.models.forecasting.torch_forecasting_model import GlobalForecastingModel -from darts.explainability.shap_explainer import ShapExplainer +from darts.utils.statistics import plot_residuals_analysis from pytorch_lightning.callbacks.early_stopping import EarlyStopping -from openbb_terminal.rich_config import console +from sklearn.metrics import ( + mean_absolute_error, + mean_squared_error, + r2_score, +) +from sklearn.model_selection import train_test_split +from sklearn.preprocessing import MaxAbsScaler, MinMaxScaler, Normalizer, StandardScaler + +from openbb_terminal import rich_config +from openbb_terminal.config_plot import PLOT_DPI from openbb_terminal.config_terminal import theme from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, plot_autoscale, print_rich_table, - is_valid_axes_count, ) -from openbb_terminal.config_plot import PLOT_DPI -from openbb_terminal import rich_config +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) logging.getLogger("pytorch_lightning").setLevel(logging.CRITICAL) # No needed for now diff --git a/openbb_terminal/forecast/linregr_model.py b/openbb_terminal/forecast/linregr_model.py index 8f44e0b172a7..5e4e4d91fc4a 100644 --- a/openbb_terminal/forecast/linregr_model.py +++ b/openbb_terminal/forecast/linregr_model.py @@ -3,16 +3,14 @@ __docformat__ = "numpy" import logging -from typing import Tuple, Union, List, Optional import warnings - +from typing import List, Optional, Tuple, Union import pandas as pd - from darts import TimeSeries from darts.models import LinearRegressionModel -from openbb_terminal.decorators import log_start_end +from openbb_terminal.decorators import log_start_end from openbb_terminal.forecast import helpers logger = logging.getLogger(__name__) diff --git a/openbb_terminal/forecast/linregr_view.py b/openbb_terminal/forecast/linregr_view.py index 6448de1f12f5..6bc09879edcb 100644 --- a/openbb_terminal/forecast/linregr_view.py +++ b/openbb_terminal/forecast/linregr_view.py @@ -2,15 +2,14 @@ __docformat__ = "numpy" import logging -from typing import Union, List, Optional from datetime import datetime +from typing import List, Optional, Union -import pandas as pd import matplotlib.pyplot as plt +import pandas as pd -from openbb_terminal.forecast import linregr_model from openbb_terminal.decorators import log_start_end -from openbb_terminal.forecast import helpers +from openbb_terminal.forecast import helpers, linregr_model logger = logging.getLogger(__name__) # pylint: disable=too-many-arguments diff --git a/openbb_terminal/forecast/mstl_model.py b/openbb_terminal/forecast/mstl_model.py index d5a5c3807bdf..8ac60a83987c 100644 --- a/openbb_terminal/forecast/mstl_model.py +++ b/openbb_terminal/forecast/mstl_model.py @@ -3,17 +3,16 @@ __docformat__ = "numpy" import logging -from typing import Union, Optional, List, Tuple - import warnings -from darts import TimeSeries +from typing import List, Optional, Tuple, Union + import pandas as pd +from darts import TimeSeries from statsforecast.core import StatsForecast from openbb_terminal.decorators import log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.forecast import helpers - +from openbb_terminal.rich_config import console warnings.simplefilter("ignore") diff --git a/openbb_terminal/forecast/mstl_view.py b/openbb_terminal/forecast/mstl_view.py index 810a9e2616b0..91338983fb13 100644 --- a/openbb_terminal/forecast/mstl_view.py +++ b/openbb_terminal/forecast/mstl_view.py @@ -2,15 +2,14 @@ __docformat__ = "numpy" import logging -from typing import Union, Optional, List from datetime import datetime +from typing import List, Optional, Union -import pandas as pd import matplotlib.pyplot as plt +import pandas as pd -from openbb_terminal.forecast import mstl_model from openbb_terminal.decorators import log_start_end -from openbb_terminal.forecast import helpers +from openbb_terminal.forecast import helpers, mstl_model logger = logging.getLogger(__name__) # pylint: disable=too-many-arguments diff --git a/openbb_terminal/forecast/nbeats_model.py b/openbb_terminal/forecast/nbeats_model.py index 1a4829c3b212..acb8480bfbe1 100644 --- a/openbb_terminal/forecast/nbeats_model.py +++ b/openbb_terminal/forecast/nbeats_model.py @@ -4,16 +4,15 @@ import logging import warnings -from typing import Tuple, Union, List, Optional +from typing import List, Optional, Tuple, Union import pandas as pd - from darts import TimeSeries from darts.models import NBEATSModel -from openbb_terminal.decorators import log_start_end -from openbb_terminal.forecast import helpers from openbb_terminal.core.config.paths import USER_FORECAST_MODELS_DIRECTORY +from openbb_terminal.decorators import log_start_end +from openbb_terminal.forecast import helpers logger = logging.getLogger(__name__) diff --git a/openbb_terminal/forecast/nbeats_view.py b/openbb_terminal/forecast/nbeats_view.py index 44573d47e998..283f6dac6020 100644 --- a/openbb_terminal/forecast/nbeats_view.py +++ b/openbb_terminal/forecast/nbeats_view.py @@ -2,15 +2,14 @@ __docformat__ = "numpy" import logging -from typing import Union, Optional, List from datetime import datetime +from typing import List, Optional, Union -import pandas as pd import matplotlib.pyplot as plt +import pandas as pd -from openbb_terminal.forecast import nbeats_model from openbb_terminal.decorators import log_start_end -from openbb_terminal.forecast import helpers +from openbb_terminal.forecast import helpers, nbeats_model logger = logging.getLogger(__name__) # pylint: disable=too-many-arguments diff --git a/openbb_terminal/forecast/nhits_model.py b/openbb_terminal/forecast/nhits_model.py index 4a4ff62a2253..43a3d1ed0f48 100644 --- a/openbb_terminal/forecast/nhits_model.py +++ b/openbb_terminal/forecast/nhits_model.py @@ -4,17 +4,16 @@ import logging import warnings -from typing import Union, Optional, List, Tuple - +from typing import List, Optional, Tuple, Union import pandas as pd - from darts import TimeSeries from darts.models.forecasting.nhits import NHiTSModel from darts.utils.likelihood_models import GaussianLikelihood + +from openbb_terminal.core.config.paths import USER_FORECAST_MODELS_DIRECTORY from openbb_terminal.decorators import log_start_end from openbb_terminal.forecast import helpers -from openbb_terminal.core.config.paths import USER_FORECAST_MODELS_DIRECTORY logger = logging.getLogger(__name__) diff --git a/openbb_terminal/forecast/nhits_view.py b/openbb_terminal/forecast/nhits_view.py index 15a44a6930df..d4ec81ecdeed 100644 --- a/openbb_terminal/forecast/nhits_view.py +++ b/openbb_terminal/forecast/nhits_view.py @@ -2,15 +2,14 @@ __docformat__ = "numpy" import logging -from typing import Union, Optional, List, Tuple from datetime import datetime +from typing import List, Optional, Tuple, Union -import pandas as pd import matplotlib.pyplot as plt +import pandas as pd -from openbb_terminal.forecast import nhits_model from openbb_terminal.decorators import log_start_end -from openbb_terminal.forecast import helpers +from openbb_terminal.forecast import helpers, nhits_model logger = logging.getLogger(__name__) # pylint: disable=too-many-arguments diff --git a/openbb_terminal/forecast/regr_model.py b/openbb_terminal/forecast/regr_model.py index d4bdb852b6f5..19871d10f24d 100644 --- a/openbb_terminal/forecast/regr_model.py +++ b/openbb_terminal/forecast/regr_model.py @@ -3,16 +3,14 @@ __docformat__ = "numpy" import logging -from typing import Tuple, Union, List import warnings - +from typing import List, Tuple, Union import pandas as pd - from darts import TimeSeries from darts.models import RegressionModel -from openbb_terminal.decorators import log_start_end +from openbb_terminal.decorators import log_start_end from openbb_terminal.forecast import helpers logger = logging.getLogger(__name__) diff --git a/openbb_terminal/forecast/regr_view.py b/openbb_terminal/forecast/regr_view.py index 790f058ef410..71e34bf4ea5d 100644 --- a/openbb_terminal/forecast/regr_view.py +++ b/openbb_terminal/forecast/regr_view.py @@ -2,15 +2,14 @@ __docformat__ = "numpy" import logging -from typing import Union, List, Optional from datetime import datetime +from typing import List, Optional, Union -import pandas as pd import matplotlib.pyplot as plt +import pandas as pd -from openbb_terminal.forecast import regr_model from openbb_terminal.decorators import log_start_end -from openbb_terminal.forecast import helpers +from openbb_terminal.forecast import helpers, regr_model logger = logging.getLogger(__name__) # pylint: disable=too-many-arguments diff --git a/openbb_terminal/forecast/rnn_model.py b/openbb_terminal/forecast/rnn_model.py index 2c72df9a4653..5f860bb43e0b 100644 --- a/openbb_terminal/forecast/rnn_model.py +++ b/openbb_terminal/forecast/rnn_model.py @@ -4,16 +4,16 @@ import logging import warnings -from typing import Tuple, Union, List, Optional +from typing import List, Optional, Tuple, Union import pandas as pd - from darts import TimeSeries from darts.models import RNNModel from darts.utils.likelihood_models import GaussianLikelihood + +from openbb_terminal.core.config.paths import USER_FORECAST_MODELS_DIRECTORY from openbb_terminal.decorators import log_start_end from openbb_terminal.forecast import helpers -from openbb_terminal.core.config.paths import USER_FORECAST_MODELS_DIRECTORY logger = logging.getLogger(__name__) diff --git a/openbb_terminal/forecast/rnn_view.py b/openbb_terminal/forecast/rnn_view.py index 8d089e5f6e73..31f259165756 100644 --- a/openbb_terminal/forecast/rnn_view.py +++ b/openbb_terminal/forecast/rnn_view.py @@ -2,15 +2,14 @@ __docformat__ = "numpy" import logging -from typing import Union, Optional, List from datetime import datetime +from typing import List, Optional, Union -import pandas as pd import matplotlib.pyplot as plt +import pandas as pd -from openbb_terminal.forecast import rnn_model from openbb_terminal.decorators import log_start_end -from openbb_terminal.forecast import helpers +from openbb_terminal.forecast import helpers, rnn_model logger = logging.getLogger(__name__) # pylint: disable=too-many-arguments diff --git a/openbb_terminal/forecast/rwd_model.py b/openbb_terminal/forecast/rwd_model.py index b50449364604..753b9e170f01 100644 --- a/openbb_terminal/forecast/rwd_model.py +++ b/openbb_terminal/forecast/rwd_model.py @@ -3,18 +3,17 @@ __docformat__ = "numpy" import logging -from typing import Union, Optional, List, Tuple - import warnings +from typing import List, Optional, Tuple, Union + import numpy as np import pandas as pd -from statsforecast.models import RandomWalkWithDrift from statsforecast.core import StatsForecast +from statsforecast.models import RandomWalkWithDrift from openbb_terminal.decorators import log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.forecast import helpers - +from openbb_terminal.rich_config import console warnings.simplefilter("ignore") diff --git a/openbb_terminal/forecast/rwd_view.py b/openbb_terminal/forecast/rwd_view.py index ed09d694a08d..fa7720d88591 100644 --- a/openbb_terminal/forecast/rwd_view.py +++ b/openbb_terminal/forecast/rwd_view.py @@ -2,15 +2,14 @@ __docformat__ = "numpy" import logging -from typing import Union, Optional, List from datetime import datetime +from typing import List, Optional, Union -import pandas as pd import matplotlib.pyplot as plt +import pandas as pd -from openbb_terminal.forecast import rwd_model from openbb_terminal.decorators import log_start_end -from openbb_terminal.forecast import helpers +from openbb_terminal.forecast import helpers, rwd_model logger = logging.getLogger(__name__) # pylint: disable=too-many-arguments diff --git a/openbb_terminal/forecast/seasonalnaive_model.py b/openbb_terminal/forecast/seasonalnaive_model.py index b4bbf058e56d..cece12ef714c 100644 --- a/openbb_terminal/forecast/seasonalnaive_model.py +++ b/openbb_terminal/forecast/seasonalnaive_model.py @@ -3,19 +3,17 @@ __docformat__ = "numpy" import logging -from typing import Union, Optional, List, Tuple - import warnings +from typing import List, Optional, Tuple, Union + import pandas as pd from darts import TimeSeries - -from statsforecast.models import SeasonalNaive from statsforecast.core import StatsForecast +from statsforecast.models import SeasonalNaive from openbb_terminal.decorators import log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.forecast import helpers - +from openbb_terminal.rich_config import console warnings.simplefilter("ignore") diff --git a/openbb_terminal/forecast/seasonalnaive_view.py b/openbb_terminal/forecast/seasonalnaive_view.py index 50ec06d49201..e4474df4a2e9 100644 --- a/openbb_terminal/forecast/seasonalnaive_view.py +++ b/openbb_terminal/forecast/seasonalnaive_view.py @@ -2,15 +2,14 @@ __docformat__ = "numpy" import logging -from typing import Union, Optional, List from datetime import datetime +from typing import List, Optional, Union -import pandas as pd import matplotlib.pyplot as plt +import pandas as pd -from openbb_terminal.forecast import seasonalnaive_model from openbb_terminal.decorators import log_start_end -from openbb_terminal.forecast import helpers +from openbb_terminal.forecast import helpers, seasonalnaive_model logger = logging.getLogger(__name__) # pylint: disable=too-many-arguments diff --git a/openbb_terminal/forecast/tcn_model.py b/openbb_terminal/forecast/tcn_model.py index 48ead2725017..1d0c7467d393 100644 --- a/openbb_terminal/forecast/tcn_model.py +++ b/openbb_terminal/forecast/tcn_model.py @@ -3,16 +3,16 @@ __docformat__ = "numpy" import logging -from typing import Tuple, Union, List, Optional import warnings +from typing import List, Optional, Tuple, Union import pandas as pd - from darts import TimeSeries from darts.models import TCNModel + +from openbb_terminal.core.config.paths import USER_FORECAST_MODELS_DIRECTORY from openbb_terminal.decorators import log_start_end from openbb_terminal.forecast import helpers -from openbb_terminal.core.config.paths import USER_FORECAST_MODELS_DIRECTORY logger = logging.getLogger(__name__) diff --git a/openbb_terminal/forecast/tcn_view.py b/openbb_terminal/forecast/tcn_view.py index 61f5fd34ecbd..5e7cf5aec944 100644 --- a/openbb_terminal/forecast/tcn_view.py +++ b/openbb_terminal/forecast/tcn_view.py @@ -2,15 +2,14 @@ __docformat__ = "numpy" import logging -from typing import Union, Optional, List from datetime import datetime +from typing import List, Optional, Union -import pandas as pd import matplotlib.pyplot as plt +import pandas as pd -from openbb_terminal.forecast import tcn_model from openbb_terminal.decorators import log_start_end -from openbb_terminal.forecast import helpers +from openbb_terminal.forecast import helpers, tcn_model logger = logging.getLogger(__name__) # pylint: disable=too-many-arguments diff --git a/openbb_terminal/forecast/tft_model.py b/openbb_terminal/forecast/tft_model.py index e94ad700f93b..136ab21f074c 100644 --- a/openbb_terminal/forecast/tft_model.py +++ b/openbb_terminal/forecast/tft_model.py @@ -3,18 +3,18 @@ __docformat__ = "numpy" import logging -from typing import Tuple, Union, List, Optional - import warnings -from statsmodels.tools.sm_exceptions import ConvergenceWarning +from typing import List, Optional, Tuple, Union + import pandas as pd from darts import TimeSeries from darts.models import TFTModel from darts.utils.likelihood_models import QuantileRegression +from statsmodels.tools.sm_exceptions import ConvergenceWarning +from openbb_terminal.core.config.paths import USER_FORECAST_MODELS_DIRECTORY from openbb_terminal.decorators import log_start_end from openbb_terminal.forecast import helpers -from openbb_terminal.core.config.paths import USER_FORECAST_MODELS_DIRECTORY warnings.simplefilter("ignore", ConvergenceWarning) diff --git a/openbb_terminal/forecast/tft_view.py b/openbb_terminal/forecast/tft_view.py index b069d066f0c8..3064027500cc 100644 --- a/openbb_terminal/forecast/tft_view.py +++ b/openbb_terminal/forecast/tft_view.py @@ -2,15 +2,14 @@ __docformat__ = "numpy" import logging -from typing import Union, Optional, List from datetime import datetime +from typing import List, Optional, Union -import pandas as pd import matplotlib.pyplot as plt +import pandas as pd -from openbb_terminal.forecast import tft_model from openbb_terminal.decorators import log_start_end -from openbb_terminal.forecast import helpers +from openbb_terminal.forecast import helpers, tft_model logger = logging.getLogger(__name__) # pylint: disable=too-many-arguments diff --git a/openbb_terminal/forecast/theta_model.py b/openbb_terminal/forecast/theta_model.py index e26d4700fe4f..74ef6523933e 100644 --- a/openbb_terminal/forecast/theta_model.py +++ b/openbb_terminal/forecast/theta_model.py @@ -2,20 +2,20 @@ __docformat__ = "numpy" import logging -from typing import Optional, Tuple, Union, List - import warnings -from statsmodels.tools.sm_exceptions import ConvergenceWarning +from typing import List, Optional, Tuple, Union + import numpy as np import pandas as pd from darts import TimeSeries +from darts.metrics import mape from darts.models import Theta from darts.utils.utils import SeasonalityMode -from darts.metrics import mape +from statsmodels.tools.sm_exceptions import ConvergenceWarning from openbb_terminal.decorators import log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.forecast import helpers +from openbb_terminal.rich_config import console warnings.simplefilter("ignore", ConvergenceWarning) diff --git a/openbb_terminal/forecast/theta_view.py b/openbb_terminal/forecast/theta_view.py index e49ad75914be..428e95c1663d 100644 --- a/openbb_terminal/forecast/theta_view.py +++ b/openbb_terminal/forecast/theta_view.py @@ -2,15 +2,14 @@ __docformat__ = "numpy" import logging -from typing import Union, Optional, List from datetime import datetime +from typing import List, Optional, Union -import pandas as pd import matplotlib.pyplot as plt +import pandas as pd -from openbb_terminal.forecast import theta_model from openbb_terminal.decorators import log_start_end -from openbb_terminal.forecast import helpers +from openbb_terminal.forecast import helpers, theta_model from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/forecast/trans_model.py b/openbb_terminal/forecast/trans_model.py index f74122def30c..ac89b255820b 100644 --- a/openbb_terminal/forecast/trans_model.py +++ b/openbb_terminal/forecast/trans_model.py @@ -4,15 +4,15 @@ import logging import warnings -from typing import Tuple, Union, List, Optional +from typing import List, Optional, Tuple, Union import pandas as pd - from darts import TimeSeries from darts.models import TransformerModel + +from openbb_terminal.core.config.paths import USER_FORECAST_MODELS_DIRECTORY from openbb_terminal.decorators import log_start_end from openbb_terminal.forecast import helpers -from openbb_terminal.core.config.paths import USER_FORECAST_MODELS_DIRECTORY logger = logging.getLogger(__name__) diff --git a/openbb_terminal/forecast/trans_view.py b/openbb_terminal/forecast/trans_view.py index a13592aea784..fda46a687a60 100644 --- a/openbb_terminal/forecast/trans_view.py +++ b/openbb_terminal/forecast/trans_view.py @@ -2,15 +2,14 @@ __docformat__ = "numpy" import logging -from typing import Union, Optional, List from datetime import datetime +from typing import List, Optional, Union -import pandas as pd import matplotlib.pyplot as plt +import pandas as pd -from openbb_terminal.forecast import trans_model from openbb_terminal.decorators import log_start_end -from openbb_terminal.forecast import helpers +from openbb_terminal.forecast import helpers, trans_model logger = logging.getLogger(__name__) # pylint: disable=too-many-arguments diff --git a/openbb_terminal/forex/av_model.py b/openbb_terminal/forex/av_model.py index e79653252cb5..dbe990c0112b 100644 --- a/openbb_terminal/forex/av_model.py +++ b/openbb_terminal/forex/av_model.py @@ -9,8 +9,8 @@ from openbb_terminal import config_terminal as cfg from openbb_terminal.decorators import log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.helper_funcs import request +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/forex/av_view.py b/openbb_terminal/forex/av_view.py index 5b8716907f7c..31f8188e4aca 100644 --- a/openbb_terminal/forex/av_view.py +++ b/openbb_terminal/forex/av_view.py @@ -5,8 +5,7 @@ import pandas as pd -from openbb_terminal.decorators import check_api_key -from openbb_terminal.decorators import log_start_end +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.forex import av_model from openbb_terminal.helper_funcs import print_rich_table from openbb_terminal.rich_config import console diff --git a/openbb_terminal/forex/forex_controller.py b/openbb_terminal/forex/forex_controller.py index ddab63556cbd..3badfea92081 100644 --- a/openbb_terminal/forex/forex_controller.py +++ b/openbb_terminal/forex/forex_controller.py @@ -9,27 +9,25 @@ import pandas as pd -from openbb_terminal.custom_prompt_toolkit import NestedCompleter -from openbb_terminal.common.quantitative_analysis import qa_view from openbb_terminal import feature_flags as obbff -from openbb_terminal.decorators import log_start_end -from openbb_terminal.forex import forex_helper, fxempire_view, av_view -from openbb_terminal.forex.forex_helper import FOREX_SOURCES, SOURCES_INTERVALS +from openbb_terminal.common.quantitative_analysis import qa_view +from openbb_terminal.custom_prompt_toolkit import NestedCompleter +from openbb_terminal.decorators import check_api_key, log_start_end +from openbb_terminal.forex import av_view, forex_helper, fxempire_view +from openbb_terminal.forex.forex_helper import FOREX_SOURCES, SOURCES_INTERVALS, parse_forex_symbol from openbb_terminal.helper_funcs import ( - valid_date, EXPORT_ONLY_RAW_DATA_ALLOWED, export_data, + valid_date, ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController from openbb_terminal.rich_config import ( - console, MenuText, + console, get_ordered_list_sources, ) from openbb_terminal.stocks import stocks_helper -from openbb_terminal.decorators import check_api_key -from openbb_terminal.forex.forex_helper import parse_forex_symbol # pylint: disable=R1710,import-outside-toplevel diff --git a/openbb_terminal/forex/forex_helper.py b/openbb_terminal/forex/forex_helper.py index 570fcf272c58..ec6663149b12 100644 --- a/openbb_terminal/forex/forex_helper.py +++ b/openbb_terminal/forex/forex_helper.py @@ -1,31 +1,31 @@ """Forex helper.""" -from datetime import datetime, timedelta -from typing import List, Optional, Dict, Iterable -import os import argparse import logging +import os import re +from datetime import datetime, timedelta +from typing import Dict, Iterable, List, Optional -import pandas as pd import matplotlib.pyplot as plt -from matplotlib.lines import Line2D -from matplotlib.ticker import LogLocator, ScalarFormatter import mplfinance as mpf -import yfinance as yf import numpy as np +import pandas as pd import plotly.graph_objects as go +import yfinance as yf +from matplotlib.lines import Line2D +from matplotlib.ticker import LogLocator, ScalarFormatter from plotly.subplots import make_subplots -from openbb_terminal.stocks import stocks_helper -from openbb_terminal.forex import av_model, polygon_model -from openbb_terminal.rich_config import console -from openbb_terminal.decorators import log_start_end import openbb_terminal.config_terminal as cfg +from openbb_terminal.decorators import log_start_end +from openbb_terminal.forex import av_model, polygon_model from openbb_terminal.helper_funcs import ( is_valid_axes_count, - plot_autoscale, lambda_long_number_format_y_axis, + plot_autoscale, ) +from openbb_terminal.rich_config import console +from openbb_terminal.stocks import stocks_helper CANDLE_SORT = [ "adjclose", diff --git a/openbb_terminal/forex/fxempire_model.py b/openbb_terminal/forex/fxempire_model.py index aeea531c78a0..4ace5afb0cfe 100644 --- a/openbb_terminal/forex/fxempire_model.py +++ b/openbb_terminal/forex/fxempire_model.py @@ -1,6 +1,7 @@ """FXEmpire Model""" import logging + import pandas as pd from openbb_terminal.decorators import log_start_end diff --git a/openbb_terminal/forex/fxempire_view.py b/openbb_terminal/forex/fxempire_view.py index 7929a3667ff1..d70ccf876fac 100644 --- a/openbb_terminal/forex/fxempire_view.py +++ b/openbb_terminal/forex/fxempire_view.py @@ -2,10 +2,11 @@ import logging import os -from openbb_terminal.forex import fxempire_model + from openbb_terminal.decorators import log_start_end +from openbb_terminal.forex import fxempire_model +from openbb_terminal.helper_funcs import export_data, print_rich_table from openbb_terminal.rich_config import console -from openbb_terminal.helper_funcs import print_rich_table, export_data logger = logging.getLogger(__name__) diff --git a/openbb_terminal/forex/oanda/oanda_controller.py b/openbb_terminal/forex/oanda/oanda_controller.py index ab3b6c3133a3..c9fca0a2d417 100644 --- a/openbb_terminal/forex/oanda/oanda_controller.py +++ b/openbb_terminal/forex/oanda/oanda_controller.py @@ -17,7 +17,7 @@ ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/forex/oanda/oanda_view.py b/openbb_terminal/forex/oanda/oanda_view.py index 543dce89276b..1342c4c97996 100644 --- a/openbb_terminal/forex/oanda/oanda_view.py +++ b/openbb_terminal/forex/oanda/oanda_view.py @@ -2,7 +2,7 @@ __docformat__ = "numpy" import logging -from typing import Dict, Union, Optional, List +from typing import Dict, List, Optional, Union import matplotlib.pyplot as plt import matplotlib.ticker as mticker @@ -11,10 +11,9 @@ import pandas_ta as ta import seaborn as sns -from openbb_terminal.config_terminal import theme from openbb_terminal.config_plot import PLOT_DPI -from openbb_terminal.decorators import check_api_key -from openbb_terminal.decorators import log_start_end +from openbb_terminal.config_terminal import theme +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.forex.oanda.oanda_model import ( account_summary_request, cancel_pending_order_request, @@ -30,7 +29,7 @@ pending_orders_request, positionbook_plot_data_request, ) -from openbb_terminal.helper_funcs import plot_autoscale, is_valid_axes_count +from openbb_terminal.helper_funcs import is_valid_axes_count, plot_autoscale from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/forex/polygon_model.py b/openbb_terminal/forex/polygon_model.py index 67a0cce85c10..4accd4adffe5 100644 --- a/openbb_terminal/forex/polygon_model.py +++ b/openbb_terminal/forex/polygon_model.py @@ -3,10 +3,12 @@ from datetime import datetime from typing import Optional + import pandas as pd + from openbb_terminal.config_terminal import API_POLYGON_KEY as api_key -from openbb_terminal.helper_funcs import get_user_agent, request from openbb_terminal.decorators import check_api_key +from openbb_terminal.helper_funcs import get_user_agent, request from openbb_terminal.rich_config import console # pylint: disable=unsupported-assignment-operation diff --git a/openbb_terminal/forex/quantitative_analysis/qa_controller.py b/openbb_terminal/forex/quantitative_analysis/qa_controller.py index 0a6b353d5620..4c13b3e9e247 100644 --- a/openbb_terminal/forex/quantitative_analysis/qa_controller.py +++ b/openbb_terminal/forex/quantitative_analysis/qa_controller.py @@ -9,19 +9,19 @@ import pandas as pd from openbb_terminal import feature_flags as obbff -from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.common.quantitative_analysis import qa_view, rolling_view +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_ONLY_FIGURES_ALLOWED, EXPORT_ONLY_RAW_DATA_ALLOWED, + check_list_dates, check_positive, check_proportion_range, - check_list_dates, ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import CryptoBaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/forex/sdk_helpers.py b/openbb_terminal/forex/sdk_helpers.py index 4300a1373106..5af9c4dad40b 100644 --- a/openbb_terminal/forex/sdk_helpers.py +++ b/openbb_terminal/forex/sdk_helpers.py @@ -3,6 +3,7 @@ import pandas as pd import yfinance as yf + from openbb_terminal.forex import av_model diff --git a/openbb_terminal/forex/technical_analysis/ta_controller.py b/openbb_terminal/forex/technical_analysis/ta_controller.py index 646a13b4863d..4bfcd38fcf6a 100644 --- a/openbb_terminal/forex/technical_analysis/ta_controller.py +++ b/openbb_terminal/forex/technical_analysis/ta_controller.py @@ -10,30 +10,29 @@ import numpy as np import pandas as pd -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff from openbb_terminal.common.technical_analysis import ( custom_indicators_view, momentum_view, overlap_view, trend_indicators_view, + volatility_model, volatility_view, volume_view, - volatility_model, ) +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end +from openbb_terminal.forex.forex_helper import FOREX_SOURCES from openbb_terminal.helper_funcs import ( EXPORT_BOTH_RAW_DATA_AND_FIGURES, check_positive, - check_positive_list, check_positive_float, + check_positive_list, valid_date, ) -from openbb_terminal.forex.forex_helper import FOREX_SOURCES from openbb_terminal.menu import session from openbb_terminal.parent_classes import StockBaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/futures/futures_controller.py b/openbb_terminal/futures/futures_controller.py index 7d01dfcfc2e9..c365abc20085 100644 --- a/openbb_terminal/futures/futures_controller.py +++ b/openbb_terminal/futures/futures_controller.py @@ -8,21 +8,19 @@ from datetime import datetime, timedelta from typing import List -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end - +from openbb_terminal.futures import yfinance_model, yfinance_view from openbb_terminal.helper_funcs import ( EXPORT_BOTH_RAW_DATA_AND_FIGURES, EXPORT_ONLY_RAW_DATA_ALLOWED, - valid_date, parse_and_split_input, + valid_date, ) -from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText from openbb_terminal.menu import session -from openbb_terminal.futures import yfinance_model, yfinance_view +from openbb_terminal.parent_classes import BaseController +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/futures/yfinance_model.py b/openbb_terminal/futures/yfinance_model.py index 718831f33f55..cb3db40608dc 100644 --- a/openbb_terminal/futures/yfinance_model.py +++ b/openbb_terminal/futures/yfinance_model.py @@ -1,19 +1,19 @@ """Yahoo Finance model""" __docformat__ = "numpy" +import logging import os import sys -import logging -from typing import List, Optional from datetime import datetime, timedelta +from typing import List, Optional -import yfinance as yf import pandas as pd +import yfinance as yf from dateutil.relativedelta import relativedelta -from openbb_terminal.rich_config import console -from openbb_terminal.decorators import log_start_end from openbb_terminal.core.config.paths import MISCELLANEOUS_DIRECTORY +from openbb_terminal.decorators import log_start_end +from openbb_terminal.rich_config import console # pylint: disable=attribute-defined-outside-init diff --git a/openbb_terminal/futures/yfinance_view.py b/openbb_terminal/futures/yfinance_view.py index e5252bd2ec5d..eb7156c43a02 100644 --- a/openbb_terminal/futures/yfinance_view.py +++ b/openbb_terminal/futures/yfinance_view.py @@ -1,25 +1,25 @@ """Yahoo Finance view""" __docformat__ = "numpy" -from typing import Optional, List -from itertools import cycle import logging import os +from itertools import cycle +from typing import List, Optional from matplotlib import pyplot as plt -from openbb_terminal.config_terminal import theme from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.futures import yfinance_model +from openbb_terminal.futures.futures_helper import make_white from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, plot_autoscale, print_rich_table, - is_valid_axes_count, ) from openbb_terminal.rich_config import console -from openbb_terminal.futures.futures_helper import make_white logger = logging.getLogger(__name__) diff --git a/openbb_terminal/helper_classes.py b/openbb_terminal/helper_classes.py index 040a88fd153d..a9236640c11c 100644 --- a/openbb_terminal/helper_classes.py +++ b/openbb_terminal/helper_classes.py @@ -1,11 +1,11 @@ """Helper classes.""" __docformat__ = "numpy" -import os -from pathlib import Path import argparse import json +import os from importlib import machinery, util -from typing import Union, List, Dict, Optional +from pathlib import Path +from typing import Dict, List, Optional, Union import matplotlib.pyplot as plt from matplotlib import font_manager, ticker diff --git a/openbb_terminal/helper_funcs.py b/openbb_terminal/helper_funcs.py index bb5341fdd700..c2bab9413eb5 100644 --- a/openbb_terminal/helper_funcs.py +++ b/openbb_terminal/helper_funcs.py @@ -3,52 +3,51 @@ # pylint: disable=too-many-lines import argparse import io +import json import logging -from pathlib import Path -from typing import List, Union, Optional, Dict, Tuple -from functools import lru_cache -from datetime import datetime, timedelta -from datetime import date as d -import types -from collections.abc import Iterable import os -import re import random +import re import sys -from difflib import SequenceMatcher -import webbrowser +import types import urllib.parse -import json +import webbrowser +from collections.abc import Iterable +from datetime import date as d +from datetime import datetime, timedelta +from difflib import SequenceMatcher +from functools import lru_cache +from pathlib import Path +from typing import Dict, List, Optional, Tuple, Union -import pytz -import pandas as pd -from rich.table import Table -import iso8601 import dotenv +import iso8601 import matplotlib import matplotlib.pyplot as plt -from holidays import US as us_holidays -from pandas._config.config import get_option -from pandas.plotting import register_matplotlib_converters +import numpy as np +import pandas as pd import pandas.io.formats.format +import pytz import requests -from screeninfo import get_monitors import yfinance as yf -import numpy as np - +from holidays import US as us_holidays +from pandas._config.config import get_option +from pandas.plotting import register_matplotlib_converters from PIL import Image, ImageDraw +from rich.table import Table +from screeninfo import get_monitors -from openbb_terminal.rich_config import console -from openbb_terminal import feature_flags as obbff -from openbb_terminal import config_terminal as cfg from openbb_terminal import config_plot as cfgPlot +from openbb_terminal import config_terminal as cfg +from openbb_terminal import feature_flags as obbff +from openbb_terminal.core.config import paths from openbb_terminal.core.config.paths import ( HOME_DIRECTORY, USER_ENV_FILE, USER_EXPORTS_DIRECTORY, load_dotenv_with_priority, ) -from openbb_terminal.core.config import paths +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/helpers_denomination.py b/openbb_terminal/helpers_denomination.py index 17a7ff834905..c42aa6645662 100644 --- a/openbb_terminal/helpers_denomination.py +++ b/openbb_terminal/helpers_denomination.py @@ -1,6 +1,7 @@ """Denomination Helper functions""" -from typing import Literal, Tuple, Callable, Dict +from typing import Callable, Dict, Literal, Tuple + import pandas as pd from pandas._typing import Axis diff --git a/openbb_terminal/keys_controller.py b/openbb_terminal/keys_controller.py index 675452c65262..bcc4fa3c69d5 100644 --- a/openbb_terminal/keys_controller.py +++ b/openbb_terminal/keys_controller.py @@ -9,15 +9,15 @@ from tqdm import tqdm -from openbb_terminal import feature_flags as obbff, keys_view -from openbb_terminal import keys_model +from openbb_terminal import feature_flags as obbff +from openbb_terminal import keys_model, keys_view from openbb_terminal.core.config.paths import USER_ENV_FILE from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import EXPORT_ONLY_RAW_DATA_ALLOWED from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText, translate +from openbb_terminal.rich_config import MenuText, console, translate logger = logging.getLogger(__name__) diff --git a/openbb_terminal/keys_model.py b/openbb_terminal/keys_model.py index 82064b42b29d..02cff5e57faa 100644 --- a/openbb_terminal/keys_model.py +++ b/openbb_terminal/keys_model.py @@ -3,39 +3,40 @@ # pylint: disable=too-many-lines -import sys +import contextlib +import io import logging import os -import contextlib +import sys from enum import Enum -import io from typing import Dict, List, Union -import dotenv + import binance +import dotenv +import oandapyV20.endpoints.pricing import pandas as pd +import praw +import pyEX import quandl import requests import stocksera -from prawcore.exceptions import ResponseException -import praw -import pyEX -import oandapyV20.endpoints.pricing -from oandapyV20 import API as oanda_API +from alpha_vantage.timeseries import TimeSeries from coinmarketcapapi import CoinMarketCapAPI +from oandapyV20 import API as oanda_API +from prawcore.exceptions import ResponseException from tokenterminal import TokenTerminal -from alpha_vantage.timeseries import TimeSeries + +from openbb_terminal import config_terminal as cfg +from openbb_terminal.core.config.paths import USER_ENV_FILE from openbb_terminal.cryptocurrency.coinbase_helpers import ( + CoinbaseApiException, CoinbaseProAuth, make_coinbase_request, - CoinbaseApiException, ) -from openbb_terminal import config_terminal as cfg -from openbb_terminal.core.config.paths import USER_ENV_FILE -from openbb_terminal.rich_config import console from openbb_terminal.helper_funcs import request - -from openbb_terminal.terminal_helper import suppress_stdout from openbb_terminal.portfolio.brokers.degiro.degiro_model import DegiroModel +from openbb_terminal.rich_config import console +from openbb_terminal.terminal_helper import suppress_stdout logger = logging.getLogger(__name__) diff --git a/openbb_terminal/keys_view.py b/openbb_terminal/keys_view.py index 43db0ab1ea86..b6231b56137a 100644 --- a/openbb_terminal/keys_view.py +++ b/openbb_terminal/keys_view.py @@ -3,8 +3,8 @@ import logging import os -from openbb_terminal import keys_model +from openbb_terminal import keys_model from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import export_data, print_rich_table from openbb_terminal.rich_config import console diff --git a/openbb_terminal/loggers.py b/openbb_terminal/loggers.py index 268a9315b633..d4c0fe2a20bf 100644 --- a/openbb_terminal/loggers.py +++ b/openbb_terminal/loggers.py @@ -21,11 +21,18 @@ LOGGING_APP_NAME, LOGGING_AWS_ACCESS_KEY_ID, LOGGING_AWS_SECRET_ACCESS_KEY, + LOGGING_COMMIT_HASH, LOGGING_FREQUENCY, LOGGING_HANDLERS, LOGGING_ROLLING_CLOCK, LOGGING_VERBOSITY, - LOGGING_COMMIT_HASH, +) +from openbb_terminal.core.log.generation.directories import get_log_dir +from openbb_terminal.core.log.generation.formatter_with_exceptions import ( + FormatterWithExceptions, +) +from openbb_terminal.core.log.generation.path_tracking_file_handler import ( + PathTrackingFileHandler, ) from openbb_terminal.core.log.generation.settings import ( AppSettings, @@ -33,13 +40,6 @@ LogSettings, Settings, ) -from openbb_terminal.core.log.generation.path_tracking_file_handler import ( - PathTrackingFileHandler, -) -from openbb_terminal.core.log.generation.formatter_with_exceptions import ( - FormatterWithExceptions, -) -from openbb_terminal.core.log.generation.directories import get_log_dir logging.getLogger("requests").setLevel(LOGGING_VERBOSITY) logging.getLogger("urllib3").setLevel(LOGGING_VERBOSITY) diff --git a/openbb_terminal/menu.py b/openbb_terminal/menu.py index 9b4909ac8942..005e40c4bd1e 100644 --- a/openbb_terminal/menu.py +++ b/openbb_terminal/menu.py @@ -1,7 +1,7 @@ -import sys -from typing import Optional import logging import os +import sys +from typing import Optional from matplotlib import pyplot from prompt_toolkit import PromptSession diff --git a/openbb_terminal/mutual_funds/avanza_view.py b/openbb_terminal/mutual_funds/avanza_view.py index 164f0aa85ffa..a8d09380f7d1 100644 --- a/openbb_terminal/mutual_funds/avanza_view.py +++ b/openbb_terminal/mutual_funds/avanza_view.py @@ -6,9 +6,9 @@ import pandas as pd from openbb_terminal.decorators import log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.helper_funcs import print_rich_table from openbb_terminal.mutual_funds import avanza_model +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/mutual_funds/investpy_model.py b/openbb_terminal/mutual_funds/investpy_model.py index 465b9ab1f8f5..ec84d7b54adb 100644 --- a/openbb_terminal/mutual_funds/investpy_model.py +++ b/openbb_terminal/mutual_funds/investpy_model.py @@ -5,8 +5,8 @@ from datetime import datetime, timedelta from typing import Tuple -import investpy import investiny +import investpy import pandas as pd from requests.exceptions import RequestException diff --git a/openbb_terminal/mutual_funds/investpy_view.py b/openbb_terminal/mutual_funds/investpy_view.py index b3deec260aa8..e6caf3579e20 100644 --- a/openbb_terminal/mutual_funds/investpy_view.py +++ b/openbb_terminal/mutual_funds/investpy_view.py @@ -3,13 +3,14 @@ import logging import os -from typing import Optional, List +from typing import List, Optional import matplotlib.pyplot as plt import numpy as np import pandas as pd from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, @@ -18,7 +19,6 @@ ) from openbb_terminal.mutual_funds import investpy_model from openbb_terminal.rich_config import console -from openbb_terminal.config_terminal import theme logger = logging.getLogger(__name__) diff --git a/openbb_terminal/mutual_funds/mutual_fund_controller.py b/openbb_terminal/mutual_funds/mutual_fund_controller.py index eac37cdc1f9b..61184fa6f8fe 100644 --- a/openbb_terminal/mutual_funds/mutual_fund_controller.py +++ b/openbb_terminal/mutual_funds/mutual_fund_controller.py @@ -10,9 +10,8 @@ import investpy import pandas as pd -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_BOTH_RAW_DATA_AND_FIGURES, @@ -24,13 +23,13 @@ ) from openbb_terminal.menu import session from openbb_terminal.mutual_funds import ( + avanza_view, investpy_model, investpy_view, yfinance_view, - avanza_view, ) from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/parent_classes.py b/openbb_terminal/parent_classes.py index d67ed9d762e0..c84353df4d2e 100644 --- a/openbb_terminal/parent_classes.py +++ b/openbb_terminal/parent_classes.py @@ -19,15 +19,16 @@ from prompt_toolkit.styles import Style from rich.markdown import Markdown +from openbb_terminal import feature_flags as obbff +from openbb_terminal.config_terminal import theme +from openbb_terminal.core.completer.choices import build_controller_choice_map from openbb_terminal.core.config.paths import ( USER_CUSTOM_IMPORTS_DIRECTORY, USER_ROUTINES_DIRECTORY, ) -from openbb_terminal.decorators import log_start_end +from openbb_terminal.cryptocurrency import cryptocurrency_helpers from openbb_terminal.custom_prompt_toolkit import NestedCompleter -from openbb_terminal.menu import session -from openbb_terminal import feature_flags as obbff -from openbb_terminal.config_terminal import theme +from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( check_file_type_saved, check_positive, @@ -42,11 +43,10 @@ system_clear, valid_date, ) +from openbb_terminal.menu import session from openbb_terminal.rich_config import console, get_ordered_list_sources from openbb_terminal.stocks import stocks_helper from openbb_terminal.terminal_helper import open_openbb_documentation -from openbb_terminal.cryptocurrency import cryptocurrency_helpers -from openbb_terminal.core.completer.choices import build_controller_choice_map logger = logging.getLogger(__name__) diff --git a/openbb_terminal/portfolio/attribution_model.py b/openbb_terminal/portfolio/attribution_model.py index dfa815b99ded..795a29d2d55f 100644 --- a/openbb_terminal/portfolio/attribution_model.py +++ b/openbb_terminal/portfolio/attribution_model.py @@ -1,13 +1,13 @@ """Attribution Model""" __docformat__ = "numpy" -from datetime import datetime -from datetime import date import logging +from datetime import date, datetime from typing import Dict -import yfinance as yf import pandas as pd +import yfinance as yf + from openbb_terminal.decorators import log_start_end logger = logging.getLogger(__name__) diff --git a/openbb_terminal/portfolio/brokers/ally/ally_controller.py b/openbb_terminal/portfolio/brokers/ally/ally_controller.py index 1a8ac160112e..be83943ae676 100644 --- a/openbb_terminal/portfolio/brokers/ally/ally_controller.py +++ b/openbb_terminal/portfolio/brokers/ally/ally_controller.py @@ -5,9 +5,8 @@ import logging from typing import List -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_ONLY_RAW_DATA_ALLOWED, @@ -15,7 +14,7 @@ from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController from openbb_terminal.portfolio.brokers.ally import ally_view -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/portfolio/brokers/bro_controller.py b/openbb_terminal/portfolio/brokers/bro_controller.py index 14cbb82da57f..b0b4d35c11fe 100644 --- a/openbb_terminal/portfolio/brokers/bro_controller.py +++ b/openbb_terminal/portfolio/brokers/bro_controller.py @@ -14,7 +14,7 @@ from openbb_terminal.portfolio.brokers.coinbase import coinbase_controller from openbb_terminal.portfolio.brokers.degiro import degiro_controller from openbb_terminal.portfolio.brokers.robinhood import robinhood_controller -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/portfolio/brokers/brokers_helpers.py b/openbb_terminal/portfolio/brokers/brokers_helpers.py index 76052965de70..00b5102dd3a1 100644 --- a/openbb_terminal/portfolio/brokers/brokers_helpers.py +++ b/openbb_terminal/portfolio/brokers/brokers_helpers.py @@ -1,4 +1,5 @@ import pandas as pd + from openbb_terminal.rich_config import console diff --git a/openbb_terminal/portfolio/brokers/coinbase/coinbase_controller.py b/openbb_terminal/portfolio/brokers/coinbase/coinbase_controller.py index 983682e41eb6..2017ea3792d6 100644 --- a/openbb_terminal/portfolio/brokers/coinbase/coinbase_controller.py +++ b/openbb_terminal/portfolio/brokers/coinbase/coinbase_controller.py @@ -6,9 +6,8 @@ import logging from typing import List -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_ONLY_RAW_DATA_ALLOWED, @@ -17,7 +16,7 @@ from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController from openbb_terminal.portfolio.brokers.coinbase import coinbase_view -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/portfolio/brokers/coinbase/coinbase_model.py b/openbb_terminal/portfolio/brokers/coinbase/coinbase_model.py index 43cf204a0ae9..460fdc8125a7 100644 --- a/openbb_terminal/portfolio/brokers/coinbase/coinbase_model.py +++ b/openbb_terminal/portfolio/brokers/coinbase/coinbase_model.py @@ -6,15 +6,15 @@ import pandas as pd import openbb_terminal.config_terminal as cfg +import openbb_terminal.cryptocurrency.due_diligence.coinbase_model as cbm from openbb_terminal.cryptocurrency.coinbase_helpers import ( + CoinbaseApiException, CoinbaseProAuth, _check_account_validity, make_coinbase_request, - CoinbaseApiException, ) from openbb_terminal.decorators import log_start_end from openbb_terminal.rich_config import console -import openbb_terminal.cryptocurrency.due_diligence.coinbase_model as cbm logger = logging.getLogger(__name__) diff --git a/openbb_terminal/portfolio/brokers/coinbase/coinbase_view.py b/openbb_terminal/portfolio/brokers/coinbase/coinbase_view.py index 156c139534c2..37af663ee903 100644 --- a/openbb_terminal/portfolio/brokers/coinbase/coinbase_view.py +++ b/openbb_terminal/portfolio/brokers/coinbase/coinbase_view.py @@ -4,8 +4,7 @@ import logging import os -from openbb_terminal.decorators import log_start_end -from openbb_terminal.decorators import check_api_key +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import export_data, print_rich_table from openbb_terminal.portfolio.brokers.coinbase import coinbase_model diff --git a/openbb_terminal/portfolio/brokers/degiro/degiro_controller.py b/openbb_terminal/portfolio/brokers/degiro/degiro_controller.py index fedd0d50d819..558c9d2b143e 100644 --- a/openbb_terminal/portfolio/brokers/degiro/degiro_controller.py +++ b/openbb_terminal/portfolio/brokers/degiro/degiro_controller.py @@ -4,10 +4,9 @@ import logging from typing import List -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - # IMPORTATION INTERNAL from openbb_terminal import feature_flags as obbff +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_ONLY_RAW_DATA_ALLOWED, diff --git a/openbb_terminal/portfolio/brokers/degiro/degiro_model.py b/openbb_terminal/portfolio/brokers/degiro/degiro_model.py index 9c244b849588..ac78e1398583 100644 --- a/openbb_terminal/portfolio/brokers/degiro/degiro_model.py +++ b/openbb_terminal/portfolio/brokers/degiro/degiro_model.py @@ -2,8 +2,8 @@ import datetime import logging import math -from typing import List, Union from pathlib import Path +from typing import List, Union # IMPORTATION THIRDPARTY import pandas as pd @@ -23,9 +23,9 @@ # IMPORTATION INTERNAL import openbb_terminal.config_terminal as config -from openbb_terminal.rich_config import console from openbb_terminal.decorators import log_start_end from openbb_terminal.portfolio import portfolio_helper +from openbb_terminal.rich_config import console # pylint: disable=no-member,no-else-return diff --git a/openbb_terminal/portfolio/brokers/degiro/degiro_view.py b/openbb_terminal/portfolio/brokers/degiro/degiro_view.py index 5b97a5a3057e..dace53cfa3c5 100644 --- a/openbb_terminal/portfolio/brokers/degiro/degiro_view.py +++ b/openbb_terminal/portfolio/brokers/degiro/degiro_view.py @@ -14,15 +14,14 @@ Update, ) -from openbb_terminal.decorators import log_start_end -from openbb_terminal.decorators import check_api_key +from openbb_terminal.decorators import check_api_key, log_start_end # IMPORTATION INTERNAL from openbb_terminal.helper_funcs import ( print_rich_table, ) from openbb_terminal.portfolio.brokers.degiro.degiro_model import DegiroModel -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console # pylint: disable=no-member diff --git a/openbb_terminal/portfolio/brokers/robinhood/robinhood_controller.py b/openbb_terminal/portfolio/brokers/robinhood/robinhood_controller.py index a707dc5ee7b5..014c874f42ff 100644 --- a/openbb_terminal/portfolio/brokers/robinhood/robinhood_controller.py +++ b/openbb_terminal/portfolio/brokers/robinhood/robinhood_controller.py @@ -5,11 +5,9 @@ import logging from typing import List -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - -from openbb_terminal.decorators import check_api_key from openbb_terminal import feature_flags as obbff -from openbb_terminal.decorators import log_start_end +from openbb_terminal.custom_prompt_toolkit import NestedCompleter +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import ( EXPORT_ONLY_RAW_DATA_ALLOWED, ) @@ -19,7 +17,7 @@ robinhood_model, robinhood_view, ) -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/portfolio/brokers/robinhood/robinhood_view.py b/openbb_terminal/portfolio/brokers/robinhood/robinhood_view.py index 7ca3ef55ffb2..c4eff7966c6e 100644 --- a/openbb_terminal/portfolio/brokers/robinhood/robinhood_view.py +++ b/openbb_terminal/portfolio/brokers/robinhood/robinhood_view.py @@ -7,8 +7,8 @@ import matplotlib.pyplot as plt import mplfinance as mpf -from openbb_terminal.config_terminal import theme from openbb_terminal import feature_flags as obbff +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, diff --git a/openbb_terminal/portfolio/metrics_model.py b/openbb_terminal/portfolio/metrics_model.py index 1453c124afb5..0e5cec11f73b 100644 --- a/openbb_terminal/portfolio/metrics_model.py +++ b/openbb_terminal/portfolio/metrics_model.py @@ -5,14 +5,14 @@ from datetime import datetime from typing import Tuple -import pandas as pd import numpy as np +import pandas as pd -from openbb_terminal.decorators import log_start_end from openbb_terminal.core.config.paths import USER_PORTFOLIO_DATA_DIRECTORY -from openbb_terminal.rich_config import console -from openbb_terminal.portfolio.statics import PERIODS +from openbb_terminal.decorators import log_start_end from openbb_terminal.portfolio.portfolio_helper import filter_df_by_period +from openbb_terminal.portfolio.statics import PERIODS +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/portfolio/portfolio_analysis/reportlab_helpers.py b/openbb_terminal/portfolio/portfolio_analysis/reportlab_helpers.py index f722a82c58ba..9d19e4e674e6 100644 --- a/openbb_terminal/portfolio/portfolio_analysis/reportlab_helpers.py +++ b/openbb_terminal/portfolio/portfolio_analysis/reportlab_helpers.py @@ -5,8 +5,8 @@ from typing import List from reportlab.lib import colors -from reportlab.pdfgen import canvas from reportlab.lib.styles import ParagraphStyle, getSampleStyleSheet +from reportlab.pdfgen import canvas from reportlab.platypus import Paragraph, Table, TableStyle diff --git a/openbb_terminal/portfolio/portfolio_analysis/yfinance_model.py b/openbb_terminal/portfolio/portfolio_analysis/yfinance_model.py index 3cf25da5e7db..9a4c49dce858 100644 --- a/openbb_terminal/portfolio/portfolio_analysis/yfinance_model.py +++ b/openbb_terminal/portfolio/portfolio_analysis/yfinance_model.py @@ -2,11 +2,12 @@ __docformat__ = "numpy" import difflib -from typing import List from datetime import datetime, timedelta +from typing import List -import yfinance as yf import pandas as pd +import yfinance as yf + from openbb_terminal.stocks.sector_industry_analysis import financedatabase_model diff --git a/openbb_terminal/portfolio/portfolio_controller.py b/openbb_terminal/portfolio/portfolio_controller.py index f966d9574472..0f18c52dd3e7 100644 --- a/openbb_terminal/portfolio/portfolio_controller.py +++ b/openbb_terminal/portfolio/portfolio_controller.py @@ -4,32 +4,26 @@ import argparse import logging import os -from typing import List from datetime import date +from typing import List import pandas as pd -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff +from openbb_terminal.common.quantitative_analysis import qa_view +from openbb_terminal.core.config.paths import MISCELLANEOUS_DIRECTORY +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_BOTH_RAW_DATA_AND_FIGURES, EXPORT_ONLY_FIGURES_ALLOWED, EXPORT_ONLY_RAW_DATA_ALLOWED, ) - from openbb_terminal.menu import session -from openbb_terminal.core.config.paths import MISCELLANEOUS_DIRECTORY from openbb_terminal.parent_classes import BaseController +from openbb_terminal.portfolio import attribution_model, portfolio_helper, portfolio_view, statics from openbb_terminal.portfolio.portfolio_model import generate_portfolio -from openbb_terminal.portfolio import statics -from openbb_terminal.portfolio import portfolio_view -from openbb_terminal.portfolio import portfolio_helper -from openbb_terminal.portfolio import attribution_model - -from openbb_terminal.rich_config import console, MenuText -from openbb_terminal.common.quantitative_analysis import qa_view +from openbb_terminal.rich_config import MenuText, console try: from openbb_terminal.portfolio.portfolio_optimization import po_controller diff --git a/openbb_terminal/portfolio/portfolio_engine.py b/openbb_terminal/portfolio/portfolio_engine.py index 9bc37d363596..8a4357cec062 100644 --- a/openbb_terminal/portfolio/portfolio_engine.py +++ b/openbb_terminal/portfolio/portfolio_engine.py @@ -1,23 +1,24 @@ """Portfolio Engine""" __docformat__ = "numpy" -from os import environ -import warnings -import logging -from typing import Dict, Any import datetime +import logging +import warnings +from os import environ +from typing import Any, Dict import numpy as np import pandas as pd import yfinance as yf from tqdm import tqdm + from openbb_terminal.decorators import log_start_end -from openbb_terminal.rich_config import console +from openbb_terminal.portfolio.allocation_model import get_allocation from openbb_terminal.portfolio.portfolio_helper import ( - make_equal_length, get_info_from_ticker, + make_equal_length, ) -from openbb_terminal.portfolio.allocation_model import get_allocation +from openbb_terminal.rich_config import console from openbb_terminal.terminal_helper import suppress_stdout # pylint: disable=E1136,W0201,R0902,C0302 diff --git a/openbb_terminal/portfolio/portfolio_helper.py b/openbb_terminal/portfolio/portfolio_helper.py index c8f052ea82cd..4022bbb84623 100644 --- a/openbb_terminal/portfolio/portfolio_helper.py +++ b/openbb_terminal/portfolio/portfolio_helper.py @@ -1,20 +1,20 @@ """Portfolio Helper""" __docformat__ = "numpy" +import csv import logging -from datetime import datetime, date import os +from datetime import date, datetime from pathlib import Path -import csv from typing import List -from dateutil.relativedelta import relativedelta -import yfinance as yf import pandas as pd +import yfinance as yf +from dateutil.relativedelta import relativedelta from openbb_terminal.core.config.paths import USER_PORTFOLIO_DATA_DIRECTORY -from openbb_terminal.rich_config import console from openbb_terminal.portfolio.statics import REGIONS +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/portfolio/portfolio_model.py b/openbb_terminal/portfolio/portfolio_model.py index 6cd87b810b94..f6703b0ec6c3 100644 --- a/openbb_terminal/portfolio/portfolio_model.py +++ b/openbb_terminal/portfolio/portfolio_model.py @@ -5,15 +5,15 @@ from typing import Tuple, Union import numpy as np -import scipy import pandas as pd +import scipy from sklearn.metrics import r2_score + from openbb_terminal.common.quantitative_analysis import qa_model from openbb_terminal.decorators import log_start_end -from openbb_terminal.portfolio.statics import PERIODS -from openbb_terminal.portfolio import portfolio_helper, metrics_model +from openbb_terminal.portfolio import metrics_model, portfolio_helper from openbb_terminal.portfolio.portfolio_engine import PortfolioEngine - +from openbb_terminal.portfolio.statics import PERIODS # pylint: disable=E1136,W0201,R0902,C0302, consider-using-f-string, consider-iterating-dictionary # pylint: disable=unsupported-assignment-operation,redefined-outer-name,too-many-public-methods diff --git a/openbb_terminal/portfolio/portfolio_optimization/optimizer_helper.py b/openbb_terminal/portfolio/portfolio_optimization/optimizer_helper.py index 9284da4bf359..5d8c4437461f 100644 --- a/openbb_terminal/portfolio/portfolio_optimization/optimizer_helper.py +++ b/openbb_terminal/portfolio/portfolio_optimization/optimizer_helper.py @@ -3,11 +3,12 @@ import argparse from typing import Any + import pandas as pd from openbb_terminal.portfolio.portfolio_optimization.statics import ( - RISK_CHOICES, OPTIMIZATION_PARAMETERS, + RISK_CHOICES, TERMINAL_TEMPLATE_MAP, ) from openbb_terminal.rich_config import console diff --git a/openbb_terminal/portfolio/portfolio_optimization/parameters/params_controller.py b/openbb_terminal/portfolio/portfolio_optimization/parameters/params_controller.py index d3c6649d39ef..623f7a5fc687 100644 --- a/openbb_terminal/portfolio/portfolio_optimization/parameters/params_controller.py +++ b/openbb_terminal/portfolio/portfolio_optimization/parameters/params_controller.py @@ -7,21 +7,19 @@ import logging from typing import List, Optional -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.portfolio.portfolio_optimization.parameters import params_view -from openbb_terminal.portfolio.portfolio_optimization.parameters import params_helpers +from openbb_terminal.portfolio.portfolio_optimization.parameters import params_helpers, params_view from openbb_terminal.portfolio.portfolio_optimization.parameters.params_statics import ( AVAILABLE_OPTIONS, - DEFAULT_PARAMETERS, DEFAULT_BOOL, + DEFAULT_PARAMETERS, MODEL_PARAMS, ) -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/portfolio/portfolio_optimization/parameters/params_helpers.py b/openbb_terminal/portfolio/portfolio_optimization/parameters/params_helpers.py index 8eda16b06b43..b2c34e5d9b1c 100644 --- a/openbb_terminal/portfolio/portfolio_optimization/parameters/params_helpers.py +++ b/openbb_terminal/portfolio/portfolio_optimization/parameters/params_helpers.py @@ -1,14 +1,15 @@ import argparse -from datetime import datetime, date -from typing import Any, Dict, List +from datetime import date, datetime from pathlib import Path -from openbb_terminal.helper_funcs import log_and_raise +from typing import Any, Dict, List + from openbb_terminal.core.config import paths -from openbb_terminal.rich_config import console +from openbb_terminal.helper_funcs import log_and_raise from openbb_terminal.portfolio.portfolio_optimization.statics import ( OPTIMIZATION_PARAMETERS, TERMINAL_TEMPLATE_MAP, ) +from openbb_terminal.rich_config import console def check_save_file(file: str) -> str: diff --git a/openbb_terminal/portfolio/portfolio_optimization/parameters/params_view.py b/openbb_terminal/portfolio/portfolio_optimization/parameters/params_view.py index 23a3d9b942f3..71007a80741d 100644 --- a/openbb_terminal/portfolio/portfolio_optimization/parameters/params_view.py +++ b/openbb_terminal/portfolio/portfolio_optimization/parameters/params_view.py @@ -1,18 +1,18 @@ import configparser -from typing import Tuple from pathlib import Path +from typing import Tuple import pandas as pd +from openbb_terminal.core.config import paths from openbb_terminal.helper_funcs import print_rich_table from openbb_terminal.portfolio.portfolio_optimization import excel_model -from openbb_terminal.rich_config import console from openbb_terminal.portfolio.portfolio_optimization.parameters import params_statics from openbb_terminal.portfolio.portfolio_optimization.parameters.params_helpers import ( booltostr, check_convert_parameters, ) -from openbb_terminal.core.config import paths +from openbb_terminal.rich_config import console def load_file(path: str = "") -> Tuple[dict, str]: diff --git a/openbb_terminal/portfolio/portfolio_optimization/po_controller.py b/openbb_terminal/portfolio/portfolio_optimization/po_controller.py index 5f46611af739..43b08df479a1 100644 --- a/openbb_terminal/portfolio/portfolio_optimization/po_controller.py +++ b/openbb_terminal/portfolio/portfolio_optimization/po_controller.py @@ -5,9 +5,7 @@ import argparse import logging -from typing import List, Dict, Tuple - -from openbb_terminal.custom_prompt_toolkit import NestedCompleter +from typing import Dict, List, Tuple from openbb_terminal import feature_flags as obbff from openbb_terminal import parent_classes @@ -16,6 +14,7 @@ USER_EXPORTS_DIRECTORY, USER_PORTFOLIO_DATA_DIRECTORY, ) +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( check_non_negative, @@ -23,19 +22,19 @@ ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.portfolio.portfolio_optimization import excel_model from openbb_terminal.portfolio.portfolio_optimization import ( + excel_model, optimizer_helper, optimizer_model, optimizer_view, statics, + yahoo_finance_model, ) -from openbb_terminal.portfolio.portfolio_optimization import yahoo_finance_model from openbb_terminal.portfolio.portfolio_optimization.parameters import ( params_controller, params_view, ) -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/portfolio/portfolio_optimization/po_engine.py b/openbb_terminal/portfolio/portfolio_optimization/po_engine.py index 4288b1a0a61e..0742e3a244bc 100644 --- a/openbb_terminal/portfolio/portfolio_optimization/po_engine.py +++ b/openbb_terminal/portfolio/portfolio_optimization/po_engine.py @@ -1,9 +1,11 @@ from typing import Dict, List, Tuple + import pandas as pd + from openbb_terminal.portfolio.portfolio_optimization import ( excel_model, - optimizer_model, optimizer_helper, + optimizer_model, ) from openbb_terminal.portfolio.portfolio_optimization.parameters import params_view from openbb_terminal.rich_config import console diff --git a/openbb_terminal/portfolio/portfolio_optimization/statics.py b/openbb_terminal/portfolio/portfolio_optimization/statics.py index 3da9963b6f5e..f20eb4d8d8a1 100644 --- a/openbb_terminal/portfolio/portfolio_optimization/statics.py +++ b/openbb_terminal/portfolio/portfolio_optimization/statics.py @@ -1,10 +1,10 @@ from typing import List, Optional + from openbb_terminal.helper_funcs import get_rf from openbb_terminal.portfolio.portfolio_optimization.parameters.Parameter import ( Parameter, ) - PERIOD_CHOICES = [ "1d", "5d", diff --git a/openbb_terminal/portfolio/portfolio_optimization/yahoo_finance_model.py b/openbb_terminal/portfolio/portfolio_optimization/yahoo_finance_model.py index a0d0ae5697e7..e54fe7133f93 100644 --- a/openbb_terminal/portfolio/portfolio_optimization/yahoo_finance_model.py +++ b/openbb_terminal/portfolio/portfolio_optimization/yahoo_finance_model.py @@ -11,7 +11,7 @@ import numpy as np import pandas as pd import yfinance as yf -from dateutil.relativedelta import relativedelta, FR +from dateutil.relativedelta import FR, relativedelta from openbb_terminal.decorators import log_start_end diff --git a/openbb_terminal/portfolio/portfolio_view.py b/openbb_terminal/portfolio/portfolio_view.py index 6d3d303b40f5..e5734881216d 100644 --- a/openbb_terminal/portfolio/portfolio_view.py +++ b/openbb_terminal/portfolio/portfolio_view.py @@ -2,64 +2,63 @@ __docformat__ = "numpy" import logging -from typing import List, Optional import os - from datetime import datetime +from typing import List, Optional + import numpy as np import pandas as pd -from matplotlib import pyplot as plt import seaborn as sns +from matplotlib import pyplot as plt from openbb_terminal.common.quantitative_analysis import qa_view -from openbb_terminal.config_terminal import theme from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme +from openbb_terminal.decorators import log_start_end +from openbb_terminal.helper_funcs import ( + export_data, + plot_autoscale, + print_rich_table, +) from openbb_terminal.portfolio.portfolio_model import ( PortfolioEngine, - get_transactions, - get_daily_returns, - get_performance_vs_benchmark, - get_yearly_returns, - get_monthly_returns, - get_distribution_returns, - get_holdings_value, - get_holdings_percentage, - get_rolling_volatility, - get_rolling_sharpe, - get_rolling_sortino, - get_rolling_beta, - get_maximum_drawdown, - get_r2_score, - get_skewness, - get_kurtosis, - get_stats, get_assets_allocation, - get_sectors_allocation, + get_calmar_ratio, + get_common_sense_ratio, get_countries_allocation, - get_regions_allocation, - get_volatility, - get_sharpe_ratio, - get_sortino_ratio, - get_maximum_drawdown_ratio, + get_daily_returns, + get_distribution_returns, get_gaintopain_ratio, - get_tracking_error, + get_holdings_percentage, + get_holdings_value, get_information_ratio, - get_tail_ratio, - get_common_sense_ratio, get_jensens_alpha, - get_calmar_ratio, get_kelly_criterion, + get_kurtosis, + get_maximum_drawdown, + get_maximum_drawdown_ratio, + get_monthly_returns, get_payoff_ratio, + get_performance_vs_benchmark, get_profit_factor, + get_r2_score, + get_regions_allocation, + get_rolling_beta, + get_rolling_sharpe, + get_rolling_sortino, + get_rolling_volatility, + get_sectors_allocation, + get_sharpe_ratio, + get_skewness, + get_sortino_ratio, + get_stats, get_summary, + get_tail_ratio, + get_tracking_error, + get_transactions, + get_volatility, + get_yearly_returns, ) - -from openbb_terminal.helper_funcs import ( - export_data, - plot_autoscale, - print_rich_table, -) -from openbb_terminal.decorators import log_start_end from openbb_terminal.rich_config import console # pylint: disable=C0302,redefined-outer-name diff --git a/openbb_terminal/reports/reports_controller.py b/openbb_terminal/reports/reports_controller.py index 982d0a7ddc4c..c45125f59fb4 100644 --- a/openbb_terminal/reports/reports_controller.py +++ b/openbb_terminal/reports/reports_controller.py @@ -13,12 +13,12 @@ from openbb_terminal.core.config.paths import ( USER_CUSTOM_REPORTS_DIRECTORY, ) -from openbb_terminal.reports import reports_model from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.reports import reports_model +from openbb_terminal.rich_config import MenuText, console # from openbb_terminal.terminal_helper import is_packaged_application diff --git a/openbb_terminal/reports/reports_model.py b/openbb_terminal/reports/reports_model.py index 2a1201249f46..cf3d9df894fc 100644 --- a/openbb_terminal/reports/reports_model.py +++ b/openbb_terminal/reports/reports_model.py @@ -5,26 +5,27 @@ # pylint: disable=R1732, R0912 import os -from pathlib import Path -from threading import Thread import webbrowser from ast import literal_eval from datetime import datetime +from pathlib import Path +from threading import Thread from typing import Any, Dict, List, Union -from ipykernel.kernelapp import IPKernelApp -import papermill as pm + import pandas as pd +import papermill as pm +from ipykernel.kernelapp import IPKernelApp from openbb_terminal import feature_flags as obbff from openbb_terminal.core.config.paths import ( MISCELLANEOUS_DIRECTORY, + USER_CUSTOM_REPORTS_DIRECTORY, USER_PORTFOLIO_DATA_DIRECTORY, USER_REPORTS_DIRECTORY, - USER_CUSTOM_REPORTS_DIRECTORY, ) from openbb_terminal.decorators import log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.forex.forex_controller import FX_TICKERS +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/reports/widget_helpers.py b/openbb_terminal/reports/widget_helpers.py index 6e610c8c2176..0f6c2ccea34b 100644 --- a/openbb_terminal/reports/widget_helpers.py +++ b/openbb_terminal/reports/widget_helpers.py @@ -4,9 +4,10 @@ The library includes both python code and html/css/js elements that can be found in the `./widgets` folder. """ +import base64 import os from typing import List -import base64 + from jinja2 import Template diff --git a/openbb_terminal/rich_config.py b/openbb_terminal/rich_config.py index dc1c771442f4..4b61f1bd11cf 100644 --- a/openbb_terminal/rich_config.py +++ b/openbb_terminal/rich_config.py @@ -1,17 +1,19 @@ """Rich Module""" __docformat__ = "numpy" -import os import json +import os from pathlib import Path from typing import Tuple + +import i18n from rich import panel from rich.console import Console, Theme from rich.text import Text -import i18n -from openbb_terminal.core.config.paths import MISCELLANEOUS_DIRECTORY + from openbb_terminal import config_terminal as cfg from openbb_terminal import feature_flags as obbff +from openbb_terminal.core.config.paths import MISCELLANEOUS_DIRECTORY # pylint: disable=no-member,c-extension-no-member diff --git a/openbb_terminal/sdk.py b/openbb_terminal/sdk.py index dfda182141db..4f7e86292ba0 100644 --- a/openbb_terminal/sdk.py +++ b/openbb_terminal/sdk.py @@ -1,15 +1,13 @@ # pylint: disable=unused-import -from openbb_terminal.config_terminal import theme # noqa: F401 -from openbb_terminal.helper_classes import TerminalStyle from openbb_terminal import helper_funcs as helper # noqa: F401 -from openbb_terminal.reports import widget_helpers as widgets # noqa: F401 +from openbb_terminal.config_terminal import theme # noqa: F401 +from openbb_terminal.core.library.breadcrumb import Breadcrumb, MetadataBuilder +from openbb_terminal.core.library.trail_map import TrailMap from openbb_terminal.cryptocurrency.due_diligence.pycoingecko_model import ( Coin, # noqa: F401 ) - -from openbb_terminal.core.library.breadcrumb import Breadcrumb -from openbb_terminal.core.library.trail_map import TrailMap -from openbb_terminal.core.library.breadcrumb import MetadataBuilder +from openbb_terminal.helper_classes import TerminalStyle +from openbb_terminal.reports import widget_helpers as widgets # noqa: F401 TerminalStyle().applyMPLstyle() trail = "" diff --git a/openbb_terminal/settings_controller.py b/openbb_terminal/settings_controller.py index 9b6324f9b176..976952b250c5 100644 --- a/openbb_terminal/settings_controller.py +++ b/openbb_terminal/settings_controller.py @@ -2,12 +2,13 @@ __docformat__ = "numpy" # IMPORTATION STANDARD -import os -import os.path import argparse import logging +import os +import os.path from pathlib import Path from typing import List + import pytz # IMPORTATION THIRDPARTY @@ -16,7 +17,7 @@ # IMPORTATION INTERNAL from openbb_terminal import config_plot as cfg_plot from openbb_terminal import feature_flags as obbff -from openbb_terminal.core.config.paths import USER_ENV_FILE, USER_DATA_DIRECTORY +from openbb_terminal.core.config.paths import USER_DATA_DIRECTORY, USER_ENV_FILE from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( @@ -27,7 +28,7 @@ ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console # pylint: disable=too-many-lines,no-member,too-many-public-methods,C0302 # pylint: disable=import-outside-toplevel diff --git a/openbb_terminal/sources_controller.py b/openbb_terminal/sources_controller.py index 8853723dfedf..5317ea91603a 100644 --- a/openbb_terminal/sources_controller.py +++ b/openbb_terminal/sources_controller.py @@ -7,10 +7,9 @@ import logging import os from pathlib import Path -from typing import List, Dict +from typing import Dict, List # IMPORTATION THIRDPARTY - # IMPORTATION INTERNAL from openbb_terminal import feature_flags as obbff from openbb_terminal.core.config.paths import MISCELLANEOUS_DIRECTORY @@ -18,7 +17,7 @@ from openbb_terminal.decorators import log_start_end from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console # pylint: disable=too-many-lines,no-member,too-many-public-methods,C0302 # pylint:disable=import-outside-toplevel diff --git a/openbb_terminal/stocks/backtesting/bt_controller.py b/openbb_terminal/stocks/backtesting/bt_controller.py index c32fbbc19da0..b26c268238d0 100644 --- a/openbb_terminal/stocks/backtesting/bt_controller.py +++ b/openbb_terminal/stocks/backtesting/bt_controller.py @@ -2,14 +2,15 @@ __docformat__ = "numpy" import argparse -from typing import List import logging +from typing import List + import matplotlib as mpl import pandas as pd -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff +from openbb_terminal.custom_prompt_toolkit import NestedCompleter +from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_ONLY_RAW_DATA_ALLOWED, check_non_negative_float, @@ -18,8 +19,7 @@ ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText -from openbb_terminal.decorators import log_start_end +from openbb_terminal.rich_config import MenuText, console # This code below aims to fix an issue with the fnn module, used by bt module # which forces matplotlib backend to be 'agg' which doesn't allow to plot diff --git a/openbb_terminal/stocks/backtesting/bt_model.py b/openbb_terminal/stocks/backtesting/bt_model.py index 772aafa21a10..20258824e4e7 100644 --- a/openbb_terminal/stocks/backtesting/bt_model.py +++ b/openbb_terminal/stocks/backtesting/bt_model.py @@ -9,8 +9,8 @@ import pandas_ta as ta import yfinance as yf -from openbb_terminal.decorators import log_start_end from openbb_terminal.common.technical_analysis import ta_helpers +from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import is_intraday logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/backtesting/bt_view.py b/openbb_terminal/stocks/backtesting/bt_view.py index bf073e4e1457..f0d62fed8f8b 100644 --- a/openbb_terminal/stocks/backtesting/bt_view.py +++ b/openbb_terminal/stocks/backtesting/bt_view.py @@ -12,14 +12,14 @@ import yfinance as yf from pandas.plotting import register_matplotlib_converters -from openbb_terminal.config_terminal import theme from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, is_intraday, - plot_autoscale, is_valid_axes_count, + plot_autoscale, ) from openbb_terminal.rich_config import console from openbb_terminal.stocks.backtesting import bt_model diff --git a/openbb_terminal/stocks/behavioural_analysis/ba_controller.py b/openbb_terminal/stocks/behavioural_analysis/ba_controller.py index 398b7016238a..03049dfc0c85 100644 --- a/openbb_terminal/stocks/behavioural_analysis/ba_controller.py +++ b/openbb_terminal/stocks/behavioural_analysis/ba_controller.py @@ -8,8 +8,6 @@ import yfinance as yf -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff from openbb_terminal.common.behavioural_analysis import ( finbrain_view, @@ -18,7 +16,7 @@ stocktwits_view, twitter_view, ) -from openbb_terminal.stocks.behavioural_analysis import finnhub_view, cramer_view +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_BOTH_RAW_DATA_AND_FIGURES, @@ -29,7 +27,8 @@ ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import StockBaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console +from openbb_terminal.stocks.behavioural_analysis import cramer_view, finnhub_view # pylint:disable=R0904,C0302 diff --git a/openbb_terminal/stocks/behavioural_analysis/cramer_model.py b/openbb_terminal/stocks/behavioural_analysis/cramer_model.py index 2ed1d0368131..0ea0a71be968 100644 --- a/openbb_terminal/stocks/behavioural_analysis/cramer_model.py +++ b/openbb_terminal/stocks/behavioural_analysis/cramer_model.py @@ -1,20 +1,19 @@ """Cramer Model""" __docformat__ = "numpy" -import os import logging +import os import re -import pandas as pd +import certifi import numpy as np +import pandas as pd import yfinance as yf from bs4 import BeautifulSoup -import certifi from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import request - logger = logging.getLogger(__name__) # Necessary only for installer to identify where SSL certs are diff --git a/openbb_terminal/stocks/behavioural_analysis/cramer_view.py b/openbb_terminal/stocks/behavioural_analysis/cramer_view.py index 5eec63692635..2d83fd2ca58a 100644 --- a/openbb_terminal/stocks/behavioural_analysis/cramer_view.py +++ b/openbb_terminal/stocks/behavioural_analysis/cramer_view.py @@ -1,26 +1,26 @@ """Cramer View""" __docformat__ = "numpy" -import os -from typing import Optional, List import logging +import os from datetime import datetime +from typing import List, Optional import matplotlib.pyplot as plt -from matplotlib.dates import DateFormatter import yfinance +from matplotlib.dates import DateFormatter import openbb_terminal.config_plot as cfp from openbb_terminal.config_terminal import theme +from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( - print_rich_table, export_data, - plot_autoscale, is_valid_axes_count, + plot_autoscale, + print_rich_table, ) -from openbb_terminal.stocks.behavioural_analysis import cramer_model from openbb_terminal.rich_config import console -from openbb_terminal.decorators import log_start_end +from openbb_terminal.stocks.behavioural_analysis import cramer_model logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/behavioural_analysis/finnhub_model.py b/openbb_terminal/stocks/behavioural_analysis/finnhub_model.py index a29b8e204a4d..c170152142a5 100644 --- a/openbb_terminal/stocks/behavioural_analysis/finnhub_model.py +++ b/openbb_terminal/stocks/behavioural_analysis/finnhub_model.py @@ -2,12 +2,13 @@ __docformat__ = "numpy" import logging - from datetime import datetime, timedelta -from typing import List, Dict, Optional +from typing import Dict, List, Optional + import finnhub import pandas as pd from vaderSentiment.vaderSentiment import SentimentIntensityAnalyzer + from openbb_terminal import config_terminal as cfg from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import similar diff --git a/openbb_terminal/stocks/behavioural_analysis/finnhub_view.py b/openbb_terminal/stocks/behavioural_analysis/finnhub_view.py index 69932fb26744..c8dfd22a87a8 100644 --- a/openbb_terminal/stocks/behavioural_analysis/finnhub_view.py +++ b/openbb_terminal/stocks/behavioural_analysis/finnhub_view.py @@ -2,23 +2,23 @@ __docformat__ = "numpy" import logging - import os -from typing import Optional, List +from typing import List, Optional + import numpy as np import pandas as pd import yfinance as yf from matplotlib import pyplot as plt -from openbb_terminal.stocks.behavioural_analysis import finnhub_model -from openbb_terminal.decorators import log_start_end -from openbb_terminal.config_terminal import theme + from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import ( export_data, - plot_autoscale, is_valid_axes_count, + plot_autoscale, ) -from openbb_terminal.decorators import check_api_key +from openbb_terminal.stocks.behavioural_analysis import finnhub_model logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/cboe_model.py b/openbb_terminal/stocks/cboe_model.py index e18a51cee655..a7ca0561d66c 100644 --- a/openbb_terminal/stocks/cboe_model.py +++ b/openbb_terminal/stocks/cboe_model.py @@ -4,8 +4,8 @@ from typing import Tuple import pandas as pd -from openbb_terminal.helper_funcs import request +from openbb_terminal.helper_funcs import request from openbb_terminal.rich_config import console diff --git a/openbb_terminal/stocks/cboe_view.py b/openbb_terminal/stocks/cboe_view.py index 4aafecd535d4..53e1de5a772a 100644 --- a/openbb_terminal/stocks/cboe_view.py +++ b/openbb_terminal/stocks/cboe_view.py @@ -2,9 +2,10 @@ __docformat__ = "numpy" import pandas as pd -from openbb_terminal.stocks import cboe_model + from openbb_terminal.helper_funcs import print_rich_table from openbb_terminal.rich_config import console +from openbb_terminal.stocks import cboe_model def display_top_of_book(symbol: str, exchange: str = "BZX"): diff --git a/openbb_terminal/stocks/comparison_analysis/ca_controller.py b/openbb_terminal/stocks/comparison_analysis/ca_controller.py index 1d9988c59470..73ea91cd223e 100644 --- a/openbb_terminal/stocks/comparison_analysis/ca_controller.py +++ b/openbb_terminal/stocks/comparison_analysis/ca_controller.py @@ -9,21 +9,20 @@ import yfinance as yf -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_BOTH_RAW_DATA_AND_FIGURES, EXPORT_ONLY_RAW_DATA_ALLOWED, check_non_negative, check_positive, - valid_date, check_start_less_than_end, + valid_date, ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText, get_ordered_list_sources +from openbb_terminal.rich_config import MenuText, console, get_ordered_list_sources from openbb_terminal.stocks.comparison_analysis import ( finbrain_view, finnhub_model, diff --git a/openbb_terminal/stocks/comparison_analysis/finbrain_model.py b/openbb_terminal/stocks/comparison_analysis/finbrain_model.py index 109e0683cd2e..bf0d8c1646fc 100644 --- a/openbb_terminal/stocks/comparison_analysis/finbrain_model.py +++ b/openbb_terminal/stocks/comparison_analysis/finbrain_model.py @@ -5,9 +5,9 @@ from typing import List, Tuple import pandas as pd -from openbb_terminal.helper_funcs import request from openbb_terminal.decorators import log_start_end +from openbb_terminal.helper_funcs import request from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/comparison_analysis/finbrain_view.py b/openbb_terminal/stocks/comparison_analysis/finbrain_view.py index 08dc17f4c233..d83918f519fe 100644 --- a/openbb_terminal/stocks/comparison_analysis/finbrain_view.py +++ b/openbb_terminal/stocks/comparison_analysis/finbrain_view.py @@ -11,14 +11,14 @@ from matplotlib import pyplot as plt from pandas.plotting import register_matplotlib_converters -from openbb_terminal.config_terminal import theme from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, plot_autoscale, print_rich_table, - is_valid_axes_count, ) from openbb_terminal.rich_config import console from openbb_terminal.stocks.comparison_analysis import finbrain_model diff --git a/openbb_terminal/stocks/comparison_analysis/finnhub_model.py b/openbb_terminal/stocks/comparison_analysis/finnhub_model.py index ddd74a3b3faa..ad240652c210 100644 --- a/openbb_terminal/stocks/comparison_analysis/finnhub_model.py +++ b/openbb_terminal/stocks/comparison_analysis/finnhub_model.py @@ -4,10 +4,9 @@ import logging from typing import List -from openbb_terminal.helper_funcs import request - from openbb_terminal import config_terminal as cfg from openbb_terminal.decorators import check_api_key, log_start_end +from openbb_terminal.helper_funcs import request from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/comparison_analysis/marketwatch_view.py b/openbb_terminal/stocks/comparison_analysis/marketwatch_view.py index ccf2ba787d38..e08064909d82 100644 --- a/openbb_terminal/stocks/comparison_analysis/marketwatch_view.py +++ b/openbb_terminal/stocks/comparison_analysis/marketwatch_view.py @@ -1,11 +1,12 @@ """ Comparison Analysis Marketwatch View """ __docformat__ = "numpy" -from datetime import datetime import logging import os +from datetime import datetime from typing import List +from openbb_terminal import rich_config from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, @@ -14,7 +15,6 @@ print_rich_table, ) from openbb_terminal.stocks.comparison_analysis import marketwatch_model -from openbb_terminal import rich_config logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/comparison_analysis/polygon_model.py b/openbb_terminal/stocks/comparison_analysis/polygon_model.py index f2d712c1fc75..f2eec683b0e9 100644 --- a/openbb_terminal/stocks/comparison_analysis/polygon_model.py +++ b/openbb_terminal/stocks/comparison_analysis/polygon_model.py @@ -6,8 +6,8 @@ from openbb_terminal import config_terminal as cfg from openbb_terminal.decorators import check_api_key, log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.helper_funcs import request +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/comparison_analysis/sdk_helpers.py b/openbb_terminal/stocks/comparison_analysis/sdk_helpers.py index 7a709b9d4b94..cf618fbcb445 100644 --- a/openbb_terminal/stocks/comparison_analysis/sdk_helpers.py +++ b/openbb_terminal/stocks/comparison_analysis/sdk_helpers.py @@ -3,11 +3,10 @@ from typing import List - from openbb_terminal.stocks.comparison_analysis import ( + finnhub_model, finviz_compare_model, polygon_model, - finnhub_model, yahoo_finance_model, ) diff --git a/openbb_terminal/stocks/comparison_analysis/yahoo_finance_model.py b/openbb_terminal/stocks/comparison_analysis/yahoo_finance_model.py index f7d8b4aee286..3c4b7b1c1280 100644 --- a/openbb_terminal/stocks/comparison_analysis/yahoo_finance_model.py +++ b/openbb_terminal/stocks/comparison_analysis/yahoo_finance_model.py @@ -2,9 +2,9 @@ __docformat__ = "numpy" import logging +import warnings from datetime import datetime, timedelta from typing import List, Optional, Tuple -import warnings import numpy as np import pandas as pd diff --git a/openbb_terminal/stocks/comparison_analysis/yahoo_finance_view.py b/openbb_terminal/stocks/comparison_analysis/yahoo_finance_view.py index 7e2454e0b8b6..39338a785c47 100644 --- a/openbb_terminal/stocks/comparison_analysis/yahoo_finance_view.py +++ b/openbb_terminal/stocks/comparison_analysis/yahoo_finance_view.py @@ -13,13 +13,13 @@ from pandas.plotting import register_matplotlib_converters from sklearn.preprocessing import MinMaxScaler -from openbb_terminal.config_terminal import theme from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, - plot_autoscale, is_valid_axes_count, + plot_autoscale, print_rich_table, ) from openbb_terminal.stocks.comparison_analysis import yahoo_finance_model diff --git a/openbb_terminal/stocks/dark_pool_shorts/dps_controller.py b/openbb_terminal/stocks/dark_pool_shorts/dps_controller.py index 58cb2cca04d6..0a58f5ff4abc 100644 --- a/openbb_terminal/stocks/dark_pool_shorts/dps_controller.py +++ b/openbb_terminal/stocks/dark_pool_shorts/dps_controller.py @@ -8,9 +8,8 @@ import pandas as pd -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_BOTH_RAW_DATA_AND_FIGURES, @@ -21,16 +20,16 @@ ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import StockBaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console from openbb_terminal.stocks.dark_pool_shorts import ( finra_view, + ibkr_view, quandl_view, sec_view, shortinterest_view, stockgrid_view, - yahoofinance_view, - ibkr_view, stocksera_view, + yahoofinance_view, ) logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/dark_pool_shorts/finra_model.py b/openbb_terminal/stocks/dark_pool_shorts/finra_model.py index 65e3bd0d577d..b5d160aa6c1b 100644 --- a/openbb_terminal/stocks/dark_pool_shorts/finra_model.py +++ b/openbb_terminal/stocks/dark_pool_shorts/finra_model.py @@ -9,8 +9,8 @@ from scipy import stats from openbb_terminal.decorators import log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.helper_funcs import request +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/dark_pool_shorts/finra_view.py b/openbb_terminal/stocks/dark_pool_shorts/finra_view.py index cf9bd971b134..643c0ab3b8d4 100644 --- a/openbb_terminal/stocks/dark_pool_shorts/finra_view.py +++ b/openbb_terminal/stocks/dark_pool_shorts/finra_view.py @@ -9,13 +9,13 @@ import pandas as pd from matplotlib import pyplot as plt -from openbb_terminal.config_terminal import theme from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, - plot_autoscale, is_valid_axes_count, + plot_autoscale, ) from openbb_terminal.rich_config import console from openbb_terminal.stocks.dark_pool_shorts import finra_model diff --git a/openbb_terminal/stocks/dark_pool_shorts/ibkr_model.py b/openbb_terminal/stocks/dark_pool_shorts/ibkr_model.py index 24ae7bf8c1cc..f3602d4d97c4 100644 --- a/openbb_terminal/stocks/dark_pool_shorts/ibkr_model.py +++ b/openbb_terminal/stocks/dark_pool_shorts/ibkr_model.py @@ -1,10 +1,10 @@ """ Interactive Broker Model """ __docformat__ = "numpy" -import logging - import ftplib +import logging from io import BytesIO + import pandas as pd from openbb_terminal.decorators import log_start_end diff --git a/openbb_terminal/stocks/dark_pool_shorts/quandl_view.py b/openbb_terminal/stocks/dark_pool_shorts/quandl_view.py index 390a1c91b679..ad9198e543e3 100644 --- a/openbb_terminal/stocks/dark_pool_shorts/quandl_view.py +++ b/openbb_terminal/stocks/dark_pool_shorts/quandl_view.py @@ -9,16 +9,15 @@ import pandas as pd from matplotlib import pyplot as plt -from openbb_terminal.decorators import check_api_key -from openbb_terminal.config_terminal import theme -from openbb_terminal.decorators import log_start_end from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, lambda_long_number_format, - print_rich_table, plot_autoscale, - is_valid_axes_count, + print_rich_table, ) from openbb_terminal.stocks.dark_pool_shorts import quandl_model diff --git a/openbb_terminal/stocks/dark_pool_shorts/sec_view.py b/openbb_terminal/stocks/dark_pool_shorts/sec_view.py index f24272dcddcf..e5e5c3b11767 100644 --- a/openbb_terminal/stocks/dark_pool_shorts/sec_view.py +++ b/openbb_terminal/stocks/dark_pool_shorts/sec_view.py @@ -3,21 +3,21 @@ import logging import os -from typing import List, Optional from datetime import datetime, timedelta +from typing import List, Optional import pandas as pd from matplotlib import pyplot as plt +from openbb_terminal.config_plot import PLOT_DPI from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, - print_rich_table, - plot_autoscale, is_valid_axes_count, + plot_autoscale, + print_rich_table, ) -from openbb_terminal.config_plot import PLOT_DPI from openbb_terminal.stocks import stocks_helper from openbb_terminal.stocks.dark_pool_shorts import sec_model diff --git a/openbb_terminal/stocks/dark_pool_shorts/stockgrid_model.py b/openbb_terminal/stocks/dark_pool_shorts/stockgrid_model.py index 2da010be45fd..840be723f4d9 100644 --- a/openbb_terminal/stocks/dark_pool_shorts/stockgrid_model.py +++ b/openbb_terminal/stocks/dark_pool_shorts/stockgrid_model.py @@ -2,13 +2,13 @@ __docformat__ = "numpy" import logging -from typing import List, Tuple from json import JSONDecodeError +from typing import List, Tuple import pandas as pd -from openbb_terminal.helper_funcs import request from openbb_terminal.decorators import log_start_end +from openbb_terminal.helper_funcs import request logger = logging.getLogger(__name__) # pylint: disable=unsupported-assignment-operation diff --git a/openbb_terminal/stocks/dark_pool_shorts/stockgrid_view.py b/openbb_terminal/stocks/dark_pool_shorts/stockgrid_view.py index 58c949c3018f..653f28aa31cd 100644 --- a/openbb_terminal/stocks/dark_pool_shorts/stockgrid_view.py +++ b/openbb_terminal/stocks/dark_pool_shorts/stockgrid_view.py @@ -8,14 +8,14 @@ import matplotlib.pyplot as plt -from openbb_terminal.config_terminal import theme from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, plot_autoscale, print_rich_table, - is_valid_axes_count, ) from openbb_terminal.rich_config import console from openbb_terminal.stocks.dark_pool_shorts import stockgrid_model diff --git a/openbb_terminal/stocks/dark_pool_shorts/stocksera_model.py b/openbb_terminal/stocks/dark_pool_shorts/stocksera_model.py index 0b4b953f70da..3295af026c68 100644 --- a/openbb_terminal/stocks/dark_pool_shorts/stocksera_model.py +++ b/openbb_terminal/stocks/dark_pool_shorts/stocksera_model.py @@ -3,9 +3,8 @@ import logging -import stocksera import pandas as pd - +import stocksera from stocksera.exceptions import StockseraRequestException from openbb_terminal import config_terminal as cfg diff --git a/openbb_terminal/stocks/dark_pool_shorts/stocksera_view.py b/openbb_terminal/stocks/dark_pool_shorts/stocksera_view.py index 777536b06651..f85a70e92358 100644 --- a/openbb_terminal/stocks/dark_pool_shorts/stocksera_view.py +++ b/openbb_terminal/stocks/dark_pool_shorts/stocksera_view.py @@ -9,19 +9,18 @@ import pandas as pd from matplotlib import pyplot as plt -from openbb_terminal.decorators import check_api_key -from openbb_terminal.config_terminal import theme -from openbb_terminal.decorators import log_start_end from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, lambda_long_number_format, - print_rich_table, plot_autoscale, - is_valid_axes_count, + print_rich_table, ) -from openbb_terminal.stocks.dark_pool_shorts import stocksera_model from openbb_terminal.rich_config import console +from openbb_terminal.stocks.dark_pool_shorts import stocksera_model logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/discovery/ark_view.py b/openbb_terminal/stocks/discovery/ark_view.py index 9388c39c3283..28d59700c296 100644 --- a/openbb_terminal/stocks/discovery/ark_view.py +++ b/openbb_terminal/stocks/discovery/ark_view.py @@ -4,10 +4,10 @@ import logging import os +from openbb_terminal import rich_config from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import export_data, print_rich_table from openbb_terminal.stocks.discovery import ark_model -from openbb_terminal import rich_config logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/discovery/disc_controller.py b/openbb_terminal/stocks/discovery/disc_controller.py index 5d73d1f106bd..a7a1a48137a6 100644 --- a/openbb_terminal/stocks/discovery/disc_controller.py +++ b/openbb_terminal/stocks/discovery/disc_controller.py @@ -6,9 +6,8 @@ from datetime import datetime from typing import List -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_ONLY_RAW_DATA_ALLOWED, @@ -20,17 +19,17 @@ ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController +from openbb_terminal.rich_config import MenuText, console +from openbb_terminal.stocks import stocks_helper from openbb_terminal.stocks.discovery import ( ark_view, finnhub_view, + finviz_view, nasdaq_view, seeking_alpha_view, shortinterest_view, yahoofinance_view, - finviz_view, ) -from openbb_terminal.stocks import stocks_helper -from openbb_terminal.rich_config import console, MenuText # pylint:disable=C0302 diff --git a/openbb_terminal/stocks/discovery/disc_helpers.py b/openbb_terminal/stocks/discovery/disc_helpers.py index 8adac7fde4ba..fc1f8340dd85 100644 --- a/openbb_terminal/stocks/discovery/disc_helpers.py +++ b/openbb_terminal/stocks/discovery/disc_helpers.py @@ -1,5 +1,7 @@ import re + import pandas as pd + from openbb_terminal.helper_funcs import get_user_agent, request diff --git a/openbb_terminal/stocks/discovery/fidelity_view.py b/openbb_terminal/stocks/discovery/fidelity_view.py index ff9c0c3d79d9..1fbf45675627 100644 --- a/openbb_terminal/stocks/discovery/fidelity_view.py +++ b/openbb_terminal/stocks/discovery/fidelity_view.py @@ -7,10 +7,10 @@ import pandas as pd +from openbb_terminal import rich_config from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import export_data, print_rich_table from openbb_terminal.stocks.discovery import fidelity_model -from openbb_terminal import rich_config logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/discovery/finnhub_model.py b/openbb_terminal/stocks/discovery/finnhub_model.py index d30816e259fd..7bedf5ac60b0 100644 --- a/openbb_terminal/stocks/discovery/finnhub_model.py +++ b/openbb_terminal/stocks/discovery/finnhub_model.py @@ -6,8 +6,8 @@ from openbb_terminal import config_terminal as cfg from openbb_terminal.decorators import check_api_key, log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.helper_funcs import request +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/discovery/finnhub_view.py b/openbb_terminal/stocks/discovery/finnhub_view.py index eb07e56ff41c..8e704c4646f7 100644 --- a/openbb_terminal/stocks/discovery/finnhub_view.py +++ b/openbb_terminal/stocks/discovery/finnhub_view.py @@ -2,8 +2,7 @@ import os from typing import Optional -from openbb_terminal.decorators import log_start_end -from openbb_terminal.decorators import check_api_key +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import export_data, print_rich_table from openbb_terminal.stocks.discovery import finnhub_model diff --git a/openbb_terminal/stocks/discovery/finviz_model.py b/openbb_terminal/stocks/discovery/finviz_model.py index d23489219a35..af74f343df21 100644 --- a/openbb_terminal/stocks/discovery/finviz_model.py +++ b/openbb_terminal/stocks/discovery/finviz_model.py @@ -2,6 +2,7 @@ __docformat__ = "numpy" import pandas as pd + from openbb_terminal.helper_funcs import get_user_agent, request from openbb_terminal.rich_config import console diff --git a/openbb_terminal/stocks/discovery/finviz_view.py b/openbb_terminal/stocks/discovery/finviz_view.py index c1fc65669dfa..d61c20db341b 100644 --- a/openbb_terminal/stocks/discovery/finviz_view.py +++ b/openbb_terminal/stocks/discovery/finviz_view.py @@ -3,13 +3,13 @@ import os from typing import Optional -import pandas as pd +import pandas as pd import plotly.express as px from plotly.subplots import make_subplots -from openbb_terminal.stocks.discovery import finviz_model from openbb_terminal.helper_funcs import export_data +from openbb_terminal.stocks.discovery import finviz_model def display_heatmap(timeframe: str, export: str = "", sheet_name: Optional[str] = ""): diff --git a/openbb_terminal/stocks/discovery/nasdaq_model.py b/openbb_terminal/stocks/discovery/nasdaq_model.py index d2e7ed4cfc12..77aeed0c850d 100644 --- a/openbb_terminal/stocks/discovery/nasdaq_model.py +++ b/openbb_terminal/stocks/discovery/nasdaq_model.py @@ -1,8 +1,8 @@ """NASDAQ DataLink Model""" __docformat__ = "numpy" -from datetime import datetime import logging +from datetime import datetime import pandas as pd import requests @@ -12,7 +12,6 @@ from openbb_terminal.helper_funcs import get_user_agent, request from openbb_terminal.rich_config import console - logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/discovery/nasdaq_view.py b/openbb_terminal/stocks/discovery/nasdaq_view.py index 49f0eb0307c5..739b3f8c4a2f 100644 --- a/openbb_terminal/stocks/discovery/nasdaq_view.py +++ b/openbb_terminal/stocks/discovery/nasdaq_view.py @@ -1,15 +1,14 @@ """NASDAQ DataLink View""" __docformat__ = "numpy" -from datetime import datetime import logging import os +from datetime import datetime -from openbb_terminal.decorators import log_start_end +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import export_data, print_rich_table from openbb_terminal.rich_config import console from openbb_terminal.stocks.discovery import nasdaq_model -from openbb_terminal.decorators import check_api_key # pylint: disable=E1123 diff --git a/openbb_terminal/stocks/discovery/shortinterest_view.py b/openbb_terminal/stocks/discovery/shortinterest_view.py index 2a83ae6ea464..4e4b006c26c1 100644 --- a/openbb_terminal/stocks/discovery/shortinterest_view.py +++ b/openbb_terminal/stocks/discovery/shortinterest_view.py @@ -7,8 +7,7 @@ from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import export_data, print_rich_table from openbb_terminal.rich_config import console -from openbb_terminal.stocks.discovery import shortinterest_model -from openbb_terminal.stocks.discovery import yahoofinance_model +from openbb_terminal.stocks.discovery import shortinterest_model, yahoofinance_model logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/discovery/yahoofinance_model.py b/openbb_terminal/stocks/discovery/yahoofinance_model.py index 7cf5ac3b7209..c8b210723daf 100644 --- a/openbb_terminal/stocks/discovery/yahoofinance_model.py +++ b/openbb_terminal/stocks/discovery/yahoofinance_model.py @@ -6,8 +6,8 @@ import pandas as pd from openbb_terminal.decorators import log_start_end -from openbb_terminal.stocks.discovery.disc_helpers import get_df from openbb_terminal.rich_config import console +from openbb_terminal.stocks.discovery.disc_helpers import get_df logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/due_diligence/business_insider_view.py b/openbb_terminal/stocks/due_diligence/business_insider_view.py index c72e3bdb1785..1f84b41f51f9 100644 --- a/openbb_terminal/stocks/due_diligence/business_insider_view.py +++ b/openbb_terminal/stocks/due_diligence/business_insider_view.py @@ -10,14 +10,14 @@ from pandas.core.frame import DataFrame from pandas.plotting import register_matplotlib_converters -from openbb_terminal.config_terminal import theme from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, plot_autoscale, print_rich_table, - is_valid_axes_count, ) from openbb_terminal.rich_config import console from openbb_terminal.stocks.due_diligence import business_insider_model diff --git a/openbb_terminal/stocks/due_diligence/dd_controller.py b/openbb_terminal/stocks/due_diligence/dd_controller.py index e59faa9102e8..96101aaf64e8 100644 --- a/openbb_terminal/stocks/due_diligence/dd_controller.py +++ b/openbb_terminal/stocks/due_diligence/dd_controller.py @@ -7,9 +7,8 @@ from pandas.core.frame import DataFrame -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_BOTH_RAW_DATA_AND_FIGURES, @@ -18,7 +17,7 @@ ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import StockBaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console from openbb_terminal.stocks.due_diligence import ( ark_view, business_insider_view, diff --git a/openbb_terminal/stocks/due_diligence/finnhub_model.py b/openbb_terminal/stocks/due_diligence/finnhub_model.py index db70551436a0..a7d70972ce94 100644 --- a/openbb_terminal/stocks/due_diligence/finnhub_model.py +++ b/openbb_terminal/stocks/due_diligence/finnhub_model.py @@ -7,8 +7,8 @@ from openbb_terminal import config_terminal as cfg from openbb_terminal.decorators import check_api_key, log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.helper_funcs import request +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/due_diligence/finnhub_view.py b/openbb_terminal/stocks/due_diligence/finnhub_view.py index a9f764ae248b..cf89f26c19aa 100644 --- a/openbb_terminal/stocks/due_diligence/finnhub_view.py +++ b/openbb_terminal/stocks/due_diligence/finnhub_view.py @@ -9,15 +9,14 @@ from matplotlib import pyplot as plt from pandas.plotting import register_matplotlib_converters -from openbb_terminal.decorators import check_api_key -from openbb_terminal.config_terminal import theme from openbb_terminal.config_plot import PLOT_DPI -from openbb_terminal.decorators import log_start_end +from openbb_terminal.config_terminal import theme +from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, plot_autoscale, print_rich_table, - is_valid_axes_count, ) from openbb_terminal.stocks.due_diligence import finnhub_model diff --git a/openbb_terminal/stocks/due_diligence/finviz_view.py b/openbb_terminal/stocks/due_diligence/finviz_view.py index 89b236fc5f00..231667f46ee8 100644 --- a/openbb_terminal/stocks/due_diligence/finviz_view.py +++ b/openbb_terminal/stocks/due_diligence/finviz_view.py @@ -5,11 +5,11 @@ import os from typing import Any, List +from openbb_terminal import rich_config from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import export_data, print_rich_table from openbb_terminal.rich_config import console from openbb_terminal.stocks.due_diligence import finviz_model -from openbb_terminal import rich_config logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/due_diligence/fmp_view.py b/openbb_terminal/stocks/due_diligence/fmp_view.py index 41801cc7f2e6..fcbcb68eecfc 100644 --- a/openbb_terminal/stocks/due_diligence/fmp_view.py +++ b/openbb_terminal/stocks/due_diligence/fmp_view.py @@ -3,6 +3,7 @@ import logging import os + import pandas as pd from openbb_terminal.decorators import log_start_end diff --git a/openbb_terminal/stocks/fundamental_analysis/av_model.py b/openbb_terminal/stocks/fundamental_analysis/av_model.py index 5c9caafff153..20391692bade 100644 --- a/openbb_terminal/stocks/fundamental_analysis/av_model.py +++ b/openbb_terminal/stocks/fundamental_analysis/av_model.py @@ -6,15 +6,15 @@ import numpy as np import pandas as pd - from alpha_vantage.fundamentaldata import FundamentalData + from openbb_terminal import config_terminal as cfg from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import lambda_long_number_format, request 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 +from openbb_terminal.stocks.stocks_helper import clean_fraction logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/fundamental_analysis/av_view.py b/openbb_terminal/stocks/fundamental_analysis/av_view.py index 62958559245d..13bbe57a84e0 100644 --- a/openbb_terminal/stocks/fundamental_analysis/av_view.py +++ b/openbb_terminal/stocks/fundamental_analysis/av_view.py @@ -6,21 +6,20 @@ from typing import List, Optional from matplotlib import pyplot as plt -from openbb_terminal.config_terminal import theme + from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import ( - export_data, - print_rich_table, - plot_autoscale, camel_case_split, + export_data, is_valid_axes_count, + plot_autoscale, + print_rich_table, ) +from openbb_terminal.helpers_denomination import transform as transform_by_denomination from openbb_terminal.rich_config import console from openbb_terminal.stocks.fundamental_analysis import av_model -from openbb_terminal.helpers_denomination import ( - transform as transform_by_denomination, -) logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/fundamental_analysis/dcf_model.py b/openbb_terminal/stocks/fundamental_analysis/dcf_model.py index 4fb404c1c113..9b7cef57ea59 100644 --- a/openbb_terminal/stocks/fundamental_analysis/dcf_model.py +++ b/openbb_terminal/stocks/fundamental_analysis/dcf_model.py @@ -17,9 +17,9 @@ from sklearn.linear_model import LinearRegression from openbb_terminal.decorators import log_start_end -from openbb_terminal.stocks.fundamental_analysis import dcf_static from openbb_terminal.helper_funcs import compose_export_path, request from openbb_terminal.rich_config import console +from openbb_terminal.stocks.fundamental_analysis import dcf_static logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/fundamental_analysis/dcf_static.py b/openbb_terminal/stocks/fundamental_analysis/dcf_static.py index a10dae139ae3..8642d4e9d6c6 100644 --- a/openbb_terminal/stocks/fundamental_analysis/dcf_static.py +++ b/openbb_terminal/stocks/fundamental_analysis/dcf_static.py @@ -2,7 +2,8 @@ __docformat__ = "numpy" from typing import Dict, List -from openpyxl.styles import Border, Side, Font, PatternFill, Alignment +from openpyxl.styles import Alignment, Border, Font, PatternFill, Side + from openbb_terminal.helper_funcs import excel_columns, get_user_agent letters = excel_columns() diff --git a/openbb_terminal/stocks/fundamental_analysis/eclect_us_view.py b/openbb_terminal/stocks/fundamental_analysis/eclect_us_view.py index 423469acc5e4..1740838dffa8 100644 --- a/openbb_terminal/stocks/fundamental_analysis/eclect_us_view.py +++ b/openbb_terminal/stocks/fundamental_analysis/eclect_us_view.py @@ -5,9 +5,9 @@ import os from openbb_terminal.decorators import log_start_end +from openbb_terminal.helper_funcs import export_data, print_rich_table from openbb_terminal.rich_config import console from openbb_terminal.stocks.fundamental_analysis import eclect_us_model -from openbb_terminal.helper_funcs import print_rich_table, export_data logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/fundamental_analysis/eodhd_model.py b/openbb_terminal/stocks/fundamental_analysis/eodhd_model.py index 01569536fb5d..cc535867251f 100644 --- a/openbb_terminal/stocks/fundamental_analysis/eodhd_model.py +++ b/openbb_terminal/stocks/fundamental_analysis/eodhd_model.py @@ -3,13 +3,13 @@ import logging -import pandas as pd import numpy as np +import pandas as pd from openbb_terminal import config_terminal as cfg from openbb_terminal.decorators import check_api_key, log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.helper_funcs import request +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/fundamental_analysis/eodhd_view.py b/openbb_terminal/stocks/fundamental_analysis/eodhd_view.py index 64779cfb4ac2..f6bd25fd6389 100644 --- a/openbb_terminal/stocks/fundamental_analysis/eodhd_view.py +++ b/openbb_terminal/stocks/fundamental_analysis/eodhd_view.py @@ -5,14 +5,14 @@ import matplotlib.pyplot as plt -from openbb_terminal.config_terminal import theme from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import ( export_data, lambda_long_number_format, - print_rich_table, plot_autoscale, + print_rich_table, ) from openbb_terminal.stocks.fundamental_analysis import eodhd_model diff --git a/openbb_terminal/stocks/fundamental_analysis/fa_controller.py b/openbb_terminal/stocks/fundamental_analysis/fa_controller.py index 8d33a88f15e7..1bc33ddad220 100644 --- a/openbb_terminal/stocks/fundamental_analysis/fa_controller.py +++ b/openbb_terminal/stocks/fundamental_analysis/fa_controller.py @@ -5,33 +5,32 @@ from datetime import datetime, timedelta from typing import List -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_BOTH_RAW_DATA_AND_FIGURES, EXPORT_ONLY_RAW_DATA_ALLOWED, check_positive, - valid_date, list_from_str, + valid_date, ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import StockBaseController -from openbb_terminal.rich_config import console, MenuText, get_ordered_list_sources +from openbb_terminal.rich_config import MenuText, console, get_ordered_list_sources from openbb_terminal.stocks import stocks_helper from openbb_terminal.stocks.fundamental_analysis import ( av_view, business_insider_view, dcf_view, eclect_us_view, + eodhd_view, finviz_view, + fmp_view, market_watch_view, - yahoo_finance_view, polygon_view, - fmp_view, - eodhd_view, seeking_alpha_view, + yahoo_finance_view, ) # pylint: disable=inconsistent-return-statements,C0302,R0904 diff --git a/openbb_terminal/stocks/fundamental_analysis/fmp_model.py b/openbb_terminal/stocks/fundamental_analysis/fmp_model.py index 79c95c067c06..7a121365efd9 100644 --- a/openbb_terminal/stocks/fundamental_analysis/fmp_model.py +++ b/openbb_terminal/stocks/fundamental_analysis/fmp_model.py @@ -1,21 +1,20 @@ """ Financial Modeling Prep Model""" __docformat__ = "numpy" import logging -from typing import Optional - -from datetime import datetime import warnings -from requests.exceptions import HTTPError +from datetime import datetime +from typing import Optional import fundamentalanalysis as fa # Financial Modeling Prep import numpy as np import pandas as pd import valinvest +from requests.exceptions import HTTPError -from openbb_terminal.rich_config import console from openbb_terminal import config_terminal as cfg from openbb_terminal.decorators import check_api_key, 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.fa_helper import clean_df_index logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/fundamental_analysis/fmp_view.py b/openbb_terminal/stocks/fundamental_analysis/fmp_view.py index f8dfd4cd78e4..4d43ec38a350 100644 --- a/openbb_terminal/stocks/fundamental_analysis/fmp_view.py +++ b/openbb_terminal/stocks/fundamental_analysis/fmp_view.py @@ -1,23 +1,20 @@ """ Financial Modeling Prep View """ __docformat__ = "numpy" +import datetime import logging import os -import datetime import matplotlib.pyplot as plt import pandas as pd -from openbb_terminal.config_terminal import theme from openbb_terminal.config_plot import PLOT_DPI -from openbb_terminal.decorators import check_api_key -from openbb_terminal.decorators import log_start_end -from openbb_terminal.helper_funcs import export_data, print_rich_table, plot_autoscale +from openbb_terminal.config_terminal import theme +from openbb_terminal.decorators import check_api_key, log_start_end +from openbb_terminal.helper_funcs import export_data, plot_autoscale, print_rich_table +from openbb_terminal.helpers_denomination import transform as transform_by_denomination from openbb_terminal.rich_config import console from openbb_terminal.stocks.fundamental_analysis import fmp_model -from openbb_terminal.helpers_denomination import ( - transform as transform_by_denomination, -) logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/fundamental_analysis/market_watch_model.py b/openbb_terminal/stocks/fundamental_analysis/market_watch_model.py index 94387989ccbe..9f752d61648c 100644 --- a/openbb_terminal/stocks/fundamental_analysis/market_watch_model.py +++ b/openbb_terminal/stocks/fundamental_analysis/market_watch_model.py @@ -11,8 +11,8 @@ from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( - lambda_clean_data_values_to_float, get_user_agent, + lambda_clean_data_values_to_float, lambda_int_or_round_float, request, ) diff --git a/openbb_terminal/stocks/fundamental_analysis/polygon_model.py b/openbb_terminal/stocks/fundamental_analysis/polygon_model.py index ef72b8b5d191..2278c11bd3f5 100644 --- a/openbb_terminal/stocks/fundamental_analysis/polygon_model.py +++ b/openbb_terminal/stocks/fundamental_analysis/polygon_model.py @@ -7,8 +7,8 @@ from openbb_terminal import config_terminal as cfg from openbb_terminal.decorators import check_api_key, log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.helper_funcs import request +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/fundamental_analysis/polygon_view.py b/openbb_terminal/stocks/fundamental_analysis/polygon_view.py index b9042e180d12..0fd4722563b8 100644 --- a/openbb_terminal/stocks/fundamental_analysis/polygon_view.py +++ b/openbb_terminal/stocks/fundamental_analysis/polygon_view.py @@ -5,19 +5,17 @@ import matplotlib.pyplot as plt -from openbb_terminal.config_terminal import theme from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.helper_funcs import ( export_data, lambda_long_number_format, - print_rich_table, plot_autoscale, + print_rich_table, ) +from openbb_terminal.helpers_denomination import transform as transform_by_denomination from openbb_terminal.stocks.fundamental_analysis import polygon_model -from openbb_terminal.helpers_denomination import ( - transform as transform_by_denomination, -) logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/fundamental_analysis/sdk_helpers.py b/openbb_terminal/stocks/fundamental_analysis/sdk_helpers.py index 9c314b127da2..911756bf15be 100644 --- a/openbb_terminal/stocks/fundamental_analysis/sdk_helpers.py +++ b/openbb_terminal/stocks/fundamental_analysis/sdk_helpers.py @@ -2,12 +2,13 @@ __docformat__ = "numpy" import pandas as pd + from openbb_terminal.stocks.fundamental_analysis import ( - yahoo_finance_model, - polygon_model, av_model, - fmp_model, eodhd_model, + fmp_model, + polygon_model, + yahoo_finance_model, ) diff --git a/openbb_terminal/stocks/fundamental_analysis/seeking_alpha_model.py b/openbb_terminal/stocks/fundamental_analysis/seeking_alpha_model.py index 7f3e2c9ce765..848ba0e30ae4 100644 --- a/openbb_terminal/stocks/fundamental_analysis/seeking_alpha_model.py +++ b/openbb_terminal/stocks/fundamental_analysis/seeking_alpha_model.py @@ -2,8 +2,9 @@ __docformat__ = "numpy" import logging -import requests + import pandas as pd +import requests from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import lambda_long_number_format diff --git a/openbb_terminal/stocks/fundamental_analysis/seeking_alpha_view.py b/openbb_terminal/stocks/fundamental_analysis/seeking_alpha_view.py index 2c2ba5dc075d..8ce3699dafca 100644 --- a/openbb_terminal/stocks/fundamental_analysis/seeking_alpha_view.py +++ b/openbb_terminal/stocks/fundamental_analysis/seeking_alpha_view.py @@ -3,13 +3,12 @@ import logging - from openbb_terminal.decorators import log_start_end -from openbb_terminal.rich_config import console -from openbb_terminal.stocks.fundamental_analysis import seeking_alpha_model from openbb_terminal.helper_funcs import ( print_rich_table, ) +from openbb_terminal.rich_config import console +from openbb_terminal.stocks.fundamental_analysis import seeking_alpha_model logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/fundamental_analysis/yahoo_finance_view.py b/openbb_terminal/stocks/fundamental_analysis/yahoo_finance_view.py index f1b1bb3f9941..1506ee3f99a8 100644 --- a/openbb_terminal/stocks/fundamental_analysis/yahoo_finance_view.py +++ b/openbb_terminal/stocks/fundamental_analysis/yahoo_finance_view.py @@ -4,30 +4,27 @@ import logging import os import webbrowser -from typing import List, Optional from fractions import Fraction +from typing import List, Optional -import yfinance as yf -import matplotlib.pyplot as plt import matplotlib.dates as mdates +import matplotlib.pyplot as plt import pandas as pd +import yfinance as yf -from openbb_terminal.config_terminal import theme from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, - plot_autoscale, - print_rich_table, is_valid_axes_count, lambda_long_number_format, + plot_autoscale, + print_rich_table, ) +from openbb_terminal.helpers_denomination import transform as transform_by_denomination from openbb_terminal.rich_config import console from openbb_terminal.stocks.fundamental_analysis import yahoo_finance_model -from openbb_terminal.helpers_denomination import ( - transform as transform_by_denomination, -) - logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/government/gov_controller.py b/openbb_terminal/stocks/government/gov_controller.py index 99fee55692a3..3ef16f2db79d 100644 --- a/openbb_terminal/stocks/government/gov_controller.py +++ b/openbb_terminal/stocks/government/gov_controller.py @@ -5,9 +5,8 @@ import logging from typing import List -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_BOTH_RAW_DATA_AND_FIGURES, @@ -16,7 +15,7 @@ ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import StockBaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console from openbb_terminal.stocks.government import quiverquant_view logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/government/quiverquant_model.py b/openbb_terminal/stocks/government/quiverquant_model.py index 739ae2e006ab..d7cbd2c2be0d 100644 --- a/openbb_terminal/stocks/government/quiverquant_model.py +++ b/openbb_terminal/stocks/government/quiverquant_model.py @@ -11,8 +11,8 @@ from sklearn.linear_model import LinearRegression from openbb_terminal.decorators import log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.helper_funcs import request +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/government/quiverquant_view.py b/openbb_terminal/stocks/government/quiverquant_view.py index 86dff2b28631..772c42f3b4bd 100644 --- a/openbb_terminal/stocks/government/quiverquant_view.py +++ b/openbb_terminal/stocks/government/quiverquant_view.py @@ -5,19 +5,19 @@ import os from typing import List, Optional +import matplotlib import numpy as np import pandas as pd from matplotlib import pyplot as plt -import matplotlib -from openbb_terminal.config_terminal import theme from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, plot_autoscale, print_rich_table, - is_valid_axes_count, ) from openbb_terminal.rich_config import console from openbb_terminal.stocks.government import quiverquant_model diff --git a/openbb_terminal/stocks/options/alphaquery_model.py b/openbb_terminal/stocks/options/alphaquery_model.py index a9292d952393..5c5537d79827 100644 --- a/openbb_terminal/stocks/options/alphaquery_model.py +++ b/openbb_terminal/stocks/options/alphaquery_model.py @@ -7,8 +7,8 @@ import pandas as pd -from openbb_terminal.helper_funcs import request from openbb_terminal.decorators import log_start_end +from openbb_terminal.helper_funcs import request logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/options/hedge/hedge_controller.py b/openbb_terminal/stocks/options/hedge/hedge_controller.py index 5c4604263b22..65d49508cab7 100644 --- a/openbb_terminal/stocks/options/hedge/hedge_controller.py +++ b/openbb_terminal/stocks/options/hedge/hedge_controller.py @@ -15,11 +15,11 @@ from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController from openbb_terminal.rich_config import MenuText, console +from openbb_terminal.stocks import stocks_helper from openbb_terminal.stocks.options.hedge import hedge_view from openbb_terminal.stocks.options.hedge.hedge_model import add_hedge_option from openbb_terminal.stocks.options.yfinance_model import get_option_chain, get_price from openbb_terminal.stocks.options.yfinance_view import plot_payoff -from openbb_terminal.stocks import stocks_helper # pylint: disable=R0902 diff --git a/openbb_terminal/stocks/options/nasdaq_model.py b/openbb_terminal/stocks/options/nasdaq_model.py index b233483ddd0c..85a37894dca1 100644 --- a/openbb_terminal/stocks/options/nasdaq_model.py +++ b/openbb_terminal/stocks/options/nasdaq_model.py @@ -9,8 +9,8 @@ import pandas as pd from openbb_terminal.decorators import log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.helper_funcs import request +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) # pylint: disable=unsupported-assignment-operation diff --git a/openbb_terminal/stocks/options/op_helpers.py b/openbb_terminal/stocks/options/op_helpers.py index 6cf4d29c71d8..0e44acd73dfe 100644 --- a/openbb_terminal/stocks/options/op_helpers.py +++ b/openbb_terminal/stocks/options/op_helpers.py @@ -1,18 +1,18 @@ """Option helper functions""" __docformat__ = "numpy" -from datetime import datetime, timedelta import logging +from datetime import datetime, timedelta from math import e, log -from typing import Union, Tuple +from typing import Tuple, Union import numpy as np import pandas as pd from scipy.stats import norm -from openbb_terminal.rich_config import console from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import get_rf +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/options/options_controller.py b/openbb_terminal/stocks/options/options_controller.py index 04a0eeaf51d6..b68e1c5ee6fa 100644 --- a/openbb_terminal/stocks/options/options_controller.py +++ b/openbb_terminal/stocks/options/options_controller.py @@ -16,9 +16,9 @@ EXPORT_BOTH_RAW_DATA_AND_FIGURES, EXPORT_ONLY_FIGURES_ALLOWED, EXPORT_ONLY_RAW_DATA_ALLOWED, + list_from_str, parse_and_split_input, valid_date, - list_from_str, ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController @@ -37,19 +37,19 @@ yfinance_view, ) from openbb_terminal.stocks.options.hedge import hedge_controller +from openbb_terminal.stocks.options.options_view import ( + display_chains, + display_expiry_dates, + plot_oi, + plot_voi, + plot_vol, +) from openbb_terminal.stocks.options.pricing import pricing_controller from openbb_terminal.stocks.options.screen import ( screener_controller, syncretism_model, syncretism_view, ) -from openbb_terminal.stocks.options.options_view import ( - plot_vol, - plot_oi, - plot_voi, - display_expiry_dates, - display_chains, -) # pylint: disable=R1710,C0302,R0916,R0902 diff --git a/openbb_terminal/stocks/options/options_sdk_helper.py b/openbb_terminal/stocks/options/options_sdk_helper.py index 2a87e96f6982..5f95d0358ede 100644 --- a/openbb_terminal/stocks/options/options_sdk_helper.py +++ b/openbb_terminal/stocks/options/options_sdk_helper.py @@ -9,9 +9,9 @@ from openbb_terminal.stocks.options import ( chartexchange_model, nasdaq_model, + op_helpers, tradier_model, yfinance_model, - op_helpers, ) logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/options/options_view.py b/openbb_terminal/stocks/options/options_view.py index 9d9db4405bc0..f692bca28816 100644 --- a/openbb_terminal/stocks/options/options_view.py +++ b/openbb_terminal/stocks/options/options_view.py @@ -4,24 +4,25 @@ # IMPORTATION THIRDPARTY from typing import List, Optional, Tuple + import matplotlib.pyplot as plt import pandas as pd # IMPORTATION INTERNAL import openbb_terminal.config_plot as cfp from openbb_terminal.config_terminal import theme -from openbb_terminal.rich_config import console from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( + export_data, is_valid_axes_count, plot_autoscale, print_rich_table, - export_data, ) +from openbb_terminal.rich_config import console from openbb_terminal.stocks.options.op_helpers import ( calculate_max_pain, - get_strikes, get_greeks, + get_strikes, ) logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/options/screen/syncretism_model.py b/openbb_terminal/stocks/options/screen/syncretism_model.py index 2a2dbce120ba..d2b635866348 100644 --- a/openbb_terminal/stocks/options/screen/syncretism_model.py +++ b/openbb_terminal/stocks/options/screen/syncretism_model.py @@ -9,9 +9,9 @@ import pandas as pd import yfinance as yf -from openbb_terminal.helper_funcs import request from openbb_terminal.core.config.paths import USER_PRESETS_DIRECTORY from openbb_terminal.decorators import log_start_end +from openbb_terminal.helper_funcs import request from openbb_terminal.rich_config import console from openbb_terminal.stocks.options import yfinance_model diff --git a/openbb_terminal/stocks/options/tradier_model.py b/openbb_terminal/stocks/options/tradier_model.py index 8c932be1c67e..dd04d7c3d615 100644 --- a/openbb_terminal/stocks/options/tradier_model.py +++ b/openbb_terminal/stocks/options/tradier_model.py @@ -10,8 +10,8 @@ from openbb_terminal import config_terminal as cfg from openbb_terminal.decorators import check_api_key, log_start_end -from openbb_terminal.rich_config import console from openbb_terminal.helper_funcs import request +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/quantitative_analysis/beta_model.py b/openbb_terminal/stocks/quantitative_analysis/beta_model.py index 8784c0208a8d..2fef77c65f1a 100644 --- a/openbb_terminal/stocks/quantitative_analysis/beta_model.py +++ b/openbb_terminal/stocks/quantitative_analysis/beta_model.py @@ -5,6 +5,7 @@ import pandas as pd from scipy import stats + from openbb_terminal.stocks import stocks_helper diff --git a/openbb_terminal/stocks/quantitative_analysis/beta_view.py b/openbb_terminal/stocks/quantitative_analysis/beta_view.py index df686a17e58e..4f3eaff0d961 100644 --- a/openbb_terminal/stocks/quantitative_analysis/beta_view.py +++ b/openbb_terminal/stocks/quantitative_analysis/beta_view.py @@ -6,10 +6,11 @@ import matplotlib.pyplot as plt import pandas as pd + from openbb_terminal.decorators import log_start_end +from openbb_terminal.helper_funcs import export_data from openbb_terminal.rich_config import console from openbb_terminal.stocks.quantitative_analysis.beta_model import beta_model -from openbb_terminal.helper_funcs import export_data logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/quantitative_analysis/qa_controller.py b/openbb_terminal/stocks/quantitative_analysis/qa_controller.py index 432be0dadf77..b3be672a11ae 100644 --- a/openbb_terminal/stocks/quantitative_analysis/qa_controller.py +++ b/openbb_terminal/stocks/quantitative_analysis/qa_controller.py @@ -8,25 +8,24 @@ import pandas as pd -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff from openbb_terminal.common.quantitative_analysis import qa_view, rolling_view +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_ONLY_FIGURES_ALLOWED, EXPORT_ONLY_RAW_DATA_ALLOWED, + check_list_dates, check_positive, check_proportion_range, - check_list_dates, ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import StockBaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console +from openbb_terminal.stocks import stocks_helper from openbb_terminal.stocks.quantitative_analysis.beta_view import beta_view from openbb_terminal.stocks.quantitative_analysis.factors_view import capm_view from openbb_terminal.stocks.quantitative_analysis.qa_model import full_stock_df -from openbb_terminal.stocks import stocks_helper # pylint: disable=C0302 diff --git a/openbb_terminal/stocks/quantitative_analysis/qa_model.py b/openbb_terminal/stocks/quantitative_analysis/qa_model.py index 8f084978e431..86dfdb4988da 100644 --- a/openbb_terminal/stocks/quantitative_analysis/qa_model.py +++ b/openbb_terminal/stocks/quantitative_analysis/qa_model.py @@ -1,5 +1,5 @@ -import pandas as pd import numpy as np +import pandas as pd pd.options.mode.chained_assignment = None diff --git a/openbb_terminal/stocks/research/res_controller.py b/openbb_terminal/stocks/research/res_controller.py index 18a8259ff23f..9e580eb2efc1 100644 --- a/openbb_terminal/stocks/research/res_controller.py +++ b/openbb_terminal/stocks/research/res_controller.py @@ -6,13 +6,12 @@ from datetime import datetime from typing import List -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/screener/finviz_model.py b/openbb_terminal/stocks/screener/finviz_model.py index 60112cd554bf..a10c5f44b201 100644 --- a/openbb_terminal/stocks/screener/finviz_model.py +++ b/openbb_terminal/stocks/screener/finviz_model.py @@ -11,11 +11,11 @@ valuation, ) -from openbb_terminal.decorators import log_start_end from openbb_terminal.core.config.paths import ( - USER_PRESETS_DIRECTORY, MISCELLANEOUS_DIRECTORY, + USER_PRESETS_DIRECTORY, ) +from openbb_terminal.decorators import log_start_end from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/screener/finviz_view.py b/openbb_terminal/stocks/screener/finviz_view.py index 54e5e8b35e43..57554fbbb065 100644 --- a/openbb_terminal/stocks/screener/finviz_view.py +++ b/openbb_terminal/stocks/screener/finviz_view.py @@ -11,12 +11,12 @@ from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, - print_rich_table, lambda_long_number_format, + print_rich_table, ) -from openbb_terminal.terminal_helper import suppress_stdout from openbb_terminal.rich_config import console from openbb_terminal.stocks.screener.finviz_model import get_screener_data +from openbb_terminal.terminal_helper import suppress_stdout logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/screener/screener_controller.py b/openbb_terminal/stocks/screener/screener_controller.py index 5b8964addd99..288e004dbe4a 100644 --- a/openbb_terminal/stocks/screener/screener_controller.py +++ b/openbb_terminal/stocks/screener/screener_controller.py @@ -6,31 +6,30 @@ import logging from typing import List -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff from openbb_terminal.core.config.paths import ( - USER_PRESETS_DIRECTORY, MISCELLANEOUS_DIRECTORY, + USER_PRESETS_DIRECTORY, ) +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_BOTH_RAW_DATA_AND_FIGURES, EXPORT_ONLY_RAW_DATA_ALLOWED, check_positive, - valid_date, parse_and_split_input, + valid_date, ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console from openbb_terminal.stocks.comparison_analysis import ca_controller from openbb_terminal.stocks.screener import ( finviz_model, finviz_view, - yahoofinance_view, - screener_view, screener_helper, + screener_view, + yahoofinance_view, ) logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/screener/screener_helper.py b/openbb_terminal/stocks/screener/screener_helper.py index 8878a802003e..9f87a7150c8e 100644 --- a/openbb_terminal/stocks/screener/screener_helper.py +++ b/openbb_terminal/stocks/screener/screener_helper.py @@ -1,4 +1,5 @@ -from typing import List, Dict +from typing import Dict, List + from openbb_terminal.stocks.screener import finviz_view diff --git a/openbb_terminal/stocks/screener/screener_view.py b/openbb_terminal/stocks/screener/screener_view.py index e01030b88efc..c61cdbabdbad 100644 --- a/openbb_terminal/stocks/screener/screener_view.py +++ b/openbb_terminal/stocks/screener/screener_view.py @@ -3,11 +3,11 @@ import configparser -from openbb_terminal.rich_config import console from openbb_terminal.core.config.paths import ( - USER_PRESETS_DIRECTORY, MISCELLANEOUS_DIRECTORY, + USER_PRESETS_DIRECTORY, ) +from openbb_terminal.rich_config import console from openbb_terminal.stocks.screener import finviz_model PRESETS_PATH = USER_PRESETS_DIRECTORY / "stocks" / "screener" diff --git a/openbb_terminal/stocks/screener/yahoofinance_model.py b/openbb_terminal/stocks/screener/yahoofinance_model.py index 9b96f952413c..103a46128546 100644 --- a/openbb_terminal/stocks/screener/yahoofinance_model.py +++ b/openbb_terminal/stocks/screener/yahoofinance_model.py @@ -3,8 +3,8 @@ import configparser import datetime import logging -from typing import List, Tuple import random +from typing import List, Tuple import numpy as np import pandas as pd @@ -13,13 +13,11 @@ from pandas.plotting import register_matplotlib_converters from sklearn.preprocessing import MinMaxScaler - -from openbb_terminal.decorators import log_start_end - from openbb_terminal.core.config.paths import ( - USER_PRESETS_DIRECTORY, MISCELLANEOUS_DIRECTORY, + USER_PRESETS_DIRECTORY, ) +from openbb_terminal.decorators import log_start_end from openbb_terminal.rich_config import console from openbb_terminal.stocks.screener import finviz_model diff --git a/openbb_terminal/stocks/screener/yahoofinance_view.py b/openbb_terminal/stocks/screener/yahoofinance_view.py index eeafda22719b..e2663f72fdce 100644 --- a/openbb_terminal/stocks/screener/yahoofinance_view.py +++ b/openbb_terminal/stocks/screener/yahoofinance_view.py @@ -8,13 +8,13 @@ import matplotlib.pyplot as plt from pandas.plotting import register_matplotlib_converters -from openbb_terminal.config_terminal import theme from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, - plot_autoscale, is_valid_axes_count, + plot_autoscale, ) from openbb_terminal.rich_config import console from openbb_terminal.stocks.screener import yahoofinance_model diff --git a/openbb_terminal/stocks/sector_industry_analysis/financedatabase_model.py b/openbb_terminal/stocks/sector_industry_analysis/financedatabase_model.py index b45532e97276..5d9ae124541a 100644 --- a/openbb_terminal/stocks/sector_industry_analysis/financedatabase_model.py +++ b/openbb_terminal/stocks/sector_industry_analysis/financedatabase_model.py @@ -6,8 +6,8 @@ import financedatabase as fd import yfinance as yf -from tqdm import tqdm from requests.exceptions import ReadTimeout +from tqdm import tqdm from openbb_terminal.decorators import log_start_end from openbb_terminal.rich_config import console diff --git a/openbb_terminal/stocks/sector_industry_analysis/financedatabase_view.py b/openbb_terminal/stocks/sector_industry_analysis/financedatabase_view.py index 1eaa133d1806..25e497d082cc 100644 --- a/openbb_terminal/stocks/sector_industry_analysis/financedatabase_view.py +++ b/openbb_terminal/stocks/sector_industry_analysis/financedatabase_view.py @@ -5,20 +5,20 @@ import logging import os from collections import OrderedDict -from typing import Dict, Optional, List +from typing import Dict, List, Optional import numpy as np import pandas as pd from matplotlib import pyplot as plt -from openbb_terminal.config_terminal import theme from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, plot_autoscale, print_rich_table, - is_valid_axes_count, ) from openbb_terminal.rich_config import console from openbb_terminal.stocks.sector_industry_analysis import financedatabase_model diff --git a/openbb_terminal/stocks/sector_industry_analysis/sia_controller.py b/openbb_terminal/stocks/sector_industry_analysis/sia_controller.py index 1c151dc5a6ca..e95eff5984e7 100644 --- a/openbb_terminal/stocks/sector_industry_analysis/sia_controller.py +++ b/openbb_terminal/stocks/sector_industry_analysis/sia_controller.py @@ -8,9 +8,8 @@ import yfinance as yf -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_BOTH_RAW_DATA_AND_FIGURES, @@ -19,7 +18,7 @@ ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console from openbb_terminal.stocks.comparison_analysis import ca_controller from openbb_terminal.stocks.sector_industry_analysis import ( financedatabase_model, diff --git a/openbb_terminal/stocks/sector_industry_analysis/stockanalysis_model.py b/openbb_terminal/stocks/sector_industry_analysis/stockanalysis_model.py index 5e6699ac8809..c0cf9bcd17fe 100644 --- a/openbb_terminal/stocks/sector_industry_analysis/stockanalysis_model.py +++ b/openbb_terminal/stocks/sector_industry_analysis/stockanalysis_model.py @@ -3,12 +3,12 @@ # pylint:disable=too-many-arguments,unexpected-keyword-arg import logging -from typing import Dict, Any, List +from typing import Any, Dict, List import numpy as np import pandas as pd -from tqdm import tqdm import yfinance as yf +from tqdm import tqdm from openbb_terminal.decorators import log_start_end from openbb_terminal.rich_config import console diff --git a/openbb_terminal/stocks/sector_industry_analysis/stockanalysis_view.py b/openbb_terminal/stocks/sector_industry_analysis/stockanalysis_view.py index e2b61cf7356f..bd4529e3c1de 100644 --- a/openbb_terminal/stocks/sector_industry_analysis/stockanalysis_view.py +++ b/openbb_terminal/stocks/sector_industry_analysis/stockanalysis_view.py @@ -5,29 +5,27 @@ import copy import logging import os -from typing import Dict, Optional, List, Tuple +from typing import Dict, List, Optional, Tuple import numpy as np import pandas as pd from matplotlib import pyplot as plt -from openbb_terminal.config_terminal import theme from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( export_data, + is_valid_axes_count, plot_autoscale, print_rich_table, - is_valid_axes_count, ) +from openbb_terminal.helpers_denomination import transform as transform_by_denomination from openbb_terminal.rich_config import console from openbb_terminal.stocks.sector_industry_analysis import stockanalysis_model from openbb_terminal.stocks.sector_industry_analysis.financedatabase_model import ( filter_stocks, ) -from openbb_terminal.helpers_denomination import ( - transform as transform_by_denomination, -) logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/stocks_controller.py b/openbb_terminal/stocks/stocks_controller.py index ca4f7d8ccefe..0cd7c8c10b54 100644 --- a/openbb_terminal/stocks/stocks_controller.py +++ b/openbb_terminal/stocks/stocks_controller.py @@ -15,12 +15,9 @@ from openbb_terminal.common.quantitative_analysis import qa_view from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end -from openbb_terminal.stocks import cboe_view -from openbb_terminal.stocks.fundamental_analysis import fmp_view - from openbb_terminal.helper_funcs import ( - EXPORT_ONLY_RAW_DATA_ALLOWED, EXPORT_BOTH_RAW_DATA_AND_FIGURES, + EXPORT_ONLY_RAW_DATA_ALLOWED, export_data, valid_date, ) @@ -31,8 +28,8 @@ console, translate, ) -from openbb_terminal.stocks import stocks_helper -from openbb_terminal.stocks import stocks_view +from openbb_terminal.stocks import cboe_view, stocks_helper, stocks_view +from openbb_terminal.stocks.fundamental_analysis import fmp_view # pylint: disable=R1710,import-outside-toplevel,R0913,R1702,no-member diff --git a/openbb_terminal/stocks/stocks_helper.py b/openbb_terminal/stocks/stocks_helper.py index b6ae80284a39..0f713db6fd7e 100644 --- a/openbb_terminal/stocks/stocks_helper.py +++ b/openbb_terminal/stocks/stocks_helper.py @@ -35,13 +35,15 @@ from openbb_terminal.rich_config import console # pylint: disable=unused-import -from openbb_terminal.stocks.stock_statics import BALANCE_PLOT # noqa: F401 -from openbb_terminal.stocks.stock_statics import CANDLE_SORT # noqa: F401 -from openbb_terminal.stocks.stock_statics import CASH_PLOT # noqa: F401 -from openbb_terminal.stocks.stock_statics import INCOME_PLOT # noqa: F401 -from openbb_terminal.stocks.stock_statics import INTERVALS # noqa: F401 -from openbb_terminal.stocks.stock_statics import SOURCES # noqa: F401 -from openbb_terminal.stocks.stock_statics import market_coverage_suffix +from openbb_terminal.stocks.stock_statics import ( + BALANCE_PLOT, # noqa: F401 + CANDLE_SORT, # noqa: F401 + CASH_PLOT, # noqa: F401 + INCOME_PLOT, # noqa: F401 + INTERVALS, # noqa: F401 + SOURCES, # noqa: F401 + market_coverage_suffix, +) from openbb_terminal.stocks.stocks_model import ( load_stock_av, load_stock_eodhd, diff --git a/openbb_terminal/stocks/stocks_model.py b/openbb_terminal/stocks/stocks_model.py index 50d06733427f..e276a2c2cb8e 100644 --- a/openbb_terminal/stocks/stocks_model.py +++ b/openbb_terminal/stocks/stocks_model.py @@ -1,16 +1,16 @@ +import logging import os from datetime import datetime -import logging -import pyEX import pandas as pd +import pyEX import yfinance as yf from alpha_vantage.timeseries import TimeSeries -from openbb_terminal.decorators import check_api_key -from openbb_terminal.rich_config import console from openbb_terminal import config_terminal as cfg +from openbb_terminal.decorators import check_api_key from openbb_terminal.helper_funcs import request +from openbb_terminal.rich_config import console # pylint: disable=unsupported-assignment-operation,no-member diff --git a/openbb_terminal/stocks/stocks_view.py b/openbb_terminal/stocks/stocks_view.py index 2ef7548475ef..9985da296b50 100644 --- a/openbb_terminal/stocks/stocks_view.py +++ b/openbb_terminal/stocks/stocks_view.py @@ -1,6 +1,7 @@ import pandas as pd -from openbb_terminal.stocks import stocks_model + from openbb_terminal.helper_funcs import print_rich_table +from openbb_terminal.stocks import stocks_model def display_quote(symbol: str) -> pd.DataFrame: diff --git a/openbb_terminal/stocks/technical_analysis/finbrain_model.py b/openbb_terminal/stocks/technical_analysis/finbrain_model.py index 8e56a533bf8e..80c85871c4a3 100644 --- a/openbb_terminal/stocks/technical_analysis/finbrain_model.py +++ b/openbb_terminal/stocks/technical_analysis/finbrain_model.py @@ -3,8 +3,8 @@ import logging -from openbb_terminal.helper_funcs import request from openbb_terminal.decorators import log_start_end +from openbb_terminal.helper_funcs import request from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/technical_analysis/finviz_view.py b/openbb_terminal/stocks/technical_analysis/finviz_view.py index 1368ee986fe8..2e0ed30c2106 100644 --- a/openbb_terminal/stocks/technical_analysis/finviz_view.py +++ b/openbb_terminal/stocks/technical_analysis/finviz_view.py @@ -9,10 +9,10 @@ import matplotlib.pyplot as plt from PIL import Image -from openbb_terminal.config_terminal import theme from openbb_terminal.config_plot import PLOT_DPI +from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end -from openbb_terminal.helper_funcs import plot_autoscale, is_valid_axes_count +from openbb_terminal.helper_funcs import is_valid_axes_count, plot_autoscale from openbb_terminal.stocks.technical_analysis import finviz_model logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/technical_analysis/rsp_model.py b/openbb_terminal/stocks/technical_analysis/rsp_model.py index 46c85d50882f..7a059ba84aa6 100644 --- a/openbb_terminal/stocks/technical_analysis/rsp_model.py +++ b/openbb_terminal/stocks/technical_analysis/rsp_model.py @@ -8,7 +8,6 @@ from openbb_terminal.decorators import log_start_end - logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/technical_analysis/rsp_view.py b/openbb_terminal/stocks/technical_analysis/rsp_view.py index fb121f58511e..0ae65f0ff98b 100644 --- a/openbb_terminal/stocks/technical_analysis/rsp_view.py +++ b/openbb_terminal/stocks/technical_analysis/rsp_view.py @@ -3,6 +3,7 @@ import logging import os + import pandas as pd from openbb_terminal.decorators import log_start_end @@ -10,8 +11,8 @@ export_data, print_rich_table, ) -from openbb_terminal.stocks.technical_analysis import rsp_model from openbb_terminal.rich_config import console +from openbb_terminal.stocks.technical_analysis import rsp_model logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/technical_analysis/ta_controller.py b/openbb_terminal/stocks/technical_analysis/ta_controller.py index 2c5806b6079a..f4c3b0c2275a 100644 --- a/openbb_terminal/stocks/technical_analysis/ta_controller.py +++ b/openbb_terminal/stocks/technical_analysis/ta_controller.py @@ -11,7 +11,6 @@ import pandas as pd from openbb_terminal import feature_flags as obbff -from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.common.technical_analysis import ( custom_indicators_view, momentum_view, @@ -22,6 +21,7 @@ volatility_view, volume_view, ) +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( EXPORT_BOTH_RAW_DATA_AND_FIGURES, @@ -33,13 +33,13 @@ ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import StockBaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.rich_config import MenuText, console from openbb_terminal.stocks.technical_analysis import ( finbrain_view, finviz_view, + rsp_view, tradingview_model, tradingview_view, - rsp_view, ) logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/technical_analysis/tradingview_view.py b/openbb_terminal/stocks/technical_analysis/tradingview_view.py index 94d890ad493d..e34eee8f90f7 100644 --- a/openbb_terminal/stocks/technical_analysis/tradingview_view.py +++ b/openbb_terminal/stocks/technical_analysis/tradingview_view.py @@ -3,12 +3,13 @@ import logging import os + import pandas as pd from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import export_data, print_rich_table -from openbb_terminal.stocks.technical_analysis import tradingview_model from openbb_terminal.rich_config import console +from openbb_terminal.stocks.technical_analysis import tradingview_model logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/tradinghours/bursa_model.py b/openbb_terminal/stocks/tradinghours/bursa_model.py index eb28cfdebacc..9e172d17a143 100644 --- a/openbb_terminal/stocks/tradinghours/bursa_model.py +++ b/openbb_terminal/stocks/tradinghours/bursa_model.py @@ -1,9 +1,8 @@ """Stocks Trading Hours Model.""" -from datetime import datetime - import logging import os +from datetime import datetime import pandas as pd import pytz diff --git a/openbb_terminal/stocks/tradinghours/bursa_view.py b/openbb_terminal/stocks/tradinghours/bursa_view.py index 3bee3add8b03..5a8df905b668 100644 --- a/openbb_terminal/stocks/tradinghours/bursa_view.py +++ b/openbb_terminal/stocks/tradinghours/bursa_view.py @@ -4,9 +4,9 @@ import logging from openbb_terminal.decorators import log_start_end -from openbb_terminal.stocks.tradinghours import bursa_model from openbb_terminal.helper_funcs import print_rich_table from openbb_terminal.rich_config import console +from openbb_terminal.stocks.tradinghours import bursa_model logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/tradinghours/pandas_market_cal_model.py b/openbb_terminal/stocks/tradinghours/pandas_market_cal_model.py index c27935d80e9d..12ef119cabb9 100644 --- a/openbb_terminal/stocks/tradinghours/pandas_market_cal_model.py +++ b/openbb_terminal/stocks/tradinghours/pandas_market_cal_model.py @@ -1,7 +1,8 @@ import logging -import pandas_market_calendars as mcal import pandas as pd +import pandas_market_calendars as mcal + from openbb_terminal.decorators import log_start_end logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/tradinghours/pandas_market_cal_view.py b/openbb_terminal/stocks/tradinghours/pandas_market_cal_view.py index 9ad362a4403f..a973773e9a38 100644 --- a/openbb_terminal/stocks/tradinghours/pandas_market_cal_view.py +++ b/openbb_terminal/stocks/tradinghours/pandas_market_cal_view.py @@ -1,10 +1,11 @@ import logging + import pandas as pd from openbb_terminal.decorators import log_start_end -from openbb_terminal.stocks.tradinghours import pandas_market_cal_model from openbb_terminal.helper_funcs import print_rich_table from openbb_terminal.rich_config import console +from openbb_terminal.stocks.tradinghours import pandas_market_cal_model logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/tradinghours/tradinghours_controller.py b/openbb_terminal/stocks/tradinghours/tradinghours_controller.py index 973901d922b8..1d6a1d2fc519 100644 --- a/openbb_terminal/stocks/tradinghours/tradinghours_controller.py +++ b/openbb_terminal/stocks/tradinghours/tradinghours_controller.py @@ -4,31 +4,30 @@ import argparse import logging import os - -from typing import List from datetime import date -import pandas as pd +from typing import List -from openbb_terminal.custom_prompt_toolkit import NestedCompleter +import pandas as pd from openbb_terminal import feature_flags as obbff +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end -from openbb_terminal.menu import session from openbb_terminal.helper_funcs import ( get_user_timezone_or_invalid, ) -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController +from openbb_terminal.rich_config import MenuText, console from openbb_terminal.stocks.tradinghours import bursa_view from openbb_terminal.stocks.tradinghours.bursa_model import get_open +from openbb_terminal.stocks.tradinghours.pandas_market_cal_view import ( + display_exchange_holidays, + get_all_holiday_exchange_short_names, +) from openbb_terminal.stocks.tradinghours.tradinghours_helper import ( get_exchanges_short_names, get_fd_equities_list, ) -from openbb_terminal.stocks.tradinghours.pandas_market_cal_view import ( - get_all_holiday_exchange_short_names, - display_exchange_holidays, -) logger = logging.getLogger(__name__) diff --git a/openbb_terminal/stocks/tradinghours/tradinghours_helper.py b/openbb_terminal/stocks/tradinghours/tradinghours_helper.py index 82ba65276a3f..5d65081d2b80 100644 --- a/openbb_terminal/stocks/tradinghours/tradinghours_helper.py +++ b/openbb_terminal/stocks/tradinghours/tradinghours_helper.py @@ -1,5 +1,5 @@ -from typing import List import logging +from typing import List import financedatabase as fd diff --git a/openbb_terminal/terminal_controller.py b/openbb_terminal/terminal_controller.py index d8a7703dd035..1a8acda3ad60 100644 --- a/openbb_terminal/terminal_controller.py +++ b/openbb_terminal/terminal_controller.py @@ -2,30 +2,29 @@ """Main Terminal Module.""" __docformat__ = "numpy" -from datetime import datetime import argparse +import contextlib import difflib import logging import os import re -from pathlib import Path import sys -import webbrowser -from typing import List, Dict, Optional -import contextlib import time +import webbrowser +from datetime import datetime +from pathlib import Path +from typing import Dict, List, Optional import certifi -from rich import panel - +import pandas as pd from prompt_toolkit import PromptSession from prompt_toolkit.completion import NestedCompleter -from prompt_toolkit.styles import Style from prompt_toolkit.formatted_text import HTML -import pandas as pd -from openbb_terminal import feature_flags as obbff -from openbb_terminal.terminal_helper import is_packaged_application +from prompt_toolkit.styles import Style +from rich import panel +from openbb_terminal import feature_flags as obbff +from openbb_terminal.common import feedparser_view from openbb_terminal.core.config.paths import ( HOME_DIRECTORY, MISCELLANEOUS_DIRECTORY, @@ -35,31 +34,30 @@ USER_ROUTINES_DIRECTORY, load_dotenv_with_priority, ) - +from openbb_terminal.core.log.generation.settings_logger import log_all_settings from openbb_terminal.helper_funcs import ( + EXPORT_ONLY_RAW_DATA_ALLOWED, check_positive, get_flair, - EXPORT_ONLY_RAW_DATA_ALLOWED, + parse_and_split_input, ) +from openbb_terminal.keys_model import first_time_user from openbb_terminal.loggers import setup_logging -from openbb_terminal.core.log.generation.settings_logger import log_all_settings -from openbb_terminal.menu import session, is_papermill +from openbb_terminal.menu import is_papermill, session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.reports.reports_model import ipykernel_launcher +from openbb_terminal.rich_config import MenuText, console from openbb_terminal.terminal_helper import ( bootup, check_for_updates, + is_packaged_application, is_reset, print_goodbye, reset, + suppress_stdout, update_terminal, welcome_message, - suppress_stdout, ) -from openbb_terminal.helper_funcs import parse_and_split_input -from openbb_terminal.keys_model import first_time_user -from openbb_terminal.common import feedparser_view -from openbb_terminal.reports.reports_model import ipykernel_launcher # pylint: disable=too-many-public-methods,import-outside-toplevel, too-many-function-args # pylint: disable=too-many-branches,no-member,C0302,too-many-return-statements, inconsistent-return-statements diff --git a/openbb_terminal/terminal_helper.py b/openbb_terminal/terminal_helper.py index d49ab1040c9f..2d4ac3b8b9fe 100644 --- a/openbb_terminal/terminal_helper.py +++ b/openbb_terminal/terminal_helper.py @@ -2,25 +2,26 @@ __docformat__ = "numpy" # IMPORTATION STANDARD -import webbrowser -from contextlib import contextmanager import hashlib import logging import os import subprocess # nosec import sys +import webbrowser +from contextlib import contextmanager from typing import List -from packaging import version # IMPORTATION THIRDPARTY import matplotlib.pyplot as plt +from packaging import version -# IMPORTATION INTERNAL -from openbb_terminal.config_terminal import LOGGING_APP_NAME, LOGGING_COMMIT_HASH from openbb_terminal import feature_flags as obbff from openbb_terminal import thought_of_the_day as thought -from openbb_terminal.rich_config import console + +# IMPORTATION INTERNAL +from openbb_terminal.config_terminal import LOGGING_APP_NAME, LOGGING_COMMIT_HASH from openbb_terminal.helper_funcs import request +from openbb_terminal.rich_config import console # pylint: disable=too-many-statements,no-member,too-many-branches,C0302 diff --git a/pyproject.toml b/pyproject.toml index 39c3aa79cddf..936379f9b8d2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -156,9 +156,9 @@ match = '((?!test_).)*\.py' line-length = 122 target-version = "py38" # This is an introductory addition of ruff. We should look to adding: -# D: pydocstyle, PD: pandas-vet, I: isort +# D: pydocstyle, PD: pandas-vet # All options here: https://github.com/charliermarsh/ruff#supported-rules -select = ["E", "W", "F", "Q", "W", "S", "UP"] +select = ["E", "W", "F", "Q", "W", "S", "UP", "I"] ignore = ["S105", "S106", "S107"] [tool.ruff.per-file-ignores] diff --git a/terminal.py b/terminal.py index f7f88beed186..648d0420c9be 100644 --- a/terminal.py +++ b/terminal.py @@ -1,5 +1,6 @@ import multiprocessing import sys + from openbb_terminal import terminal_controller from openbb_terminal.core.integration_tests import integration_controller diff --git a/tests/conftest.py b/tests/conftest.py index 2ef453270dcc..bc6c7e609a57 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -17,7 +17,8 @@ from _pytest.mark.structures import Mark # IMPORTATION INTERNAL -from openbb_terminal import decorators, feature_flags as obbff, helper_funcs +from openbb_terminal import decorators, helper_funcs +from openbb_terminal import feature_flags as obbff from openbb_terminal.base_helpers import strtobool # pylint: disable=redefined-outer-name diff --git a/tests/formatting/test_best_practices.py b/tests/formatting/test_best_practices.py index a55ac890023e..a30566cd89f8 100644 --- a/tests/formatting/test_best_practices.py +++ b/tests/formatting/test_best_practices.py @@ -1,5 +1,6 @@ -from typing import Optional, List, Tuple from inspect import signature +from typing import List, Optional, Tuple + import pytest # Certain openbb distributions like pip do not include the docs folder, diff --git a/tests/openbb_terminal/alternative/covid/test_covid_controller.py b/tests/openbb_terminal/alternative/covid/test_covid_controller.py index 7138f8193e33..55ea0fb4c45a 100644 --- a/tests/openbb_terminal/alternative/covid/test_covid_controller.py +++ b/tests/openbb_terminal/alternative/covid/test_covid_controller.py @@ -7,6 +7,7 @@ # IMPORTATION INTERNAL from openbb_terminal.alternative.covid import covid_controller + # pylint: disable=E1101 # pylint: disable=W0603 # pylint: disable=E1111 diff --git a/tests/openbb_terminal/alternative/oss/test_oss_controller.py b/tests/openbb_terminal/alternative/oss/test_oss_controller.py index ba68aff3e512..ee810508cddf 100644 --- a/tests/openbb_terminal/alternative/oss/test_oss_controller.py +++ b/tests/openbb_terminal/alternative/oss/test_oss_controller.py @@ -7,6 +7,7 @@ # IMPORTATION INTERNAL from openbb_terminal.alternative.oss import oss_controller + # pylint: disable=E1101 # pylint: disable=W0603 # pylint: disable=E1111 diff --git a/tests/openbb_terminal/alternative/test_alt_controller.py b/tests/openbb_terminal/alternative/test_alt_controller.py index 599f10cf6c70..d4f3ae785ec8 100644 --- a/tests/openbb_terminal/alternative/test_alt_controller.py +++ b/tests/openbb_terminal/alternative/test_alt_controller.py @@ -7,6 +7,7 @@ # IMPORTATION INTERNAL from openbb_terminal.alternative import alt_controller + # pylint: disable=E1101 # pylint: disable=W0603 # pylint: disable=E1111 diff --git a/tests/openbb_terminal/common/behavioural_analysis/test_finbrain_view.py b/tests/openbb_terminal/common/behavioural_analysis/test_finbrain_view.py index 78e9f0218c2d..5100f28f1672 100644 --- a/tests/openbb_terminal/common/behavioural_analysis/test_finbrain_view.py +++ b/tests/openbb_terminal/common/behavioural_analysis/test_finbrain_view.py @@ -4,9 +4,10 @@ import pandas as pd import pytest +from openbb_terminal import helper_funcs + # IMPORTATION INTERNAL from openbb_terminal.common.behavioural_analysis import finbrain_view -from openbb_terminal import helper_funcs @pytest.mark.default_cassette("test_display_sentiment_analysis") diff --git a/tests/openbb_terminal/common/quantitative_analysis/test_qa_view.py b/tests/openbb_terminal/common/quantitative_analysis/test_qa_view.py index d3cbfab778b6..533d89dc08e3 100644 --- a/tests/openbb_terminal/common/quantitative_analysis/test_qa_view.py +++ b/tests/openbb_terminal/common/quantitative_analysis/test_qa_view.py @@ -1,7 +1,8 @@ from datetime import datetime, timedelta from unittest.mock import MagicMock -import pytest + import pandas as pd +import pytest from openbb_terminal.common.quantitative_analysis import qa_view diff --git a/tests/openbb_terminal/core/log/collection/test_logging_clock.py b/tests/openbb_terminal/core/log/collection/test_logging_clock.py index a859fc1ecf02..bd79d3a5523e 100644 --- a/tests/openbb_terminal/core/log/collection/test_logging_clock.py +++ b/tests/openbb_terminal/core/log/collection/test_logging_clock.py @@ -1,7 +1,8 @@ from datetime import datetime + import pytest -from openbb_terminal.core.log.collection import logging_clock +from openbb_terminal.core.log.collection import logging_clock clock = logging_clock.LoggingClock() now = datetime.now() diff --git a/tests/openbb_terminal/core/log/collection/test_s3_sender.py b/tests/openbb_terminal/core/log/collection/test_s3_sender.py index 0ea607c04e68..368fe4a79b5b 100644 --- a/tests/openbb_terminal/core/log/collection/test_s3_sender.py +++ b/tests/openbb_terminal/core/log/collection/test_s3_sender.py @@ -4,10 +4,11 @@ # IMPORTATION THIRDPARTY import pytest +from openbb_terminal.core.log.collection import s3_sender +from openbb_terminal.core.log.constants import DEFAULT_API_URL + # IMPORTATION INTERNAL from openbb_terminal.core.log.generation.settings import AWSSettings -from openbb_terminal.core.log.constants import DEFAULT_API_URL -from openbb_terminal.core.log.collection import s3_sender # pylint: disable=W0611 diff --git a/tests/openbb_terminal/core/log/conftest.py b/tests/openbb_terminal/core/log/conftest.py index f639a3e61ef0..705512921fa4 100644 --- a/tests/openbb_terminal/core/log/conftest.py +++ b/tests/openbb_terminal/core/log/conftest.py @@ -1,9 +1,10 @@ import pytest + from openbb_terminal.core.log.generation.settings import ( - Settings, AppSettings, AWSSettings, LogSettings, + Settings, ) diff --git a/tests/openbb_terminal/core/log/generation/test_directories.py b/tests/openbb_terminal/core/log/generation/test_directories.py index 5a56e8d988fe..21f287e8c63c 100644 --- a/tests/openbb_terminal/core/log/generation/test_directories.py +++ b/tests/openbb_terminal/core/log/generation/test_directories.py @@ -1,5 +1,5 @@ -from pathlib import Path import logging +from pathlib import Path from openbb_terminal.core.log.generation.directories import get_log_dir, get_log_sub_dir from openbb_terminal.loggers import setup_logging diff --git a/tests/openbb_terminal/core/log/generation/test_expired_files.py b/tests/openbb_terminal/core/log/generation/test_expired_files.py index c8015e7d744a..bf2312eb568c 100644 --- a/tests/openbb_terminal/core/log/generation/test_expired_files.py +++ b/tests/openbb_terminal/core/log/generation/test_expired_files.py @@ -1,7 +1,8 @@ import os + from openbb_terminal.core.log.generation.expired_files import ( - get_timestamp_from_x_days, get_expired_file_list, + get_timestamp_from_x_days, remove_file_list, ) diff --git a/tests/openbb_terminal/core/log/generation/test_path_tracking_file_handler.py b/tests/openbb_terminal/core/log/generation/test_path_tracking_file_handler.py index 72cf65dfb917..fc3da4653a78 100644 --- a/tests/openbb_terminal/core/log/generation/test_path_tracking_file_handler.py +++ b/tests/openbb_terminal/core/log/generation/test_path_tracking_file_handler.py @@ -1,12 +1,13 @@ import random -from pathlib import Path from datetime import datetime +from pathlib import Path + import pytest + from openbb_terminal.core.log.generation.path_tracking_file_handler import ( PathTrackingFileHandler, ) - randint = random.randint(0, 999999999) diff --git a/tests/openbb_terminal/cryptocurrency/defi/test_defi_controller.py b/tests/openbb_terminal/cryptocurrency/defi/test_defi_controller.py index dd2f9311f3a6..86ec160163f6 100644 --- a/tests/openbb_terminal/cryptocurrency/defi/test_defi_controller.py +++ b/tests/openbb_terminal/cryptocurrency/defi/test_defi_controller.py @@ -7,6 +7,7 @@ # IMPORTATION INTERNAL from openbb_terminal.cryptocurrency.defi import defi_controller + # pylint: disable=E1101 # pylint: disable=W0603 # pylint: disable=E1111 diff --git a/tests/openbb_terminal/cryptocurrency/discovery/test_discovery_controller.py b/tests/openbb_terminal/cryptocurrency/discovery/test_discovery_controller.py index bb14ae4143c4..d3f98c4908fd 100644 --- a/tests/openbb_terminal/cryptocurrency/discovery/test_discovery_controller.py +++ b/tests/openbb_terminal/cryptocurrency/discovery/test_discovery_controller.py @@ -7,6 +7,7 @@ # IMPORTATION INTERNAL from openbb_terminal.cryptocurrency.discovery import discovery_controller + # pylint: disable=E1101 # pylint: disable=W0603 # pylint: disable=E1111 diff --git a/tests/openbb_terminal/cryptocurrency/due_diligence/test_dd_controller.py b/tests/openbb_terminal/cryptocurrency/due_diligence/test_dd_controller.py index 034eb2586c15..6b9b66d2a65e 100644 --- a/tests/openbb_terminal/cryptocurrency/due_diligence/test_dd_controller.py +++ b/tests/openbb_terminal/cryptocurrency/due_diligence/test_dd_controller.py @@ -1,6 +1,6 @@ # IMPORTATION STANDARD -from typing import List import os +from typing import List # IMPORTATION THIRDPARTY import pandas as pd diff --git a/tests/openbb_terminal/cryptocurrency/due_diligence/test_pycoingecko_view.py b/tests/openbb_terminal/cryptocurrency/due_diligence/test_pycoingecko_view.py index dfd248fdf8d6..691c531c7ec5 100644 --- a/tests/openbb_terminal/cryptocurrency/due_diligence/test_pycoingecko_view.py +++ b/tests/openbb_terminal/cryptocurrency/due_diligence/test_pycoingecko_view.py @@ -1,16 +1,14 @@ -from unittest import mock, TestCase import json import os -import pytest +from unittest import TestCase, mock +import pytest import vcr -from openbb_terminal.cryptocurrency.due_diligence import ( - pycoingecko_view as dd_pycoingecko_view, -) from openbb_terminal.cryptocurrency.cryptocurrency_helpers import ( load, ) +from openbb_terminal.cryptocurrency.due_diligence import pycoingecko_view as dd_pycoingecko_view from tests.helpers.helpers import check_print # pylint: disable=unused-import diff --git a/tests/openbb_terminal/cryptocurrency/nft/test_nft_controller.py b/tests/openbb_terminal/cryptocurrency/nft/test_nft_controller.py index 5cbe1ce9f1f3..617db6d74535 100644 --- a/tests/openbb_terminal/cryptocurrency/nft/test_nft_controller.py +++ b/tests/openbb_terminal/cryptocurrency/nft/test_nft_controller.py @@ -7,6 +7,7 @@ # IMPORTATION INTERNAL from openbb_terminal.cryptocurrency.nft import nft_controller + # pylint: disable=E1101 # pylint: disable=W0603 # pylint: disable=E1111 diff --git a/tests/openbb_terminal/cryptocurrency/onchain/test_onchain_controller.py b/tests/openbb_terminal/cryptocurrency/onchain/test_onchain_controller.py index 5fc0d462ed54..1f283005f7ba 100644 --- a/tests/openbb_terminal/cryptocurrency/onchain/test_onchain_controller.py +++ b/tests/openbb_terminal/cryptocurrency/onchain/test_onchain_controller.py @@ -7,6 +7,7 @@ # IMPORTATION INTERNAL from openbb_terminal.cryptocurrency.onchain import onchain_controller + # pylint: disable=E1101 # pylint: disable=W0603 # pylint: disable=E1111 diff --git a/tests/openbb_terminal/cryptocurrency/overview/test_coinbase_view.py b/tests/openbb_terminal/cryptocurrency/overview/test_coinbase_view.py index 6e73f8d275fb..dc6fed8a1400 100644 --- a/tests/openbb_terminal/cryptocurrency/overview/test_coinbase_view.py +++ b/tests/openbb_terminal/cryptocurrency/overview/test_coinbase_view.py @@ -1,11 +1,8 @@ import pytest -from openbb_terminal.cryptocurrency.due_diligence import ( - coinbase_view as dd_coinbase_view, -) -from openbb_terminal.portfolio.brokers.coinbase import ( - coinbase_view as bro_coinbase_view, -) + +from openbb_terminal.cryptocurrency.due_diligence import coinbase_view as dd_coinbase_view from openbb_terminal.cryptocurrency.overview import coinbase_view as ov_coinbase_view +from openbb_terminal.portfolio.brokers.coinbase import coinbase_view as bro_coinbase_view from tests.helpers.helpers import check_print diff --git a/tests/openbb_terminal/cryptocurrency/overview/test_pycoingecko_view.py b/tests/openbb_terminal/cryptocurrency/overview/test_pycoingecko_view.py index ce7eda34e96e..85c5cb5a80b6 100644 --- a/tests/openbb_terminal/cryptocurrency/overview/test_pycoingecko_view.py +++ b/tests/openbb_terminal/cryptocurrency/overview/test_pycoingecko_view.py @@ -1,7 +1,6 @@ import pytest -from openbb_terminal.cryptocurrency.overview import ( - pycoingecko_view as ov_pycoingecko_view, -) + +from openbb_terminal.cryptocurrency.overview import pycoingecko_view as ov_pycoingecko_view # pylint: disable=unused-import diff --git a/tests/openbb_terminal/cryptocurrency/test_cryptocurrency_helpers.py b/tests/openbb_terminal/cryptocurrency/test_cryptocurrency_helpers.py index 0b465cbce0c0..989216a052ca 100644 --- a/tests/openbb_terminal/cryptocurrency/test_cryptocurrency_helpers.py +++ b/tests/openbb_terminal/cryptocurrency/test_cryptocurrency_helpers.py @@ -5,11 +5,11 @@ from pycoingecko import CoinGeckoAPI from openbb_terminal.cryptocurrency.cryptocurrency_helpers import ( - read_data_file, + _create_closest_match_df, _load_coin_map, load, load_coins_list, - _create_closest_match_df, + read_data_file, ) # pylint: disable=unused-import diff --git a/tests/openbb_terminal/cryptocurrency/tools/test_tools_controller.py b/tests/openbb_terminal/cryptocurrency/tools/test_tools_controller.py index 5ea27e313f7a..913d8528c69d 100644 --- a/tests/openbb_terminal/cryptocurrency/tools/test_tools_controller.py +++ b/tests/openbb_terminal/cryptocurrency/tools/test_tools_controller.py @@ -7,6 +7,7 @@ # IMPORTATION INTERNAL from openbb_terminal.cryptocurrency.tools import tools_controller + # pylint: disable=E1101 # pylint: disable=W0603 # pylint: disable=E1111 diff --git a/tests/openbb_terminal/econometrics/test_econometrics_controller.py b/tests/openbb_terminal/econometrics/test_econometrics_controller.py index efcd39cc655e..cba45f859ec8 100644 --- a/tests/openbb_terminal/econometrics/test_econometrics_controller.py +++ b/tests/openbb_terminal/econometrics/test_econometrics_controller.py @@ -1,5 +1,6 @@ -import pytest import pandas as pd +import pytest + from openbb_terminal.econometrics.econometrics_controller import EconometricsController # pylint: disable=W0621 diff --git a/tests/openbb_terminal/econometrics/test_econometrics_model.py b/tests/openbb_terminal/econometrics/test_econometrics_model.py index ab513fb38b64..170dcadab797 100644 --- a/tests/openbb_terminal/econometrics/test_econometrics_model.py +++ b/tests/openbb_terminal/econometrics/test_econometrics_model.py @@ -4,9 +4,10 @@ # IMPORTATION THIRDPARTY import pytest +from openbb_terminal.common import common_model + # IMPORTATION INTERNAL from openbb_terminal.econometrics import econometrics_model -from openbb_terminal.common import common_model @pytest.mark.vcr() diff --git a/tests/openbb_terminal/econometrics/test_econometrics_view.py b/tests/openbb_terminal/econometrics/test_econometrics_view.py index fc52440d58c3..5ae8d2dad861 100644 --- a/tests/openbb_terminal/econometrics/test_econometrics_view.py +++ b/tests/openbb_terminal/econometrics/test_econometrics_view.py @@ -1,9 +1,10 @@ # IMPORTATION THIRDPARTY import pytest +from openbb_terminal.common import common_model + # IMPORTATION INTERNAL from openbb_terminal.econometrics import econometrics_view -from openbb_terminal.common import common_model @pytest.mark.vcr() diff --git a/tests/openbb_terminal/economy/test_economy_controller.py b/tests/openbb_terminal/economy/test_economy_controller.py index 5fb7e54ae6db..7ddb16bcb0ca 100644 --- a/tests/openbb_terminal/economy/test_economy_controller.py +++ b/tests/openbb_terminal/economy/test_economy_controller.py @@ -1,16 +1,16 @@ # IMPORTATION STANDARD -import os import datetime +import os + +import pandas as pd # IMPORTATION THIRDPARTY import pytest -import pandas as pd from pandas import Timestamp # IMPORTATION INTERNAL from openbb_terminal.economy import economy_controller - # pylint: disable=E1101 # pylint: disable=W0603 # pylint: disable=E1111 diff --git a/tests/openbb_terminal/economy/test_economy_helpers.py b/tests/openbb_terminal/economy/test_economy_helpers.py index e4b208126299..dd0d889b3cdc 100644 --- a/tests/openbb_terminal/economy/test_economy_helpers.py +++ b/tests/openbb_terminal/economy/test_economy_helpers.py @@ -1,5 +1,6 @@ import pandas as pd import pytest + from openbb_terminal.economy import economy_helpers diff --git a/tests/openbb_terminal/economy/test_finviz_view.py b/tests/openbb_terminal/economy/test_finviz_view.py index 5ff89135f6dc..6a9a692272af 100644 --- a/tests/openbb_terminal/economy/test_finviz_view.py +++ b/tests/openbb_terminal/economy/test_finviz_view.py @@ -3,9 +3,10 @@ # IMPORTATION THIRDPARTY import pytest +from openbb_terminal import helper_funcs + # IMPORTATION INTERNAL from openbb_terminal.economy import finviz_view -from openbb_terminal import helper_funcs @pytest.fixture(scope="module") diff --git a/tests/openbb_terminal/economy/test_fred_model.py b/tests/openbb_terminal/economy/test_fred_model.py index 7219fde3dd77..5fcc3e0768fc 100644 --- a/tests/openbb_terminal/economy/test_fred_model.py +++ b/tests/openbb_terminal/economy/test_fred_model.py @@ -1,8 +1,8 @@ # IMPORTATION STANDARD # IMPORTATION THIRDPARTY -import pytest import pandas as pd +import pytest # IMPORTATION INTERNAL from openbb_terminal.economy import fred_model diff --git a/tests/openbb_terminal/economy/test_investingcom_model.py b/tests/openbb_terminal/economy/test_investingcom_model.py index 47b98424f4f2..20acca171a07 100644 --- a/tests/openbb_terminal/economy/test_investingcom_model.py +++ b/tests/openbb_terminal/economy/test_investingcom_model.py @@ -2,6 +2,7 @@ # IMPORTATION THIRDPARTY from typing import List, Union + import pandas as pd import pytest diff --git a/tests/openbb_terminal/economy/test_investingcom_view.py b/tests/openbb_terminal/economy/test_investingcom_view.py index 38ac910dc927..54fb01ac249b 100644 --- a/tests/openbb_terminal/economy/test_investingcom_view.py +++ b/tests/openbb_terminal/economy/test_investingcom_view.py @@ -5,6 +5,7 @@ # import pandas as pd from typing import List, Union + import pytest # IMPORTATION INTERNAL diff --git a/tests/openbb_terminal/economy/test_wsj_view.py b/tests/openbb_terminal/economy/test_wsj_view.py index 464f91ba5d09..9aaca56434c6 100644 --- a/tests/openbb_terminal/economy/test_wsj_view.py +++ b/tests/openbb_terminal/economy/test_wsj_view.py @@ -3,9 +3,10 @@ # IMPORTATION THIRDPARTY import pytest +from openbb_terminal import helper_funcs + # IMPORTATION INTERNAL from openbb_terminal.economy import wsj_view -from openbb_terminal import helper_funcs @pytest.mark.vcr diff --git a/tests/openbb_terminal/etf/discovery/test_wsj_view.py b/tests/openbb_terminal/etf/discovery/test_wsj_view.py index b44a2aea3c29..01b0a278909a 100644 --- a/tests/openbb_terminal/etf/discovery/test_wsj_view.py +++ b/tests/openbb_terminal/etf/discovery/test_wsj_view.py @@ -3,9 +3,10 @@ # IMPORTATION THIRDPARTY import pytest +from openbb_terminal import helper_funcs + # IMPORTATION INTERNAL from openbb_terminal.etf.discovery import wsj_view -from openbb_terminal import helper_funcs @pytest.fixture(scope="module") diff --git a/tests/openbb_terminal/etf/screener/test_screener_view.py b/tests/openbb_terminal/etf/screener/test_screener_view.py index 188d8fbe528d..f1ac63fc6c80 100644 --- a/tests/openbb_terminal/etf/screener/test_screener_view.py +++ b/tests/openbb_terminal/etf/screener/test_screener_view.py @@ -3,9 +3,10 @@ # IMPORTATION THIRDPARTY import pytest +from openbb_terminal import helper_funcs + # IMPORTATION INTERNAL from openbb_terminal.etf.screener import screener_view -from openbb_terminal import helper_funcs @pytest.fixture(scope="module") diff --git a/tests/openbb_terminal/etf/test_financedatabase_view.py b/tests/openbb_terminal/etf/test_financedatabase_view.py index 2460b74c77bf..9dcb39e77698 100644 --- a/tests/openbb_terminal/etf/test_financedatabase_view.py +++ b/tests/openbb_terminal/etf/test_financedatabase_view.py @@ -3,9 +3,10 @@ # IMPORTATION THIRDPARTY import pytest +from openbb_terminal import helper_funcs + # IMPORTATION INTERNAL from openbb_terminal.etf import financedatabase_view -from openbb_terminal import helper_funcs @pytest.fixture(scope="module") diff --git a/tests/openbb_terminal/etf/test_stockanalysis_view.py b/tests/openbb_terminal/etf/test_stockanalysis_view.py index a1f39193ea3a..0f6ad0657d89 100644 --- a/tests/openbb_terminal/etf/test_stockanalysis_view.py +++ b/tests/openbb_terminal/etf/test_stockanalysis_view.py @@ -3,9 +3,10 @@ # IMPORTATION THIRDPARTY import pytest +from openbb_terminal import helper_funcs + # IMPORTATION INTERNAL from openbb_terminal.etf import stockanalysis_view -from openbb_terminal import helper_funcs @pytest.fixture(scope="module") diff --git a/tests/openbb_terminal/forecast/conftest.py b/tests/openbb_terminal/forecast/conftest.py index ebc22a5c4512..764764c4ae4c 100644 --- a/tests/openbb_terminal/forecast/conftest.py +++ b/tests/openbb_terminal/forecast/conftest.py @@ -1,7 +1,8 @@ import os + +import pandas as pd import pytest from _pytest.nodes import Node -import pandas as pd def create_path(*path: str) -> str: diff --git a/tests/openbb_terminal/forecast/test_NBEATS_model.py b/tests/openbb_terminal/forecast/test_NBEATS_model.py index 72f6d417822e..ae3884a0f302 100644 --- a/tests/openbb_terminal/forecast/test_NBEATS_model.py +++ b/tests/openbb_terminal/forecast/test_NBEATS_model.py @@ -1,4 +1,5 @@ import pytest + from tests.openbb_terminal.forecast import conftest try: diff --git a/tests/openbb_terminal/forecast/test_TCN_model.py b/tests/openbb_terminal/forecast/test_TCN_model.py index 244029ed9acd..12770986fb50 100644 --- a/tests/openbb_terminal/forecast/test_TCN_model.py +++ b/tests/openbb_terminal/forecast/test_TCN_model.py @@ -1,4 +1,5 @@ import pytest + from tests.openbb_terminal.forecast import conftest try: diff --git a/tests/openbb_terminal/forecast/test_anom_model.py b/tests/openbb_terminal/forecast/test_anom_model.py index 736d0f7b511a..a877abeda076 100644 --- a/tests/openbb_terminal/forecast/test_anom_model.py +++ b/tests/openbb_terminal/forecast/test_anom_model.py @@ -1,4 +1,5 @@ import pytest + from tests.openbb_terminal.forecast import conftest try: diff --git a/tests/openbb_terminal/forecast/test_autoarima_model.py b/tests/openbb_terminal/forecast/test_autoarima_model.py index ab5b0ae898fa..2acc2222d6dc 100644 --- a/tests/openbb_terminal/forecast/test_autoarima_model.py +++ b/tests/openbb_terminal/forecast/test_autoarima_model.py @@ -1,4 +1,5 @@ import pytest + from tests.openbb_terminal.forecast import conftest try: diff --git a/tests/openbb_terminal/forecast/test_autoces_model.py b/tests/openbb_terminal/forecast/test_autoces_model.py index 609a352daa06..a27b7c21aa48 100644 --- a/tests/openbb_terminal/forecast/test_autoces_model.py +++ b/tests/openbb_terminal/forecast/test_autoces_model.py @@ -1,4 +1,5 @@ import pytest + from tests.openbb_terminal.forecast import conftest try: diff --git a/tests/openbb_terminal/forecast/test_autoets_model.py b/tests/openbb_terminal/forecast/test_autoets_model.py index d50a180d5c33..e66e9908d139 100644 --- a/tests/openbb_terminal/forecast/test_autoets_model.py +++ b/tests/openbb_terminal/forecast/test_autoets_model.py @@ -1,4 +1,5 @@ import pytest + from tests.openbb_terminal.forecast import conftest try: diff --git a/tests/openbb_terminal/forecast/test_autoselect_model.py b/tests/openbb_terminal/forecast/test_autoselect_model.py index 6fcb44795582..7bf998c76bb7 100644 --- a/tests/openbb_terminal/forecast/test_autoselect_model.py +++ b/tests/openbb_terminal/forecast/test_autoselect_model.py @@ -1,4 +1,5 @@ import pytest + from tests.openbb_terminal.forecast import conftest try: diff --git a/tests/openbb_terminal/forecast/test_brnn_model.py b/tests/openbb_terminal/forecast/test_brnn_model.py index 7e0f57666c67..f32b419704d1 100644 --- a/tests/openbb_terminal/forecast/test_brnn_model.py +++ b/tests/openbb_terminal/forecast/test_brnn_model.py @@ -1,4 +1,5 @@ import pytest + from tests.openbb_terminal.forecast import conftest try: diff --git a/tests/openbb_terminal/forecast/test_expo_model.py b/tests/openbb_terminal/forecast/test_expo_model.py index f6123595b65f..cfe95f368acd 100644 --- a/tests/openbb_terminal/forecast/test_expo_model.py +++ b/tests/openbb_terminal/forecast/test_expo_model.py @@ -1,4 +1,5 @@ import pytest + from tests.openbb_terminal.forecast import conftest try: diff --git a/tests/openbb_terminal/forecast/test_forecast_controller.py b/tests/openbb_terminal/forecast/test_forecast_controller.py index 59a0bed76d55..69167e15818d 100644 --- a/tests/openbb_terminal/forecast/test_forecast_controller.py +++ b/tests/openbb_terminal/forecast/test_forecast_controller.py @@ -1,7 +1,9 @@ -from typing import List import argparse +from typing import List + import pandas as pd import pytest + from openbb_terminal.custom_prompt_toolkit import NestedCompleter try: diff --git a/tests/openbb_terminal/forecast/test_forecast_model.py b/tests/openbb_terminal/forecast/test_forecast_model.py index d0e9015587bc..961b71119b34 100644 --- a/tests/openbb_terminal/forecast/test_forecast_model.py +++ b/tests/openbb_terminal/forecast/test_forecast_model.py @@ -1,8 +1,10 @@ from typing import Tuple + import pandas as pd import pytest -from openbb_terminal.forecast import forecast_model as fm + from openbb_terminal.common import common_model +from openbb_terminal.forecast import forecast_model as fm from tests.openbb_terminal.forecast import conftest diff --git a/tests/openbb_terminal/forecast/test_linear_model.py b/tests/openbb_terminal/forecast/test_linear_model.py index 07b5ff1b6da6..968416982e26 100644 --- a/tests/openbb_terminal/forecast/test_linear_model.py +++ b/tests/openbb_terminal/forecast/test_linear_model.py @@ -1,4 +1,5 @@ import pytest + from tests.openbb_terminal.forecast import conftest try: diff --git a/tests/openbb_terminal/forecast/test_mstl_model.py b/tests/openbb_terminal/forecast/test_mstl_model.py index c0ad009f121f..da55ec42c414 100644 --- a/tests/openbb_terminal/forecast/test_mstl_model.py +++ b/tests/openbb_terminal/forecast/test_mstl_model.py @@ -1,4 +1,5 @@ import pytest + from tests.openbb_terminal.forecast import conftest try: diff --git a/tests/openbb_terminal/forecast/test_nhits_model.py b/tests/openbb_terminal/forecast/test_nhits_model.py index 8281c96c9c4b..7f103296ac2e 100644 --- a/tests/openbb_terminal/forecast/test_nhits_model.py +++ b/tests/openbb_terminal/forecast/test_nhits_model.py @@ -1,4 +1,5 @@ import pytest + from tests.openbb_terminal.forecast import conftest try: diff --git a/tests/openbb_terminal/forecast/test_regr_model.py b/tests/openbb_terminal/forecast/test_regr_model.py index 7fd1bf3aecd2..4bb79f888af3 100644 --- a/tests/openbb_terminal/forecast/test_regr_model.py +++ b/tests/openbb_terminal/forecast/test_regr_model.py @@ -1,4 +1,5 @@ import pytest + from tests.openbb_terminal.forecast import conftest try: diff --git a/tests/openbb_terminal/forecast/test_rnn_model.py b/tests/openbb_terminal/forecast/test_rnn_model.py index bc9be0da1036..7ceacd44f8c8 100644 --- a/tests/openbb_terminal/forecast/test_rnn_model.py +++ b/tests/openbb_terminal/forecast/test_rnn_model.py @@ -1,4 +1,5 @@ import pytest + from tests.openbb_terminal.forecast import conftest try: diff --git a/tests/openbb_terminal/forecast/test_rwd_model.py b/tests/openbb_terminal/forecast/test_rwd_model.py index 54f2d5478107..f64a67c65e0b 100644 --- a/tests/openbb_terminal/forecast/test_rwd_model.py +++ b/tests/openbb_terminal/forecast/test_rwd_model.py @@ -1,4 +1,5 @@ import pytest + from tests.openbb_terminal.forecast import conftest try: diff --git a/tests/openbb_terminal/forecast/test_seasonalnaive_model.py b/tests/openbb_terminal/forecast/test_seasonalnaive_model.py index f1d89b856a79..e384e5347e05 100644 --- a/tests/openbb_terminal/forecast/test_seasonalnaive_model.py +++ b/tests/openbb_terminal/forecast/test_seasonalnaive_model.py @@ -1,4 +1,5 @@ import pytest + from tests.openbb_terminal.forecast import conftest try: diff --git a/tests/openbb_terminal/forecast/test_tft_model.py b/tests/openbb_terminal/forecast/test_tft_model.py index 882c4d83b8ed..8600109b69ff 100644 --- a/tests/openbb_terminal/forecast/test_tft_model.py +++ b/tests/openbb_terminal/forecast/test_tft_model.py @@ -1,4 +1,5 @@ import pytest + from tests.openbb_terminal.forecast import conftest try: diff --git a/tests/openbb_terminal/forecast/test_theta_model.py b/tests/openbb_terminal/forecast/test_theta_model.py index 711bcf449bef..458ce8334147 100644 --- a/tests/openbb_terminal/forecast/test_theta_model.py +++ b/tests/openbb_terminal/forecast/test_theta_model.py @@ -1,4 +1,5 @@ import pytest + from tests.openbb_terminal.forecast import conftest try: diff --git a/tests/openbb_terminal/forecast/test_trans_model.py b/tests/openbb_terminal/forecast/test_trans_model.py index 8705831c6005..822fb71e085d 100644 --- a/tests/openbb_terminal/forecast/test_trans_model.py +++ b/tests/openbb_terminal/forecast/test_trans_model.py @@ -1,4 +1,5 @@ import pytest + from tests.openbb_terminal.forecast import conftest try: diff --git a/tests/openbb_terminal/forex/quantitative_analysis/test_qa_controller.py b/tests/openbb_terminal/forex/quantitative_analysis/test_qa_controller.py index ca9ca195c1a9..0e3f47bed153 100644 --- a/tests/openbb_terminal/forex/quantitative_analysis/test_qa_controller.py +++ b/tests/openbb_terminal/forex/quantitative_analysis/test_qa_controller.py @@ -9,7 +9,6 @@ from openbb_terminal.forex.quantitative_analysis import qa_controller from tests.test_helpers import no_dfs - DF_PAIR = pd.DataFrame.from_dict( data={ pd.Timestamp("2020-11-30 00:00:00"): { diff --git a/tests/openbb_terminal/forex/test_fxempire_model.py b/tests/openbb_terminal/forex/test_fxempire_model.py index 1f2ef4a7de78..6f1cdf8f3153 100644 --- a/tests/openbb_terminal/forex/test_fxempire_model.py +++ b/tests/openbb_terminal/forex/test_fxempire_model.py @@ -1,4 +1,5 @@ import pytest + from openbb_terminal.forex.fxempire_model import get_forward_rates diff --git a/tests/openbb_terminal/forex/test_fxempire_view.py b/tests/openbb_terminal/forex/test_fxempire_view.py index 1502af4b8535..f316129b158d 100644 --- a/tests/openbb_terminal/forex/test_fxempire_view.py +++ b/tests/openbb_terminal/forex/test_fxempire_view.py @@ -1,4 +1,5 @@ import pytest + from openbb_terminal.forex.fxempire_view import display_forward_rates diff --git a/tests/openbb_terminal/portfolio/brokers/coinbase/test_coinbase_controller.py b/tests/openbb_terminal/portfolio/brokers/coinbase/test_coinbase_controller.py index 46978825613b..d043acb899d3 100644 --- a/tests/openbb_terminal/portfolio/brokers/coinbase/test_coinbase_controller.py +++ b/tests/openbb_terminal/portfolio/brokers/coinbase/test_coinbase_controller.py @@ -1,4 +1,5 @@ import pytest + from openbb_terminal.portfolio.brokers.coinbase import coinbase_controller diff --git a/tests/openbb_terminal/portfolio/brokers/coinbase/test_coinbase_model.py b/tests/openbb_terminal/portfolio/brokers/coinbase/test_coinbase_model.py index ed8b51c94c0c..d2143f412d7d 100644 --- a/tests/openbb_terminal/portfolio/brokers/coinbase/test_coinbase_model.py +++ b/tests/openbb_terminal/portfolio/brokers/coinbase/test_coinbase_model.py @@ -1,4 +1,5 @@ import pytest + import openbb_terminal.portfolio.brokers.coinbase.coinbase_model as cbm diff --git a/tests/openbb_terminal/portfolio/brokers/degiro/test_degiro_controller.py b/tests/openbb_terminal/portfolio/brokers/degiro/test_degiro_controller.py index 5d4382bb4861..67685b3f8b4a 100644 --- a/tests/openbb_terminal/portfolio/brokers/degiro/test_degiro_controller.py +++ b/tests/openbb_terminal/portfolio/brokers/degiro/test_degiro_controller.py @@ -7,6 +7,7 @@ # IMPORTATION INTERNAL from openbb_terminal.portfolio.brokers.degiro import degiro_controller + # pylint: disable=E1101 # pylint: disable=W0603 # pylint: disable=E1111 diff --git a/tests/openbb_terminal/portfolio/brokers/degiro/test_degiro_view.py b/tests/openbb_terminal/portfolio/brokers/degiro/test_degiro_view.py index 419d5b76b66a..cf4d7697c261 100644 --- a/tests/openbb_terminal/portfolio/brokers/degiro/test_degiro_view.py +++ b/tests/openbb_terminal/portfolio/brokers/degiro/test_degiro_view.py @@ -6,7 +6,6 @@ # IMPORTATION INTERNAL from openbb_terminal.portfolio.brokers.degiro.degiro_view import DegiroView - # pylint: disable=E1101 # pylint: disable=W0603 # pylint: disable=E1111 diff --git a/tests/openbb_terminal/portfolio/portfolio_analysis/test_pa_controller.py b/tests/openbb_terminal/portfolio/portfolio_analysis/test_pa_controller.py index c81244eb5b87..8d073dd5b361 100644 --- a/tests/openbb_terminal/portfolio/portfolio_analysis/test_pa_controller.py +++ b/tests/openbb_terminal/portfolio/portfolio_analysis/test_pa_controller.py @@ -7,6 +7,7 @@ # IMPORTATION INTERNAL from openbb_terminal.portfolio.portfolio_analysis import pa_controller + # pylint: disable=E1101 # pylint: disable=W0603 # pylint: disable=E1111 diff --git a/tests/openbb_terminal/portfolio/test_portfolio_controller.py b/tests/openbb_terminal/portfolio/test_portfolio_controller.py index 221ed23d985a..3c0f852a707c 100644 --- a/tests/openbb_terminal/portfolio/test_portfolio_controller.py +++ b/tests/openbb_terminal/portfolio/test_portfolio_controller.py @@ -7,6 +7,7 @@ # IMPORTATION INTERNAL from openbb_terminal.portfolio import portfolio_controller + # pylint: disable=E1101 # pylint: disable=W0603 # pylint: disable=E1111 diff --git a/tests/openbb_terminal/portfolio/test_portfolio_model.py b/tests/openbb_terminal/portfolio/test_portfolio_model.py index e41a457a4cac..e691342d9035 100644 --- a/tests/openbb_terminal/portfolio/test_portfolio_model.py +++ b/tests/openbb_terminal/portfolio/test_portfolio_model.py @@ -2,6 +2,7 @@ # IMPORTATION THIRDPARTY from pathlib import Path + import pandas as pd import pytest diff --git a/tests/openbb_terminal/stocks/backtesting/test_bt_model.py b/tests/openbb_terminal/stocks/backtesting/test_bt_model.py index f2c35a2506bb..6f5cbd5cf800 100644 --- a/tests/openbb_terminal/stocks/backtesting/test_bt_model.py +++ b/tests/openbb_terminal/stocks/backtesting/test_bt_model.py @@ -1,11 +1,12 @@ # IMPORTATION STANDARD from datetime import datetime +# IMPORTATION INTERNAL +import bt + # IMPORTATION THIRDPARTY import pytest -# IMPORTATION INTERNAL -import bt from openbb_terminal.stocks import stocks_helper from openbb_terminal.stocks.backtesting import bt_model diff --git a/tests/openbb_terminal/stocks/behavioural_analysis/test_ba_controller.py b/tests/openbb_terminal/stocks/behavioural_analysis/test_ba_controller.py index 3f775413cb54..89492d09cf5b 100644 --- a/tests/openbb_terminal/stocks/behavioural_analysis/test_ba_controller.py +++ b/tests/openbb_terminal/stocks/behavioural_analysis/test_ba_controller.py @@ -6,9 +6,10 @@ import pandas as pd import pytest +from openbb_terminal import parent_classes + # IMPORTATION INTERNAL from openbb_terminal.stocks.behavioural_analysis import ba_controller -from openbb_terminal import parent_classes # pylint: disable=E1101 # pylint: disable=W0603 diff --git a/tests/openbb_terminal/stocks/behavioural_analysis/test_cramer_view.py b/tests/openbb_terminal/stocks/behavioural_analysis/test_cramer_view.py index 67b8ba806cc3..51cc19c4656a 100644 --- a/tests/openbb_terminal/stocks/behavioural_analysis/test_cramer_view.py +++ b/tests/openbb_terminal/stocks/behavioural_analysis/test_cramer_view.py @@ -1,7 +1,8 @@ # IMPORTATION THIRDPARTY from io import StringIO -import pytest + import pandas as pd +import pytest # IMPORTATION INTERNAL from openbb_terminal.stocks.behavioural_analysis import cramer_view diff --git a/tests/openbb_terminal/stocks/comparison_analysis/test_finviz_compare_view.py b/tests/openbb_terminal/stocks/comparison_analysis/test_finviz_compare_view.py index 85b997e75112..fc27e2f5de94 100644 --- a/tests/openbb_terminal/stocks/comparison_analysis/test_finviz_compare_view.py +++ b/tests/openbb_terminal/stocks/comparison_analysis/test_finviz_compare_view.py @@ -4,9 +4,10 @@ import pandas as pd import pytest +from openbb_terminal import helper_funcs + # IMPORTATION INTERNAL from openbb_terminal.stocks.comparison_analysis import finviz_compare_view -from openbb_terminal import helper_funcs @pytest.mark.skip( diff --git a/tests/openbb_terminal/stocks/dark_pool_shorts/test_sec_view.py b/tests/openbb_terminal/stocks/dark_pool_shorts/test_sec_view.py index 5dbaf7eb1632..42b8d9dff168 100644 --- a/tests/openbb_terminal/stocks/dark_pool_shorts/test_sec_view.py +++ b/tests/openbb_terminal/stocks/dark_pool_shorts/test_sec_view.py @@ -9,7 +9,6 @@ from openbb_terminal.stocks import stocks_helper from openbb_terminal.stocks.dark_pool_shorts import sec_view - df_fails_to_deliver = pd.DataFrame( data={ "SETTLEMENT DATE": [ diff --git a/tests/openbb_terminal/stocks/dark_pool_shorts/test_stocksera_view.py b/tests/openbb_terminal/stocks/dark_pool_shorts/test_stocksera_view.py index ff4adcae979f..7c12794d26c9 100644 --- a/tests/openbb_terminal/stocks/dark_pool_shorts/test_stocksera_view.py +++ b/tests/openbb_terminal/stocks/dark_pool_shorts/test_stocksera_view.py @@ -1,8 +1,8 @@ # IMPORTATION STANDARD # IMPORTATION THIRDPARTY -import pytest import pandas as pd +import pytest # IMPORTATION INTERNAL from openbb_terminal.stocks.dark_pool_shorts import stocksera_view diff --git a/tests/openbb_terminal/stocks/discovery/test_disc_controller.py b/tests/openbb_terminal/stocks/discovery/test_disc_controller.py index d51286400328..c57c4e2e0015 100644 --- a/tests/openbb_terminal/stocks/discovery/test_disc_controller.py +++ b/tests/openbb_terminal/stocks/discovery/test_disc_controller.py @@ -7,6 +7,7 @@ # IMPORTATION INTERNAL from openbb_terminal.stocks.discovery import disc_controller + # pylint: disable=E1101 # pylint: disable=W0603 # pylint: disable=E1111 diff --git a/tests/openbb_terminal/stocks/discovery/test_financedatabase_view.py b/tests/openbb_terminal/stocks/discovery/test_financedatabase_view.py index 7e1fba1a9dee..228872a51494 100644 --- a/tests/openbb_terminal/stocks/discovery/test_financedatabase_view.py +++ b/tests/openbb_terminal/stocks/discovery/test_financedatabase_view.py @@ -3,9 +3,10 @@ # IMPORTATION THIRDPARTY import pytest +from openbb_terminal import helper_funcs + # IMPORTATION INTERNAL from openbb_terminal.stocks.discovery import financedatabase_view -from openbb_terminal import helper_funcs @pytest.mark.default_cassette("test_show_equities") diff --git a/tests/openbb_terminal/stocks/discovery/test_finnhub_view.py b/tests/openbb_terminal/stocks/discovery/test_finnhub_view.py index 910919f94587..6e2ac0e99db1 100644 --- a/tests/openbb_terminal/stocks/discovery/test_finnhub_view.py +++ b/tests/openbb_terminal/stocks/discovery/test_finnhub_view.py @@ -5,7 +5,7 @@ import pytest # IMPORTATION INTERNAL -from openbb_terminal.stocks.discovery import finnhub_view, finnhub_model +from openbb_terminal.stocks.discovery import finnhub_model, finnhub_view @pytest.fixture(scope="module") diff --git a/tests/openbb_terminal/stocks/discovery/test_nasdaq_view.py b/tests/openbb_terminal/stocks/discovery/test_nasdaq_view.py index e0f99de679fe..af84fa7dd68f 100644 --- a/tests/openbb_terminal/stocks/discovery/test_nasdaq_view.py +++ b/tests/openbb_terminal/stocks/discovery/test_nasdaq_view.py @@ -3,9 +3,10 @@ # IMPORTATION THIRDPARTY import pytest +from openbb_terminal import helper_funcs + # IMPORTATION INTERNAL from openbb_terminal.stocks.discovery import nasdaq_view -from openbb_terminal import helper_funcs @pytest.fixture(scope="module") diff --git a/tests/openbb_terminal/stocks/due_diligence/test_ark_model.py b/tests/openbb_terminal/stocks/due_diligence/test_ark_model.py index c6bd46b085bd..b516d4000f7d 100644 --- a/tests/openbb_terminal/stocks/due_diligence/test_ark_model.py +++ b/tests/openbb_terminal/stocks/due_diligence/test_ark_model.py @@ -1,9 +1,9 @@ # IMPORTATION STANDARD # IMPORTATION THIRDPARTY -import requests import pandas as pd import pytest +import requests # IMPORTATION INTERNAL from openbb_terminal.stocks.due_diligence import ark_model diff --git a/tests/openbb_terminal/stocks/due_diligence/test_dd_controller.py b/tests/openbb_terminal/stocks/due_diligence/test_dd_controller.py index 94e107d2feb6..2ba76a15484a 100644 --- a/tests/openbb_terminal/stocks/due_diligence/test_dd_controller.py +++ b/tests/openbb_terminal/stocks/due_diligence/test_dd_controller.py @@ -8,6 +8,7 @@ # IMPORTATION INTERNAL from openbb_terminal.stocks.due_diligence import dd_controller + # pylint: disable=E1101 # pylint: disable=W0603 # pylint: disable=E1111 diff --git a/tests/openbb_terminal/stocks/fundamental_analysis/test_av_view.py b/tests/openbb_terminal/stocks/fundamental_analysis/test_av_view.py index 2c99b89ea9fe..b36fd5df42a9 100644 --- a/tests/openbb_terminal/stocks/fundamental_analysis/test_av_view.py +++ b/tests/openbb_terminal/stocks/fundamental_analysis/test_av_view.py @@ -4,9 +4,10 @@ import pandas as pd import pytest +from openbb_terminal import helper_funcs + # IMPORTATION INTERNAL from openbb_terminal.stocks.fundamental_analysis import av_view -from openbb_terminal import helper_funcs @pytest.fixture(scope="module") diff --git a/tests/openbb_terminal/stocks/fundamental_analysis/test_business_insider_view.py b/tests/openbb_terminal/stocks/fundamental_analysis/test_business_insider_view.py index 7a1946a13fd8..5b64c8d430c7 100644 --- a/tests/openbb_terminal/stocks/fundamental_analysis/test_business_insider_view.py +++ b/tests/openbb_terminal/stocks/fundamental_analysis/test_business_insider_view.py @@ -3,9 +3,10 @@ # IMPORTATION THIRDPARTY import pytest +from openbb_terminal import helper_funcs + # IMPORTATION INTERNAL from openbb_terminal.stocks.fundamental_analysis import business_insider_view -from openbb_terminal import helper_funcs @pytest.fixture(scope="module") diff --git a/tests/openbb_terminal/stocks/fundamental_analysis/test_dcf_model.py b/tests/openbb_terminal/stocks/fundamental_analysis/test_dcf_model.py index e006d1d311cc..aea84a9787ef 100644 --- a/tests/openbb_terminal/stocks/fundamental_analysis/test_dcf_model.py +++ b/tests/openbb_terminal/stocks/fundamental_analysis/test_dcf_model.py @@ -1,8 +1,8 @@ # IMPORTATION STANDARD # IMPORTATION THIRDPARTY -import openpyxl import numpy as np +import openpyxl import pandas as pd import pytest diff --git a/tests/openbb_terminal/stocks/fundamental_analysis/test_dcf_view.py b/tests/openbb_terminal/stocks/fundamental_analysis/test_dcf_view.py index f957f0d4980e..cb49c227464d 100644 --- a/tests/openbb_terminal/stocks/fundamental_analysis/test_dcf_view.py +++ b/tests/openbb_terminal/stocks/fundamental_analysis/test_dcf_view.py @@ -4,7 +4,7 @@ import pytest # IMPORTATION INTERNAL -from openbb_terminal.stocks.fundamental_analysis import dcf_view, dcf_static +from openbb_terminal.stocks.fundamental_analysis import dcf_static, dcf_view @pytest.fixture(scope="module") diff --git a/tests/openbb_terminal/stocks/fundamental_analysis/test_eclect_us_view.py b/tests/openbb_terminal/stocks/fundamental_analysis/test_eclect_us_view.py index 75a0095a6a28..5fa94cb9819c 100644 --- a/tests/openbb_terminal/stocks/fundamental_analysis/test_eclect_us_view.py +++ b/tests/openbb_terminal/stocks/fundamental_analysis/test_eclect_us_view.py @@ -1,8 +1,8 @@ # IMPORTATION STANDARD # IMPORTATION THIRDPARTY -import pytest import pandas as pd +import pytest # IMPORTATION INTERNAL from openbb_terminal.stocks.fundamental_analysis import eclect_us_view diff --git a/tests/openbb_terminal/stocks/fundamental_analysis/test_fa_controller.py b/tests/openbb_terminal/stocks/fundamental_analysis/test_fa_controller.py index 0f77336af372..d41a5b952b4f 100644 --- a/tests/openbb_terminal/stocks/fundamental_analysis/test_fa_controller.py +++ b/tests/openbb_terminal/stocks/fundamental_analysis/test_fa_controller.py @@ -7,6 +7,7 @@ # IMPORTATION INTERNAL from openbb_terminal.stocks.fundamental_analysis import fa_controller + # pylint: disable=E1101 # pylint: disable=W0603 # pylint: disable=E1111 diff --git a/tests/openbb_terminal/stocks/fundamental_analysis/test_finviz_model.py b/tests/openbb_terminal/stocks/fundamental_analysis/test_finviz_model.py index 677c7ff22060..7fdb342d86fd 100644 --- a/tests/openbb_terminal/stocks/fundamental_analysis/test_finviz_model.py +++ b/tests/openbb_terminal/stocks/fundamental_analysis/test_finviz_model.py @@ -2,8 +2,8 @@ # IMPORTATION THIRDPARTY import finviz.main_func -import pytest import pandas as pd +import pytest # IMPORTATION INTERNAL from openbb_terminal.stocks.fundamental_analysis import finviz_model diff --git a/tests/openbb_terminal/stocks/fundamental_analysis/test_finviz_view.py b/tests/openbb_terminal/stocks/fundamental_analysis/test_finviz_view.py index 5e0201ecf8a9..52d6813fdb5c 100644 --- a/tests/openbb_terminal/stocks/fundamental_analysis/test_finviz_view.py +++ b/tests/openbb_terminal/stocks/fundamental_analysis/test_finviz_view.py @@ -4,9 +4,10 @@ import finviz.main_func import pytest +from openbb_terminal import helper_funcs + # IMPORTATION INTERNAL from openbb_terminal.stocks.fundamental_analysis import finviz_view -from openbb_terminal import helper_funcs @pytest.mark.vcr diff --git a/tests/openbb_terminal/stocks/fundamental_analysis/test_fmp_model.py b/tests/openbb_terminal/stocks/fundamental_analysis/test_fmp_model.py index 3d7381ab27c1..94b18b4f43d3 100644 --- a/tests/openbb_terminal/stocks/fundamental_analysis/test_fmp_model.py +++ b/tests/openbb_terminal/stocks/fundamental_analysis/test_fmp_model.py @@ -1,9 +1,9 @@ # IMPORTATION STANDARD # IMPORTATION THIRDPARTY -import pytest import numpy as np import pandas as pd +import pytest # IMPORTATION INTERNAL from openbb_terminal.stocks.fundamental_analysis import fmp_model diff --git a/tests/openbb_terminal/stocks/fundamental_analysis/test_fmp_view.py b/tests/openbb_terminal/stocks/fundamental_analysis/test_fmp_view.py index 94d87369dd54..df2275771486 100644 --- a/tests/openbb_terminal/stocks/fundamental_analysis/test_fmp_view.py +++ b/tests/openbb_terminal/stocks/fundamental_analysis/test_fmp_view.py @@ -3,9 +3,10 @@ # IMPORTATION THIRDPARTY import pytest +from openbb_terminal import helper_funcs + # IMPORTATION INTERNAL from openbb_terminal.stocks.fundamental_analysis import fmp_view -from openbb_terminal import helper_funcs @pytest.fixture(scope="module") diff --git a/tests/openbb_terminal/stocks/fundamental_analysis/test_polygon_view.py b/tests/openbb_terminal/stocks/fundamental_analysis/test_polygon_view.py index 58f783c08a8b..8ae46822beda 100644 --- a/tests/openbb_terminal/stocks/fundamental_analysis/test_polygon_view.py +++ b/tests/openbb_terminal/stocks/fundamental_analysis/test_polygon_view.py @@ -1,4 +1,5 @@ import pytest + from openbb_terminal.stocks.fundamental_analysis import polygon_view diff --git a/tests/openbb_terminal/stocks/government/test_gov_controller.py b/tests/openbb_terminal/stocks/government/test_gov_controller.py index 4be45af0f76b..19e514fd395c 100644 --- a/tests/openbb_terminal/stocks/government/test_gov_controller.py +++ b/tests/openbb_terminal/stocks/government/test_gov_controller.py @@ -4,9 +4,10 @@ # IMPORTATION THIRDPARTY import pytest +from openbb_terminal import parent_classes + # IMPORTATION INTERNAL from openbb_terminal.stocks.government import gov_controller -from openbb_terminal import parent_classes # pylint: disable=E1101 # pylint: disable=W0603 diff --git a/tests/openbb_terminal/stocks/insider/test_openinsider_view.py b/tests/openbb_terminal/stocks/insider/test_openinsider_view.py index ac6360c2f544..4fcbd1680654 100644 --- a/tests/openbb_terminal/stocks/insider/test_openinsider_view.py +++ b/tests/openbb_terminal/stocks/insider/test_openinsider_view.py @@ -1,12 +1,13 @@ # IMPORTATION STANDARD # IMPORTATION THIRDPARTY -import pytest import pandas as pd +import pytest # IMPORTATION INTERNAL from openbb_terminal.stocks.insider import openinsider_view + # pylint: disable=E1101 diff --git a/tests/openbb_terminal/stocks/options/test_chartexchange_view.py b/tests/openbb_terminal/stocks/options/test_chartexchange_view.py index af042de1dcfe..6fe09c440d6c 100644 --- a/tests/openbb_terminal/stocks/options/test_chartexchange_view.py +++ b/tests/openbb_terminal/stocks/options/test_chartexchange_view.py @@ -3,9 +3,10 @@ # IMPORTATION THIRDPARTY import pytest +from openbb_terminal import helper_funcs + # IMPORTATION INTERNAL from openbb_terminal.stocks.options import chartexchange_view -from openbb_terminal import helper_funcs @pytest.fixture(scope="module") diff --git a/tests/openbb_terminal/stocks/options/test_fdscanner_view.py b/tests/openbb_terminal/stocks/options/test_fdscanner_view.py index 3d383740b211..bedd1fb07d05 100644 --- a/tests/openbb_terminal/stocks/options/test_fdscanner_view.py +++ b/tests/openbb_terminal/stocks/options/test_fdscanner_view.py @@ -3,10 +3,10 @@ # IMPORTATION THIRDPARTY import pytest -# IMPORTATION INTERNAL -from openbb_terminal.stocks.options import fdscanner_view from openbb_terminal import helper_funcs +# IMPORTATION INTERNAL +from openbb_terminal.stocks.options import fdscanner_view # pylint: disable=E1101 diff --git a/tests/openbb_terminal/stocks/options/test_options_controller.py b/tests/openbb_terminal/stocks/options/test_options_controller.py index a3b7735540e2..a67f152d8ab8 100644 --- a/tests/openbb_terminal/stocks/options/test_options_controller.py +++ b/tests/openbb_terminal/stocks/options/test_options_controller.py @@ -1,6 +1,6 @@ # IMPORTATION STANDARD -import os import argparse +import os # IMPORTATION THIRDPARTY import pandas as pd diff --git a/tests/openbb_terminal/stocks/options/test_options_view.py b/tests/openbb_terminal/stocks/options/test_options_view.py index e849252cd270..f727a754a47a 100644 --- a/tests/openbb_terminal/stocks/options/test_options_view.py +++ b/tests/openbb_terminal/stocks/options/test_options_view.py @@ -1,18 +1,18 @@ # IMPORTATION STANDARD # IMPORTATION THIRDPARTY -import pytest import pandas as pd +import pytest # IMPORTATION INTERNAL from openbb_terminal.stocks.options.options_view import ( + display_chains, + display_expiry_dates, get_calls_and_puts, - print_raw, - plot_vol, plot_oi, plot_voi, - display_expiry_dates, - display_chains, + plot_vol, + print_raw, ) EXPIRY_DATES = [ diff --git a/tests/openbb_terminal/stocks/options/test_syncretism_view.py b/tests/openbb_terminal/stocks/options/test_syncretism_view.py index 1cc0980adeb3..c01bcc2faa9c 100644 --- a/tests/openbb_terminal/stocks/options/test_syncretism_view.py +++ b/tests/openbb_terminal/stocks/options/test_syncretism_view.py @@ -1,8 +1,8 @@ # IMPORTATION STANDARD # IMPORTATION THIRDPARTY -import pytest import pandas as pd +import pytest # IMPORTATION INTERNAL from openbb_terminal.stocks.options.screen import syncretism_view diff --git a/tests/openbb_terminal/stocks/options/test_tradier_view.py b/tests/openbb_terminal/stocks/options/test_tradier_view.py index 44c0d15c9e30..6dea21f8ac4c 100644 --- a/tests/openbb_terminal/stocks/options/test_tradier_view.py +++ b/tests/openbb_terminal/stocks/options/test_tradier_view.py @@ -1,5 +1,6 @@ # IMPORTATION THIRDPARTY import pytest + from openbb_terminal import rich_config # IMPORTATION INTERNAL diff --git a/tests/openbb_terminal/stocks/quantitative_analysis/test_qa_controller.py b/tests/openbb_terminal/stocks/quantitative_analysis/test_qa_controller.py index ca0652708df2..24b2987d669a 100644 --- a/tests/openbb_terminal/stocks/quantitative_analysis/test_qa_controller.py +++ b/tests/openbb_terminal/stocks/quantitative_analysis/test_qa_controller.py @@ -6,9 +6,10 @@ import pandas as pd import pytest +from openbb_terminal import parent_classes + # IMPORTATION INTERNAL from openbb_terminal.stocks.quantitative_analysis import qa_controller -from openbb_terminal import parent_classes # pylint: disable=E1101 # pylint: disable=W0603 diff --git a/tests/openbb_terminal/stocks/screener/test_finviz_view.py b/tests/openbb_terminal/stocks/screener/test_finviz_view.py index 29be725f9f09..1590cd7b2c6e 100644 --- a/tests/openbb_terminal/stocks/screener/test_finviz_view.py +++ b/tests/openbb_terminal/stocks/screener/test_finviz_view.py @@ -4,9 +4,10 @@ import pandas as pd import pytest +from openbb_terminal import helper_funcs + # IMPORTATION INTERNAL from openbb_terminal.stocks.screener import finviz_view -from openbb_terminal import helper_funcs @pytest.mark.vcr diff --git a/tests/openbb_terminal/stocks/sector_industry_analysis/test_stockanalysis_model.py b/tests/openbb_terminal/stocks/sector_industry_analysis/test_stockanalysis_model.py index aef28909eb8c..ca38c1ebe5d6 100644 --- a/tests/openbb_terminal/stocks/sector_industry_analysis/test_stockanalysis_model.py +++ b/tests/openbb_terminal/stocks/sector_industry_analysis/test_stockanalysis_model.py @@ -1,6 +1,6 @@ # IMPORTATION STANDARD -import pandas as pd import numpy as np +import pandas as pd # IMPORTATION THIRDPARTY import pytest diff --git a/tests/openbb_terminal/stocks/technical_analysis/test_rsp_view.py b/tests/openbb_terminal/stocks/technical_analysis/test_rsp_view.py index f99b3215e8e2..5444589e47c1 100644 --- a/tests/openbb_terminal/stocks/technical_analysis/test_rsp_view.py +++ b/tests/openbb_terminal/stocks/technical_analysis/test_rsp_view.py @@ -6,6 +6,7 @@ # IMPORTATION INTERNAL from openbb_terminal.stocks.technical_analysis import rsp_view + # pylint: disable=E1101 diff --git a/tests/openbb_terminal/stocks/technical_analysis/test_ta_controller.py b/tests/openbb_terminal/stocks/technical_analysis/test_ta_controller.py index 87505b40a713..297c9508ba00 100644 --- a/tests/openbb_terminal/stocks/technical_analysis/test_ta_controller.py +++ b/tests/openbb_terminal/stocks/technical_analysis/test_ta_controller.py @@ -6,9 +6,10 @@ import pandas as pd import pytest +from openbb_terminal.stocks import stocks_helper + # IMPORTATION INTERNAL from openbb_terminal.stocks.technical_analysis import ta_controller -from openbb_terminal.stocks import stocks_helper # pylint: disable=E1101 # pylint: disable=W0603 diff --git a/tests/openbb_terminal/stocks/test_cboe_model.py b/tests/openbb_terminal/stocks/test_cboe_model.py index 7bbbaa0b454a..019a1c181ee8 100644 --- a/tests/openbb_terminal/stocks/test_cboe_model.py +++ b/tests/openbb_terminal/stocks/test_cboe_model.py @@ -1,4 +1,5 @@ import pytest + from openbb_terminal.stocks import cboe_model diff --git a/tests/openbb_terminal/stocks/test_cboe_view.py b/tests/openbb_terminal/stocks/test_cboe_view.py index 1cb8b94dd1b6..a594f6fc0c43 100644 --- a/tests/openbb_terminal/stocks/test_cboe_view.py +++ b/tests/openbb_terminal/stocks/test_cboe_view.py @@ -1,4 +1,5 @@ import pytest + from openbb_terminal.stocks import cboe_view diff --git a/tests/openbb_terminal/stocks/test_stocks_helper.py b/tests/openbb_terminal/stocks/test_stocks_helper.py index d7a6dde2d4cf..afb2484db108 100644 --- a/tests/openbb_terminal/stocks/test_stocks_helper.py +++ b/tests/openbb_terminal/stocks/test_stocks_helper.py @@ -1,15 +1,15 @@ # IMPORTATION STANDARD -from datetime import datetime import os +from datetime import datetime # IMPORTATION THIRDPARTY import pytest -# IMPORTATION INTERNAL -from openbb_terminal.stocks import stocks_helper -from openbb_terminal.stocks import stocks_view from openbb_terminal import helper_funcs +# IMPORTATION INTERNAL +from openbb_terminal.stocks import stocks_helper, stocks_view + @pytest.fixture(scope="module") def vcr_config(): diff --git a/tests/openbb_terminal/test_helper_funcs.py b/tests/openbb_terminal/test_helper_funcs.py index b6c74248e257..b36a064eda17 100644 --- a/tests/openbb_terminal/test_helper_funcs.py +++ b/tests/openbb_terminal/test_helper_funcs.py @@ -6,7 +6,7 @@ import pytest # IMPORTATION INTERNAL -from openbb_terminal.helper_funcs import export_data, check_start_less_than_end +from openbb_terminal.helper_funcs import check_start_less_than_end, export_data # pylint: disable=E1101 # pylint: disable=W0603 diff --git a/tests/openbb_terminal/test_helpers_denomination.py b/tests/openbb_terminal/test_helpers_denomination.py index 5af4983e9cbd..62669951e813 100644 --- a/tests/openbb_terminal/test_helpers_denomination.py +++ b/tests/openbb_terminal/test_helpers_denomination.py @@ -1,18 +1,18 @@ # IMPORTATION STANDARD from typing import Callable + +import pandas as pd import pytest from pandas._typing import Axis from pandas.testing import assert_frame_equal -import pandas as pd # IMPORTATION INTERNAL - from openbb_terminal.helpers_denomination import ( DENOMINATION, - transform as transform_by_denomination, get_denomination, get_denominations, ) +from openbb_terminal.helpers_denomination import transform as transform_by_denomination df = pd.DataFrame( data={"Revenue": [1000000, 2000000, 3000000], "EPS": [3, 4, 5]}, diff --git a/tests/openbb_terminal/test_keys_model.py b/tests/openbb_terminal/test_keys_model.py index 4c78f32323d6..4a971d83b438 100644 --- a/tests/openbb_terminal/test_keys_model.py +++ b/tests/openbb_terminal/test_keys_model.py @@ -1,12 +1,14 @@ import os +from pathlib import Path from typing import List from unittest.mock import patch -from pathlib import Path + import pandas as pd import pytest from openbb_terminal import keys_model + # pylint: disable=R0902,R0903,W1404,C0302 diff --git a/tests/openbb_terminal/test_loggers.py b/tests/openbb_terminal/test_loggers.py index 609fe6f948b3..f2739db88709 100644 --- a/tests/openbb_terminal/test_loggers.py +++ b/tests/openbb_terminal/test_loggers.py @@ -1,11 +1,13 @@ from pathlib import Path + import pytest + from openbb_terminal import loggers from openbb_terminal.core.log.generation.settings import ( - Settings, AppSettings, AWSSettings, LogSettings, + Settings, ) settings = Settings( diff --git a/tests/openbb_terminal/test_terminal_controller.py b/tests/openbb_terminal/test_terminal_controller.py index a4bdb16d2d55..e030045231b9 100644 --- a/tests/openbb_terminal/test_terminal_controller.py +++ b/tests/openbb_terminal/test_terminal_controller.py @@ -1,5 +1,7 @@ from contextlib import contextmanager + import pytest + from openbb_terminal import terminal_controller diff --git a/tests/openbb_terminal/test_terminal_helper.py b/tests/openbb_terminal/test_terminal_helper.py index f11b3002163f..31ce5df312dc 100644 --- a/tests/openbb_terminal/test_terminal_helper.py +++ b/tests/openbb_terminal/test_terminal_helper.py @@ -2,6 +2,7 @@ import unittest from contextlib import contextmanager from unittest.mock import patch + import pytest from openbb_terminal import terminal_helper diff --git a/tests/openbb_terminal/test_thought_of_the_day.py b/tests/openbb_terminal/test_thought_of_the_day.py index f9f09f6ac87b..66be7fc570e0 100644 --- a/tests/openbb_terminal/test_thought_of_the_day.py +++ b/tests/openbb_terminal/test_thought_of_the_day.py @@ -2,12 +2,13 @@ import unittest from unittest import mock +from openbb_terminal import thought_of_the_day + # pylint: disable=unused-import from tests.helpers.tools import ( # noqa: F401 parameterize_from_file, pytest_generate_tests, ) -from openbb_terminal import thought_of_the_day assertions = unittest.TestCase("__init__") diff --git a/tests/website/test_generate_docs.py b/tests/website/test_generate_docs.py index 95413e115aa7..394a9d03af74 100644 --- a/tests/website/test_generate_docs.py +++ b/tests/website/test_generate_docs.py @@ -1,11 +1,10 @@ from typing import Optional + import pytest try: - from website import ( - generate_sdk_markdown as gen_sdk, - generate_terminal_markdown as gen_term, - ) + from website import generate_sdk_markdown as gen_sdk + from website import generate_terminal_markdown as gen_term except ImportError: pytest.skip(allow_module_level=True) diff --git a/website/generate_sdk_markdown.py b/website/generate_sdk_markdown.py index 9990561670dd..eda1123b69cb 100644 --- a/website/generate_sdk_markdown.py +++ b/website/generate_sdk_markdown.py @@ -11,11 +11,11 @@ import pandas as pd from docstring_parser import parse +from openbb_terminal.core.library.trail_map import FORECASTING_TOOLKIT_ENABLED as FORECASTING from openbb_terminal.core.library.trail_map import ( - FORECASTING_TOOLKIT_ENABLED as FORECASTING, MISCELLANEOUS_DIRECTORY, - OPTIMIZATION_TOOLKIT_ENABLED as OPTIMIZATION, ) +from openbb_terminal.core.library.trail_map import OPTIMIZATION_TOOLKIT_ENABLED as OPTIMIZATION from openbb_terminal.rich_config import console from website.controller_doc_classes import sub_names_full as subnames diff --git a/website/generate_terminal_markdown.py b/website/generate_terminal_markdown.py index ed422933cbd4..84e25f64db97 100644 --- a/website/generate_terminal_markdown.py +++ b/website/generate_terminal_markdown.py @@ -12,8 +12,8 @@ from website.controller_doc_classes import ( ControllerDoc, LoadControllersDoc, - sub_names_full as subnames, ) +from website.controller_doc_classes import sub_names_full as subnames website_path = Path(__file__).parent.absolute() USER_PATH = (f"{USER_DATA_DIRECTORY}", "`USER_DATA_DIRECTORY`") From 6ae7946f78a8899262b243bf6209087a2daee887 Mon Sep 17 00:00:00 2001 From: colin99d Date: Thu, 2 Feb 2023 09:19:26 -0500 Subject: [PATCH 2/3] Fixed issues --- .../custom_indicators_view.py | 5 ++++- openbb_terminal/forex/forex_controller.py | 6 ++++- .../portfolio/portfolio_controller.py | 7 +++++- .../parameters/params_controller.py | 5 ++++- .../due_diligence/test_pycoingecko_view.py | 22 +++++++++---------- .../overview/test_coinbase_view.py | 18 +++++++-------- .../overview/test_pycoingecko_view.py | 20 ++++++++--------- website/generate_sdk_markdown.py | 10 ++++++--- 8 files changed, 55 insertions(+), 38 deletions(-) diff --git a/openbb_terminal/common/technical_analysis/custom_indicators_view.py b/openbb_terminal/common/technical_analysis/custom_indicators_view.py index d995b35a17ba..da3be043bf34 100644 --- a/openbb_terminal/common/technical_analysis/custom_indicators_view.py +++ b/openbb_terminal/common/technical_analysis/custom_indicators_view.py @@ -8,7 +8,10 @@ import matplotlib.pyplot as plt import pandas as pd -from openbb_terminal.common.technical_analysis import custom_indicators_model, ta_helpers +from openbb_terminal.common.technical_analysis import ( + custom_indicators_model, + ta_helpers, +) from openbb_terminal.config_plot import PLOT_DPI from openbb_terminal.config_terminal import theme from openbb_terminal.decorators import log_start_end diff --git a/openbb_terminal/forex/forex_controller.py b/openbb_terminal/forex/forex_controller.py index 3badfea92081..3859fb3bdb0f 100644 --- a/openbb_terminal/forex/forex_controller.py +++ b/openbb_terminal/forex/forex_controller.py @@ -14,7 +14,11 @@ from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import check_api_key, log_start_end from openbb_terminal.forex import av_view, forex_helper, fxempire_view -from openbb_terminal.forex.forex_helper import FOREX_SOURCES, SOURCES_INTERVALS, parse_forex_symbol +from openbb_terminal.forex.forex_helper import ( + FOREX_SOURCES, + SOURCES_INTERVALS, + parse_forex_symbol, +) from openbb_terminal.helper_funcs import ( EXPORT_ONLY_RAW_DATA_ALLOWED, export_data, diff --git a/openbb_terminal/portfolio/portfolio_controller.py b/openbb_terminal/portfolio/portfolio_controller.py index 0f18c52dd3e7..66fc00e1ec8c 100644 --- a/openbb_terminal/portfolio/portfolio_controller.py +++ b/openbb_terminal/portfolio/portfolio_controller.py @@ -21,7 +21,12 @@ ) from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.portfolio import attribution_model, portfolio_helper, portfolio_view, statics +from openbb_terminal.portfolio import ( + attribution_model, + portfolio_helper, + portfolio_view, + statics, +) from openbb_terminal.portfolio.portfolio_model import generate_portfolio from openbb_terminal.rich_config import MenuText, console diff --git a/openbb_terminal/portfolio/portfolio_optimization/parameters/params_controller.py b/openbb_terminal/portfolio/portfolio_optimization/parameters/params_controller.py index 623f7a5fc687..15ba1f7276a4 100644 --- a/openbb_terminal/portfolio/portfolio_optimization/parameters/params_controller.py +++ b/openbb_terminal/portfolio/portfolio_optimization/parameters/params_controller.py @@ -12,7 +12,10 @@ from openbb_terminal.decorators import log_start_end from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.portfolio.portfolio_optimization.parameters import params_helpers, params_view +from openbb_terminal.portfolio.portfolio_optimization.parameters import ( + params_helpers, + params_view, +) from openbb_terminal.portfolio.portfolio_optimization.parameters.params_statics import ( AVAILABLE_OPTIONS, DEFAULT_BOOL, diff --git a/tests/openbb_terminal/cryptocurrency/due_diligence/test_pycoingecko_view.py b/tests/openbb_terminal/cryptocurrency/due_diligence/test_pycoingecko_view.py index 691c531c7ec5..f9eca9d8d695 100644 --- a/tests/openbb_terminal/cryptocurrency/due_diligence/test_pycoingecko_view.py +++ b/tests/openbb_terminal/cryptocurrency/due_diligence/test_pycoingecko_view.py @@ -8,7 +8,7 @@ from openbb_terminal.cryptocurrency.cryptocurrency_helpers import ( load, ) -from openbb_terminal.cryptocurrency.due_diligence import pycoingecko_view as dd_pycoingecko_view +from openbb_terminal.cryptocurrency.due_diligence import pycoingecko_view from tests.helpers.helpers import check_print # pylint: disable=unused-import @@ -19,7 +19,7 @@ @pytest.mark.vcr @pytest.mark.record_stdout def test_display_potential_returns(): - dd_pycoingecko_view.display_coin_potential_returns( + pycoingecko_view.display_coin_potential_returns( to_symbol="algorand", from_symbol="bitcoin" ) @@ -51,7 +51,7 @@ class TestCoinGeckoAPI(TestCase): record_mode="none", ) def test_coin_info(self): - dd_pycoingecko_view.display_info(self.coin, export="") + pycoingecko_view.display_info(self.coin, export="") @check_print(assert_in="Homepage") @vcr.use_cassette( @@ -59,7 +59,7 @@ def test_coin_info(self): record_mode="none", ) def test_coin_web(self): - dd_pycoingecko_view.display_web(self.coin, export="") + pycoingecko_view.display_web(self.coin, export="") @check_print(assert_in="Metric") @vcr.use_cassette( @@ -67,7 +67,7 @@ def test_coin_web(self): record_mode="none", ) def test_coin_social(self): - dd_pycoingecko_view.display_social(self.coin, export="") + pycoingecko_view.display_social(self.coin, export="") @check_print(assert_in="Metric") @vcr.use_cassette( @@ -75,7 +75,7 @@ def test_coin_social(self): record_mode="none", ) def test_coin_dev(self): - dd_pycoingecko_view.display_dev(self.coin, export="") + pycoingecko_view.display_dev(self.coin, export="") @check_print(assert_in="Metric") @vcr.use_cassette( @@ -83,7 +83,7 @@ def test_coin_dev(self): record_mode="none", ) def test_coin_ath(self): - dd_pycoingecko_view.display_ath(self.coin, export="", currency="usd") + pycoingecko_view.display_ath(self.coin, export="", currency="usd") @check_print(assert_in="Metric") @vcr.use_cassette( @@ -91,7 +91,7 @@ def test_coin_ath(self): record_mode="none", ) def test_coin_atl(self): - dd_pycoingecko_view.display_atl(self.coin, export="", currency="usd") + pycoingecko_view.display_atl(self.coin, export="", currency="usd") @check_print(assert_in="Metric") @vcr.use_cassette( @@ -99,7 +99,7 @@ def test_coin_atl(self): record_mode="none", ) def test_coin_score(self): - dd_pycoingecko_view.display_score(self.coin, export="") + pycoingecko_view.display_score(self.coin, export="") @check_print(assert_in="Metric") @vcr.use_cassette( @@ -107,7 +107,7 @@ def test_coin_score(self): record_mode="none", ) def test_coin_bc(self): - dd_pycoingecko_view.display_bc(self.coin, export="") + pycoingecko_view.display_bc(self.coin, export="") @check_print(assert_in="Metric") @vcr.use_cassette( @@ -115,4 +115,4 @@ def test_coin_bc(self): record_mode="none", ) def test_coin_market(self): - dd_pycoingecko_view.display_market(self.coin, export="") + pycoingecko_view.display_market(self.coin, export="") diff --git a/tests/openbb_terminal/cryptocurrency/overview/test_coinbase_view.py b/tests/openbb_terminal/cryptocurrency/overview/test_coinbase_view.py index dc6fed8a1400..e8f344770f2d 100644 --- a/tests/openbb_terminal/cryptocurrency/overview/test_coinbase_view.py +++ b/tests/openbb_terminal/cryptocurrency/overview/test_coinbase_view.py @@ -1,8 +1,8 @@ import pytest -from openbb_terminal.cryptocurrency.due_diligence import coinbase_view as dd_coinbase_view +from openbb_terminal.cryptocurrency.due_diligence import coinbase_view as dcv from openbb_terminal.cryptocurrency.overview import coinbase_view as ov_coinbase_view -from openbb_terminal.portfolio.brokers.coinbase import coinbase_view as bro_coinbase_view +from openbb_terminal.portfolio.brokers.coinbase import coinbase_view as bcv from tests.helpers.helpers import check_print @@ -20,7 +20,7 @@ def test_display_candles(mocker): [1631232000, 0.07088, 0.07476, 0.07382, 0.07159, 13264.33844153], [1631145600, 0.07369, 0.07669, 0.07599, 0.07378, 12462.35265359], ] - dd_coinbase_view.display_candles("ETH-BTC", "1day", "") + dcv.display_candles("ETH-BTC", "1day", "") @check_print(assert_in="Value") @@ -40,7 +40,7 @@ def test_display_stats(mocker): "last": "3333.19000000", "volume_30day": "1019451.11188405", } - dd_coinbase_view.display_stats("ETH-USDT", "") + dcv.display_stats("ETH-USDT", "") @check_print(assert_in="price") @@ -68,7 +68,7 @@ def test_display_trades(mocker): "side": "sell", }, ] - dd_coinbase_view.display_trades("ETH-USDT", limit=100, side=None, export="") + dcv.display_trades("ETH-USDT", limit=100, side=None, export="") @check_print(assert_in="product_id") @@ -127,7 +127,7 @@ def test_display_orders(mocker): "settled": False, }, ] - bro_coinbase_view.display_orders(2, "created_at", descend=True, export="") + bcv.display_orders(2, "created_at", descend=True, export="") @check_print(assert_in="crypto_address") @@ -185,9 +185,7 @@ def test_display_deposits(mocker): }, ], ) - bro_coinbase_view.display_deposits( - 2, "created_at", "deposit", descend=True, export="" - ) + bcv.display_deposits(2, "created_at", "deposit", descend=True, export="") @check_print(assert_in="balance") @@ -225,7 +223,7 @@ def test_display_history(mocker): }, }, ] - bro_coinbase_view.display_history("ETH", "", None, 2) + bcv.display_history("ETH", "", None, 2) @check_print(assert_in="base_currency") diff --git a/tests/openbb_terminal/cryptocurrency/overview/test_pycoingecko_view.py b/tests/openbb_terminal/cryptocurrency/overview/test_pycoingecko_view.py index 85c5cb5a80b6..e5b3f4d5379a 100644 --- a/tests/openbb_terminal/cryptocurrency/overview/test_pycoingecko_view.py +++ b/tests/openbb_terminal/cryptocurrency/overview/test_pycoingecko_view.py @@ -1,6 +1,6 @@ import pytest -from openbb_terminal.cryptocurrency.overview import pycoingecko_view as ov_pycoingecko_view +from openbb_terminal.cryptocurrency.overview import pycoingecko_view # pylint: disable=unused-import @@ -10,7 +10,7 @@ @pytest.mark.record_stdout @pytest.mark.vcr() def test_coin_holdings_overview(): - ov_pycoingecko_view.display_holdings_overview( + pycoingecko_view.display_holdings_overview( symbol="bitcoin", show_bar=False, export="", limit=20 ) @@ -18,7 +18,7 @@ def test_coin_holdings_overview(): @pytest.mark.record_stdout @pytest.mark.vcr() def test_coin_categories(): - ov_pycoingecko_view.display_categories( + pycoingecko_view.display_categories( limit=15, export="", pie=False, sortby="market_cap" ) @@ -26,7 +26,7 @@ def test_coin_categories(): @pytest.mark.record_stdout @pytest.mark.vcr() def test_coin_stablecoins(): - ov_pycoingecko_view.display_stablecoins( + pycoingecko_view.display_stablecoins( limit=15, export="", sortby="Market_Cap_[$]", pie=False, ascend=False ) @@ -34,7 +34,7 @@ def test_coin_stablecoins(): @pytest.mark.record_stdout @pytest.mark.vcr() def test_coin_exchanges(): - ov_pycoingecko_view.display_exchanges( + pycoingecko_view.display_exchanges( limit=15, sortby="Rank", ascend=True, links=False, export="" ) @@ -42,13 +42,13 @@ def test_coin_exchanges(): @pytest.mark.record_stdout @pytest.mark.vcr() def test_coin_indexes(): - ov_pycoingecko_view.display_indexes(limit=15, ascend=True, export="") + pycoingecko_view.display_indexes(limit=15, ascend=True, export="") @pytest.mark.record_stdout @pytest.mark.vcr() def test_coin_derivatives(): - ov_pycoingecko_view.display_derivatives( + pycoingecko_view.display_derivatives( limit=15, sortby="Rank", ascend=True, export="" ) @@ -56,7 +56,7 @@ def test_coin_derivatives(): @pytest.mark.record_stdout @pytest.mark.vcr() def test_coin_exchange_rates(): - ov_pycoingecko_view.display_exchange_rates( + pycoingecko_view.display_exchange_rates( limit=15, sortby="Index", ascend=True, export="" ) @@ -64,10 +64,10 @@ def test_coin_exchange_rates(): @pytest.mark.record_stdout @pytest.mark.vcr() def test_coin_global_market_info(): - ov_pycoingecko_view.display_global_market_info(export="", pie=False) + pycoingecko_view.display_global_market_info(export="", pie=False) @pytest.mark.record_stdout @pytest.mark.vcr() def test_coin_global_defi_info(): - ov_pycoingecko_view.display_global_defi_info(export="") + pycoingecko_view.display_global_defi_info(export="") diff --git a/website/generate_sdk_markdown.py b/website/generate_sdk_markdown.py index eda1123b69cb..0d3de1452743 100644 --- a/website/generate_sdk_markdown.py +++ b/website/generate_sdk_markdown.py @@ -1,4 +1,4 @@ -import csv +import csv # noqa: I001 import importlib import inspect import json @@ -11,11 +11,15 @@ import pandas as pd from docstring_parser import parse -from openbb_terminal.core.library.trail_map import FORECASTING_TOOLKIT_ENABLED as FORECASTING +from openbb_terminal.core.library.trail_map import ( + FORECASTING_TOOLKIT_ENABLED as FORECASTING, +) from openbb_terminal.core.library.trail_map import ( MISCELLANEOUS_DIRECTORY, ) -from openbb_terminal.core.library.trail_map import OPTIMIZATION_TOOLKIT_ENABLED as OPTIMIZATION +from openbb_terminal.core.library.trail_map import ( + OPTIMIZATION_TOOLKIT_ENABLED as OPTIMIZATION, +) from openbb_terminal.rich_config import console from website.controller_doc_classes import sub_names_full as subnames From 72ec76d7e9d60f7dd127d28432a16c404c4e8fc1 Mon Sep 17 00:00:00 2001 From: colin99d Date: Sat, 4 Feb 2023 20:40:40 -0500 Subject: [PATCH 3/3] FIxed linters --- .../alternative/realestate/landRegistry_model.py | 3 ++- .../alternative/realestate/landRegistry_view.py | 4 ++-- .../alternative/realestate/realestate_controller.py | 9 ++++----- openbb_terminal/mutual_funds/mstarpy_view.py | 8 ++++---- openbb_terminal/mutual_funds/mutual_fund_controller.py | 4 +--- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/openbb_terminal/alternative/realestate/landRegistry_model.py b/openbb_terminal/alternative/realestate/landRegistry_model.py index 107be49ff8de..61ed6a4efdce 100644 --- a/openbb_terminal/alternative/realestate/landRegistry_model.py +++ b/openbb_terminal/alternative/realestate/landRegistry_model.py @@ -1,8 +1,9 @@ """ UK Land Registry Model """ __docformat__ = "numpy" -import logging import io +import logging + import pandas as pd from SPARQLWrapper.Wrapper import CSV, SPARQLWrapper diff --git a/openbb_terminal/alternative/realestate/landRegistry_view.py b/openbb_terminal/alternative/realestate/landRegistry_view.py index f2ca955ccc7b..f0d79928a360 100644 --- a/openbb_terminal/alternative/realestate/landRegistry_view.py +++ b/openbb_terminal/alternative/realestate/landRegistry_view.py @@ -4,9 +4,9 @@ import logging import os -from openbb_terminal.decorators import log_start_end from openbb_terminal.alternative.realestate import landRegistry_model -from openbb_terminal.helper_funcs import print_rich_table, export_data +from openbb_terminal.decorators import log_start_end +from openbb_terminal.helper_funcs import export_data, print_rich_table from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/alternative/realestate/realestate_controller.py b/openbb_terminal/alternative/realestate/realestate_controller.py index e6c6c64a5caf..e9d2702f35a6 100644 --- a/openbb_terminal/alternative/realestate/realestate_controller.py +++ b/openbb_terminal/alternative/realestate/realestate_controller.py @@ -6,18 +6,17 @@ from datetime import datetime, timedelta from typing import List -from openbb_terminal.custom_prompt_toolkit import NestedCompleter - from openbb_terminal import feature_flags as obbff +from openbb_terminal.alternative.realestate import landRegistry_view +from openbb_terminal.custom_prompt_toolkit import NestedCompleter from openbb_terminal.decorators import log_start_end -from openbb_terminal.menu import session from openbb_terminal.helper_funcs import ( EXPORT_ONLY_RAW_DATA_ALLOWED, check_positive, ) -from openbb_terminal.rich_config import console, MenuText +from openbb_terminal.menu import session from openbb_terminal.parent_classes import BaseController -from openbb_terminal.alternative.realestate import landRegistry_view +from openbb_terminal.rich_config import MenuText, console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/mutual_funds/mstarpy_view.py b/openbb_terminal/mutual_funds/mstarpy_view.py index 65c643ff5ecf..c8b59e7a6cda 100644 --- a/openbb_terminal/mutual_funds/mstarpy_view.py +++ b/openbb_terminal/mutual_funds/mstarpy_view.py @@ -1,18 +1,18 @@ import logging from typing import Union -import mstarpy import matplotlib.pyplot as plt +import mstarpy import numpy as np import pandas as pd -from openbb_terminal.mutual_funds.mutual_funds_utils import mapping_country -from openbb_terminal.mutual_funds import mstarpy_model -from openbb_terminal.rich_config import console from openbb_terminal.decorators import log_start_end from openbb_terminal.helper_funcs import ( print_rich_table, ) +from openbb_terminal.mutual_funds import mstarpy_model +from openbb_terminal.mutual_funds.mutual_funds_utils import mapping_country +from openbb_terminal.rich_config import console logger = logging.getLogger(__name__) diff --git a/openbb_terminal/mutual_funds/mutual_fund_controller.py b/openbb_terminal/mutual_funds/mutual_fund_controller.py index 43d91effbf4c..1ef4a2f466e8 100644 --- a/openbb_terminal/mutual_funds/mutual_fund_controller.py +++ b/openbb_terminal/mutual_funds/mutual_fund_controller.py @@ -6,6 +6,7 @@ import os from datetime import datetime, timedelta from typing import List + import pandas as pd from openbb_terminal import feature_flags as obbff @@ -19,9 +20,6 @@ from openbb_terminal.menu import session from openbb_terminal.mutual_funds import ( avanza_view, - investpy_model, - investpy_view, - yfinance_view, mstarpy_view, ) from openbb_terminal.mutual_funds.mutual_funds_utils import mapping_country