Dmitry Beresnev commited on
Commit
db46b9f
Β·
1 Parent(s): a7ddd73

refactor AsyncTradingGridGenerator and cmd

Browse files
src/services/async_trading_grid_calculator.py CHANGED
@@ -272,6 +272,7 @@ class AsyncTradingGridGenerator:
272
  message = f"""🎯 <b>TRADING GRID {ticker.upper()}</b>
273
  {strategy_info['emoji']} <b>Strategy:</b> {strategy.upper()}
274
  {strategy_info['description']}
 
275
  πŸ“Š <b>CURRENT INDICATORS:</b>
276
  πŸ’° Price: <code>${indicators['current_price']:.2f}</code> {trend_emoji}
277
  πŸ“Š RSI: <code>{indicators['rsi']:.1f}</code> {rsi_status}
@@ -279,16 +280,18 @@ class AsyncTradingGridGenerator:
279
  🎯 ATR: <code>${indicators['atr']:.2f}</code>
280
  πŸ”» Support: <code>${indicators['support']:.2f}</code>
281
  πŸ”Ί Resistance: <code>${indicators['resistance']:.2f}</code>
 
282
  πŸ“‹ <b>GRID METRICS:</b>
283
  πŸ’΅ Capital: <code>${metrics['total_capital']:.2f}</code>
284
  πŸ“‰ Max drawdown: <code>{metrics['max_drawdown']:.2f}%</code>
285
  🎯 Orders: <code>{metrics['number_of_orders']}</code>
286
  πŸ’° Potential: <code>${metrics['potential_profit']:.2f}</code>
287
  πŸ“ˆ Margin: <code>{metrics['profit_margin']:.2f}%</code>
 
288
  🎯 <b>TOP-{min(5, len(df))} LEVELS:</b>
289
- ```
290
- β„– Price Size Drop Type
291
- """
292
  # Add top-5 levels
293
  for i in range(min(5, len(df))):
294
  row = df.iloc[i]
 
272
  message = f"""🎯 <b>TRADING GRID {ticker.upper()}</b>
273
  {strategy_info['emoji']} <b>Strategy:</b> {strategy.upper()}
274
  {strategy_info['description']}
275
+
276
  πŸ“Š <b>CURRENT INDICATORS:</b>
277
  πŸ’° Price: <code>${indicators['current_price']:.2f}</code> {trend_emoji}
278
  πŸ“Š RSI: <code>{indicators['rsi']:.1f}</code> {rsi_status}
 
280
  🎯 ATR: <code>${indicators['atr']:.2f}</code>
281
  πŸ”» Support: <code>${indicators['support']:.2f}</code>
282
  πŸ”Ί Resistance: <code>${indicators['resistance']:.2f}</code>
283
+
284
  πŸ“‹ <b>GRID METRICS:</b>
285
  πŸ’΅ Capital: <code>${metrics['total_capital']:.2f}</code>
286
  πŸ“‰ Max drawdown: <code>{metrics['max_drawdown']:.2f}%</code>
287
  🎯 Orders: <code>{metrics['number_of_orders']}</code>
288
  πŸ’° Potential: <code>${metrics['potential_profit']:.2f}</code>
289
  πŸ“ˆ Margin: <code>{metrics['profit_margin']:.2f}%</code>
290
+
291
  🎯 <b>TOP-{min(5, len(df))} LEVELS:</b>
292
+ ```
293
+ β„– Price Size Drop Type
294
+ """
295
  # Add top-5 levels
296
  for i in range(min(5, len(df))):
297
  row = df.iloc[i]
src/telegram_bot/telegram_bot_service.py CHANGED
@@ -171,8 +171,8 @@ class TelegramBotService:
171
  response += "πŸ€– AI-powered trading insights\n"
172
  response += "πŸ”— Powered by OpenRouter and Gemini API\n\n"
173
  response += "πŸ€– /news_iter TICKER - News feed iterating\n\n"
174
- response += "πŸ’‘ <i>Note: Risk analysis is experimental and may not be accurate. Use at your own risk!</i>"
175
- response += "/predict TICKER - Stock price prediction (e.g., /predict AAPL)\n"
176
  response += "/grid TICKER CAPITAL STRATEGY\n"
177
  response += " - Generate trading grid (e.g., /grid AAPL 10000 conservative)\n"
178
 
 
171
  response += "πŸ€– AI-powered trading insights\n"
172
  response += "πŸ”— Powered by OpenRouter and Gemini API\n\n"
173
  response += "πŸ€– /news_iter TICKER - News feed iterating\n\n"
174
+ response += "πŸ’‘ <i>Note: Risk analysis is experimental and may not be accurate. Use at your own risk!</i>\n\n"
175
+ response += "/predict TICKER - Stock price prediction (e.g., /predict AAPL)\n\n"
176
  response += "/grid TICKER CAPITAL STRATEGY\n"
177
  response += " - Generate trading grid (e.g., /grid AAPL 10000 conservative)\n"
178