Update services/market.py

services/market.py

@@ -1,36 +1,14 @@
 import time
-from typing import Dict, List, Optional, Any
 from api.kucoin import KuCoinClient
-from models.market_data import MarketData
 
 
-class MarketService:
-    def __init__(self):
-        self.kucoin = KuCoinClient()
-        self.cache: Dict[str, Dict[str, Any]] = {}
-
-    def get_market_data(
-        self, symbol: str, granularity: int, days: int = 2
-    ) -> MarketData:
-        now = int(time.time() * 1000)
-        before = now - (days * 86400000)
-        return self.kucoin.get_kline_data(
-            symbol, granularity, from_time=before, to_time=now
-        )
-
-    def get_current_price(self, symbol: str) -> float:
-        if symbol in self.cache and time.time() - self.cache[symbol]["timestamp"] < 10:
-            return self.cache[symbol]["price"]
-        data = self.kucoin.get_ticker(symbol)
-        self.cache[symbol] = {"price": float(data["price"]), "timestamp": time.time()}
-        return self.cache[symbol]["price"]
-
-
-def get_market_data(symbol: str, timeframe: str, session) -> MarketData:
-    tf_map = {"15m": 15, "1h": 60, "4h": 240, "1d": 1440}
-    ms = MarketService()
-    return ms.get_market_data(symbol, tf_map.get(timeframe, 15))
+def get_market_data(symbol: str, timeframe: str, session) -> "MarketData":
+    granularity_map = {"15m": 15, "1h": 60, "4h": 240, "1d": 1440}
+    granularity = granularity_map.get(timeframe, 15)
+    now = int(time.time() * 1000)
+    start = now - (2 * 24 * 60 * 60 * 1000)
+    return KuCoinClient(session).get_kline_data(symbol, granularity, start, now)
 
 
 def get_current_price(symbol: str, session) -> float:
-    return MarketService().get_current_price(symbol)
+    return KuCoinClient(session).get_current_price(symbol)