Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion check_version.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 0 additions & 8 deletions spam_detector_ai/__info__.py

This file was deleted.

15 changes: 8 additions & 7 deletions spam_detector_ai/__init__.py
Original file line number Diff line number Diff line change
@@ -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.4"
__test_version__ = False
7 changes: 0 additions & 7 deletions spam_detector_ai/classifiers/__init__.py
Original file line number Diff line number Diff line change
@@ -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
4 changes: 0 additions & 4 deletions spam_detector_ai/loading_and_processing/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +0,0 @@
# spam_detector_ai/loading_and_processing/__init__.py

from .data_loader import DataLoader
from .preprocessor import Preprocessor
1 change: 0 additions & 1 deletion spam_detector_ai/prediction/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
from .predict import SpamDetector, VotingSpamDetector
6 changes: 4 additions & 2 deletions spam_detector_ai/prediction/predict.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 0 additions & 2 deletions spam_detector_ai/test_and_tuning/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +0,0 @@
from .test import TestModel
from .py_test import TestClassifiers
2 changes: 1 addition & 1 deletion spam_detector_ai/test_and_tuning/fine_tuning_svm.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions spam_detector_ai/test_and_tuning/py_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions spam_detector_ai/test_and_tuning/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion spam_detector_ai/trainer.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
3 changes: 0 additions & 3 deletions spam_detector_ai/training/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
# training/__init__.py

from .train_models import ModelTrainer
8 changes: 6 additions & 2 deletions spam_detector_ai/training/train_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down