ChatterBot 1.2.12__tar.gz → 1.2.13__tar.gz

{chatterbot-1.2.12 → chatterbot-1.2.13}/ChatterBot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ChatterBot
-Version: 1.2.12
+Version: 1.2.13
 Summary: ChatterBot is a machine learning, conversational dialog engine
 Author: Gunther Cox
 License-Expression: BSD-3-Clause
@@ -26,9 +26,9 @@ Classifier: Topic :: Text Processing :: Indexing
 Classifier: Topic :: Text Processing :: Linguistic
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3 :: Only
-Requires-Python: <3.14,>=3.9
+Requires-Python: <3.15,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: mathparse<0.3,>=0.2
@@ -42,7 +42,7 @@ Requires-Dist: coverage; extra == "test"
 Requires-Dist: sphinx<9.2,>=5.3; extra == "test"
 Requires-Dist: sphinx-sitemap>=2.6.0; extra == "test"
 Requires-Dist: huggingface_hub; extra == "test"
-Requires-Dist: django<6.0,<=4.1; extra == "test"
+Requires-Dist: django<6.0,>=4.1; extra == "test"
 Provides-Extra: dev
 Requires-Dist: pint>=0.8.1; extra == "dev"
 Requires-Dist: pyyaml<7.0,>=6.0; extra == "dev"
@@ -50,10 +50,10 @@ Requires-Dist: chatterbot-corpus<1.3.0,>=1.2.2; extra == "dev"
 Requires-Dist: ollama<1.0,>=0.6.0; extra == "dev"
 Requires-Dist: openai; extra == "dev"
 Provides-Extra: redis
-Requires-Dist: redis[hiredis]<7.2,>=7.0; extra == "redis"
+Requires-Dist: redis[hiredis]<7.3,>=7.0; extra == "redis"
 Requires-Dist: langchain-redis<0.3.0; extra == "redis"
 Requires-Dist: langchain-huggingface<1.3.0,>=0.1.2; extra == "redis"
-Requires-Dist: accelerate<1.13,>=1.6.0; extra == "redis"
+Requires-Dist: accelerate<1.14,>=1.6.0; extra == "redis"
 Requires-Dist: sentence-transformers<5.3.0,>=4.0.2; extra == "redis"
 Provides-Extra: mongodb
 Requires-Dist: pymongo<4.17,>=4.11; extra == "mongodb"
@@ -163,7 +163,7 @@ https://docs.chatterbot.us/contributing/
 ChatterBot is sponsored by:
 
 <p>
-   <a href="https://www.lambdatest.com/?utm_source=chatterbot&utm_medium=sponsor" target="_blank">
+   <a href="https://www.testmuai.com/?utm_source=chatterbot&utm_medium=sponsor" target="_blank">
       <img src="docs/_static/testmu-ai-white-logo.png" style="vertical-align: middle;" width="250" height="80" />
    </a>
 </p>

{chatterbot-1.2.12 → chatterbot-1.2.13}/ChatterBot.egg-info/SOURCES.txt

@@ -19,7 +19,6 @@ chatterbot/corpus.py
 chatterbot/exceptions.py
 chatterbot/filters.py
 chatterbot/languages.py
-chatterbot/llm.py
 chatterbot/parsing.py
 chatterbot/preprocessors.py
 chatterbot/response_selection.py
@@ -62,8 +61,10 @@ chatterbot/ext/sqlalchemy_app/__init__.py
 chatterbot/ext/sqlalchemy_app/models.py
 chatterbot/logic/__init__.py
 chatterbot/logic/best_match.py
+chatterbot/logic/llm_adapters.py
 chatterbot/logic/logic_adapter.py
 chatterbot/logic/mathematical_evaluation.py
+chatterbot/logic/mcp_tools.py
 chatterbot/logic/specific_response.py
 chatterbot/logic/time_adapter.py
 chatterbot/logic/unit_conversion.py

{chatterbot-1.2.12 → chatterbot-1.2.13}/ChatterBot.egg-info/requires.txt

@@ -15,10 +15,10 @@ openai
 pymongo<4.17,>=4.11
 
 [redis]
