fix: Fixing package dependencies

adevinta · Jul 1, 2024 · 912cdc0 · 912cdc0
1 parent ac2c38e
commit 912cdc0
Show file tree

Hide file tree

Showing 22 changed files with 32 additions and 50 deletions.
diff --git a/anomalywatchdog/anomaly_features/create_features.py b/anomalywatchdog/anomaly_features/create_features.py
@@ -1,5 +1,5 @@
 import pandas as pd
-from loaders.package.d_anomaly_features\
+from anomalywatchdog.anomaly_features\
     .CalendarFeatureCreator import CalendarFeatureCreator
 
 

diff --git a/anomalywatchdog/anomaly_watchdog.py b/anomalywatchdog/anomaly_watchdog.py
@@ -1,14 +1,14 @@
-from loaders.package.a_data_treatment.data_handler\
+from anomalywatchdog.data_treatment.data_handler\
     import DataADHandler
-from loaders.package.a_data_treatment.input_checker\
+from anomalywatchdog.data_treatment.input_checker\
     import InputChecker
-from loaders.package.a_data_treatment.model_updater\
+from anomalywatchdog.data_treatment.model_updater\
     import ModelUpdater
-from loaders.package.c_engine.model_trainer\
+from anomalywatchdog.engine.model_trainer\
     import ModelTrainer
-from loaders.package.c_engine.model_predictor\
+from anomalywatchdog.engine.model_predictor\
     import ModelPredictor
-from loaders.package.d_anomaly_features.create_features\
+from anomalywatchdog.anomaly_features.create_features\
     import create_features
 import os.path as op
 import yaml

diff --git a/anomalywatchdog/data_treatment/model_updater.py b/anomalywatchdog/data_treatment/model_updater.py
@@ -1,5 +1,5 @@
 import pandas as pd
-from loaders.package.z_utils.kruskal_test_seasonality \
+from anomalywatchdog.utils.kruskal_test_seasonality \
     import kruskal_test_seasonality
 
 class ModelUpdater:

diff --git a/anomalywatchdog/engine/model_factory.py b/anomalywatchdog/engine/model_factory.py
@@ -1,10 +1,10 @@
-from loaders.package.b_modelling.autoencoder_lstm_model\
+from anomalywatchdog.modelling.autoencoder_lstm_model\
     import AutoEncoderLSTMModel
-from loaders.package.b_modelling.autoencoder_conv_model\
+from anomalywatchdog.modelling.autoencoder_conv_model\
     import AutoEncoderConvModel
-from loaders.package.b_modelling.prophet_model\
+from anomalywatchdog.modelling.prophet_model\
     import ProphetModel
-from loaders.package.b_modelling.auto_arima_model\
+from anomalywatchdog.modelling.auto_arima_model\
     import AutoArimaModel
 
 

diff --git a/anomalywatchdog/engine/model_trainer.py b/anomalywatchdog/engine/model_trainer.py
@@ -1,5 +1,5 @@
 import pandas as pd
-from loaders.package.c_engine.model_factory \
+from anomalywatchdog.engine.model_factory \
     import ModelFactory
 
 

diff --git a/anomalywatchdog/main.py b/anomalywatchdog/main.py
diff --git a/anomalywatchdog/modelling/auto_arima_model.py b/anomalywatchdog/modelling/auto_arima_model.py
@@ -1,6 +1,6 @@
-from loaders.package.b_modelling.abstract_model \
+from anomalywatchdog.modelling.abstract_model \
     import AnomalyDetectionModel
-from loaders.package.z_utils.create_fourier_terms \
+from anomalywatchdog.utils.create_fourier_terms \
     import create_fourier_terms
 import pandas as pd
 from pmdarima.arima import auto_arima

diff --git a/anomalywatchdog/modelling/autoencoder_conv_model.py b/anomalywatchdog/modelling/autoencoder_conv_model.py
@@ -1,6 +1,6 @@
-from loaders.package.b_modelling.abstract_model \
+from anomalywatchdog.modelling.abstract_model \
     import AnomalyDetectionModel
-from loaders.package.z_utils.create_sequences \
+from anomalywatchdog.utils.create_sequences \
     import create_sequences
 import pandas as pd
 import keras

diff --git a/anomalywatchdog/modelling/autoencoder_lstm_model.py b/anomalywatchdog/modelling/autoencoder_lstm_model.py
@@ -1,5 +1,5 @@
-from loaders.package.b_modelling.abstract_model import AnomalyDetectionModel
-from loaders.package.z_utils.create_sequences import create_sequences
+from anomalywatchdog.modelling.abstract_model import AnomalyDetectionModel
+from anomalywatchdog.utils.create_sequences import create_sequences
 import pandas as pd
 import keras
 from keras import layers

