goldhand 15.1__tar.gz → 15.3__tar.gz

{goldhand-15.1 → goldhand-15.3}/PKG-INFO

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

{goldhand-15.1 → goldhand-15.3}/goldhand/stocks.py

@@ -21,6 +21,9 @@ class GoldHand:
 
 
     def get_olhc(self):
+        """
+        Download historical stock data for the last year
+        """
         #scraper = cloudscraper.create_scraper()
         response = self.scraper.get(f"https://query1.finance.yahoo.com/v8/finance/chart/{self.ticker}?interval={self.interval}&range={self.range}")
         t= response.json()
@@ -32,6 +35,9 @@ class GoldHand:
         return(df)
     
     def smma(self, data, window, colname):
+        """
+        Calculate Smoothed Moving Average (SMMA)
+        """
         hl2 = data['hl2'].values
         smma_values = [hl2[0]]
 
@@ -141,7 +147,7 @@ class GoldHand:
                 else:
                     temj = '😭💔' 
                 self.df.loc[states[i], 'local_text'] = f'{temj}{fall}%<br>${round(current_low, 2)}'
-
+        self.df.reset_index(inplace=True, drop=True)
 
     def plotly_last_year(self, plot_title, plot_height=900, ndays=500, ad_local_min_max=True):
         tdf = self.df.tail(ndays)

{goldhand-15.1 → goldhand-15.3}/goldhand/strategy_goldhand_line.py

@@ -8,11 +8,13 @@ from goldhand import *
 
 
 
-def goldhand_line_strategy(data):
+def goldhand_line_strategy(data, buy_at='gold', sell_at='grey'):
     """
     This function implements the goldhand line strategy.
     Parameters:
     data (pandas.DataFrame): The dataframe containing the data.
+    buy_at (str): The color of the line to buy at. Default is 'gold'.
+    sell_at (str): The color of the line to sell at. Default is 'grey'.
     Returns:
     res_df (pandas.DataFrame): The dataframe containing the results.
     """
@@ -52,23 +54,33 @@ def goldhand_line_strategy(data):
         # Check if not already in a trade
         if not in_trade:
             # Generate buy signal
-            if (data['color'][i] =='gold') :
-
-                temp_trade['buy_price'] = data['close'][i]
+            if (data['color'][i] ==buy_at) :
+
+                if i == (len(data) -1): 
+                    temp_trade['buy_price'] = data['close'][i]
+                    temp_trade.update(dict(data.iloc[i].add_prefix('buy_')))
+                else:
+                    temp_trade['buy_price'] = data['open'][i+1]
+                    temp_trade.update(dict(data.iloc[i+1].add_prefix('buy_')))
+                
+                
                 temp_trade['trade_id'] = trade_id
                 temp_trade['status'] = 'open'
-                temp_trade.update(dict(data.iloc[i].add_prefix('buy_')))
                 in_trade = True  # Set flag to indicate in a trade
         else:
             # Generate sell signal
-            if (data['color'][i] =='grey') :
-
-                temp_trade['sell_price'] = data['close'][i]
+            if (data['color'][i] ==sell_at) :
+
+                if i == (len(data) -1): 
+                    temp_trade['sell_price'] = data['close'][i]
+                    temp_trade.update(dict(data.iloc[i].add_prefix('sell_')))
+                else:
+                    temp_trade['sell_price'] = data['open'][i+1]
+                    temp_trade.update(dict(data.iloc[i+1].add_prefix('sell_')))
+                
                 temp_trade['trade_id'] = trade_id
                 temp_trade['status'] = 'closed'
 
-                temp_trade.update(dict(data.iloc[i].add_prefix('sell_')))
-
                 # calculate results
                 temp_trade['result'] = temp_trade['sell_price'] / temp_trade['buy_price']
                 temp_trade['days_in_trade'] = (temp_trade['sell_date'] - temp_trade['buy_date']).days
@@ -98,7 +110,7 @@ def goldhand_line_strategy(data):
     return(res_df)
 
 
