fix import path

idanya · Dec 28, 2022 · 169cf43 · 169cf43
1 parent da025cd
commit 169cf43
Show file tree

Hide file tree

Showing 99 changed files with 539 additions and 523 deletions.
diff --git a/scripts/test-setup.sh b/scripts/test-setup.sh
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-export PYTHONPATH=$PYTHONPATH:../src/algotrader:../tests
+export PYTHONPATH=$PYTHONPATH:../src:../tests
diff --git a/src/algotrader/calc/technicals.py b/src/algotrader/calc/technicals.py
@@ -5,7 +5,7 @@
 import numpy as np
 import tulipy as ti
 
-from entities.candle import Candle
+from algotrader.entities.candle import Candle
 
 
 class TechnicalCalculator:

diff --git a/src/algotrader/cli/pipeline.py b/src/algotrader/cli/pipeline.py
@@ -2,9 +2,9 @@
 
 import typer
 
-from pipeline.pipeline import Pipeline
-from pipeline.runner import PipelineRunner
-from serialization.store import DeserializationService
+from algotrader.pipeline.pipeline import Pipeline
+from algotrader.pipeline.runner import PipelineRunner
+from algotrader.serialization.store import DeserializationService
 
 app = typer.Typer(no_args_is_help=True)
 

diff --git a/src/algotrader/cli/processors.py b/src/algotrader/cli/processors.py
@@ -1,7 +1,7 @@
 import typer
 
 from cli.helpers import _describe_object, _get_all_of_class_names, _get_single_by_name
-from pipeline.processor import Processor
+from algotrader.pipeline.processor import Processor
 
 app = typer.Typer(no_args_is_help=True)
 

diff --git a/src/algotrader/cli/sources.py b/src/algotrader/cli/sources.py
@@ -1,7 +1,7 @@
 import typer
 
 from cli.helpers import _describe_object, _get_all_of_class_names, _get_single_by_name
-from pipeline.source import Source
+from algotrader.pipeline.source import Source
 
 app = typer.Typer(no_args_is_help=True)
 

diff --git a/src/algotrader/cli/strategies.py b/src/algotrader/cli/strategies.py
@@ -1,7 +1,7 @@
 import typer
 
 from cli.helpers import _describe_object, _get_all_of_class_names, _get_single_by_name
-from entities.strategy import Strategy
+from algotrader.entities.strategy import Strategy
 
 app = typer.Typer(no_args_is_help=True)
 

diff --git a/src/algotrader/entities/bucket.py b/src/algotrader/entities/bucket.py
@@ -2,7 +2,7 @@
 
 from typing import Dict, List, Union
 
-from entities.serializable import Serializable, Deserializable
+from algotrader.entities.serializable import Serializable, Deserializable
 
 
 class Bucket(Serializable, Deserializable):

diff --git a/src/algotrader/entities/bucketscontainer.py b/src/algotrader/entities/bucketscontainer.py
@@ -2,9 +2,9 @@
 
 from typing import Dict, Optional, ItemsView
 
-from entities.bucket import Bucket, CompoundBucketList
-from entities.serializable import Serializable, Deserializable
-from serialization.store import DeserializationService
+from algotrader.entities.bucket import Bucket, CompoundBucketList
+from algotrader.entities.serializable import Serializable, Deserializable
+from algotrader.serialization.store import DeserializationService
 
 
 class BucketsContainer(Serializable, Deserializable):

diff --git a/src/algotrader/entities/candle.py b/src/algotrader/entities/candle.py
@@ -3,10 +3,10 @@
 from datetime import datetime
 from typing import Callable, Dict, Optional
 
-from entities.candle_attachments import CandleAttachments
-from entities.serializable import Serializable, Deserializable
-from entities.timespan import TimeSpan
-from serialization.store import DeserializationService
+from algotrader.entities.candle_attachments import CandleAttachments
+from algotrader.entities.serializable import Serializable, Deserializable
+from algotrader.entities.timespan import TimeSpan
+from algotrader.serialization.store import DeserializationService
 
 timestamp_to_str: Callable[[datetime], str] = lambda d: d.strftime("%Y%m%d %H:%M:%S.%f")
 str_to_timestamp: Callable[[str], datetime] = lambda d: datetime.strptime(d, "%Y%m%d %H:%M:%S.%f")

