goldhand 13.3__py3-none-any.whl → 14.2__py3-none-any.whl

goldhand/stocks.py

@@ -143,22 +143,22 @@ class GoldHand:
                 self.df.loc[states[i], 'local_text'] = f'{temj}{fall}%<br>${round(current_low, 2)}'
 
 
-    def plotly_last_year(self, plot_title, plot_height=900):
-        tdf = self.df.tail(500)
+    def plotly_last_year(self, plot_title, plot_height=900, ndays=500, ad_local_min_max=True):
+        tdf = self.df.tail(ndays)
 
         fig = go.Figure(data=go.Ohlc(x=tdf['date'], open=tdf['open'], high=tdf['high'], low=tdf['low'],close=tdf['close']))
-
-        for index, row in tdf[tdf['local']!=''].iterrows():
-            direction = row['local']
-            tdate = row['date']
-            local_text = row['local_text']
-            min_price = row['low']
-            max_price = row['high']
-            if direction == 'maximum':
-                fig.add_annotation( x=tdate, y=max_price, text=local_text, showarrow=True, align="center", bordercolor="#c7c7c7", font=dict(family="Courier New, monospace", size=16, color="#214e34" ), borderwidth=2, borderpad=4, bgcolor="#f4fdff", opacity=0.8, arrowhead=2, arrowsize=1, arrowwidth=1, ax=-45,ay=-45)
-
-            if direction == 'minimum':
-                fig.add_annotation( x=tdate, y=min_price, text=local_text, showarrow=True, align="center", bordercolor="#c7c7c7", font=dict(family="Courier New, monospace", size=16, color="red" ), borderwidth=2, borderpad=4, bgcolor="#f4fdff", opacity=0.8, arrowhead=2, arrowsize=1, arrowwidth=1, ax=45,ay=45)
+        if ad_local_min_max:
+            for index, row in tdf[tdf['local']!=''].iterrows():
+                direction = row['local']
+                tdate = row['date']
+                local_text = row['local_text']
+                min_price = row['low']
+                max_price = row['high']
+                if direction == 'maximum':
+                    fig.add_annotation( x=tdate, y=max_price, text=local_text, showarrow=True, align="center", bordercolor="#c7c7c7", font=dict(family="Courier New, monospace", size=16, color="#214e34" ), borderwidth=2, borderpad=4, bgcolor="#f4fdff", opacity=0.8, arrowhead=2, arrowsize=1, arrowwidth=1, ax=-45,ay=-45)
+
+                if direction == 'minimum':
+                    fig.add_annotation( x=tdate, y=min_price, text=local_text, showarrow=True, align="center", bordercolor="#c7c7c7", font=dict(family="Courier New, monospace", size=16, color="red" ), borderwidth=2, borderpad=4, bgcolor="#f4fdff", opacity=0.8, arrowhead=2, arrowsize=1, arrowwidth=1, ax=45,ay=45)
 
         fig.update_layout(showlegend=False, plot_bgcolor='white', height=plot_height, title= plot_title)
 
@@ -169,7 +169,7 @@ class GoldHand:
         fig.add_trace( go.Scatter(x=tdf['date'], y=tdf['sma_200'], opacity =0.7, line=dict(color='red', width = 2.5) ,  name = 'SMA 200') )
         return(fig)
 
-    def plot_goldhand_line(self, plot_title, plot_height=900):
+    def plot_goldhand_line(self, plot_title, plot_height=900, ndays=800,  ad_local_min_max=True):
         
         data = self.df.copy()
         # Apply SMMA to the dataframe
@@ -190,9 +190,22 @@ class GoldHand:
         # Create a 'group' column and increase the value only when there's a color change
         data['group'] = (data['color_change']).cumsum()
 
-        tdf = data.tail(800)
+        tdf = data.tail(ndays)
 
         fig = go.Figure(data=go.Ohlc(x=tdf['date'], open=tdf['open'], high=tdf['high'], low=tdf['low'],close=tdf['close']))
+        if ad_local_min_max:
+            for index, row in tdf[tdf['local']!=''].iterrows():
+                direction = row['local']
+                tdate = row['date']
+                local_text = row['local_text']
+                min_price = row['low']
+                max_price = row['high']
+                if direction == 'maximum':
+                    fig.add_annotation( x=tdate, y=max_price, text=local_text, showarrow=True, align="center", bordercolor="#c7c7c7", font=dict(family="Courier New, monospace", size=16, color="#214e34" ), borderwidth=2, borderpad=4, bgcolor="#f4fdff", opacity=0.8, arrowhead=2, arrowsize=1, arrowwidth=1, ax=-45,ay=-45)
+
+                if direction == 'minimum':
+                    fig.add_annotation( x=tdate, y=min_price, text=local_text, showarrow=True, align="center", bordercolor="#c7c7c7", font=dict(family="Courier New, monospace", size=16, color="red" ), borderwidth=2, borderpad=4, bgcolor="#f4fdff", opacity=0.8, arrowhead=2, arrowsize=1, arrowwidth=1, ax=45,ay=45)
+
 
         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')

