Skip to content

Commit 6d0a7fc

Browse files
committed
Put states in dedicated folder
1 parent 135a445 commit 6d0a7fc

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

investing_bot_framework/core/states/templates/__init__.py

Whitespace-only changes.

investing_bot_framework/core/context/states/data_providing_state.py renamed to investing_bot_framework/core/states/templates/data_providing_state.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from investing_bot_framework.core.events import Observer
77
from investing_bot_framework.core.context.bot_context import BotContext
88
from investing_bot_framework.core.exceptions import OperationalException
9-
from investing_bot_framework.core.context.states import BotState
9+
from investing_bot_framework.core.states import BotState
1010
from investing_bot_framework.core.executors import ExecutionScheduler
1111
from investing_bot_framework.core.workers import Worker
1212
from investing_bot_framework.core.data_providers import DataProvider
@@ -78,7 +78,7 @@ class DataProvidingState(BotState, Observer):
7878

7979
registered_data_providers: List = None
8080

81-
from investing_bot_framework.core.context.states.strategy_state import StrategyState
81+
from investing_bot_framework.core.states.templates.strategy_state import StrategyState
8282
transition_state_class = StrategyState
8383

8484
data_provider_scheduler: DataProviderScheduler = None
@@ -88,6 +88,9 @@ def __init__(self, context: BotContext) -> None:
8888
self._updated = False
8989
self.data_provider_executor = None
9090

91+
if self.registered_data_providers is None or len(self.registered_data_providers) < 1:
92+
raise OperationalException("Data providing state has not any data providers configured")
93+
9194
def _schedule_data_providers(self) -> List[DataProvider]:
9295

9396
if not DataProvidingState.data_provider_scheduler:
@@ -122,9 +125,6 @@ def _start_data_providers(self, data_providers: List[DataProvider]) -> None:
122125

123126
def run(self) -> None:
124127

125-
if self.registered_data_providers is None:
126-
raise OperationalException("Data providing state has not any data providers configured")
127-
128128
# Schedule the data_providers providers
129129
planned_data_providers = self._schedule_data_providers()
130130

investing_bot_framework/core/context/states/setup_state.py renamed to investing_bot_framework/core/states/templates/setup_state.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1+
import logging
2+
13
from investing_bot_framework.core.exceptions import ImproperlyConfigured
2-
from investing_bot_framework.core.context.states import BotState
4+
from investing_bot_framework.core.states import BotState
5+
6+
logger = logging.getLogger(__name__)
37

48

59
class SetupState(BotState):
610

7-
from investing_bot_framework.core.context.states.data_providing_state import DataProvidingState
11+
from investing_bot_framework.core.states.templates.data_providing_state import DataProvidingState
812
transition_state_class = DataProvidingState
913

1014
def __init__(self, context):
1115
super(SetupState, self).__init__(context)
12-
16+
1317
def run(self) -> None:
1418
"""
1519
Running the setup state.
@@ -27,10 +31,4 @@ def run(self) -> None:
2731
"manage.py file"
2832
)
2933

30-
def stop(self) -> None:
31-
# Stopping all services
32-
pass
3334

34-
def reconfigure(self) -> None:
35-
# Clean up and reconfigure all the services
36-
pass

investing_bot_framework/core/context/states/strategy_state.py renamed to investing_bot_framework/core/states/templates/strategy_state.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import time
33
from typing import List
44

5-
from investing_bot_framework.core.context.states import BotState
5+
from investing_bot_framework.core.states import BotState
66
from investing_bot_framework.core.executors import ExecutionScheduler
77
from investing_bot_framework.core.exceptions import OperationalException
88
from investing_bot_framework.core.workers import Worker
@@ -66,9 +66,6 @@ def configured(self) -> bool:
6666

6767
class StrategyState(BotState, Observer):
6868

69-
from investing_bot_framework.core.context.states.data_providing_state import DataProvidingState
70-
transition_state_class = DataProvidingState
71-
7269
registered_strategies: List = None
7370
strategy_scheduler: StrategyScheduler = None
7471

@@ -126,11 +123,16 @@ def run(self) -> None:
126123

127124
# Collect all strategies from the strategies providers
128125
for strategies in self.strategy_executor.registered_strategies:
129-
logger.info("Data provider: {} finished running".format(strategies.get_id()))
126+
logger.info("Strategy: {} finished running".format(strategies.get_id()))
130127

131128
def update(self, observable, **kwargs) -> None:
132129
self._updated = True
133130

134131
@staticmethod
135132
def register_strategies(strategies: List) -> None:
136133
StrategyState.registered_strategies = strategies
134+
135+
def get_transition_state_class(self):
136+
from investing_bot_framework.core.states.templates.ordering_state import OrderingState
137+
return OrderingState
138+

0 commit comments

Comments
 (0)