siglab-py 0.3.1__tar.gz → 0.3.2__tar.gz

{siglab_py-0.3.1 → siglab_py-0.3.2}/PKG-INFO

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

{siglab_py-0.3.1 → siglab_py-0.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "siglab_py"
-version = "0.3.1"
+version = "0.3.2"
 description = "Market data fetches, TA calculations and generic order gateway."
 authors = [{name = "r0bbarh00d", email = "r0bbarh00d@gmail.com"}]
 license = {text = "MIT"}

{siglab_py-0.3.1 → siglab_py-0.3.2}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = siglab_py
-version = 0.3.1
+version = 0.3.2
 description = Market data fetches, TA calculations and generic order gateway.
 author = r0bbarh00d
 author_email = r0bbarh00d@gmail.com

{siglab_py-0.3.1 → siglab_py-0.3.2}/siglab_py/tests/unit/trading_util_tests.py

@@ -12,7 +12,7 @@ class TradingUtilTests(unittest.TestCase):
         tp_min_percent : float = 1.5
         tp_max_percent : float = 2.5
         sl_percent_trailing : float = 50 # Trailing stop loss in percent
-        default_effective_tp_percent_trailing : float = 50
+        default_effective_tp_trailing_percent : float = 50
 
         pnl_percent_notional : float = 0.5 # Trade's current pnl in percent.
 
@@ -21,7 +21,7 @@ class TradingUtilTests(unittest.TestCase):
             tp_max_percent = tp_max_percent,
             sl_percent_trailing = sl_percent_trailing,
             pnl_percent_notional = pnl_percent_notional,
-            default_effective_tp_percent_trailing = default_effective_tp_percent_trailing
+            default_effective_tp_trailing_percent = default_effective_tp_trailing_percent
         )
         assert(effective_tp_trailing_percent==50) # Generous trailing SL when trading starting out and pnl small.
 
@@ -29,7 +29,7 @@ class TradingUtilTests(unittest.TestCase):
         tp_min_percent : float = 1.5
         tp_max_percent : float = 2.5
         sl_percent_trailing : float = 50 # Trailing stop loss in percent
-        default_effective_tp_percent_trailing : float = 50
+        default_effective_tp_trailing_percent : float = 50
 
         pnl_percent_notional : float = 2 # Trade's current pnl in percent.
 
@@ -38,7 +38,7 @@ class TradingUtilTests(unittest.TestCase):
             tp_max_percent = tp_max_percent,
             sl_percent_trailing = sl_percent_trailing,
             pnl_percent_notional = pnl_percent_notional,
-            default_effective_tp_percent_trailing = default_effective_tp_percent_trailing
+            default_effective_tp_trailing_percent = default_effective_tp_trailing_percent
         )
         assert(effective_tp_trailing_percent==25) # Intermediate trailing SL
 
@@ -46,7 +46,7 @@ class TradingUtilTests(unittest.TestCase):
         tp_min_percent : float = 1.5
         tp_max_percent : float = 2.5
         sl_percent_trailing : float = 50 # Trailing stop loss in percent
-        default_effective_tp_percent_trailing : float = 50
+        default_effective_tp_trailing_percent : float = 50
 
         pnl_percent_notional : float = 2.5 # Trade's current pnl in percent.
 
@@ -55,6 +55,6 @@ class TradingUtilTests(unittest.TestCase):
             tp_max_percent = tp_max_percent,
             sl_percent_trailing = sl_percent_trailing,
             pnl_percent_notional = pnl_percent_notional,
-            default_effective_tp_percent_trailing = default_effective_tp_percent_trailing
+            default_effective_tp_trailing_percent = default_effective_tp_trailing_percent
         )
         assert(effective_tp_trailing_percent==0) # Most tight trailing SL

{siglab_py-0.3.1 → siglab_py-0.3.2}/siglab_py/util/analytic_util.py

