diff --git a/user_data/strategies/BreakEven.py b/user_data/strategies/BreakEven.py index b405890..0e73b86 100644 --- a/user_data/strategies/BreakEven.py +++ b/user_data/strategies/BreakEven.py @@ -1,6 +1,7 @@ # --- Do not remove these libs --- -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from pandas import DataFrame + # -------------------------------- @@ -12,13 +13,13 @@ class BreakEven(IStrategy): I can "/stopbuy" and wait for the positions to get closed by the bot rules, which is waiting for some profit, etc -- this usually takes too long... - + What I would prefer is to close everything that is over 0% profit to avoid the losses. Here's a simple strategy with empty buy/sell signals and "minimal_roi = { 0 : 0 }" that sells everything already at profit and wait until the positions at loss will come to break even point (or the small profit you provide in ROI table). - + You may restart the bot with the new strategy as a command-line parameter. Another way would be to specify the original strategy in the config file, then change to @@ -29,7 +30,7 @@ class BreakEven(IStrategy): # This attribute will be overridden if the config file contains "minimal_roi" minimal_roi = { "0": 0.01, # at least 1% at first - "10": 0 # after 10min, everything goes + "10": 0 # after 10min, everything goes } # This is more radical version that sells everything above the profit level diff --git a/user_data/strategies/Diamond.py b/user_data/strategies/Diamond.py index d69e79e..8eafad7 100644 --- a/user_data/strategies/Diamond.py +++ b/user_data/strategies/Diamond.py @@ -40,8 +40,7 @@ # * 7/10: 117 trades. 74/41/2 Wins/Draws/Losses. Avg profit 1.91%. Median profit 1.50%. Total profit 0.07370921 BTC ( 73.71%). Avg duration 9:26:00 min. Objective: -0.07371 # --- Do not remove these libs --- -from freqtrade.strategy.hyper import CategoricalParameter, DecimalParameter, IntParameter -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import CategoricalParameter, DecimalParameter, IntParameter, IStrategy from pandas import DataFrame # -------------------------------- diff --git a/user_data/strategies/GodStra.py b/user_data/strategies/GodStra.py index ecd7878..28f85ab 100644 --- a/user_data/strategies/GodStra.py +++ b/user_data/strategies/GodStra.py @@ -11,21 +11,22 @@ # --- Do not remove these libs --- import logging +from functools import reduce -from numpy.lib import math -from freqtrade.strategy.interface import IStrategy -from pandas import DataFrame -# -------------------------------- - +import freqtrade.vendor.qtpylib.indicators as qtpylib +import numpy as np # Add your lib to import here # import talib.abstract as ta import pandas as pd +from freqtrade.strategy import IStrategy +from numpy.lib import math +from pandas import DataFrame # import talib.abstract as ta from ta import add_all_ta_features from ta.utils import dropna -import freqtrade.vendor.qtpylib.indicators as qtpylib -from functools import reduce -import numpy as np + +# -------------------------------- + class GodStra(IStrategy): diff --git a/user_data/strategies/Heracles.py b/user_data/strategies/Heracles.py index 223dc82..c4e6f6f 100644 --- a/user_data/strategies/Heracles.py +++ b/user_data/strategies/Heracles.py @@ -12,8 +12,7 @@ # freqtrade hyperopt --hyperopt-loss SharpeHyperOptLoss --spaces roi buy --strategy Heracles # ###################################################################### # --- Do not remove these libs --- -from freqtrade.strategy.hyper import IntParameter, DecimalParameter -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IntParameter, DecimalParameter, IStrategy from pandas import DataFrame # -------------------------------- # Add your lib to import here diff --git a/user_data/strategies/MultiMa.py b/user_data/strategies/MultiMa.py index 8909b65..95a287a 100644 --- a/user_data/strategies/MultiMa.py +++ b/user_data/strategies/MultiMa.py @@ -3,8 +3,7 @@ # github: https://github.com/mablue/ # --- Do not remove these libs --- -from freqtrade.strategy.hyper import IntParameter -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IntParameter, IStrategy from pandas import DataFrame # -------------------------------- diff --git a/user_data/strategies/Strategy001_custom_sell.py b/user_data/strategies/Strategy001_custom_sell.py index 231d085..4a6a164 100644 --- a/user_data/strategies/Strategy001_custom_sell.py +++ b/user_data/strategies/Strategy001_custom_sell.py @@ -1,6 +1,6 @@ # --- Do not remove these libs --- -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from typing import Dict, List from functools import reduce from pandas import DataFrame @@ -88,7 +88,7 @@ class Strategy001_custom_sell(IStrategy): dataframe['ha_close'] = heikinashi['close'] dataframe['rsi'] = ta.RSI(dataframe, 14) - + return dataframe def populate_buy_trend(self, dataframe: DataFrame, metadata: dict) -> DataFrame: @@ -129,13 +129,13 @@ class Strategy001_custom_sell(IStrategy): """ # get dataframe dataframe, _ = self.dp.get_analyzed_dataframe(pair=pair, timeframe=self.timeframe) - + # get the current candle current_candle = dataframe.iloc[-1].squeeze() - + # if RSI greater than 70 and profit is positive, then sell if (current_candle['rsi'] > 70) and (current_profit > 0): return "rsi_profit_sell" - + # else, hold - return None \ No newline at end of file + return None diff --git a/user_data/strategies/Strategy003.py b/user_data/strategies/Strategy003.py index 8d8630b..b985dea 100644 --- a/user_data/strategies/Strategy003.py +++ b/user_data/strategies/Strategy003.py @@ -1,6 +1,6 @@ # --- Do not remove these libs --- -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from typing import Dict, List from functools import reduce from pandas import DataFrame diff --git a/user_data/strategies/Supertrend.py b/user_data/strategies/Supertrend.py index be8d973..67fbeae 100644 --- a/user_data/strategies/Supertrend.py +++ b/user_data/strategies/Supertrend.py @@ -14,8 +14,7 @@ Supertrend strategy: import logging from numpy.lib import math -from freqtrade.strategy.interface import IStrategy -from freqtrade.strategy.hyper import IntParameter +from freqtrade.strategy import IStrategy, IntParameter from pandas import DataFrame import talib.abstract as ta import numpy as np diff --git a/user_data/strategies/berlinguyinca/ADXMomentum.py b/user_data/strategies/berlinguyinca/ADXMomentum.py index b268ab4..f09b80c 100644 --- a/user_data/strategies/berlinguyinca/ADXMomentum.py +++ b/user_data/strategies/berlinguyinca/ADXMomentum.py @@ -1,5 +1,5 @@ # --- Do not remove these libs --- -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from pandas import DataFrame import talib.abstract as ta diff --git a/user_data/strategies/berlinguyinca/ASDTSRockwellTrading.py b/user_data/strategies/berlinguyinca/ASDTSRockwellTrading.py index 9cdfb63..f3e0268 100644 --- a/user_data/strategies/berlinguyinca/ASDTSRockwellTrading.py +++ b/user_data/strategies/berlinguyinca/ASDTSRockwellTrading.py @@ -1,6 +1,6 @@ # --- Do not remove these libs --- -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from typing import Dict, List from functools import reduce from pandas import DataFrame diff --git a/user_data/strategies/berlinguyinca/AdxSmas.py b/user_data/strategies/berlinguyinca/AdxSmas.py index 7c8bfc9..d555dc4 100644 --- a/user_data/strategies/berlinguyinca/AdxSmas.py +++ b/user_data/strategies/berlinguyinca/AdxSmas.py @@ -1,5 +1,5 @@ # --- Do not remove these libs --- -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from pandas import DataFrame import talib.abstract as ta import freqtrade.vendor.qtpylib.indicators as qtpylib diff --git a/user_data/strategies/berlinguyinca/AwesomeMacd.py b/user_data/strategies/berlinguyinca/AwesomeMacd.py index f68f2eb..ec4c8cd 100644 --- a/user_data/strategies/berlinguyinca/AwesomeMacd.py +++ b/user_data/strategies/berlinguyinca/AwesomeMacd.py @@ -1,5 +1,5 @@ # --- Do not remove these libs --- -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from pandas import DataFrame import talib.abstract as ta import freqtrade.vendor.qtpylib.indicators as qtpylib diff --git a/user_data/strategies/berlinguyinca/BbandRsi.py b/user_data/strategies/berlinguyinca/BbandRsi.py index 6db3bc3..2405361 100644 --- a/user_data/strategies/berlinguyinca/BbandRsi.py +++ b/user_data/strategies/berlinguyinca/BbandRsi.py @@ -1,5 +1,5 @@ # --- Do not remove these libs --- -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from pandas import DataFrame import talib.abstract as ta import freqtrade.vendor.qtpylib.indicators as qtpylib diff --git a/user_data/strategies/berlinguyinca/BinHV27.py b/user_data/strategies/berlinguyinca/BinHV27.py index eadad0d..20981b0 100644 --- a/user_data/strategies/berlinguyinca/BinHV27.py +++ b/user_data/strategies/berlinguyinca/BinHV27.py @@ -1,4 +1,4 @@ -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from typing import Dict, List from functools import reduce from pandas import DataFrame diff --git a/user_data/strategies/berlinguyinca/CCIStrategy.py b/user_data/strategies/berlinguyinca/CCIStrategy.py index 921bbc1..0987ebd 100644 --- a/user_data/strategies/berlinguyinca/CCIStrategy.py +++ b/user_data/strategies/berlinguyinca/CCIStrategy.py @@ -1,5 +1,5 @@ # --- Do not remove these libs --- -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from typing import Dict, List from functools import reduce from pandas import DataFrame, Series, DatetimeIndex, merge diff --git a/user_data/strategies/berlinguyinca/CMCWinner.py b/user_data/strategies/berlinguyinca/CMCWinner.py index 4364d37..6d9a34e 100644 --- a/user_data/strategies/berlinguyinca/CMCWinner.py +++ b/user_data/strategies/berlinguyinca/CMCWinner.py @@ -1,6 +1,6 @@ # --- Do not remove these libs --- -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from pandas import DataFrame # -------------------------------- diff --git a/user_data/strategies/berlinguyinca/ClucMay72018.py b/user_data/strategies/berlinguyinca/ClucMay72018.py index 1ad6314..76d6bdb 100644 --- a/user_data/strategies/berlinguyinca/ClucMay72018.py +++ b/user_data/strategies/berlinguyinca/ClucMay72018.py @@ -1,5 +1,5 @@ # --- Do not remove these libs --- -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from typing import Dict, List from functools import reduce from pandas import DataFrame diff --git a/user_data/strategies/berlinguyinca/CofiBitStrategy.py b/user_data/strategies/berlinguyinca/CofiBitStrategy.py index 8f86059..5730a4b 100644 --- a/user_data/strategies/berlinguyinca/CofiBitStrategy.py +++ b/user_data/strategies/berlinguyinca/CofiBitStrategy.py @@ -1,7 +1,7 @@ # --- Do not remove these libs --- import freqtrade.vendor.qtpylib.indicators as qtpylib import talib.abstract as ta -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from freqtrade.strategy import IntParameter from pandas import DataFrame diff --git a/user_data/strategies/berlinguyinca/CombinedBinHAndCluc.py b/user_data/strategies/berlinguyinca/CombinedBinHAndCluc.py index 22f903f..499f6e6 100644 --- a/user_data/strategies/berlinguyinca/CombinedBinHAndCluc.py +++ b/user_data/strategies/berlinguyinca/CombinedBinHAndCluc.py @@ -3,7 +3,7 @@ import freqtrade.vendor.qtpylib.indicators as qtpylib import numpy as np # -------------------------------- import talib.abstract as ta -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from pandas import DataFrame diff --git a/user_data/strategies/berlinguyinca/DoesNothingStrategy.py b/user_data/strategies/berlinguyinca/DoesNothingStrategy.py index 05db7e2..07ccf32 100644 --- a/user_data/strategies/berlinguyinca/DoesNothingStrategy.py +++ b/user_data/strategies/berlinguyinca/DoesNothingStrategy.py @@ -1,5 +1,5 @@ # --- Do not remove these libs --- -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from pandas import DataFrame # -------------------------------- diff --git a/user_data/strategies/berlinguyinca/EMASkipPump.py b/user_data/strategies/berlinguyinca/EMASkipPump.py index a217161..1f723ac 100644 --- a/user_data/strategies/berlinguyinca/EMASkipPump.py +++ b/user_data/strategies/berlinguyinca/EMASkipPump.py @@ -1,4 +1,4 @@ -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from typing import Dict, List from functools import reduce from pandas import DataFrame diff --git a/user_data/strategies/berlinguyinca/Freqtrade_backtest_validation_freqtrade1.py b/user_data/strategies/berlinguyinca/Freqtrade_backtest_validation_freqtrade1.py index 31af28c..c14e289 100644 --- a/user_data/strategies/berlinguyinca/Freqtrade_backtest_validation_freqtrade1.py +++ b/user_data/strategies/berlinguyinca/Freqtrade_backtest_validation_freqtrade1.py @@ -4,7 +4,7 @@ # The purpose is to test Freqtrade backtest provides like results to a known industry platform. # # --- Do not remove these libs --- -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from pandas import DataFrame # -------------------------------- diff --git a/user_data/strategies/berlinguyinca/Low_BB.py b/user_data/strategies/berlinguyinca/Low_BB.py index 4cc733b..cbbbd04 100644 --- a/user_data/strategies/berlinguyinca/Low_BB.py +++ b/user_data/strategies/berlinguyinca/Low_BB.py @@ -1,5 +1,5 @@ # --- Do not remove these libs --- -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from typing import Dict, List from functools import reduce from pandas import DataFrame diff --git a/user_data/strategies/berlinguyinca/MACDStrategy_crossed.py b/user_data/strategies/berlinguyinca/MACDStrategy_crossed.py index 8bd882e..3e0be5a 100644 --- a/user_data/strategies/berlinguyinca/MACDStrategy_crossed.py +++ b/user_data/strategies/berlinguyinca/MACDStrategy_crossed.py @@ -1,6 +1,6 @@ # --- Do not remove these libs --- -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from typing import Dict, List from functools import reduce from pandas import DataFrame diff --git a/user_data/strategies/berlinguyinca/MultiRSI.py b/user_data/strategies/berlinguyinca/MultiRSI.py index 1465e4f..8cdb4d8 100644 --- a/user_data/strategies/berlinguyinca/MultiRSI.py +++ b/user_data/strategies/berlinguyinca/MultiRSI.py @@ -1,5 +1,5 @@ # --- Do not remove these libs --- -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from pandas import DataFrame # -------------------------------- import talib.abstract as ta diff --git a/user_data/strategies/berlinguyinca/Quickie.py b/user_data/strategies/berlinguyinca/Quickie.py index d4e017f..572c4f7 100644 --- a/user_data/strategies/berlinguyinca/Quickie.py +++ b/user_data/strategies/berlinguyinca/Quickie.py @@ -1,5 +1,5 @@ # --- Do not remove these libs --- -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from typing import Dict, List from functools import reduce from pandas import DataFrame diff --git a/user_data/strategies/berlinguyinca/ReinforcedAverageStrategy.py b/user_data/strategies/berlinguyinca/ReinforcedAverageStrategy.py index a1d32b4..d952ba1 100644 --- a/user_data/strategies/berlinguyinca/ReinforcedAverageStrategy.py +++ b/user_data/strategies/berlinguyinca/ReinforcedAverageStrategy.py @@ -1,5 +1,5 @@ # --- Do not remove these libs --- -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from typing import Dict, List from functools import reduce from pandas import DataFrame, merge, DatetimeIndex diff --git a/user_data/strategies/berlinguyinca/ReinforcedQuickie.py b/user_data/strategies/berlinguyinca/ReinforcedQuickie.py index 2dccbc8..6821256 100644 --- a/user_data/strategies/berlinguyinca/ReinforcedQuickie.py +++ b/user_data/strategies/berlinguyinca/ReinforcedQuickie.py @@ -1,5 +1,5 @@ # --- Do not remove these libs --- -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from typing import Dict, List from functools import reduce from pandas import DataFrame diff --git a/user_data/strategies/berlinguyinca/Scalp.py b/user_data/strategies/berlinguyinca/Scalp.py index 336c4b6..46b61d4 100644 --- a/user_data/strategies/berlinguyinca/Scalp.py +++ b/user_data/strategies/berlinguyinca/Scalp.py @@ -1,5 +1,5 @@ # --- Do not remove these libs --- -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from typing import Dict, List from functools import reduce from pandas import DataFrame diff --git a/user_data/strategies/berlinguyinca/Simple.py b/user_data/strategies/berlinguyinca/Simple.py index 9f53182..7c27b19 100644 --- a/user_data/strategies/berlinguyinca/Simple.py +++ b/user_data/strategies/berlinguyinca/Simple.py @@ -1,5 +1,5 @@ # --- Do not remove these libs --- -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from typing import Dict, List from functools import reduce from pandas import DataFrame diff --git a/user_data/strategies/berlinguyinca/SmoothOperator.py b/user_data/strategies/berlinguyinca/SmoothOperator.py index dc06819..639953e 100644 --- a/user_data/strategies/berlinguyinca/SmoothOperator.py +++ b/user_data/strategies/berlinguyinca/SmoothOperator.py @@ -1,5 +1,5 @@ # --- Do not remove these libs --- -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from typing import Dict, List from functools import reduce from pandas import DataFrame diff --git a/user_data/strategies/berlinguyinca/SmoothScalp.py b/user_data/strategies/berlinguyinca/SmoothScalp.py index 2f5faab..cedb324 100644 --- a/user_data/strategies/berlinguyinca/SmoothScalp.py +++ b/user_data/strategies/berlinguyinca/SmoothScalp.py @@ -1,5 +1,5 @@ # --- Do not remove these libs --- -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from typing import Dict, List from functools import reduce from pandas import DataFrame diff --git a/user_data/strategies/berlinguyinca/TDSequentialStrategy.py b/user_data/strategies/berlinguyinca/TDSequentialStrategy.py index 10a1313..fd09e81 100644 --- a/user_data/strategies/berlinguyinca/TDSequentialStrategy.py +++ b/user_data/strategies/berlinguyinca/TDSequentialStrategy.py @@ -2,7 +2,7 @@ import talib.abstract as ta from pandas import DataFrame import scipy.signal import freqtrade.vendor.qtpylib.indicators as qtpylib -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy class TDSequentialStrategy(IStrategy): diff --git a/user_data/strategies/berlinguyinca/TechnicalExampleStrategy.py b/user_data/strategies/berlinguyinca/TechnicalExampleStrategy.py index 64df6f5..e750beb 100644 --- a/user_data/strategies/berlinguyinca/TechnicalExampleStrategy.py +++ b/user_data/strategies/berlinguyinca/TechnicalExampleStrategy.py @@ -1,7 +1,7 @@ from pandas import DataFrame from technical.indicators import cmf -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy class TechnicalExampleStrategy(IStrategy): diff --git a/user_data/strategies/custom_stoploss_with_psar.py b/user_data/strategies/custom_stoploss_with_psar.py index 92f3e0e..f5ca274 100644 --- a/user_data/strategies/custom_stoploss_with_psar.py +++ b/user_data/strategies/custom_stoploss_with_psar.py @@ -5,7 +5,7 @@ import numpy as np # noqa import pandas as pd # noqa from pandas import DataFrame -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy # -------------------------------- # Add your lib to import here diff --git a/user_data/strategies/fixed_riskreward_loss.py b/user_data/strategies/fixed_riskreward_loss.py index 1a8d9fc..2f54773 100644 --- a/user_data/strategies/fixed_riskreward_loss.py +++ b/user_data/strategies/fixed_riskreward_loss.py @@ -5,7 +5,7 @@ import numpy as np # noqa import pandas as pd # noqa from pandas import DataFrame -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy # -------------------------------- # Add your lib to import here diff --git a/user_data/strategies/futures/f_ott_strategy.py b/user_data/strategies/futures/f_ott_strategy.py index 02398ef..8cea8a6 100644 --- a/user_data/strategies/futures/f_ott_strategy.py +++ b/user_data/strategies/futures/f_ott_strategy.py @@ -1,7 +1,6 @@ import logging from numpy.lib import math -from freqtrade.strategy.interface import IStrategy -from freqtrade.strategy.hyper import IntParameter +from freqtrade.strategy import IStrategy from pandas import DataFrame import talib.abstract as ta import numpy as np diff --git a/user_data/strategies/futures/f_supertrend_strategy.py b/user_data/strategies/futures/f_supertrend_strategy.py index f4e2f3c..a73bdee 100644 --- a/user_data/strategies/futures/f_supertrend_strategy.py +++ b/user_data/strategies/futures/f_supertrend_strategy.py @@ -5,7 +5,7 @@ Supertrend strategy: Sells if the 3 'sell' indicators are 'down' * Author: @juankysoriano (Juan Carlos Soriano) * github: https://github.com/juankysoriano/ -*** NOTE: This Supertrend strategy is just one of many possible strategies using `Supertrend` as indicator. It should on any case used at your own risk. +*** NOTE: This Supertrend strategy is just one of many possible strategies using `Supertrend` as indicator. It should on any case used at your own risk. It comes with at least a couple of caveats: 1. The implementation for the `supertrend` indicator is based on the following discussion: https://github.com/freqtrade/freqtrade-strategies/issues/30 . Concretelly https://github.com/freqtrade/freqtrade-strategies/issues/30#issuecomment-853042401 2. The implementation for `supertrend` on this strategy is not validated; meaning this that is not proven to match the results by the paper where it was originally introduced or any other trusted academic resources @@ -13,8 +13,7 @@ Supertrend strategy: import logging from numpy.lib import math -from freqtrade.strategy.interface import IStrategy -from freqtrade.strategy.hyper import IntParameter +from freqtrade.strategy import IStrategy, IntParameter from pandas import DataFrame import talib.abstract as ta import numpy as np diff --git a/user_data/strategies/lookahead_bias/DevilStra.py b/user_data/strategies/lookahead_bias/DevilStra.py index 775ad56..bf1503d 100644 --- a/user_data/strategies/lookahead_bias/DevilStra.py +++ b/user_data/strategies/lookahead_bias/DevilStra.py @@ -20,10 +20,9 @@ from functools import reduce import freqtrade.vendor.qtpylib.indicators as qtpylib import talib.abstract as ta import random -from freqtrade.strategy.hyper import CategoricalParameter, DecimalParameter, IntParameter +from freqtrade.strategy import CategoricalParameter, IStrategy from numpy.lib import math -from freqtrade.strategy.interface import IStrategy from pandas import DataFrame # ########################## SETTINGS ############################## diff --git a/user_data/strategies/lookahead_bias/GodStraNew.py b/user_data/strategies/lookahead_bias/GodStraNew.py index d8e157f..3b5916c 100644 --- a/user_data/strategies/lookahead_bias/GodStraNew.py +++ b/user_data/strategies/lookahead_bias/GodStraNew.py @@ -4,10 +4,10 @@ # freqtrade hyperopt --hyperopt-loss SharpeHyperOptLoss --spaces buy roi trailing sell --strategy GodStraNew # --- Do not remove these libs --- from freqtrade import data -from freqtrade.strategy.hyper import CategoricalParameter, DecimalParameter +from freqtrade.strategy import CategoricalParameter, DecimalParameter from numpy.lib import math -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from pandas import DataFrame # -------------------------------- diff --git a/user_data/strategies/lookahead_bias/Zeus.py b/user_data/strategies/lookahead_bias/Zeus.py index 1d9038c..e6f3fdc 100644 --- a/user_data/strategies/lookahead_bias/Zeus.py +++ b/user_data/strategies/lookahead_bias/Zeus.py @@ -6,10 +6,10 @@ # freqtrade hyperopt --hyperopt-loss SharpeHyperOptLoss --spaces buy sell roi --strategy Zeus # --- Do not remove these libs --- import logging -from freqtrade.strategy.hyper import CategoricalParameter, DecimalParameter +from freqtrade.strategy import CategoricalParameter, DecimalParameter from numpy.lib import math -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IStrategy from pandas import DataFrame # -------------------------------- diff --git a/user_data/strategies/mabStra.py b/user_data/strategies/mabStra.py index f86c639..20595a3 100644 --- a/user_data/strategies/mabStra.py +++ b/user_data/strategies/mabStra.py @@ -4,8 +4,7 @@ # freqtrade hyperopt --hyperopt-loss SharpeHyperOptLoss --spaces all --strategy mabStra --config config.json -e 100 # --- Do not remove these libs --- -from freqtrade.strategy.hyper import IntParameter, DecimalParameter -from freqtrade.strategy.interface import IStrategy +from freqtrade.strategy import IntParameter, DecimalParameter, IStrategy from pandas import DataFrame # -------------------------------- diff --git a/user_data/strategies/multi_tf.py b/user_data/strategies/multi_tf.py index de4ad50..e9e1558 100644 --- a/user_data/strategies/multi_tf.py +++ b/user_data/strategies/multi_tf.py @@ -1,22 +1,14 @@ import freqtrade.vendor.qtpylib.indicators as qtpylib import numpy as np import talib.abstract as ta -from freqtrade.strategy import IStrategy, informative - DecimalParameter, IntParameter, BooleanParameter, CategoricalParameter, stoploss_from_open) +from freqtrade.strategy import (IStrategy, informative) from pandas import DataFrame, Series -from typing import Dict, List, Optional, Tuple -from functools import reduce -from freqtrade.persistence import Trade -from datetime import datetime, timedelta, timezone -from freqtrade.exchange import timeframe_to_prev_date -from freqtrade_strategies.custom_indicators import zema, tv_hma, pmax import talib.abstract as ta import math import pandas_ta as pta # from finta import TA as fta import logging from logging import FATAL -import time logger = logging.getLogger(__name__) @@ -54,10 +46,10 @@ class multi_tf (IStrategy): process_only_new_candles = True startup_candle_count = 100 - # This method is not required. + # This method is not required. # def informative_pairs(self): ... - # Define informative upper timeframe for each pair. Decorators can be stacked on same + # Define informative upper timeframe for each pair. Decorators can be stacked on same # method. Available in populate_indicators as 'rsi_30m' and 'rsi_1h'. @informative('30m') @informative('1h') @@ -66,8 +58,8 @@ class multi_tf (IStrategy): return dataframe # Define BTC/STAKE informative pair. Available in populate_indicators and other methods as - # 'btc_rsi_1h'. Current stake currency should be specified as {stake} format variable - # instead of hard-coding actual stake currency. Available in populate_indicators and other + # 'btc_rsi_1h'. Current stake currency should be specified as {stake} format variable + # instead of hard-coding actual stake currency. Available in populate_indicators and other # methods as 'btc_usdt_rsi_1h' (when stake currency is USDT). @informative('1h', 'BTC/{stake}') def populate_indicators_btc_1h(self, dataframe: DataFrame, metadata: dict) -> DataFrame: @@ -103,7 +95,7 @@ class multi_tf (IStrategy): # Informative pairs are available in this method. dataframe['rsi_less'] = dataframe['rsi'] < dataframe['rsi_1h'] return dataframe - + def populate_entry_trend(self, dataframe: DataFrame, metadata: dict) -> DataFrame: stake = self.config['stake_currency'] dataframe.loc[