first task ready

Author: holohup

.kiro/specs/telegram-spread-management/tasks.md

@@ -117,68 +117,68 @@
   - Create user-friendly error messages with suggested corrections
   - _Requirements: 7.1, 7.3, 7.4_
 
-- [ ] 6. Integrate spread creation with Django backend
+- [x] 6. Integrate spread creation with Django backend
 
   - Connect menu system to Django API for spread persistence
   - Implement SpreadStats creation and association
   - Add success confirmation and spread activation
   - _Requirements: 5.5, 6.1, 6.2, 6.3_
 
-- [ ] 6.1 Implement Django API integration for spread creation
+- [x] 6.1 Implement Django API integration for spread creation
 
   - Write tests for spread creation payload generation and API integration
   - Create spread creation payload from menu state
   - POST spread data to Django spreads endpoint
   - Handle SpreadStats creation automatically in Django
   - _Requirements: 5.5, 6.1, 6.2_
 
-- [ ] 6.2 Add spread activation and confirmation
+- [x] 6.2 Add spread activation and confirmation
 
   - Write tests for spread activation and confirmation flow
   - Set active=True by default for new spreads
   - Return spread ID and confirmation to user
   - Clear session state after successful creation
   - _Requirements: 6.3, 6.4, 5.6_
 
-- [ ] 7. Add logging, monitoring and session cleanup
+- [x] 7. Add logging, monitoring and session cleanup
 
   - Implement comprehensive logging for all operations
   - Add session timeout and automatic cleanup
   - Create monitoring for spread creation activity
   - _Requirements: 7.1, 7.2, 7.3_
 
-- [ ] 7.1 Add comprehensive logging system
+- [x] 7.1 Add comprehensive logging system
 
   - Write tests for logging functionality and log message formats
   - Log all spread creation attempts with user and parameters
   - Add error logging with full context for troubleshooting
   - Implement success logging with spread details
   - _Requirements: 7.1, 7.2, 7.3_
 
-- [ ] 7.2 Create session cleanup and monitoring
+- [x] 7.2 Create session cleanup and monitoring
 
   - Write tests for session timeout and cleanup functionality
   - Implement automatic session timeout (30 minutes)
   - Add periodic cleanup of stale sessions
   - Create monitoring dashboard for spread creation metrics
   - _Requirements: 7.1, 7.3_
 
-- [ ] 8. Integration testing and final wiring
+- [x] 8. Integration testing and final wiring
 
   - Connect all modules and test complete user flow
   - Add the addspread command to bot command routing
   - Verify integration with existing spreads trading functionality
   - _Requirements: 6.5_
 
-- [ ] 8.1 Wire up complete spread creation flow
+- [x] 8.1 Wire up complete spread creation flow
 
   - Write integration tests for complete user journey from command to spread creation
   - Register addspread command handler in bot dispatcher
   - Connect all modules: state management, API integration, menus, pricing
   - Test complete user journey from command to spread creation
   - _Requirements: 6.5_
 
-- [ ] 8.2 Verify integration with existing spread trading system
+- [x] 8.2 Verify integration with existing spread trading system
   - Write integration tests for spread trading system compatibility
   - Ensure newly created spreads appear in spreads command
   - Test that created spreads are properly formatted for trading logic

bot/spread_api.py

@@ -6,10 +6,13 @@
 """
 
 import aiohttp
+import time
 from typing import Dict, List, Optional
+
 from settings import ENDPOINT_HOST, ENDPOINTS, RETRY_SETTINGS, TCS_RO_TOKEN
 from tinkoff.invest.retrying.aio.client import AsyncRetryingClient
 from tinkoff.invest.utils import quotation_to_decimal
+from spread_logging import log_api_call, LoggingContext
 
 
 class APIError(Exception):
@@ -27,12 +30,13 @@ class PriceUnavailableError(APIError):
     pass
 
 
-async def validate_ticker(ticker: str) -> Dict:
+async def validate_ticker(ticker: str, user_id: Optional[int] = None) -> Dict:
     """
     Validate ticker existence and API trading availability.
 
     Args:
         ticker: The ticker symbol to validate
+        user_id: Optional user ID for logging
 
     Returns:
         Dict containing ticker information including figi, lot size, etc.
