Rename Strategy to Reducer

Author: pbashyal-nmdp

pyard/handlers/allele_reducer.py

@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING
 
 from ..constants import VALID_REDUCTION_TYPE
-from ..strategies.strategy_factory import StrategyFactory
+from ..reducers.reducer_factory import StrategyFactory
 
 if TYPE_CHECKING:
     from ..ard import ARD

pyard/reducers/__init__.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+
+from .base_reducer import Reducer
+from .g_reducer import GGroupReducer
+from .p_reducer import PGroupReducer
+from .lg_reducer import LGReducer, LGXReducer
+from .w_reducer import WReducer
+from .exon_reducer import ExonReducer
+from .u2_reducer import U2Reducer
+from .s_reducer import SReducer
+from .default_reducer import DefaultReducer
+from .reducer_factory import StrategyFactory
+
+__all__ = [
+    "Reducer",
+    "GGroupReducer",
+    "PGroupReducer",
+    "LGReducer",
+    "LGXReducer",
+    "WReducer",
+    "ExonReducer",
+    "U2Reducer",
+    "SReducer",
+    "DefaultReducer",
+    "StrategyFactory",
+]

pyard/strategies/base_strategy.py renamed to pyard/reducers/base_reducer.py

@@ -7,7 +7,7 @@
     from ..ard import ARD
 
 
-class ReductionStrategy(ABC):
+class Reducer(ABC):
     """Base class for all reduction strategies"""
 
     def __init__(self, ard_instance: "ARD"):

pyard/strategies/default_strategy.py renamed to pyard/reducers/default_reducer.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 from typing_extensions import override
 
-from .base_strategy import ReductionStrategy
+from .base_reducer import Reducer
 
 
-class DefaultStrategy(ReductionStrategy):
+class DefaultReducer(Reducer):
     """Default strategy for handling P/G suffixes and validation"""
 
     @override

pyard/strategies/exon_strategy.py renamed to pyard/reducers/exon_reducer.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 from typing import override
 
-from .base_strategy import ReductionStrategy
+from .base_reducer import Reducer
 
 
-class ExonStrategy(ReductionStrategy):
+class ExonReducer(Reducer):
     """Strategy for exon reduction"""
 
     @override

pyard/strategies/g_strategy.py renamed to pyard/reducers/g_reducer.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 from typing_extensions import override
 
-from .default_strategy import DefaultStrategy
+from .default_reducer import DefaultReducer
 
 
-class GGroupStrategy(DefaultStrategy):
+class GGroupReducer(DefaultReducer):
     """Strategy for G group reduction"""
 
     @override

pyard/strategies/lg_strategy.py renamed to pyard/reducers/lg_reducer.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 from typing import override
 
-from .base_strategy import ReductionStrategy
+from .base_reducer import Reducer
 
 
-class LGXStrategy(ReductionStrategy):
+class LGXReducer(Reducer):
     """Strategy for lgx reduction"""
 
     @override
@@ -16,12 +16,12 @@ def reduce(self, allele: str) -> str:
             return ":".join(allele.split(":")[0:2])
 
 
-class LGStrategy(ReductionStrategy):
+class LGReducer(Reducer):
     """Strategy for lg reduction (lgx + g suffix)"""
 
     @override
     def reduce(self, allele: str) -> str:
-        lgx_strategy = LGXStrategy(self.ard)
+        lgx_strategy = LGXReducer(self.ard)
         redux_allele = lgx_strategy.reduce(allele)
         return self._add_lg_suffix(redux_allele)
 

pyard/strategies/p_strategy.py renamed to pyard/reducers/p_reducer.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 from typing import override
 
-from .base_strategy import ReductionStrategy
+from .base_reducer import Reducer
 
 
-class PGroupStrategy(ReductionStrategy):
+class PGroupReducer(Reducer):
     """Strategy for P group reduction"""
 
     @override

pyard/reducers/reducer_factory.py

@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+
+from typing import Dict, TYPE_CHECKING
+
+from .default_reducer import DefaultReducer
+from .base_reducer import Reducer
+from .exon_reducer import ExonReducer
+from .g_reducer import GGroupReducer
+from .lg_reducer import LGReducer, LGXReducer
+from .p_reducer import PGroupReducer
+from .s_reducer import SReducer
+from .u2_reducer import U2Reducer
+from .w_reducer import WReducer
+from ..constants import VALID_REDUCTION_TYPE
+
+if TYPE_CHECKING:
+    from ..ard import ARD
+
+
+class StrategyFactory:
+    """Factory for creating reduction strategies"""
+
+    def __init__(self, ard_instance: "ARD"):
+        self.ard = ard_instance
+        self._strategies: Dict[str, Reducer] = {}
+        self._initialize_strategies()
+
+    def _initialize_strategies(self):
+        """Initialize all reduction strategies"""
+        self._strategies = {
+            "G": GGroupReducer(self.ard),
+            "P": PGroupReducer(self.ard),
+            "lg": LGReducer(self.ard),
+            "lgx": LGXReducer(self.ard),
+            "W": WReducer(self.ard),
+            "exon": ExonReducer(self.ard),
+            "U2": U2Reducer(self.ard),
+            "S": SReducer(self.ard),
+            "default": DefaultReducer(self.ard),
+        }
+
+    def get_strategy(self, redux_type: VALID_REDUCTION_TYPE) -> Reducer:
+        """Get the appropriate strategy for the reduction type"""
+        return self._strategies.get(redux_type, self._strategies["default"])

pyard/strategies/s_strategy.py renamed to pyard/reducers/s_reducer.py

@@ -3,10 +3,10 @@
 import functools
 from typing import override
 
-from .base_strategy import ReductionStrategy
+from .base_reducer import Reducer
 
 
-class SStrategy(ReductionStrategy):
+class SReducer(Reducer):
     """Strategy for serology reduction"""
 
     @override