harry/Forex_bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove chart from /signal, explain score bar, and optimize API calls to run concurrently

Browse Source
This commit is contained in:
Harwinder
2026-05-01 17:22:04 -04:00
parent 9cd4460bd0
commit 76a39672be
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.py
+17 -10
View File
@@ -196,10 +196,18 @@ async def chart_cmd(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
async def signal_cmd(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
try:
pair, tf = _parse_pair_tf(ctx.args)
df = await fetch_ohlc(pair, tf)
htf = HTF_OF.get(tf)
htf_df = await fetch_ohlc(pair, htf) if htf and htf != tf else None
# Fetch both timeframes concurrently to double the network speed
import asyncio
if htf and htf != tf:
df, htf_df = await asyncio.gather(
fetch_ohlc(pair, tf),
fetch_ohlc(pair, htf)
)
else:
df = await fetch_ohlc(pair, tf)
htf_df = None
report = analyze(df, htf_df)
price = report["price"]
@@ -221,12 +229,12 @@ async def signal_cmd(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
"",
*_fmt_group(report["readings"], "volatility", "*-- VOLATILITY*"),
"",
# Score line — bar + plain-English label so the number has context
"*-- FINAL VERDICT --*",
f"`[{_score_bar(report['score'], report['max_score'])}]` "
f"{ascii_indicator(verdict)} *{verdict}*",
f"Score `{report['score']:+d}` of +/-`{report['max_score']}` "
f"({_score_label(report['score'], report['max_score'])} signal, "
f"{report['confidence']}% of max)",
f"Score `{report['score']:+d}` of maximum +/-`{report['max_score']}`",
f"_{report['confidence']}% overall strength ({_score_label(report['score'], report['max_score'])} signal)_",
"> _The bar above visualizes the signal strength. The more # symbols, the stronger the conviction. +20 is maximum Buy, -20 is maximum Sell._",
]
if report["context"]:
@@ -249,9 +257,8 @@ async def signal_cmd(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
f"_ATR-based zones:_ SL `{sl}` | TP `{tp}`",
]
caption = "\n".join(lines) + DISCLAIMER
img = generate_chart(df, pair, tf, verdict=verdict, confidence=report["confidence"])
await update.message.reply_photo(img, caption=caption, parse_mode="Markdown")
text = "\n".join(lines) + DISCLAIMER
await update.message.reply_text(text, parse_mode="Markdown")
except Exception as e:
logger.exception("signal_cmd failed")
await _reply(update, f"Error: {e}")