diff --git a/freqtrade/commands/list_commands.py b/freqtrade/commands/list_commands.py index 494ee87fa..af6e4571f 100644 --- a/freqtrade/commands/list_commands.py +++ b/freqtrade/commands/list_commands.py @@ -12,9 +12,9 @@ from freqtrade.configuration import setup_utils_configuration from freqtrade.enums import RunMode from freqtrade.exceptions import ConfigurationError, OperationalException from freqtrade.exchange import list_available_exchanges, market_is_active +from freqtrade.ft_types import ValidExchangesType from freqtrade.misc import parse_db_uri_for_logging, plural from freqtrade.resolvers import ExchangeResolver, StrategyResolver -from freqtrade.types.valid_exchanges_type import ValidExchangesType from freqtrade.util import print_rich_table diff --git a/freqtrade/data/btanalysis.py b/freqtrade/data/btanalysis.py index a237b10f1..580807a76 100644 --- a/freqtrade/data/btanalysis.py +++ b/freqtrade/data/btanalysis.py @@ -13,10 +13,10 @@ import pandas as pd from freqtrade.constants import LAST_BT_RESULT_FN, IntOrInf from freqtrade.exceptions import ConfigurationError, OperationalException +from freqtrade.ft_types import BacktestHistoryEntryType, BacktestResultType from freqtrade.misc import file_dump_json, json_load from freqtrade.optimize.backtest_caching import get_backtest_metadata_filename from freqtrade.persistence import LocalTrade, Trade, init_db -from freqtrade.types import BacktestHistoryEntryType, BacktestResultType logger = logging.getLogger(__name__) diff --git a/freqtrade/exchange/exchange_utils.py b/freqtrade/exchange/exchange_utils.py index fc3824dcf..c150d751b 100644 --- a/freqtrade/exchange/exchange_utils.py +++ b/freqtrade/exchange/exchange_utils.py @@ -26,7 +26,7 @@ from freqtrade.exchange.common import ( SUPPORTED_EXCHANGES, ) from freqtrade.exchange.exchange_utils_timeframe import timeframe_to_minutes, timeframe_to_prev_date -from freqtrade.types import ValidExchangesType +from freqtrade.ft_types import ValidExchangesType from freqtrade.util import FtPrecise diff --git a/freqtrade/types/__init__.py b/freqtrade/ft_types/__init__.py similarity index 52% rename from freqtrade/types/__init__.py rename to freqtrade/ft_types/__init__.py index 6420baba0..2eb4e5dda 100644 --- a/freqtrade/types/__init__.py +++ b/freqtrade/ft_types/__init__.py @@ -1,8 +1,8 @@ # flake8: noqa: F401 -from freqtrade.types.backtest_result_type import ( +from freqtrade.ft_types.backtest_result_type import ( BacktestHistoryEntryType, BacktestMetadataType, BacktestResultType, get_BacktestResultType_default, ) -from freqtrade.types.valid_exchanges_type import ValidExchangesType +from freqtrade.ft_types.valid_exchanges_type import ValidExchangesType diff --git a/freqtrade/types/backtest_result_type.py b/freqtrade/ft_types/backtest_result_type.py similarity index 100% rename from freqtrade/types/backtest_result_type.py rename to freqtrade/ft_types/backtest_result_type.py diff --git a/freqtrade/types/valid_exchanges_type.py b/freqtrade/ft_types/valid_exchanges_type.py similarity index 100% rename from freqtrade/types/valid_exchanges_type.py rename to freqtrade/ft_types/valid_exchanges_type.py diff --git a/freqtrade/optimize/backtesting.py b/freqtrade/optimize/backtesting.py index 1487d9f10..7ea0b44c9 100644 --- a/freqtrade/optimize/backtesting.py +++ b/freqtrade/optimize/backtesting.py @@ -36,6 +36,7 @@ from freqtrade.exchange import ( timeframe_to_seconds, ) from freqtrade.exchange.exchange import Exchange +from freqtrade.ft_types import BacktestResultType, get_BacktestResultType_default from freqtrade.mixins import LoggingMixin from freqtrade.optimize.backtest_caching import get_strategy_run_id from freqtrade.optimize.bt_progress import BTProgress @@ -61,7 +62,6 @@ from freqtrade.plugins.protectionmanager import ProtectionManager from freqtrade.resolvers import ExchangeResolver, StrategyResolver from freqtrade.strategy.interface import IStrategy from freqtrade.strategy.strategy_wrapper import strategy_safe_wrapper -from freqtrade.types import BacktestResultType, get_BacktestResultType_default from freqtrade.util import FtPrecise from freqtrade.util.migrations import migrate_data from freqtrade.wallets import Wallets diff --git a/freqtrade/optimize/optimize_reports/bt_output.py b/freqtrade/optimize/optimize_reports/bt_output.py index 620b6da7e..ef58975ca 100644 --- a/freqtrade/optimize/optimize_reports/bt_output.py +++ b/freqtrade/optimize/optimize_reports/bt_output.py @@ -2,8 +2,8 @@ import logging from typing import Any, Dict, List, Literal, Union from freqtrade.constants import UNLIMITED_STAKE_AMOUNT, Config +from freqtrade.ft_types import BacktestResultType from freqtrade.optimize.optimize_reports.optimize_reports import generate_periodic_breakdown_stats -from freqtrade.types import BacktestResultType from freqtrade.util import decimals_per_coin, fmt_coin, print_rich_table diff --git a/freqtrade/optimize/optimize_reports/bt_storage.py b/freqtrade/optimize/optimize_reports/bt_storage.py index ea8991337..2953c65e7 100644 --- a/freqtrade/optimize/optimize_reports/bt_storage.py +++ b/freqtrade/optimize/optimize_reports/bt_storage.py @@ -5,9 +5,9 @@ from typing import Dict, Optional from pandas import DataFrame from freqtrade.constants import LAST_BT_RESULT_FN +from freqtrade.ft_types import BacktestResultType from freqtrade.misc import file_dump_joblib, file_dump_json from freqtrade.optimize.backtest_caching import get_backtest_metadata_filename -from freqtrade.types import BacktestResultType logger = logging.getLogger(__name__) diff --git a/freqtrade/optimize/optimize_reports/optimize_reports.py b/freqtrade/optimize/optimize_reports/optimize_reports.py index ef5fce0e1..38a6cfbf8 100644 --- a/freqtrade/optimize/optimize_reports/optimize_reports.py +++ b/freqtrade/optimize/optimize_reports/optimize_reports.py @@ -17,7 +17,7 @@ from freqtrade.data.metrics import ( calculate_sharpe, calculate_sortino, ) -from freqtrade.types import BacktestResultType +from freqtrade.ft_types import BacktestResultType from freqtrade.util import decimals_per_coin, fmt_coin diff --git a/freqtrade/rpc/api_server/api_backtest.py b/freqtrade/rpc/api_server/api_backtest.py index 4295d9d19..e4b598807 100644 --- a/freqtrade/rpc/api_server/api_backtest.py +++ b/freqtrade/rpc/api_server/api_backtest.py @@ -21,6 +21,7 @@ from freqtrade.data.btanalysis import ( from freqtrade.enums import BacktestState from freqtrade.exceptions import ConfigurationError, DependencyException, OperationalException from freqtrade.exchange.common import remove_exchange_credentials +from freqtrade.ft_types import get_BacktestResultType_default from freqtrade.misc import deep_merge_dicts, is_file_in_dir from freqtrade.rpc.api_server.api_schemas import ( BacktestHistoryEntry, @@ -32,7 +33,6 @@ from freqtrade.rpc.api_server.api_schemas import ( from freqtrade.rpc.api_server.deps import get_config from freqtrade.rpc.api_server.webserver_bgwork import ApiBG from freqtrade.rpc.rpc import RPCException -from freqtrade.types import get_BacktestResultType_default logger = logging.getLogger(__name__) diff --git a/freqtrade/rpc/api_server/api_schemas.py b/freqtrade/rpc/api_server/api_schemas.py index 6ba65d0ec..e3e23d211 100644 --- a/freqtrade/rpc/api_server/api_schemas.py +++ b/freqtrade/rpc/api_server/api_schemas.py @@ -5,7 +5,7 @@ from pydantic import AwareDatetime, BaseModel, RootModel, SerializeAsAny from freqtrade.constants import IntOrInf from freqtrade.enums import MarginMode, OrderTypeValues, SignalDirection, TradingMode -from freqtrade.types import ValidExchangesType +from freqtrade.ft_types import ValidExchangesType class ExchangeModePayloadMixin(BaseModel):