aljaz/hummingbot-dashboard
1
0
Fork 0
mirror of https://github.com/aljazceru/hummingbot-dashboard.git synced 2025-12-28 18:54:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

(fix) fix parsing issues

Browse Source
This commit is contained in:
Michael Feng
2023-08-31 07:54:55 -07:00
parent 6395a96bca
commit 63bc5d5ce1
3 changed files with 60 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -138,5 +138,6 @@ quants_lab/strategy/experiments/*
# Master bot template user-added configs
hummingbot_files/templates/master_bot_conf/conf/*
hummingbot_files/templates/master_bot_conf/logs/*
**/.DS_Store

99
ui_components/bot_performance_card.py
View File

@@ -60,8 +60,8 @@ class BotPerformanceCard(Dashboard.Item):
title=bot_config["bot_name"],
subheader=subheader_message,
avatar=mui.Avatar("🤖", sx={"bgcolor": color}),
# action=mui.IconButton(mui.icon.Stop, onClick=lambda: bot_config["broker_client"].stop()) if bot_config[
# "is_running"] else mui.IconButton(mui.icon.BuildCircle),
action=mui.IconButton(mui.icon.Stop, onClick=lambda: bot_config["broker_client"].stop()) if bot_config[
"is_running"] else mui.IconButton(mui.icon.BuildCircle),
className=self._draggable_class,
)
if bot_config["is_running"]:
@@ -94,62 +94,67 @@ class BotPerformanceCard(Dashboard.Item):
mui.Typography("Active Orders", variant="h6", sx={"marginTop": 2})
# Convert list of dictionaries to DataFrame
orders = StatusParser(bot_config["status"], type="orders").parse()
if orders != "No active maker orders" or "No matching string":
df_orders = pd.DataFrame(orders)
orders_rows = df_orders.to_dict(orient='records')
orders_cols = [{'field': col, 'headerName': col} for col in df_orders.columns]
try:
orders = StatusParser(bot_config["status"], type="orders").parse()
if orders not in ["No active maker orders", "Market connectors are not ready"]:
df_orders = pd.DataFrame(orders)
orders_rows = df_orders.to_dict(orient='records')
orders_cols = [{'field': col, 'headerName': col} for col in df_orders.columns]
for column in orders_cols:
# Customize width for 'exchange' column
if column['field'] == 'Exchange':
column['width'] = WIDE_COL_WIDTH
# Customize width for column
if column['field'] == 'Price':
column['width'] = MEDIUM_COL_WIDTH
for column in orders_cols:
# Customize width for 'exchange' column
if column['field'] == 'Exchange':
column['width'] = WIDE_COL_WIDTH
# Customize width for column
if column['field'] == 'Price':
column['width'] = MEDIUM_COL_WIDTH
mui.DataGrid(rows=orders_rows,
columns=orders_cols,
autoHeight=True,
density="compact",
disableColumnSelector=True,
hideFooter=True,
initialState={"columns": {"columnVisibilityModel": {"id": False}}})
else:
mui.Typography(str(orders), sx={"fontSize": "0.75rem"})
mui.DataGrid(rows=orders_rows,
columns=orders_cols,
autoHeight=True,
density="compact",
disableColumnSelector=True,
hideFooter=True,
initialState={"columns": {"columnVisibilityModel": {"id": False}}})
else:
mui.Typography(str(orders), sx={"fontSize": "0.75rem"})
except ValueError as e:
mui.Typography(str(bot_config["status"]), sx={"fontSize": "0.75rem"})
# Trades Table
mui.Typography("Recent Trades", variant="h6", sx={"marginTop": 2})
df_trades = pd.DataFrame(bot_config["trades"])
if not df_trades.empty:
# Add 'id' column to the dataframe by concatenating 'trade_id' and 'trade_timestamp'
df_trades['id'] = df_trades.get('trade_id', '0').astype(str) + df_trades['trade_timestamp'].astype(str)
# Add 'id' column to the dataframe by concatenating 'trade_id' and 'trade_timestamp'
df_trades['id'] = df_trades.get('trade_id', '0').astype(str) + df_trades['trade_timestamp'].astype(str)
# Convert timestamp col to datetime
df_trades['trade_timestamp'] = df_trades['trade_timestamp'].astype(int)
# Convert timestamp col to datetime
df_trades['trade_timestamp'] = df_trades['trade_timestamp'].astype(int)
# Show last X trades
df_trades = df_trades.sort_values(by='trade_timestamp', ascending=False)
df_trades = df_trades.head(TRADES_TO_SHOW)
df_trades['time_ago'] = df_trades['trade_timestamp'].apply(time_ago)
# Show last X trades
df_trades = df_trades.sort_values(by='trade_timestamp', ascending=False)
df_trades = df_trades.head(TRADES_TO_SHOW)
df_trades['time_ago'] = df_trades['trade_timestamp'].apply(time_ago)
trades_rows = df_trades.to_dict(orient='records')
trades_cols = [{'field': col, 'headerName': col} for col in df_trades.columns]
trades_rows = df_trades.to_dict(orient='records')
trades_cols = [{'field': col, 'headerName': col} for col in df_trades.columns]
for column in trades_cols:
# Customize width for 'market' column
if column['field'] == 'market':
column['width'] = WIDE_COL_WIDTH
if column['field'] == 'trade_timestamp':
column['width'] = MEDIUM_COL_WIDTH
for column in trades_cols:
# Customize width for 'market' column
if column['field'] == 'market':
column['width'] = WIDE_COL_WIDTH
if column['field'] == 'trade_timestamp':
column['width'] = MEDIUM_COL_WIDTH
mui.DataGrid(rows=trades_rows,
columns=trades_cols,
autoHeight=True,
density="compact",
disableColumnSelector=True,
hideFooter=True,
initialState={"columns": {"columnVisibilityModel": {"id": False, "trade_id": False, "trade_timestamp": False, "base_asset": False, "quote_asset": False, "raw_json": False}}})
mui.DataGrid(rows=trades_rows,
columns=trades_cols,
autoHeight=True,
density="compact",
disableColumnSelector=True,
hideFooter=True,
initialState={"columns": {"columnVisibilityModel": {"id": False, "trade_id": False, "trade_timestamp": False, "base_asset": False, "quote_asset": False, "raw_json": False}}})
else:
mui.Typography("No trades yet", sx={"fontSize": "0.75rem"})
else:
with mui.CardContent(sx={"flex": 1}):
with mui.Grid(container=True, spacing=2):

7
utils/status_parser.py
View File

@@ -5,6 +5,8 @@ class StatusParser:
if type == 'orders':
if "No active maker orders" in input_str:
self.parser = self
if "Market connectors are not ready" in input_str:
self.parser = self
elif all(keyword in input_str for keyword in ['Orders:','Exchange', 'Market', 'Side', 'Price', 'Amount', 'Age']):
self.parser = OrdersParser(self.lines, ['Exchange', 'Market', 'Side', 'Price', 'Amount', 'Age'])
elif all(keyword in input_str for keyword in ['Orders:','Level', 'Amount (Orig)', 'Amount (Adj)']):
@@ -23,6 +25,8 @@ class StatusParser:
def _parse(self):
if "No active maker orders" in self.lines:
return "No active maker orders"
if "Market connectors are not ready" in "\n".join(self.lines):
return "Market connectors are not ready"
raise NotImplementedError
class OrdersParser:
@@ -34,6 +38,9 @@ class OrdersParser:
if "No active maker orders" in "\n".join(self.lines):
return "No active maker orders"
if "Market connectors are not ready" in "\n".join(self.lines):
return "Market connectors are not ready"
orders = []
for i, line in enumerate(self.lines):
if "Orders:" in line: