From 8bbee4038b874c766a3739e234f098db3f5464be Mon Sep 17 00:00:00 2001 From: Gert Wohlgemuth Date: Thu, 5 Jul 2018 14:30:24 -0700 Subject: [PATCH] integrated BASE64 encoded strategy loading --- freqtrade/strategy/resolver.py | 22 ++++++++++++++++++++-- freqtrade/tests/strategy/test_strategy.py | 9 +++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/freqtrade/strategy/resolver.py b/freqtrade/strategy/resolver.py index 0dcd3fc6a..46f70ccc9 100644 --- a/freqtrade/strategy/resolver.py +++ b/freqtrade/strategy/resolver.py @@ -6,14 +6,16 @@ This module load custom strategies import importlib.util import inspect import logging -import os +from base64 import urlsafe_b64decode from collections import OrderedDict from typing import Optional, Dict, Type from freqtrade import constants from freqtrade.strategy import import_strategy from freqtrade.strategy.interface import IStrategy - +import tempfile +import os +from pathlib import Path logger = logging.getLogger(__name__) @@ -80,6 +82,22 @@ class StrategyResolver(object): # Add extra strategy directory on top of search paths abs_paths.insert(0, extra_dir) + if ":" in strategy_name and "http" not in strategy_name: + print("loading none http based strategy: {}".format(strategy_name)) + strat = strategy_name.split(":") + + if len(strat) == 2: + temp = Path(tempfile.mkdtemp("freq", "strategy")) + name = strat[0] + ".py" + + temp.joinpath(name).write_text(urlsafe_b64decode(strat[1]).decode('utf-8')) + temp.joinpath("__init__.py").touch() + + strategy_name = os.path.splitext(name)[0] + + # register temp path with the bot + abs_paths.insert(0, temp.absolute()) + for path in abs_paths: try: strategy = self._search_strategy(path, strategy_name) diff --git a/freqtrade/tests/strategy/test_strategy.py b/freqtrade/tests/strategy/test_strategy.py index 1e082c380..72125a244 100644 --- a/freqtrade/tests/strategy/test_strategy.py +++ b/freqtrade/tests/strategy/test_strategy.py @@ -1,6 +1,7 @@ # pragma pylint: disable=missing-docstring, protected-access, C0103 import logging import os +from base64 import urlsafe_b64encode import pytest @@ -50,6 +51,14 @@ def test_load_strategy(result): assert 'adx' in resolver.strategy.populate_indicators(result) +def test_load_strategy_byte64(result): + with open("freqtrade/tests/strategy/test_strategy.py", "r") as file: + encoded_string = urlsafe_b64encode(file.read().encode("utf-8")).decode("utf-8") + resolver = StrategyResolver({'strategy': 'TestStrategy:{}'.format(encoded_string)}) + assert hasattr(resolver.strategy, 'populate_indicators') + assert 'adx' in resolver.strategy.populate_indicators(result) + + def test_load_strategy_invalid_directory(result, caplog): resolver = StrategyResolver() extra_dir = os.path.join('some', 'path')