merge: price_events DB unification
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,50 @@
|
||||
import json, sqlite3
|
||||
from datetime import datetime
|
||||
|
||||
d = json.load(open('/home/hmo/web-dashboard/data/price_events.json'))
|
||||
events = d.get('events', d if isinstance(d, list) else [])
|
||||
print(f'JSON events: {len(events)}')
|
||||
|
||||
conn = sqlite3.connect('/home/hmo/MoFin/data/mofin.db', timeout=30)
|
||||
conn.execute('PRAGMA busy_timeout=30000')
|
||||
|
||||
# 已有的 DB 记录(避免重复):用 code+created_at 做粗粒度去重
|
||||
existing = set()
|
||||
for r in conn.execute("SELECT code, created_at FROM price_events"):
|
||||
existing.add((r[0], r[1]))
|
||||
|
||||
inserted = 0
|
||||
skipped = 0
|
||||
for e in events:
|
||||
code = str(e.get('code', ''))
|
||||
name = e.get('name', code)
|
||||
ts = e.get('timestamp') or e.get('created_at') or ''
|
||||
if not code or not ts:
|
||||
skipped += 1
|
||||
continue
|
||||
# 统一时间格式
|
||||
try:
|
||||
dt = datetime.fromisoformat(str(ts).replace('Z', ''))
|
||||
created = dt.strftime('%Y-%m-%d %H:%M:%S')
|
||||
date = dt.strftime('%Y-%m-%d')
|
||||
except Exception:
|
||||
skipped += 1
|
||||
continue
|
||||
if (code, created) in existing:
|
||||
skipped += 1
|
||||
continue
|
||||
exch, typ = ('HK', 'H') if len(code) == 5 else (('SH', 'A') if code.startswith(('6', '9')) else ('SZ', 'A'))
|
||||
conn.execute("INSERT OR IGNORE INTO stocks (code, name, exchange, type, updated_at) VALUES (?,?,?,?,?)",
|
||||
(code, name, exch, typ, created))
|
||||
conn.execute(
|
||||
"INSERT INTO price_events (code, name, event_type, price, trigger_value, event_label, created_at, date) "
|
||||
"VALUES (?,?,?,?,?,?,?,?)",
|
||||
(code, name, e.get('event_type', ''), e.get('price', 0),
|
||||
str(e.get('trigger_value', '')), e.get('event_label', ''), created, date))
|
||||
inserted += 1
|
||||
|
||||
conn.commit()
|
||||
total = conn.execute("SELECT COUNT(*) FROM price_events").fetchone()[0]
|
||||
last = conn.execute("SELECT MAX(created_at) FROM price_events").fetchone()[0]
|
||||
print(f'inserted={inserted} skipped={skipped} total={total} last={last}')
|
||||
conn.close()
|
||||
@@ -0,0 +1,7 @@
|
||||
import sqlite3
|
||||
c = sqlite3.connect('/home/hmo/MoFin/data/mofin.db')
|
||||
sql = c.execute("SELECT sql FROM sqlite_master WHERE name='price_events'").fetchone()[0]
|
||||
print(sql)
|
||||
print()
|
||||
for r in c.execute("PRAGMA foreign_key_list(price_events)"):
|
||||
print(r)
|
||||
@@ -0,0 +1,9 @@
|
||||
import sqlite3
|
||||
c = sqlite3.connect('/home/hmo/MoFin/data/mofin.db')
|
||||
sql = c.execute("SELECT sql FROM sqlite_master WHERE name='stocks'").fetchone()
|
||||
print(sql[0] if sql else 'no stocks table')
|
||||
print()
|
||||
cnt = c.execute("SELECT COUNT(*) FROM stocks").fetchone()[0]
|
||||
print('rows:', cnt)
|
||||
for r in c.execute("SELECT * FROM stocks LIMIT 3"):
|
||||
print(r)
|
||||
@@ -0,0 +1,38 @@
|
||||
import json, urllib.request
|
||||
|
||||
msg = """[笑笑] 今日F健康全量错误清理 — 完成汇报
|
||||
|
||||
你批评得对,之前修了部分没修全部,这次把 32 个 error/异常任务全部逐项过了一遍。
|
||||
|
||||
■ 先说结论:真错误比看上去少得多,大部分是监控假警报
|
||||
|
||||
【今天还在犯的真错误 — 已全部修复并验证】
|
||||
1. price_monitor L584 shares=None 崩溃 → 修后完整跑通 3m7s(39只重评+区间触发+推送)
|
||||
2. market_insight L142 net_inflow=None 崩溃 → 修后 0.3s 出 5 条洞察
|
||||
3. promote_candidates DB锁 → 加 busy_timeout,25s 提拔 19 只
|
||||
4. premarket 120s 超时 → 12维分析改为后台分离启动(cron 不再被卡死)
|
||||
5. 全局脚本超时 120s→600s(mofin_health/market_watch/memory_guardian 超时全消)
|
||||
6. 隐性部署缺陷:scp 换文件会破坏硬链接,cron 一直在跑旧代码(这就是 promote 修了还报错的原因)→ 新增 sync_profile_scripts.sh,部署后一键重链
|
||||
|
||||
【假警报 — 监控逻辑已修】
|
||||
7. "数据管道停滞14天":假的。数据早就迁到 DB,mtf_cache(0.4h前)/macro_context(2h)/market_snapshots(2h)/live_prices(0.4h) 全是新鲜的。mofin_health 现在查 DB 表新鲜度(db_freshness),不再拿遗留 JSON 的 mtime 报警
|
||||
8. "价格事件零记录":假的。事件写在 price_events.json(今天 17:06 宏华数科入区),DB 表才是旧的
|
||||
9. "suggestions表不存在":没有任何脚本用这个表,不存在的问题
|
||||
10. "newspaper3k缺失":当前代码不需要它(stderr警告而已,不致命)
|
||||
|
||||
【已验证修复生效】
|
||||
- 周末 Blocked 任务(hardlink修复):vacuum_state_db 实跑通过
|
||||
- default gateway 8642 在 key6 上 LLM 正常
|
||||
- 全部 5 张数据表新鲜度 <24h,无一 warn
|
||||
|
||||
wiki-self-growth 03:04 的 key1 429 是 key6 完全生效前的残留,明早 03:00 的运行会自证。禁用任务(8个)未动,如需启用哪些跟我说。
|
||||
|
||||
代码已提交并合并到 246(c02caeb1)。"""
|
||||
|
||||
payload = json.dumps({"to": "hmo@yoin.fun", "body": msg, "type": "chat"}).encode()
|
||||
req = urllib.request.Request("http://127.0.0.1:5805/", data=payload,
|
||||
headers={"Content-Type": "application/json"})
|
||||
try:
|
||||
print("XMPP:", urllib.request.urlopen(req, timeout=10).read().decode()[:100])
|
||||
except Exception as e:
|
||||
print("XMPP fail:", e)
|
||||
@@ -0,0 +1,15 @@
|
||||
import sys
|
||||
sys.path.insert(0, '/home/hmo/.hermes/profiles/position-analyst/scripts')
|
||||
sys.path.insert(0, '/home/hmo/MoFin')
|
||||
from mofin_db import get_conn, write_price_event
|
||||
|
||||
c = get_conn()
|
||||
ok = write_price_event(c, code='TEST99', name='测试股', event_type='entry_zone',
|
||||
price=12.34, trigger_value='12.0~12.5', event_label='加仓区间')
|
||||
print('write_price_event returned:', ok)
|
||||
r = c.execute("SELECT code,created_at FROM price_events WHERE code='TEST99'").fetchone()
|
||||
print('row:', r)
|
||||
c.execute("DELETE FROM price_events WHERE code='TEST99'")
|
||||
c.commit()
|
||||
c.close()
|
||||
print('done')
|
||||
@@ -0,0 +1,23 @@
|
||||
import sys
|
||||
sys.path.insert(0, '/home/hmo/.hermes/profiles/position-analyst/scripts')
|
||||
import price_monitor as pm
|
||||
pm.record_event('TEST99', '测试股', 'entry_zone', 12.34, '12.0~12.5', '加仓区间')
|
||||
print('record_event OK')
|
||||
|
||||
import sqlite3
|
||||
c = sqlite3.connect('/home/hmo/MoFin/data/mofin.db')
|
||||
r = c.execute("SELECT code,name,event_type,price,created_at FROM price_events WHERE code='TEST99' ORDER BY id DESC LIMIT 1").fetchone()
|
||||
print('DB row:', r)
|
||||
c.execute("DELETE FROM price_events WHERE code='TEST99'")
|
||||
c.commit()
|
||||
print('cleaned')
|
||||
|
||||
# also check JSON got it
|
||||
import json
|
||||
d = json.load(open('/home/hmo/web-dashboard/data/price_events.json'))
|
||||
last = d['events'][-1]
|
||||
print('JSON last:', last['code'], last['price'])
|
||||
if last['code'] == 'TEST99':
|
||||
d['events'] = d['events'][:-1]
|
||||
json.dump(d, open('/home/hmo/web-dashboard/data/price_events.json', 'w'), ensure_ascii=False, indent=2)
|
||||
print('JSON cleaned')
|
||||
@@ -0,0 +1,20 @@
|
||||
import sys, sqlite3, traceback
|
||||
sys.path.insert(0, '/home/hmo/MoFin')
|
||||
from mofin_db import get_conn, DB_PATH
|
||||
print('DB_PATH:', DB_PATH)
|
||||
|
||||
c = get_conn()
|
||||
try:
|
||||
c.execute(
|
||||
"INSERT INTO price_events (code, name, event_type, price, trigger_value, event_label, date) "
|
||||
"VALUES (?, ?, ?, ?, ?, ?, ?)",
|
||||
('TEST99', '测试股', 'entry_zone', 12.34, '12.0~12.5', '加仓区间', '2026-07-20'))
|
||||
c.commit()
|
||||
print('INSERT OK')
|
||||
except Exception as e:
|
||||
traceback.print_exc()
|
||||
r = c.execute("SELECT code FROM price_events WHERE code='TEST99'").fetchone()
|
||||
print('row:', r)
|
||||
c.execute("DELETE FROM price_events WHERE code='TEST99'")
|
||||
c.commit()
|
||||
c.close()
|
||||
Reference in New Issue
Block a user