Stage 03.2 - market timestamp in local timezone
This commit is contained in:
@@ -1,12 +1,18 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from datetime import datetime
|
||||
from zoneinfo import ZoneInfo
|
||||
from src.core.config import load_settings
|
||||
|
||||
from src.core.config import load_settings
|
||||
from src.integrations.exchange.exceptions import ExchangeError
|
||||
from src.integrations.exchange.mock_data import (
|
||||
mock_balance_summary,
|
||||
mock_exchange_health,
|
||||
mock_ticker_price,
|
||||
)
|
||||
from src.integrations.exchange.models import BalanceSummary, ExchangeHealth, TickerPrice
|
||||
from src.integrations.exchange.rest_client import ExchangeRestClient
|
||||
|
||||
|
||||
class ExchangeService:
|
||||
@@ -17,22 +23,57 @@ class ExchangeService:
|
||||
if not self.settings.exchange_enabled:
|
||||
return mock_exchange_health()
|
||||
|
||||
if not self.settings.exchange_api_key or not self.settings.exchange_api_secret:
|
||||
try:
|
||||
ticker = self._get_real_price(self.settings.default_symbol)
|
||||
except ExchangeError as exc:
|
||||
return ExchangeHealth(
|
||||
ok=False,
|
||||
mode="configured_without_keys",
|
||||
message="Интеграция включена, но API key / secret не заданы.",
|
||||
mode="real_error",
|
||||
message=f"Ошибка подключения к API: {exc}",
|
||||
)
|
||||
|
||||
return ExchangeHealth(
|
||||
ok=False,
|
||||
mode="real_pending",
|
||||
message="Реальный REST client еще не подключен. Пока доступен только mock mode.",
|
||||
ok=True,
|
||||
mode="real_public_api",
|
||||
message=f"Public API OK. Последняя цена {ticker.symbol}: {ticker.price:.2f}",
|
||||
)
|
||||
|
||||
def get_price(self, symbol: str | None = None) -> TickerPrice:
|
||||
symbol_to_use = symbol or self.settings.default_symbol
|
||||
return mock_ticker_price(symbol_to_use)
|
||||
|
||||
if not self.settings.exchange_enabled:
|
||||
return mock_ticker_price(symbol_to_use)
|
||||
|
||||
return self._get_real_price(symbol_to_use)
|
||||
|
||||
def get_balance_summary(self) -> list[BalanceSummary]:
|
||||
return mock_balance_summary()
|
||||
|
||||
def _get_real_price(self, symbol: str) -> TickerPrice:
|
||||
client = ExchangeRestClient()
|
||||
payload = client.get_json(
|
||||
"/api/v2/ticker/24hr",
|
||||
params={"symbol": symbol},
|
||||
)
|
||||
|
||||
price_raw = payload.get("lastPrice")
|
||||
if price_raw is None:
|
||||
raise ExchangeError("Field 'lastPrice' is missing in ticker response.")
|
||||
|
||||
close_time = payload.get("closeTime") or payload.get("eventTime") or ""
|
||||
|
||||
settings = load_settings()
|
||||
|
||||
if close_time:
|
||||
dt_utc = datetime.fromtimestamp(int(close_time) / 1000, tz=ZoneInfo("UTC"))
|
||||
dt_local = dt_utc.astimezone(ZoneInfo(settings.tz))
|
||||
updated_at = dt_local.strftime("%d/%m/%Y %H:%M:%S")
|
||||
else:
|
||||
updated_at = "n/a"
|
||||
|
||||
return TickerPrice(
|
||||
symbol=symbol,
|
||||
price=float(price_raw),
|
||||
source="dzengi-demo-api",
|
||||
updated_at=updated_at,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user