diff --git a/freqtrade/enums/candletype.py b/freqtrade/enums/candletype.py index eb7ae50b8..dddabdb70 100644 --- a/freqtrade/enums/candletype.py +++ b/freqtrade/enums/candletype.py @@ -1,7 +1,7 @@ -from enum import Enum +from enum import StrEnum -class CandleType(str, Enum): +class CandleType(StrEnum): """Enum to distinguish candle types""" SPOT = "spot" @@ -14,9 +14,6 @@ class CandleType(str, Enum): FUNDING_RATE = "funding_rate" # BORROW_RATE = "borrow_rate" # * unimplemented - def __str__(self): - return f"{self.name.lower()}" - @staticmethod def from_string(value: str) -> "CandleType": if not value: diff --git a/freqtrade/enums/marginmode.py b/freqtrade/enums/marginmode.py index f1a4a3a17..69e99b2ea 100644 --- a/freqtrade/enums/marginmode.py +++ b/freqtrade/enums/marginmode.py @@ -1,7 +1,7 @@ -from enum import Enum +from enum import StrEnum -class MarginMode(str, Enum): +class MarginMode(StrEnum): """ Enum to distinguish between cross margin/futures margin_mode and @@ -11,6 +11,3 @@ class MarginMode(str, Enum): CROSS = "cross" ISOLATED = "isolated" NONE = "" - - def __str__(self): - return f"{self.value.lower()}" diff --git a/freqtrade/enums/ordertypevalue.py b/freqtrade/enums/ordertypevalue.py index 3a253166d..9727887a6 100644 --- a/freqtrade/enums/ordertypevalue.py +++ b/freqtrade/enums/ordertypevalue.py @@ -1,6 +1,6 @@ -from enum import Enum +from enum import StrEnum -class OrderTypeValues(str, Enum): +class OrderTypeValues(StrEnum): limit = "limit" market = "market" diff --git a/freqtrade/enums/pricetype.py b/freqtrade/enums/pricetype.py index f2e3bef23..456c9daad 100644 --- a/freqtrade/enums/pricetype.py +++ b/freqtrade/enums/pricetype.py @@ -1,7 +1,7 @@ -from enum import Enum +from enum import StrEnum -class PriceType(str, Enum): +class PriceType(StrEnum): """Enum to distinguish possible trigger prices for stoplosses""" LAST = "last" diff --git a/freqtrade/enums/rpcmessagetype.py b/freqtrade/enums/rpcmessagetype.py index 6fdd788e8..bf7019322 100644 --- a/freqtrade/enums/rpcmessagetype.py +++ b/freqtrade/enums/rpcmessagetype.py @@ -1,7 +1,7 @@ -from enum import Enum +from enum import StrEnum -class RPCMessageType(str, Enum): +class RPCMessageType(StrEnum): STATUS = "status" WARNING = "warning" EXCEPTION = "exception" @@ -25,21 +25,16 @@ class RPCMessageType(str, Enum): NEW_CANDLE = "new_candle" def __repr__(self): - return self.value - - def __str__(self): + # TODO: do we still need to overwrite __repr__? Impact needs to be looked at in detail return self.value # Enum for parsing requests from ws consumers -class RPCRequestType(str, Enum): +class RPCRequestType(StrEnum): SUBSCRIBE = "subscribe" WHITELIST = "whitelist" ANALYZED_DF = "analyzed_df" - def __str__(self): - return self.value - NO_ECHO_MESSAGES = (RPCMessageType.ANALYZED_DF, RPCMessageType.WHITELIST, RPCMessageType.NEW_CANDLE) diff --git a/freqtrade/enums/runmode.py b/freqtrade/enums/runmode.py index f3316629a..ee0f97fb2 100644 --- a/freqtrade/enums/runmode.py +++ b/freqtrade/enums/runmode.py @@ -1,7 +1,7 @@ -from enum import Enum +from enum import StrEnum -class RunMode(str, Enum): +class RunMode(StrEnum): """ Bot running mode (backtest, hyperopt, ...) can be "live", "dry-run", "backtest", "hyperopt". diff --git a/freqtrade/enums/signaltype.py b/freqtrade/enums/signaltype.py index 267a37ab3..deafce2d7 100644 --- a/freqtrade/enums/signaltype.py +++ b/freqtrade/enums/signaltype.py @@ -1,4 +1,4 @@ -from enum import Enum +from enum import Enum, StrEnum class SignalType(Enum): @@ -27,9 +27,6 @@ class SignalTagType(Enum): return f"{self.name.lower()}" -class SignalDirection(str, Enum): +class SignalDirection(StrEnum): LONG = "long" SHORT = "short" - - def __str__(self): - return f"{self.name.lower()}" diff --git a/freqtrade/enums/tradingmode.py b/freqtrade/enums/tradingmode.py index a681d60f9..7f025b033 100644 --- a/freqtrade/enums/tradingmode.py +++ b/freqtrade/enums/tradingmode.py @@ -1,7 +1,7 @@ -from enum import Enum +from enum import StrEnum -class TradingMode(str, Enum): +class TradingMode(StrEnum): """ Enum to distinguish between spot, margin, futures or any other trading method @@ -10,6 +10,3 @@ class TradingMode(str, Enum): SPOT = "spot" MARGIN = "margin" FUTURES = "futures" - - def __str__(self): - return f"{self.name.lower()}" diff --git a/freqtrade/persistence/key_value_store.py b/freqtrade/persistence/key_value_store.py index 0d5a97fa1..310e82b4b 100644 --- a/freqtrade/persistence/key_value_store.py +++ b/freqtrade/persistence/key_value_store.py @@ -1,5 +1,5 @@ from datetime import UTC, datetime -from enum import Enum +from enum import StrEnum from typing import ClassVar, Literal from sqlalchemy import String @@ -11,7 +11,7 @@ from freqtrade.persistence.base import ModelBase, SessionType ValueTypes = str | datetime | float | int -class ValueTypesEnum(str, Enum): +class ValueTypesEnum(StrEnum): STRING = "str" DATETIME = "datetime" FLOAT = "float" diff --git a/freqtrade/plugins/pairlist/IPairList.py b/freqtrade/plugins/pairlist/IPairList.py index 9cb5d7744..aa5f2c166 100644 --- a/freqtrade/plugins/pairlist/IPairList.py +++ b/freqtrade/plugins/pairlist/IPairList.py @@ -5,7 +5,7 @@ PairList Handler base class import logging from abc import ABC, abstractmethod from copy import deepcopy -from enum import Enum +from enum import StrEnum from typing import Any, Literal, TypedDict from freqtrade.constants import Config @@ -58,7 +58,7 @@ PairlistParameter = ( ) -class SupportsBacktesting(str, Enum): +class SupportsBacktesting(StrEnum): """ Enum to indicate if a Pairlist Handler supports backtesting. """