adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small stylistic improvements to strategyresolver

Browse Source
This commit is contained in:
Matthias 2018-11-24 20:02:29 +01:00
parent 21a093bcdb
commit 2c0d0946e6
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
freqtrade/resolvers/iresolver.py
View File

@ -1,7 +1,7 @@
# pragma pylint: disable=attribute-defined-outside-init # pragma pylint: disable=attribute-defined-outside-init
""" """
This module load custom hyperopts This module load custom objects
""" """
import importlib.util import importlib.util
import inspect import inspect
@ -9,10 +9,6 @@ import logging
import os import os
from typing import Optional, Dict, Type, Any from typing import Optional, Dict, Type, Any
from freqtrade.constants import DEFAULT_HYPEROPT
from freqtrade.optimize.hyperopt_interface import IHyperOpt
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -51,7 +47,7 @@ class IResolver(object):
return next(valid_objects_gen, None) return next(valid_objects_gen, None)
@staticmethod @staticmethod
def _search_object(directory: str, object_type, object_name: str, def _search_object(directory: str, object_type, object_name: str,
kwargs: dict) -> Optional[Any]: kwargs: dict) -> Optional[Any]:
""" """
Search for the objectname in the given directory Search for the objectname in the given directory

12
freqtrade/resolvers/strategyresolver.py
View File

@ -5,7 +5,7 @@ This module load custom strategies
""" """
import inspect import inspect
import logging import logging
import os from os import getcwd, path
import tempfile import tempfile
from base64 import urlsafe_b64decode from base64 import urlsafe_b64decode
from collections import OrderedDict from collections import OrderedDict
@ -103,10 +103,10 @@ class StrategyResolver(IResolver):
:param extra_dir: additional directory to search for the given strategy :param extra_dir: additional directory to search for the given strategy
:return: Strategy instance or None :return: Strategy instance or None
""" """
current_path = os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), 'strategy') current_path = path.join(path.dirname(path.dirname(path.realpath(__file__))), 'strategy')
abs_paths = [ abs_paths = [
os.path.join(os.getcwd(), 'user_data', 'strategies'), path.join(getcwd(), 'user_data', 'strategies'),
current_path, current_path,
] ]
@ -125,14 +125,14 @@ class StrategyResolver(IResolver):
temp.joinpath(name).write_text(urlsafe_b64decode(strat[1]).decode('utf-8')) temp.joinpath(name).write_text(urlsafe_b64decode(strat[1]).decode('utf-8'))
temp.joinpath("__init__.py").touch() temp.joinpath("__init__.py").touch()
strategy_name = os.path.splitext(name)[0] strategy_name = path.splitext(name)[0]
# register temp path with the bot # register temp path with the bot
abs_paths.insert(0, str(temp.resolve())) abs_paths.insert(0, str(temp.resolve()))
for path in abs_paths: for _path in abs_paths:
try: try:
strategy = self._search_object(directory=path, object_type=IStrategy, strategy = self._search_object(directory=_path, object_type=IStrategy,
object_name=strategy_name, kwargs={'config': config}) object_name=strategy_name, kwargs={'config': config})
if strategy: if strategy:
logger.info('Using resolved strategy %s from \'%s\'', strategy_name, path) logger.info('Using resolved strategy %s from \'%s\'', strategy_name, path)