diff --git a/anomalywatchdog/modelling/prophet_model.py b/anomalywatchdog/modelling/prophet_model.py
@@ -1,4 +1,4 @@
-from loaders.package.b_modelling.abstract_model \
+from anomalywatchdog.modelling.abstract_model \
     import AnomalyDetectionModel
 import pandas as pd
 from prophet import Prophet

diff --git a/tests/data_treatment/test_data_handler.py b/tests/data_treatment/test_data_handler.py
@@ -1,5 +1,5 @@
 import pandas as pd
-from loaders.package.a_data_treatment.data_handler \
+from anomalywatchdog.data_treatment.data_handler \
     import DataADHandler
 
 

diff --git a/tests/data_treatment/test_input_checker.py b/tests/data_treatment/test_input_checker.py
@@ -1,5 +1,5 @@
 import pandas as pd
-from loaders.package.a_data_treatment.input_checker \
+from anomalywatchdog.data_treatment.input_checker \
     import InputChecker
 
 

diff --git a/tests/data_treatment/test_model_updater.py b/tests/data_treatment/test_model_updater.py
@@ -1,4 +1,4 @@
-from loaders.package.a_data_treatment.model_updater\
+from anomalywatchdog.data_treatment.model_updater\
     import ModelUpdater
 import pandas as pd
 

diff --git a/tests/engine/test_main_engine.py b/tests/engine/test_main_engine.py
@@ -1,7 +1,7 @@
 import pandas as pd
-from loaders.package.c_engine.model_trainer \
+from anomalywatchdog.engine.model_trainer \
     import ModelTrainer
-from loaders.package.c_engine.model_predictor \
+from anomalywatchdog.engine.model_predictor \
     import ModelPredictor
 
 MODELS_TO_USE = ["prophet", "auto_arima"]

diff --git a/tests/modelling/test_auto_arima_model.py b/tests/modelling/test_auto_arima_model.py
@@ -1,4 +1,4 @@
-from loaders.package.b_modelling.auto_arima_model \
+from anomalywatchdog.modelling.auto_arima_model \
     import AutoArimaModel
 import pandas as pd
 

diff --git a/tests/modelling/test_autoencoder_conv_model.py b/tests/modelling/test_autoencoder_conv_model.py
@@ -1,4 +1,4 @@
-from loaders.package.b_modelling.autoencoder_conv_model \
+from anomalywatchdog.modelling.autoencoder_conv_model \
     import AutoEncoderConvModel
 import pandas as pd
 

diff --git a/tests/modelling/test_autoencoder_lstm_model.py b/tests/modelling/test_autoencoder_lstm_model.py
@@ -1,4 +1,4 @@
-from loaders.package.b_modelling.autoencoder_lstm_model \
+from anomalywatchdog.modelling.autoencoder_lstm_model \
     import AutoEncoderLSTMModel
 import pandas as pd
 

diff --git a/tests/modelling/test_prophet_model.py b/tests/modelling/test_prophet_model.py
@@ -1,4 +1,4 @@
-from loaders.package.b_modelling.prophet_model \
+from anomalywatchdog.modelling.prophet_model \
     import ProphetModel
 import pandas as pd
 

diff --git a/tests/test_build.py b/tests/test_build.py
diff --git a/tests/utils/test_create_fourier_terms.py b/tests/utils/test_create_fourier_terms.py
@@ -1,5 +1,5 @@
 import pandas as pd
-from loaders.package.z_utils.create_fourier_terms \
+from anomalywatchdog.utils.create_fourier_terms \
     import create_fourier_terms
 
 

diff --git a/tests/utils/test_create_sequences.py b/tests/utils/test_create_sequences.py
@@ -1,6 +1,6 @@
 import pandas as pd
 import numpy as np
-from loaders.package.z_utils.create_sequences \
+from anomalywatchdog.utils.create_sequences \
     import create_sequences
 
 

diff --git a/tests/utils/test_kruskal_test_seasonality.py b/tests/utils/test_kruskal_test_seasonality.py
@@ -1,5 +1,5 @@
 import pandas as pd
-from loaders.package.z_utils.kruskal_test_seasonality \
+from anomalywatchdog.utils.kruskal_test_seasonality \
     import kruskal_test_seasonality