goldhand 12.9__tar.gz → 13.3__tar.gz

{goldhand-12.9 → goldhand-13.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: goldhand
-Version: 12.9
+Version: 13.3
 Summary: A package working with financial data
 Home-page: https://github.com/misrori/goldhand
 Author: Mihaly

{goldhand-12.9 → goldhand-13.3}/goldhand/strategy_goldhand_line.py

@@ -91,8 +91,7 @@ def goldhand_line_strategy(data):
     return(res_df)
 
 
-
-def show_indicator_goldhand_line_strategy(ticker, plot_title = 'Goldhand line Strategy'):
+def show_indicator_goldhand_line_strategy(ticker, plot_title = '', ndays=0, plot_height=800):
 
     data = GoldHand(ticker).df
 
@@ -134,9 +133,17 @@ def show_indicator_goldhand_line_strategy(ticker, plot_title = 'Goldhand line St
     ##### data prepar end
 
     ##### backtest
-    backtest = Backtest( data, goldhand_line_strategy, plot_title = 'Goldhand line Strategy' )
+    backtest = Backtest( data, goldhand_line_strategy, plot_title =plot_title)
     trades =backtest.trades
 
+    if ndays!=0:
+      data = data.tail(ndays)
+      trades = trades.loc[trades['buy_date']>data.date.min()]
+
+    if data['high'].max() >= max(data['high'][0:50]):
+        tex_loc = [0.1, 0.2]
+    else:
+        tex_loc = [0.1, 0.85]
 
     # base plot
     fig = go.Figure(data=go.Ohlc(x=data['date'], open=data['open'], high=data['high'], low=data['low'],close=data['close']))
@@ -227,22 +234,28 @@ def show_indicator_goldhand_line_strategy(ticker, plot_title = 'Goldhand line St
                                 font=dict(size=13, color=triangle_color, family="Times New Roman")))
 
     # Update layout
-    fig.update_layout(showlegend=False, plot_bgcolor='white', height=800, title=plot_title)
+    fig.update_layout(showlegend=False, plot_bgcolor='white', height=plot_height, title=plot_title)
     fig.update(layout_xaxis_rangeslider_visible=False)
 
-    # Update x-axes and y-axes for the main chart
-    fig.update_xaxes(mirror=True, ticks='outside', showline=True, linecolor='black', gridcolor='lightgrey')
-    fig.update_yaxes(mirror=True, ticks='outside', showline=True, linecolor='black', gridcolor='lightgrey')
-
-    # Update x-axes and y-axes for the RSI subplot
-    fig.update_xaxes(mirror=True, ticks='outside', showline=True, linecolor='black', gridcolor='lightgrey')
-    fig.update_yaxes(mirror=True, ticks='outside', showline=True, linecolor='black', gridcolor='lightgrey')
-
 
+    t= backtest.trades_summary
+    trade_text = f"Trades: {t['number_of_trades']}<br>"\
+    f"Win ratio: {t['win_ratio(%)']}%<br>"\
+    f"Average result: {t['average_res(%)']}%<br>"\
+    f"Median result: {t['median_res(%)']}%<br>"\
+    f"Average trade lenght: {round(t['average_trade_len(days)'], 0)} days<br>"\
+    f"Cumulative result: {round(t['cumulative_result'], 2)}x<br>"\
+    f"Profitable trades mean: {t['profitable_trades_mean']}%<br>"\
+    f"Profitable trades median: {t['profitable_trades_median']}%<br>"\
+    f"Looser trades mean: {t['looser_trades_mean']}%<br>"\
+    f"Looser trades median: {t['looser_trades_median']}%<br>"
 
+    # Add a larger textbox using annotations
+    fig.add_annotation( go.layout.Annotation( x=tex_loc[0], y=tex_loc[1], xref='paper', yref='paper', text=trade_text, showarrow=True, arrowhead=4, ax=0, ay=0, bordercolor='black', borderwidth=2, bgcolor='white', align='left', font=dict(size=14, color='black')))
 
     # Show the plot
-    fig.show()
+    return (fig)
 
 
-#show_indicator_goldhand_line_strategy('TSLA', plot_title='sdgfsdg')
+#ticker= 'AAPL'
+#show_indicator_goldhand_line_strategy(ticker, plot_title=tw.get_plotly_title(ticker), ndays=700, plot_height=1000)

{goldhand-12.9 → goldhand-13.3}/goldhand/strategy_rsi.py

@@ -67,11 +67,22 @@ def rsi_strategy(data, buy_threshold = 30, sell_threshold = 70):
 
 
 
-def show_indicator_rsi_strategy(ticker, buy_threshold = 30, sell_threshold = 70, plot_title = 'RSI Strategy'):
+def show_indicator_rsi_strategy(ticker, buy_threshold = 30, sell_threshold = 70, plot_title = '', ndays=0, plot_height=800):
 
     tdf = GoldHand(ticker).df
     backtest = Backtest( tdf, rsi_strategy, buy_threshold=buy_threshold, sell_threshold=sell_threshold)
     trades =backtest.trades
+    
+    if ndays!=0:
+        tdf = data.tail(tdf)
+        trades = trades.loc[trades['buy_date']>tdf.date.min()]
+        
+    if data['high'].max() >= max(data['high'][0:50]):
+        tex_loc = [0.1, 0.2]
+    else:
+        tex_loc = [0.1, 0.85]
+
+    
 
     # Create subplots with shared x-axis and custom heights
     fig = make_subplots(rows=2, cols=1, shared_xaxes=True, vertical_spacing=0.1, subplot_titles=[plot_title, "RSI"], row_heights=[0.7, 0.3])
@@ -151,6 +162,21 @@ def show_indicator_rsi_strategy(ticker, buy_threshold = 30, sell_threshold = 70,
     fig.update_yaxes(mirror=True, ticks='outside', showline=True, linecolor='black', gridcolor='lightgrey', row=2, col=1)
 
 
+    t= backtest.trades_summary
+    trade_text = f"Trades: {t['number_of_trades']}<br>"\
+    f"Win ratio: {t['win_ratio(%)']}%<br>"\
+    f"Average result: {t['average_res(%)']}%<br>"\
+    f"Median result: {t['median_res(%)']}%<br>"\
+    f"Average trade length: {round(t['average_trade_len(days)'], 0)} days<br>"\
+    f"Cumulative result: {round(t['cumulative_result'], 2)}x<br>"\
+    f"Profitable trades mean: {t['profitable_trades_mean']}%<br>"\
+    f"Profitable trades median: {t['profitable_trades_median']}%<br>"\
+    f"Looser trades mean: {t['looser_trades_mean']}%<br>"\
+    f"Looser trades median: {t['looser_trades_median']}%<br>"
+
+    # Add a larger textbox using annotations
+    fig.add_annotation( go.layout.Annotation( x=tex_loc[0], y=tex_loc[1], xref='paper', yref='paper', text=trade_text, showarrow=True, arrowhead=4, ax=0, ay=0, bordercolor='black', borderwidth=2, bgcolor='white', align='left', font=dict(size=14, color='black')))
+
 
 
     # Add RSI line
@@ -160,7 +186,7 @@ def show_indicator_rsi_strategy(ticker, buy_threshold = 30, sell_threshold = 70,
 
 
     # Show the plot
-    fig.show()
+    return (fig)
 
 
 # Test

{goldhand-12.9 → goldhand-13.3}/goldhand.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: goldhand
-Version: 12.9
+Version: 13.3
 Summary: A package working with financial data
 Home-page: https://github.com/misrori/goldhand
 Author: Mihaly

{goldhand-12.9 → goldhand-13.3}/setup.py

@@ -8,7 +8,7 @@ long_description = (this_directory / "README.md").read_text()
 
 setup(
     name="goldhand",
-    version="12.9",
+    version="13.3",
     author="Mihaly",
     author_email="ormraat.pte@gmail.com",
     description="A package working with financial data",