ChatterBot 1.2.1__tar.gz → 1.2.3__tar.gz

{chatterbot-1.2.1 → chatterbot-1.2.3}/ChatterBot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ChatterBot
-Version: 1.2.1
+Version: 1.2.3
 Summary: ChatterBot is a machine learning, conversational dialog engine
 Author: Gunther Cox
 License: Copyright (c) 2016 - 2025, Gunther Cox
@@ -53,11 +53,18 @@ Requires-Dist: flake8; extra == "test"
 Requires-Dist: coverage; extra == "test"
 Requires-Dist: nose; extra == "test"
 Requires-Dist: sphinx<8.2,>=5.3; extra == "test"
+Requires-Dist: sphinx-sitemap>=2.6.0; extra == "test"
 Provides-Extra: dev
 Requires-Dist: pint>=0.8.1; extra == "dev"
-Requires-Dist: pymongo<4.12,>=4.11; extra == "dev"
 Requires-Dist: pyyaml<7.0,>=6.0; extra == "dev"
 Requires-Dist: chatterbot-corpus>=1.2.2; extra == "dev"
+Provides-Extra: redis
+Requires-Dist: redis[hiredis]; extra == "redis"
+Requires-Dist: langchain-redis; extra == "redis"
+Requires-Dist: langchain-huggingface; extra == "redis"
+Requires-Dist: sentence-transformers; extra == "redis"
+Provides-Extra: mongodb
+Requires-Dist: pymongo<4.12,>=4.11; extra == "mongodb"
 
 ![ChatterBot: Machine learning in Python](https://i.imgur.com/b3SCmGT.png)
 
@@ -70,7 +77,6 @@ to be trained to speak any language.
 
 [![Package Version](https://img.shields.io/pypi/v/chatterbot.svg)](https://pypi.python.org/pypi/chatterbot/)
 [![Python 3.9](https://img.shields.io/badge/python-3.9-blue.svg)](https://www.python.org/downloads/release/python-360/)
-[![Django 2.0](https://img.shields.io/badge/Django-2.0-blue.svg)](https://docs.djangoproject.com/en/2.1/releases/2.0/)
 [![Coverage Status](https://img.shields.io/coveralls/gunthercox/ChatterBot.svg)](https://coveralls.io/r/gunthercox/ChatterBot)
 [![Code Climate](https://codeclimate.com/github/gunthercox/ChatterBot/badges/gpa.svg)](https://codeclimate.com/github/gunthercox/ChatterBot)
 [![Join the chat at https://gitter.im/chatterbot/Lobby](https://badges.gitter.im/chatterbot/Lobby.svg)](https://gitter.im/chatterbot/Lobby?utm_source=badge&utm_medium=badge&utm_content=badge)

{chatterbot-1.2.1 → chatterbot-1.2.3}/ChatterBot.egg-info/SOURCES.txt

@@ -26,6 +26,7 @@ chatterbot/search.py
 chatterbot/tagging.py
 chatterbot/trainers.py
 chatterbot/utils.py
+chatterbot/vectorstores.py
 chatterbot/ext/__init__.py
 chatterbot/ext/django_chatterbot/__init__.py
 chatterbot/ext/django_chatterbot/abstract_models.py
@@ -66,6 +67,7 @@ chatterbot/logic/unit_conversion.py
 chatterbot/storage/__init__.py
 chatterbot/storage/django_storage.py
 chatterbot/storage/mongodb.py
+chatterbot/storage/redis.py
 chatterbot/storage/sql_storage.py
 chatterbot/storage/storage_adapter.py
 tests/test_adapter_validation.py

{chatterbot-1.2.1 → chatterbot-1.2.3}/ChatterBot.egg-info/requires.txt

@@ -6,12 +6,21 @@ tqdm
 
 [dev]
 pint>=0.8.1
-pymongo<4.12,>=4.11
 pyyaml<7.0,>=6.0
 chatterbot-corpus>=1.2.2
 
+[mongodb]
+pymongo<4.12,>=4.11
+
+[redis]
+redis[hiredis]
+langchain-redis
+langchain-huggingface
+sentence-transformers
+
 [test]
 flake8
 coverage
 nose
 sphinx<8.2,>=5.3
+sphinx-sitemap>=2.6.0

{chatterbot-1.2.1 → chatterbot-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ChatterBot
-Version: 1.2.1
+Version: 1.2.3
 Summary: ChatterBot is a machine learning, conversational dialog engine
 Author: Gunther Cox
 License: Copyright (c) 2016 - 2025, Gunther Cox
@@ -53,11 +53,18 @@ Requires-Dist: flake8; extra == "test"
 Requires-Dist: coverage; extra == "test"
 Requires-Dist: nose; extra == "test"
 Requires-Dist: sphinx<8.2,>=5.3; extra == "test"
+Requires-Dist: sphinx-sitemap>=2.6.0; extra == "test"
 Provides-Extra: dev
 Requires-Dist: pint>=0.8.1; extra == "dev"
-Requires-Dist: pymongo<4.12,>=4.11; extra == "dev"
 Requires-Dist: pyyaml<7.0,>=6.0; extra == "dev"
 Requires-Dist: chatterbot-corpus>=1.2.2; extra == "dev"
+Provides-Extra: redis
+Requires-Dist: redis[hiredis]; extra == "redis"
+Requires-Dist: langchain-redis; extra == "redis"
+Requires-Dist: langchain-huggingface; extra == "redis"
+Requires-Dist: sentence-transformers; extra == "redis"
+Provides-Extra: mongodb
+Requires-Dist: pymongo<4.12,>=4.11; extra == "mongodb"
 
 ![ChatterBot: Machine learning in Python](https://i.imgur.com/b3SCmGT.png)
 
@@ -70,7 +77,6 @@ to be trained to speak any language.
 
 [![Package Version](https://img.shields.io/pypi/v/chatterbot.svg)](https://pypi.python.org/pypi/chatterbot/)
 [![Python 3.9](https://img.shields.io/badge/python-3.9-blue.svg)](https://www.python.org/downloads/release/python-360/)
-[![Django 2.0](https://img.shields.io/badge/Django-2.0-blue.svg)](https://docs.djangoproject.com/en/2.1/releases/2.0/)
 [![Coverage Status](https://img.shields.io/coveralls/gunthercox/ChatterBot.svg)](https://coveralls.io/r/gunthercox/ChatterBot)
 [![Code Climate](https://codeclimate.com/github/gunthercox/ChatterBot/badges/gpa.svg)](https://codeclimate.com/github/gunthercox/ChatterBot)
 [![Join the chat at https://gitter.im/chatterbot/Lobby](https://badges.gitter.im/chatterbot/Lobby.svg)](https://gitter.im/chatterbot/Lobby?utm_source=badge&utm_medium=badge&utm_content=badge)

{chatterbot-1.2.1 → chatterbot-1.2.3}/README.md

@@ -9,7 +9,6 @@ to be trained to speak any language.
 
 [![Package Version](https://img.shields.io/pypi/v/chatterbot.svg)](https://pypi.python.org/pypi/chatterbot/)
 [![Python 3.9](https://img.shields.io/badge/python-3.9-blue.svg)](https://www.python.org/downloads/release/python-360/)
-[![Django 2.0](https://img.shields.io/badge/Django-2.0-blue.svg)](https://docs.djangoproject.com/en/2.1/releases/2.0/)
 [![Coverage Status](https://img.shields.io/coveralls/gunthercox/ChatterBot.svg)](https://coveralls.io/r/gunthercox/ChatterBot)
 [![Code Climate](https://codeclimate.com/github/gunthercox/ChatterBot/badges/gpa.svg)](https://codeclimate.com/github/gunthercox/ChatterBot)
 [![Join the chat at https://gitter.im/chatterbot/Lobby](https://badges.gitter.im/chatterbot/Lobby.svg)](https://gitter.im/chatterbot/Lobby?utm_source=badge&utm_medium=badge&utm_content=badge)

{chatterbot-1.2.1 → chatterbot-1.2.3}/chatterbot/__init__.py

@@ -4,7 +4,7 @@ ChatterBot is a machine learning, conversational dialog engine.
 from .chatterbot import ChatBot
 
 
-__version__ = '1.2.1'
+__version__ = '1.2.3'
 
 __all__ = (
     'ChatBot',

{chatterbot-1.2.1 → chatterbot-1.2.3}/chatterbot/chatterbot.py

@@ -2,7 +2,10 @@ import logging
 from chatterbot.storage import StorageAdapter
 from chatterbot.logic import LogicAdapter
 from chatterbot.search import TextSearch, IndexedTextSearch
+from chatterbot.tagging import PosLemmaTagger
+from chatterbot import languages
 from chatterbot import utils
+import spacy
 
 
 class ChatBot(object):
@@ -27,6 +30,12 @@ class ChatBot(object):
 
         self.storage = utils.initialize_class(storage_adapter, **kwargs)
 
+        Tagger = kwargs.get('tagger', PosLemmaTagger)
+
+        self.tagger = Tagger(language=kwargs.get(
+            'tagger_language', languages.ENG
+        ))
+
         primary_search_algorithm = IndexedTextSearch(self, **kwargs)
         text_search_algorithm = TextSearch(self, **kwargs)
 
@@ -51,6 +60,9 @@ class ChatBot(object):
         for preprocessor in preprocessors:
             self.preprocessors.append(utils.import_module(preprocessor))
 
+        # NOTE: 'xx' is the language code for a multi-language model
+        self.nlp = spacy.blank(self.tagger.language.ISO_639_1)
+
         self.logger = kwargs.get('logger', logging.getLogger(__name__))
 
         # Allow the bot to save input it receives so that it can learn
@@ -105,16 +117,27 @@ class ChatBot(object):
         for preprocessor in self.preprocessors:
             input_statement = preprocessor(input_statement)
 
+        # Mark the statement as being a response to the previous
+        if input_statement.in_response_to is None:
+            previous_statement = self.get_latest_response(input_statement.conversation)
+            if previous_statement:
+                input_statement.in_response_to = previous_statement.text
+
         # Make sure the input statement has its search text saved
 
         if not input_statement.search_text:
-            _search_text = self.storage.tagger.get_text_index_string(input_statement.text)
+            _search_text = self.tagger.get_text_index_string(input_statement.text)
             input_statement.search_text = _search_text
 
         if not input_statement.search_in_response_to and input_statement.in_response_to:
-            input_statement.search_in_response_to = self.storage.tagger.get_text_index_string(input_statement.in_response_to)
+            input_statement.search_in_response_to = self.tagger.get_text_index_string(
+                input_statement.in_response_to
+            )
 
-        response = self.generate_response(input_statement, additional_response_selection_parameters)
+        response = self.generate_response(
+            input_statement,
+            additional_response_selection_parameters
+        )
 
         # Update any response data that needs to be changed
         if persist_values_to_response:
@@ -128,10 +151,13 @@ class ChatBot(object):
                     setattr(response, response_key, response_value)
 
         if not self.read_only:
-            self.learn_response(input_statement)
+
+            # Save the input statement
+            self.storage.create(**input_statement.serialize())
 
             # Save the response generated for the input
-            self.storage.create(**response.serialize())
+            self.learn_response(response, previous_statement=input_statement)
+
 
         return response
 
@@ -194,6 +220,8 @@ class ChatBot(object):
                 if result_option.count > most_common.count:
                     most_common = result_option
 
+            self.logger.info('Selecting "{}" as the most common response'.format(most_common.statement.text))
+
             if most_common.count > 1:
                 result = most_common.statement
 
@@ -204,6 +232,8 @@ class ChatBot(object):
             persona='bot:' + self.name
         )
 
+        response.add_tags(*result.get_tags())
+
         response.confidence = result.confidence
 
         return response
@@ -228,11 +258,14 @@ class ChatBot(object):
             statement.in_response_to = previous_statement
 
         self.logger.info('Adding "{}" as a response to "{}"'.format(
-            statement.text,
-            previous_statement_text
+            previous_statement_text,
+            statement.text
         ))
 
-        # Save the input statement
+        if not statement.persona:
+            statement.persona = 'bot:' + self.name
+
+        # Save the response statement
         return self.storage.create(**statement.serialize())
 
     def get_latest_response(self, conversation):

{chatterbot-1.2.1 → chatterbot-1.2.3}/chatterbot/comparisons.py

@@ -19,15 +19,22 @@ class Comparator:
     def __call__(self, statement_a, statement_b):
         return self.compare(statement_a, statement_b)
 
-    def compare(self, statement_a, statement_b):
+    def compare_text(self, text_a, text_b):
         """
-        Implemented in subclasses: compare statement_a to statement_b.
+        Implemented in subclasses: compare text_a to text_b.
 
         :return: The percent of similarity between the statements based on the implemented algorithm.
         :rtype: float
         """
         return 0
 
+    def compare(self, statement_a, statement_b):
+        """
+        :return: The percent of similarity between the statements based on the implemented algorithm.
+        :rtype: float
+        """
+        return self.compare_text(statement_a.text, statement_b.text)
+
 
 class LevenshteinDistance(Comparator):
     """
@@ -39,21 +46,21 @@ class LevenshteinDistance(Comparator):
     based on the Levenshtein distance algorithm.
     """
 
-    def compare(self, statement_a, statement_b):
+    def compare_text(self, text_a, text_b):
         """
-        Compare the two input statements.
+        Compare the two pieces of text.
 
         :return: The percent of similarity between the text of the statements.
         :rtype: float
         """
 
-        # Return 0 if either statement has a falsy text value
-        if not statement_a.text or not statement_b.text:
+        # Return 0 if either statement has a None text value
+        if text_a is None or text_b is None:
             return 0
 
         # Get the lowercase version of both strings
-        statement_a_text = str(statement_a.text.lower())
-        statement_b_text = str(statement_b.text.lower())
+        statement_a_text = str(text_a.lower())
+        statement_b_text = str(text_b.lower())
 
         similarity = SequenceMatcher(
             None,
@@ -103,15 +110,20 @@ class SpacySimilarity(Comparator):
         # Disable the Named Entity Recognition (NER) component because it is not necessary
         self.nlp = spacy.load(model, exclude=['ner'])
 
-    def compare(self, statement_a, statement_b):
+    def compare_text(self, text_a, text_b):
         """
-        Compare the two input statements.
+        Compare the similarity of two strings.
 
         :return: The percent of similarity between the closest synset distance.
         :rtype: float
         """
-        document_a = self.nlp(statement_a.text)
-        document_b = self.nlp(statement_b.text)
+
+        # Return 0 if either statement has a None text value
+        if text_a is None or text_b is None:
+            return 0
+
+        document_a = self.nlp(text_a)
+        document_b = self.nlp(text_b)
 
         return document_a.similarity(document_b)
 
@@ -155,14 +167,19 @@ class JaccardSimilarity(Comparator):
         # Disable the Named Entity Recognition (NER) component because it is not necessary
         self.nlp = spacy.load(model, exclude=['ner'])
 
-    def compare(self, statement_a, statement_b):
+    def compare_text(self, text_a, text_b):
         """
         Return the calculated similarity of two
         statements based on the Jaccard index.
         """
+
+        # Return 0 if either statement has a None text value
+        if text_a is None or text_b is None:
+            return 0
+
         # Make both strings lowercase
-        document_a = self.nlp(statement_a.text.lower())
-        document_b = self.nlp(statement_b.text.lower())
+        document_a = self.nlp(text_a.lower())
+        document_b = self.nlp(text_b.lower())
 
         statement_a_lemmas = frozenset([
             token.lemma_ for token in document_a if not token.is_stop

{chatterbot-1.2.1 → chatterbot-1.2.3}/chatterbot/logic/best_match.py

@@ -23,10 +23,13 @@ class BestMatch(LogicAdapter):
         self.excluded_words = kwargs.get('excluded_words')
 
     def process(self, input_statement, additional_response_selection_parameters=None):
+
+        # Get all statements that have a response text similar to the input statement
         search_results = self.search_algorithm.search(input_statement)
 
         # Use the input statement as the closest match if no other results are found
-        closest_match = next(search_results, input_statement)
+        input_statement.confidence = 0  # Use 0 confidence when no other results are found
+        closest_match = input_statement
 
         # Search for the closest match to the input statement
         for result in search_results:
@@ -36,8 +39,8 @@ class BestMatch(LogicAdapter):
             if result.confidence >= self.maximum_similarity_threshold:
                 break
 
-        self.chatbot.logger.info('Using "{}" as a close match to "{}" with a confidence of {}'.format(
-            closest_match.text, input_statement.text, closest_match.confidence
+        self.chatbot.logger.info('Selecting "{}" as a response to "{}" with a confidence of {}'.format(
+            closest_match.in_response_to, input_statement.text, closest_match.confidence
         ))
 
         recent_repeated_responses = filters.get_recent_repeated_responses(
@@ -51,39 +54,34 @@ class BestMatch(LogicAdapter):
             ))
 
         response_selection_parameters = {
-            'search_in_response_to': closest_match.search_text,
+            'search_text': closest_match.search_text,
+            'persona_not_startswith': 'bot:',
             'exclude_text': recent_repeated_responses,
             'exclude_text_words': self.excluded_words
         }
 
         alternate_response_selection_parameters = {
-            'search_in_response_to': self.chatbot.storage.tagger.get_text_index_string(
+            'search_in_response_to': self.chatbot.tagger.get_text_index_string(
                 input_statement.text
             ),
+            'persona_not_startswith': 'bot:',
             'exclude_text': recent_repeated_responses,
             'exclude_text_words': self.excluded_words
         }
 
         if additional_response_selection_parameters:
-            response_selection_parameters.update(additional_response_selection_parameters)
-            alternate_response_selection_parameters.update(additional_response_selection_parameters)
-
-        # Get all statements that are in response to the closest match
-        response_list = list(self.chatbot.storage.filter(**response_selection_parameters))
+            response_selection_parameters.update(
+                additional_response_selection_parameters
+            )
+            alternate_response_selection_parameters.update(
+                additional_response_selection_parameters
+            )
 
-        alternate_response_list = []
 
-        if not response_list:
-            self.chatbot.logger.info('No responses found. Generating alternate response list.')
-            alternate_response_list = list(self.chatbot.storage.filter(**alternate_response_selection_parameters))
+        # Get all statements with text similar to the closest match
+        response_list = list(self.chatbot.storage.filter(**response_selection_parameters))
 
         if response_list:
-            self.chatbot.logger.info(
-                'Selecting response from {} optimal responses.'.format(
-                    len(response_list)
-                )
-            )
-
             response = self.select_response(
                 input_statement,
                 response_list,
@@ -91,26 +89,35 @@ class BestMatch(LogicAdapter):
             )
 
             response.confidence = closest_match.confidence
-            self.chatbot.logger.info('Response selected. Using "{}"'.format(response.text))
-        elif alternate_response_list:
+            self.chatbot.logger.info('Selecting "{}" from {} optimal responses.'.format(
+                response.text,
+                len(response_list)
+            ))
+        else:
             '''
             The case where there was no responses returned for the selected match
             but a value exists for the statement the match is in response to.
             '''
-            self.chatbot.logger.info(
-                'Selecting response from {} optimal alternate responses.'.format(
-                    len(alternate_response_list)
+            self.chatbot.logger.info('No responses found. Generating alternate response list.')
+
+            alternate_response_list = list(self.chatbot.storage.filter(
+                **alternate_response_selection_parameters
+            ))
+
+            if alternate_response_list:
+                response = self.select_response(
+                    input_statement,
+                    alternate_response_list,
+                    self.chatbot.storage
                 )
-            )
-            response = self.select_response(
-                input_statement,
-                alternate_response_list,
-                self.chatbot.storage
-            )
 
-            response.confidence = closest_match.confidence
-            self.chatbot.logger.info('Alternate response selected. Using "{}"'.format(response.text))
-        else:
-            response = self.get_default_response(input_statement)
+                response.confidence = closest_match.confidence
+                self.chatbot.logger.info('Selected alternative response "{}" from {} options'.format(
+                    response.text,
+                    len(alternate_response_list)
+                ))
+            else:
+                response = self.get_default_response(input_statement)
+                self.chatbot.logger.info('Using "%s" as a default response.', response.text)
 
         return response

chatterbot-1.2.3/chatterbot/logic/specific_response.py

@@ -0,0 +1,80 @@
+from chatterbot.logic import LogicAdapter
+from chatterbot.conversation import Statement
+from chatterbot import constants, languages
+import spacy
+
+
+class SpecificResponseAdapter(LogicAdapter):
+    """
+    Return a specific response to a specific input.
+
+    :kwargs:
+        * *input_text* (``str``) --
+          The input text that triggers this logic adapter.
+        * *output_text* (``str`` or ``function``) --
+          The output text returned by this logic adapter.
+          If a function is provided, it should return a string.
+    """
+
+    def __init__(self, chatbot, **kwargs):
+        super().__init__(chatbot, **kwargs)
+
+        self.input_text = kwargs.get('input_text')
+
+        self.matcher = None
+
+        if MatcherClass := kwargs.get('matcher'):
+            language = kwargs.get('language', languages.ENG)
+
+            self.nlp = self._initialize_nlp(language)
+
+            self.matcher = MatcherClass(self.nlp.vocab)
+
+            self.matcher.add('SpecificResponse', [self.input_text])
+
+        self._output_text = kwargs.get('output_text')
+
+    def _initialize_nlp(self, language):
+        try:
+            model = constants.DEFAULT_LANGUAGE_TO_SPACY_MODEL_MAP[language]
+        except KeyError as e:
+            raise KeyError(
+                f'Spacy model is not available for language {language}'
+            ) from e
+
+        return spacy.load(model)
+
+    def can_process(self, statement):
+        if self.matcher:
+            doc = self.nlp(statement.text)
+            matches = self.matcher(doc)
+
+            if matches:
+                return True
+        elif statement.text == self.input_text:
+            return True
+
+        return False
+
+    def process(self, statement, additional_response_selection_parameters=None):
+
+        if callable(self._output_text):
+            response_statement = Statement(text=self._output_text())
+        else:
+            response_statement = Statement(text=self._output_text)
+
+        if self.matcher:
+            doc = self.nlp(statement.text)
+            matches = self.matcher(doc)
+
+            if matches:
+                response_statement.confidence = 1
+            else:
+                response_statement.confidence = 0
+
+        elif statement.text == self.input_text:
+            response_statement.confidence = 1
+        else:
+            response_statement.confidence = 0
+
+        return response_statement

{chatterbot-1.2.1 → chatterbot-1.2.3}/chatterbot/logic/unit_conversion.py

@@ -158,7 +158,8 @@ class UnitConversion(LogicAdapter):
                     response = func(p)
                     if response.confidence == 1.0:
                         break
-        except Exception:
+        except Exception as e:
+            self.chatbot.logger.warning('Error during UnitConversion: {}'.format(str(e)))
             response.confidence = 0.0
-        finally:
-            return response
+
+        return response

{chatterbot-1.2.1 → chatterbot-1.2.3}/chatterbot/response_selection.py

@@ -37,7 +37,7 @@ def get_most_frequent_response(input_statement, response_list, storage=None):
             matching_response = statement
             occurrence_count = count
 
-    # Choose the most commonly occuring matching response
+    # Choose the most commonly occurring matching response
     return matching_response