goldhand/strategy_goldhand_line.py

@@ -140,7 +140,7 @@ def show_indicator_goldhand_line_strategy(ticker, plot_title = '', ndays=0, plot
       data = data.tail(ndays)
       trades = trades.loc[trades['buy_date']>data.date.min()]
 
-    if data['high'].max() >= max(data['high'][0:50]):
+    if data['high'].max() == max(data['high'][0:50]):
         tex_loc = [0.1, 0.2]
     else:
         tex_loc = [0.1, 0.85]

goldhand/strategy_rsi.py

@@ -77,7 +77,7 @@ def show_indicator_rsi_strategy(ticker, buy_threshold = 30, sell_threshold = 70,
         tdf = data.tail(tdf)
         trades = trades.loc[trades['buy_date']>tdf.date.min()]
         
-    if data['high'].max() >= max(data['high'][0:50]):
+    if tdf['high'].max() == max(tdf['high'][0:50]):
         tex_loc = [0.1, 0.2]
     else:
         tex_loc = [0.1, 0.85]

{goldhand-13.3.dist-info → goldhand-14.2.dist-info}/METADATA

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

goldhand-14.2.dist-info/RECORD

@@ -0,0 +1,11 @@
+goldhand/__init__.py,sha256=2D68nqSZuv6sqyLJbOXnWIeeFpNgpYc90rHa2Fo70lk,152
+goldhand/backtest.py,sha256=KrZXXaQw3ZPxE3tY0MOCa2qPJX374pVMLwM_VIOKy5Y,6105
+goldhand/helpers.py,sha256=l9yn0kVTiwfUR8sI5nH1QFx6dYikaUQgRA227Ox7hs0,6130
+goldhand/stocks.py,sha256=wizTmZ8ybH76CSHuWbNu0hkbwH95Mw4LWSblb5jl9ro,11680
+goldhand/strategy_goldhand_line.py,sha256=Ulq_wcUOzzQBjtwq45R3_9QbFXHSbkZTtkwOczQC43I,10501
+goldhand/strategy_rsi.py,sha256=Ja2jomY4lw6K_VMLTNcUomn80T2iY3XwL40H2JUdAFY,8802
+goldhand/tw.py,sha256=K8MwMDkW5JtBFBG0qcPzj8OVx2OhDjrOH2UGo6nwtSs,8375
+goldhand-14.2.dist-info/METADATA,sha256=KlD3Z6LQt-MCaGGXPATHgNYP1h3n0oI0QbL_Ewu2NfA,1952
+goldhand-14.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+goldhand-14.2.dist-info/top_level.txt,sha256=siEJ2_a_Fx_7hqRI4Ms6SzCelbXrK_1H_eOF8KAaMdA,9
+goldhand-14.2.dist-info/RECORD,,

goldhand-13.3.dist-info/RECORD

@@ -1,11 +0,0 @@
-goldhand/__init__.py,sha256=2D68nqSZuv6sqyLJbOXnWIeeFpNgpYc90rHa2Fo70lk,152
-goldhand/backtest.py,sha256=KrZXXaQw3ZPxE3tY0MOCa2qPJX374pVMLwM_VIOKy5Y,6105
-goldhand/helpers.py,sha256=l9yn0kVTiwfUR8sI5nH1QFx6dYikaUQgRA227Ox7hs0,6130
-goldhand/stocks.py,sha256=0MnjAex2A2c06JHinToKHBAvUJvYtDFXxtGudqBux6o,10521
-goldhand/strategy_goldhand_line.py,sha256=ersczdUtKBpyWpmgbLOEnoGi5MedV1aSjBNptMM-zP0,10501
-goldhand/strategy_rsi.py,sha256=9uzKo3HnmpkJV7rxzvovlGZv3-O2rwTJxxdl8V2--s4,8804
-goldhand/tw.py,sha256=K8MwMDkW5JtBFBG0qcPzj8OVx2OhDjrOH2UGo6nwtSs,8375
-goldhand-13.3.dist-info/METADATA,sha256=rDlhsIGYs5naNPOD5fmCy6_SpNDm9kg0gdkVHCvYlJo,1952
-goldhand-13.3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-goldhand-13.3.dist-info/top_level.txt,sha256=siEJ2_a_Fx_7hqRI4Ms6SzCelbXrK_1H_eOF8KAaMdA,9
-goldhand-13.3.dist-info/RECORD,,