siglab-py 0.5.37__py3-none-any.whl → 0.5.38__py3-none-any.whl

siglab_py/tests/unit/analytic_util_tests.py

@@ -2,7 +2,7 @@ import unittest
 from typing import List
 from pathlib import Path
 
-from util.analytic_util import compute_candles_stats
+from util.analytic_util import compute_candles_stats, lookup_fib_target
 
 import pandas as pd
 
@@ -78,4 +78,29 @@ class AnalyticUtilTests(unittest.TestCase):
         missing_columns = [ expected for expected in expected_columns if expected not in pd_candles.columns.to_list() ]
         unexpected_columns = [ actual for actual in pd_candles.columns.to_list() if actual not in expected_columns ]
 
-        assert(pd_candles.columns.to_list()==expected_columns)
+        assert(pd_candles.columns.to_list()==expected_columns)
+
+    def test_lookup_fib_target(self):
+        data_dir = Path(__file__).parent.parent.parent.parent / "data"
+        csv_path = data_dir / "sample_btc_candles.csv"
+        pd_candles : pd.DataFrame = pd.read_csv(csv_path)
+        target_fib_level : float = 0.618
+        compute_candles_stats(
+            pd_candles=pd_candles,
+            boillenger_std_multiples=2,
+            sliding_window_how_many_candles=20,
+            target_fib_level=target_fib_level,
+            pypy_compat=True # Slopes calculation? Set pypy_compat to False
+        )
+
+        last_row = pd_candles.iloc[-1]
+        result = lookup_fib_target(
+            row=last_row, 
+            pd_candles=pd_candles,
+            target_fib_level=target_fib_level
+            )
+        if result:
+            assert(result['short_periods']['min']<result['short_periods']['fib_target']<result['short_periods']['max'])
+            assert(result['long_periods']['min']<result['long_periods']['fib_target']<result['long_periods']['max'])
+        
+

siglab_py/util/analytic_util.py

@@ -83,14 +83,15 @@ def trend_from_lows(series: np.ndarray) -> float:
 '''
 compute_candles_stats will calculate typical/basic technical indicators using in many trading strategies:
     a. Basic SMA/EMAs (And slopes)
-    b. ATR
-    c. Boillenger bands (Yes incorrect spelling sorry)
-    d. FVG
-    e. Hurst Exponent
-    f. RSI, MFI
-    g. MACD
-    h. Fibonacci
-    i. Inflections points: where 'close' crosses EMA from above or below.
+    b. EMA crosses
+    c. ATR
+    d. Boillenger bands (Yes incorrect spelling sorry)
+    e. FVG
+    f. Hurst Exponent
+    g. RSI, MFI
+    h. MACD
+    i. Fibonacci
+    j. Inflections points: where 'close' crosses EMA from above or below.
 
 Parameters:
     a. boillenger_std_multiples: For boillenger upper and lower calc
@@ -433,8 +434,11 @@ def compute_candles_stats(
 
     pd_candles['fvg_mitigated'] = pd_candles.apply(lambda row: compute_fvg_mitigated(row, pd_candles), axis=1)
 
-
-    # RSI - https://www.youtube.com/watch?v=G9oUTi-PI18&t=809s 
+    '''
+        RSI
+        Divergences from Bybit Learn https://www.youtube.com/watch?v=G9oUTi-PI18&t=809s 
+        RSI Reversals from BK Traders https://www.youtube.com/watch?v=MvkbrHjiQlI
+    '''
     pd_candles.loc[:,'close_delta'] = pd_candles['close'].diff()
     pd_candles.loc[:,'close_delta_percent'] = pd_candles['close'].pct_change()
     lo_up = pd_candles['close_delta'].clip(lower=0)
@@ -608,6 +612,68 @@ def compute_candles_stats(
         'close_vs_ema_inflection'
     ] = np.sign(pd_candles['close'] - pd_candles['ema_long_periods'])
 
+def lookup_fib_target(
+            row,
+            pd_candles,
+            target_fib_level : float = 0.618
+        ) -> Union[Dict, None]:
+            if row is None:
+                return None
+            
+            fib_target_short_periods = None
+            fib_target_long_periods = None
+
+            max_short_periods = row['max_short_periods']
+            idmax_short_periods = int(row['idmax_short_periods']) if not math.isnan(row['idmax_short_periods']) else None
+            max_long_periods = row['max_long_periods']
+            idmax_long_periods = int(row['idmax_long_periods']) if not math.isnan(row['idmax_long_periods']) else None
+
+            min_short_periods = row['min_short_periods']
+            idmin_short_periods = int(row['idmin_short_periods']) if not math.isnan(row['idmin_short_periods']) else None
+            min_long_periods = row['min_long_periods']
+            idmin_long_periods = int(row['idmin_long_periods']) if not math.isnan(row['idmin_long_periods']) else None
+                        
+            if idmax_short_periods and idmin_short_periods and idmax_short_periods>0 and idmin_short_periods>0:
+                if idmax_short_periods>idmin_short_periods and idmax_short_periods < len(pd_candles):
+                    # Falling from prev peak
+                    last_peak = pd_candles.iloc[idmax_short_periods]
+                    fib_target_short_periods = last_peak[f'fib_{target_fib_level}_short_periods'] if not math.isnan(last_peak[f'fib_{target_fib_level}_short_periods']) else None
+                    
+                else:
+                    # Bouncing from prev bottom
+                    if idmin_short_periods < len(pd_candles):
+                        last_bottom = pd_candles.iloc[idmin_short_periods]
+                        fib_target_short_periods = last_bottom[f'fib_{target_fib_level}_short_periods'] if not math.isnan(last_bottom[f'fib_{target_fib_level}_short_periods']) else None
+                        
+            if idmax_long_periods and idmin_long_periods and idmax_long_periods>0 and idmin_long_periods>0:
+                if idmax_long_periods>idmin_long_periods and idmax_long_periods < len(pd_candles):
+                    # Falling from prev peak
+                    last_peak = pd_candles.iloc[idmax_long_periods]
+                    fib_target_long_periods = last_peak[f'fib_{target_fib_level}_long_periods'] if not math.isnan(last_peak[f'fib_{target_fib_level}_long_periods']) else None
+                    
+                else:
+                    # Bouncing from prev bottom
+                    if idmin_long_periods < len(pd_candles):
+                        last_bottom = pd_candles.iloc[idmin_long_periods]
+                        fib_target_long_periods = last_bottom[f'fib_{target_fib_level}_long_periods'] if not math.isnan(last_bottom[f'fib_{target_fib_level}_long_periods']) else None
+            
+            return {
+                'short_periods' : {
+                    'idmin' : idmin_short_periods,
+                    'idmax' : idmax_short_periods,
+                    'min' : min_short_periods,
+                    'max' : max_short_periods,
+                    'fib_target' : fib_target_short_periods,
+                },
+                'long_periods' : {
+                    'idmin' : idmin_long_periods,
+                    'idmax' : idmax_long_periods,
+                    'min' : min_long_periods,
+                    'max' : max_long_periods,
+                    'fib_target' : fib_target_long_periods
+                }
+            }
+
 ''' 
 The implementation from Geeksforgeeks https://www.geeksforgeeks.org/find-indices-of-all-local-maxima-and-local-minima-in-an-array/ is wrong. 
 If you have consecutive-duplicates, things will gall apart!

