app.py

@@ -4,78 +4,64 @@ import pandas as pd
 import numpy as np
 from datetime import datetime
 from flask import Flask, jsonify, Response
-from model import download_data, format_data, train_model, get_training_data_path
+from model import download_data, format_data, train_model, training_price_data_path
 from config import model_file_path
 
 app = Flask(__name__)
 
 
 def update_data():
-    """Download price data, format data and train model for each token."""
-    tokens = ["ETH", "BTC", "SOL", "BNB", "ARB"]
+    """Download price data, format data and train model."""
     download_data()
-    for token in tokens:
-        format_data(token)
-        train_model(token)
+    format_data()
+    train_model()
 
 
-def get_inference(token, period):
+def get_eth_inference():
+    """Load model and predict current price."""
     try:
-        model_path = model_file_path[token]
-
-        with open(model_path, "rb") as f:
+        with open(model_file_path, "rb") as f:
             loaded_model = pickle.load(f)
 
-        # Загружаем последние данные для данного токена
-        training_price_data_path = get_training_data_path(token)
+        # Загружаем последние данные из файла
         price_data = pd.read_csv(training_price_data_path)
 
         # Используем последние значения признаков для предсказания
-        last_row = price_data.iloc[-1]
-        last_timestamp = last_row["timestamp"]
-
-        # Преобразуем период в секунды
-        period_seconds = convert_period_to_seconds(period)
-        new_timestamp = last_timestamp + period_seconds
-
-        # Формируем данные для предсказания с новым timestamp
-        X_new = np.array(
+        X_new = (
+            price_data[
                 [
-                new_timestamp,
-                last_row["price_diff"],
-                last_row["volatility"],
-                last_row["volume"],
-                last_row["moving_avg_7"],
-                last_row["moving_avg_30"],
+                    "timestamp",
+                    "price_diff",
+                    "volatility",
+                    "volume",
+                    "moving_avg_7",
+                    "moving_avg_30",
                 ]
-        ).reshape(1, -1)
+            ]
+            .iloc[-1]
+            .values.reshape(1, -1)
+        )
 
         # Делаем предсказание
-        future_price_pred = loaded_model.predict(X_new)
-        return future_price_pred[0]
+        current_price_pred = loaded_model.predict(X_new)
 
+        return current_price_pred[0]
     except Exception as e:
         print(f"Error during inference: {str(e)}")
         raise
 
 
-def convert_period_to_seconds(period):
-    """Конвертируем период в секунды."""
-    if period.endswith("m"):
-        return int(period[:-1]) * 60
-    elif period.endswith("h"):
-        return int(period[:-1]) * 3600
-    elif period.endswith("d"):
-        return int(period[:-1]) * 86400
-    else:
-        raise ValueError(f"Unknown period format: {period}")
+@app.route("/inference/<string:token>")
+def generate_inference(token):
+    """Generate inference for given token."""
+    if not token or token != "ETH":
+        error_msg = "Token is required" if not token else "Token not supported"
+        return Response(
+            json.dumps({"error": error_msg}), status=400, mimetype="application/json"
+        )
 
-
-@app.route("/inference/<string:token>/<string:period>")
-def generate_inference(token, period):
-    """Generate inference for given token and period."""
     try:
-        inference = get_inference(token, period)
+        inference = get_eth_inference()
         return Response(str(inference), status=200)
     except Exception as e:
         return Response(
@@ -95,4 +81,4 @@ def update():
 
 if __name__ == "__main__":
     update_data()
-    app.run(host="0.0.0.0", port=8080)
+    app.run(host="0.0.0.0", port=8000)

config.json

@@ -13,48 +13,30 @@
     "worker": [
         {
             "topicId": 1,
-            "inferenceEntrypointName": "api-worker-reputer", "loopSeconds": 5,
-            "parameters": { "InferenceEndpoint": "http://inference:8080/inference/ETH/10m", "Token": "ETH" }
+            "inferenceEntrypointName": "api-worker-reputer",
+            "loopSeconds": 5,
+            "parameters": {
+                "InferenceEndpoint": "http://inference:8000/inference/{Token}",
+                "Token": "ETH"
+            }
         },
         {
             "topicId": 2,
-            "inferenceEntrypointName": "api-worker-reputer", "loopSeconds": 5,
-            "parameters": { "InferenceEndpoint": "http://inference:8080/inference/ETH/24h", "Token": "ETH" }
-        },
-        {   
-            "topicId": 3,
-            "inferenceEntrypointName": "api-worker-reputer", "loopSeconds": 5,
-            "parameters": { "InferenceEndpoint": "http://inference:8080/inference/BTC/10m", "Token": "BTC" }
-        },
-        {   
-            "topicId": 4,
-            "inferenceEntrypointName": "api-worker-reputer", "loopSeconds": 5,
-            "parameters": { "InferenceEndpoint": "http://inference:8080/inference/BTC/24h", "Token": "BTC" }
-        },
-        {   
-            "topicId": 5,
-            "inferenceEntrypointName": "api-worker-reputer", "loopSeconds": 5,
-            "parameters": { "InferenceEndpoint": "http://inference:8080/inference/SOL/10m", "Token": "SOL" }
-        },
-        {   
-            "topicId": 6,
-            "inferenceEntrypointName": "api-worker-reputer", "loopSeconds": 5,
-            "parameters": { "InferenceEndpoint": "http://inference:8080/inference/SOL/24h", "Token": "SOL" }
+            "inferenceEntrypointName": "api-worker-reputer",
+            "loopSeconds": 5,
+            "parameters": {
+                "InferenceEndpoint": "http://inference:8000/inference/{Token}",
+                "Token": "ETH"
+            }
         },
         {
             "topicId": 7,
-            "inferenceEntrypointName": "api-worker-reputer", "loopSeconds": 5,
-            "parameters": { "InferenceEndpoint": "http://inference:8080/inference/ETH/20m", "Token": "ETH" }
-        },
-        {   
-            "topicId": 8,
-            "inferenceEntrypointName": "api-worker-reputer", "loopSeconds": 5,
-            "parameters": { "InferenceEndpoint": "http://inference:8080/inference/BNB/20m", "Token": "BNB" }
-        },
-        {   
-            "topicId": 9,
-            "inferenceEntrypointName": "api-worker-reputer", "loopSeconds": 5,
-            "parameters": { "InferenceEndpoint": "http://inference:8080/inference/ARB/20m", "Token": "ARB" }
+            "inferenceEntrypointName": "api-worker-reputer",
+            "loopSeconds": 5,
+            "parameters": {
+                "InferenceEndpoint": "http://inference:8000/inference/{Token}",
+                "Token": "ETH"
+            }
         }
     ]
 }