diff --git a/src/algotrader/entities/candle_attachments.py b/src/algotrader/entities/candle_attachments.py
@@ -2,8 +2,8 @@
 
 from typing import Dict, Optional
 
-from entities.serializable import Serializable, Deserializable
-from serialization.store import DeserializationService
+from algotrader.entities.serializable import Serializable, Deserializable
+from algotrader.serialization.store import DeserializationService
 
 
 class CandleAttachments(Serializable, Deserializable):

diff --git a/src/algotrader/entities/generic_candle_attachment.py b/src/algotrader/entities/generic_candle_attachment.py
@@ -2,7 +2,7 @@
 
 from typing import Dict, TypeVar, Generic, Optional, ItemsView, Union
 
-from entities.serializable import Serializable, Deserializable
+from algotrader.entities.serializable import Serializable, Deserializable
 
 T = TypeVar('T')
 

diff --git a/src/algotrader/entities/strategy.py b/src/algotrader/entities/strategy.py
@@ -3,10 +3,10 @@
 from abc import abstractmethod
 from typing import List
 
-from entities.candle import Candle
-from entities.serializable import Deserializable, Serializable
-from entities.strategy_signal import StrategySignal
-from pipeline.shared_context import SharedContext
+from algotrader.entities.candle import Candle
+from algotrader.entities.serializable import Deserializable, Serializable
+from algotrader.entities.strategy_signal import StrategySignal
+from algotrader.pipeline.shared_context import SharedContext
 
 
 class Strategy(Serializable, Deserializable):

