Rename value_extractor to input_modifier (#110)

nardew · Dec 29, 2023 · 3991e1b · 3991e1b
1 parent 485c20d
commit 3991e1b
Show file tree

Hide file tree

Showing 56 changed files with 186 additions and 186 deletions.
diff --git a/talipp/indicators/ADX.py b/talipp/indicators/ADX.py
@@ -3,7 +3,7 @@
 
 from talipp.indicator_util import has_valid_values
 from talipp.indicators.ATR import ATR
-from talipp.indicators.Indicator import Indicator, ValueExtractorType
+from talipp.indicators.Indicator import Indicator, InputModifierType
 from talipp.ohlcv import OHLCV
 
 
@@ -22,8 +22,8 @@ class ADX(Indicator):
     """
 
     def __init__(self, di_period: int, adx_period: int, input_values: List[OHLCV] = None, input_indicator: Indicator = None,
-                 value_extractor: ValueExtractorType = None):
-        super().__init__(value_extractor=value_extractor, output_value_type=ADXVal)
+                 input_modifier: InputModifierType = None):
+        super().__init__(input_modifier=input_modifier, output_value_type=ADXVal)
 
         self.di_period = di_period
         self.adx_period = adx_period

diff --git a/talipp/indicators/ALMA.py b/talipp/indicators/ALMA.py
@@ -1,7 +1,7 @@
 from math import exp
 from typing import List, Any
 
-from talipp.indicators.Indicator import Indicator, ValueExtractorType
+from talipp.indicators.Indicator import Indicator, InputModifierType
 
 
 class ALMA(Indicator):
@@ -11,8 +11,8 @@ class ALMA(Indicator):
     Output: a list of floats
     """
 
-    def __init__(self, period: int, offset: float, sigma: float, input_values: List[float] = None, input_indicator: Indicator = None, value_extractor: ValueExtractorType = None):
-        super().__init__(value_extractor = value_extractor)
+    def __init__(self, period: int, offset: float, sigma: float, input_values: List[float] = None, input_indicator: Indicator = None, input_modifier: InputModifierType = None):
+        super().__init__(input_modifier=input_modifier)
 
         self.period = period
         self.offset = offset

diff --git a/talipp/indicators/AO.py b/talipp/indicators/AO.py
@@ -1,7 +1,7 @@
 from typing import List, Any
 
 from talipp.indicator_util import has_valid_values
-from talipp.indicators.Indicator import Indicator, ValueExtractorType
+from talipp.indicators.Indicator import Indicator, InputModifierType
 from talipp.ma import MAType, MAFactory
 from talipp.ohlcv import OHLCV
 
@@ -14,8 +14,8 @@ class AO(Indicator):
     """
 
     def __init__(self, fast_period: int, slow_period: int, input_values: List[OHLCV] = None, input_indicator: Indicator = None,
-                 value_extractor: ValueExtractorType = None, ma_type: MAType = MAType.SMA):
-        super().__init__(value_extractor=value_extractor)
+                 input_modifier: InputModifierType = None, ma_type: MAType = MAType.SMA):
+        super().__init__(input_modifier=input_modifier)
 
         self.fast_period = fast_period
         self.slow_period = slow_period

diff --git a/talipp/indicators/ATR.py b/talipp/indicators/ATR.py
@@ -1,7 +1,7 @@
 from typing import List, Any
 
 from talipp.indicator_util import has_valid_values
-from talipp.indicators.Indicator import Indicator, ValueExtractorType
+from talipp.indicators.Indicator import Indicator, InputModifierType
 from talipp.ohlcv import OHLCV
 
 
@@ -12,7 +12,7 @@ class ATR(Indicator):
     Output: a list of floats
     """
 
-    def __init__(self, period: int, input_values: List[OHLCV] = None, input_indicator: Indicator = None, value_extractor: ValueExtractorType = None):
+    def __init__(self, period: int, input_values: List[OHLCV] = None, input_indicator: Indicator = None, input_modifier: InputModifierType = None):
         super(ATR, self).__init__()
 
         self.period = period

diff --git a/talipp/indicators/AccuDist.py b/talipp/indicators/AccuDist.py
@@ -1,7 +1,7 @@
 from typing import List, Any
 
 from talipp.indicator_util import has_valid_values
-from talipp.indicators.Indicator import Indicator, ValueExtractorType
+from talipp.indicators.Indicator import Indicator, InputModifierType
 from talipp.ohlcv import OHLCV
 
 
@@ -12,8 +12,8 @@ class AccuDist(Indicator):
     Output: a list of floats
     """
 
-    def __init__(self, input_values: List[OHLCV] = None, input_indicator: Indicator = None, value_extractor: ValueExtractorType = None):
-        super().__init__(value_extractor = value_extractor)
+    def __init__(self, input_values: List[OHLCV] = None, input_indicator: Indicator = None, input_modifier: InputModifierType = None):
+        super().__init__(input_modifier=input_modifier)
 
         self.initialize(input_values, input_indicator)
 

diff --git a/talipp/indicators/Aroon.py b/talipp/indicators/Aroon.py
@@ -2,7 +2,7 @@
 from typing import List, Any
 
 from talipp.indicator_util import has_valid_values
-from talipp.indicators.Indicator import Indicator, ValueExtractorType
+from talipp.indicators.Indicator import Indicator, InputModifierType
 from talipp.ohlcv import OHLCV
 
 
@@ -19,8 +19,8 @@ class Aroon(Indicator):
     Output: a list of AroonVal
     """
 
-    def __init__(self, period: int, input_values: List[OHLCV] = None, input_indicator: Indicator = None, value_extractor: ValueExtractorType = None):
-        super().__init__(value_extractor = value_extractor, output_value_type=AroonVal)
+    def __init__(self, period: int, input_values: List[OHLCV] = None, input_indicator: Indicator = None, input_modifier: InputModifierType = None):
+        super().__init__(input_modifier=input_modifier, output_value_type=AroonVal)
 
         self.period = period
 

diff --git a/talipp/indicators/BB.py b/talipp/indicators/BB.py
@@ -2,7 +2,7 @@
 from typing import List, Any
 
 from talipp.indicator_util import has_valid_values
-from talipp.indicators.Indicator import Indicator, ValueExtractorType
+from talipp.indicators.Indicator import Indicator, InputModifierType
 from talipp.indicators.StdDev import StdDev
 from talipp.ma import MAType, MAFactory
 
@@ -27,15 +27,15 @@ class BB(Indicator):
     """
 
     def __init__(self, period: int, std_dev_mult: float, input_values: List[float] = None,
-                 input_indicator: Indicator = None, value_extractor: ValueExtractorType = None,
+                 input_indicator: Indicator = None, input_modifier: InputModifierType = None,
                  ma_type: MAType = MAType.SMA):
-        super().__init__(value_extractor=value_extractor, output_value_type=BBVal)
+        super().__init__(input_modifier=input_modifier, output_value_type=BBVal)
 
         self.period = period
         self.std_dev_mult = std_dev_mult
 
-        self.central_band = MAFactory.get_ma(ma_type, period, value_extractor=value_extractor)
-        self.std_dev = StdDev(self.period, value_extractor = value_extractor)
+        self.central_band = MAFactory.get_ma(ma_type, period, input_modifier=input_modifier)
+        self.std_dev = StdDev(self.period, input_modifier=input_modifier)
 
         self.add_sub_indicator(self.central_band)
         self.add_sub_indicator(self.std_dev)

diff --git a/talipp/indicators/BOP.py b/talipp/indicators/BOP.py
@@ -1,6 +1,6 @@
 from typing import List, Any
 
-from talipp.indicators.Indicator import Indicator, ValueExtractorType
+from talipp.indicators.Indicator import Indicator, InputModifierType
 from talipp.ohlcv import OHLCV
 
 
@@ -11,8 +11,8 @@ class BOP(Indicator):
     Output: a list of floats
     """
 
-    def __init__(self, input_values: List[OHLCV] = None, input_indicator: Indicator = None, value_extractor: ValueExtractorType = None):
-        super().__init__(value_extractor = value_extractor)
+    def __init__(self, input_values: List[OHLCV] = None, input_indicator: Indicator = None, input_modifier: InputModifierType = None):
+        super().__init__(input_modifier=input_modifier)
 
         self.initialize(input_values, input_indicator)
 

diff --git a/talipp/indicators/CCI.py b/talipp/indicators/CCI.py
@@ -1,7 +1,7 @@
 from typing import List, Any
 
 from talipp.indicator_util import has_valid_values
-from talipp.indicators.Indicator import Indicator, ValueExtractorType
+from talipp.indicators.Indicator import Indicator, InputModifierType
 from talipp.indicators.MeanDev import MeanDev
 from talipp.ohlcv import OHLCV
 
@@ -13,8 +13,8 @@ class CCI(Indicator):
     Output: a list of OHLCV objects
     """
 
-    def __init__(self, period: int, input_values: List[OHLCV] = None, input_indicator: Indicator = None, value_extractor: ValueExtractorType = None):
-        super().__init__(value_extractor = value_extractor)
+    def __init__(self, period: int, input_values: List[OHLCV] = None, input_indicator: Indicator = None, input_modifier: InputModifierType = None):
+        super().__init__(input_modifier=input_modifier)
 
         self.mean_dev = MeanDev(period)
         self.add_managed_sequence(self.mean_dev)

diff --git a/talipp/indicators/CHOP.py b/talipp/indicators/CHOP.py
@@ -3,7 +3,7 @@
 
 from talipp.indicator_util import has_valid_values
 from talipp.indicators.ATR import ATR
-from talipp.indicators.Indicator import Indicator, ValueExtractorType
+from talipp.indicators.Indicator import Indicator, InputModifierType
 from talipp.ohlcv import OHLCV
 
 
@@ -14,8 +14,8 @@ class CHOP(Indicator):
     Output: a list of OHLCV objects
     """
 
-    def __init__(self, period: int, input_values: List[OHLCV] = None, input_indicator: Indicator = None, value_extractor: ValueExtractorType = None):
-        super().__init__(value_extractor = value_extractor)
+    def __init__(self, period: int, input_values: List[OHLCV] = None, input_indicator: Indicator = None, input_modifier: InputModifierType = None):
+        super().__init__(input_modifier=input_modifier)
 
         self.period = period
 

diff --git a/talipp/indicators/ChaikinOsc.py b/talipp/indicators/ChaikinOsc.py
@@ -2,7 +2,7 @@
 
 from talipp.indicator_util import has_valid_values
 from talipp.indicators.AccuDist import AccuDist
-from talipp.indicators.Indicator import Indicator, ValueExtractorType
+from talipp.indicators.Indicator import Indicator, InputModifierType
 from talipp.ma import MAType, MAFactory
 from talipp.ohlcv import OHLCV
 
@@ -15,19 +15,19 @@ class ChaikinOsc(Indicator):
     """
 
     def __init__(self, fast_period: int, slow_period: int, input_values: List[OHLCV] = None, input_indicator: Indicator = None,
-                 value_extractor: ValueExtractorType = None, ma_type: MAType = MAType.EMA):
-        super().__init__(value_extractor = value_extractor)
+                 input_modifier: InputModifierType = None, ma_type: MAType = MAType.EMA):
+        super().__init__(input_modifier=input_modifier)
 
         self.fast_period = fast_period
         self.slow_period = slow_period
 
         self.accu_dist = AccuDist()
         self.add_sub_indicator(self.accu_dist)
 
-        self.ma_fast = MAFactory.get_ma(ma_type, fast_period, value_extractor=value_extractor)
+        self.ma_fast = MAFactory.get_ma(ma_type, fast_period, input_modifier=input_modifier)
         self.add_managed_sequence(self.ma_fast)
 
-        self.ma_slow = MAFactory.get_ma(ma_type, slow_period, value_extractor=value_extractor)
+        self.ma_slow = MAFactory.get_ma(ma_type, slow_period, input_modifier=input_modifier)
         self.add_managed_sequence(self.ma_slow)
 
         self.initialize(input_values, input_indicator)

diff --git a/talipp/indicators/ChandeKrollStop.py b/talipp/indicators/ChandeKrollStop.py
@@ -3,7 +3,7 @@
 
 from talipp.indicator_util import has_valid_values
 from talipp.indicators import ATR
-from talipp.indicators.Indicator import Indicator, ValueExtractorType
+from talipp.indicators.Indicator import Indicator, InputModifierType
 from talipp.ohlcv import OHLCV
 
 
@@ -20,8 +20,8 @@ class ChandeKrollStop(Indicator):
     Output: a list of ChandeKrollStopVal objects
     """
 
-    def __init__(self, atr_period: int, atr_mult: float, period: int, input_values: List[OHLCV] = None, input_indicator: Indicator = None, value_extractor: ValueExtractorType = None):
-        super().__init__(value_extractor = value_extractor, output_value_type=ChandeKrollStopVal)
+    def __init__(self, atr_period: int, atr_mult: float, period: int, input_values: List[OHLCV] = None, input_indicator: Indicator = None, input_modifier: InputModifierType = None):
+        super().__init__(input_modifier=input_modifier, output_value_type=ChandeKrollStopVal)
 
         self.atr_period = atr_period
         self.atr_mult = atr_mult

diff --git a/talipp/indicators/CoppockCurve.py b/talipp/indicators/CoppockCurve.py
@@ -1,7 +1,7 @@
 from typing import List, Any
 
 from talipp.indicator_util import has_valid_values
-from talipp.indicators.Indicator import Indicator, ValueExtractorType
+from talipp.indicators.Indicator import Indicator, InputModifierType
 from talipp.indicators.ROC import ROC
 from talipp.indicators.WMA import WMA
 
@@ -14,8 +14,8 @@ class CoppockCurve(Indicator):
     """
 
     def __init__(self, fast_roc_period: int, slow_roc_period: int, wma_period: int,
-                 input_values: List[float] = None, input_indicator: Indicator = None, value_extractor: ValueExtractorType = None):
-        super().__init__(value_extractor = value_extractor)
+                 input_values: List[float] = None, input_indicator: Indicator = None, input_modifier: InputModifierType = None):
+        super().__init__(input_modifier=input_modifier)
 
         self.fast_roc = ROC(fast_roc_period)
         self.add_sub_indicator(self.fast_roc)

diff --git a/talipp/indicators/DEMA.py b/talipp/indicators/DEMA.py
@@ -2,7 +2,7 @@
 
 from talipp.indicator_util import has_valid_values
 from talipp.indicators.EMA import EMA
-from talipp.indicators.Indicator import Indicator, ValueExtractorType
+from talipp.indicators.Indicator import Indicator, InputModifierType
 
 
 class DEMA(Indicator):
@@ -12,8 +12,8 @@ class DEMA(Indicator):
     Output: a list of floats
     """
 
-    def __init__(self, period: int, input_values: List[float] = None, input_indicator: Indicator = None, value_extractor: ValueExtractorType = None):
-        super().__init__(value_extractor = value_extractor)
+    def __init__(self, period: int, input_values: List[float] = None, input_indicator: Indicator = None, input_modifier: InputModifierType = None):
+        super().__init__(input_modifier=input_modifier)
 
         self.period = period
 

diff --git a/talipp/indicators/DPO.py b/talipp/indicators/DPO.py
@@ -1,7 +1,7 @@
 from typing import List, Any
 
 from talipp.indicator_util import has_valid_values
-from talipp.indicators.Indicator import Indicator, ValueExtractorType
+from talipp.indicators.Indicator import Indicator, InputModifierType
 from talipp.ma import MAType, MAFactory
 
 
@@ -13,8 +13,8 @@ class DPO(Indicator):
     """
 
     def __init__(self, period: int, input_values: List[float] = None, input_indicator: Indicator = None,
-                 value_extractor: ValueExtractorType = None, ma_type: MAType = MAType.SMA):
-        super().__init__(value_extractor = value_extractor)
+                 input_modifier: InputModifierType = None, ma_type: MAType = MAType.SMA):
+        super().__init__(input_modifier=input_modifier)
 
         self.period = period
 

diff --git a/talipp/indicators/DonchianChannels.py b/talipp/indicators/DonchianChannels.py
@@ -2,7 +2,7 @@
 from typing import List, Any
 
 from talipp.indicator_util import has_valid_values
-from talipp.indicators.Indicator import Indicator, ValueExtractorType
+from talipp.indicators.Indicator import Indicator, InputModifierType
 from talipp.ohlcv import OHLCV
 
 
@@ -24,8 +24,8 @@ class DonchianChannels(Indicator):
 
     Output: a list of DonnchianChannelsVal
     """
-    def __init__(self, period: int, input_values: List[OHLCV] = None, input_indicator: Indicator = None, value_extractor: ValueExtractorType = None):
-        super().__init__(value_extractor = value_extractor, output_value_type=DonchianChannelsVal)
+    def __init__(self, period: int, input_values: List[OHLCV] = None, input_indicator: Indicator = None, input_modifier: InputModifierType = None):
+        super().__init__(input_modifier=input_modifier, output_value_type=DonchianChannelsVal)
 
         self.period = period
 

diff --git a/talipp/indicators/EMA.py b/talipp/indicators/EMA.py
@@ -1,7 +1,7 @@
 from typing import List, Any
 
 from talipp.indicator_util import has_valid_values
-from talipp.indicators.Indicator import Indicator, ValueExtractorType
+from talipp.indicators.Indicator import Indicator, InputModifierType
 
 
 class EMA(Indicator):
@@ -11,8 +11,8 @@ class EMA(Indicator):
     Output: a list of floats
     """
 
-    def __init__(self, period: int, input_values: List[float] = None, input_indicator: Indicator = None, value_extractor: ValueExtractorType = None):
-        super().__init__(value_extractor = value_extractor)
+    def __init__(self, period: int, input_values: List[float] = None, input_indicator: Indicator = None, input_modifier: InputModifierType = None):
+        super().__init__(input_modifier=input_modifier)
 
         self.period = period
 

diff --git a/talipp/indicators/EMV.py b/talipp/indicators/EMV.py
@@ -1,7 +1,7 @@
 from typing import List, Any
 
 from talipp.indicator_util import has_valid_values
-from talipp.indicators.Indicator import Indicator, ValueExtractorType
+from talipp.indicators.Indicator import Indicator, InputModifierType
 from talipp.ma import MAType, MAFactory
 from talipp.ohlcv import OHLCV
 
@@ -14,8 +14,8 @@ class EMV(Indicator):
     """
 
     def __init__(self, period: int, volume_div: int, input_values: List[OHLCV] = None, input_indicator: Indicator = None,
-                 value_extractor: ValueExtractorType = None, ma_type: MAType = MAType.SMA):
-        super().__init__(value_extractor = value_extractor)
+                 input_modifier: InputModifierType = None, ma_type: MAType = MAType.SMA):
+        super().__init__(input_modifier=input_modifier)
 
         self.period = period
         self.volume_div = volume_div

diff --git a/talipp/indicators/ForceIndex.py b/talipp/indicators/ForceIndex.py
@@ -1,7 +1,7 @@
 from typing import List, Any
 
 from talipp.indicator_util import has_valid_values
-from talipp.indicators.Indicator import Indicator, ValueExtractorType
+from talipp.indicators.Indicator import Indicator, InputModifierType
 from talipp.ma import MAFactory, MAType
 from talipp.ohlcv import OHLCV
 
@@ -14,8 +14,8 @@ class ForceIndex(Indicator):
     """
 
     def __init__(self, period: int, input_values: List[OHLCV] = None, input_indicator: Indicator = None,
-                 value_extractor: ValueExtractorType = None, ma_type: MAType = MAType.EMA):
-        super().__init__(value_extractor = value_extractor)
+                 input_modifier: InputModifierType = None, ma_type: MAType = MAType.EMA):
+        super().__init__(input_modifier=input_modifier)
 
         self.ma = MAFactory.get_ma(ma_type, period)
         self.add_managed_sequence(self.ma)