{siglab_py-0.5.37.dist-info → siglab_py-0.5.38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: siglab_py
-Version: 0.5.37
+Version: 0.5.38
 Summary: Market data fetches, TA calculations and generic order gateway.
 Author: r0bbarh00d
 Author-email: r0bbarh00d <r0bbarh00d@gmail.com>

{siglab_py-0.5.37.dist-info → siglab_py-0.5.38.dist-info}/RECORD

@@ -22,18 +22,18 @@ siglab_py/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 siglab_py/tests/integration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 siglab_py/tests/integration/market_data_util_tests.py,sha256=p-RWIJZLyj0lAdfi4QTIeAttCm_e8mEVWFKh4OWuogU,7189
 siglab_py/tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-siglab_py/tests/unit/analytic_util_tests.py,sha256=9tAg7cLDEJ3ueYIQxMYMtPKtZQValKAbRfFgVY_L8dQ,4413
+siglab_py/tests/unit/analytic_util_tests.py,sha256=Tffqy6ngMDj71NkwWvswRln8uhLUJ-RckhbTMN-jVX4,5474
 siglab_py/tests/unit/market_data_util_tests.py,sha256=A1y83itISmMJdn6wLpfwcr4tGola8wTf1D1xbelMvgw,2026
 siglab_py/tests/unit/trading_util_tests.py,sha256=9DZmTZlW55lPtNfTCukgDdiyBiMYv9R4mEFWJIJiTNg,3870
 siglab_py/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-siglab_py/util/analytic_util.py,sha256=lOQoObczb6Z4AZGevKOwuSTdNVKA2QhwAKa36LrMf7w,56524
+siglab_py/util/analytic_util.py,sha256=vZ8G8Kpb2dYoeV5ruIaoVz4lUcVFAILsQVF-zuFb9yk,60287
 siglab_py/util/aws_util.py,sha256=KGmjHrr1rpnnxr33nXHNzTul4tvyyxl9p6gpwNv0Ygc,2557
 siglab_py/util/market_data_util.py,sha256=mUXg4uaiX3b6_klgJWIEgnUQU4IUd6CwTOqKLiQWRlU,31307
 siglab_py/util/notification_util.py,sha256=tNZMUkkjz4q1CKqcQq62oEmZgHgNIwz2Iw9J22V22Zw,2668
 siglab_py/util/retry_util.py,sha256=g-UU6pkPouWZZRZEqP99R2Z0lX5xzckYkzjwqqSDpVQ,922
 siglab_py/util/slack_notification_util.py,sha256=G27n-adbT3Q6oaHSMvu_Nom794rrda5PprSF-zvmzkM,1912
 siglab_py/util/trading_util.py,sha256=-TGNgJdy4HMDPgq31KQn_lRawFxuXnFU5NnLRb1XM5o,5757
-siglab_py-0.5.37.dist-info/METADATA,sha256=jaOC_0EKsjoghv2MUr397p7alkxIUGx5WS1OHxM7_IE,829
-siglab_py-0.5.37.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
-siglab_py-0.5.37.dist-info/top_level.txt,sha256=AbD4VR9OqmMOGlMJLkAVPGQMtUPIQv0t1BF5xmcLJSk,10
-siglab_py-0.5.37.dist-info/RECORD,,
+siglab_py-0.5.38.dist-info/METADATA,sha256=GfE11A07HWATi24pVPfOLFZxxMPd1aKae-97cmeuOqo,829
+siglab_py-0.5.38.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
+siglab_py-0.5.38.dist-info/top_level.txt,sha256=AbD4VR9OqmMOGlMJLkAVPGQMtUPIQv0t1BF5xmcLJSk,10
+siglab_py-0.5.38.dist-info/RECORD,,