@@ -98,10 +98,13 @@ def compute_candles_stats(
     pd_candles['ema_short_periods'] = close_short_periods_ewm.mean()
     pd_candles['ema_long_periods'] = close_long_periods_ewm.mean()
     pd_candles['ema_close'] = pd_candles['ema_long_periods'] # Alias, shorter name
-    pd_candles['std'] = pd_candles['close'].rolling(window=sliding_window_how_many_candles).std()
+    pd_candles['std'] = close_long_periods_rolling.std()
 
     pd_candles['std_percent'] = pd_candles['std'] / pd_candles['ema_close'] * 100
 
+    pd_candles['normalized_close_short'] = (pd_candles['close'] - pd_candles['sma_short_periods']) / close_short_periods_rolling.std()
+    pd_candles['normalized_close_long'] = (pd_candles['close'] - pd_candles['sma_long_periods']) / pd_candles['std']
+
     pd_candles['candle_height_percent'] = pd_candles['candle_height'] / pd_candles['ema_close'] * 100
     pd_candles['candle_height_percent_rounded'] = pd_candles['candle_height_percent'].round().astype('Int64')
 
@@ -368,12 +371,12 @@ def compute_candles_stats(
         import statsmodels.api as sm # in-compatible with pypy
 
         # Slopes
-        X = sm.add_constant(range(len(pd_candles['close'])))
-        rolling_slope = pd_candles['close'].rolling(window=int(sliding_window_how_many_candles/slow_fast_interval_ratio)).apply(lambda x: sm.OLS(x, X[:len(x)]).fit().params[1], raw=False)
+        X = sm.add_constant(range(len(pd_candles['normalized_close_short'])))
+        rolling_slope = pd_candles['normalized_close_short'].rolling(window=int(sliding_window_how_many_candles/slow_fast_interval_ratio)).apply(lambda x: sm.OLS(x, X[:len(x)]).fit().params[1], raw=False)
         pd_candles['close_short_slope'] = rolling_slope
 
-        X = sm.add_constant(range(len(pd_candles['close'])))
-        rolling_slope = pd_candles['close'].rolling(window=sliding_window_how_many_candles).apply(lambda x: sm.OLS(x, X[:len(x)]).fit().params[1], raw=False)
+        X = sm.add_constant(range(len(pd_candles['normalized_close_long'])))
+        rolling_slope = pd_candles['normalized_close_long'].rolling(window=sliding_window_how_many_candles).apply(lambda x: sm.OLS(x, X[:len(x)]).fit().params[1], raw=False)
         pd_candles['close_long_slope'] = rolling_slope
         
         X = sm.add_constant(range(len(pd_candles['ema_short_periods'])))

{siglab_py-0.3.1 → siglab_py-0.3.2}/siglab_py/util/trading_util.py

@@ -11,11 +11,11 @@ Examples,
         min TP = 1.5% <-- min TP
         max TP = 2.5% <-- max TP
 
-    slope = (0-50)/(2.5-1.5) = -50
+    slope = (0-50)/(2.5-1.5) = -50/+1 = -50
     effective_tp_trailing_percent = slope * (pnl_percent_notional - 1.5%) + sl_percent_trailing
 
-Case 1. pnl_percent_notional = 0.5% (Trade starting off, only +50bps pnl. i.e. min TP)
-            effective_tp_trailing_percent = slope * (pnl_percent_notional - 0.5%) + sl_percent_trailing
+Case 1. pnl_percent_notional = 1.5% (Trade starting off, only +50bps pnl. i.e. min TP)
+            effective_tp_trailing_percent = slope * (pnl_percent_notional - 1.5%) + sl_percent_trailing
                                             = -50 * (1.5-1.5) + 50%
                                             = 0 + 50
                                             = 50% (Most loose)

{siglab_py-0.3.1 → siglab_py-0.3.2}/siglab_py.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siglab-py
-Version: 0.3.1
+Version: 0.3.2
 Summary: Market data fetches, TA calculations and generic order gateway.
 Author: r0bbarh00d
 Author-email: r0bbarh00d <r0bbarh00d@gmail.com>