diff --git a/src/algotrader/examples/pipeline-templates/backtest_history_buckets_backtester.json b/src/algotrader/examples/pipeline-templates/backtest_history_buckets_backtester.json
@@ -1,9 +1,9 @@
 {
-  "__class__": "pipeline.pipeline:Pipeline",
+  "__class__": "algotrader.pipeline.pipeline:Pipeline",
   "source": {
-    "__class__": "pipeline.sources.mongodb_source:MongoDBSource",
+    "__class__": "algotrader.pipeline.sources.mongodb_source:MongoDBSource",
     "mongo_storage": {
-      "__class__": "storage.mongodb_storage:MongoDBStorage",
+      "__class__": "algotrader.storage.mongodb_storage:MongoDBStorage",
       "host": "localhost",
       "port": 27017,
       "database": "algo-trader",
@@ -512,21 +512,21 @@
     "to_time": "2022-01-01 00:00:00"
   },
   "processor": {
-    "__class__": "pipeline.processors.technicals:TechnicalsProcessor",
+    "__class__": "algotrader.pipeline.processors.technicals:TechnicalsProcessor",
     "next_processor": {
-      "__class__": "pipeline.processors.technicals_normalizer:TechnicalsNormalizerProcessor",
+      "__class__": "algotrader.pipeline.processors.technicals_normalizer:TechnicalsNormalizerProcessor",
       "next_processor": {
-        "__class__": "pipeline.processors.technicals_buckets_matcher:TechnicalsBucketsMatcher",
+        "__class__": "algotrader.pipeline.processors.technicals_buckets_matcher:TechnicalsBucketsMatcher",
         "next_processor": {
-          "__class__": "pipeline.processors.strategy:StrategyProcessor",
+          "__class__": "algotrader.pipeline.processors.strategy:StrategyProcessor",
           "next_processor": {
-            "__class__": "pipeline.processors.candle_cache:CandleCache"
+            "__class__": "algotrader.pipeline.processors.candle_cache:CandleCache"
           },
           "strategies": [
             {
-              "__class__": "pipeline.strategies.history_bucket_compare:HistoryBucketCompareStrategy",
+              "__class__": "algotrader.pipeline.strategies.history_bucket_compare:HistoryBucketCompareStrategy",
               "storage_provider": {
-                "__class__": "storage.mongodb_storage:MongoDBStorage",
+                "__class__": "algotrader.storage.mongodb_storage:MongoDBStorage",
                 "host": "localhost",
                 "port": 27017,
                 "database": "algo-trader",
@@ -553,10 +553,10 @@
             }
           ],
           "signals_executor": {
-            "__class__": "trade.simple_sum_signals_executor:SimpleSumSignalsExecutor"
+            "__class__": "algotrader.trade.simple_sum_signals_executor:SimpleSumSignalsExecutor"
           }
         },
-        "bins_file_path": "/Users/idanyael/personal-dev/algo-trader/src/examples/pipeline-templates/bins.json"
+        "bins_file_path": "/Users/idanyael/personal-dev/algo-trader/src/algotrader/examples/pipeline-templates/bins.json"
       },
       "normalization_window_size": 3
     }

diff --git a/src/algotrader/examples/pipeline-templates/backtest_history_similarity_backtester.json b/src/algotrader/examples/pipeline-templates/backtest_history_similarity_backtester.json
@@ -1,9 +1,9 @@
 {
-  "__class__": "pipeline.pipeline:Pipeline",
+  "__class__": "algotrader.pipeline.pipeline:Pipeline",
   "source": {
-    "__class__": "pipeline.sources.mongodb_source:MongoDBSource",
+    "__class__": "algotrader.pipeline.sources.mongodb_source:MongoDBSource",
     "mongo_storage": {
-      "__class__": "storage.mongodb_storage:MongoDBStorage",
+      "__class__": "algotrader.storage.mongodb_storage:MongoDBStorage",
       "host": "localhost",
       "port": 27017,
       "database": "algo-trader",
@@ -512,21 +512,21 @@
     "to_time": "2022-01-01 00:00:00"
   },
   "processor": {
-    "__class__": "pipeline.processors.technicals:TechnicalsProcessor",
+    "__class__": "algotrader.pipeline.processors.technicals:TechnicalsProcessor",
     "next_processor": {
-      "__class__": "pipeline.processors.technicals_normalizer:TechnicalsNormalizerProcessor",
+      "__class__": "algotrader.pipeline.processors.technicals_normalizer:TechnicalsNormalizerProcessor",
       "next_processor": {
-        "__class__": "pipeline.processors.technicals_buckets_matcher:TechnicalsBucketsMatcher",
+        "__class__": "algotrader.pipeline.processors.technicals_buckets_matcher:TechnicalsBucketsMatcher",
         "next_processor": {
-          "__class__": "pipeline.processors.strategy:StrategyProcessor",
+          "__class__": "algotrader.pipeline.processors.strategy:StrategyProcessor",
           "next_processor": {
-            "__class__": "pipeline.processors.candle_cache:CandleCache"
+            "__class__": "algotrader.pipeline.processors.candle_cache:CandleCache"
           },
           "strategies": [
             {
-              "__class__": "pipeline.strategies.history_cosine_similarity:HistoryCosineSimilarityStrategy",
+              "__class__": "algotrader.pipeline.strategies.history_cosine_similarity:HistoryCosineSimilarityStrategy",
               "storage_provider": {
-                "__class__": "storage.mongodb_storage:MongoDBStorage",
+                "__class__": "algotrader.storage.mongodb_storage:MongoDBStorage",
                 "host": "localhost",
                 "port": 27017,
                 "database": "algo-trader",
@@ -552,10 +552,10 @@
             }
           ],
           "signals_executor": {
-            "__class__": "trade.simple_sum_signals_executor:SimpleSumSignalsExecutor"
+            "__class__": "algotrader.trade.simple_sum_signals_executor:SimpleSumSignalsExecutor"
           }
         },
-        "bins_file_path": "/Users/idanyael/personal-dev/algo-trader/src/examples/pipeline-templates/bins.json"
+        "bins_file_path": "/Users/idanyael/personal-dev/algo-trader/src/algotrader/examples/pipeline-templates/bins.json"
       },
       "normalization_window_size": 3
     }

diff --git a/src/algotrader/examples/pipeline-templates/backtest_mongo_source_rsi_strategy.json b/src/algotrader/examples/pipeline-templates/backtest_mongo_source_rsi_strategy.json
@@ -1,9 +1,9 @@
 {
-  "__class__": "pipeline.pipeline:Pipeline",
+  "__class__": "algotrader.pipeline.pipeline:Pipeline",
   "source": {
-    "__class__": "pipeline.sources.mongodb_source:MongoDBSource",
+    "__class__": "algotrader.pipeline.sources.mongodb_source:MongoDBSource",
     "mongo_storage": {
-      "__class__": "storage.mongodb_storage:MongoDBStorage",
+      "__class__": "algotrader.storage.mongodb_storage:MongoDBStorage",
       "host": "localhost",
       "port": 27017,
       "database": "algo-trader",
@@ -512,21 +512,21 @@
     "to_time": "2022-01-01 00:00:00"
   },
   "processor": {
-    "__class__": "pipeline.processors.technicals:TechnicalsProcessor",
+    "__class__": "algotrader.pipeline.processors.technicals:TechnicalsProcessor",
     "next_processor": {
-      "__class__": "pipeline.processors.technicals:TechnicalsProcessor",
+      "__class__": "algotrader.pipeline.processors.technicals:TechnicalsProcessor",
       "next_processor": {
-        "__class__": "pipeline.processors.strategy:StrategyProcessor",
+        "__class__": "algotrader.pipeline.processors.strategy:StrategyProcessor",
         "next_processor": {
-          "__class__": "pipeline.processors.candle_cache:CandleCache"
+          "__class__": "algotrader.pipeline.processors.candle_cache:CandleCache"
         },
         "strategies": [
           {
-            "__class__": "pipeline.strategies.connors_rsi2:ConnorsRSI2"
+            "__class__": "algotrader.pipeline.strategies.connors_rsi2:ConnorsRSI2"
           }
         ],
         "signals_executor": {
-          "__class__": "trade.simple_sum_signals_executor:SimpleSumSignalsExecutor"
+          "__class__": "algotrader.trade.simple_sum_signals_executor:SimpleSumSignalsExecutor"
         }
       }
     }

diff --git a/src/algotrader/examples/pipeline-templates/backtest_technicals_with_buckets_calculator.json b/src/algotrader/examples/pipeline-templates/backtest_technicals_with_buckets_calculator.json
@@ -1,9 +1,9 @@
 {
-  "__class__": "pipeline.pipeline:Pipeline",
+  "__class__": "algotrader.pipeline.pipeline:Pipeline",
   "source": {
-    "__class__": "pipeline.sources.mongodb_source:MongoDBSource",
+    "__class__": "algotrader.pipeline.sources.mongodb_source:MongoDBSource",
     "mongo_storage": {
-      "__class__": "storage.mongodb_storage:MongoDBStorage",
+      "__class__": "algotrader.storage.mongodb_storage:MongoDBStorage",
       "host": "localhost",
       "port": 27017,
       "database": "algo-trader",
@@ -512,19 +512,19 @@
     "to_time": "2022-01-01 00:00:00"
   },
   "processor": {
-    "__class__": "pipeline.processors.timespan_change:TimeSpanChangeProcessor",
+    "__class__": "algotrader.pipeline.processors.timespan_change:TimeSpanChangeProcessor",
     "next_processor": {
-      "__class__": "pipeline.processors.technicals:TechnicalsProcessor",
+      "__class__": "algotrader.pipeline.processors.technicals:TechnicalsProcessor",
       "next_processor": {
-        "__class__": "pipeline.processors.technicals_normalizer:TechnicalsNormalizerProcessor",
+        "__class__": "algotrader.pipeline.processors.technicals_normalizer:TechnicalsNormalizerProcessor",
         "next_processor": {
-          "__class__": "pipeline.processors.assets_correlation:AssetCorrelationProcessor",
+          "__class__": "algotrader.pipeline.processors.assets_correlation:AssetCorrelationProcessor",
           "next_processor": {
-            "__class__": "pipeline.processors.candle_cache:CandleCache",
+            "__class__": "algotrader.pipeline.processors.candle_cache:CandleCache",
             "next_processor": {
-              "__class__": "pipeline.processors.storage_provider_sink:StorageSinkProcessor",
+              "__class__": "algotrader.pipeline.processors.storage_provider_sink:StorageSinkProcessor",
               "storage_provider": {
-                "__class__": "storage.mongodb_storage:MongoDBStorage",
+                "__class__": "algotrader.storage.mongodb_storage:MongoDBStorage",
                 "host": "localhost",
                 "port": 27017,
                 "database": "algo-trader",
@@ -539,7 +539,7 @@
     }
   },
   "terminator": {
-    "__class__": "pipeline.terminators.technicals_binner:TechnicalsBinner",
+    "__class__": "algotrader.pipeline.terminators.technicals_binner:TechnicalsBinner",
     "symbols": [
       "A",
       "AAL",
@@ -1038,6 +1038,6 @@
       "ZTS"
     ],
     "bins_count": 10,
-    "output_file_path": "/Users/idanyael/personal-dev/algo-trader/src/examples/pipeline-templates/bins.json"
+    "output_file_path": "/Users/idanyael/personal-dev/algo-trader/src/algotrader/examples/pipeline-templates/bins.json"
   }
 }
diff --git a/src/algotrader/examples/pipeline-templates/build_daily_binance_loader.json b/src/algotrader/examples/pipeline-templates/build_daily_binance_loader.json
@@ -1,7 +1,7 @@
 {
-  "__class__": "pipeline.pipeline:Pipeline",
+  "__class__": "algotrader.pipeline.pipeline:Pipeline",
   "source": {
-    "__class__": "pipeline.sources.binance_history:BinanceHistorySource",
+    "__class__": "algotrader.pipeline.sources.binance_history:BinanceHistorySource",
     "binanceProvider": {
       "apiKey": "",
       "apiSecret": "",
@@ -15,13 +15,13 @@
     "endTime": 1640988000.0
   },
   "processor": {
-    "__class__": "pipeline.processors.technicals:TechnicalsProcessor",
+    "__class__": "algotrader.pipeline.processors.technicals:TechnicalsProcessor",
     "next_processor": {
-      "__class__": "pipeline.processors.candle_cache:CandleCache",
+      "__class__": "algotrader.pipeline.processors.candle_cache:CandleCache",
       "next_processor": {
-        "__class__": "pipeline.processors.storage_provider_sink:StorageSinkProcessor",
+        "__class__": "algotrader.pipeline.processors.storage_provider_sink:StorageSinkProcessor",
         "storage_provider": {
-          "__class__": "storage.mongodb_storage:MongoDBStorage",
+          "__class__": "algotrader.storage.mongodb_storage:MongoDBStorage",
           "host": "localhost",
           "port": 27017,
           "database": "algo-trader",

diff --git a/src/algotrader/examples/pipeline-templates/build_daily_yahoo_loader.json b/src/algotrader/examples/pipeline-templates/build_daily_yahoo_loader.json
@@ -1,7 +1,7 @@
 {
-  "__class__": "pipeline.pipeline:Pipeline",
+  "__class__": "algotrader.pipeline.pipeline:Pipeline",
   "source": {
-    "__class__": "pipeline.sources.yahoo_finance_history:YahooFinanceHistorySource",
+    "__class__": "algotrader.pipeline.sources.yahoo_finance_history:YahooFinanceHistorySource",
     "symbols": [
       "A",
       "AAL",
@@ -507,13 +507,13 @@
     "sort_all": false
   },
   "processor": {
-    "__class__": "pipeline.processors.technicals:TechnicalsProcessor",
+    "__class__": "algotrader.pipeline.processors.technicals:TechnicalsProcessor",
     "next_processor": {
-      "__class__": "pipeline.processors.candle_cache:CandleCache",
+      "__class__": "algotrader.pipeline.processors.candle_cache:CandleCache",
       "next_processor": {
-        "__class__": "pipeline.processors.storage_provider_sink:StorageSinkProcessor",
+        "__class__": "algotrader.pipeline.processors.storage_provider_sink:StorageSinkProcessor",
         "storage_provider": {
-          "__class__": "storage.mongodb_storage:MongoDBStorage",
+          "__class__": "algotrader.storage.mongodb_storage:MongoDBStorage",
           "host": "localhost",
           "port": 27017,
           "database": "algo-trader",