fix: strategy spelling

Author: Yvictor

sjtrade/__init__.py

@@ -2,7 +2,7 @@
 trading with shioaji
 """
 
-__version__ = "0.4.0"
+__version__ = "0.4.1"
 
 def inject_env():
     import os
@@ -17,4 +17,4 @@ def inject_env():
 
 inject_env()
 from .trader import SJTrader
-from .stratage import StratageBase
+from .strategy import StrategyBase

sjtrade/stratage.py sjtrade/strategy.py

@@ -9,7 +9,7 @@
 from .data import Snapshot
 
 
-class StratageBase:
+class StrategyBase:
     name: str
 
     def entry_positions(self):
@@ -42,7 +42,7 @@ def cover_positions_onclose(self, positions: Dict[str, Position]):
         return positions
 
 
-class StratageBasic(StratageBase):
+class StrategyBasic(StrategyBase):
     def __init__(
         self,
         entry_pct: float = 0.05,

sjtrade/trader.py

@@ -7,7 +7,7 @@
 from .utils import quantity_split, sleep_until
 from .data import Snapshot
 from .simulation_shioaji import SimulationShioaji
-from .stratage import StratageBasic
+from .strategy import StrategyBasic
 from .position import Position, PositionCond, PriceSet
 from loguru import logger
 from shioaji.constant import (
@@ -38,7 +38,7 @@ def __init__(self, api: sj.Shioaji, simulation: bool = False):
             self.simulation_api = SimulationShioaji(self.order_deal_handler)
         self.api.set_order_callback(self.order_deal_handler)
         self.api.quote.set_event_callback(self.sj_event_handel)
-        self.stratage = StratageBasic(contracts=self.api.Contracts)
+        self.stratage = StrategyBasic(contracts=self.api.Contracts)
         # self.account = api.stock_account
         # self.entry_trades: Dict[str, sj.order.Trade] = {}
 

tests/conftest.py

@@ -77,4 +77,4 @@ def logger(mocker: MockFixture) -> loguru._logger.Logger:
 
 @pytest.fixture
 def logger_stratage(mocker: MockFixture) -> loguru._logger.Logger:
-    return mocker.patch("sjtrade.stratage.logger")
+    return mocker.patch("sjtrade.strategy.logger")

tests/test_stratage.py tests/test_strategy.py

@@ -1,10 +1,10 @@
 import pytest
 
-from sjtrade.stratage import StratageBase
+from sjtrade.strategy import StrategyBase
 
 
 def test_stratage_base():
-    stratage = StratageBase()
+    stratage = StrategyBase()
     with pytest.raises(NotImplementedError):
         stratage.entry_positions()
 

tests/test_trader.py

@@ -13,7 +13,7 @@
     PositionCond,
     SJTrader,
     SimulationShioaji,
-    StratageBasic,
+    StrategyBasic,
 )
 from shioaji.constant import (
     Action,
@@ -44,7 +44,7 @@ def positions():
 @pytest.fixture
 def sjtrader(api: sj.Shioaji, mocker: MockFixture, positions: dict) -> SJTrader:
     sjtrader = SJTrader(api)
-    sjtrader.stratage = StratageBasic(entry_pct=0.05, contracts=api.Contracts)
+    sjtrader.stratage = StrategyBasic(entry_pct=0.05, contracts=api.Contracts)
     sjtrader.stratage.read_position_func = mocker.MagicMock()
     sjtrader.stratage.read_position_func.return_value = positions
     return sjtrader
@@ -53,7 +53,7 @@ def sjtrader(api: sj.Shioaji, mocker: MockFixture, positions: dict) -> SJTrader:
 @pytest.fixture
 def sjtrader_sim(api: sj.Shioaji, mocker: MockFixture, positions: dict) -> SJTrader:
     sjtrader = SJTrader(api, simulation=True)
-    sjtrader.stratage = StratageBasic(entry_pct=0.05, contracts=api.Contracts)
+    sjtrader.stratage = StrategyBasic(entry_pct=0.05, contracts=api.Contracts)
     sjtrader.stratage.read_position_func = mocker.MagicMock()
     sjtrader.stratage.read_position_func.return_value = positions
     return sjtrader
@@ -80,7 +80,7 @@ def sjtrader_entryed_sim(sjtrader_sim: SJTrader, positions: dict) -> SJTrader:
 
 def test_sjtrader(api: sj.Shioaji):
     sjtrader = SJTrader(api)
-    sjtrader.stratage = StratageBasic()
+    sjtrader.stratage = StrategyBasic()
     assert hasattr(sjtrader, "api")
     sjtrader.stop_profit_pct = 0.1
     assert sjtrader.stop_profit_pct == 0.1