Made the onramp in Go with way better architecture. Created onramp/DATABASE.md to help with next development cycle.
This commit is contained in:
Kalzu Rekku
12
monitor/Pipfile
Normal file
12
monitor/Pipfile
Normal file
@@ -0,0 +1,12 @@
|
||||
[[source]]
|
||||
url = "https://pypi.org/simple"
|
||||
verify_ssl = true
|
||||
name = "pypi"
|
||||
|
||||
[packages]
|
||||
rich = "*"
|
||||
|
||||
[dev-packages]
|
||||
|
||||
[requires]
|
||||
python_version = "3.13"
|
||||
@@ -5,6 +5,7 @@ import json
|
||||
import time
|
||||
import os
|
||||
from datetime import datetime
|
||||
from collections import deque # Added for history tracking
|
||||
|
||||
from rich.live import Live
|
||||
from rich.table import Table
|
||||
@@ -12,13 +13,15 @@ from rich.layout import Layout
|
||||
from rich.panel import Panel
|
||||
from rich.console import Console
|
||||
from rich.text import Text
|
||||
from rich.columns import Columns
|
||||
|
||||
# --- CONFIGURATION ---
|
||||
INPUT_SOCKET = "/tmp/streamer.sock"
|
||||
ONRAMP_HOST = "127.0.0.1"
|
||||
ONRAMP_PORT = 9999
|
||||
REFRESH_RATE = 1.0
|
||||
REFRESH_RATE = 1.0
|
||||
|
||||
# Global state to track lag history (last 300 seconds)
|
||||
LAG_HISTORY = deque(maxlen=300)
|
||||
|
||||
console = Console()
|
||||
|
||||
@@ -36,23 +39,20 @@ def query_input_go():
|
||||
def query_onramp(command):
|
||||
try:
|
||||
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
|
||||
# Increase timeout slightly for the larger 'live' payload
|
||||
s.settimeout(1.0)
|
||||
s.connect((ONRAMP_HOST, ONRAMP_PORT))
|
||||
s.sendall(command.encode('utf-8'))
|
||||
|
||||
chunks = []
|
||||
while True:
|
||||
chunk = s.recv(4096) # Read in 4KB chunks
|
||||
chunk = s.recv(4096)
|
||||
if not chunk:
|
||||
break # Server closed connection, we have everything
|
||||
break
|
||||
chunks.append(chunk)
|
||||
|
||||
full_data = b"".join(chunks).decode('utf-8')
|
||||
return json.loads(full_data)
|
||||
except Exception as e:
|
||||
# For debugging, you can uncomment the line below:
|
||||
# print(f"Socket Error: {e}")
|
||||
except:
|
||||
return None
|
||||
|
||||
def make_layout():
|
||||
@@ -73,8 +73,6 @@ def get_input_panel():
|
||||
raw = query_input_go()
|
||||
if not raw:
|
||||
return Panel(Text("OFFLINE", style="bold red"), title="[1] Input Service (Go)", border_style="red")
|
||||
|
||||
# The Go app returns: "Uptime: 1m2s | Total Msgs: 500 | Rate: 10.00 msg/min"
|
||||
parts = raw.split("|")
|
||||
content = "\n".join([p.strip() for p in parts])
|
||||
return Panel(content, title="[1] Input Service (Go)", border_style="green")
|
||||
@@ -82,25 +80,39 @@ def get_input_panel():
|
||||
def get_onramp_panel():
|
||||
data = query_onramp("status")
|
||||
if not data:
|
||||
LAG_HISTORY.clear() # Clear history if service goes down
|
||||
return Panel(Text("OFFLINE", style="bold red"), title="[2] Onramp Service (Python)", border_style="red")
|
||||
|
||||
|
||||
# 1. Calculate Instant Lag
|
||||
last_ts = data.get('last_ts', 0) / 1000
|
||||
lag = time.time() - last_ts if last_ts > 0 else 0
|
||||
lag_style = "green" if lag < 2 else "yellow" if lag < 5 else "bold red"
|
||||
current_lag = time.time() - last_ts if last_ts > 0 else 0
|
||||
|
||||
# 2. Update History
|
||||
LAG_HISTORY.append(current_lag)
|
||||
|
||||
# 3. Calculate Averages (Load Average style)
|
||||
avg_1m = sum(list(LAG_HISTORY)[-60:]) / min(len(LAG_HISTORY), 60)
|
||||
avg_5m = sum(LAG_HISTORY) / len(LAG_HISTORY)
|
||||
|
||||
# 4. Determine Styling
|
||||
lag_style = "green" if current_lag < 2 else "yellow" if current_lag < 5 else "bold red"
|
||||
|
||||
content = Text()
|
||||
content.append(f"Uptime Start : {data.get('uptime_start')}\n")
|
||||
content.append(f"Total Trades : {data.get('total_trades')}\n")
|
||||
content.append(f"Current File : {os.path.basename(str(data.get('last_file')))}\n")
|
||||
content.append("Lag : ", style="white")
|
||||
content.append(f"{lag:.2f}s", style=lag_style)
|
||||
|
||||
|
||||
# The "Load Average" line
|
||||
content.append("Lag (Avg) : ", style="white")
|
||||
content.append(f"{current_lag:.2f}s", style=lag_style)
|
||||
content.append(f", {avg_1m:.2f}s/1m", style="dim" if avg_1m < 2 else "yellow")
|
||||
content.append(f", {avg_5m:.2f}s/5m", style="dim" if avg_5m < 2 else "yellow")
|
||||
|
||||
return Panel(content, title="[2] Onramp Service (Python)", border_style="blue")
|
||||
|
||||
def get_market_table():
|
||||
res = query_onramp("live")
|
||||
table = Table(expand=True, border_style="cyan", header_style="bold cyan")
|
||||
|
||||
table.add_column("TF", justify="center", style="bold yellow")
|
||||
table.add_column("Last Update", justify="center")
|
||||
table.add_column("Open", justify="right")
|
||||
@@ -112,64 +124,36 @@ def get_market_table():
|
||||
|
||||
if res and "data" in res:
|
||||
candles_data = res["data"]
|
||||
# We want to show these specific rows
|
||||
for tf in ["1m", "5m", "15m", "1h"]:
|
||||
if tf in candles_data and candles_data[tf]:
|
||||
# Get all timestamps, convert to int to find the latest one
|
||||
all_timestamps = [int(ts) for ts in candles_data[tf].keys()]
|
||||
latest_ts = str(max(all_timestamps))
|
||||
|
||||
all_ts = [int(ts) for ts in candles_data[tf].keys()]
|
||||
latest_ts = str(max(all_ts))
|
||||
c = candles_data[tf][latest_ts]
|
||||
|
||||
# Format time
|
||||
|
||||
ts_str = datetime.fromtimestamp(int(latest_ts)).strftime('%H:%M:%S')
|
||||
|
||||
# Price Color (Bullish vs Bearish)
|
||||
color = "green" if c['close'] >= c['open'] else "red"
|
||||
|
||||
# Calculate Buy Volume Percentage
|
||||
buy_pct = (c['buy_volume'] / c['volume'] * 100) if c['volume'] > 0 else 0
|
||||
buy_color = "green" if buy_pct > 50 else "red"
|
||||
|
||||
table.add_row(
|
||||
tf,
|
||||
ts_str,
|
||||
f"{c['open']:.2f}",
|
||||
f"{c['high']:.2f}",
|
||||
f"{c['low']:.2f}",
|
||||
tf, ts_str, f"{c['open']:.2f}", f"{c['high']:.2f}", f"{c['low']:.2f}",
|
||||
Text(f"{c['close']:.2f}", style=f"bold {color}"),
|
||||
f"{c['volume']:.2f}",
|
||||
Text(f"{buy_pct:.1f}%", style=buy_color)
|
||||
f"{c['volume']:.2f}", Text(f"{buy_pct:.1f}%", style=buy_color)
|
||||
)
|
||||
time.sleep(1)
|
||||
else:
|
||||
# Placeholder if service is offline or data not ready
|
||||
table.add_row("waiting...", "-", "-", "-", "-", "-", "-", "-")
|
||||
|
||||
return table
|
||||
|
||||
def main():
|
||||
layout = make_layout()
|
||||
|
||||
with Live(layout, refresh_per_second=2, screen=True):
|
||||
while True:
|
||||
# Header
|
||||
header_text = Text(f"BYBIT BTC UNIFIED MONITOR | {datetime.now().strftime('%H:%M:%S')}",
|
||||
justify="center", style="bold white on blue")
|
||||
layout["header"].update(Panel(header_text))
|
||||
|
||||
# Body Panels
|
||||
layout["header"].update(Panel(Text(f"BYBIT BTC UNIFIED MONITOR | {datetime.now().strftime('%H:%M:%S')}", justify="center", style="bold white on blue")))
|
||||
layout["input_svc"].update(get_input_panel())
|
||||
layout["onramp_svc"].update(get_onramp_panel())
|
||||
|
||||
# Market Table
|
||||
layout["market"].update(get_market_table())
|
||||
|
||||
# Footer
|
||||
footer_text = Text("Press Ctrl+C to exit | Monitoring: publicTrade.BTCUSDT", justify="center", style="dim")
|
||||
layout["footer"].update(footer_text)
|
||||
|
||||
layout["footer"].update(Text("Press Ctrl+C to exit | Monitoring: publicTrade.BTCUSDT", justify="center", style="dim"))
|
||||
time.sleep(REFRESH_RATE)
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
main()
|
||||
Reference in New Issue
Block a user