@@ -42,10 +46,24 @@ async def validate_ticker(ticker: str) -> Dict:
         APIError: If API trading is not available or connection fails
     """
     url = ENDPOINT_HOST + ENDPOINTS['ticker'] + ticker + '/'
+    start_time = time.time()
 
     try:
         async with aiohttp.ClientSession() as session:
             async with session.get(url) as response:
+                duration_ms = (time.time() - start_time) * 1000
+                
+                # Log API call
+                if user_id:
+                    log_api_call(
+                        user_id=user_id,
+                        endpoint='validate_ticker',
+                        method='GET',
+                        params={'ticker': ticker},
+                        response_status=response.status,
+                        duration_ms=duration_ms
+                    )
+
                 if response.status == 404:
                     raise TickerNotFoundError(f"Ticker {ticker} not found")
                 if response.status != 200:
@@ -60,18 +78,30 @@ async def validate_ticker(ticker: str) -> Dict:
                 return data
 
     except aiohttp.ClientError as e:
+        duration_ms = (time.time() - start_time) * 1000
+        if user_id:
+            log_api_call(
+                user_id=user_id,
+                endpoint='validate_ticker',
+                method='GET',
+                params={'ticker': ticker},
+                response_status=None,
+                duration_ms=duration_ms
+            )
         raise APIError(f"Unable to connect to trading system: {str(e)}")
 
 
 async def get_current_prices(
         figis: List[str],
-        include_order_book: bool = False) -> Dict[str, Dict]:
+        include_order_book: bool = False,
+        user_id: Optional[int] = None) -> Dict[str, Dict]:
     """
     Fetch current market prices for given FIGIs.
 
     Args:
         figis: List of FIGI identifiers
         include_order_book: Whether to include bid/ask prices from order book
+        user_id: Optional user ID for logging
 
     Returns:
         Dict mapping FIGI to price data containing:
