refactoring - create sub directory

smtm/__init__.py

@@ -2,33 +2,33 @@
 Description for Package
 """
 from .config import Config
+from .worker import Worker
 from .date_converter import DateConverter
-from .operator import Operator
 from .log_manager import LogManager
 from .analyzer import Analyzer
-from .simulation_trader import SimulationTrader
-from .simulation_data_provider import SimulationDataProvider
+from .data.simulation_data_provider import SimulationDataProvider
+from .data.upbit_data_provider import UpbitDataProvider
+from .data.bithumb_data_provider import BithumbDataProvider
+from .data.binance_data_provider import BinanceDataProvider
+from .data.data_repository import DataRepository
+from .data.database import Database
+from .strategy.strategy_bnh import StrategyBuyAndHold
+from .strategy.strategy_sma_0 import StrategySma0
+from .strategy.strategy_sma_ml import StrategySmaMl
+from .strategy.strategy_rsi import StrategyRsi
+from .strategy.strategy_factory import StrategyFactory
+from .trader.simulation_trader import SimulationTrader
+from .trader.virtual_market import VirtualMarket
+from .trader.demo_trader import DemoTrader
+from .trader.upbit_trader import UpbitTrader
+from .trader.bithumb_trader import BithumbTrader
+from .operator import Operator
 from .simulation_operator import SimulationOperator
-from .strategy_bnh import StrategyBuyAndHold
-from .strategy_sma_0 import StrategySma0
-from .strategy_sma_ml import StrategySmaMl
-from .strategy_rsi import StrategyRsi
-from .strategy_factory import StrategyFactory
-from .virtual_market import VirtualMarket
-from .worker import Worker
-from .simulator import Simulator
-from .demo_trader import DemoTrader
-from .upbit_trader import UpbitTrader
-from .bithumb_trader import BithumbTrader
-from .upbit_data_provider import UpbitDataProvider
-from .bithumb_data_provider import BithumbDataProvider
-from .binance_data_provider import BinanceDataProvider
-from .controller import Controller
-from .jpt_controller import JptController
-from .telegram_controller import TelegramController
-from .data_repository import DataRepository
-from .database import Database
-from .mass_simulator import MassSimulator
+from .controller.controller import Controller
+from .controller.jpt_controller import JptController
+from .controller.telegram_controller import TelegramController
+from .controller.mass_simulator import MassSimulator
+from .controller.simulator import Simulator
 
 __all__ = [
     "LogManager",

smtm/__main__.py

@@ -21,10 +21,10 @@
 import argparse
 from argparse import RawTextHelpFormatter
 import sys
-from .simulator import Simulator
-from .controller import Controller
-from .telegram_controller import TelegramController
-from .mass_simulator import MassSimulator
+from .controller.simulator import Simulator
+from .controller.controller import Controller
+from .controller.telegram_controller import TelegramController
+from .controller.mass_simulator import MassSimulator
 from .log_manager import LogManager
 from .__init__ import __version__
 

smtm/controller.py → smtm/controller/controller.py

@@ -1,15 +1,15 @@
 """시스템 운영 인터페이스로서 Operator를 사용해서 자동 거래 시스템을 컨트롤하는 Controller 클래스"""
 
 import signal
-from .config import Config
-from .log_manager import LogManager
-from .analyzer import Analyzer
-from .upbit_trader import UpbitTrader
-from .upbit_data_provider import UpbitDataProvider
-from .bithumb_trader import BithumbTrader
-from .bithumb_data_provider import BithumbDataProvider
-from .strategy_factory import StrategyFactory
-from .operator import Operator
+from ..config import Config
+from ..log_manager import LogManager
+from ..analyzer import Analyzer
+from ..trader.upbit_trader import UpbitTrader
+from ..data.upbit_data_provider import UpbitDataProvider
+from ..trader.bithumb_trader import BithumbTrader
+from ..data.bithumb_data_provider import BithumbDataProvider
+from ..strategy.strategy_factory import StrategyFactory
+from ..operator import Operator
 
 
 class Controller:

smtm/jpt_controller.py → smtm/controller/jpt_controller.py

@@ -3,15 +3,15 @@
 Jupyter notebook에서 사용하기 좋게 만든 자동 거래 시스템 컨트롤 모듈
 """
 from IPython.display import Image, display
