From 5d2a13f2a33078683604ceb5e7b85e8c1748bba1 Mon Sep 17 00:00:00 2001 From: Bobloy Date: Thu, 3 May 2018 10:58:22 -0400 Subject: [PATCH 01/14] rename to chatterbot --- chatter/chatter.py | 10 +++++++--- chatter/{source => chatterbot}/__init__.py | 2 +- chatter/{source => chatterbot}/__main__.py | 0 chatter/{source => chatterbot}/adapters.py | 2 +- chatter/{source => chatterbot}/chatterbot.py | 14 +++++++------- chatter/{source => chatterbot}/comparisons.py | 2 +- chatter/{source => chatterbot}/constants.py | 0 chatter/{source => chatterbot}/conversation.py | 0 chatter/{source => chatterbot}/corpus.py | 0 chatter/{source => chatterbot}/ext/__init__.py | 0 .../chatterbot/ext/django_chatterbot/__init__.py | 3 +++ .../ext/django_chatterbot/abstract_models.py | 4 ++-- .../ext/django_chatterbot/admin.py | 2 +- .../ext/django_chatterbot/apps.py | 2 +- .../ext/django_chatterbot/factories.py | 4 ++-- .../ext/django_chatterbot/management/__init__.py | 0 .../management/commands/__init__.py | 0 .../management/commands/train.py | 4 ++-- .../django_chatterbot/migrations/0001_initial.py | 0 .../migrations/0002_statement_extra_data.py | 0 .../migrations/0003_change_occurrence_default.py | 0 .../migrations/0004_rename_in_response_to.py | 0 .../migrations/0005_statement_created_at.py | 0 .../migrations/0006_create_conversation.py | 0 .../migrations/0007_response_created_at.py | 0 .../migrations/0008_update_conversations.py | 0 .../django_chatterbot/migrations/0009_tags.py | 0 .../migrations/0010_statement_text.py | 0 .../migrations/0011_blank_extra_data.py | 0 .../ext/django_chatterbot/migrations/__init__.py | 0 .../ext/django_chatterbot/models.py | 2 +- .../ext/django_chatterbot/settings.py | 8 ++++---- .../ext/django_chatterbot/urls.py | 0 .../ext/django_chatterbot/views.py | 6 +++--- .../ext/sqlalchemy_app/__init__.py | 0 .../ext/sqlalchemy_app/models.py | 10 +++++----- .../ext/sqlalchemy_app/types.py | 0 chatter/{source => chatterbot}/filters.py | 0 chatter/{source => chatterbot}/input/__init__.py | 0 chatter/{source => chatterbot}/input/gitter.py | 4 ++-- chatter/{source => chatterbot}/input/hipchat.py | 4 ++-- .../input/input_adapter.py | 2 +- chatter/{source => chatterbot}/input/mailgun.py | 4 ++-- .../{source => chatterbot}/input/microsoft.py | 4 ++-- chatter/{source => chatterbot}/input/terminal.py | 6 +++--- .../input/variable_input_type_adapter.py | 4 ++-- chatter/{source => chatterbot}/logic/__init__.py | 0 .../{source => chatterbot}/logic/best_match.py | 0 .../logic/logic_adapter.py | 8 ++++---- .../logic/low_confidence.py | 2 +- .../logic/mathematical_evaluation.py | 4 ++-- .../logic/multi_adapter.py | 4 ++-- .../logic/no_knowledge_adapter.py | 0 .../logic/specific_response.py | 2 +- .../{source => chatterbot}/logic/time_adapter.py | 2 +- .../{source => chatterbot}/output/__init__.py | 0 chatter/{source => chatterbot}/output/gitter.py | 0 chatter/{source => chatterbot}/output/hipchat.py | 0 chatter/{source => chatterbot}/output/mailgun.py | 0 .../{source => chatterbot}/output/microsoft.py | 0 .../output/output_adapter.py | 2 +- .../{source => chatterbot}/output/terminal.py | 0 chatter/{source => chatterbot}/parsing.py | 0 chatter/{source => chatterbot}/preprocessors.py | 0 .../{source => chatterbot}/response_selection.py | 0 .../{source => chatterbot}/storage/__init__.py | 0 .../storage/django_storage.py | 4 ++-- .../{source => chatterbot}/storage/mongodb.py | 6 +++--- .../storage/sql_storage.py | 16 ++++++++-------- .../storage/storage_adapter.py | 0 chatter/{source => chatterbot}/trainers.py | 0 chatter/{source => chatterbot}/utils.py | 0 chatter/source/ext/django_chatterbot/__init__.py | 3 --- 73 files changed, 80 insertions(+), 76 deletions(-) rename chatter/{source => chatterbot}/__init__.py (91%) rename chatter/{source => chatterbot}/__main__.py (100%) rename chatter/{source => chatterbot}/adapters.py (96%) rename chatter/{source => chatterbot}/chatterbot.py (91%) rename chatter/{source => chatterbot}/comparisons.py (99%) rename chatter/{source => chatterbot}/constants.py (100%) rename chatter/{source => chatterbot}/conversation.py (100%) rename chatter/{source => chatterbot}/corpus.py (100%) rename chatter/{source => chatterbot}/ext/__init__.py (100%) create mode 100644 chatter/chatterbot/ext/django_chatterbot/__init__.py rename chatter/{source => chatterbot}/ext/django_chatterbot/abstract_models.py (98%) rename chatter/{source => chatterbot}/ext/django_chatterbot/admin.py (93%) rename chatter/{source => chatterbot}/ext/django_chatterbot/apps.py (74%) rename chatter/{source => chatterbot}/ext/django_chatterbot/factories.py (89%) rename chatter/{source => chatterbot}/ext/django_chatterbot/management/__init__.py (100%) rename chatter/{source => chatterbot}/ext/django_chatterbot/management/commands/__init__.py (100%) rename chatter/{source => chatterbot}/ext/django_chatterbot/management/commands/train.py (88%) rename chatter/{source => chatterbot}/ext/django_chatterbot/migrations/0001_initial.py (100%) rename chatter/{source => chatterbot}/ext/django_chatterbot/migrations/0002_statement_extra_data.py (100%) rename chatter/{source => chatterbot}/ext/django_chatterbot/migrations/0003_change_occurrence_default.py (100%) rename chatter/{source => chatterbot}/ext/django_chatterbot/migrations/0004_rename_in_response_to.py (100%) rename chatter/{source => chatterbot}/ext/django_chatterbot/migrations/0005_statement_created_at.py (100%) rename chatter/{source => chatterbot}/ext/django_chatterbot/migrations/0006_create_conversation.py (100%) rename chatter/{source => chatterbot}/ext/django_chatterbot/migrations/0007_response_created_at.py (100%) rename chatter/{source => chatterbot}/ext/django_chatterbot/migrations/0008_update_conversations.py (100%) rename chatter/{source => chatterbot}/ext/django_chatterbot/migrations/0009_tags.py (100%) rename chatter/{source => chatterbot}/ext/django_chatterbot/migrations/0010_statement_text.py (100%) rename chatter/{source => chatterbot}/ext/django_chatterbot/migrations/0011_blank_extra_data.py (100%) rename chatter/{source => chatterbot}/ext/django_chatterbot/migrations/__init__.py (100%) rename chatter/{source => chatterbot}/ext/django_chatterbot/models.py (90%) rename chatter/{source => chatterbot}/ext/django_chatterbot/settings.py (59%) rename chatter/{source => chatterbot}/ext/django_chatterbot/urls.py (100%) rename chatter/{source => chatterbot}/ext/django_chatterbot/views.py (95%) rename chatter/{source => chatterbot}/ext/sqlalchemy_app/__init__.py (100%) rename chatter/{source => chatterbot}/ext/sqlalchemy_app/models.py (89%) rename chatter/{source => chatterbot}/ext/sqlalchemy_app/types.py (100%) rename chatter/{source => chatterbot}/filters.py (100%) rename chatter/{source => chatterbot}/input/__init__.py (100%) rename chatter/{source => chatterbot}/input/gitter.py (98%) rename chatter/{source => chatterbot}/input/hipchat.py (97%) rename chatter/{source => chatterbot}/input/input_adapter.py (96%) rename chatter/{source => chatterbot}/input/mailgun.py (94%) rename chatter/{source => chatterbot}/input/microsoft.py (97%) rename chatter/{source => chatterbot}/input/terminal.py (73%) rename chatter/{source => chatterbot}/input/variable_input_type_adapter.py (95%) rename chatter/{source => chatterbot}/logic/__init__.py (100%) rename chatter/{source => chatterbot}/logic/best_match.py (100%) rename chatter/{source => chatterbot}/logic/logic_adapter.py (94%) rename chatter/{source => chatterbot}/logic/low_confidence.py (97%) rename chatter/{source => chatterbot}/logic/mathematical_evaluation.py (95%) rename chatter/{source => chatterbot}/logic/multi_adapter.py (98%) rename chatter/{source => chatterbot}/logic/no_knowledge_adapter.py (100%) rename chatter/{source => chatterbot}/logic/specific_response.py (94%) rename chatter/{source => chatterbot}/logic/time_adapter.py (98%) rename chatter/{source => chatterbot}/output/__init__.py (100%) rename chatter/{source => chatterbot}/output/gitter.py (100%) rename chatter/{source => chatterbot}/output/hipchat.py (100%) rename chatter/{source => chatterbot}/output/mailgun.py (100%) rename chatter/{source => chatterbot}/output/microsoft.py (100%) rename chatter/{source => chatterbot}/output/output_adapter.py (93%) rename chatter/{source => chatterbot}/output/terminal.py (100%) rename chatter/{source => chatterbot}/parsing.py (100%) rename chatter/{source => chatterbot}/preprocessors.py (100%) rename chatter/{source => chatterbot}/response_selection.py (100%) rename chatter/{source => chatterbot}/storage/__init__.py (100%) rename chatter/{source => chatterbot}/storage/django_storage.py (98%) rename chatter/{source => chatterbot}/storage/mongodb.py (98%) rename chatter/{source => chatterbot}/storage/sql_storage.py (96%) rename chatter/{source => chatterbot}/storage/storage_adapter.py (100%) rename chatter/{source => chatterbot}/trainers.py (100%) rename chatter/{source => chatterbot}/utils.py (100%) delete mode 100644 chatter/source/ext/django_chatterbot/__init__.py diff --git a/chatter/chatter.py b/chatter/chatter.py index 3678324..0a083a9 100644 --- a/chatter/chatter.py +++ b/chatter/chatter.py @@ -5,8 +5,8 @@ import discord from discord.ext import commands from redbot.core import Config -from .source import ChatBot -from .source.trainers import ListTrainer +from .chatterbot import ChatBot +from .chatterbot.trainers import ListTrainer class Chatter: @@ -23,7 +23,11 @@ class Chatter: "days": 1 } - self.chatbot = ChatBot("ChatterBot") + self.chatbot = ChatBot( + "ChatterBot", + storage_adapter='chatterbot.storage.SQLStorageAdapter', + database='./database.sqlite3' + ) self.chatbot.set_trainer(ListTrainer) self.config.register_global(**default_global) diff --git a/chatter/source/__init__.py b/chatter/chatterbot/__init__.py similarity index 91% rename from chatter/source/__init__.py rename to chatter/chatterbot/__init__.py index 2ea55f6..7a127ee 100644 --- a/chatter/source/__init__.py +++ b/chatter/chatterbot/__init__.py @@ -3,7 +3,7 @@ ChatterBot is a machine learning, conversational dialog engine. """ from .chatterbot import ChatBot -__version__ = '0.8.4' +__version__ = '0.8.5' __author__ = 'Gunther Cox' __email__ = 'gunthercx@gmail.com' __url__ = 'https://github.com/gunthercox/ChatterBot' diff --git a/chatter/source/__main__.py b/chatter/chatterbot/__main__.py similarity index 100% rename from chatter/source/__main__.py rename to chatter/chatterbot/__main__.py diff --git a/chatter/source/adapters.py b/chatter/chatterbot/adapters.py similarity index 96% rename from chatter/source/adapters.py rename to chatter/chatterbot/adapters.py index f99734d..83ce94c 100644 --- a/chatter/source/adapters.py +++ b/chatter/chatterbot/adapters.py @@ -16,7 +16,7 @@ class Adapter(object): """ Gives the adapter access to an instance of the ChatBot class. - :param chatbot: A chat bot instanse. + :param chatbot: A chat bot instance. :type chatbot: ChatBot """ self.chatbot = chatbot diff --git a/chatter/source/chatterbot.py b/chatter/chatterbot/chatterbot.py similarity index 91% rename from chatter/source/chatterbot.py rename to chatter/chatterbot/chatterbot.py index 66a92b9..2a5049d 100644 --- a/chatter/source/chatterbot.py +++ b/chatter/chatterbot/chatterbot.py @@ -20,15 +20,15 @@ class ChatBot(object): self.default_session = None - storage_adapter = kwargs.get('storage_adapter', 'chatter.source.storage.SQLStorageAdapter') + storage_adapter = kwargs.get('storage_adapter', 'chatterbot.storage.SQLStorageAdapter') logic_adapters = kwargs.get('logic_adapters', [ - 'chatter.source.logic.BestMatch' + 'chatterbot.logic.BestMatch' ]) - input_adapter = kwargs.get('input_adapter', 'chatter.source.input.VariableInputTypeAdapter') + input_adapter = kwargs.get('input_adapter', 'chatterbot.input.VariableInputTypeAdapter') - output_adapter = kwargs.get('output_adapter', 'chatter.source.output.OutputAdapter') + output_adapter = kwargs.get('output_adapter', 'chatterbot.output.OutputAdapter') # Check that each adapter is a valid subclass of it's respective parent utils.validate_adapter_class(storage_adapter, StorageAdapter) @@ -45,7 +45,7 @@ class ChatBot(object): # Add required system logic adapter self.logic.system_adapters.append( - utils.initialize_class('chatter.source.logic.NoKnowledgeAdapter', **kwargs) + utils.initialize_class('chatterbot.logic.NoKnowledgeAdapter', **kwargs) ) for adapter in logic_adapters: @@ -59,7 +59,7 @@ class ChatBot(object): preprocessors = kwargs.get( 'preprocessors', [ - 'chatter.source.preprocessors.clean_whitespace' + 'chatterbot.preprocessors.clean_whitespace' ] ) @@ -69,7 +69,7 @@ class ChatBot(object): self.preprocessors.append(utils.import_module(preprocessor)) # Use specified trainer or fall back to the default - trainer = kwargs.get('trainer', 'chatter.source.trainers.Trainer') + trainer = kwargs.get('trainer', 'chatterbot.trainers.Trainer') TrainerClass = utils.import_module(trainer) self.trainer = TrainerClass(self.storage, **kwargs) self.training_data = kwargs.get('training_data') diff --git a/chatter/source/comparisons.py b/chatter/chatterbot/comparisons.py similarity index 99% rename from chatter/source/comparisons.py rename to chatter/chatterbot/comparisons.py index 816e175..c500487 100644 --- a/chatter/source/comparisons.py +++ b/chatter/chatterbot/comparisons.py @@ -130,7 +130,7 @@ class SynsetDistance(Comparator): """ from nltk.corpus import wordnet from nltk import word_tokenize - from . import utils + from chatterbot import utils import itertools tokens1 = word_tokenize(statement.text.lower()) diff --git a/chatter/source/constants.py b/chatter/chatterbot/constants.py similarity index 100% rename from chatter/source/constants.py rename to chatter/chatterbot/constants.py diff --git a/chatter/source/conversation.py b/chatter/chatterbot/conversation.py similarity index 100% rename from chatter/source/conversation.py rename to chatter/chatterbot/conversation.py diff --git a/chatter/source/corpus.py b/chatter/chatterbot/corpus.py similarity index 100% rename from chatter/source/corpus.py rename to chatter/chatterbot/corpus.py diff --git a/chatter/source/ext/__init__.py b/chatter/chatterbot/ext/__init__.py similarity index 100% rename from chatter/source/ext/__init__.py rename to chatter/chatterbot/ext/__init__.py diff --git a/chatter/chatterbot/ext/django_chatterbot/__init__.py b/chatter/chatterbot/ext/django_chatterbot/__init__.py new file mode 100644 index 0000000..0bd8684 --- /dev/null +++ b/chatter/chatterbot/ext/django_chatterbot/__init__.py @@ -0,0 +1,3 @@ +default_app_config = ( + 'chatterbot.ext.django_chatterbot.apps.DjangoChatterBotConfig' +) diff --git a/chatter/source/ext/django_chatterbot/abstract_models.py b/chatter/chatterbot/ext/django_chatterbot/abstract_models.py similarity index 98% rename from chatter/source/ext/django_chatterbot/abstract_models.py rename to chatter/chatterbot/ext/django_chatterbot/abstract_models.py index 4531186..59c9cea 100644 --- a/chatter/source/ext/django_chatterbot/abstract_models.py +++ b/chatter/chatterbot/ext/django_chatterbot/abstract_models.py @@ -1,5 +1,5 @@ -from ...conversation import StatementMixin -from ... import constants +from chatterbot.conversation import StatementMixin +from chatterbot import constants from django.db import models from django.apps import apps from django.utils import timezone diff --git a/chatter/source/ext/django_chatterbot/admin.py b/chatter/chatterbot/ext/django_chatterbot/admin.py similarity index 93% rename from chatter/source/ext/django_chatterbot/admin.py rename to chatter/chatterbot/ext/django_chatterbot/admin.py index 193c264..a641883 100644 --- a/chatter/source/ext/django_chatterbot/admin.py +++ b/chatter/chatterbot/ext/django_chatterbot/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from .models import ( +from chatterbot.ext.django_chatterbot.models import ( Statement, Response, Conversation, Tag ) diff --git a/chatter/source/ext/django_chatterbot/apps.py b/chatter/chatterbot/ext/django_chatterbot/apps.py similarity index 74% rename from chatter/source/ext/django_chatterbot/apps.py rename to chatter/chatterbot/ext/django_chatterbot/apps.py index b873e3e..13f8fe0 100644 --- a/chatter/source/ext/django_chatterbot/apps.py +++ b/chatter/chatterbot/ext/django_chatterbot/apps.py @@ -3,6 +3,6 @@ from django.apps import AppConfig class DjangoChatterBotConfig(AppConfig): - name = 'chatter.source.ext.django_chatterbot' + name = 'chatterbot.ext.django_chatterbot' label = 'django_chatterbot' verbose_name = 'Django ChatterBot' diff --git a/chatter/source/ext/django_chatterbot/factories.py b/chatter/chatterbot/ext/django_chatterbot/factories.py similarity index 89% rename from chatter/source/ext/django_chatterbot/factories.py rename to chatter/chatterbot/ext/django_chatterbot/factories.py index 7367b58..4ac52b8 100644 --- a/chatter/source/ext/django_chatterbot/factories.py +++ b/chatter/chatterbot/ext/django_chatterbot/factories.py @@ -2,8 +2,8 @@ These factories are used to generate fake data for testing. """ import factory -from . import models -from ... import constants +from chatterbot.ext.django_chatterbot import models +from chatterbot import constants from factory.django import DjangoModelFactory diff --git a/chatter/source/ext/django_chatterbot/management/__init__.py b/chatter/chatterbot/ext/django_chatterbot/management/__init__.py similarity index 100% rename from chatter/source/ext/django_chatterbot/management/__init__.py rename to chatter/chatterbot/ext/django_chatterbot/management/__init__.py diff --git a/chatter/source/ext/django_chatterbot/management/commands/__init__.py b/chatter/chatterbot/ext/django_chatterbot/management/commands/__init__.py similarity index 100% rename from chatter/source/ext/django_chatterbot/management/commands/__init__.py rename to chatter/chatterbot/ext/django_chatterbot/management/commands/__init__.py diff --git a/chatter/source/ext/django_chatterbot/management/commands/train.py b/chatter/chatterbot/ext/django_chatterbot/management/commands/train.py similarity index 88% rename from chatter/source/ext/django_chatterbot/management/commands/train.py rename to chatter/chatterbot/ext/django_chatterbot/management/commands/train.py index d4810b8..50af70d 100644 --- a/chatter/source/ext/django_chatterbot/management/commands/train.py +++ b/chatter/chatterbot/ext/django_chatterbot/management/commands/train.py @@ -11,8 +11,8 @@ class Command(BaseCommand): can_import_settings = True def handle(self, *args, **options): - from ..... import ChatBot - from ... import settings + from chatterbot import ChatBot + from chatterbot.ext.django_chatterbot import settings chatterbot = ChatBot(**settings.CHATTERBOT) diff --git a/chatter/source/ext/django_chatterbot/migrations/0001_initial.py b/chatter/chatterbot/ext/django_chatterbot/migrations/0001_initial.py similarity index 100% rename from chatter/source/ext/django_chatterbot/migrations/0001_initial.py rename to chatter/chatterbot/ext/django_chatterbot/migrations/0001_initial.py diff --git a/chatter/source/ext/django_chatterbot/migrations/0002_statement_extra_data.py b/chatter/chatterbot/ext/django_chatterbot/migrations/0002_statement_extra_data.py similarity index 100% rename from chatter/source/ext/django_chatterbot/migrations/0002_statement_extra_data.py rename to chatter/chatterbot/ext/django_chatterbot/migrations/0002_statement_extra_data.py diff --git a/chatter/source/ext/django_chatterbot/migrations/0003_change_occurrence_default.py b/chatter/chatterbot/ext/django_chatterbot/migrations/0003_change_occurrence_default.py similarity index 100% rename from chatter/source/ext/django_chatterbot/migrations/0003_change_occurrence_default.py rename to chatter/chatterbot/ext/django_chatterbot/migrations/0003_change_occurrence_default.py diff --git a/chatter/source/ext/django_chatterbot/migrations/0004_rename_in_response_to.py b/chatter/chatterbot/ext/django_chatterbot/migrations/0004_rename_in_response_to.py similarity index 100% rename from chatter/source/ext/django_chatterbot/migrations/0004_rename_in_response_to.py rename to chatter/chatterbot/ext/django_chatterbot/migrations/0004_rename_in_response_to.py diff --git a/chatter/source/ext/django_chatterbot/migrations/0005_statement_created_at.py b/chatter/chatterbot/ext/django_chatterbot/migrations/0005_statement_created_at.py similarity index 100% rename from chatter/source/ext/django_chatterbot/migrations/0005_statement_created_at.py rename to chatter/chatterbot/ext/django_chatterbot/migrations/0005_statement_created_at.py diff --git a/chatter/source/ext/django_chatterbot/migrations/0006_create_conversation.py b/chatter/chatterbot/ext/django_chatterbot/migrations/0006_create_conversation.py similarity index 100% rename from chatter/source/ext/django_chatterbot/migrations/0006_create_conversation.py rename to chatter/chatterbot/ext/django_chatterbot/migrations/0006_create_conversation.py diff --git a/chatter/source/ext/django_chatterbot/migrations/0007_response_created_at.py b/chatter/chatterbot/ext/django_chatterbot/migrations/0007_response_created_at.py similarity index 100% rename from chatter/source/ext/django_chatterbot/migrations/0007_response_created_at.py rename to chatter/chatterbot/ext/django_chatterbot/migrations/0007_response_created_at.py diff --git a/chatter/source/ext/django_chatterbot/migrations/0008_update_conversations.py b/chatter/chatterbot/ext/django_chatterbot/migrations/0008_update_conversations.py similarity index 100% rename from chatter/source/ext/django_chatterbot/migrations/0008_update_conversations.py rename to chatter/chatterbot/ext/django_chatterbot/migrations/0008_update_conversations.py diff --git a/chatter/source/ext/django_chatterbot/migrations/0009_tags.py b/chatter/chatterbot/ext/django_chatterbot/migrations/0009_tags.py similarity index 100% rename from chatter/source/ext/django_chatterbot/migrations/0009_tags.py rename to chatter/chatterbot/ext/django_chatterbot/migrations/0009_tags.py diff --git a/chatter/source/ext/django_chatterbot/migrations/0010_statement_text.py b/chatter/chatterbot/ext/django_chatterbot/migrations/0010_statement_text.py similarity index 100% rename from chatter/source/ext/django_chatterbot/migrations/0010_statement_text.py rename to chatter/chatterbot/ext/django_chatterbot/migrations/0010_statement_text.py diff --git a/chatter/source/ext/django_chatterbot/migrations/0011_blank_extra_data.py b/chatter/chatterbot/ext/django_chatterbot/migrations/0011_blank_extra_data.py similarity index 100% rename from chatter/source/ext/django_chatterbot/migrations/0011_blank_extra_data.py rename to chatter/chatterbot/ext/django_chatterbot/migrations/0011_blank_extra_data.py diff --git a/chatter/source/ext/django_chatterbot/migrations/__init__.py b/chatter/chatterbot/ext/django_chatterbot/migrations/__init__.py similarity index 100% rename from chatter/source/ext/django_chatterbot/migrations/__init__.py rename to chatter/chatterbot/ext/django_chatterbot/migrations/__init__.py diff --git a/chatter/source/ext/django_chatterbot/models.py b/chatter/chatterbot/ext/django_chatterbot/models.py similarity index 90% rename from chatter/source/ext/django_chatterbot/models.py rename to chatter/chatterbot/ext/django_chatterbot/models.py index ac51c06..d82a603 100644 --- a/chatter/source/ext/django_chatterbot/models.py +++ b/chatter/chatterbot/ext/django_chatterbot/models.py @@ -1,4 +1,4 @@ -from .abstract_models import ( +from chatterbot.ext.django_chatterbot.abstract_models import ( AbstractBaseConversation, AbstractBaseResponse, AbstractBaseStatement, AbstractBaseTag ) diff --git a/chatter/source/ext/django_chatterbot/settings.py b/chatter/chatterbot/ext/django_chatterbot/settings.py similarity index 59% rename from chatter/source/ext/django_chatterbot/settings.py rename to chatter/chatterbot/ext/django_chatterbot/settings.py index 802b77d..ed5ca46 100644 --- a/chatter/source/ext/django_chatterbot/settings.py +++ b/chatter/chatterbot/ext/django_chatterbot/settings.py @@ -2,16 +2,16 @@ Default ChatterBot settings for Django. """ from django.conf import settings -from ... import constants +from chatterbot import constants CHATTERBOT_SETTINGS = getattr(settings, 'CHATTERBOT', {}) CHATTERBOT_DEFAULTS = { 'name': 'ChatterBot', - 'storage_adapter': 'chatter.source.storage.DjangoStorageAdapter', - 'input_adapter': 'chatter.source.input.VariableInputTypeAdapter', - 'output_adapter': 'chatter.source.output.OutputAdapter', + 'storage_adapter': 'chatterbot.storage.DjangoStorageAdapter', + 'input_adapter': 'chatterbot.input.VariableInputTypeAdapter', + 'output_adapter': 'chatterbot.output.OutputAdapter', 'django_app_name': constants.DEFAULT_DJANGO_APP_NAME } diff --git a/chatter/source/ext/django_chatterbot/urls.py b/chatter/chatterbot/ext/django_chatterbot/urls.py similarity index 100% rename from chatter/source/ext/django_chatterbot/urls.py rename to chatter/chatterbot/ext/django_chatterbot/urls.py diff --git a/chatter/source/ext/django_chatterbot/views.py b/chatter/chatterbot/ext/django_chatterbot/views.py similarity index 95% rename from chatter/source/ext/django_chatterbot/views.py rename to chatter/chatterbot/ext/django_chatterbot/views.py index d73408e..ff4d12b 100644 --- a/chatter/source/ext/django_chatterbot/views.py +++ b/chatter/chatterbot/ext/django_chatterbot/views.py @@ -1,8 +1,8 @@ import json from django.views.generic import View from django.http import JsonResponse -from ... import ChatBot -from . import settings +from chatterbot import ChatBot +from chatterbot.ext.django_chatterbot import settings class ChatterBotViewMixin(object): @@ -28,7 +28,7 @@ class ChatterBotViewMixin(object): Return the conversation for the session if one exists. Create a new conversation if one does not exist. """ - from .models import Conversation, Response + from chatterbot.ext.django_chatterbot.models import Conversation, Response class Obj(object): def __init__(self): diff --git a/chatter/source/ext/sqlalchemy_app/__init__.py b/chatter/chatterbot/ext/sqlalchemy_app/__init__.py similarity index 100% rename from chatter/source/ext/sqlalchemy_app/__init__.py rename to chatter/chatterbot/ext/sqlalchemy_app/__init__.py diff --git a/chatter/source/ext/sqlalchemy_app/models.py b/chatter/chatterbot/ext/sqlalchemy_app/models.py similarity index 89% rename from chatter/source/ext/sqlalchemy_app/models.py rename to chatter/chatterbot/ext/sqlalchemy_app/models.py index 9f1b0d3..cba4a47 100644 --- a/chatter/source/ext/sqlalchemy_app/models.py +++ b/chatter/chatterbot/ext/sqlalchemy_app/models.py @@ -3,9 +3,9 @@ from sqlalchemy.orm import relationship from sqlalchemy.sql import func from sqlalchemy.ext.declarative import declared_attr, declarative_base -from ...constants import TAG_NAME_MAX_LENGTH, STATEMENT_TEXT_MAX_LENGTH -from .types import UnicodeString -from ...conversation import StatementMixin +from chatterbot.constants import TAG_NAME_MAX_LENGTH, STATEMENT_TEXT_MAX_LENGTH +from chatterbot.ext.sqlalchemy_app.types import UnicodeString +from chatterbot.conversation import StatementMixin class ModelBase(object): @@ -73,8 +73,8 @@ class Statement(Base, StatementMixin): return [tag.name for tag in self.tags] def get_statement(self): - from ...conversation import Statement as StatementObject - from ...conversation import Response as ResponseObject + from chatterbot.conversation import Statement as StatementObject + from chatterbot.conversation import Response as ResponseObject statement = StatementObject( self.text, diff --git a/chatter/source/ext/sqlalchemy_app/types.py b/chatter/chatterbot/ext/sqlalchemy_app/types.py similarity index 100% rename from chatter/source/ext/sqlalchemy_app/types.py rename to chatter/chatterbot/ext/sqlalchemy_app/types.py diff --git a/chatter/source/filters.py b/chatter/chatterbot/filters.py similarity index 100% rename from chatter/source/filters.py rename to chatter/chatterbot/filters.py diff --git a/chatter/source/input/__init__.py b/chatter/chatterbot/input/__init__.py similarity index 100% rename from chatter/source/input/__init__.py rename to chatter/chatterbot/input/__init__.py diff --git a/chatter/source/input/gitter.py b/chatter/chatterbot/input/gitter.py similarity index 98% rename from chatter/source/input/gitter.py rename to chatter/chatterbot/input/gitter.py index 6ed83db..db97772 100644 --- a/chatter/source/input/gitter.py +++ b/chatter/chatterbot/input/gitter.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals from time import sleep -from . import InputAdapter -from ..conversation import Statement +from chatterbot.input import InputAdapter +from chatterbot.conversation import Statement class Gitter(InputAdapter): diff --git a/chatter/source/input/hipchat.py b/chatter/chatterbot/input/hipchat.py similarity index 97% rename from chatter/source/input/hipchat.py rename to chatter/chatterbot/input/hipchat.py index b251157..57cf4d6 100644 --- a/chatter/source/input/hipchat.py +++ b/chatter/chatterbot/input/hipchat.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals from time import sleep -from . import InputAdapter -from ..conversation import Statement +from chatterbot.input import InputAdapter +from chatterbot.conversation import Statement class HipChat(InputAdapter): diff --git a/chatter/source/input/input_adapter.py b/chatter/chatterbot/input/input_adapter.py similarity index 96% rename from chatter/source/input/input_adapter.py rename to chatter/chatterbot/input/input_adapter.py index 3bc4b08..17b1dbe 100644 --- a/chatter/source/input/input_adapter.py +++ b/chatter/chatterbot/input/input_adapter.py @@ -1,5 +1,5 @@ from __future__ import unicode_literals -from ..adapters import Adapter +from chatterbot.adapters import Adapter class InputAdapter(Adapter): diff --git a/chatter/source/input/mailgun.py b/chatter/chatterbot/input/mailgun.py similarity index 94% rename from chatter/source/input/mailgun.py rename to chatter/chatterbot/input/mailgun.py index b1fe705..199a677 100644 --- a/chatter/source/input/mailgun.py +++ b/chatter/chatterbot/input/mailgun.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals import datetime -from . import InputAdapter -from ..conversation import Statement +from chatterbot.input import InputAdapter +from chatterbot.conversation import Statement class Mailgun(InputAdapter): diff --git a/chatter/source/input/microsoft.py b/chatter/chatterbot/input/microsoft.py similarity index 97% rename from chatter/source/input/microsoft.py rename to chatter/chatterbot/input/microsoft.py index 395a3de..5e57e78 100644 --- a/chatter/source/input/microsoft.py +++ b/chatter/chatterbot/input/microsoft.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals from time import sleep -from . import InputAdapter -from ..conversation import Statement +from chatterbot.input import InputAdapter +from chatterbot.conversation import Statement class Microsoft(InputAdapter): diff --git a/chatter/source/input/terminal.py b/chatter/chatterbot/input/terminal.py similarity index 73% rename from chatter/source/input/terminal.py rename to chatter/chatterbot/input/terminal.py index e2d7ba2..2fc15f2 100644 --- a/chatter/source/input/terminal.py +++ b/chatter/chatterbot/input/terminal.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from . import InputAdapter -from ..conversation import Statement -from ..utils import input_function +from chatterbot.input import InputAdapter +from chatterbot.conversation import Statement +from chatterbot.utils import input_function class TerminalAdapter(InputAdapter): diff --git a/chatter/source/input/variable_input_type_adapter.py b/chatter/chatterbot/input/variable_input_type_adapter.py similarity index 95% rename from chatter/source/input/variable_input_type_adapter.py rename to chatter/chatterbot/input/variable_input_type_adapter.py index 9158611..2b495d9 100644 --- a/chatter/source/input/variable_input_type_adapter.py +++ b/chatter/chatterbot/input/variable_input_type_adapter.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from . import InputAdapter -from ..conversation import Statement +from chatterbot.input import InputAdapter +from chatterbot.conversation import Statement class VariableInputTypeAdapter(InputAdapter): diff --git a/chatter/source/logic/__init__.py b/chatter/chatterbot/logic/__init__.py similarity index 100% rename from chatter/source/logic/__init__.py rename to chatter/chatterbot/logic/__init__.py diff --git a/chatter/source/logic/best_match.py b/chatter/chatterbot/logic/best_match.py similarity index 100% rename from chatter/source/logic/best_match.py rename to chatter/chatterbot/logic/best_match.py diff --git a/chatter/source/logic/logic_adapter.py b/chatter/chatterbot/logic/logic_adapter.py similarity index 94% rename from chatter/source/logic/logic_adapter.py rename to chatter/chatterbot/logic/logic_adapter.py index df2c143..020c2a2 100644 --- a/chatter/source/logic/logic_adapter.py +++ b/chatter/chatterbot/logic/logic_adapter.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from ..adapters import Adapter -from ..utils import import_module +from chatterbot.adapters import Adapter +from chatterbot.utils import import_module class LogicAdapter(Adapter): @@ -17,8 +17,8 @@ class LogicAdapter(Adapter): def __init__(self, **kwargs): super(LogicAdapter, self).__init__(**kwargs) - from ..comparisons import levenshtein_distance - from ..response_selection import get_first_response + from chatterbot.comparisons import levenshtein_distance + from chatterbot.response_selection import get_first_response # Import string module parameters if 'statement_comparison_function' in kwargs: diff --git a/chatter/source/logic/low_confidence.py b/chatter/chatterbot/logic/low_confidence.py similarity index 97% rename from chatter/source/logic/low_confidence.py rename to chatter/chatterbot/logic/low_confidence.py index fb5435c..bb8ebfd 100644 --- a/chatter/source/logic/low_confidence.py +++ b/chatter/chatterbot/logic/low_confidence.py @@ -1,5 +1,5 @@ from __future__ import unicode_literals -from ..conversation import Statement +from chatterbot.conversation import Statement from .best_match import BestMatch diff --git a/chatter/source/logic/mathematical_evaluation.py b/chatter/chatterbot/logic/mathematical_evaluation.py similarity index 95% rename from chatter/source/logic/mathematical_evaluation.py rename to chatter/chatterbot/logic/mathematical_evaluation.py index 2a65fdc..f1e3cbc 100644 --- a/chatter/source/logic/mathematical_evaluation.py +++ b/chatter/chatterbot/logic/mathematical_evaluation.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from . import LogicAdapter -from ..conversation import Statement +from chatterbot.logic import LogicAdapter +from chatterbot.conversation import Statement class MathematicalEvaluation(LogicAdapter): diff --git a/chatter/source/logic/multi_adapter.py b/chatter/chatterbot/logic/multi_adapter.py similarity index 98% rename from chatter/source/logic/multi_adapter.py rename to chatter/chatterbot/logic/multi_adapter.py index 150f6c3..17e91f4 100644 --- a/chatter/source/logic/multi_adapter.py +++ b/chatter/chatterbot/logic/multi_adapter.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals from collections import Counter -from .. import utils +from chatterbot import utils from .logic_adapter import LogicAdapter @@ -13,7 +13,7 @@ class MultiLogicAdapter(LogicAdapter): """ def __init__(self, **kwargs): - super().__init__(**kwargs) + super(MultiLogicAdapter, self).__init__(**kwargs) # Logic adapters added by the chat bot self.adapters = [] diff --git a/chatter/source/logic/no_knowledge_adapter.py b/chatter/chatterbot/logic/no_knowledge_adapter.py similarity index 100% rename from chatter/source/logic/no_knowledge_adapter.py rename to chatter/chatterbot/logic/no_knowledge_adapter.py diff --git a/chatter/source/logic/specific_response.py b/chatter/chatterbot/logic/specific_response.py similarity index 94% rename from chatter/source/logic/specific_response.py rename to chatter/chatterbot/logic/specific_response.py index 2ed6da1..611d54f 100644 --- a/chatter/source/logic/specific_response.py +++ b/chatter/chatterbot/logic/specific_response.py @@ -15,7 +15,7 @@ class SpecificResponseAdapter(LogicAdapter): def __init__(self, **kwargs): super(SpecificResponseAdapter, self).__init__(**kwargs) - from ..conversation import Statement + from chatterbot.conversation import Statement self.input_text = kwargs.get('input_text') diff --git a/chatter/source/logic/time_adapter.py b/chatter/chatterbot/logic/time_adapter.py similarity index 98% rename from chatter/source/logic/time_adapter.py rename to chatter/chatterbot/logic/time_adapter.py index 3de4001..6bf6c73 100644 --- a/chatter/source/logic/time_adapter.py +++ b/chatter/chatterbot/logic/time_adapter.py @@ -79,7 +79,7 @@ class TimeLogicAdapter(LogicAdapter): return features def process(self, statement): - from ..conversation import Statement + from chatterbot.conversation import Statement now = datetime.now() diff --git a/chatter/source/output/__init__.py b/chatter/chatterbot/output/__init__.py similarity index 100% rename from chatter/source/output/__init__.py rename to chatter/chatterbot/output/__init__.py diff --git a/chatter/source/output/gitter.py b/chatter/chatterbot/output/gitter.py similarity index 100% rename from chatter/source/output/gitter.py rename to chatter/chatterbot/output/gitter.py diff --git a/chatter/source/output/hipchat.py b/chatter/chatterbot/output/hipchat.py similarity index 100% rename from chatter/source/output/hipchat.py rename to chatter/chatterbot/output/hipchat.py diff --git a/chatter/source/output/mailgun.py b/chatter/chatterbot/output/mailgun.py similarity index 100% rename from chatter/source/output/mailgun.py rename to chatter/chatterbot/output/mailgun.py diff --git a/chatter/source/output/microsoft.py b/chatter/chatterbot/output/microsoft.py similarity index 100% rename from chatter/source/output/microsoft.py rename to chatter/chatterbot/output/microsoft.py diff --git a/chatter/source/output/output_adapter.py b/chatter/chatterbot/output/output_adapter.py similarity index 93% rename from chatter/source/output/output_adapter.py rename to chatter/chatterbot/output/output_adapter.py index 880cb18..631e343 100644 --- a/chatter/source/output/output_adapter.py +++ b/chatter/chatterbot/output/output_adapter.py @@ -1,4 +1,4 @@ -from ..adapters import Adapter +from chatterbot.adapters import Adapter class OutputAdapter(Adapter): diff --git a/chatter/source/output/terminal.py b/chatter/chatterbot/output/terminal.py similarity index 100% rename from chatter/source/output/terminal.py rename to chatter/chatterbot/output/terminal.py diff --git a/chatter/source/parsing.py b/chatter/chatterbot/parsing.py similarity index 100% rename from chatter/source/parsing.py rename to chatter/chatterbot/parsing.py diff --git a/chatter/source/preprocessors.py b/chatter/chatterbot/preprocessors.py similarity index 100% rename from chatter/source/preprocessors.py rename to chatter/chatterbot/preprocessors.py diff --git a/chatter/source/response_selection.py b/chatter/chatterbot/response_selection.py similarity index 100% rename from chatter/source/response_selection.py rename to chatter/chatterbot/response_selection.py diff --git a/chatter/source/storage/__init__.py b/chatter/chatterbot/storage/__init__.py similarity index 100% rename from chatter/source/storage/__init__.py rename to chatter/chatterbot/storage/__init__.py diff --git a/chatter/source/storage/django_storage.py b/chatter/chatterbot/storage/django_storage.py similarity index 98% rename from chatter/source/storage/django_storage.py rename to chatter/chatterbot/storage/django_storage.py index 5642b2c..dea6a82 100644 --- a/chatter/source/storage/django_storage.py +++ b/chatter/chatterbot/storage/django_storage.py @@ -1,5 +1,5 @@ -from . import StorageAdapter -from .. import constants +from chatterbot.storage import StorageAdapter +from chatterbot import constants class DjangoStorageAdapter(StorageAdapter): diff --git a/chatter/source/storage/mongodb.py b/chatter/chatterbot/storage/mongodb.py similarity index 98% rename from chatter/source/storage/mongodb.py rename to chatter/chatterbot/storage/mongodb.py index 92ce5a1..744d672 100644 --- a/chatter/source/storage/mongodb.py +++ b/chatter/chatterbot/storage/mongodb.py @@ -1,4 +1,4 @@ -from . import StorageAdapter +from chatterbot.storage import StorageAdapter class Query(object): @@ -116,7 +116,7 @@ class MongoDatabaseAdapter(StorageAdapter): """ Return the class for the statement model. """ - from ..conversation import Statement + from chatterbot.conversation import Statement # Create a storage-aware statement statement = Statement @@ -128,7 +128,7 @@ class MongoDatabaseAdapter(StorageAdapter): """ Return the class for the response model. """ - from ..conversation import Response + from chatterbot.conversation import Response # Create a storage-aware response response = Response diff --git a/chatter/source/storage/sql_storage.py b/chatter/chatterbot/storage/sql_storage.py similarity index 96% rename from chatter/source/storage/sql_storage.py rename to chatter/chatterbot/storage/sql_storage.py index 21c84e6..ed1153c 100644 --- a/chatter/source/storage/sql_storage.py +++ b/chatter/chatterbot/storage/sql_storage.py @@ -1,8 +1,8 @@ -from . import StorageAdapter +from chatterbot.storage import StorageAdapter def get_response_table(response): - from ..ext.sqlalchemy_app.models import Response + from chatterbot.ext.sqlalchemy_app.models import Response return Response(text=response.text, occurrence=response.occurrence) @@ -86,28 +86,28 @@ class SQLStorageAdapter(StorageAdapter): """ Return the statement model. """ - from ..ext.sqlalchemy_app.models import Statement + from chatterbot.ext.sqlalchemy_app.models import Statement return Statement def get_response_model(self): """ Return the response model. """ - from ..ext.sqlalchemy_app.models import Response + from chatterbot.ext.sqlalchemy_app.models import Response return Response def get_conversation_model(self): """ Return the conversation model. """ - from ..ext.sqlalchemy_app.models import Conversation + from chatterbot.ext.sqlalchemy_app.models import Conversation return Conversation def get_tag_model(self): """ Return the conversation model. """ - from ..ext.sqlalchemy_app.models import Tag + from chatterbot.ext.sqlalchemy_app.models import Tag return Tag def count(self): @@ -379,14 +379,14 @@ class SQLStorageAdapter(StorageAdapter): """ Drop the database attached to a given adapter. """ - from ..ext.sqlalchemy_app.models import Base + from chatterbot.ext.sqlalchemy_app.models import Base Base.metadata.drop_all(self.engine) def create(self): """ Populate the database with the tables. """ - from ..ext.sqlalchemy_app.models import Base + from chatterbot.ext.sqlalchemy_app.models import Base Base.metadata.create_all(self.engine) def _session_finish(self, session, statement_text=None): diff --git a/chatter/source/storage/storage_adapter.py b/chatter/chatterbot/storage/storage_adapter.py similarity index 100% rename from chatter/source/storage/storage_adapter.py rename to chatter/chatterbot/storage/storage_adapter.py diff --git a/chatter/source/trainers.py b/chatter/chatterbot/trainers.py similarity index 100% rename from chatter/source/trainers.py rename to chatter/chatterbot/trainers.py diff --git a/chatter/source/utils.py b/chatter/chatterbot/utils.py similarity index 100% rename from chatter/source/utils.py rename to chatter/chatterbot/utils.py diff --git a/chatter/source/ext/django_chatterbot/__init__.py b/chatter/source/ext/django_chatterbot/__init__.py deleted file mode 100644 index c683f59..0000000 --- a/chatter/source/ext/django_chatterbot/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -default_app_config = ( - 'chatter.source.ext.django_chatterbot.apps.DjangoChatterBotConfig' -) From d7b91c4f4f695b8b46f15b5d9bf233097985d45e Mon Sep 17 00:00:00 2001 From: Bobloy Date: Thu, 3 May 2018 11:01:03 -0400 Subject: [PATCH 02/14] chatter --- chatter/chatterbot/storage/django_storage.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chatter/chatterbot/storage/django_storage.py b/chatter/chatterbot/storage/django_storage.py index dea6a82..5e11fc6 100644 --- a/chatter/chatterbot/storage/django_storage.py +++ b/chatter/chatterbot/storage/django_storage.py @@ -1,5 +1,5 @@ -from chatterbot.storage import StorageAdapter -from chatterbot import constants +from chatter.chatterbot.storage import StorageAdapter +from chatter.chatterbot import constants class DjangoStorageAdapter(StorageAdapter): From bb6a336e0e11be2756fa3a98d3e719a5bc87b7cc Mon Sep 17 00:00:00 2001 From: Bobloy Date: Thu, 3 May 2018 11:12:58 -0400 Subject: [PATCH 03/14] no djnago --- chatter/chatterbot/chatterbot.py | 6 +- .../ext/django_chatterbot/__init__.py | 3 - .../ext/django_chatterbot/abstract_models.py | 261 ------------------ .../chatterbot/ext/django_chatterbot/admin.py | 31 --- .../chatterbot/ext/django_chatterbot/apps.py | 8 - .../ext/django_chatterbot/factories.py | 42 --- .../django_chatterbot/management/__init__.py | 0 .../management/commands/__init__.py | 0 .../management/commands/train.py | 29 -- .../migrations/0001_initial.py | 39 --- .../migrations/0002_statement_extra_data.py | 21 -- .../0003_change_occurrence_default.py | 20 -- .../migrations/0004_rename_in_response_to.py | 26 -- .../migrations/0005_statement_created_at.py | 24 -- .../migrations/0006_create_conversation.py | 33 --- .../migrations/0007_response_created_at.py | 24 -- .../migrations/0008_update_conversations.py | 32 --- .../django_chatterbot/migrations/0009_tags.py | 35 --- .../migrations/0010_statement_text.py | 20 -- .../migrations/0011_blank_extra_data.py | 20 -- .../django_chatterbot/migrations/__init__.py | 0 .../ext/django_chatterbot/models.py | 34 --- .../ext/django_chatterbot/settings.py | 19 -- .../chatterbot/ext/django_chatterbot/urls.py | 11 - .../chatterbot/ext/django_chatterbot/views.py | 118 -------- .../chatterbot/ext/sqlalchemy_app/models.py | 9 +- chatter/chatterbot/input/__init__.py | 5 +- chatter/chatterbot/input/gitter.py | 4 +- chatter/chatterbot/input/hipchat.py | 4 +- chatter/chatterbot/input/input_adapter.py | 1 + chatter/chatterbot/input/mailgun.py | 4 +- chatter/chatterbot/input/microsoft.py | 4 +- chatter/chatterbot/input/terminal.py | 3 +- .../input/variable_input_type_adapter.py | 3 +- chatter/chatterbot/logic/__init__.py | 3 +- chatter/chatterbot/logic/best_match.py | 1 + chatter/chatterbot/logic/logic_adapter.py | 1 + chatter/chatterbot/logic/low_confidence.py | 2 + .../logic/mathematical_evaluation.py | 3 +- chatter/chatterbot/logic/multi_adapter.py | 3 + .../chatterbot/logic/no_knowledge_adapter.py | 1 + chatter/chatterbot/logic/specific_response.py | 1 + chatter/chatterbot/logic/time_adapter.py | 2 + chatter/chatterbot/output/__init__.py | 8 +- chatter/chatterbot/output/gitter.py | 1 + chatter/chatterbot/output/hipchat.py | 2 + chatter/chatterbot/output/mailgun.py | 1 + chatter/chatterbot/output/microsoft.py | 2 + chatter/chatterbot/output/terminal.py | 1 + chatter/chatterbot/parsing.py | 2 +- chatter/chatterbot/storage/__init__.py | 5 +- chatter/chatterbot/storage/django_storage.py | 220 --------------- chatter/chatterbot/trainers.py | 3 +- 53 files changed, 56 insertions(+), 1099 deletions(-) delete mode 100644 chatter/chatterbot/ext/django_chatterbot/__init__.py delete mode 100644 chatter/chatterbot/ext/django_chatterbot/abstract_models.py delete mode 100644 chatter/chatterbot/ext/django_chatterbot/admin.py delete mode 100644 chatter/chatterbot/ext/django_chatterbot/apps.py delete mode 100644 chatter/chatterbot/ext/django_chatterbot/factories.py delete mode 100644 chatter/chatterbot/ext/django_chatterbot/management/__init__.py delete mode 100644 chatter/chatterbot/ext/django_chatterbot/management/commands/__init__.py delete mode 100644 chatter/chatterbot/ext/django_chatterbot/management/commands/train.py delete mode 100644 chatter/chatterbot/ext/django_chatterbot/migrations/0001_initial.py delete mode 100644 chatter/chatterbot/ext/django_chatterbot/migrations/0002_statement_extra_data.py delete mode 100644 chatter/chatterbot/ext/django_chatterbot/migrations/0003_change_occurrence_default.py delete mode 100644 chatter/chatterbot/ext/django_chatterbot/migrations/0004_rename_in_response_to.py delete mode 100644 chatter/chatterbot/ext/django_chatterbot/migrations/0005_statement_created_at.py delete mode 100644 chatter/chatterbot/ext/django_chatterbot/migrations/0006_create_conversation.py delete mode 100644 chatter/chatterbot/ext/django_chatterbot/migrations/0007_response_created_at.py delete mode 100644 chatter/chatterbot/ext/django_chatterbot/migrations/0008_update_conversations.py delete mode 100644 chatter/chatterbot/ext/django_chatterbot/migrations/0009_tags.py delete mode 100644 chatter/chatterbot/ext/django_chatterbot/migrations/0010_statement_text.py delete mode 100644 chatter/chatterbot/ext/django_chatterbot/migrations/0011_blank_extra_data.py delete mode 100644 chatter/chatterbot/ext/django_chatterbot/migrations/__init__.py delete mode 100644 chatter/chatterbot/ext/django_chatterbot/models.py delete mode 100644 chatter/chatterbot/ext/django_chatterbot/settings.py delete mode 100644 chatter/chatterbot/ext/django_chatterbot/urls.py delete mode 100644 chatter/chatterbot/ext/django_chatterbot/views.py delete mode 100644 chatter/chatterbot/storage/django_storage.py diff --git a/chatter/chatterbot/chatterbot.py b/chatter/chatterbot/chatterbot.py index 2a5049d..40fd05d 100644 --- a/chatter/chatterbot/chatterbot.py +++ b/chatter/chatterbot/chatterbot.py @@ -1,9 +1,11 @@ from __future__ import unicode_literals + import logging -from .storage import StorageAdapter + +from . import utils from .input import InputAdapter from .output import OutputAdapter -from . import utils +from .storage import StorageAdapter class ChatBot(object): diff --git a/chatter/chatterbot/ext/django_chatterbot/__init__.py b/chatter/chatterbot/ext/django_chatterbot/__init__.py deleted file mode 100644 index 0bd8684..0000000 --- a/chatter/chatterbot/ext/django_chatterbot/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -default_app_config = ( - 'chatterbot.ext.django_chatterbot.apps.DjangoChatterBotConfig' -) diff --git a/chatter/chatterbot/ext/django_chatterbot/abstract_models.py b/chatter/chatterbot/ext/django_chatterbot/abstract_models.py deleted file mode 100644 index 59c9cea..0000000 --- a/chatter/chatterbot/ext/django_chatterbot/abstract_models.py +++ /dev/null @@ -1,261 +0,0 @@ -from chatterbot.conversation import StatementMixin -from chatterbot import constants -from django.db import models -from django.apps import apps -from django.utils import timezone -from django.conf import settings - - -DJANGO_APP_NAME = constants.DEFAULT_DJANGO_APP_NAME -STATEMENT_MODEL = 'Statement' -RESPONSE_MODEL = 'Response' - -if hasattr(settings, 'CHATTERBOT'): - """ - Allow related models to be overridden in the project settings. - Default to the original settings if one is not defined. - """ - DJANGO_APP_NAME = settings.CHATTERBOT.get( - 'django_app_name', - DJANGO_APP_NAME - ) - STATEMENT_MODEL = settings.CHATTERBOT.get( - 'statement_model', - STATEMENT_MODEL - ) - RESPONSE_MODEL = settings.CHATTERBOT.get( - 'response_model', - RESPONSE_MODEL - ) - - -class AbstractBaseStatement(models.Model, StatementMixin): - """ - The abstract base statement allows other models to - be created using the attributes that exist on the - default models. - """ - - text = models.CharField( - unique=True, - blank=False, - null=False, - max_length=constants.STATEMENT_TEXT_MAX_LENGTH - ) - - extra_data = models.CharField( - max_length=500, - blank=True - ) - - # This is the confidence with which the chat bot believes - # this is an accurate response. This value is set when the - # statement is returned by the chat bot. - confidence = 0 - - class Meta: - abstract = True - - def __str__(self): - if len(self.text.strip()) > 60: - return '{}...'.format(self.text[:57]) - elif len(self.text.strip()) > 0: - return self.text - return '' - - def __init__(self, *args, **kwargs): - super(AbstractBaseStatement, self).__init__(*args, **kwargs) - - # Responses to be saved if the statement is updated with the storage adapter - self.response_statement_cache = [] - - @property - def in_response_to(self): - """ - Return the response objects that are for this statement. - """ - ResponseModel = apps.get_model(DJANGO_APP_NAME, RESPONSE_MODEL) - return ResponseModel.objects.filter(statement=self) - - def add_extra_data(self, key, value): - """ - Add extra data to the extra_data field. - """ - import json - - if not self.extra_data: - self.extra_data = '{}' - - extra_data = json.loads(self.extra_data) - extra_data[key] = value - - self.extra_data = json.dumps(extra_data) - - def add_tags(self, tags): - """ - Add a list of strings to the statement as tags. - (Overrides the method from StatementMixin) - """ - for tag in tags: - self.tags.create( - name=tag - ) - - def add_response(self, statement): - """ - Add a response to this statement. - """ - self.response_statement_cache.append(statement) - - def remove_response(self, response_text): - """ - Removes a response from the statement's response list based - on the value of the response text. - - :param response_text: The text of the response to be removed. - :type response_text: str - """ - is_deleted = False - response = self.in_response.filter(response__text=response_text) - - if response.exists(): - is_deleted = True - - return is_deleted - - def get_response_count(self, statement): - """ - Find the number of times that the statement has been used - as a response to the current statement. - - :param statement: The statement object to get the count for. - :type statement: chatterbot.conversation.Statement - - :returns: Return the number of times the statement has been used as a response. - :rtype: int - """ - return self.in_response.filter(response__text=statement.text).count() - - def serialize(self): - """ - :returns: A dictionary representation of the statement object. - :rtype: dict - """ - import json - data = {} - - if not self.extra_data: - self.extra_data = '{}' - - data['text'] = self.text - data['in_response_to'] = [] - data['extra_data'] = json.loads(self.extra_data) - - for response in self.in_response.all(): - data['in_response_to'].append(response.serialize()) - - return data - - -class AbstractBaseResponse(models.Model): - """ - The abstract base response allows other models to - be created using the attributes that exist on the - default models. - """ - - statement = models.ForeignKey( - STATEMENT_MODEL, - related_name='in_response', - on_delete=models.CASCADE - ) - - response = models.ForeignKey( - STATEMENT_MODEL, - related_name='responses', - on_delete=models.CASCADE - ) - - created_at = models.DateTimeField( - default=timezone.now, - help_text='The date and time that this response was created at.' - ) - - class Meta: - abstract = True - - @property - def occurrence(self): - """ - Return a count of the number of times this response has occurred. - """ - ResponseModel = apps.get_model(DJANGO_APP_NAME, RESPONSE_MODEL) - - return ResponseModel.objects.filter( - statement__text=self.statement.text, - response__text=self.response.text - ).count() - - def __str__(self): - statement = self.statement.text - response = self.response.text - return '{} => {}'.format( - statement if len(statement) <= 20 else statement[:17] + '...', - response if len(response) <= 40 else response[:37] + '...' - ) - - def serialize(self): - """ - :returns: A dictionary representation of the statement object. - :rtype: dict - """ - data = {} - - data['text'] = self.response.text - data['created_at'] = self.created_at.isoformat() - data['occurrence'] = self.occurrence - - return data - - -class AbstractBaseConversation(models.Model): - """ - The abstract base conversation allows other models to - be created using the attributes that exist on the - default models. - """ - - responses = models.ManyToManyField( - RESPONSE_MODEL, - related_name='conversations', - help_text='The responses in this conversation.' - ) - - class Meta: - abstract = True - - def __str__(self): - return str(self.id) - - -class AbstractBaseTag(models.Model): - """ - The abstract base tag allows other models to - be created using the attributes that exist on the - default models. - """ - - name = models.SlugField( - max_length=constants.TAG_NAME_MAX_LENGTH - ) - - statements = models.ManyToManyField( - STATEMENT_MODEL, - related_name='tags' - ) - - class Meta: - abstract = True - - def __str__(self): - return self.name diff --git a/chatter/chatterbot/ext/django_chatterbot/admin.py b/chatter/chatterbot/ext/django_chatterbot/admin.py deleted file mode 100644 index a641883..0000000 --- a/chatter/chatterbot/ext/django_chatterbot/admin.py +++ /dev/null @@ -1,31 +0,0 @@ -from django.contrib import admin -from chatterbot.ext.django_chatterbot.models import ( - Statement, Response, Conversation, Tag -) - - -class StatementAdmin(admin.ModelAdmin): - list_display = ('text', ) - list_filter = ('text', ) - search_fields = ('text', ) - - -class ResponseAdmin(admin.ModelAdmin): - list_display = ('statement', 'response', 'occurrence', ) - search_fields = ['statement__text', 'response__text'] - - -class ConversationAdmin(admin.ModelAdmin): - list_display = ('id', ) - - -class TagAdmin(admin.ModelAdmin): - list_display = ('name', ) - list_filter = ('name', ) - search_fields = ('name', ) - - -admin.site.register(Statement, StatementAdmin) -admin.site.register(Response, ResponseAdmin) -admin.site.register(Conversation, ConversationAdmin) -admin.site.register(Tag, TagAdmin) diff --git a/chatter/chatterbot/ext/django_chatterbot/apps.py b/chatter/chatterbot/ext/django_chatterbot/apps.py deleted file mode 100644 index 13f8fe0..0000000 --- a/chatter/chatterbot/ext/django_chatterbot/apps.py +++ /dev/null @@ -1,8 +0,0 @@ -from django.apps import AppConfig - - -class DjangoChatterBotConfig(AppConfig): - - name = 'chatterbot.ext.django_chatterbot' - label = 'django_chatterbot' - verbose_name = 'Django ChatterBot' diff --git a/chatter/chatterbot/ext/django_chatterbot/factories.py b/chatter/chatterbot/ext/django_chatterbot/factories.py deleted file mode 100644 index 4ac52b8..0000000 --- a/chatter/chatterbot/ext/django_chatterbot/factories.py +++ /dev/null @@ -1,42 +0,0 @@ -""" -These factories are used to generate fake data for testing. -""" -import factory -from chatterbot.ext.django_chatterbot import models -from chatterbot import constants -from factory.django import DjangoModelFactory - - -class StatementFactory(DjangoModelFactory): - - text = factory.Faker( - 'text', - max_nb_chars=constants.STATEMENT_TEXT_MAX_LENGTH - ) - - class Meta: - model = models.Statement - - -class ResponseFactory(DjangoModelFactory): - - statement = factory.SubFactory(StatementFactory) - - response = factory.SubFactory(StatementFactory) - - class Meta: - model = models.Response - - -class ConversationFactory(DjangoModelFactory): - - class Meta: - model = models.Conversation - - -class TagFactory(DjangoModelFactory): - - name = factory.Faker('word') - - class Meta: - model = models.Tag diff --git a/chatter/chatterbot/ext/django_chatterbot/management/__init__.py b/chatter/chatterbot/ext/django_chatterbot/management/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/chatter/chatterbot/ext/django_chatterbot/management/commands/__init__.py b/chatter/chatterbot/ext/django_chatterbot/management/commands/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/chatter/chatterbot/ext/django_chatterbot/management/commands/train.py b/chatter/chatterbot/ext/django_chatterbot/management/commands/train.py deleted file mode 100644 index 50af70d..0000000 --- a/chatter/chatterbot/ext/django_chatterbot/management/commands/train.py +++ /dev/null @@ -1,29 +0,0 @@ -from django.core.management.base import BaseCommand - - -class Command(BaseCommand): - """ - A Django management command for calling a - chat bot's training method. - """ - - help = 'Trains the database used by the chat bot' - can_import_settings = True - - def handle(self, *args, **options): - from chatterbot import ChatBot - from chatterbot.ext.django_chatterbot import settings - - chatterbot = ChatBot(**settings.CHATTERBOT) - - chatterbot.train(chatterbot.training_data) - - # Django 1.8 does not define SUCCESS - if hasattr(self.style, 'SUCCESS'): - style = self.style.SUCCESS - else: - style = self.style.NOTICE - - self.stdout.write(style('Starting training...')) - training_class = chatterbot.trainer.__class__.__name__ - self.stdout.write(style('ChatterBot trained using "%s"' % training_class)) diff --git a/chatter/chatterbot/ext/django_chatterbot/migrations/0001_initial.py b/chatter/chatterbot/ext/django_chatterbot/migrations/0001_initial.py deleted file mode 100644 index 9c20907..0000000 --- a/chatter/chatterbot/ext/django_chatterbot/migrations/0001_initial.py +++ /dev/null @@ -1,39 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [] - - operations = [ - migrations.CreateModel( - name='Response', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('occurrence', models.PositiveIntegerField(default=0)), - ], - ), - migrations.CreateModel( - name='Statement', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('text', models.CharField(max_length=255, unique=True)), - ], - ), - migrations.AddField( - model_name='response', - name='response', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='django_chatterbot.Statement'), - ), - migrations.AddField( - model_name='response', - name='statement', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='in_response_to', to='django_chatterbot.Statement'), - ), - ] diff --git a/chatter/chatterbot/ext/django_chatterbot/migrations/0002_statement_extra_data.py b/chatter/chatterbot/ext/django_chatterbot/migrations/0002_statement_extra_data.py deleted file mode 100644 index 5ed2f4a..0000000 --- a/chatter/chatterbot/ext/django_chatterbot/migrations/0002_statement_extra_data.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.2 on 2016-10-30 12:13 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('django_chatterbot', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='statement', - name='extra_data', - field=models.CharField(default='{}', max_length=500), - preserve_default=False, - ), - ] diff --git a/chatter/chatterbot/ext/django_chatterbot/migrations/0003_change_occurrence_default.py b/chatter/chatterbot/ext/django_chatterbot/migrations/0003_change_occurrence_default.py deleted file mode 100644 index 8da6869..0000000 --- a/chatter/chatterbot/ext/django_chatterbot/migrations/0003_change_occurrence_default.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9 on 2016-12-12 00:06 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('django_chatterbot', '0002_statement_extra_data'), - ] - - operations = [ - migrations.AlterField( - model_name='response', - name='occurrence', - field=models.PositiveIntegerField(default=1), - ), - ] diff --git a/chatter/chatterbot/ext/django_chatterbot/migrations/0004_rename_in_response_to.py b/chatter/chatterbot/ext/django_chatterbot/migrations/0004_rename_in_response_to.py deleted file mode 100644 index 7860d49..0000000 --- a/chatter/chatterbot/ext/django_chatterbot/migrations/0004_rename_in_response_to.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.3 on 2016-12-04 23:52 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('django_chatterbot', '0003_change_occurrence_default'), - ] - - operations = [ - migrations.AlterField( - model_name='response', - name='statement', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='in_response', to='django_chatterbot.Statement'), - ), - migrations.AlterField( - model_name='response', - name='response', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='responses', to='django_chatterbot.Statement'), - ), - ] diff --git a/chatter/chatterbot/ext/django_chatterbot/migrations/0005_statement_created_at.py b/chatter/chatterbot/ext/django_chatterbot/migrations/0005_statement_created_at.py deleted file mode 100644 index 7b38f00..0000000 --- a/chatter/chatterbot/ext/django_chatterbot/migrations/0005_statement_created_at.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.1 on 2016-12-29 19:20 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('django_chatterbot', '0004_rename_in_response_to'), - ] - - operations = [ - migrations.AddField( - model_name='statement', - name='created_at', - field=models.DateTimeField( - default=django.utils.timezone.now, - help_text='The date and time that this statement was created at.' - ), - ), - ] diff --git a/chatter/chatterbot/ext/django_chatterbot/migrations/0006_create_conversation.py b/chatter/chatterbot/ext/django_chatterbot/migrations/0006_create_conversation.py deleted file mode 100644 index 1cf95d9..0000000 --- a/chatter/chatterbot/ext/django_chatterbot/migrations/0006_create_conversation.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9 on 2017-01-17 07:02 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('django_chatterbot', '0005_statement_created_at'), - ] - - operations = [ - migrations.CreateModel( - name='Conversation', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ], - ), - migrations.AlterField( - model_name='statement', - name='created_at', - field=models.DateTimeField(default=django.utils.timezone.now, help_text='The date and time that this statement was created at.'), - ), - migrations.AddField( - model_name='conversation', - name='statements', - field=models.ManyToManyField(help_text='The statements in this conversation.', related_name='conversation', to='django_chatterbot.Statement'), - ), - ] diff --git a/chatter/chatterbot/ext/django_chatterbot/migrations/0007_response_created_at.py b/chatter/chatterbot/ext/django_chatterbot/migrations/0007_response_created_at.py deleted file mode 100644 index 1a0b5ac..0000000 --- a/chatter/chatterbot/ext/django_chatterbot/migrations/0007_response_created_at.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11 on 2017-07-18 00:16 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('django_chatterbot', '0006_create_conversation'), - ] - - operations = [ - migrations.AddField( - model_name='response', - name='created_at', - field=models.DateTimeField( - default=django.utils.timezone.now, - help_text='The date and time that this response was created at.' - ), - ), - ] diff --git a/chatter/chatterbot/ext/django_chatterbot/migrations/0008_update_conversations.py b/chatter/chatterbot/ext/django_chatterbot/migrations/0008_update_conversations.py deleted file mode 100644 index f3bd720..0000000 --- a/chatter/chatterbot/ext/django_chatterbot/migrations/0008_update_conversations.py +++ /dev/null @@ -1,32 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11 on 2017-07-18 11:25 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('django_chatterbot', '0007_response_created_at'), - ] - - operations = [ - migrations.RemoveField( - model_name='conversation', - name='statements', - ), - migrations.RemoveField( - model_name='response', - name='occurrence', - ), - migrations.RemoveField( - model_name='statement', - name='created_at', - ), - migrations.AddField( - model_name='conversation', - name='responses', - field=models.ManyToManyField(help_text='The responses in this conversation.', related_name='conversations', to='django_chatterbot.Response'), - ), - ] diff --git a/chatter/chatterbot/ext/django_chatterbot/migrations/0009_tags.py b/chatter/chatterbot/ext/django_chatterbot/migrations/0009_tags.py deleted file mode 100644 index ee71713..0000000 --- a/chatter/chatterbot/ext/django_chatterbot/migrations/0009_tags.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11a1 on 2017-07-07 00:12 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('django_chatterbot', '0008_update_conversations'), - ] - - operations = [ - migrations.CreateModel( - name='Tag', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.SlugField()), - ], - options={ - 'abstract': False, - }, - ), - migrations.AlterField( - model_name='statement', - name='text', - field=models.CharField(max_length=255, unique=True), - ), - migrations.AddField( - model_name='tag', - name='statements', - field=models.ManyToManyField(related_name='tags', to='django_chatterbot.Statement'), - ), - ] diff --git a/chatter/chatterbot/ext/django_chatterbot/migrations/0010_statement_text.py b/chatter/chatterbot/ext/django_chatterbot/migrations/0010_statement_text.py deleted file mode 100644 index 84940a7..0000000 --- a/chatter/chatterbot/ext/django_chatterbot/migrations/0010_statement_text.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.4 on 2017-08-16 00:56 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('django_chatterbot', '0009_tags'), - ] - - operations = [ - migrations.AlterField( - model_name='statement', - name='text', - field=models.CharField(max_length=400, unique=True), - ), - ] diff --git a/chatter/chatterbot/ext/django_chatterbot/migrations/0011_blank_extra_data.py b/chatter/chatterbot/ext/django_chatterbot/migrations/0011_blank_extra_data.py deleted file mode 100644 index 4f7b327..0000000 --- a/chatter/chatterbot/ext/django_chatterbot/migrations/0011_blank_extra_data.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.4 on 2017-08-20 13:55 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('django_chatterbot', '0010_statement_text'), - ] - - operations = [ - migrations.AlterField( - model_name='statement', - name='extra_data', - field=models.CharField(blank=True, max_length=500), - ), - ] diff --git a/chatter/chatterbot/ext/django_chatterbot/migrations/__init__.py b/chatter/chatterbot/ext/django_chatterbot/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/chatter/chatterbot/ext/django_chatterbot/models.py b/chatter/chatterbot/ext/django_chatterbot/models.py deleted file mode 100644 index d82a603..0000000 --- a/chatter/chatterbot/ext/django_chatterbot/models.py +++ /dev/null @@ -1,34 +0,0 @@ -from chatterbot.ext.django_chatterbot.abstract_models import ( - AbstractBaseConversation, AbstractBaseResponse, - AbstractBaseStatement, AbstractBaseTag -) - - -class Statement(AbstractBaseStatement): - """ - A statement represents a single spoken entity, sentence or - phrase that someone can say. - """ - pass - - -class Response(AbstractBaseResponse): - """ - A connection between a statement and anther statement - that response to it. - """ - pass - - -class Conversation(AbstractBaseConversation): - """ - A sequence of statements representing a conversation. - """ - pass - - -class Tag(AbstractBaseTag): - """ - A label that categorizes a statement. - """ - pass diff --git a/chatter/chatterbot/ext/django_chatterbot/settings.py b/chatter/chatterbot/ext/django_chatterbot/settings.py deleted file mode 100644 index ed5ca46..0000000 --- a/chatter/chatterbot/ext/django_chatterbot/settings.py +++ /dev/null @@ -1,19 +0,0 @@ -""" -Default ChatterBot settings for Django. -""" -from django.conf import settings -from chatterbot import constants - - -CHATTERBOT_SETTINGS = getattr(settings, 'CHATTERBOT', {}) - -CHATTERBOT_DEFAULTS = { - 'name': 'ChatterBot', - 'storage_adapter': 'chatterbot.storage.DjangoStorageAdapter', - 'input_adapter': 'chatterbot.input.VariableInputTypeAdapter', - 'output_adapter': 'chatterbot.output.OutputAdapter', - 'django_app_name': constants.DEFAULT_DJANGO_APP_NAME -} - -CHATTERBOT = CHATTERBOT_DEFAULTS.copy() -CHATTERBOT.update(CHATTERBOT_SETTINGS) diff --git a/chatter/chatterbot/ext/django_chatterbot/urls.py b/chatter/chatterbot/ext/django_chatterbot/urls.py deleted file mode 100644 index 079005d..0000000 --- a/chatter/chatterbot/ext/django_chatterbot/urls.py +++ /dev/null @@ -1,11 +0,0 @@ -from django.conf.urls import url -from .views import ChatterBotView - - -urlpatterns = [ - url( - r'^$', - ChatterBotView.as_view(), - name='chatterbot', - ), -] diff --git a/chatter/chatterbot/ext/django_chatterbot/views.py b/chatter/chatterbot/ext/django_chatterbot/views.py deleted file mode 100644 index ff4d12b..0000000 --- a/chatter/chatterbot/ext/django_chatterbot/views.py +++ /dev/null @@ -1,118 +0,0 @@ -import json -from django.views.generic import View -from django.http import JsonResponse -from chatterbot import ChatBot -from chatterbot.ext.django_chatterbot import settings - - -class ChatterBotViewMixin(object): - """ - Subclass this mixin for access to the 'chatterbot' attribute. - """ - - chatterbot = ChatBot(**settings.CHATTERBOT) - - def validate(self, data): - """ - Validate the data recieved from the client. - - * The data should contain a text attribute. - """ - from django.core.exceptions import ValidationError - - if 'text' not in data: - raise ValidationError('The attribute "text" is required.') - - def get_conversation(self, request): - """ - Return the conversation for the session if one exists. - Create a new conversation if one does not exist. - """ - from chatterbot.ext.django_chatterbot.models import Conversation, Response - - class Obj(object): - def __init__(self): - self.id = None - self.statements = [] - - conversation = Obj() - - conversation.id = request.session.get('conversation_id', 0) - existing_conversation = False - try: - Conversation.objects.get(id=conversation.id) - existing_conversation = True - - except Conversation.DoesNotExist: - conversation_id = self.chatterbot.storage.create_conversation() - request.session['conversation_id'] = conversation_id - conversation.id = conversation_id - - if existing_conversation: - responses = Response.objects.filter( - conversations__id=conversation.id - ) - - for response in responses: - conversation.statements.append(response.statement.serialize()) - conversation.statements.append(response.response.serialize()) - - return conversation - - -class ChatterBotView(ChatterBotViewMixin, View): - """ - Provide an API endpoint to interact with ChatterBot. - """ - - def post(self, request, *args, **kwargs): - """ - Return a response to the statement in the posted data. - """ - input_data = json.loads(request.read().decode('utf-8')) - - self.validate(input_data) - - conversation = self.get_conversation(request) - - response = self.chatterbot.get_response(input_data, conversation.id) - response_data = response.serialize() - - return JsonResponse(response_data, status=200) - - def get(self, request, *args, **kwargs): - """ - Return data corresponding to the current conversation. - """ - conversation = self.get_conversation(request) - - data = { - 'detail': 'You should make a POST request to this endpoint.', - 'name': self.chatterbot.name, - 'conversation': conversation.statements - } - - # Return a method not allowed response - return JsonResponse(data, status=405) - - def patch(self, request, *args, **kwargs): - """ - The patch method is not allowed for this endpoint. - """ - data = { - 'detail': 'You should make a POST request to this endpoint.' - } - - # Return a method not allowed response - return JsonResponse(data, status=405) - - def delete(self, request, *args, **kwargs): - """ - The delete method is not allowed for this endpoint. - """ - data = { - 'detail': 'You should make a POST request to this endpoint.' - } - - # Return a method not allowed response - return JsonResponse(data, status=405) diff --git a/chatter/chatterbot/ext/sqlalchemy_app/models.py b/chatter/chatterbot/ext/sqlalchemy_app/models.py index cba4a47..ae08193 100644 --- a/chatter/chatterbot/ext/sqlalchemy_app/models.py +++ b/chatter/chatterbot/ext/sqlalchemy_app/models.py @@ -1,11 +1,10 @@ +from chatterbot.constants import TAG_NAME_MAX_LENGTH, STATEMENT_TEXT_MAX_LENGTH +from chatterbot.conversation import StatementMixin +from chatterbot.ext.sqlalchemy_app.types import UnicodeString from sqlalchemy import Table, Column, Integer, DateTime, ForeignKey, PickleType +from sqlalchemy.ext.declarative import declared_attr, declarative_base from sqlalchemy.orm import relationship from sqlalchemy.sql import func -from sqlalchemy.ext.declarative import declared_attr, declarative_base - -from chatterbot.constants import TAG_NAME_MAX_LENGTH, STATEMENT_TEXT_MAX_LENGTH -from chatterbot.ext.sqlalchemy_app.types import UnicodeString -from chatterbot.conversation import StatementMixin class ModelBase(object): diff --git a/chatter/chatterbot/input/__init__.py b/chatter/chatterbot/input/__init__.py index 34d9568..625b583 100644 --- a/chatter/chatterbot/input/__init__.py +++ b/chatter/chatterbot/input/__init__.py @@ -1,12 +1,11 @@ -from .input_adapter import InputAdapter -from .microsoft import Microsoft from .gitter import Gitter from .hipchat import HipChat +from .input_adapter import InputAdapter from .mailgun import Mailgun +from .microsoft import Microsoft from .terminal import TerminalAdapter from .variable_input_type_adapter import VariableInputTypeAdapter - __all__ = ( 'InputAdapter', 'Microsoft', diff --git a/chatter/chatterbot/input/gitter.py b/chatter/chatterbot/input/gitter.py index db97772..1b6d01f 100644 --- a/chatter/chatterbot/input/gitter.py +++ b/chatter/chatterbot/input/gitter.py @@ -1,7 +1,9 @@ from __future__ import unicode_literals + from time import sleep -from chatterbot.input import InputAdapter + from chatterbot.conversation import Statement +from chatterbot.input import InputAdapter class Gitter(InputAdapter): diff --git a/chatter/chatterbot/input/hipchat.py b/chatter/chatterbot/input/hipchat.py index 57cf4d6..70c52bc 100644 --- a/chatter/chatterbot/input/hipchat.py +++ b/chatter/chatterbot/input/hipchat.py @@ -1,7 +1,9 @@ from __future__ import unicode_literals + from time import sleep -from chatterbot.input import InputAdapter + from chatterbot.conversation import Statement +from chatterbot.input import InputAdapter class HipChat(InputAdapter): diff --git a/chatter/chatterbot/input/input_adapter.py b/chatter/chatterbot/input/input_adapter.py index 17b1dbe..46fb3a5 100644 --- a/chatter/chatterbot/input/input_adapter.py +++ b/chatter/chatterbot/input/input_adapter.py @@ -1,4 +1,5 @@ from __future__ import unicode_literals + from chatterbot.adapters import Adapter diff --git a/chatter/chatterbot/input/mailgun.py b/chatter/chatterbot/input/mailgun.py index 199a677..9807a79 100644 --- a/chatter/chatterbot/input/mailgun.py +++ b/chatter/chatterbot/input/mailgun.py @@ -1,7 +1,9 @@ from __future__ import unicode_literals + import datetime -from chatterbot.input import InputAdapter + from chatterbot.conversation import Statement +from chatterbot.input import InputAdapter class Mailgun(InputAdapter): diff --git a/chatter/chatterbot/input/microsoft.py b/chatter/chatterbot/input/microsoft.py index 5e57e78..3d58dd8 100644 --- a/chatter/chatterbot/input/microsoft.py +++ b/chatter/chatterbot/input/microsoft.py @@ -1,7 +1,9 @@ from __future__ import unicode_literals + from time import sleep -from chatterbot.input import InputAdapter + from chatterbot.conversation import Statement +from chatterbot.input import InputAdapter class Microsoft(InputAdapter): diff --git a/chatter/chatterbot/input/terminal.py b/chatter/chatterbot/input/terminal.py index 2fc15f2..40521d2 100644 --- a/chatter/chatterbot/input/terminal.py +++ b/chatter/chatterbot/input/terminal.py @@ -1,6 +1,7 @@ from __future__ import unicode_literals -from chatterbot.input import InputAdapter + from chatterbot.conversation import Statement +from chatterbot.input import InputAdapter from chatterbot.utils import input_function diff --git a/chatter/chatterbot/input/variable_input_type_adapter.py b/chatter/chatterbot/input/variable_input_type_adapter.py index 2b495d9..c0bd8cb 100644 --- a/chatter/chatterbot/input/variable_input_type_adapter.py +++ b/chatter/chatterbot/input/variable_input_type_adapter.py @@ -1,6 +1,7 @@ from __future__ import unicode_literals -from chatterbot.input import InputAdapter + from chatterbot.conversation import Statement +from chatterbot.input import InputAdapter class VariableInputTypeAdapter(InputAdapter): diff --git a/chatter/chatterbot/logic/__init__.py b/chatter/chatterbot/logic/__init__.py index ecb1020..1930556 100644 --- a/chatter/chatterbot/logic/__init__.py +++ b/chatter/chatterbot/logic/__init__.py @@ -1,5 +1,5 @@ -from .logic_adapter import LogicAdapter from .best_match import BestMatch +from .logic_adapter import LogicAdapter from .low_confidence import LowConfidenceAdapter from .mathematical_evaluation import MathematicalEvaluation from .multi_adapter import MultiLogicAdapter @@ -7,7 +7,6 @@ from .no_knowledge_adapter import NoKnowledgeAdapter from .specific_response import SpecificResponseAdapter from .time_adapter import TimeLogicAdapter - __all__ = ( 'LogicAdapter', 'BestMatch', diff --git a/chatter/chatterbot/logic/best_match.py b/chatter/chatterbot/logic/best_match.py index 712c8f9..5c48121 100644 --- a/chatter/chatterbot/logic/best_match.py +++ b/chatter/chatterbot/logic/best_match.py @@ -1,4 +1,5 @@ from __future__ import unicode_literals + from .logic_adapter import LogicAdapter diff --git a/chatter/chatterbot/logic/logic_adapter.py b/chatter/chatterbot/logic/logic_adapter.py index 020c2a2..68f8088 100644 --- a/chatter/chatterbot/logic/logic_adapter.py +++ b/chatter/chatterbot/logic/logic_adapter.py @@ -1,4 +1,5 @@ from __future__ import unicode_literals + from chatterbot.adapters import Adapter from chatterbot.utils import import_module diff --git a/chatter/chatterbot/logic/low_confidence.py b/chatter/chatterbot/logic/low_confidence.py index bb8ebfd..2e9dd65 100644 --- a/chatter/chatterbot/logic/low_confidence.py +++ b/chatter/chatterbot/logic/low_confidence.py @@ -1,5 +1,7 @@ from __future__ import unicode_literals + from chatterbot.conversation import Statement + from .best_match import BestMatch diff --git a/chatter/chatterbot/logic/mathematical_evaluation.py b/chatter/chatterbot/logic/mathematical_evaluation.py index f1e3cbc..02af55e 100644 --- a/chatter/chatterbot/logic/mathematical_evaluation.py +++ b/chatter/chatterbot/logic/mathematical_evaluation.py @@ -1,6 +1,7 @@ from __future__ import unicode_literals -from chatterbot.logic import LogicAdapter + from chatterbot.conversation import Statement +from chatterbot.logic import LogicAdapter class MathematicalEvaluation(LogicAdapter): diff --git a/chatter/chatterbot/logic/multi_adapter.py b/chatter/chatterbot/logic/multi_adapter.py index 17e91f4..145424a 100644 --- a/chatter/chatterbot/logic/multi_adapter.py +++ b/chatter/chatterbot/logic/multi_adapter.py @@ -1,6 +1,9 @@ from __future__ import unicode_literals + from collections import Counter + from chatterbot import utils + from .logic_adapter import LogicAdapter diff --git a/chatter/chatterbot/logic/no_knowledge_adapter.py b/chatter/chatterbot/logic/no_knowledge_adapter.py index 59b11fd..55208b4 100644 --- a/chatter/chatterbot/logic/no_knowledge_adapter.py +++ b/chatter/chatterbot/logic/no_knowledge_adapter.py @@ -1,4 +1,5 @@ from __future__ import unicode_literals + from .logic_adapter import LogicAdapter diff --git a/chatter/chatterbot/logic/specific_response.py b/chatter/chatterbot/logic/specific_response.py index 611d54f..d3fa38a 100644 --- a/chatter/chatterbot/logic/specific_response.py +++ b/chatter/chatterbot/logic/specific_response.py @@ -1,4 +1,5 @@ from __future__ import unicode_literals + from .logic_adapter import LogicAdapter diff --git a/chatter/chatterbot/logic/time_adapter.py b/chatter/chatterbot/logic/time_adapter.py index 6bf6c73..5047210 100644 --- a/chatter/chatterbot/logic/time_adapter.py +++ b/chatter/chatterbot/logic/time_adapter.py @@ -1,5 +1,7 @@ from __future__ import unicode_literals + from datetime import datetime + from .logic_adapter import LogicAdapter diff --git a/chatter/chatterbot/output/__init__.py b/chatter/chatterbot/output/__init__.py index 0d64ca4..80abe4f 100644 --- a/chatter/chatterbot/output/__init__.py +++ b/chatter/chatterbot/output/__init__.py @@ -1,9 +1,9 @@ -from .output_adapter import OutputAdapter -from .microsoft import Microsoft -from .terminal import TerminalAdapter -from .mailgun import Mailgun from .gitter import Gitter from .hipchat import HipChat +from .mailgun import Mailgun +from .microsoft import Microsoft +from .output_adapter import OutputAdapter +from .terminal import TerminalAdapter __all__ = ( 'OutputAdapter', diff --git a/chatter/chatterbot/output/gitter.py b/chatter/chatterbot/output/gitter.py index db654e2..ba01fa8 100644 --- a/chatter/chatterbot/output/gitter.py +++ b/chatter/chatterbot/output/gitter.py @@ -1,4 +1,5 @@ from __future__ import unicode_literals + from .output_adapter import OutputAdapter diff --git a/chatter/chatterbot/output/hipchat.py b/chatter/chatterbot/output/hipchat.py index 4eaa9a7..2546092 100644 --- a/chatter/chatterbot/output/hipchat.py +++ b/chatter/chatterbot/output/hipchat.py @@ -1,5 +1,7 @@ from __future__ import unicode_literals + import json + from .output_adapter import OutputAdapter diff --git a/chatter/chatterbot/output/mailgun.py b/chatter/chatterbot/output/mailgun.py index 6bb4954..71a9a7a 100644 --- a/chatter/chatterbot/output/mailgun.py +++ b/chatter/chatterbot/output/mailgun.py @@ -1,4 +1,5 @@ from __future__ import unicode_literals + from .output_adapter import OutputAdapter diff --git a/chatter/chatterbot/output/microsoft.py b/chatter/chatterbot/output/microsoft.py index 177dc35..816fc97 100644 --- a/chatter/chatterbot/output/microsoft.py +++ b/chatter/chatterbot/output/microsoft.py @@ -1,5 +1,7 @@ from __future__ import unicode_literals + import json + from .output_adapter import OutputAdapter diff --git a/chatter/chatterbot/output/terminal.py b/chatter/chatterbot/output/terminal.py index f189aba..8ab63e1 100644 --- a/chatter/chatterbot/output/terminal.py +++ b/chatter/chatterbot/output/terminal.py @@ -1,4 +1,5 @@ from __future__ import unicode_literals + from .output_adapter import OutputAdapter diff --git a/chatter/chatterbot/parsing.py b/chatter/chatterbot/parsing.py index cf955ff..d7ad4d2 100644 --- a/chatter/chatterbot/parsing.py +++ b/chatter/chatterbot/parsing.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- +import calendar import re from datetime import timedelta, datetime -import calendar # Variations of dates that the parser can capture year_variations = ['year', 'years', 'yrs'] diff --git a/chatter/chatterbot/storage/__init__.py b/chatter/chatterbot/storage/__init__.py index 2b4e286..c456292 100644 --- a/chatter/chatterbot/storage/__init__.py +++ b/chatter/chatterbot/storage/__init__.py @@ -1,12 +1,9 @@ -from .storage_adapter import StorageAdapter -from .django_storage import DjangoStorageAdapter from .mongodb import MongoDatabaseAdapter from .sql_storage import SQLStorageAdapter - +from .storage_adapter import StorageAdapter __all__ = ( 'StorageAdapter', - 'DjangoStorageAdapter', 'MongoDatabaseAdapter', 'SQLStorageAdapter', ) diff --git a/chatter/chatterbot/storage/django_storage.py b/chatter/chatterbot/storage/django_storage.py deleted file mode 100644 index 5e11fc6..0000000 --- a/chatter/chatterbot/storage/django_storage.py +++ /dev/null @@ -1,220 +0,0 @@ -from chatter.chatterbot.storage import StorageAdapter -from chatter.chatterbot import constants - - -class DjangoStorageAdapter(StorageAdapter): - """ - Storage adapter that allows ChatterBot to interact with - Django storage backends. - """ - - def __init__(self, **kwargs): - super(DjangoStorageAdapter, self).__init__(**kwargs) - - self.adapter_supports_queries = False - self.django_app_name = kwargs.get( - 'django_app_name', - constants.DEFAULT_DJANGO_APP_NAME - ) - - def get_statement_model(self): - from django.apps import apps - return apps.get_model(self.django_app_name, 'Statement') - - def get_response_model(self): - from django.apps import apps - return apps.get_model(self.django_app_name, 'Response') - - def get_conversation_model(self): - from django.apps import apps - return apps.get_model(self.django_app_name, 'Conversation') - - def get_tag_model(self): - from django.apps import apps - return apps.get_model(self.django_app_name, 'Tag') - - def count(self): - Statement = self.get_model('statement') - return Statement.objects.count() - - def find(self, statement_text): - Statement = self.get_model('statement') - try: - return Statement.objects.get(text=statement_text) - except Statement.DoesNotExist as e: - self.logger.info(str(e)) - return None - - def filter(self, **kwargs): - """ - Returns a list of statements in the database - that match the parameters specified. - """ - from django.db.models import Q - Statement = self.get_model('statement') - - order = kwargs.pop('order_by', None) - - RESPONSE_CONTAINS = 'in_response_to__contains' - - if RESPONSE_CONTAINS in kwargs: - value = kwargs[RESPONSE_CONTAINS] - del kwargs[RESPONSE_CONTAINS] - kwargs['in_response__response__text'] = value - - kwargs_copy = kwargs.copy() - - for kwarg in kwargs_copy: - value = kwargs[kwarg] - del kwargs[kwarg] - kwarg = kwarg.replace('in_response_to', 'in_response') - kwargs[kwarg] = value - - if 'in_response' in kwargs: - responses = kwargs['in_response'] - del kwargs['in_response'] - - if responses: - kwargs['in_response__response__text__in'] = [] - for response in responses: - kwargs['in_response__response__text__in'].append(response) - else: - kwargs['in_response'] = None - - parameters = {} - if 'in_response__response__text' in kwargs: - value = kwargs['in_response__response__text'] - parameters['responses__statement__text'] = value - - statements = Statement.objects.filter(Q(**kwargs) | Q(**parameters)) - - if order: - statements = statements.order_by(order) - - return statements - - def update(self, statement): - """ - Update the provided statement. - """ - Statement = self.get_model('statement') - Response = self.get_model('response') - - response_statement_cache = statement.response_statement_cache - - statement, created = Statement.objects.get_or_create(text=statement.text) - statement.extra_data = getattr(statement, 'extra_data', '') - statement.save() - - for _response_statement in response_statement_cache: - - response_statement, created = Statement.objects.get_or_create( - text=_response_statement.text - ) - response_statement.extra_data = getattr(_response_statement, 'extra_data', '') - response_statement.save() - - Response.objects.create( - statement=response_statement, - response=statement - ) - - return statement - - def get_random(self): - """ - Returns a random statement from the database - """ - Statement = self.get_model('statement') - return Statement.objects.order_by('?').first() - - def remove(self, statement_text): - """ - Removes the statement that matches the input text. - Removes any responses from statements if the response text matches the - input text. - """ - from django.db.models import Q - - Statement = self.get_model('statement') - Response = self.get_model('response') - - statements = Statement.objects.filter(text=statement_text) - - responses = Response.objects.filter( - Q(statement__text=statement_text) | Q(response__text=statement_text) - ) - - responses.delete() - statements.delete() - - def get_latest_response(self, conversation_id): - """ - Returns the latest response in a conversation if it exists. - Returns None if a matching conversation cannot be found. - """ - Response = self.get_model('response') - - response = Response.objects.filter( - conversations__id=conversation_id - ).order_by( - 'created_at' - ).last() - - if not response: - return None - - return response.response - - def create_conversation(self): - """ - Create a new conversation. - """ - Conversation = self.get_model('conversation') - conversation = Conversation.objects.create() - return conversation.id - - def add_to_conversation(self, conversation_id, statement, response): - """ - Add the statement and response to the conversation. - """ - Statement = self.get_model('statement') - Response = self.get_model('response') - - first_statement, created = Statement.objects.get_or_create(text=statement.text) - first_response, created = Statement.objects.get_or_create(text=response.text) - - response = Response.objects.create( - statement=first_statement, - response=first_response - ) - - response.conversations.add(conversation_id) - - def drop(self): - """ - Remove all data from the database. - """ - Statement = self.get_model('statement') - Response = self.get_model('response') - Conversation = self.get_model('conversation') - Tag = self.get_model('tag') - - Statement.objects.all().delete() - Response.objects.all().delete() - Conversation.objects.all().delete() - Tag.objects.all().delete() - - def get_response_statements(self): - """ - Return only statements that are in response to another statement. - A statement must exist which lists the closest matching statement in the - in_response_to field. Otherwise, the logic adapter may find a closest - matching statement that does not have a known response. - """ - Statement = self.get_model('statement') - Response = self.get_model('response') - - responses = Response.objects.all() - - return Statement.objects.filter(in_response__in=responses) diff --git a/chatter/chatterbot/trainers.py b/chatter/chatterbot/trainers.py index 1f634d1..e48c436 100644 --- a/chatter/chatterbot/trainers.py +++ b/chatter/chatterbot/trainers.py @@ -1,8 +1,9 @@ import logging import os import sys -from .conversation import Statement, Response + from . import utils +from .conversation import Statement, Response class Trainer(object): From 33307aa76f2a57c07c3305a2b7f4eaea31e6407d Mon Sep 17 00:00:00 2001 From: Bobloy Date: Thu, 3 May 2018 11:35:35 -0400 Subject: [PATCH 04/14] no python2 nonsense --- chatter/chatterbot/comparisons.py | 11 +++-------- chatter/chatterbot/conversation.py | 7 ------- chatter/chatterbot/ext/sqlalchemy_app/types.py | 5 ----- .../chatterbot/input/variable_input_type_adapter.py | 6 ++---- chatter/chatterbot/preprocessors.py | 9 +-------- chatter/chatterbot/trainers.py | 8 ++++---- chatter/chatterbot/utils.py | 9 +-------- 7 files changed, 11 insertions(+), 44 deletions(-) diff --git a/chatter/chatterbot/comparisons.py b/chatter/chatterbot/comparisons.py index c500487..43cda14 100644 --- a/chatter/chatterbot/comparisons.py +++ b/chatter/chatterbot/comparisons.py @@ -58,19 +58,14 @@ class LevenshteinDistance(Comparator): :rtype: float """ - PYTHON = sys.version_info[0] - # Return 0 if either statement has a falsy text value if not statement.text or not other_statement.text: return 0 # Get the lowercase version of both strings - if PYTHON < 3: - statement_text = unicode(statement.text.lower()) # NOQA - other_statement_text = unicode(other_statement.text.lower()) # NOQA - else: - statement_text = str(statement.text.lower()) - other_statement_text = str(other_statement.text.lower()) + + statement_text = str(statement.text.lower()) + other_statement_text = str(other_statement.text.lower()) similarity = SequenceMatcher( None, diff --git a/chatter/chatterbot/conversation.py b/chatter/chatterbot/conversation.py index ea674aa..a798e17 100644 --- a/chatter/chatterbot/conversation.py +++ b/chatter/chatterbot/conversation.py @@ -33,13 +33,6 @@ class Statement(StatementMixin): except UnicodeEncodeError: pass - # Prefer decoded utf8-strings in Python 2.7 - if sys.version_info[0] < 3: - try: - text = text.decode('utf-8') - except UnicodeEncodeError: - pass - self.text = text self.tags = kwargs.pop('tags', []) self.in_response_to = kwargs.pop('in_response_to', []) diff --git a/chatter/chatterbot/ext/sqlalchemy_app/types.py b/chatter/chatterbot/ext/sqlalchemy_app/types.py index b48f4f6..ee9b123 100644 --- a/chatter/chatterbot/ext/sqlalchemy_app/types.py +++ b/chatter/chatterbot/ext/sqlalchemy_app/types.py @@ -13,9 +13,4 @@ class UnicodeString(TypeDecorator): Coerce Python bytestrings to unicode before saving them to the database. """ - import sys - - if sys.version_info[0] < 3: - if isinstance(value, str): - value = value.decode('utf-8') return value diff --git a/chatter/chatterbot/input/variable_input_type_adapter.py b/chatter/chatterbot/input/variable_input_type_adapter.py index c0bd8cb..a93abe9 100644 --- a/chatter/chatterbot/input/variable_input_type_adapter.py +++ b/chatter/chatterbot/input/variable_input_type_adapter.py @@ -14,10 +14,8 @@ class VariableInputTypeAdapter(InputAdapter): def detect_type(self, statement): import sys - if sys.version_info[0] < 3: - string_types = basestring # NOQA - else: - string_types = str + + string_types = str if hasattr(statement, 'text'): return self.OBJECT diff --git a/chatter/chatterbot/preprocessors.py b/chatter/chatterbot/preprocessors.py index f7043b1..59c6456 100644 --- a/chatter/chatterbot/preprocessors.py +++ b/chatter/chatterbot/preprocessors.py @@ -30,11 +30,7 @@ def unescape_html(chatbot, statement): import sys # Replace HTML escape characters - if sys.version_info[0] < 3: - from HTMLParser import HTMLParser - html = HTMLParser() - else: - import html + import html statement.text = html.unescape(statement.text) @@ -49,9 +45,6 @@ def convert_to_ascii(chatbot, statement): import unicodedata import sys - # Normalize unicode characters - if sys.version_info[0] < 3: - statement.text = unicode(statement.text) # NOQA text = unicodedata.normalize('NFKD', statement.text) text = text.encode('ascii', 'ignore').decode('utf-8') diff --git a/chatter/chatterbot/trainers.py b/chatter/chatterbot/trainers.py index e48c436..2d1aa59 100644 --- a/chatter/chatterbot/trainers.py +++ b/chatter/chatterbot/trainers.py @@ -393,10 +393,10 @@ class UbuntuCorpusTrainer(Trainer): file_kwargs = {} - if sys.version_info[0] > 2: - # Specify the encoding in Python versions 3 and up - file_kwargs['encoding'] = 'utf-8' - # WARNING: This might fail to read a unicode corpus file in Python 2.x + + # Specify the encoding in Python versions 3 and up + file_kwargs['encoding'] = 'utf-8' + # WARNING: This might fail to read a unicode corpus file in Python 2.x for file in glob.iglob(extracted_corpus_path): self.logger.info('Training from: {}'.format(file)) diff --git a/chatter/chatterbot/utils.py b/chatter/chatterbot/utils.py index 684d7f7..33c35c1 100644 --- a/chatter/chatterbot/utils.py +++ b/chatter/chatterbot/utils.py @@ -77,15 +77,8 @@ def input_function(): """ import sys - if sys.version_info[0] < 3: - user_input = str(raw_input()) # NOQA - # Avoid problems using format strings with unicode characters - if user_input: - user_input = user_input.decode('utf-8') - - else: - user_input = input() # NOQA + user_input = input() # NOQA return user_input From 1cde8566611f7ef72a0c496a268071048ea77bdf Mon Sep 17 00:00:00 2001 From: Bobloy Date: Thu, 3 May 2018 11:37:52 -0400 Subject: [PATCH 05/14] proper import --- chatter/chatterbot/comparisons.py | 2 +- chatter/chatterbot/ext/sqlalchemy_app/models.py | 10 +++++----- chatter/chatterbot/input/gitter.py | 4 ++-- chatter/chatterbot/input/hipchat.py | 4 ++-- chatter/chatterbot/input/input_adapter.py | 2 +- chatter/chatterbot/input/mailgun.py | 4 ++-- chatter/chatterbot/input/microsoft.py | 4 ++-- chatter/chatterbot/input/terminal.py | 6 +++--- .../input/variable_input_type_adapter.py | 4 ++-- chatter/chatterbot/logic/logic_adapter.py | 8 ++++---- chatter/chatterbot/logic/low_confidence.py | 2 +- .../chatterbot/logic/mathematical_evaluation.py | 4 ++-- chatter/chatterbot/logic/multi_adapter.py | 2 +- chatter/chatterbot/logic/specific_response.py | 2 +- chatter/chatterbot/logic/time_adapter.py | 2 +- chatter/chatterbot/output/output_adapter.py | 2 +- chatter/chatterbot/storage/mongodb.py | 6 +++--- chatter/chatterbot/storage/sql_storage.py | 16 ++++++++-------- chatter/chatterbot/utils.py | 2 +- 19 files changed, 43 insertions(+), 43 deletions(-) diff --git a/chatter/chatterbot/comparisons.py b/chatter/chatterbot/comparisons.py index 43cda14..3abc009 100644 --- a/chatter/chatterbot/comparisons.py +++ b/chatter/chatterbot/comparisons.py @@ -125,7 +125,7 @@ class SynsetDistance(Comparator): """ from nltk.corpus import wordnet from nltk import word_tokenize - from chatterbot import utils + from chatter.chatterbot import utils import itertools tokens1 = word_tokenize(statement.text.lower()) diff --git a/chatter/chatterbot/ext/sqlalchemy_app/models.py b/chatter/chatterbot/ext/sqlalchemy_app/models.py index ae08193..41a05c0 100644 --- a/chatter/chatterbot/ext/sqlalchemy_app/models.py +++ b/chatter/chatterbot/ext/sqlalchemy_app/models.py @@ -1,6 +1,6 @@ -from chatterbot.constants import TAG_NAME_MAX_LENGTH, STATEMENT_TEXT_MAX_LENGTH -from chatterbot.conversation import StatementMixin -from chatterbot.ext.sqlalchemy_app.types import UnicodeString +from chatter.chatterbot.constants import TAG_NAME_MAX_LENGTH, STATEMENT_TEXT_MAX_LENGTH +from chatter.chatterbot.conversation import StatementMixin +from chatter.chatterbot.ext.sqlalchemy_app.types import UnicodeString from sqlalchemy import Table, Column, Integer, DateTime, ForeignKey, PickleType from sqlalchemy.ext.declarative import declared_attr, declarative_base from sqlalchemy.orm import relationship @@ -72,8 +72,8 @@ class Statement(Base, StatementMixin): return [tag.name for tag in self.tags] def get_statement(self): - from chatterbot.conversation import Statement as StatementObject - from chatterbot.conversation import Response as ResponseObject + from chatter.chatterbot.conversation import Statement as StatementObject + from chatter.chatterbot.conversation import Response as ResponseObject statement = StatementObject( self.text, diff --git a/chatter/chatterbot/input/gitter.py b/chatter/chatterbot/input/gitter.py index 1b6d01f..9018e37 100644 --- a/chatter/chatterbot/input/gitter.py +++ b/chatter/chatterbot/input/gitter.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals from time import sleep -from chatterbot.conversation import Statement -from chatterbot.input import InputAdapter +from chatter.chatterbot.conversation import Statement +from chatter.chatterbot.input import InputAdapter class Gitter(InputAdapter): diff --git a/chatter/chatterbot/input/hipchat.py b/chatter/chatterbot/input/hipchat.py index 70c52bc..b5da731 100644 --- a/chatter/chatterbot/input/hipchat.py +++ b/chatter/chatterbot/input/hipchat.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals from time import sleep -from chatterbot.conversation import Statement -from chatterbot.input import InputAdapter +from chatter.chatterbot.conversation import Statement +from chatter.chatterbot.input import InputAdapter class HipChat(InputAdapter): diff --git a/chatter/chatterbot/input/input_adapter.py b/chatter/chatterbot/input/input_adapter.py index 46fb3a5..49c63db 100644 --- a/chatter/chatterbot/input/input_adapter.py +++ b/chatter/chatterbot/input/input_adapter.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from chatterbot.adapters import Adapter +from chatter.chatterbot.adapters import Adapter class InputAdapter(Adapter): diff --git a/chatter/chatterbot/input/mailgun.py b/chatter/chatterbot/input/mailgun.py index 9807a79..6fb78a8 100644 --- a/chatter/chatterbot/input/mailgun.py +++ b/chatter/chatterbot/input/mailgun.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals import datetime -from chatterbot.conversation import Statement -from chatterbot.input import InputAdapter +from chatter.chatterbot.conversation import Statement +from chatter.chatterbot.input import InputAdapter class Mailgun(InputAdapter): diff --git a/chatter/chatterbot/input/microsoft.py b/chatter/chatterbot/input/microsoft.py index 3d58dd8..054a9c7 100644 --- a/chatter/chatterbot/input/microsoft.py +++ b/chatter/chatterbot/input/microsoft.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals from time import sleep -from chatterbot.conversation import Statement -from chatterbot.input import InputAdapter +from chatter.chatterbot.conversation import Statement +from chatter.chatterbot.input import InputAdapter class Microsoft(InputAdapter): diff --git a/chatter/chatterbot/input/terminal.py b/chatter/chatterbot/input/terminal.py index 40521d2..20cb3c2 100644 --- a/chatter/chatterbot/input/terminal.py +++ b/chatter/chatterbot/input/terminal.py @@ -1,8 +1,8 @@ from __future__ import unicode_literals -from chatterbot.conversation import Statement -from chatterbot.input import InputAdapter -from chatterbot.utils import input_function +from chatter.chatterbot.conversation import Statement +from chatter.chatterbot.input import InputAdapter +from chatter.chatterbot.utils import input_function class TerminalAdapter(InputAdapter): diff --git a/chatter/chatterbot/input/variable_input_type_adapter.py b/chatter/chatterbot/input/variable_input_type_adapter.py index a93abe9..e08bf53 100644 --- a/chatter/chatterbot/input/variable_input_type_adapter.py +++ b/chatter/chatterbot/input/variable_input_type_adapter.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from chatterbot.conversation import Statement -from chatterbot.input import InputAdapter +from chatter.chatterbot.conversation import Statement +from chatter.chatterbot.input import InputAdapter class VariableInputTypeAdapter(InputAdapter): diff --git a/chatter/chatterbot/logic/logic_adapter.py b/chatter/chatterbot/logic/logic_adapter.py index 68f8088..1239cca 100644 --- a/chatter/chatterbot/logic/logic_adapter.py +++ b/chatter/chatterbot/logic/logic_adapter.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from chatterbot.adapters import Adapter -from chatterbot.utils import import_module +from chatter.chatterbot.adapters import Adapter +from chatter.chatterbot.utils import import_module class LogicAdapter(Adapter): @@ -18,8 +18,8 @@ class LogicAdapter(Adapter): def __init__(self, **kwargs): super(LogicAdapter, self).__init__(**kwargs) - from chatterbot.comparisons import levenshtein_distance - from chatterbot.response_selection import get_first_response + from chatter.chatterbot.comparisons import levenshtein_distance + from chatter.chatterbot.response_selection import get_first_response # Import string module parameters if 'statement_comparison_function' in kwargs: diff --git a/chatter/chatterbot/logic/low_confidence.py b/chatter/chatterbot/logic/low_confidence.py index 2e9dd65..0e3d5d8 100644 --- a/chatter/chatterbot/logic/low_confidence.py +++ b/chatter/chatterbot/logic/low_confidence.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from chatterbot.conversation import Statement +from chatter.chatterbot.conversation import Statement from .best_match import BestMatch diff --git a/chatter/chatterbot/logic/mathematical_evaluation.py b/chatter/chatterbot/logic/mathematical_evaluation.py index 02af55e..af27548 100644 --- a/chatter/chatterbot/logic/mathematical_evaluation.py +++ b/chatter/chatterbot/logic/mathematical_evaluation.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from chatterbot.conversation import Statement -from chatterbot.logic import LogicAdapter +from chatter.chatterbot.conversation import Statement +from chatter.chatterbot.logic import LogicAdapter class MathematicalEvaluation(LogicAdapter): diff --git a/chatter/chatterbot/logic/multi_adapter.py b/chatter/chatterbot/logic/multi_adapter.py index 145424a..5e35dfd 100644 --- a/chatter/chatterbot/logic/multi_adapter.py +++ b/chatter/chatterbot/logic/multi_adapter.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from collections import Counter -from chatterbot import utils +from chatter.chatterbot import utils from .logic_adapter import LogicAdapter diff --git a/chatter/chatterbot/logic/specific_response.py b/chatter/chatterbot/logic/specific_response.py index d3fa38a..101dd3b 100644 --- a/chatter/chatterbot/logic/specific_response.py +++ b/chatter/chatterbot/logic/specific_response.py @@ -16,7 +16,7 @@ class SpecificResponseAdapter(LogicAdapter): def __init__(self, **kwargs): super(SpecificResponseAdapter, self).__init__(**kwargs) - from chatterbot.conversation import Statement + from chatter.chatterbot.conversation import Statement self.input_text = kwargs.get('input_text') diff --git a/chatter/chatterbot/logic/time_adapter.py b/chatter/chatterbot/logic/time_adapter.py index 5047210..b177a67 100644 --- a/chatter/chatterbot/logic/time_adapter.py +++ b/chatter/chatterbot/logic/time_adapter.py @@ -81,7 +81,7 @@ class TimeLogicAdapter(LogicAdapter): return features def process(self, statement): - from chatterbot.conversation import Statement + from chatter.chatterbot.conversation import Statement now = datetime.now() diff --git a/chatter/chatterbot/output/output_adapter.py b/chatter/chatterbot/output/output_adapter.py index 631e343..5d13dd7 100644 --- a/chatter/chatterbot/output/output_adapter.py +++ b/chatter/chatterbot/output/output_adapter.py @@ -1,4 +1,4 @@ -from chatterbot.adapters import Adapter +from chatter.chatterbot.adapters import Adapter class OutputAdapter(Adapter): diff --git a/chatter/chatterbot/storage/mongodb.py b/chatter/chatterbot/storage/mongodb.py index 744d672..06ced53 100644 --- a/chatter/chatterbot/storage/mongodb.py +++ b/chatter/chatterbot/storage/mongodb.py @@ -1,4 +1,4 @@ -from chatterbot.storage import StorageAdapter +from chatter.chatterbot.storage import StorageAdapter class Query(object): @@ -116,7 +116,7 @@ class MongoDatabaseAdapter(StorageAdapter): """ Return the class for the statement model. """ - from chatterbot.conversation import Statement + from chatter.chatterbot.conversation import Statement # Create a storage-aware statement statement = Statement @@ -128,7 +128,7 @@ class MongoDatabaseAdapter(StorageAdapter): """ Return the class for the response model. """ - from chatterbot.conversation import Response + from chatter.chatterbot.conversation import Response # Create a storage-aware response response = Response diff --git a/chatter/chatterbot/storage/sql_storage.py b/chatter/chatterbot/storage/sql_storage.py index ed1153c..32b9535 100644 --- a/chatter/chatterbot/storage/sql_storage.py +++ b/chatter/chatterbot/storage/sql_storage.py @@ -1,8 +1,8 @@ -from chatterbot.storage import StorageAdapter +from chatter.chatterbot.storage import StorageAdapter def get_response_table(response): - from chatterbot.ext.sqlalchemy_app.models import Response + from chatter.chatterbot.ext.sqlalchemy_app.models import Response return Response(text=response.text, occurrence=response.occurrence) @@ -86,28 +86,28 @@ class SQLStorageAdapter(StorageAdapter): """ Return the statement model. """ - from chatterbot.ext.sqlalchemy_app.models import Statement + from chatter.chatterbot.ext.sqlalchemy_app.models import Statement return Statement def get_response_model(self): """ Return the response model. """ - from chatterbot.ext.sqlalchemy_app.models import Response + from chatter.chatterbot.ext.sqlalchemy_app.models import Response return Response def get_conversation_model(self): """ Return the conversation model. """ - from chatterbot.ext.sqlalchemy_app.models import Conversation + from chatter.chatterbot.ext.sqlalchemy_app.models import Conversation return Conversation def get_tag_model(self): """ Return the conversation model. """ - from chatterbot.ext.sqlalchemy_app.models import Tag + from chatter.chatterbot.ext.sqlalchemy_app.models import Tag return Tag def count(self): @@ -379,14 +379,14 @@ class SQLStorageAdapter(StorageAdapter): """ Drop the database attached to a given adapter. """ - from chatterbot.ext.sqlalchemy_app.models import Base + from chatter.chatterbot.ext.sqlalchemy_app.models import Base Base.metadata.drop_all(self.engine) def create(self): """ Populate the database with the tables. """ - from chatterbot.ext.sqlalchemy_app.models import Base + from chatter.chatterbot.ext.sqlalchemy_app.models import Base Base.metadata.create_all(self.engine) def _session_finish(self, session, statement_text=None): diff --git a/chatter/chatterbot/utils.py b/chatter/chatterbot/utils.py index 33c35c1..391a06a 100644 --- a/chatter/chatterbot/utils.py +++ b/chatter/chatterbot/utils.py @@ -130,7 +130,7 @@ def remove_stopwords(tokens, language): Stop words are words like "is, the, a, ..." Be sure to download the required NLTK corpus before calling this function: - - from chatterbot.utils import nltk_download_corpus + - from chatter.chatterbot.utils import nltk_download_corpus - nltk_download_corpus('corpora/stopwords') """ from nltk.corpus import stopwords From a7bc72493efe536cfb50b79ec1a8889682047ac8 Mon Sep 17 00:00:00 2001 From: Bobloy Date: Thu, 3 May 2018 11:38:24 -0400 Subject: [PATCH 06/14] optimize imports --- chatter/chatterbot/comparisons.py | 1 - chatter/chatterbot/conversation.py | 1 - chatter/chatterbot/ext/sqlalchemy_app/models.py | 7 ++++--- chatter/chatterbot/input/variable_input_type_adapter.py | 2 -- chatter/chatterbot/logic/low_confidence.py | 1 - chatter/chatterbot/logic/multi_adapter.py | 1 - chatter/chatterbot/preprocessors.py | 3 --- chatter/chatterbot/utils.py | 2 -- 8 files changed, 4 insertions(+), 14 deletions(-) diff --git a/chatter/chatterbot/comparisons.py b/chatter/chatterbot/comparisons.py index 3abc009..59efa95 100644 --- a/chatter/chatterbot/comparisons.py +++ b/chatter/chatterbot/comparisons.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -import sys """ diff --git a/chatter/chatterbot/conversation.py b/chatter/chatterbot/conversation.py index a798e17..c9dfcb4 100644 --- a/chatter/chatterbot/conversation.py +++ b/chatter/chatterbot/conversation.py @@ -25,7 +25,6 @@ class Statement(StatementMixin): """ def __init__(self, text, **kwargs): - import sys # Try not to allow non-string types to be passed to statements try: diff --git a/chatter/chatterbot/ext/sqlalchemy_app/models.py b/chatter/chatterbot/ext/sqlalchemy_app/models.py index 41a05c0..d30bb75 100644 --- a/chatter/chatterbot/ext/sqlalchemy_app/models.py +++ b/chatter/chatterbot/ext/sqlalchemy_app/models.py @@ -1,11 +1,12 @@ -from chatter.chatterbot.constants import TAG_NAME_MAX_LENGTH, STATEMENT_TEXT_MAX_LENGTH -from chatter.chatterbot.conversation import StatementMixin -from chatter.chatterbot.ext.sqlalchemy_app.types import UnicodeString from sqlalchemy import Table, Column, Integer, DateTime, ForeignKey, PickleType from sqlalchemy.ext.declarative import declared_attr, declarative_base from sqlalchemy.orm import relationship from sqlalchemy.sql import func +from chatter.chatterbot.constants import TAG_NAME_MAX_LENGTH, STATEMENT_TEXT_MAX_LENGTH +from chatter.chatterbot.conversation import StatementMixin +from chatter.chatterbot.ext.sqlalchemy_app.types import UnicodeString + class ModelBase(object): """ diff --git a/chatter/chatterbot/input/variable_input_type_adapter.py b/chatter/chatterbot/input/variable_input_type_adapter.py index e08bf53..199d86b 100644 --- a/chatter/chatterbot/input/variable_input_type_adapter.py +++ b/chatter/chatterbot/input/variable_input_type_adapter.py @@ -12,8 +12,6 @@ class VariableInputTypeAdapter(InputAdapter): VALID_FORMATS = (JSON, TEXT, OBJECT, ) def detect_type(self, statement): - import sys - string_types = str diff --git a/chatter/chatterbot/logic/low_confidence.py b/chatter/chatterbot/logic/low_confidence.py index 0e3d5d8..585cf20 100644 --- a/chatter/chatterbot/logic/low_confidence.py +++ b/chatter/chatterbot/logic/low_confidence.py @@ -1,7 +1,6 @@ from __future__ import unicode_literals from chatter.chatterbot.conversation import Statement - from .best_match import BestMatch diff --git a/chatter/chatterbot/logic/multi_adapter.py b/chatter/chatterbot/logic/multi_adapter.py index 5e35dfd..e83cc00 100644 --- a/chatter/chatterbot/logic/multi_adapter.py +++ b/chatter/chatterbot/logic/multi_adapter.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals from collections import Counter from chatter.chatterbot import utils - from .logic_adapter import LogicAdapter diff --git a/chatter/chatterbot/preprocessors.py b/chatter/chatterbot/preprocessors.py index 59c6456..2ab0ee0 100644 --- a/chatter/chatterbot/preprocessors.py +++ b/chatter/chatterbot/preprocessors.py @@ -27,7 +27,6 @@ def unescape_html(chatbot, statement): Convert escaped html characters into unescaped html characters. For example: "<b>" becomes "". """ - import sys # Replace HTML escape characters import html @@ -43,8 +42,6 @@ def convert_to_ascii(chatbot, statement): For example: "på fédéral" becomes "pa federal". """ import unicodedata - import sys - text = unicodedata.normalize('NFKD', statement.text) text = text.encode('ascii', 'ignore').decode('utf-8') diff --git a/chatter/chatterbot/utils.py b/chatter/chatterbot/utils.py index 391a06a..c8c670d 100644 --- a/chatter/chatterbot/utils.py +++ b/chatter/chatterbot/utils.py @@ -75,8 +75,6 @@ def input_function(): Normalizes reading input between python 2 and 3. The function 'raw_input' becomes 'input' in Python 3. """ - import sys - user_input = input() # NOQA From 5434da22bc3070682e6628657bce24f5a0e5b560 Mon Sep 17 00:00:00 2001 From: Bobloy Date: Thu, 3 May 2018 11:45:12 -0400 Subject: [PATCH 07/14] better default --- chatter/chatterbot/storage/mongodb.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/chatter/chatterbot/storage/mongodb.py b/chatter/chatterbot/storage/mongodb.py index 06ced53..1ddb625 100644 --- a/chatter/chatterbot/storage/mongodb.py +++ b/chatter/chatterbot/storage/mongodb.py @@ -3,8 +3,11 @@ from chatter.chatterbot.storage import StorageAdapter class Query(object): - def __init__(self, query={}): - self.query = query + def __init__(self, query=None): + if query is None: + self.query = {} + else: + self.query = query def value(self): return self.query.copy() From 04fd25d4bd27592eebae12af203dd4790c91ad2f Mon Sep 17 00:00:00 2001 From: Bobloy Date: Thu, 3 May 2018 11:46:12 -0400 Subject: [PATCH 08/14] pep8 --- chatter/chatterbot/__main__.py | 1 - chatter/chatterbot/corpus.py | 1 - .../chatterbot/ext/sqlalchemy_app/models.py | 1 - chatter/chatterbot/input/microsoft.py | 6 ++-- .../input/variable_input_type_adapter.py | 3 +- chatter/chatterbot/logic/multi_adapter.py | 2 +- chatter/chatterbot/logic/time_adapter.py | 4 +-- chatter/chatterbot/storage/storage_adapter.py | 7 ++-- chatter/chatterbot/trainers.py | 5 ++- chatter/chatterbot/utils.py | 2 +- chatter/info.json | 36 ++++++++++++++----- 11 files changed, 42 insertions(+), 26 deletions(-) diff --git a/chatter/chatterbot/__main__.py b/chatter/chatterbot/__main__.py index a27f483..0322854 100644 --- a/chatter/chatterbot/__main__.py +++ b/chatter/chatterbot/__main__.py @@ -1,6 +1,5 @@ import sys - if __name__ == '__main__': import importlib diff --git a/chatter/chatterbot/corpus.py b/chatter/chatterbot/corpus.py index 65da8eb..4bf0e4b 100644 --- a/chatter/chatterbot/corpus.py +++ b/chatter/chatterbot/corpus.py @@ -5,7 +5,6 @@ View the corpus on GitHub at https://github.com/gunthercox/chatterbot-corpus from chatterbot_corpus import Corpus - __all__ = ( 'Corpus', ) diff --git a/chatter/chatterbot/ext/sqlalchemy_app/models.py b/chatter/chatterbot/ext/sqlalchemy_app/models.py index d30bb75..6a7dc00 100644 --- a/chatter/chatterbot/ext/sqlalchemy_app/models.py +++ b/chatter/chatterbot/ext/sqlalchemy_app/models.py @@ -29,7 +29,6 @@ class ModelBase(object): Base = declarative_base(cls=ModelBase) - tag_association_table = Table( 'tag_association', Base.metadata, diff --git a/chatter/chatterbot/input/microsoft.py b/chatter/chatterbot/input/microsoft.py index 054a9c7..3a255bf 100644 --- a/chatter/chatterbot/input/microsoft.py +++ b/chatter/chatterbot/input/microsoft.py @@ -23,10 +23,10 @@ class Microsoft(InputAdapter): # NOTE: Direct Line client credentials are different from your bot's # credentials - self.direct_line_token_or_secret = kwargs.\ + self.direct_line_token_or_secret = kwargs. \ get('direct_line_token_or_secret') - authorization_header = 'BotConnector {}'.\ + authorization_header = 'BotConnector {}'. \ format(self.direct_line_token_or_secret) self.headers = { @@ -64,7 +64,7 @@ class Microsoft(InputAdapter): def get_most_recent_message(self): import requests - endpoint = '{host}/api/conversations/{id}/messages'\ + endpoint = '{host}/api/conversations/{id}/messages' \ .format(host=self.directline_host, id=self.conversation_id) diff --git a/chatter/chatterbot/input/variable_input_type_adapter.py b/chatter/chatterbot/input/variable_input_type_adapter.py index 199d86b..d2d598c 100644 --- a/chatter/chatterbot/input/variable_input_type_adapter.py +++ b/chatter/chatterbot/input/variable_input_type_adapter.py @@ -5,11 +5,10 @@ from chatter.chatterbot.input import InputAdapter class VariableInputTypeAdapter(InputAdapter): - JSON = 'json' TEXT = 'text' OBJECT = 'object' - VALID_FORMATS = (JSON, TEXT, OBJECT, ) + VALID_FORMATS = (JSON, TEXT, OBJECT,) def detect_type(self, statement): diff --git a/chatter/chatterbot/logic/multi_adapter.py b/chatter/chatterbot/logic/multi_adapter.py index e83cc00..6cfe30f 100644 --- a/chatter/chatterbot/logic/multi_adapter.py +++ b/chatter/chatterbot/logic/multi_adapter.py @@ -51,7 +51,7 @@ class MultiLogicAdapter(LogicAdapter): if adapter.can_process(statement): output = adapter.process(statement) - results.append((output.confidence, output, )) + results.append((output.confidence, output,)) self.logger.info( '{} selected "{}" as a response with a confidence of {}'.format( diff --git a/chatter/chatterbot/logic/time_adapter.py b/chatter/chatterbot/logic/time_adapter.py index b177a67..72902e2 100644 --- a/chatter/chatterbot/logic/time_adapter.py +++ b/chatter/chatterbot/logic/time_adapter.py @@ -42,8 +42,8 @@ class TimeLogicAdapter(LogicAdapter): ]) labeled_data = ( - [(name, 0) for name in self.negative] + - [(name, 1) for name in self.positive] + [(name, 0) for name in self.negative] + + [(name, 1) for name in self.positive] ) train_set = [ diff --git a/chatter/chatterbot/storage/storage_adapter.py b/chatter/chatterbot/storage/storage_adapter.py index 50beac7..046ae63 100644 --- a/chatter/chatterbot/storage/storage_adapter.py +++ b/chatter/chatterbot/storage/storage_adapter.py @@ -24,12 +24,12 @@ class StorageAdapter(object): # The string must be lowercase model_name = model_name.lower() - kwarg_model_key = '%s_model' % (model_name, ) + kwarg_model_key = '%s_model' % (model_name,) if kwarg_model_key in self.kwargs: return self.kwargs.get(kwarg_model_key) - get_model_method = getattr(self, 'get_%s_model' % (model_name, )) + get_model_method = getattr(self, 'get_%s_model' % (model_name,)) return get_model_method() @@ -157,7 +157,8 @@ class StorageAdapter(object): class EmptyDatabaseException(Exception): - def __init__(self, value='The database currently contains no entries. At least one entry is expected. You may need to train your chat bot to populate your database.'): + def __init__(self, + value='The database currently contains no entries. At least one entry is expected. You may need to train your chat bot to populate your database.'): self.value = value def __str__(self): diff --git a/chatter/chatterbot/trainers.py b/chatter/chatterbot/trainers.py index 2d1aa59..456176c 100644 --- a/chatter/chatterbot/trainers.py +++ b/chatter/chatterbot/trainers.py @@ -61,8 +61,8 @@ class Trainer(object): def __init__(self, value=None): default = ( - 'A training class must be specified before calling train(). ' + - 'See http://chatterbot.readthedocs.io/en/stable/training.html' + 'A training class must be specified before calling train(). ' + + 'See http://chatterbot.readthedocs.io/en/stable/training.html' ) self.value = value or default @@ -393,7 +393,6 @@ class UbuntuCorpusTrainer(Trainer): file_kwargs = {} - # Specify the encoding in Python versions 3 and up file_kwargs['encoding'] = 'utf-8' # WARNING: This might fail to read a unicode corpus file in Python 2.x diff --git a/chatter/chatterbot/utils.py b/chatter/chatterbot/utils.py index c8c670d..e18549e 100644 --- a/chatter/chatterbot/utils.py +++ b/chatter/chatterbot/utils.py @@ -76,7 +76,7 @@ def input_function(): The function 'raw_input' becomes 'input' in Python 3. """ - user_input = input() # NOQA + user_input = input() # NOQA return user_input diff --git a/chatter/info.json b/chatter/info.json index bd4870a..d2ebffd 100644 --- a/chatter/info.json +++ b/chatter/info.json @@ -1,10 +1,30 @@ { - "author" : ["Bobloy"], - "bot_version" : [3,0,0], - "description" : "Create an offline chatbot that talks like your average member using Machine Learning", - "hidden" : false, - "install_msg" : "Thank you for installing Chatter!", - "requirements" : ["sqlalchemy<1.3,>=1.2", "python-twitter<4.0,>=3.0", "python-dateutil<2.7,>=2.6", "pymongo<4.0,>=3.3", "nltk<4.0,>=3.2", "mathparse<0.2,>=0.1", "chatterbot-corpus<1.2,>=1.1"], - "short" : "Local Chatbot run on machine learning", - "tags" : ["chat", "chatbot", "cleverbot", "clever","bobloy"] + "author": [ + "Bobloy" + ], + "bot_version": [ + 3, + 0, + 0 + ], + "description": "Create an offline chatbot that talks like your average member using Machine Learning", + "hidden": false, + "install_msg": "Thank you for installing Chatter!", + "requirements": [ + "sqlalchemy<1.3,>=1.2", + "python-twitter<4.0,>=3.0", + "python-dateutil<2.7,>=2.6", + "pymongo<4.0,>=3.3", + "nltk<4.0,>=3.2", + "mathparse<0.2,>=0.1", + "chatterbot-corpus<1.2,>=1.1" + ], + "short": "Local Chatbot run on machine learning", + "tags": [ + "chat", + "chatbot", + "cleverbot", + "clever", + "bobloy" + ] } \ No newline at end of file From 0c721a2dbe2c15ca2da77b7e42a4149c7e9272bb Mon Sep 17 00:00:00 2001 From: Bobloy Date: Thu, 3 May 2018 12:24:16 -0400 Subject: [PATCH 09/14] naming --- chatter/__init__.py | 8 ++++++-- chatter/chatterbot/input/__init__.py | 2 +- chatter/chatterbot/storage/__init__.py | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/chatter/__init__.py b/chatter/__init__.py index 2d7a8e8..3056b82 100644 --- a/chatter/__init__.py +++ b/chatter/__init__.py @@ -1,5 +1,9 @@ -from .chatter import Chatter - +from .chat import Chatter +from . import chatterbot def setup(bot): bot.add_cog(Chatter(bot)) + +__all__ = ( + 'chatterbot' +) diff --git a/chatter/chatterbot/input/__init__.py b/chatter/chatterbot/input/__init__.py index 625b583..53c53f9 100644 --- a/chatter/chatterbot/input/__init__.py +++ b/chatter/chatterbot/input/__init__.py @@ -1,6 +1,6 @@ +from .input_adapter import InputAdapter from .gitter import Gitter from .hipchat import HipChat -from .input_adapter import InputAdapter from .mailgun import Mailgun from .microsoft import Microsoft from .terminal import TerminalAdapter diff --git a/chatter/chatterbot/storage/__init__.py b/chatter/chatterbot/storage/__init__.py index c456292..77d3e04 100644 --- a/chatter/chatterbot/storage/__init__.py +++ b/chatter/chatterbot/storage/__init__.py @@ -1,6 +1,6 @@ +from .storage_adapter import StorageAdapter from .mongodb import MongoDatabaseAdapter from .sql_storage import SQLStorageAdapter -from .storage_adapter import StorageAdapter __all__ = ( 'StorageAdapter', From f27787f76b44db1d69257e0faa16bcf4feaf2962 Mon Sep 17 00:00:00 2001 From: Bobloy Date: Thu, 3 May 2018 12:24:48 -0400 Subject: [PATCH 10/14] rename --- chatter/{chatter.py => chat.py} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename chatter/{chatter.py => chat.py} (96%) diff --git a/chatter/chatter.py b/chatter/chat.py similarity index 96% rename from chatter/chatter.py rename to chatter/chat.py index 0a083a9..eab5a8e 100644 --- a/chatter/chatter.py +++ b/chatter/chat.py @@ -5,8 +5,8 @@ import discord from discord.ext import commands from redbot.core import Config -from .chatterbot import ChatBot -from .chatterbot.trainers import ListTrainer +from chatter.chatterbot import ChatBot +from chatter.chatterbot.trainers import ListTrainer class Chatter: @@ -25,7 +25,7 @@ class Chatter: self.chatbot = ChatBot( "ChatterBot", - storage_adapter='chatterbot.storage.SQLStorageAdapter', + storage_adapter='chatter.chatterbotstorage.SQLStorageAdapter', database='./database.sqlite3' ) self.chatbot.set_trainer(ListTrainer) From af41b0c015a4aad7a1dd257bce23f0d54574ddf2 Mon Sep 17 00:00:00 2001 From: Bobloy Date: Thu, 3 May 2018 12:29:19 -0400 Subject: [PATCH 11/14] chatter. --- chatter/chat.py | 2 +- chatter/chatterbot/chatterbot.py | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/chatter/chat.py b/chatter/chat.py index eab5a8e..42a6f6c 100644 --- a/chatter/chat.py +++ b/chatter/chat.py @@ -25,7 +25,7 @@ class Chatter: self.chatbot = ChatBot( "ChatterBot", - storage_adapter='chatter.chatterbotstorage.SQLStorageAdapter', + storage_adapter='chatter.chatterbot.storage.SQLStorageAdapter', database='./database.sqlite3' ) self.chatbot.set_trainer(ListTrainer) diff --git a/chatter/chatterbot/chatterbot.py b/chatter/chatterbot/chatterbot.py index 40fd05d..c7a92cb 100644 --- a/chatter/chatterbot/chatterbot.py +++ b/chatter/chatterbot/chatterbot.py @@ -22,15 +22,15 @@ class ChatBot(object): self.default_session = None - storage_adapter = kwargs.get('storage_adapter', 'chatterbot.storage.SQLStorageAdapter') + storage_adapter = kwargs.get('storage_adapter', 'chatter.chatterbot.storage.SQLStorageAdapter') logic_adapters = kwargs.get('logic_adapters', [ - 'chatterbot.logic.BestMatch' + 'chatter.chatterbot.logic.BestMatch' ]) - input_adapter = kwargs.get('input_adapter', 'chatterbot.input.VariableInputTypeAdapter') + input_adapter = kwargs.get('input_adapter', 'chatter.chatterbot.input.VariableInputTypeAdapter') - output_adapter = kwargs.get('output_adapter', 'chatterbot.output.OutputAdapter') + output_adapter = kwargs.get('output_adapter', 'chatter.chatterbot.output.OutputAdapter') # Check that each adapter is a valid subclass of it's respective parent utils.validate_adapter_class(storage_adapter, StorageAdapter) @@ -47,7 +47,7 @@ class ChatBot(object): # Add required system logic adapter self.logic.system_adapters.append( - utils.initialize_class('chatterbot.logic.NoKnowledgeAdapter', **kwargs) + utils.initialize_class('chatter.chatterbot.logic.NoKnowledgeAdapter', **kwargs) ) for adapter in logic_adapters: @@ -61,7 +61,7 @@ class ChatBot(object): preprocessors = kwargs.get( 'preprocessors', [ - 'chatterbot.preprocessors.clean_whitespace' + 'chatter.chatterbot.preprocessors.clean_whitespace' ] ) @@ -71,7 +71,7 @@ class ChatBot(object): self.preprocessors.append(utils.import_module(preprocessor)) # Use specified trainer or fall back to the default - trainer = kwargs.get('trainer', 'chatterbot.trainers.Trainer') + trainer = kwargs.get('trainer', 'chatter.chatterbot.trainers.Trainer') TrainerClass = utils.import_module(trainer) self.trainer = TrainerClass(self.storage, **kwargs) self.training_data = kwargs.get('training_data') From c412ad238eb5d683bb41fef7f61d446689b2062b Mon Sep 17 00:00:00 2001 From: Bobloy Date: Thu, 3 May 2018 12:30:15 -0400 Subject: [PATCH 12/14] import order --- chatter/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/chatter/__init__.py b/chatter/__init__.py index 3056b82..cc101b7 100644 --- a/chatter/__init__.py +++ b/chatter/__init__.py @@ -1,9 +1,11 @@ -from .chat import Chatter from . import chatterbot +from .chat import Chatter + def setup(bot): bot.add_cog(Chatter(bot)) + __all__ = ( 'chatterbot' ) From 3b086d4c03186e0c6922916df0b52c099134db31 Mon Sep 17 00:00:00 2001 From: Bobloy Date: Thu, 3 May 2018 12:55:22 -0400 Subject: [PATCH 13/14] current progress --- chatter/chat.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/chatter/chat.py b/chatter/chat.py index 42a6f6c..2b3d8ea 100644 --- a/chatter/chat.py +++ b/chatter/chat.py @@ -26,7 +26,7 @@ class Chatter: self.chatbot = ChatBot( "ChatterBot", storage_adapter='chatter.chatterbot.storage.SQLStorageAdapter', - database='./database.sqlite3' + database='chatter/database/database.sqlite3' ) self.chatbot.set_trainer(ListTrainer) @@ -91,6 +91,18 @@ class Chatter: await self.config.guild(ctx.guild).days.set(days) await ctx.send("Success") + @chatter.command() + async def backup(self, ctx, backupname): + """ + Backup your training data to a json for later use + :param ctx: + :param backupname: + :return: + """ + + self.chatbot.trainer.export_for_training('./{}.json'.format(backupname)) + + @chatter.command() async def train(self, ctx: commands.Context, channel: discord.TextChannel = None): """ From 3e0773ee1ea9d380ba9f9dbf606cbbd8a667258a Mon Sep 17 00:00:00 2001 From: Bobloy Date: Thu, 3 May 2018 14:31:56 -0400 Subject: [PATCH 14/14] changes --- chatter/chat.py | 25 ++++++++++++++----------- chatter/chatterbot/trainers.py | 2 +- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/chatter/chat.py b/chatter/chat.py index 2b3d8ea..8301411 100644 --- a/chatter/chat.py +++ b/chatter/chat.py @@ -26,7 +26,7 @@ class Chatter: self.chatbot = ChatBot( "ChatterBot", storage_adapter='chatter.chatterbot.storage.SQLStorageAdapter', - database='chatter/database/database.sqlite3' + database='./database.sqlite3' ) self.chatbot.set_trainer(ListTrainer) @@ -95,16 +95,17 @@ class Chatter: async def backup(self, ctx, backupname): """ Backup your training data to a json for later use - :param ctx: - :param backupname: - :return: """ + await ctx.send("Backing up data, this may take a while") + future = await self.loop.run_in_executor(None, self.chatbot.trainer.export_for_training, './{}.json'.format(backupname)) - self.chatbot.trainer.export_for_training('./{}.json'.format(backupname)) - + if future: + await ctx.send("Backup successful!") + else: + await ctx.send("Error occurred :(") @chatter.command() - async def train(self, ctx: commands.Context, channel: discord.TextChannel = None): + async def train(self, ctx: commands.Context, channel: discord.TextChannel): """ Trains the bot based on language in this guild """ @@ -146,7 +147,9 @@ class Chatter: return text = text.replace(to_strip, "", 1) async with channel.typing(): - response = self.chatbot.get_response(text) - if not response: - response = ":thinking:" - await channel.send(response) + future = await self.loop.run_in_executor(None, self.chatbot.get_response, text) + + if future: + await channel.send(str(future)) + else: + await channel.send(':thinking:') diff --git a/chatter/chatterbot/trainers.py b/chatter/chatterbot/trainers.py index 456176c..42ccd47 100644 --- a/chatter/chatterbot/trainers.py +++ b/chatter/chatterbot/trainers.py @@ -85,7 +85,7 @@ class Trainer(object): import json export = {'conversations': self._generate_export_data()} with open(file_path, 'w+') as jsonfile: - json.dump(export, jsonfile, ensure_ascii=False) + json.dump(export, jsonfile, ensure_ascii=True) class ListTrainer(Trainer):