Remove server.py

Author: Herklos

Dockerfile

@@ -9,7 +9,7 @@ RUN apt-get update \
 COPY . .
 
 RUN pip3 install --no-cache-dir -U setuptools wheel pip \
-    && pip3 install --no-cache-dir -r requirements.txt -r dev_requirements.txt \
+    && pip3 install --no-cache-dir -r requirements.txt \
     && python3 setup.py install
 
-ENTRYPOINT ["python3", "server.py"]
+ENTRYPOINT ["python3", "main.py"]

dev_requirements.txt

@@ -1,21 +1,20 @@
 import asyncio
-from dotenv import load_dotenv
 
 import octobot_commons.symbols as symbols
 import octobot_commons.os_util as os_util
 
 import triangular_arbitrage.detector
 
 if __name__ == "__main__":
-    load_dotenv()
     benchmark = os_util.parse_boolean_environment_var("IS_BENCHMARKING", "False")
     if benchmark:
         import time
         s = time.perf_counter()
 
     # start arbitrage detection
     print("Scanning...")
-    best_opportunities, best_profit, exchange_name = asyncio.run(triangular_arbitrage.detector.run_detection())
+    exchange_name = "binance"
+    best_opportunities, best_profit = asyncio.run(triangular_arbitrage.detector.run_detection(exchange_name))
     def opportunity_symbol(opportunity):
         return symbols.parse_symbol(str(opportunity.symbol))
 

main.py

@@ -1,5 +1,4 @@
 tqdm
 ccxt
 
-python-dotenv
 OctoBot-Commons

requirements.txt

@@ -1,6 +1 @@
-REDIS_HOST_ENV="REDIS_HOST"
-REDIS_PORT_ENV="REDIS_PORT"
-REDIS_PASSWORD_ENV="REDIS_PASSWORD"
-REDIS_KEY_ENV="REDIS_KEY"
-
 EXCHANGE_NAME_ENV="EXCHANGE_NAME"

server.py

@@ -1,5 +1,4 @@
 import os
-import datetime
 import ccxt.async_support as ccxt
 from typing import List
 from tqdm.auto import tqdm
@@ -9,7 +8,7 @@
 import octobot_commons.symbols as symbols
 import octobot_commons.constants as constants
 
-from triangular_arbitrage import REDIS_HOST_ENV, REDIS_PASSWORD_ENV, REDIS_PORT_ENV, REDIS_KEY_ENV, EXCHANGE_NAME_ENV
+from triangular_arbitrage import EXCHANGE_NAME_ENV
 
 @dataclass
 class ShortTicker:
@@ -93,7 +92,7 @@ def get_opportunity_symbol(a, b):
     return best_triplet, best_profit
 
 async def get_exchange_data(exchange_name):
-    exchange_class = getattr(ccxt, os.getenv(EXCHANGE_NAME_ENV, exchange_name))
+    exchange_class = getattr(ccxt, exchange_name)
     exchange = exchange_class()
     tickers = await fetch_tickers(exchange)
     exchange_time = exchange.milliseconds()
@@ -105,28 +104,7 @@ async def get_exchange_last_prices(exchange_name):
     last_prices = get_last_prices(exchange_time, tickers)
     return last_prices
 
-async def run_detection(exchange_name = "binance"):
-    exchange = os.getenv(EXCHANGE_NAME_ENV, exchange_name)
-    last_prices = await get_exchange_last_prices(exchange)
-    best_opportunity, best_profit = get_best_opportunity(last_prices)
-    if os.getenv(REDIS_HOST_ENV, None) is not None:
-        upload_result(best_opportunity, best_profit, exchange)
-    
-    return best_opportunity, best_profit, exchange
-
-def upload_result(best_opportunities, best_profit, exchange_id):
-    import redis
-    redis_client = redis.Redis(
-        host=os.getenv(REDIS_HOST_ENV, None),
-        port=os.getenv(REDIS_PORT_ENV, None),
-        password=os.getenv(REDIS_PASSWORD_ENV, None),
-        ssl=True
-    )
-
-    data = {
-        'best_opportunity': [str(best_opportunity.symbol) for best_opportunity in best_opportunities],
-        'best_profit': best_profit,
-        'exchange_id': exchange_id,
-        'timestamp': datetime.datetime.utcnow().timestamp()
-    }
-    redis_client.json().set(f"{os.getenv(REDIS_KEY_ENV, None)}:{exchange_id}", '$', data)
+async def run_detection(exchange_name):
+    last_prices = await get_exchange_last_prices(exchange_name)
+    best_opportunity, best_profit = get_best_opportunity(last_prices)    
+    return best_opportunity, best_profit