ChatterBot 1.2.13__tar.gz → 1.2.14__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ChatterBot
-Version: 1.2.13
+Version: 1.2.14
 Summary: ChatterBot is a machine learning, conversational dialog engine
 Author: Gunther Cox
 License-Expression: BSD-3-Clause
@@ -43,6 +43,7 @@ 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: click<9.0,>=8.4; extra == "test"
 Provides-Extra: dev
 Requires-Dist: pint>=0.8.1; extra == "dev"
 Requires-Dist: pyyaml<7.0,>=6.0; extra == "dev"

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

@@ -28,3 +28,4 @@ sphinx<9.2,>=5.3
 sphinx-sitemap>=2.6.0
 huggingface_hub
 django<6.0,>=4.1
+click<9.0,>=8.4

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ChatterBot
-Version: 1.2.13
+Version: 1.2.14
 Summary: ChatterBot is a machine learning, conversational dialog engine
 Author: Gunther Cox
 License-Expression: BSD-3-Clause
@@ -43,6 +43,7 @@ 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: click<9.0,>=8.4; extra == "test"
 Provides-Extra: dev
 Requires-Dist: pint>=0.8.1; extra == "dev"
 Requires-Dist: pyyaml<7.0,>=6.0; extra == "dev"

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

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

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

@@ -354,25 +354,15 @@ 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 isinstance(previous_statement, Statement):
+        if not isinstance(previous_statement, (str, type(None), )):
             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(
             statement.text,
@@ -382,12 +372,6 @@ class ChatBot(object):
         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.13 → chatterbot-1.2.14}/chatterbot/trainers.py

@@ -618,13 +618,18 @@ class UbuntuCorpusTrainer(CsvFileTrainer):
         if not self.disable_progress:
             print('Extracting {}'.format(file_path))
 
+        if os.path.islink(self.data_path):
+            raise self.TrainerInitializationException(
+                'Refusing to extract archive to a symbolic link: {}'.format(self.data_path)
+            )
+
         if not os.path.exists(self.data_path):
             os.makedirs(self.data_path)
 
         def is_within_directory(directory, target):
 
-            abs_directory = os.path.abspath(directory)
-            abs_target = os.path.abspath(target)
+            abs_directory = os.path.realpath(directory)
+            abs_target = os.path.realpath(target)
 
             prefix = os.path.commonprefix([abs_directory, abs_target])
 
@@ -633,6 +638,8 @@ class UbuntuCorpusTrainer(CsvFileTrainer):
         def safe_extract(tar, path='.', members=None, *, numeric_owner=False):
 
             for member in tar.getmembers():
+                if member.issym() or member.islnk():
+                    raise Exception('Symlinks and hard links are not permitted in the tar file')
                 member_path = os.path.join(path, member.name)
                 if not is_within_directory(path, member_path):
                     raise Exception('Attempted Path Traversal in Tar File')

{chatterbot-1.2.13 → chatterbot-1.2.14}/pyproject.toml

@@ -74,7 +74,8 @@ test = [
     "sphinx>=5.3,<9.2",
     "sphinx-sitemap>=2.6.0",
     "huggingface_hub",
-    "django>=4.1,<6.0"
+    "django>=4.1,<6.0",
+    "click>=8.4,<9.0"
 ]
 dev = [
     "pint>=0.8.1",