-redis[hiredis]<7.2,>=7.0
+redis[hiredis]<7.3,>=7.0
 langchain-redis<0.3.0
 langchain-huggingface<1.3.0,>=0.1.2
-accelerate<1.13,>=1.6.0
+accelerate<1.14,>=1.6.0
 sentence-transformers<5.3.0,>=4.0.2
 
 [test]
@@ -27,4 +27,4 @@ coverage
 sphinx<9.2,>=5.3
 sphinx-sitemap>=2.6.0
 huggingface_hub
-django<6.0,<=4.1
+django<6.0,>=4.1

{chatterbot-1.2.12 → chatterbot-1.2.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ChatterBot
-Version: 1.2.12
+Version: 1.2.13
 Summary: ChatterBot is a machine learning, conversational dialog engine
 Author: Gunther Cox
 License-Expression: BSD-3-Clause
@@ -26,9 +26,9 @@ Classifier: Topic :: Text Processing :: Indexing
 Classifier: Topic :: Text Processing :: Linguistic
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3 :: Only
-Requires-Python: <3.14,>=3.9
+Requires-Python: <3.15,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: mathparse<0.3,>=0.2
@@ -42,7 +42,7 @@ Requires-Dist: coverage; extra == "test"
 Requires-Dist: sphinx<9.2,>=5.3; extra == "test"
 Requires-Dist: sphinx-sitemap>=2.6.0; extra == "test"
 Requires-Dist: huggingface_hub; extra == "test"
-Requires-Dist: django<6.0,<=4.1; extra == "test"
+Requires-Dist: django<6.0,>=4.1; extra == "test"
 Provides-Extra: dev
 Requires-Dist: pint>=0.8.1; extra == "dev"
 Requires-Dist: pyyaml<7.0,>=6.0; extra == "dev"
@@ -50,10 +50,10 @@ Requires-Dist: chatterbot-corpus<1.3.0,>=1.2.2; extra == "dev"
 Requires-Dist: ollama<1.0,>=0.6.0; extra == "dev"
 Requires-Dist: openai; extra == "dev"
 Provides-Extra: redis
-Requires-Dist: redis[hiredis]<7.2,>=7.0; extra == "redis"
+Requires-Dist: redis[hiredis]<7.3,>=7.0; extra == "redis"
 Requires-Dist: langchain-redis<0.3.0; extra == "redis"
 Requires-Dist: langchain-huggingface<1.3.0,>=0.1.2; extra == "redis"
-Requires-Dist: accelerate<1.13,>=1.6.0; extra == "redis"
+Requires-Dist: accelerate<1.14,>=1.6.0; extra == "redis"
 Requires-Dist: sentence-transformers<5.3.0,>=4.0.2; extra == "redis"
 Provides-Extra: mongodb
 Requires-Dist: pymongo<4.17,>=4.11; extra == "mongodb"
@@ -163,7 +163,7 @@ https://docs.chatterbot.us/contributing/
 ChatterBot is sponsored by:
 
 <p>
-   <a href="https://www.lambdatest.com/?utm_source=chatterbot&utm_medium=sponsor" target="_blank">
+   <a href="https://www.testmuai.com/?utm_source=chatterbot&utm_medium=sponsor" target="_blank">
       <img src="docs/_static/testmu-ai-white-logo.png" style="vertical-align: middle;" width="250" height="80" />
    </a>
 </p>

{chatterbot-1.2.12 → chatterbot-1.2.13}/README.md

@@ -102,7 +102,7 @@ https://docs.chatterbot.us/contributing/
 ChatterBot is sponsored by:
 
 <p>
-   <a href="https://www.lambdatest.com/?utm_source=chatterbot&utm_medium=sponsor" target="_blank">
+   <a href="https://www.testmuai.com/?utm_source=chatterbot&utm_medium=sponsor" target="_blank">
       <img src="docs/_static/testmu-ai-white-logo.png" style="vertical-align: middle;" width="250" height="80" />
    </a>
 </p>

{chatterbot-1.2.12 → chatterbot-1.2.13}/chatterbot/__init__.py

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

{chatterbot-1.2.12 → chatterbot-1.2.13}/chatterbot/chatterbot.py

@@ -1,4 +1,5 @@
 import logging
+import uuid
 from typing import Union
 from chatterbot.storage import StorageAdapter
 from chatterbot.logic import LogicAdapter
@@ -56,6 +57,14 @@ class ChatBot(object):
 
         self.stream = stream
 
+        # Generate a default conversation ID for this ChatBot instance.
+        # This is used as a fallback when callers don't provide an explicit
+        # conversation ID, ensuring that conversation history is tracked
+        # within a session. Conversation IDs are necessary for cases such as
+        # the LLM-based logic adapters which require it to retrieve previous
+        # messages.
+        self.default_conversation = uuid.uuid4().hex
+
         self.logger = kwargs.get('logger', logging.getLogger(__name__))
 
         storage_adapter = kwargs.get('storage_adapter', 'chatterbot.storage.SQLStorageAdapter')
@@ -147,11 +156,6 @@ class ChatBot(object):
         # NOTE: 'xx' is the language code for a multi-language model
         self.nlp = spacy.blank(self.tagger.language.ISO_639_1)
 
-        self.model = None
-        if model := kwargs.get('model'):
-            import_path = model.pop('client')
-            self.model = utils.initialize_class(import_path, self, **model)
-
         # Allow the bot to save input it receives so that it can learn
         self.read_only = kwargs.get('read_only', False)
 
@@ -199,6 +203,13 @@ class ChatBot(object):
 
         input_statement.add_tags(*tags)
 
+        # If no conversation ID was provided, use the default session ID
+        # so that conversation history is tracked across calls. Callers
+        # can override this by passing an explicit conversation kwarg or
+        # setting it on the Statement object.
+        if not input_statement.conversation:
+            input_statement.conversation = self.default_conversation
+
         # Preprocess the input statement
         for preprocessor in self.preprocessors:
             input_statement = preprocessor(input_statement)
@@ -269,12 +280,6 @@ class ChatBot(object):
         result = None
         max_confidence = -1
 
-        # If a model is provided, use it to process the input statement
-        # instead of the logic adapters
-        if self.model:
-            model_response = self.model.process(input_statement)
-            return model_response
-
         for adapter in self.logic_adapters:
             if adapter.can_process(input_statement):
 
@@ -349,24 +354,40 @@ class ChatBot(object):
 
         if not previous_statement:
             previous_statement = self.get_latest_response(statement.conversation)
-            if previous_statement:
-                previous_statement = previous_statement.text
 
         previous_statement_text = previous_statement
 
-        if not isinstance(previous_statement, (str, type(None), )):
+        if isinstance(previous_statement, Statement):
             statement.in_response_to = previous_statement.text
+            previous_statement_text = previous_statement.text
+
+            # Set search_in_response_to from the previous statement's search_text
+            if previous_statement.search_text:
+                statement.search_in_response_to = previous_statement.search_text
+            elif previous_statement.text:
+                statement.search_in_response_to = self.tagger.get_text_index_string(
+                    previous_statement.text
+                )
         elif isinstance(previous_statement, str):
             statement.in_response_to = previous_statement
+            statement.search_in_response_to = self.tagger.get_text_index_string(
+                previous_statement
+            )
 
         self.logger.info('Adding "{}" as a response to "{}"'.format(
-            previous_statement_text,
-            statement.text
+            statement.text,
+            previous_statement_text
         ))
 
         if not statement.persona:
             statement.persona = 'bot:' + self.name
 
+        # Ensure search_text is set for the statement being saved
+        if not statement.search_text and statement.text:
+            statement.search_text = self.tagger.get_text_index_string(
+                statement.text
+            )
+
         # Save the response statement
         return self.storage.create(**statement.serialize())
 

{chatterbot-1.2.12 → chatterbot-1.2.13}/chatterbot/conversation.py

@@ -101,7 +101,7 @@ class Statement(StatementMixin):
         # 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.
-        self.confidence = 0
+        self.confidence = kwargs.get('confidence', 0)
 
         self.storage = None
 

{chatterbot-1.2.12 → chatterbot-1.2.13}/chatterbot/logic/__init__.py

@@ -4,6 +4,11 @@ from chatterbot.logic.mathematical_evaluation import MathematicalEvaluation
 from chatterbot.logic.specific_response import SpecificResponseAdapter
 from chatterbot.logic.time_adapter import TimeLogicAdapter
 from chatterbot.logic.unit_conversion import UnitConversion
+from chatterbot.logic.llm_adapters import (
+    LLMLogicAdapter,
+    OllamaLogicAdapter,
+    OpenAILogicAdapter,
+)
 
 
 __all__ = (
@@ -13,4 +18,7 @@ __all__ = (
     'SpecificResponseAdapter',
     'TimeLogicAdapter',
     'UnitConversion',
+    'LLMLogicAdapter',
+    'OllamaLogicAdapter',
+    'OpenAILogicAdapter',
 )

chatterbot-1.2.13/chatterbot/logic/best_match.py

@@ -0,0 +1,150 @@
+from chatterbot.logic import LogicAdapter
+from chatterbot.conversation import Statement
+from chatterbot import filters
+
+
+class BestMatch(LogicAdapter):
+    """
+    A logic adapter that returns a response based on known responses to
+    the closest matches to the input statement.
+
+    :param excluded_words:
+        The excluded_words parameter allows a list of words to be set that will
+        prevent the logic adapter from returning statements that have text
+        containing any of those words. This can be useful for preventing your
+        chat bot from saying swears when it is being demonstrated in front of
+        an audience.
+        Defaults to None
+    :type excluded_words: list
+    """
+
+    def __init__(self, chatbot, **kwargs):
+        super().__init__(chatbot, **kwargs)
+
+        self.excluded_words = kwargs.get('excluded_words')
+
+    def process(self, input_statement: Statement, additional_response_selection_parameters=None) -> Statement:
+
+        # 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
+        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:
+            closest_match = result
+
+            # Stop searching if a match that is close enough is found
+            if result.confidence >= self.maximum_similarity_threshold:
+                break
+
+        self.chatbot.logger.info('Selecting "{}" as a response to "{}" with a confidence of {}'.format(
+            closest_match.text, input_statement.text, closest_match.confidence
+        ))
+
+        # Semantic vector search vs indexed text search have different architectures:
+        #
+        # For SQL with indexed text search:
+        #   - Phase 1 finds a match based on string similarity (Levenshtein distance)
+        #   - Phase 2 finds variations of that match to get diverse responses
+        #   - This makes sense because you might have multiple instances of similar statements
+        #     learned from different conversations that provide different response options
+        #
+        # For Redis with semantic vectors:
+        #   - Phase 1 finds semantically similar responses using vector embeddings
+        #   - The semantic similarity already captures the "closeness" we want
+        #   - Phase 2 would be redundant - we already have the best semantic match
+        #   - The vector search inherently considers the entire semantic space, not just
+        #     exact string matches, so additional variation searching is unnecessary
+        #
+        # NOTE: This difference of functionality may need to be modified in the future
+        # if the redis adapter is determined to benefit from a Phase 2 style response
+        # selection. The main symptom that would drive such a change would be low
+        # quality or repetitive responses when using semantic vector search.
+        #
+        # Therefore, semantic vector search returns the Phase 1 result directly.
+        if self.search_algorithm.name == 'semantic_vector_search' and closest_match.confidence > 0:
+            response = closest_match
+            self.chatbot.logger.info('Using semantic search result directly: "{}"'.format(response.text))
+        else:
+            # For other search algorithms (indexed_text_search, text_search),
+            # we need to find responses to the closest match
+            recent_repeated_responses = filters.get_recent_repeated_responses(
+                self.chatbot,
+                input_statement.conversation
+            )
+
+            for index, recent_repeated_response in enumerate(recent_repeated_responses):
+                self.chatbot.logger.info('{}. Excluding recent repeated response of "{}"'.format(
+                    index, recent_repeated_response
+                ))
+
+            response_selection_parameters = {
+                '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': input_statement.search_text or 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 with text similar to the closest match
+            response_list = list(self.chatbot.storage.filter(**response_selection_parameters))
+
+            if response_list:
+                response = self.select_response(
+                    input_statement,
+                    response_list,
+                    self.chatbot.storage
+                )
+
+                response.confidence = closest_match.confidence
+                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('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.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