Merge pull request #6264 from italodamato/plot-trade-buytag
add buy_tag to trade tooltip in plots
This commit is contained in:
		| @@ -235,10 +235,12 @@ def plot_trades(fig, trades: pd.DataFrame) -> make_subplots: | |||||||
|     # Trades can be empty |     # Trades can be empty | ||||||
|     if trades is not None and len(trades) > 0: |     if trades is not None and len(trades) > 0: | ||||||
|         # Create description for sell summarizing the trade |         # Create description for sell summarizing the trade | ||||||
|         trades['desc'] = trades.apply(lambda row: f"{row['profit_ratio']:.2%}, " |         trades['desc'] = trades.apply( | ||||||
|                                                   f"{row['sell_reason']}, " |             lambda row: f"{row['profit_ratio']:.2%}, " + | ||||||
|                                                   f"{row['trade_duration']} min", |             (f"{row['buy_tag']}, " if row['buy_tag'] is not None else "") + | ||||||
|                                       axis=1) |             f"{row['sell_reason']}, " + | ||||||
|  |             f"{row['trade_duration']} min", | ||||||
|  |             axis=1) | ||||||
|         trade_buys = go.Scatter( |         trade_buys = go.Scatter( | ||||||
|             x=trades["open_date"], |             x=trades["open_date"], | ||||||
|             y=trades["open_rate"], |             y=trades["open_rate"], | ||||||
|   | |||||||
| @@ -171,7 +171,7 @@ def test_plot_trades(testdatadir, caplog): | |||||||
|     assert len(trades) == len(trade_buy.x) |     assert len(trades) == len(trade_buy.x) | ||||||
|     assert trade_buy.marker.color == 'cyan' |     assert trade_buy.marker.color == 'cyan' | ||||||
|     assert trade_buy.marker.symbol == 'circle-open' |     assert trade_buy.marker.symbol == 'circle-open' | ||||||
|     assert trade_buy.text[0] == '3.99%, roi, 15 min' |     assert trade_buy.text[0] == '3.99%, buy_tag, roi, 15 min' | ||||||
|  |  | ||||||
|     trade_sell = find_trace_in_fig_data(figure.data, 'Sell - Profit') |     trade_sell = find_trace_in_fig_data(figure.data, 'Sell - Profit') | ||||||
|     assert isinstance(trade_sell, go.Scatter) |     assert isinstance(trade_sell, go.Scatter) | ||||||
| @@ -179,7 +179,7 @@ def test_plot_trades(testdatadir, caplog): | |||||||
|     assert len(trades.loc[trades['profit_ratio'] > 0]) == len(trade_sell.x) |     assert len(trades.loc[trades['profit_ratio'] > 0]) == len(trade_sell.x) | ||||||
|     assert trade_sell.marker.color == 'green' |     assert trade_sell.marker.color == 'green' | ||||||
|     assert trade_sell.marker.symbol == 'square-open' |     assert trade_sell.marker.symbol == 'square-open' | ||||||
|     assert trade_sell.text[0] == '3.99%, roi, 15 min' |     assert trade_sell.text[0] == '3.99%, buy_tag, roi, 15 min' | ||||||
|  |  | ||||||
|     trade_sell_loss = find_trace_in_fig_data(figure.data, 'Sell - Loss') |     trade_sell_loss = find_trace_in_fig_data(figure.data, 'Sell - Loss') | ||||||
|     assert isinstance(trade_sell_loss, go.Scatter) |     assert isinstance(trade_sell_loss, go.Scatter) | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								tests/testdata/backtest-result_new.json
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								tests/testdata/backtest-result_new.json
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
		Reference in New Issue
	
	Block a user