From 17bfb08e43d089e7e56af25f28e9792b29f19683 Mon Sep 17 00:00:00 2001 From: Siarhei Siniak Date: Wed, 16 Jul 2025 10:52:37 +0300 Subject: [PATCH] [+] fix typing --- .../test_task_2025_06_30_v1/async_api/websocket_api.py | 4 ++-- .../pr34/test_task_2025_06_30_v1/tickers/logic.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deps/test-task-2025-06-30-v1/python/online/fxreader/pr34/test_task_2025_06_30_v1/async_api/websocket_api.py b/deps/test-task-2025-06-30-v1/python/online/fxreader/pr34/test_task_2025_06_30_v1/async_api/websocket_api.py index 5877b3e..efd08d8 100644 --- a/deps/test-task-2025-06-30-v1/python/online/fxreader/pr34/test_task_2025_06_30_v1/async_api/websocket_api.py +++ b/deps/test-task-2025-06-30-v1/python/online/fxreader/pr34/test_task_2025_06_30_v1/async_api/websocket_api.py @@ -63,8 +63,8 @@ class WebsocketAPI: message=dict( points=[ dict( - asset_name=o.asset_name, - asset_id=o.asset_id, + asset_name=o.market.name, + asset_id=o.market.id, time=o.timestamp.timestamp(), value=o.value, ) diff --git a/deps/test-task-2025-06-30-v1/python/online/fxreader/pr34/test_task_2025_06_30_v1/tickers/logic.py b/deps/test-task-2025-06-30-v1/python/online/fxreader/pr34/test_task_2025_06_30_v1/tickers/logic.py index 21d4169..d3d1189 100644 --- a/deps/test-task-2025-06-30-v1/python/online/fxreader/pr34/test_task_2025_06_30_v1/tickers/logic.py +++ b/deps/test-task-2025-06-30-v1/python/online/fxreader/pr34/test_task_2025_06_30_v1/tickers/logic.py @@ -2,8 +2,8 @@ import datetime from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.ext.asyncio import async_sessionmaker -from sqlalchemy.orm import selectinload -from sqlalchemy.future import select, make_transient +from sqlalchemy.orm import selectinload, make_transient +from sqlalchemy.future import select from .models import Ticker, Market from .utils import get_or_create @@ -44,8 +44,8 @@ async def tickers_get_by_period( async with session() as active_session: async with active_session.begin() as transaction: q = select( - Ticket - ).join(Ticket.market).where( + Ticker + ).join(Ticker.market).where( Market.id == market_id, Ticker.timestamp >= datetime.datetime.now( tz=datetime.timezone.utc @@ -56,7 +56,7 @@ async def tickers_get_by_period( res = await active_session.execute(q) - rows = list(res) + rows = [o[0] for o in res] for o in rows: active_session.expunge(o)