refactor: remove status attribute from ProductInfo and update related methods to use timestamp_ms

src/app/markets/base.py

@@ -46,7 +46,6 @@ class ProductInfo(BaseModel):
     symbol: str = ""
     price: float = 0.0
     volume_24h: float = 0.0
-    status: str = ""
     quote_currency: str = ""
 
 class Price(BaseModel):
@@ -59,4 +58,4 @@ class Price(BaseModel):
     open: float = 0.0
     close: float = 0.0
     volume: float = 0.0
-    time: str = ""
+    timestamp_ms: int = 0  # Timestamp in milliseconds

src/app/markets/binance.py

@@ -3,16 +3,25 @@ from datetime import datetime
 from binance.client import Client
 from .base import ProductInfo, BaseWrapper, Price
 
-def get_product(currency: str, ticker_data: dict[str, str]) -> 'ProductInfo':
+def get_product(currency: str, ticker_data: dict[str, str]) -> ProductInfo:
     product = ProductInfo()
     product.id = ticker_data.get('symbol')
     product.symbol = ticker_data.get('symbol', '').replace(currency, '')
     product.price = float(ticker_data.get('price', 0))
     product.volume_24h = float(ticker_data.get('volume', 0))
-    product.status = "TRADING"  # Binance non fornisce status esplicito
     product.quote_currency = currency
     return product
 
+def get_price(kline_data: list) -> Price:
+    price = Price()
+    price.open = float(kline_data[1])
+    price.high = float(kline_data[2])
+    price.low = float(kline_data[3])
+    price.close = float(kline_data[4])
+    price.volume = float(kline_data[5])
+    price.timestamp_ms = kline_data[0]
+    return price
+
 class BinanceWrapper(BaseWrapper):
     """
     Wrapper per le API autenticate di Binance.\n
@@ -63,15 +72,5 @@ class BinanceWrapper(BaseWrapper):
             interval=Client.KLINE_INTERVAL_1HOUR,
             limit=limit,
         )
+        return [get_price(kline) for kline in klines]
 
-        prices = []
-        for kline in klines:
-            price = Price()
-            price.open = float(kline[1])
-            price.high = float(kline[2])
-            price.low = float(kline[3])
-            price.close = float(kline[4])
-            price.volume = float(kline[5])
-            price.time = str(datetime.fromtimestamp(kline[0] / 1000))
-            prices.append(price)
-        return prices

src/app/markets/coinbase.py

@@ -6,24 +6,22 @@ from coinbase.rest.types.product_types import Candle, GetProductResponse, Produc
 from .base import ProductInfo, BaseWrapper, Price
 
 
-def get_product(product_data: GetProductResponse | Product) -> 'ProductInfo':
+def get_product(product_data: GetProductResponse | Product) -> ProductInfo:
     product = ProductInfo()
     product.id = product_data.product_id or ""
     product.symbol = product_data.base_currency_id or ""
     product.price = float(product_data.price) if product_data.price else 0.0
     product.volume_24h = float(product_data.volume_24h) if product_data.volume_24h else 0.0
-    # TODO Check what status means in Coinbase
-    product.status = product_data.status or ""
     return product
 
-def get_price(candle_data: Candle) -> 'Price':
+def get_price(candle_data: Candle) -> Price:
     price = Price()
     price.high = float(candle_data.high) if candle_data.high else 0.0
     price.low = float(candle_data.low) if candle_data.low else 0.0
     price.open = float(candle_data.open) if candle_data.open else 0.0
     price.close = float(candle_data.close) if candle_data.close else 0.0
     price.volume = float(candle_data.volume) if candle_data.volume else 0.0
-    price.time = str(candle_data.start) if candle_data.start else ""
+    price.timestamp_ms = int(candle_data.start) * 1000 if candle_data.start else 0
     return price
 
 

src/app/markets/cryptocompare.py

@@ -1,26 +1,26 @@
 import os
 import requests
-from typing import Optional, Dict, Any
 from .base import ProductInfo, BaseWrapper, Price
 
 
-def get_product(asset_data: dict) -> 'ProductInfo':
+def get_product(asset_data: dict) -> ProductInfo:
     product = ProductInfo()
-    product.id = asset_data['FROMSYMBOL'] + '-' + asset_data['TOSYMBOL']
-    product.symbol = asset_data['FROMSYMBOL']
-    product.price = float(asset_data['PRICE'])
-    product.volume_24h = float(asset_data['VOLUME24HOUR'])
-    product.status = "" # Cryptocompare does not provide status
+    product.id = asset_data.get('FROMSYMBOL', '') + '-' + asset_data.get('TOSYMBOL', '')
+    product.symbol = asset_data.get('FROMSYMBOL', '')
+    product.price = float(asset_data.get('PRICE', 0))
+    product.volume_24h = float(asset_data.get('VOLUME24HOUR', 0))
+    assert product.price > 0, "Invalid price data received from CryptoCompare"
     return product
 
-def get_price(price_data: dict) -> 'Price':
+def get_price(price_data: dict) -> Price:
     price = Price()
-    price.high = float(price_data['high'])
-    price.low = float(price_data['low'])
-    price.open = float(price_data['open'])
-    price.close = float(price_data['close'])
-    price.volume = float(price_data['volumeto'])
-    price.time = str(price_data['time'])
+    price.high = float(price_data.get('high', 0))
+    price.low = float(price_data.get('low', 0))
+    price.open = float(price_data.get('open', 0))
+    price.close = float(price_data.get('close', 0))
+    price.volume = float(price_data.get('volumeto', 0))
+    price.timestamp_ms = price_data.get('time', 0) * 1000
+    assert price.timestamp_ms > 0, "Invalid timestamp data received from CryptoCompare"
     return price
 
 
@@ -39,7 +39,7 @@ class CryptoCompareWrapper(BaseWrapper):
         self.api_key = api_key
         self.currency = currency
 
-    def __request(self, endpoint: str, params: Optional[Dict[str, Any]] = None) -> Dict[str, Any]:
+    def __request(self, endpoint: str, params: dict[str, str] | None = None) -> dict[str, str]:
         if params is None:
             params = {}
         params['api_key'] = self.api_key
@@ -67,7 +67,7 @@ class CryptoCompareWrapper(BaseWrapper):
             assets.append(get_product(asset_data))
         return assets
 
-    def get_historical_prices(self, asset_id: str, limit: int = 100) -> list[dict]:
+    def get_historical_prices(self, asset_id: str, limit: int = 100) -> list[Price]:
         response = self.__request("/data/v2/histohour", params = {
             "fsym": asset_id,
             "tsym": self.currency,

src/app/markets/yfinance.py

@@ -12,7 +12,6 @@ def create_product_info(stock_data: dict[str, str]) -> ProductInfo:
     product.symbol = product.id.split('-')[0]  # Rimuovi il suffisso della valuta per le crypto
     product.price = float(stock_data.get('Current Stock Price', f"0.0 USD").split(" ")[0]) # prende solo il numero
     product.volume_24h = 0.0 # YFinance non fornisce il volume 24h direttamente
-    product.status = "trading" if product.price > 0 else "offline"
     product.quote_currency = product.id.split('-')[0]  # La valuta è la parte dopo il '-'
     return product
 
@@ -26,7 +25,7 @@ def create_price_from_history(hist_data: dict[str, str]) -> Price:
     price.open = float(hist_data.get('Open', 0.0))
     price.close = float(hist_data.get('Close', 0.0))
     price.volume = float(hist_data.get('Volume', 0.0))
-    price.time = hist_data.get('Timestamp', '')
+    price.timestamp_ms = int(hist_data.get('Timestamp', '0'))
     return price