-def show_indicator_goldhand_line_strategy(ticker, plot_title = '', ndays=0, plot_height=1000, add_strategy_summary = True):
+def show_indicator_goldhand_line_strategy(ticker, plot_title = '', buy_at='gold', sell_at='grey', ndays=0, plot_height=1000, add_strategy_summary = True):
     """
     This function shows the goldhand line strategy on a plotly candlestick chart.   
     Parameters:
@@ -147,11 +159,10 @@ def show_indicator_goldhand_line_strategy(ticker, plot_title = '', ndays=0, plot
     # Create a 'group' column and increase the value only when there's a color change
     data['group'] = (data['color_change']).cumsum()
 
-
     ##### data prepar end
 
     ##### backtest
-    backtest = Backtest( data, goldhand_line_strategy, plot_title =plot_title)
+    backtest = Backtest( data, goldhand_line_strategy, plot_title =plot_title, buy_at='gold', sell_at='grey')
     trades =backtest.trades
 
     if ndays!=0:

{goldhand-15.1 → goldhand-15.3}/goldhand/strategy_rsi.py

@@ -20,33 +20,43 @@ def rsi_strategy(data, buy_threshold = 30, sell_threshold = 70):
         # Check if not already in a trade
         if not in_trade:
             # Generate buy signal
+            #You have to change olne the buy and sell signal
             if data['rsi'][i] < buy_threshold:
 
-                temp_trade['buy_price'] = data['close'][i]
+                if i == (len(data) -1): 
+                    temp_trade['buy_price'] = data['close'][i]
+                    temp_trade.update(dict(data.iloc[i].add_prefix('buy_')))
+                else:
+                    temp_trade['buy_price'] = data['open'][i+1]
+                    temp_trade.update(dict(data.iloc[i+1].add_prefix('buy_')))
+
                 temp_trade['trade_id'] = trade_id
                 temp_trade['status'] = 'open'
-                temp_trade.update(dict(data.iloc[i].add_prefix('buy_')))
                 in_trade = True  # Set flag to indicate in a trade
         else:
             # Generate sell signal
+            #You have to change olne the buy and sell signal
             if data['rsi'][i] > sell_threshold:
-
-                temp_trade['sell_price'] = data['close'][i]
+                if i == (len(data) -1): 
+                    temp_trade['sell_price'] = data['close'][i]
+                    temp_trade.update(dict(data.iloc[i].add_prefix('sell_')))
+                else:
+                    temp_trade['sell_price'] = data['open'][i+1]
+                    temp_trade.update(dict(data.iloc[i+1].add_prefix('sell_')))
+                                       
                 temp_trade['trade_id'] = trade_id
                 temp_trade['status'] = 'closed'
 
-                temp_trade.update(dict(data.iloc[i].add_prefix('sell_')))
-
+                
                 # calculate results
                 temp_trade['result'] = temp_trade['sell_price'] / temp_trade['buy_price']
                 temp_trade['days_in_trade'] = (temp_trade['sell_date'] - temp_trade['buy_date']).days
 
-
-
                 in_trade = False  # Reset flag to indicate not in a trade
                 trade_id +=1
                 all_trades.append(temp_trade)
                 temp_trade = {}
+                
     if temp_trade:
         temp_trade['sell_price'] = data['close'][i]
         temp_trade['trade_id'] = trade_id
@@ -59,7 +69,6 @@ def rsi_strategy(data, buy_threshold = 30, sell_threshold = 70):
     res_df = pd.DataFrame(all_trades)
     
     # change orders
-
     all_col = res_df.columns.tolist()
     first = ['result', 'buy_price', 'sell_price', 'buy_date', 'sell_date', 'days_in_trade']
     first.extend([x for x in all_col if x not in first])

{goldhand-15.1 → goldhand-15.3}/goldhand.egg-info/PKG-INFO

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

{goldhand-15.1 → goldhand-15.3}/setup.py

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