-from .config import Config
-from .log_manager import LogManager
-from .analyzer import Analyzer
-from .upbit_trader import UpbitTrader
-from .upbit_data_provider import UpbitDataProvider
-from .bithumb_trader import BithumbTrader
-from .bithumb_data_provider import BithumbDataProvider
-from .strategy_factory import StrategyFactory
-from .operator import Operator
+from ..config import Config
+from ..log_manager import LogManager
+from ..analyzer import Analyzer
+from ..trader.upbit_trader import UpbitTrader
+from ..data.upbit_data_provider import UpbitDataProvider
+from ..trader.bithumb_trader import BithumbTrader
+from ..data.bithumb_data_provider import BithumbDataProvider
+from ..strategy.strategy_factory import StrategyFactory
+from ..operator import Operator
 
 
 class JptController:

smtm/mass_simulator.py → smtm/controller/mass_simulator.py

@@ -14,14 +14,14 @@
 import pandas as pd
 import matplotlib.pyplot as plt
 
-from .config import Config
-from .log_manager import LogManager
-from .analyzer import Analyzer
-from .strategy_factory import StrategyFactory
-from .simulation_operator import SimulationOperator
-from .simulation_trader import SimulationTrader
-from .date_converter import DateConverter
-from .simulation_data_provider import SimulationDataProvider
+from ..config import Config
+from ..log_manager import LogManager
+from ..analyzer import Analyzer
+from ..strategy.strategy_factory import StrategyFactory
+from ..simulation_operator import SimulationOperator
+from ..trader.simulation_trader import SimulationTrader
+from ..date_converter import DateConverter
+from ..data.simulation_data_provider import SimulationDataProvider
 
 
 class MassSimulator:

smtm/simulator.py → smtm/controller/simulator.py

@@ -2,14 +2,14 @@
 import signal
 import time
 
-from .config import Config
-from .log_manager import LogManager
-from .analyzer import Analyzer
-from .simulation_operator import SimulationOperator
-from .simulation_trader import SimulationTrader
-from .date_converter import DateConverter
-from .simulation_data_provider import SimulationDataProvider
-from .strategy_factory import StrategyFactory
+from ..config import Config
+from ..log_manager import LogManager
+from ..analyzer import Analyzer
+from ..simulation_operator import SimulationOperator
+from ..trader.simulation_trader import SimulationTrader
+from ..date_converter import DateConverter
+from ..data.simulation_data_provider import SimulationDataProvider
+from ..strategy.strategy_factory import StrategyFactory
 
 
 class Simulator:

smtm/telegram_controller.py → smtm/controller/telegram_controller.py

@@ -8,17 +8,17 @@
 from urllib import parse
 import requests
 from dotenv import load_dotenv
-from .config import Config
-from .log_manager import LogManager
-from .analyzer import Analyzer
-from .upbit_trader import UpbitTrader
-from .upbit_data_provider import UpbitDataProvider
-from .bithumb_trader import BithumbTrader
-from .bithumb_data_provider import BithumbDataProvider
-from .strategy_factory import StrategyFactory
-from .operator import Operator
-from .worker import Worker
-from .demo_trader import DemoTrader
+from ..config import Config
+from ..log_manager import LogManager
+from ..analyzer import Analyzer
+from ..trader.upbit_trader import UpbitTrader
+from ..data.upbit_data_provider import UpbitDataProvider
+from ..trader.bithumb_trader import BithumbTrader
+from ..data.bithumb_data_provider import BithumbDataProvider
+from ..strategy.strategy_factory import StrategyFactory
+from ..operator import Operator
+from ..worker import Worker
+from ..trader.demo_trader import DemoTrader
 
 load_dotenv()
 

smtm/binance_data_provider.py → smtm/data/binance_data_provider.py

@@ -2,9 +2,9 @@
 
 from datetime import datetime, timezone, timedelta
 import requests
-from .date_converter import DateConverter
+from ..date_converter import DateConverter
 from .data_provider import DataProvider
-from .log_manager import LogManager
+from ..log_manager import LogManager
 
 
 class BinanceDataProvider(DataProvider):

smtm/bithumb_data_provider.py → smtm/data/bithumb_data_provider.py

@@ -3,7 +3,7 @@
 from datetime import datetime, timezone, timedelta
 import requests
 from .data_provider import DataProvider
-from .log_manager import LogManager
+from ..log_manager import LogManager
 
 
 class BithumbDataProvider(DataProvider):

smtm/data_repository.py → smtm/data/data_repository.py

@@ -5,8 +5,8 @@
 import time
 from datetime import datetime, timedelta
 import requests
