1. move the StorageEngine outof __init__ file

2. Add dependency

api-docs/conf.py

@@ -14,10 +14,11 @@
 import os
 import sys
 
-sys.path.insert(0, os.path.abspath('.'))
-sys.path.insert(0, os.path.abspath('..'))
-sys.path.insert(0, os.path.abspath('../src2/'))
-sys.path.insert(0, os.path.abspath('../src/'))
+sys.path.append(os.path.abspath('.'))
+sys.path.append(os.path.abspath('../'))
+
+#sys.path.insert(0, os.path.abspath('../src2/'))
+#sys.path.insert(0, os.path.abspath('../src/'))
 
 print('Sys paths:')
 for pathx in sys.path:

script/install/conda_eva_environment.yml

@@ -27,6 +27,8 @@ dependencies:
   - mock
   - pytest-asyncio
   - flake8
+  - sphinx 
+  - sphinx_rtd_theme
   - pip:
     - antlr4-python3-runtime==4.8
     - petastorm

src/executor/create_executor.py

@@ -17,7 +17,7 @@
 from src.planner.create_plan import CreatePlan
 from src.executor.abstract_executor import AbstractExecutor
 from src.utils.generic_utils import generate_file_path
-from src.storage import StorageEngine
+from src.storage.storage_engine import StorageEngine
 
 
 class CreateExecutor(AbstractExecutor):

src/executor/insert_executor.py

@@ -19,7 +19,7 @@
 from src.catalog.column_type import ColumnType
 from src.planner.insert_plan import InsertPlan
 from src.executor.abstract_executor import AbstractExecutor
-from src.storage import StorageEngine
+from src.storage.storage_engine import StorageEngine
 from src.utils.logging_manager import LoggingLevel
 from src.utils.logging_manager import LoggingManager
 

src/executor/load_executor.py

@@ -15,7 +15,7 @@
 
 from src.planner.load_data_plan import LoadDataPlan
 from src.executor.abstract_executor import AbstractExecutor
-from src.storage import StorageEngine
+from src.storage.storage_engine import StorageEngine
 from src.readers.opencv_reader import OpenCVReader
 
 

src/executor/storage_executor.py

@@ -16,7 +16,7 @@
 from src.models.storage.batch import Batch
 from src.executor.abstract_executor import AbstractExecutor
 from src.planner.storage_plan import StoragePlan
-from src.storage import StorageEngine
+from src.storage.storage_engine import StorageEngine
 
 
 class StorageExecutor(AbstractExecutor):

src/storage/__init__.py

@@ -15,9 +15,4 @@
 """
 storage subdirectory
 """
-from src.configuration.configuration_manager import ConfigurationManager
-from src.utils.generic_utils import str_to_class
 
-StorageEngine = str_to_class(
-    ConfigurationManager().get_value(
-        "storage", "engine"))()

src/storage/storage_engine.py

@@ -0,0 +1,6 @@
+from src.configuration.configuration_manager import ConfigurationManager
+from src.utils.generic_utils import str_to_class
+
+StorageEngine = str_to_class(
+    ConfigurationManager().get_value(
+        "storage", "engine"))()

test/integration_tests/test_load_executor.py

@@ -18,7 +18,7 @@
 
 from src.catalog.catalog_manager import CatalogManager
 from src.models.storage.batch import Batch
-from src.storage import StorageEngine
+from src.storage.storage_engine import StorageEngine
 
 from test.util import create_sample_video, create_dummy_batches, perform_query