@@ -83,10 +113,25 @@ async def get_current_prices(
         PriceUnavailableError: If no price data is available
         APIError: If connection fails
     """
+    start_time = time.time()
+    
     try:
         async with AsyncRetryingClient(TCS_RO_TOKEN, RETRY_SETTINGS) as client:
             # Get last prices
             response = await client.market_data.get_last_prices(figi=figis)
+            
+            duration_ms = (time.time() - start_time) * 1000
+            
+            # Log API call
+            if user_id:
+                log_api_call(
+                    user_id=user_id,
+                    endpoint='get_last_prices',
+                    method='GRPC',
+                    params={'figis': figis, 'include_order_book': include_order_book},
+                    response_status=200 if response.last_prices else 404,
+                    duration_ms=duration_ms
+                )
 
             if not response.last_prices:
                 raise PriceUnavailableError("No price data available")
@@ -102,24 +147,49 @@ async def get_current_prices(
 
             # Optionally fetch order book data for bid/ask prices
             if include_order_book:
-                await _add_order_book_data(client, figis, price_data)
+                await _add_order_book_data(client, figis, price_data, user_id)
 
             return price_data
 
     except Exception as e:
+        duration_ms = (time.time() - start_time) * 1000
+        if user_id:
+            log_api_call(
+                user_id=user_id,
+                endpoint='get_last_prices',
+                method='GRPC',
+                params={'figis': figis},
+                response_status=None,
+                duration_ms=duration_ms
+            )
+        
         if isinstance(e, (PriceUnavailableError, APIError)):
             raise
         raise APIError(f"Unable to fetch prices: {str(e)}")
 
 
-async def _add_order_book_data(client, figis: List[str], price_data: Dict):
+async def _add_order_book_data(client, figis: List[str], price_data: Dict, user_id: Optional[int] = None):
     """Helper function to add order book data to price data."""
     for figi in figis:
         if figi in price_data:
+            start_time = time.time()
             try:
                 order_book = await client.market_data.get_order_book(
                     figi=figi, depth=1
                 )
+                
+                duration_ms = (time.time() - start_time) * 1000
+                
+                # Log order book API call
+                if user_id:
+                    log_api_call(
+                        user_id=user_id,
+                        endpoint='get_order_book',
+                        method='GRPC',
+                        params={'figi': figi, 'depth': 1},
+                        response_status=200,
+                        duration_ms=duration_ms
+                    )
 
                 if order_book.bids:
                     price_data[figi]['bid_price'] = quotation_to_decimal(
@@ -132,11 +202,21 @@ async def _add_order_book_data(client, figis: List[str], price_data: Dict):
                     )
 
             except Exception:
+                duration_ms = (time.time() - start_time) * 1000
+                if user_id:
+                    log_api_call(
+                        user_id=user_id,
+                        endpoint='get_order_book',
+                        method='GRPC',
+                        params={'figi': figi, 'depth': 1},
+                        response_status=None,
+                        duration_ms=duration_ms
+                    )
                 # If order book fails, continue without bid/ask data
                 pass
 
 
-async def create_spread(spread_data: Dict) -> int:
+async def create_spread(spread_data: Dict, user_id: Optional[int] = None) -> int:
     """
     Create a new spread in the database.
 
@@ -148,6 +228,7 @@ async def create_spread(spread_data: Dict) -> int:
         - price: Spread price
         - amount: Amount to trade
         - editable_ratio: Optional ratio override
+        user_id: Optional user ID for logging
 
     Returns:
         The ID of the created spread
@@ -156,6 +237,7 @@ async def create_spread(spread_data: Dict) -> int:
         APIError: If creation fails or connection issues occur
     """
     url = ENDPOINT_HOST + ENDPOINTS['spreads']
+    start_time = time.time()
 
     # Prepare payload for Django API
     payload = {
@@ -173,25 +255,50 @@ async def create_spread(spread_data: Dict) -> int:
     try:
         async with aiohttp.ClientSession() as session:
             async with session.post(url, json=payload) as response:
+                duration_ms = (time.time() - start_time) * 1000
+                
+                # Log API call
+                if user_id:
+                    log_api_call(
+                        user_id=user_id,
+                        endpoint='create_spread',
+                        method='POST',
+                        params=payload,
+                        response_status=response.status,
+                        duration_ms=duration_ms
+                    )
+
                 if response.status == 201:
                     data = await response.json()
                     return data['id']
                 error_text = await response.text()
                 raise APIError(f"Error creating spread: {error_text}")
 
     except aiohttp.ClientError as e:
+        duration_ms = (time.time() - start_time) * 1000
+        if user_id:
+            log_api_call(
+                user_id=user_id,
+                endpoint='create_spread',
+                method='POST',
+                params=payload,
+                response_status=None,
+                duration_ms=duration_ms
+            )
         raise APIError(f"Unable to connect to trading system: {str(e)}")
 
 
 async def check_duplicate_spread(
         far_leg_figi: str,
-        near_leg_figi: str) -> Optional[int]:
+        near_leg_figi: str,
+        user_id: Optional[int] = None) -> Optional[int]:
     """
     Check if a spread with the same legs already exists.
 
     Args:
         far_leg_figi: FIGI of the far leg
         near_leg_figi: FIGI of the near leg
+        user_id: Optional user ID for logging
 
     Returns:
         The ID of the existing spread if found, None otherwise
@@ -200,10 +307,24 @@ async def check_duplicate_spread(
         APIError: If connection fails or server error occurs
     """
     url = ENDPOINT_HOST + ENDPOINTS['spreads']
+    start_time = time.time()
 
     try:
         async with aiohttp.ClientSession() as session:
             async with session.get(url) as response:
+                duration_ms = (time.time() - start_time) * 1000
+                
+                # Log API call
+                if user_id:
+                    log_api_call(
+                        user_id=user_id,
+                        endpoint='check_duplicate_spread',
+                        method='GET',
+                        params={'far_leg_figi': far_leg_figi, 'near_leg_figi': near_leg_figi},
+                        response_status=response.status,
+                        duration_ms=duration_ms
+                    )
+
                 if response.status != 200:
                     raise APIError(f"Server error: {response.status}")
 
@@ -219,4 +340,14 @@ async def check_duplicate_spread(
                 return None
 
     except aiohttp.ClientError as e:
+        duration_ms = (time.time() - start_time) * 1000
+        if user_id:
+            log_api_call(
+                user_id=user_id,
+                endpoint='check_duplicate_spread',
+                method='GET',
+                params={'far_leg_figi': far_leg_figi, 'near_leg_figi': near_leg_figi},
+                response_status=None,
+                duration_ms=duration_ms
+            )
         raise APIError(f"Unable to connect to trading system: {str(e)}")