Merge pull request #167 from diogomatoschaves/fix-strategy-validation

Fix strategy validation
diogomatoschaves · Feb 25, 2024 · 5e581dd · 5e581dd
2 parents 9ad5c90 + a3e068a
commit 5e581dd
Show file tree

Hide file tree

Showing 11 changed files with 376 additions and 348 deletions.
diff --git a/README.md b/README.md
@@ -128,6 +128,7 @@ This page shows all the trades executed by any of the trading bots. It is possib
 
 ## Software Requirements
 
-- [Poetry](https://python-poetry.org/docs/) (For creating an environment for local dev.)
+- [Poetry](https://python-poetry.org/docs/) (For creating an environment for local development.)
 - [Docker](https://docs.docker.com/get-docker/) (For running the app locally.)
 - [Heroku CLI](https://devcenter.heroku.com/articles/heroku-cli) (For deploying the app to a Heroku.)
+- [AWS S3](https://signin.aws.amazon.com/) (For storing machine learning models in the cloud.)
diff --git a/dashboard/src/utils/helpers/index.ts b/dashboard/src/utils/helpers/index.ts
@@ -194,8 +194,6 @@ export const validateParams = (strategy: any) => {
     }
   }, {success: true, params: {}})
 
-  debugger
-
   return {
     success: requiredParams.success && optionalParams.success,
     updatedParams: {...requiredParams.params, ...optionalParams.params}
@@ -288,3 +286,9 @@ export const addLineBreaks = (text: string) => {
   const regex = /\s{2}/g;
   return text.replace(regex, '<br/>')
 }
+
+
+const Split = (str: string) => {
+  const re = /\s*(?:,|$)\s*/;
+  return str.split(re)
+}
diff --git a/data/poetry.lock b/data/poetry.lock
diff --git a/execution/poetry.lock b/execution/poetry.lock
diff --git a/model/poetry.lock b/model/poetry.lock
diff --git a/model/service/app.py b/model/service/app.py
@@ -15,7 +15,7 @@
 from model.service.cloud_storage import check_aws_config
 from model.service.helpers.decorators.handle_app_errors import handle_app_errors
 from model.service.helpers.responses import Responses
-from model.strategies import compile_strategies
+from model.strategies.properties import compile_strategies
 from model.worker import conn
 from shared.utils.config_parser import get_config
 from shared.utils.decorators import handle_db_connection_error

diff --git a/model/service/cloud_storage/_upload.py b/model/service/cloud_storage/_upload.py
@@ -1,4 +1,4 @@
-import os.path
+import os
 
 
 def upload_file(client, bucket, local_dir, filename):

diff --git a/model/signal_generation/_helpers.py b/model/signal_generation/_helpers.py
@@ -1,3 +1,6 @@
+from model.service.helpers import LOCAL_MODELS_LOCATION
+
+
 def convert_signal_to_text(signal):
     if signal == 1:
         return "BUY"
@@ -8,5 +11,5 @@ def convert_signal_to_text(signal):
 
 
 strategies_defaults = {
-    'MachineLearning': {"verbose": False, "models_dir": 'model/strategies/models'}
+    'MachineLearning': {"verbose": False, "models_dir": LOCAL_MODELS_LOCATION}
 }
diff --git a/model/strategies/properties.py b/model/strategies/properties.py
@@ -13,25 +13,6 @@
 )
 
 
-def map_type(element):
-
-    try:
-        type_ = element.__name__
-    except AttributeError:
-        type_ = type(element).__name__
-
-    if type_ in ['int', 'float']:
-        return {
-            "type": "number",
-            "func": "Number"
-        }
-    elif type_ == 'str':
-        return {
-            "type": "string",
-            "func": "String"
-        }
-
-
 def process_ml_strategies(strategies_obj):
 
     estimator = strategies_obj["MachineLearning"]["optionalParamsOrder"][0]
@@ -65,6 +46,49 @@ def process_ml_strategies(strategies_obj):
     return strategies_obj
 
 
+def check_typing(props):
+    typing_type = str(props.annotation).replace('typing.', '').split('[')
+
+    if len(typing_type) > 1:
+        return typing_type[0]
+    return props.annotation
+
+
+def map_type(type_, args):
+    if type_ in [int, float]:
+        return {
+            "type": {
+                "type": "number",
+                "func": "Number"
+            }
+        }
+    elif type_ == 'List':
+        return {
+            "type": {
+                "type": "object",
+                "func": "Split"
+            }
+        }
+
+    elif type_ == 'Literal':
+        return {
+            "type": {
+                "type": "string",
+                "func": "String"
+            },
+            "options": args
+        }
+    elif type_ == str:
+        return {
+            "type": {
+                "type": "string",
+                "func": "String"
+            }
+        }
+    else:
+        return None
+
+
 def compile_strategies():
 
     # Download models from the cloud
@@ -96,15 +120,11 @@ def compile_strategies():
 
                 args = get_args(props.annotation)
 
-                if len(args) != 0:
-                    param_info = {"type": map_type(args[0])}
+                typing_type = check_typing(props)
+                param_info = map_type(typing_type, args)
 
-                    if type(args[0]) is not type:
-                        param_info.update({"options": args})
-                else:
-                    param_info = {
-                         "type": map_type(props.annotation)
-                    }
+                if param_info is None:
+                    continue
 
                 if is_required:
                     required_ordering.append(param)

diff --git a/model/tests/strategies/test_strategies.py b/model/tests/strategies/test_strategies.py
@@ -4,7 +4,7 @@
 import pytest
 import pandas as pd
 
-from model.strategies import compile_strategies
+from model.strategies.properties import compile_strategies
 from model.tests.setup.test_data.sample_data import data
 from model.tests.setup.fixtures.internal_modules import spy_download_file
 from model.tests.setup.fixtures.external_modules import (