progress 0.0.9

lib/live/mkt_data_client.py

@@ -5,13 +5,13 @@ from typing import Dict, Any, List, Optional, Set
 
 import requests
 
-from cvttpy_tools.base import NamedObject
-from cvttpy_tools.logger import Log
-from cvttpy_tools.config import Config
-from cvttpy_tools.timer import Timer
-from cvttpy_tools.timeutils import NanosT, current_seconds
+from cvttpy_tools.base.base import NamedObject
+from cvttpy_tools.base.logger import Log
+from cvttpy_tools.base.config import Config
+from cvttpy_tools.base.timer import Timer
+from cvttpy_tools.base.timeutils import NanosT, current_seconds
 from cvttpy_tools.settings.cvtt_types import InstrumentIdT, IntervalSecT
-from cvttpy_tools.web.rest_client import RESTSender
+from cvttpy_tools.comm.web.rest_client import RESTSender
 # ---
 from cvttpy_trading.trading.instrument import ExchangeInstrument
 from cvttpy_trading.trading.accounting.exch_account import ExchangeAccountNameT

lib/live/rest_client.py.md

@@ -6,7 +6,7 @@ import time
 
 import requests
 
-from cvttpy_tools.base import NamedObject
+from cvttpy_tools.base.base import NamedObject
 
 class RESTSender(NamedObject):
     session_: requests.Session

lib/live/ti_sender.py

@@ -3,10 +3,10 @@ from enum import Enum
 import requests
 
 # import aiohttp
-from cvttpy_tools.base import NamedObject
-from cvttpy_tools.config import Config
-from cvttpy_tools.logger import Log
-from cvttpy_tools.web.rest_client import RESTSender
+from cvttpy_tools.base.base import NamedObject
+from cvttpy_tools.base.config import Config
+from cvttpy_tools.base.logger import Log
+from cvttpy_tools.comm.web.rest_client import RESTSender
 # ---
 from cvttpy_trading.trading.trading_instructions import TradingInstructions
 # ---

lib/pt_strategy/live/live_strategy.py

@@ -5,12 +5,12 @@ from typing import Any, Dict, List, Optional
 import pandas as pd
 
 # ---
-from cvttpy_tools.base import NamedObject
-from cvttpy_tools.app import App
-from cvttpy_tools.config import Config
+from cvttpy_tools.base.base import NamedObject
+from cvttpy_tools.base.app import App
+from cvttpy_tools.base.config import Config
 from cvttpy_tools.settings.cvtt_types import IntervalSecT
-from cvttpy_tools.timeutils import NanosT, SecPerHour, current_nanoseconds, NanoPerSec, format_nanos_utc
-from cvttpy_tools.logger import Log
+from cvttpy_tools.base.timeutils import NanosT, SecPerHour, current_nanoseconds, NanoPerSec, format_nanos_utc
+from cvttpy_tools.base.logger import Log
 
 # ---
 from cvttpy_trading.trading.instrument import ExchangeInstrument

lib/pt_strategy/model_data_policy.py

@@ -8,7 +8,7 @@ from typing import Any, Dict, Optional, cast
 import numpy as np
 import pandas as pd
 
-from cvttpy_tools.config import Config
+from cvttpy_tools.base.config import Config
 
 @dataclass
 class DataWindowParams:

lib/pt_strategy/pt_market_data.py

@@ -6,8 +6,8 @@ from typing import Any, Dict, List, Optional
 import pandas as pd
 
 # ---
-from cvttpy_tools.base import NamedObject
-from cvttpy_tools.config import Config
+from cvttpy_tools.base.base import NamedObject
+from cvttpy_tools.base.config import Config
 from cvttpy_tools.settings.cvtt_types import JsonDictT
 
 # ---

lib/pt_strategy/pt_model.py

@@ -4,7 +4,7 @@ from abc import ABC, abstractmethod
 from typing import Any, Dict, cast
 
 # ---
-from cvttpy_tools.config import Config
+from cvttpy_tools.base.config import Config
 # ---
 from pairs_trading.lib.pt_strategy.prediction import Prediction
 from pairs_trading.lib.pt_strategy.trading_pair import TradingPair

lib/pt_strategy/research_strategy.py

@@ -4,7 +4,7 @@ from typing import Any, Dict, List, Optional, Tuple
 
 import pandas as pd
 # ---
-from cvttpy_tools.config import Config
+from cvttpy_tools.base.config import Config
 # ---
 from cvttpy_trading.trading.instrument import ExchangeInstrument
 # ---

lib/pt_strategy/results.py

@@ -5,7 +5,7 @@ from typing import Any, Dict, List, Optional, Tuple
 
 import pandas as pd
 # ---
-from cvttpy_tools.config import Config
+from cvttpy_tools.base.config import Config
 # ---
 from cvttpy_trading.trading.instrument import ExchangeInstrument
 # ---

lib/pt_strategy/trading_pair.py

@@ -8,8 +8,8 @@ from typing import Any, Dict, List
 import pandas as pd
 
 # ---
-from cvttpy_tools.base import NamedObject
-from cvttpy_tools.config import Config
+from cvttpy_tools.base.base import NamedObject
+from cvttpy_tools.base.config import Config
 # ---
 from cvttpy_trading.trading.instrument import ExchangeInstrument
 # ---

lib/tools/config.py

@@ -2,7 +2,7 @@ import hjson
 from typing import Dict
 from datetime import datetime
 # ---
-from cvttpy_tools.config import Config
+from cvttpy_tools.base.config import Config
 
 
 def load_config(config_path: str) -> Config:

lib/tools/filetools.py

@@ -2,7 +2,7 @@ import os
 import glob
 from typing import Dict, List, Tuple
 # ---
-from cvttpy_tools.config import Config
+from cvttpy_tools.base.config import Config
 # ---
 from cvttpy_trading.trading.instrument import ExchangeInstrument