config.py

@@ -2,15 +2,4 @@ import os
 
 app_base_path = os.getenv("APP_BASE_PATH", default=os.getcwd())
 data_base_path = os.path.join(app_base_path, "data")
-
-model_file_path = {
-    "ETH": os.path.join(data_base_path, "eth_model.pkl"),
-    "BTC": os.path.join(data_base_path, "btc_model.pkl"),
-    "SOL": os.path.join(data_base_path, "sol_model.pkl"),
-    "BNB": os.path.join(data_base_path, "bnb_model.pkl"),
-    "ARB": os.path.join(data_base_path, "arb_model.pkl"),
-}
-
-
-def get_training_data_path(token):
-    return os.path.join(data_base_path, f"{token.lower()}_price_data.csv")
+model_file_path = os.path.join(data_base_path, "model.pkl")

model.py

@@ -3,26 +3,20 @@ import pickle
 import numpy as np 
 from xgboost import XGBRegressor
 from zipfile import ZipFile
-from datetime import datetime, timedelta
+from datetime import datetime
 import pandas as pd
 from sklearn.model_selection import train_test_split
 from updater import download_binance_monthly_data, download_binance_daily_data
 from config import data_base_path, model_file_path
 
 binance_data_path = os.path.join(data_base_path, "binance/futures-klines")
-
-
-def get_training_data_path(token):
-    """
-    Возвращает путь к файлу данных для указанного токена.
-    """
-    return os.path.join(data_base_path, f"{token}_price_data.csv")
+training_price_data_path = os.path.join(data_base_path, "eth_price_data.csv")
 
 
 def download_data():
     cm_or_um = "um"
-    symbols = ["ETHUSDT", "BTCUSDT", "SOLUSDT", "BNBUSDT", "ARBUSDT"]
-    intervals = ["10min", "1d"]
+    symbols = ["ETHUSDT"]
+    intervals = ["1d"]
     years = ["2020", "2021", "2022", "2023", "2024"]
     months = ["01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"]
     download_path = binance_data_path
@@ -39,10 +33,8 @@ def download_data():
     print(f"Downloaded daily data to {download_path}.")
 
 
-def format_data(token):
-    files = sorted(
-        [x for x in os.listdir(binance_data_path) if x.endswith(".zip") and token in x]
-    )
+def format_data():
+    files = sorted([x for x in os.listdir(binance_data_path) if x.endswith(".zip")])
 
     if len(files) == 0:
         return
@@ -83,12 +75,10 @@ def format_data(token):
     price_df.dropna(inplace=True)
 
     # Сохраняем данные
-    training_price_data_path = get_training_data_path(token)
     price_df.sort_index().to_csv(training_price_data_path)
 
 
-def train_model(token):
-    training_price_data_path = get_training_data_path(token)
+def train_model():
     price_data = pd.read_csv(training_price_data_path)
 
     # Используем дополнительные признаки
@@ -108,16 +98,20 @@ def train_model(token):
         x, y, test_size=0.2, random_state=0
     )
 
+    # Train the model
+    print("Training model...")
     model = XGBRegressor()
     model.fit(x_train, y_train)
+    print("Model trained.")
 
-    token_model_path = model_file_path[token]
-    os.makedirs(os.path.dirname(token_model_path), exist_ok=True)
+    # create the model's parent directory if it doesn't exist
+    os.makedirs(os.path.dirname(model_file_path), exist_ok=True)
 
-    with open(token_model_path, "wb") as f:
+    # Save the trained model to a file
+    with open(model_file_path, "wb") as f:
         pickle.dump(model, f)
 
-    print(f"Trained model saved to {token_model_path}")
+    print(f"Trained model saved to {model_file_path}")
 
     # Optional: Оценка модели
     y_pred = model.predict(x_test)