mirror of
https://github.com/d0zingcat/deploy.git
synced 2026-06-09 15:11:00 +00:00
add changes from dashboard pr #239
This commit is contained in:
david-hummingbot
@@ -1,6 +1,3 @@
|
||||
from decimal import Decimal
|
||||
|
||||
import plotly.graph_objs as go
|
||||
import streamlit as st
|
||||
from hummingbot.core.data_type.common import OrderType, PositionMode, TradeType
|
||||
|
||||
@@ -16,65 +13,177 @@ def get_price_range_defaults(connector_name: str, trading_pair: str, interval: s
|
||||
interval=interval,
|
||||
days=days
|
||||
)
|
||||
current_price = float(candles['close'].iloc[-1])
|
||||
min_price = float(candles['low'].quantile(0.05))
|
||||
max_price = float(candles['high'].quantile(0.95))
|
||||
return round(min_price, 2), round(max_price, 2)
|
||||
return round(min_price, 2), round(current_price, 2), round(max_price, 2)
|
||||
except Exception as e:
|
||||
st.warning(f"Could not fetch price data: {str(e)}. Using default values.")
|
||||
return 40000.0, 60000.0 # Fallback defaults
|
||||
|
||||
|
||||
def get_grid_range_traces(grid_ranges):
|
||||
"""Generate horizontal line traces for grid ranges with different colors."""
|
||||
dash_styles = ['solid', 'dash', 'dot', 'dashdot', 'longdash'] # 5 different styles
|
||||
traces = []
|
||||
buy_count = 0
|
||||
sell_count = 0
|
||||
for i, grid_range in enumerate(grid_ranges):
|
||||
# Set color based on trade type
|
||||
if grid_range["side"] == TradeType.BUY:
|
||||
color = 'rgba(0, 255, 0, 1)' # Bright green for buy
|
||||
dash_style = dash_styles[buy_count % len(dash_styles)]
|
||||
buy_count += 1
|
||||
else:
|
||||
color = 'rgba(255, 0, 0, 1)' # Bright red for sell
|
||||
dash_style = dash_styles[sell_count % len(dash_styles)]
|
||||
sell_count += 1
|
||||
# Start price line
|
||||
traces.append(go.Scatter(
|
||||
x=[], # Will be set to full range when plotting
|
||||
y=[float(grid_range["start_price"]), float(grid_range["start_price"])],
|
||||
mode='lines',
|
||||
line=dict(color=color, width=1.5, dash=dash_style),
|
||||
name=f'Range {i} Start: {float(grid_range["start_price"]):,.2f} ({grid_range["side"].name})',
|
||||
hoverinfo='name'
|
||||
))
|
||||
# End price line
|
||||
traces.append(go.Scatter(
|
||||
x=[], # Will be set to full range when plotting
|
||||
y=[float(grid_range["end_price"]), float(grid_range["end_price"])],
|
||||
mode='lines',
|
||||
line=dict(color=color, width=1.5, dash=dash_style),
|
||||
name=f'Range {i} End: {float(grid_range["end_price"]):,.2f} ({grid_range["side"].name})',
|
||||
hoverinfo='name'
|
||||
))
|
||||
return traces
|
||||
return 40000.0, 42000.0, 44000.0 # Fallback defaults
|
||||
|
||||
|
||||
def user_inputs():
|
||||
# Split the page into two columns for the expanders
|
||||
left_col, right_col = st.columns(2)
|
||||
with left_col:
|
||||
# Basic trading parameters
|
||||
with st.expander("Basic Configuration", expanded=True):
|
||||
# Combined Basic, Amount, and Grid Configuration
|
||||
with st.expander("Grid Configuration", expanded=True):
|
||||
# Basic parameters
|
||||
c1, c2 = st.columns(2)
|
||||
with c1:
|
||||
connector_name = st.text_input("Connector Name", value="binance_perpetual")
|
||||
# Side selection
|
||||
side = st.selectbox(
|
||||
"Side",
|
||||
options=["BUY", "SELL"],
|
||||
index=0,
|
||||
help="Trading direction for the grid"
|
||||
)
|
||||
leverage = st.number_input("Leverage", min_value=1, value=20)
|
||||
with c2:
|
||||
trading_pair = st.text_input("Trading Pair", value="WLD-USDT")
|
||||
# Amount parameter
|
||||
total_amount_quote = st.number_input(
|
||||
"Total Amount (Quote)",
|
||||
min_value=0.0,
|
||||
value=200.0,
|
||||
help="Total amount in quote currency to use for trading"
|
||||
)
|
||||
position_mode = st.selectbox(
|
||||
"Position Mode",
|
||||
options=["HEDGE", "ONEWAY"],
|
||||
index=0
|
||||
)
|
||||
# Grid price parameters
|
||||
with c1:
|
||||
# Get default price ranges based on current market data
|
||||
min_price, current_price, max_price = get_price_range_defaults(
|
||||
connector_name,
|
||||
trading_pair,
|
||||
"1h", # Default interval for price range calculation
|
||||
30 # Default days for price range calculation
|
||||
)
|
||||
if side == "BUY":
|
||||
start_price = min(min_price, current_price)
|
||||
end_price = max(current_price, max_price)
|
||||
limit_price = start_price * 0.95
|
||||
else:
|
||||
start_price = max(max_price, current_price)
|
||||
end_price = min(current_price, min_price)
|
||||
limit_price = start_price * 1.05
|
||||
# Price configuration with meaningful defaults
|
||||
start_price = st.number_input(
|
||||
"Start Price",
|
||||
value=start_price,
|
||||
format="%.2f",
|
||||
help="Grid start price"
|
||||
)
|
||||
|
||||
end_price = st.number_input(
|
||||
"End Price",
|
||||
value=end_price,
|
||||
format="%.2f",
|
||||
help="Grid end price"
|
||||
)
|
||||
|
||||
limit_price = st.number_input(
|
||||
"Limit Price",
|
||||
value=limit_price,
|
||||
format="%.2f",
|
||||
help="Price limit to stop the strategy"
|
||||
)
|
||||
|
||||
with c2:
|
||||
# Grid spacing configuration
|
||||
min_spread = st.number_input(
|
||||
"Min Spread Between Orders",
|
||||
min_value=0.0000,
|
||||
value=0.0001,
|
||||
format="%.4f",
|
||||
help="Minimum price difference between orders",
|
||||
step=0.0001
|
||||
)
|
||||
|
||||
min_order_amount = st.number_input(
|
||||
"Min Order Amount (Quote)",
|
||||
min_value=1.0,
|
||||
value=6.0,
|
||||
help="Minimum amount for each order in quote currency"
|
||||
)
|
||||
|
||||
max_open_orders = st.number_input(
|
||||
"Maximum Open Orders",
|
||||
min_value=1,
|
||||
value=3,
|
||||
help="Maximum number of active orders in the grid"
|
||||
)
|
||||
|
||||
with right_col:
|
||||
# Order configuration
|
||||
with st.expander("Order Configuration", expanded=True):
|
||||
c1, c2, c3 = st.columns(3)
|
||||
with c1:
|
||||
connector_name = st.text_input("Connector Name", value="binance")
|
||||
max_orders_per_batch = st.number_input(
|
||||
"Max Orders Per Batch",
|
||||
min_value=1,
|
||||
value=1,
|
||||
help="Maximum number of orders to place at once"
|
||||
)
|
||||
with c2:
|
||||
trading_pair = st.text_input("Trading Pair", value="BTC-USDT")
|
||||
order_frequency = st.number_input(
|
||||
"Order Frequency (s)",
|
||||
min_value=1,
|
||||
value=2,
|
||||
help="Time between order placements in seconds"
|
||||
)
|
||||
with c3:
|
||||
leverage = st.number_input("Leverage", min_value=1, value=20)
|
||||
# Visualization Configuration
|
||||
activation_bounds = st.number_input(
|
||||
"Activation Bounds",
|
||||
min_value=0.0,
|
||||
value=0.01,
|
||||
format="%.4f",
|
||||
help="Price deviation to trigger updates"
|
||||
)
|
||||
|
||||
# Triple barrier configuration
|
||||
with st.expander("Triple Barrier Configuration", expanded=True):
|
||||
c1, c2 = st.columns(2)
|
||||
with c1:
|
||||
# Order types
|
||||
open_order_type_options = ["LIMIT", "LIMIT_MAKER", "MARKET"]
|
||||
open_order_type = st.selectbox(
|
||||
"Open Order Type",
|
||||
options=open_order_type_options,
|
||||
index=1, # Default to MARKET
|
||||
key="open_order_type"
|
||||
)
|
||||
|
||||
take_profit_order_type_options = ["LIMIT", "LIMIT_MAKER", "MARKET"]
|
||||
take_profit_order_type = st.selectbox(
|
||||
"Take Profit Order Type",
|
||||
options=take_profit_order_type_options,
|
||||
index=1, # Default to MARKET
|
||||
key="tp_order_type"
|
||||
)
|
||||
|
||||
with c2:
|
||||
# Barrier values
|
||||
take_profit = st.number_input(
|
||||
"Take Profit",
|
||||
min_value=0.0,
|
||||
value=0.0001,
|
||||
format="%.4f",
|
||||
help="Price movement percentage for take profit"
|
||||
)
|
||||
|
||||
stop_loss = st.number_input(
|
||||
"Stop Loss",
|
||||
min_value=0.0,
|
||||
value=0.1,
|
||||
format="%.4f",
|
||||
help="Price movement percentage for stop loss (0 for none)"
|
||||
)
|
||||
# Chart configuration
|
||||
with st.expander("Chart Configuration", expanded=True):
|
||||
c1, c2, c3 = st.columns(3)
|
||||
with c1:
|
||||
@@ -87,7 +196,7 @@ def user_inputs():
|
||||
interval = st.selectbox(
|
||||
"Interval",
|
||||
options=["1m", "3m", "5m", "15m", "30m", "1h", "2h", "4h", "6h", "12h", "1d"],
|
||||
index=10, # Default to 30m
|
||||
index=4, # Default to 1h
|
||||
help="Candlestick interval"
|
||||
)
|
||||
with c3:
|
||||
@@ -95,122 +204,23 @@ def user_inputs():
|
||||
"Days to Display",
|
||||
min_value=1,
|
||||
max_value=365,
|
||||
value=180,
|
||||
value=30,
|
||||
help="Number of days of historical data to display"
|
||||
)
|
||||
|
||||
# Get default price ranges based on current market data
|
||||
default_min, default_max = get_price_range_defaults(
|
||||
candles_connector,
|
||||
trading_pair,
|
||||
interval,
|
||||
days_to_visualize
|
||||
)
|
||||
# Grid Ranges Configuration
|
||||
with st.expander("Grid Ranges", expanded=True):
|
||||
grid_ranges = []
|
||||
num_ranges = st.number_input("Number of Grid Ranges", min_value=1, max_value=5, value=1)
|
||||
for i in range(num_ranges):
|
||||
st.markdown(f"#### Range {i}")
|
||||
# Price configuration
|
||||
c1, c2, c3, c4 = st.columns(4)
|
||||
with c1:
|
||||
# Set default start price based on side
|
||||
side = st.selectbox(
|
||||
f"Side {i}",
|
||||
options=[TradeType.BUY.name, TradeType.SELL.name],
|
||||
key=f"side_{i}"
|
||||
)
|
||||
with c2:
|
||||
# Set default start price based on side
|
||||
start_price = st.number_input(
|
||||
f"Start Price {i}",
|
||||
value=default_min,
|
||||
key=f"start_price_{i}"
|
||||
)
|
||||
with c3:
|
||||
# Set default end price based on side
|
||||
end_price = st.number_input(
|
||||
f"End Price {i}",
|
||||
value=default_max,
|
||||
key=f"end_price_{i}"
|
||||
)
|
||||
with c4:
|
||||
total_amount_pct = st.number_input(
|
||||
f"Amount % {i}",
|
||||
min_value=0.0,
|
||||
max_value=100.0,
|
||||
value=50.0,
|
||||
key=f"amount_pct_{i}"
|
||||
)
|
||||
st.markdown("---")
|
||||
grid_ranges.append({
|
||||
"id": f"R{i}",
|
||||
"start_price": Decimal(str(start_price)),
|
||||
"end_price": Decimal(str(end_price)),
|
||||
"total_amount_pct": Decimal(str(total_amount_pct/100)),
|
||||
"side": TradeType[side],
|
||||
"open_order_type": OrderType.LIMIT_MAKER,
|
||||
"take_profit_order_type": OrderType.LIMIT
|
||||
})
|
||||
with right_col:
|
||||
# Amount configuration
|
||||
with st.expander("Amount Configuration", expanded=True):
|
||||
total_amount_quote = st.number_input(
|
||||
"Total Amount (Quote)",
|
||||
min_value=0.0,
|
||||
value=1000.0,
|
||||
help="Total amount in quote currency to use for trading"
|
||||
)
|
||||
min_order_amount = st.number_input(
|
||||
"Minimum Order Amount",
|
||||
min_value=1.0,
|
||||
value=10.0,
|
||||
help="Minimum amount for each order"
|
||||
)
|
||||
# Advanced Configuration
|
||||
with st.expander("Advanced Configuration", expanded=True):
|
||||
position_mode = st.selectbox(
|
||||
"Position Mode",
|
||||
options=["HEDGE", "ONEWAY"],
|
||||
index=0
|
||||
)
|
||||
c1, c2 = st.columns(2)
|
||||
with c1:
|
||||
time_limit = st.number_input(
|
||||
"Time Limit (hours)",
|
||||
min_value=1,
|
||||
value=48,
|
||||
help="Strategy time limit in hours"
|
||||
)
|
||||
min_spread = st.number_input(
|
||||
"Min Spread Between Orders",
|
||||
min_value=0.0000,
|
||||
value=0.0001,
|
||||
format="%.4f", # Show 3 decimal places
|
||||
help="Minimum price difference between orders",
|
||||
step=0.0001
|
||||
)
|
||||
activation_bounds = st.number_input(
|
||||
"Activation Bounds",
|
||||
min_value=0.0,
|
||||
value=0.01,
|
||||
format="%.4f",
|
||||
help="Price deviation to trigger updates"
|
||||
)
|
||||
with c2:
|
||||
max_open_orders = st.number_input(
|
||||
"Maximum Open Orders",
|
||||
min_value=1,
|
||||
value=5,
|
||||
help="Maximum number of open orders"
|
||||
)
|
||||
grid_update_interval = st.number_input(
|
||||
"Grid Update Interval (s)",
|
||||
min_value=1,
|
||||
value=60,
|
||||
help="How often to update grid ranges"
|
||||
)
|
||||
|
||||
|
||||
# Convert stop_loss to None if it's zero
|
||||
stop_loss_value = stop_loss if stop_loss > 0 else None
|
||||
|
||||
# Prepare triple barrier config
|
||||
triple_barrier_config = {
|
||||
"open_order_type": OrderType[open_order_type],
|
||||
"stop_loss": stop_loss_value,
|
||||
"take_profit": take_profit,
|
||||
"take_profit_order_type": OrderType[take_profit_order_type],
|
||||
"time_limit": None,
|
||||
}
|
||||
|
||||
return {
|
||||
"controller_name": "grid_strike",
|
||||
@@ -221,14 +231,18 @@ def user_inputs():
|
||||
"interval": interval,
|
||||
"days_to_visualize": days_to_visualize,
|
||||
"leverage": leverage,
|
||||
"total_amount_quote": Decimal(str(total_amount_quote)),
|
||||
"grid_ranges": grid_ranges,
|
||||
"side": TradeType[side],
|
||||
"start_price": start_price,
|
||||
"end_price": end_price,
|
||||
"limit_price": limit_price,
|
||||
"position_mode": PositionMode[position_mode],
|
||||
"time_limit": time_limit * 60 * 60,
|
||||
"activation_bounds": Decimal(str(activation_bounds)),
|
||||
"min_spread_between_orders": Decimal(str(min_spread)) if min_spread > 0 else None,
|
||||
"min_order_amount": Decimal(str(min_order_amount)),
|
||||
"total_amount_quote": total_amount_quote,
|
||||
"min_spread_between_orders": min_spread,
|
||||
"min_order_amount_quote": min_order_amount,
|
||||
"max_open_orders": max_open_orders,
|
||||
"grid_range_update_interval": grid_update_interval,
|
||||
"extra_balance_base_usd": Decimal("10")
|
||||
}
|
||||
"max_orders_per_batch": max_orders_per_batch,
|
||||
"order_frequency": order_frequency,
|
||||
"activation_bounds": activation_bounds,
|
||||
"triple_barrier_config": triple_barrier_config,
|
||||
"candles_config": []
|
||||
}
|
||||
Reference in New Issue
Block a user