modify directory structure

sapientml · Aug 10, 2023 · 2ada5fa · 2ada5fa
1 parent a89f907
commit 2ada5fa
Show file tree

Hide file tree

Showing 80 changed files with 44 additions and 21 deletions.
diff --git a/.pysen/pyproject.toml b/.pysen/pyproject.toml
@@ -0,0 +1,16 @@
+[tool]
+[tool.black] # automatically generated by pysen
+# pysen ignores and overwrites any modifications
+line-length = 120
+target-version = ["py310"]
+
+[tool.isort] # automatically generated by pysen
+# pysen ignores and overwrites any modifications
+default_section = "THIRDPARTY"
+ensure_newline_before_comments = true
+force_grid_wrap = 0
+force_single_line = false
+include_trailing_comma = true
+line_length = 120
+multi_line_output = 3
+use_parentheses = true
diff --git a/.pysen/setup.cfg b/.pysen/setup.cfg
@@ -0,0 +1,11 @@
+[flake8]
+# automatically generated by pysen
+# pysen ignores and overwrites any modifications
+# e203: black treats : as a binary operator
+# e231: black doesn't put a space after ,
+# e501: black may exceed the line-length to follow other style rules
+# w503 or w504: either one needs to be disabled to select w error codes
+ignore = E203,E231,E501,W503
+max-line-length = 120
+select = B,B950,C,E,F,W
+
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -9,8 +9,8 @@ include = ["core/**/*.py", "templates/**/*.py.jinja"]
 [tool.poetry.dependencies]
 python = ">=3.9,<3.13"
 sapientml = "^0.1.4"
-sapientml-loaddata = "^0.1.0"
-sapientml-preprocess = "^0.1.0"
+sapientml-loaddata = "^0.1.2"
+sapientml-preprocess = "^0.1.2"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.4.0"
@@ -27,7 +27,7 @@ requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.plugins."pipeline_generator"]
-sapientml_core = "core:SapientMLGenerator"
+sapientml_core = "sapientml_core:SapientMLGenerator"
 
 [tool.pysen]
 version = "0.10"

