修复web前端,增加openai

This commit is contained in:
dekun
2026-05-23 11:53:36 +08:00
parent 4439bedcb7
commit ada9478713
20 changed files with 335 additions and 355 deletions
+19 -76
View File
@@ -34,6 +34,7 @@ import sys
if _REPO_ROOT not in sys.path:
sys.path.insert(0, _REPO_ROOT)
from ai_client import ai_generate, ai_review, ai_short_advice
from fib_key_monitor_lib import (
FIB_KEY_MONITOR_TYPES,
KEY_ENTRY_REASON_BY_SIGNAL,
@@ -207,8 +208,6 @@ BREAKEVEN_RR_TRIGGER = float(os.getenv("BREAKEVEN_RR_TRIGGER", "1.0"))
BREAKEVEN_OFFSET_PCT = float(os.getenv("BREAKEVEN_OFFSET_PCT", "0.02"))
BREAKEVEN_STEP_R = float(os.getenv("BREAKEVEN_STEP_R", "1.0"))
DEFAULT_TRADE_STYLE = (os.getenv("DEFAULT_TRADE_STYLE", "trend") or "trend").strip().lower()
OLLAMA_API = os.getenv("OLLAMA_API", "http://127.0.0.1:11434/api/generate")
AI_MODEL = os.getenv("AI_MODEL", "huihui_ai/deepseek-r1-abliterated:latest")
GATE_SOCKS_PROXY = (os.getenv("GATE_SOCKS_PROXY") or "").strip()
GATE_HTTP_PROXY = (os.getenv("GATE_HTTP_PROXY") or "").strip()
@@ -527,61 +526,6 @@ def _journal_row_lines_for_ai(idx, row, *, include_hold_duration=True):
return "\n".join(lines) + "\n"
def ai_review(trades_text, period_title, image_paths=None):
prompt = f"""
你是一位专业交易教练下面是用户的{period_title}交易记录请做简洁可执行的复盘中文
硬性规则 必须遵守
- 你只能根据交易记录**明确出现的字段**陈述事实禁止编造是否触发止损是否扛单亏损是否扩大图上具体结构/进出场点位等记录里**没有**的信息
- 平仓/离场只是交易员自述摘要不是客观成交明细若记录未写明代币是否打到止损价是否软件平仓等不要断言执行路径可用在记录有限前提下一种可能是或简短写执行路径记录不足无法判断
- 提前离场类结论必须优先依据记录中的提前离场记录字段若该段全为或未出现有效内容不得写道明显扛单拒不止损未执行硬止损
- 实际RR为负只说明结果相对于预期RR不利不等同于风控失灵止损纪律崩溃除非记录里另有依据
- 禁止用语人身攻击夸张定性致命伤灾难语气克制对事不对人
- 若有截图且你能辨认再结合图讨论看不清或无明确定位则明确说无法从图确认不得虚构 K 线故事
输出结构
1. 总体盈亏结构紧扣笔数盈亏数字与 RR少形容词
2. 心态与执行每笔 110 + 一句依据依据必须对应记录字段
3. 行为标签提前离场 / 乱开仓 / 扛单等仅在有字段或自述支撑时点名否则写记录未勾选或未描述不作强加
4. 改进建议最多 3 每条具体可执行
5. 图表若有且可读结合价格行为简述否则一两句说明无法看图分析
交易记录
{trades_text}
""".strip()
payload = {"model": AI_MODEL, "prompt": prompt, "stream": False, "options": {"temperature": 0.2}}
images = []
for p in image_paths or []:
b64 = _read_image_base64(p)
if b64:
images.append(b64)
if images:
payload["images"] = images
try:
r = requests.post(OLLAMA_API, json=payload, timeout=AI_TIMEOUT_SECONDS)
return r.json().get("response", "AI 生成失败")
except Exception as e:
return f"AI 调用失败:{str(e)}"
def ai_short_advice(prompt_text):
prompt = f"""
你是交易风控助理请用中文给出**最多 3 **提醒要求
- 每条不超过 25 个字
- 语气克制具体可执行
- 不要输出 Markdown不要编号前缀以外的废话
场景
{prompt_text}
""".strip()
payload = {"model": AI_MODEL, "prompt": prompt, "stream": False, "options": {"temperature": 0.2}}
try:
r = requests.post(OLLAMA_API, json=payload, timeout=AI_TIMEOUT_SECONDS)
return (r.json().get("response") or "").strip()
except Exception:
return ""
def _load_font(size):
if not ImageFont:
return None
@@ -1095,16 +1039,10 @@ JSON 字段:
"note": ""
}
""".strip()
payload = {
"model": AI_MODEL,
"prompt": prompt,
"images": [image_b64],
"stream": False,
"options": {"temperature": 0.1},
}
try:
r = requests.post(OLLAMA_API, json=payload, timeout=AI_TIMEOUT_SECONDS)
raw = r.json().get("response", "")
raw = ai_generate(prompt, images_b64=[image_b64], temperature=0.1)
if raw.startswith("AI 调用失败"):
return {}
data = _extract_json_object(raw) or {}
if not isinstance(data, dict):
data = {}
@@ -5739,18 +5677,16 @@ def render_main_page(page="trade"):
f"斐波:限价 @ E(SL/TP 为 H/L),可选移动保本|趋势止损外侧 {KEY_TREND_STOP_OUTSIDE_PCT}%"
)
strategy_extra = {}
if page in ("strategy_trend", "strategy_roll"):
if page in ("strategy", "strategy_trend", "strategy_roll"):
from strategy_ui import strategy_page_template_vars
strategy_extra = strategy_page_template_vars(
conn, page, default_risk_percent=float(RISK_PERCENT)
conn,
"strategy",
default_risk_percent=float(RISK_PERCENT),
request_obj=request,
trend_cfg=app.extensions.get("strategy_trend_cfg"),
)
if page == "strategy_trend":
cfg = app.extensions.get("strategy_trend_cfg")
if cfg:
from strategy_trend_register import load_trend_page_context
strategy_extra.update(load_trend_page_context(conn, request, cfg))
conn.close()
return render_template(
"index.html",
@@ -7826,16 +7762,23 @@ except Exception as _hub_err:
print(f"[hub_bridge] gate: {_hub_err}")
@app.route("/strategy")
@login_required
def strategy_trading_page():
return render_main_page("strategy")
@app.route("/strategy/trend")
@login_required
def strategy_trend_page():
return render_main_page("strategy_trend")
qs = request.query_string.decode()
return redirect(f"/strategy?{qs}" if qs else "/strategy")
@app.route("/strategy/roll")
@login_required
def strategy_roll_page():
return render_main_page("strategy_roll")
return redirect("/strategy")
from strategy_register import install_strategy_trading