From 6d7e8906e8904ce1f039b945fd2c295b358e6185 Mon Sep 17 00:00:00 2001 From: Adams Pierre David <57180807+adamspd@users.noreply.github.com> Date: Fri, 19 Jan 2024 05:07:56 +0100 Subject: [PATCH 1/2] Fixing smote import error --- check_version.py | 2 +- setup.py | 2 +- spam_detector_ai/__info__.py | 8 -------- spam_detector_ai/__init__.py | 15 ++++++++------- spam_detector_ai/classifiers/__init__.py | 7 ------- .../loading_and_processing/__init__.py | 4 ---- spam_detector_ai/prediction/__init__.py | 1 - spam_detector_ai/prediction/predict.py | 6 ++++-- spam_detector_ai/test_and_tuning/__init__.py | 2 -- .../test_and_tuning/fine_tuning_svm.py | 2 +- spam_detector_ai/test_and_tuning/py_test.py | 4 ++-- spam_detector_ai/test_and_tuning/test.py | 4 ++-- spam_detector_ai/trainer.py | 2 +- spam_detector_ai/training/__init__.py | 3 --- spam_detector_ai/training/train_models.py | 8 ++++++-- 15 files changed, 26 insertions(+), 44 deletions(-) delete mode 100644 spam_detector_ai/__info__.py diff --git a/check_version.py b/check_version.py index ca22229..b867609 100644 --- a/check_version.py +++ b/check_version.py @@ -1,7 +1,7 @@ import os import requests -from spam_detector_ai.__info__ import __version__, __package_name__, __test_version__ +from spam_detector_ai import __version__, __package_name__, __test_version__ def check_package_version(package_name, current_version): diff --git a/setup.py b/setup.py index 34ed1f1..2d0b71d 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ import setuptools -from spam_detector_ai.__info__ import ( +from spam_detector_ai import ( __author__, __author_email__, __author_website__, __description__, __package_name__, __url__, __version__) with open("README.md", "r", encoding="utf-8") as fh: diff --git a/spam_detector_ai/__info__.py b/spam_detector_ai/__info__.py deleted file mode 100644 index 10bd69b..0000000 --- a/spam_detector_ai/__info__.py +++ /dev/null @@ -1,8 +0,0 @@ -__author__ = "Adams Pierre David" -__author_email__ = "adamspd.developer@gmail.com" -__author_website__ = "https://adamspierredavid.com/" -__description__ = "A package for detecting and filtering spam messages using Machine Learning models." -__package_name__ = "spam-detector-ai" -__url__ = "https://github.com/adamspd/spam-detection-project" -__version__ = "2.0.3" -__test_version__ = False diff --git a/spam_detector_ai/__init__.py b/spam_detector_ai/__init__.py index 59656e1..3466c8e 100644 --- a/spam_detector_ai/__init__.py +++ b/spam_detector_ai/__init__.py @@ -1,7 +1,8 @@ -# spam_detector_ai/__init__.py - -from . import classifiers -from . import loading_and_processing -from . import prediction -from . import test_and_tuning -from . import training +__author__ = "Adams Pierre David" +__author_email__ = "adamspd.developer@gmail.com" +__author_website__ = "https://adamspierredavid.com/" +__description__ = "A package for detecting and filtering spam messages using Machine Learning models." +__package_name__ = "spam-detector-ai" +__url__ = "https://github.com/adamspd/spam-detection-project" +__version__ = "2.0.2" +__test_version__ = False diff --git a/spam_detector_ai/classifiers/__init__.py b/spam_detector_ai/classifiers/__init__.py index 1233575..e69de29 100644 --- a/spam_detector_ai/classifiers/__init__.py +++ b/spam_detector_ai/classifiers/__init__.py @@ -1,7 +0,0 @@ -# classifiers/__init__.py - -from .base_classifier import BaseClassifier -from .naive_bayes_classifier import NaiveBayesClassifier -from .random_forest_classifier import RandomForestSpamClassifier -from .svm_classifier import SVMClassifier -from .classifier_types import ClassifierType diff --git a/spam_detector_ai/loading_and_processing/__init__.py b/spam_detector_ai/loading_and_processing/__init__.py index d08d187..e69de29 100644 --- a/spam_detector_ai/loading_and_processing/__init__.py +++ b/spam_detector_ai/loading_and_processing/__init__.py @@ -1,4 +0,0 @@ -# spam_detector_ai/loading_and_processing/__init__.py - -from .data_loader import DataLoader -from .preprocessor import Preprocessor diff --git a/spam_detector_ai/prediction/__init__.py b/spam_detector_ai/prediction/__init__.py index 75b1aa8..e69de29 100644 --- a/spam_detector_ai/prediction/__init__.py +++ b/spam_detector_ai/prediction/__init__.py @@ -1 +0,0 @@ -from .predict import SpamDetector, VotingSpamDetector diff --git a/spam_detector_ai/prediction/predict.py b/spam_detector_ai/prediction/predict.py index 34a4aa7..8e2f024 100644 --- a/spam_detector_ai/prediction/predict.py +++ b/spam_detector_ai/prediction/predict.py @@ -7,9 +7,11 @@ import os -from spam_detector_ai.classifiers import NaiveBayesClassifier, RandomForestSpamClassifier, SVMClassifier from spam_detector_ai.classifiers.classifier_types import ClassifierType -from spam_detector_ai.loading_and_processing import Preprocessor +from spam_detector_ai.classifiers.naive_bayes_classifier import NaiveBayesClassifier +from spam_detector_ai.classifiers.random_forest_classifier import RandomForestSpamClassifier +from spam_detector_ai.classifiers.svm_classifier import SVMClassifier +from spam_detector_ai.loading_and_processing.preprocessor import Preprocessor def get_model_path(model_type): diff --git a/spam_detector_ai/test_and_tuning/__init__.py b/spam_detector_ai/test_and_tuning/__init__.py index 8476b83..e69de29 100644 --- a/spam_detector_ai/test_and_tuning/__init__.py +++ b/spam_detector_ai/test_and_tuning/__init__.py @@ -1,2 +0,0 @@ -from .test import TestModel -from .py_test import TestClassifiers diff --git a/spam_detector_ai/test_and_tuning/fine_tuning_svm.py b/spam_detector_ai/test_and_tuning/fine_tuning_svm.py index fc55c06..d0d2b93 100644 --- a/spam_detector_ai/test_and_tuning/fine_tuning_svm.py +++ b/spam_detector_ai/test_and_tuning/fine_tuning_svm.py @@ -7,7 +7,7 @@ from spam_detector_ai.classifiers.classifier_types import ClassifierType from spam_detector_ai.logger_config import init_logging -from spam_detector_ai.training import ModelTrainer +from spam_detector_ai.training.train_models import ModelTrainer if __name__ == '__main__': logger = init_logging() diff --git a/spam_detector_ai/test_and_tuning/py_test.py b/spam_detector_ai/test_and_tuning/py_test.py index 6170c73..e4c20f0 100644 --- a/spam_detector_ai/test_and_tuning/py_test.py +++ b/spam_detector_ai/test_and_tuning/py_test.py @@ -6,8 +6,8 @@ from spam_detector_ai.classifiers.classifier_types import ClassifierType from spam_detector_ai.logger_config import init_logging -from spam_detector_ai.prediction import SpamDetector -from spam_detector_ai.training import ModelTrainer +from spam_detector_ai.prediction.predict import SpamDetector +from spam_detector_ai.training.train_models import ModelTrainer @pytest.fixture(scope="module") diff --git a/spam_detector_ai/test_and_tuning/test.py b/spam_detector_ai/test_and_tuning/test.py index 58dc1d3..4fcbb7b 100644 --- a/spam_detector_ai/test_and_tuning/test.py +++ b/spam_detector_ai/test_and_tuning/test.py @@ -7,8 +7,8 @@ from spam_detector_ai.classifiers.classifier_types import ClassifierType from spam_detector_ai.logger_config import init_logging -from spam_detector_ai.prediction import SpamDetector -from spam_detector_ai.training import ModelTrainer +from spam_detector_ai.prediction.predict import SpamDetector +from spam_detector_ai.training.train_models import ModelTrainer class TestModel: diff --git a/spam_detector_ai/trainer.py b/spam_detector_ai/trainer.py index 7b695e9..1db7cf3 100644 --- a/spam_detector_ai/trainer.py +++ b/spam_detector_ai/trainer.py @@ -4,7 +4,7 @@ from classifiers.classifier_types import ClassifierType from logger_config import init_logging -from training import ModelTrainer +from training.train_models import ModelTrainer logger = init_logging() diff --git a/spam_detector_ai/training/__init__.py b/spam_detector_ai/training/__init__.py index fe87961..e69de29 100644 --- a/spam_detector_ai/training/__init__.py +++ b/spam_detector_ai/training/__init__.py @@ -1,3 +0,0 @@ -# training/__init__.py - -from .train_models import ModelTrainer diff --git a/spam_detector_ai/training/train_models.py b/spam_detector_ai/training/train_models.py index a50332b..2ce32ed 100644 --- a/spam_detector_ai/training/train_models.py +++ b/spam_detector_ai/training/train_models.py @@ -4,8 +4,12 @@ from sklearn.model_selection import train_test_split -from spam_detector_ai.classifiers import ClassifierType, NaiveBayesClassifier, RandomForestSpamClassifier, SVMClassifier -from spam_detector_ai.loading_and_processing import DataLoader, Preprocessor +from spam_detector_ai.classifiers.classifier_types import ClassifierType +from spam_detector_ai.classifiers.naive_bayes_classifier import NaiveBayesClassifier +from spam_detector_ai.classifiers.random_forest_classifier import RandomForestSpamClassifier +from spam_detector_ai.classifiers.svm_classifier import SVMClassifier +from spam_detector_ai.loading_and_processing.data_loader import DataLoader +from spam_detector_ai.loading_and_processing.preprocessor import Preprocessor class ModelTrainer: From 70775183d4bf6542c718d37bc2e3db7c111e34cd Mon Sep 17 00:00:00 2001 From: Adams Pierre David <57180807+adamspd@users.noreply.github.com> Date: Fri, 19 Jan 2024 05:09:36 +0100 Subject: [PATCH 2/2] Upgrade version --- spam_detector_ai/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spam_detector_ai/__init__.py b/spam_detector_ai/__init__.py index 3466c8e..81e4f10 100644 --- a/spam_detector_ai/__init__.py +++ b/spam_detector_ai/__init__.py @@ -4,5 +4,5 @@ __description__ = "A package for detecting and filtering spam messages using Machine Learning models." __package_name__ = "spam-detector-ai" __url__ = "https://github.com/adamspd/spam-detection-project" -__version__ = "2.0.2" +__version__ = "2.0.4" __test_version__ = False