Merge pull request #27 from auto-trading-temp-name/revert-26-master

Revert "algorithm update"
tetrahedral-tech · Nov 3, 2023 · 059c57d · 059c57d
2 parents 4f24e9f + 0cfdbc2
commit 059c57d
Show file tree

Hide file tree

Showing 19 changed files with 116 additions and 421 deletions.
diff --git a/.dockerignore b/.dockerignore
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
diff --git a/.gitmodules b/.gitmodules
diff --git a/Dockerfile b/Dockerfile
diff --git a/algorithms/bollinger_bands.py b/algorithms/bollinger_bands.py
@@ -5,7 +5,7 @@ def algorithm(prices, window_size=20, standard_deviations=2):
 	return upper_band, lower_band, middle_band
 
 def signal(prices, data):
-	upper_band, lower_band, middle_band = data
+	upper_band, lower_band, middle_band, prices = data
 	if prices[-1] > upper_band[-1]:
 		return 'sell', 1
 	elif prices[-1] < lower_band[-1]:

diff --git a/algorithms/rsi.py b/algorithms/rsi.py
@@ -6,7 +6,7 @@ def algorithm(prices, window_size=14):
 def signal(prices, data, high=70, low=30):
 	rsi = data
 	if rsi[-1] > high:
-		return 'sell', 0.5
+		return 'sell'
 	elif rsi[-1] < low:
-		return 'buy', 0.5
-	return 'no_action', 0
+		return 'buy'
+	return 'no_action'
diff --git a/app.py b/app.py
@@ -1,7 +1,7 @@
 from dotenv import load_dotenv
 from flask import Flask
 from werkzeug.middleware.proxy_fix import ProxyFix
-from views import internal_checker, plot, worth
+from views import bot_net_worth, internal_checker, plot
 
 load_dotenv()
 
@@ -10,10 +10,6 @@
 
 app.add_url_rule('/plot/<algorithm>', view_func=plot.plot)
 app.add_url_rule('/internal_checker', view_func=internal_checker.internal_checker)
-app.add_url_rule('/worth/<bot_id>', view_func=worth.worth)
+app.add_url_rule('/profit/<bot_id>', view_func=bot_net_worth.bot_net_worth)
 
-if __name__ == '__main__':
-	app.run()
-
-def get_app():
-	return app
+app.run()