diff --git a/core/__init__.py → sapientml_core/__init__.py b/core/__init__.py → sapientml_core/__init__.py
diff --git a/core/adaptation/__init__.py → sapientml_core/adaptation/__init__.py b/core/adaptation/__init__.py → sapientml_core/adaptation/__init__.py
diff --git a/core/adaptation/artifacts/label_order.json → ...ore/adaptation/artifacts/label_order.json b/core/adaptation/artifacts/label_order.json → ...ore/adaptation/artifacts/label_order.json
diff --git a/core/adaptation/generation/__init__.py → ...ml_core/adaptation/generation/__init__.py b/core/adaptation/generation/__init__.py → ...ml_core/adaptation/generation/__init__.py
diff --git a/...daptation/generation/pipeline_template.py → ...daptation/generation/pipeline_template.py b/...daptation/generation/pipeline_template.py → ...daptation/generation/pipeline_template.py
@@ -28,7 +28,7 @@
 
 logger = logging.getLogger("sapientml")
 env = Environment(
-    loader=FileSystemLoader(f"{os.path.dirname(__file__)}/../../../templates"), trim_blocks=True
+    loader=FileSystemLoader(f"{os.path.dirname(__file__)}/../../templates"), trim_blocks=True
 )
 
 MODEL_IMPORT_LIBRARY_MAP = {

diff --git a/core/adaptation/generation/predicate.py → ...l_core/adaptation/generation/predicate.py b/core/adaptation/generation/predicate.py → ...l_core/adaptation/generation/predicate.py
diff --git a/...ptation/generation/preprocessing_label.py → ...ptation/generation/preprocessing_label.py b/...ptation/generation/preprocessing_label.py → ...ptation/generation/preprocessing_label.py
diff --git a/...n/generation/template_based_adaptation.py → ...n/generation/template_based_adaptation.py b/...n/generation/template_based_adaptation.py → ...n/generation/template_based_adaptation.py
diff --git a/core/design/__init__.py → sapientml_core/design/__init__.py b/core/design/__init__.py → sapientml_core/design/__init__.py
diff --git a/core/design/search_space.py → sapientml_core/design/search_space.py b/core/design/search_space.py → sapientml_core/design/search_space.py
diff --git a/core/enums.py → sapientml_core/enums.py b/core/enums.py → sapientml_core/enums.py
diff --git a/core/generator.py → sapientml_core/generator.py b/core/generator.py → sapientml_core/generator.py
diff --git a/core/meta_features.py → sapientml_core/meta_features.py b/core/meta_features.py → sapientml_core/meta_features.py
diff --git a/core/models/feature_importance.json → ...entml_core/models/feature_importance.json b/core/models/feature_importance.json → ...entml_core/models/feature_importance.json
diff --git a/core/models/mp_model_1.pkl → sapientml_core/models/mp_model_1.pkl b/core/models/mp_model_1.pkl → sapientml_core/models/mp_model_1.pkl
diff --git a/core/models/mp_model_2.pkl → sapientml_core/models/mp_model_2.pkl b/core/models/mp_model_2.pkl → sapientml_core/models/mp_model_2.pkl
diff --git a/core/models/pp_models.pkl → sapientml_core/models/pp_models.pkl b/core/models/pp_models.pkl → sapientml_core/models/pp_models.pkl
diff --git a/core/params.py → sapientml_core/params.py b/core/params.py → sapientml_core/params.py
diff --git a/core/ps_macros.py → sapientml_core/ps_macros.py b/core/ps_macros.py → sapientml_core/ps_macros.py
diff --git a/core/seeding/__init__.py → sapientml_core/seeding/__init__.py b/core/seeding/__init__.py → sapientml_core/seeding/__init__.py
diff --git a/core/seeding/predictor.py → sapientml_core/seeding/predictor.py b/core/seeding/predictor.py → sapientml_core/seeding/predictor.py
diff --git a/...lity_templates/component_description.json → ...lity_templates/component_description.json b/...lity_templates/component_description.json → ...lity_templates/component_description.json
diff --git a/...lity_templates/model_explanation.py.jinja → ...lity_templates/model_explanation.py.jinja b/...lity_templates/model_explanation.py.jinja → ...lity_templates/model_explanation.py.jinja
diff --git a/...plates/preprocessing_explanation.py.jinja → ...plates/preprocessing_explanation.py.jinja b/...plates/preprocessing_explanation.py.jinja → ...plates/preprocessing_explanation.py.jinja
diff --git a/...mplates/classification_post_process.jinja → ...mplates/classification_post_process.jinja b/...mplates/classification_post_process.jinja → ...mplates/classification_post_process.jinja
diff --git a/..._templates/hyperparameter_tuning.py.jinja → ..._templates/hyperparameter_tuning.py.jinja b/..._templates/hyperparameter_tuning.py.jinja → ..._templates/hyperparameter_tuning.py.jinja
diff --git a/.../model_templates/hyperparameters.py.jinja → .../model_templates/hyperparameters.py.jinja b/.../model_templates/hyperparameters.py.jinja → .../model_templates/hyperparameters.py.jinja
diff --git a/...es/hyperparameters_default_value.py.jinja → ...es/hyperparameters_default_value.py.jinja b/...es/hyperparameters_default_value.py.jinja → ...es/hyperparameters_default_value.py.jinja
diff --git a/templates/model_templates/model.py.jinja → .../templates/model_templates/model.py.jinja b/templates/model_templates/model.py.jinja → .../templates/model_templates/model.py.jinja
diff --git a/...es/model_templates/model_predict.py.jinja → ...es/model_templates/model_predict.py.jinja b/...es/model_templates/model_predict.py.jinja → ...es/model_templates/model_predict.py.jinja
diff --git a/...ates/model_templates/model_train.py.jinja → ...ates/model_templates/model_train.py.jinja b/...ates/model_templates/model_train.py.jinja → ...ates/model_templates/model_train.py.jinja
diff --git a/...tes/other_templates/drop_columns.py.jinja → ...tes/other_templates/drop_columns.py.jinja b/...tes/other_templates/drop_columns.py.jinja → ...tes/other_templates/drop_columns.py.jinja
diff --git a/...r_templates/drop_columns_predict.py.jinja → ...r_templates/drop_columns_predict.py.jinja b/...r_templates/drop_columns_predict.py.jinja → ...r_templates/drop_columns_predict.py.jinja
diff --git a/...her_templates/drop_columns_train.py.jinja → ...her_templates/drop_columns_train.py.jinja b/...her_templates/drop_columns_train.py.jinja → ...her_templates/drop_columns_train.py.jinja
diff --git a/...lates/other_templates/evaluation.py.jinja → ...lates/other_templates/evaluation.py.jinja b/...lates/other_templates/evaluation.py.jinja → ...lates/other_templates/evaluation.py.jinja
diff --git a/...hyperparameter_tuning_evaluation.py.jinja → ...hyperparameter_tuning_evaluation.py.jinja b/...hyperparameter_tuning_evaluation.py.jinja → ...hyperparameter_tuning_evaluation.py.jinja
diff --git a/...s/other_templates/inverse_target.py.jinja → ...s/other_templates/inverse_target.py.jinja b/...s/other_templates/inverse_target.py.jinja → ...s/other_templates/inverse_target.py.jinja
diff --git a/...templates/permutation_importance.py.jinja → ...templates/permutation_importance.py.jinja b/...templates/permutation_importance.py.jinja → ...templates/permutation_importance.py.jinja
diff --git a/...ther_templates/prediction_result.py.jinja → ...ther_templates/prediction_result.py.jinja b/...ther_templates/prediction_result.py.jinja → ...ther_templates/prediction_result.py.jinja
diff --git a/...mplates/store_prediction_columns.py.jinja → ...mplates/store_prediction_columns.py.jinja b/...mplates/store_prediction_columns.py.jinja → ...mplates/store_prediction_columns.py.jinja
diff --git a/...plates/target_separation_predict.py.jinja → ...plates/target_separation_predict.py.jinja b/...plates/target_separation_predict.py.jinja → ...plates/target_separation_predict.py.jinja
diff --git a/...templates/target_separation_test.py.jinja → ...templates/target_separation_test.py.jinja b/...templates/target_separation_test.py.jinja → ...templates/target_separation_test.py.jinja
diff --git a/...emplates/target_separation_train.py.jinja → ...emplates/target_separation_train.py.jinja b/...emplates/target_separation_train.py.jinja → ...emplates/target_separation_train.py.jinja
diff --git a/...tes/target_separation_validation.py.jinja → ...tes/target_separation_validation.py.jinja b/...tes/target_separation_validation.py.jinja → ...tes/target_separation_validation.py.jinja
diff --git a/templates/pipeline_predict.py.jinja → ..._core/templates/pipeline_predict.py.jinja b/templates/pipeline_predict.py.jinja → ..._core/templates/pipeline_predict.py.jinja
diff --git a/templates/pipeline_test.py.jinja → ...tml_core/templates/pipeline_test.py.jinja b/templates/pipeline_test.py.jinja → ...tml_core/templates/pipeline_test.py.jinja
diff --git a/templates/pipeline_train.py.jinja → ...ml_core/templates/pipeline_train.py.jinja b/templates/pipeline_train.py.jinja → ...ml_core/templates/pipeline_train.py.jinja
diff --git a/templates/pipeline_validation.py.jinja → ...re/templates/pipeline_validation.py.jinja b/templates/pipeline_validation.py.jinja → ...re/templates/pipeline_validation.py.jinja
diff --git a/...tes/preprocessing_templates/DATE.py.jinja → ...tes/preprocessing_templates/DATE.py.jinja b/...tes/preprocessing_templates/DATE.py.jinja → ...tes/preprocessing_templates/DATE.py.jinja
diff --git a/...reprocessing_templates/DATE_predict.jinja → ...reprocessing_templates/DATE_predict.jinja b/...reprocessing_templates/DATE_predict.jinja → ...reprocessing_templates/DATE_predict.jinja
diff --git a/.../preprocessing_templates/DATE_train.jinja → .../preprocessing_templates/DATE_train.jinja b/.../preprocessing_templates/DATE_train.jinja → .../preprocessing_templates/DATE_train.jinja
diff --git a/...rocessing_templates/LabelEncoder.py.jinja → ...rocessing_templates/LabelEncoder.py.jinja b/...rocessing_templates/LabelEncoder.py.jinja → ...rocessing_templates/LabelEncoder.py.jinja
diff --git a/...g_templates/LabelEncoder_predict.py.jinja → ...g_templates/LabelEncoder_predict.py.jinja b/...g_templates/LabelEncoder_predict.py.jinja → ...g_templates/LabelEncoder_predict.py.jinja
diff --git a/...ing_templates/LabelEncoder_train.py.jinja → ...ing_templates/LabelEncoder_train.py.jinja b/...ing_templates/LabelEncoder_train.py.jinja → ...ing_templates/LabelEncoder_train.py.jinja
diff --git a/...eprocessing_templates/Processing.py.jinja → ...eprocessing_templates/Processing.py.jinja b/...eprocessing_templates/Processing.py.jinja → ...eprocessing_templates/Processing.py.jinja
diff --git a/...ing_templates/Processing_predict.py.jinja → ...ing_templates/Processing_predict.py.jinja b/...ing_templates/Processing_predict.py.jinja → ...ing_templates/Processing_predict.py.jinja
diff --git a/...ssing_templates/Processing_train.py.jinja → ...ssing_templates/Processing_train.py.jinja b/...ssing_templates/Processing_train.py.jinja → ...ssing_templates/Processing_train.py.jinja
diff --git a/...es/preprocessing_templates/SMOTE.py.jinja → ...es/preprocessing_templates/SMOTE.py.jinja b/...es/preprocessing_templates/SMOTE.py.jinja → ...es/preprocessing_templates/SMOTE.py.jinja
diff --git a/...preprocessing_templates/STANDARD.py.jinja → ...preprocessing_templates/STANDARD.py.jinja b/...preprocessing_templates/STANDARD.py.jinja → ...preprocessing_templates/STANDARD.py.jinja
diff --git a/...ssing_templates/STANDARD_predict.py.jinja → ...ssing_templates/STANDARD_predict.py.jinja b/...ssing_templates/STANDARD_predict.py.jinja → ...ssing_templates/STANDARD_predict.py.jinja
diff --git a/...cessing_templates/STANDARD_train.py.jinja → ...cessing_templates/STANDARD_train.py.jinja b/...cessing_templates/STANDARD_train.py.jinja → ...cessing_templates/STANDARD_train.py.jinja
diff --git a/...essing_templates/TfidfVectorizer.py.jinja → ...essing_templates/TfidfVectorizer.py.jinja b/...essing_templates/TfidfVectorizer.py.jinja → ...essing_templates/TfidfVectorizer.py.jinja
diff --git a/...emplates/TfidfVectorizer_predict.py.jinja → ...emplates/TfidfVectorizer_predict.py.jinja b/...emplates/TfidfVectorizer_predict.py.jinja → ...emplates/TfidfVectorizer_predict.py.jinja
diff --git a/..._templates/TfidfVectorizer_train.py.jinja → ..._templates/TfidfVectorizer_train.py.jinja b/..._templates/TfidfVectorizer_train.py.jinja → ..._templates/TfidfVectorizer_train.py.jinja
diff --git a/...ng_templates/fillna-type-numeric.py.jinja → ...ng_templates/fillna-type-numeric.py.jinja b/...ng_templates/fillna-type-numeric.py.jinja → ...ng_templates/fillna-type-numeric.py.jinja
diff --git a/...ates/fillna-type-numeric_predict.py.jinja → ...ates/fillna-type-numeric_predict.py.jinja b/...ates/fillna-type-numeric_predict.py.jinja → ...ates/fillna-type-numeric_predict.py.jinja
diff --git a/...plates/fillna-type-numeric_train.py.jinja → ...plates/fillna-type-numeric_train.py.jinja b/...plates/fillna-type-numeric_train.py.jinja → ...plates/fillna-type-numeric_train.py.jinja
diff --git a/...ing_templates/fillna-type-string.py.jinja → ...ing_templates/fillna-type-string.py.jinja b/...ing_templates/fillna-type-string.py.jinja → ...ing_templates/fillna-type-string.py.jinja
diff --git a/...lates/fillna-type-string_predict.py.jinja → ...lates/fillna-type-string_predict.py.jinja b/...lates/fillna-type-string_predict.py.jinja → ...lates/fillna-type-string_predict.py.jinja
diff --git a/...mplates/fillna-type-string_train.py.jinja → ...mplates/fillna-type-string_train.py.jinja b/...mplates/fillna-type-string_train.py.jinja → ...mplates/fillna-type-string_train.py.jinja
diff --git a/...processing_templates/get_dummies.py.jinja → ...processing_templates/get_dummies.py.jinja b/...processing_templates/get_dummies.py.jinja → ...processing_templates/get_dummies.py.jinja
diff --git a/...ng_templates/get_dummies_predict.py.jinja → ...ng_templates/get_dummies_predict.py.jinja b/...ng_templates/get_dummies_predict.py.jinja → ...ng_templates/get_dummies_predict.py.jinja
diff --git a/...sing_templates/get_dummies_train.py.jinja → ...sing_templates/get_dummies_train.py.jinja b/...sing_templates/get_dummies_train.py.jinja → ...sing_templates/get_dummies_train.py.jinja
diff --git a/...ates/preprocessing_templates/log.py.jinja → ...ates/preprocessing_templates/log.py.jinja b/...ates/preprocessing_templates/log.py.jinja → ...ates/preprocessing_templates/log.py.jinja
diff --git a/...processing_templates/log_predict.py.jinja → ...processing_templates/log_predict.py.jinja b/...processing_templates/log_predict.py.jinja → ...processing_templates/log_predict.py.jinja
diff --git a/...reprocessing_templates/log_train.py.jinja → ...reprocessing_templates/log_train.py.jinja b/...reprocessing_templates/log_train.py.jinja → ...reprocessing_templates/log_train.py.jinja