-from .log_manager import LogManager
-from .date_converter import DateConverter
+from ..log_manager import LogManager
+from ..date_converter import DateConverter
 from .database import Database
 
 

smtm/database.py → smtm/data/database.py

@@ -1,6 +1,6 @@
 """거래 데이터의 데이터베이스 역할의 Database 클래스"""
 import sqlite3
-from .log_manager import LogManager
+from ..log_manager import LogManager
 
 
 class Database:

smtm/simulation_data_provider.py → smtm/data/simulation_data_provider.py

@@ -2,7 +2,7 @@
 
 from datetime import datetime, timedelta
 from .data_provider import DataProvider
-from .log_manager import LogManager
+from ..log_manager import LogManager
 from .data_repository import DataRepository
 
 

smtm/upbit_data_provider.py → smtm/data/upbit_data_provider.py

@@ -2,7 +2,7 @@
 
 import requests
 from .data_provider import DataProvider
-from .log_manager import LogManager
+from ..log_manager import LogManager
 
 
 class UpbitDataProvider(DataProvider):

smtm/strategy_bnh.py → smtm/strategy/strategy_bnh.py

@@ -4,8 +4,8 @@
 import math
 from datetime import datetime
 from .strategy import Strategy
-from .log_manager import LogManager
-from .date_converter import DateConverter
+from ..log_manager import LogManager
+from ..date_converter import DateConverter
 
 
 class StrategyBuyAndHold(Strategy):

smtm/strategy_rsi.py → smtm/strategy/strategy_rsi.py

@@ -4,8 +4,8 @@
 from datetime import datetime
 import numpy as np
 from .strategy import Strategy
-from .log_manager import LogManager
-from .date_converter import DateConverter
+from ..log_manager import LogManager
+from ..date_converter import DateConverter
 
 
 class StrategyRsi(Strategy):

smtm/strategy_sma_0.py → smtm/strategy/strategy_sma_0.py

@@ -6,8 +6,8 @@
 import pandas as pd
 import numpy as np
 from .strategy import Strategy
-from .log_manager import LogManager
-from .date_converter import DateConverter
+from ..log_manager import LogManager
+from ..date_converter import DateConverter
 
 
 class StrategySma0(Strategy):

smtm/strategy_sma_ml.py → smtm/strategy/strategy_sma_ml.py

@@ -8,8 +8,8 @@
 import pandas as pd
 import numpy as np
 from .strategy import Strategy
-from .log_manager import LogManager
-from .date_converter import DateConverter
+from ..log_manager import LogManager
+from ..date_converter import DateConverter
 
 
 class StrategySmaMl(Strategy):

smtm/bithumb_trader.py → smtm/trader/bithumb_trader.py

@@ -12,9 +12,9 @@
 import hashlib
 import requests
 from dotenv import load_dotenv
-from .log_manager import LogManager
+from ..log_manager import LogManager
 from .trader import Trader
-from .worker import Worker
+from ..worker import Worker
 
 load_dotenv()
 

smtm/demo_trader.py → smtm/trader/demo_trader.py

@@ -2,9 +2,9 @@
 
 from datetime import datetime
 import requests
-from .log_manager import LogManager
+from ..log_manager import LogManager
 from .trader import Trader
-from .worker import Worker
+from ..worker import Worker
 
 
 class DemoTrader(Trader):

smtm/simulation_trader.py → smtm/trader/simulation_trader.py

@@ -1,6 +1,6 @@
 """시뮬레이션을 위한 가상 거래를 처리해주는 SimulationTrader 클래스"""
 
-from .log_manager import LogManager
+from ..log_manager import LogManager
 from .trader import Trader
 from .virtual_market import VirtualMarket
 

smtm/upbit_trader.py → smtm/trader/upbit_trader.py

@@ -10,9 +10,9 @@
 import requests
 import jwt  # PyJWT
 from dotenv import load_dotenv
-from .log_manager import LogManager
+from ..log_manager import LogManager
 from .trader import Trader
-from .worker import Worker
+from ..worker import Worker
 
 load_dotenv()
 

smtm/virtual_market.py → smtm/trader/virtual_market.py

@@ -1,8 +1,8 @@
 """업비트 거래소의 과거 거래 정보를 이용한 가상 거래소 역할의 VirtualMarket 클래스"""
 from datetime import datetime, timedelta
-from .config import Config
-from .data_repository import DataRepository
-from .log_manager import LogManager
+from ..config import Config
+from ..log_manager import LogManager
+from ..data.data_repository import DataRepository
 
 
 class VirtualMarket: