refactor: renamed (almost) all Chat/ChatDB functions
This commit is contained in:
+59
-59
@@ -23,78 +23,78 @@ class TestChat(unittest.TestCase):
|
||||
file_path=pathlib.Path('0002.txt'))
|
||||
|
||||
def test_filter(self) -> None:
|
||||
self.chat.add_messages([self.message1, self.message2])
|
||||
self.chat.filter(MessageFilter(answer_contains='Answer 1'))
|
||||
self.chat.msg_add([self.message1, self.message2])
|
||||
self.chat.msg_filter(MessageFilter(answer_contains='Answer 1'))
|
||||
|
||||
self.assertEqual(len(self.chat.messages), 1)
|
||||
self.assertEqual(self.chat.messages[0].question, 'Question 1')
|
||||
|
||||
def test_sort(self) -> None:
|
||||
self.chat.add_messages([self.message2, self.message1])
|
||||
self.chat.sort()
|
||||
self.chat.msg_add([self.message2, self.message1])
|
||||
self.chat.msg_sort()
|
||||
self.assertEqual(self.chat.messages[0].question, 'Question 1')
|
||||
self.assertEqual(self.chat.messages[1].question, 'Question 2')
|
||||
self.chat.sort(reverse=True)
|
||||
self.chat.msg_sort(reverse=True)
|
||||
self.assertEqual(self.chat.messages[0].question, 'Question 2')
|
||||
self.assertEqual(self.chat.messages[1].question, 'Question 1')
|
||||
|
||||
def test_clear(self) -> None:
|
||||
self.chat.add_messages([self.message1])
|
||||
self.chat.clear()
|
||||
self.chat.msg_add([self.message1])
|
||||
self.chat.msg_clear()
|
||||
self.assertEqual(len(self.chat.messages), 0)
|
||||
|
||||
def test_add_messages(self) -> None:
|
||||
self.chat.add_messages([self.message1, self.message2])
|
||||
self.chat.msg_add([self.message1, self.message2])
|
||||
self.assertEqual(len(self.chat.messages), 2)
|
||||
self.assertEqual(self.chat.messages[0].question, 'Question 1')
|
||||
self.assertEqual(self.chat.messages[1].question, 'Question 2')
|
||||
|
||||
def test_tags(self) -> None:
|
||||
self.chat.add_messages([self.message1, self.message2])
|
||||
tags_all = self.chat.tags()
|
||||
self.chat.msg_add([self.message1, self.message2])
|
||||
tags_all = self.chat.msg_tags()
|
||||
self.assertSetEqual(tags_all, {Tag('atag1'), Tag('btag2')})
|
||||
tags_pref = self.chat.tags(prefix='a')
|
||||
tags_pref = self.chat.msg_tags(prefix='a')
|
||||
self.assertSetEqual(tags_pref, {Tag('atag1')})
|
||||
tags_cont = self.chat.tags(contain='2')
|
||||
tags_cont = self.chat.msg_tags(contain='2')
|
||||
self.assertSetEqual(tags_cont, {Tag('btag2')})
|
||||
|
||||
def test_tags_frequency(self) -> None:
|
||||
self.chat.add_messages([self.message1, self.message2])
|
||||
tags_freq = self.chat.tags_frequency()
|
||||
self.chat.msg_add([self.message1, self.message2])
|
||||
tags_freq = self.chat.msg_tags_frequency()
|
||||
self.assertDictEqual(tags_freq, {'atag1': 1, 'btag2': 2})
|
||||
|
||||
def test_find_remove_messages(self) -> None:
|
||||
self.chat.add_messages([self.message1, self.message2])
|
||||
msgs = self.chat.find_messages(['0001.txt'])
|
||||
self.chat.msg_add([self.message1, self.message2])
|
||||
msgs = self.chat.msg_find(['0001.txt'])
|
||||
self.assertListEqual(msgs, [self.message1])
|
||||
msgs = self.chat.find_messages(['0001.txt', '0002.txt'])
|
||||
msgs = self.chat.msg_find(['0001.txt', '0002.txt'])
|
||||
self.assertListEqual(msgs, [self.message1, self.message2])
|
||||
# add new Message with full path
|
||||
message3 = Message(Question('Question 2'),
|
||||
Answer('Answer 2'),
|
||||
{Tag('btag2')},
|
||||
file_path=pathlib.Path('/foo/bla/0003.txt'))
|
||||
self.chat.add_messages([message3])
|
||||
self.chat.msg_add([message3])
|
||||
# find new Message by full path
|
||||
msgs = self.chat.find_messages(['/foo/bla/0003.txt'])
|
||||
msgs = self.chat.msg_find(['/foo/bla/0003.txt'])
|
||||
self.assertListEqual(msgs, [message3])
|
||||
# find Message with full path only by filename
|
||||
msgs = self.chat.find_messages(['0003.txt'])
|
||||
msgs = self.chat.msg_find(['0003.txt'])
|
||||
self.assertListEqual(msgs, [message3])
|
||||
# remove last message
|
||||
self.chat.remove_messages(['0003.txt'])
|
||||
self.chat.msg_remove(['0003.txt'])
|
||||
self.assertListEqual(self.chat.messages, [self.message1, self.message2])
|
||||
|
||||
def test_latest_message(self) -> None:
|
||||
self.assertIsNone(self.chat.latest_message())
|
||||
self.chat.add_messages([self.message1])
|
||||
self.assertEqual(self.chat.latest_message(), self.message1)
|
||||
self.chat.add_messages([self.message2])
|
||||
self.assertEqual(self.chat.latest_message(), self.message2)
|
||||
self.assertIsNone(self.chat.msg_latest())
|
||||
self.chat.msg_add([self.message1])
|
||||
self.assertEqual(self.chat.msg_latest(), self.message1)
|
||||
self.chat.msg_add([self.message2])
|
||||
self.assertEqual(self.chat.msg_latest(), self.message2)
|
||||
|
||||
@patch('sys.stdout', new_callable=StringIO)
|
||||
def test_print(self, mock_stdout: StringIO) -> None:
|
||||
self.chat.add_messages([self.message1, self.message2])
|
||||
self.chat.msg_add([self.message1, self.message2])
|
||||
self.chat.print(paged=False)
|
||||
expected_output = f"""{Question.txt_header}
|
||||
Question 1
|
||||
@@ -109,7 +109,7 @@ Answer 2
|
||||
|
||||
@patch('sys.stdout', new_callable=StringIO)
|
||||
def test_print_with_tags_and_file(self, mock_stdout: StringIO) -> None:
|
||||
self.chat.add_messages([self.message1, self.message2])
|
||||
self.chat.msg_add([self.message1, self.message2])
|
||||
self.chat.print(paged=False, with_tags=True, with_files=True)
|
||||
expected_output = f"""{TagLine.prefix} atag1 btag2
|
||||
FILE: 0001.txt
|
||||
@@ -267,7 +267,7 @@ class TestChatDB(unittest.TestCase):
|
||||
self.assertEqual(chat_db.messages[3].file_path, pathlib.Path(self.db_path.name, '0004.yaml'))
|
||||
|
||||
# write the messages to the cache directory
|
||||
chat_db.write_cache()
|
||||
chat_db.cache_write()
|
||||
# check if the written files are in the cache directory
|
||||
cache_dir_files = self.message_list(self.cache_path)
|
||||
self.assertEqual(len(cache_dir_files), 4)
|
||||
@@ -287,7 +287,7 @@ class TestChatDB(unittest.TestCase):
|
||||
old_timestamps = {file: file.stat().st_mtime for file in db_dir_files}
|
||||
# overwrite the messages in the db directory
|
||||
time.sleep(0.05)
|
||||
chat_db.write_db()
|
||||
chat_db.db_write()
|
||||
# check if the written files are in the DB directory
|
||||
db_dir_files = self.message_list(self.db_path)
|
||||
self.assertEqual(len(db_dir_files), 4)
|
||||
@@ -320,7 +320,7 @@ class TestChatDB(unittest.TestCase):
|
||||
new_message1.to_file(pathlib.Path(self.db_path.name, '0005.txt'))
|
||||
new_message2.to_file(pathlib.Path(self.db_path.name, '0006.yaml'))
|
||||
# read and check them
|
||||
chat_db.read_db()
|
||||
chat_db.db_read()
|
||||
self.assertEqual(len(chat_db.messages), 6)
|
||||
self.assertEqual(chat_db.messages[4].file_path, pathlib.Path(self.db_path.name, '0005.txt'))
|
||||
self.assertEqual(chat_db.messages[5].file_path, pathlib.Path(self.db_path.name, '0006.yaml'))
|
||||
@@ -335,7 +335,7 @@ class TestChatDB(unittest.TestCase):
|
||||
new_message3.to_file(pathlib.Path(self.cache_path.name, '0007.txt'))
|
||||
new_message4.to_file(pathlib.Path(self.cache_path.name, '0008.yaml'))
|
||||
# read and check them
|
||||
chat_db.read_cache()
|
||||
chat_db.cache_read()
|
||||
self.assertEqual(len(chat_db.messages), 8)
|
||||
# check that the new message have the cache dir path
|
||||
self.assertEqual(chat_db.messages[6].file_path, pathlib.Path(self.cache_path.name, '0007.txt'))
|
||||
@@ -350,7 +350,7 @@ class TestChatDB(unittest.TestCase):
|
||||
new_message1.to_file(pathlib.Path(self.db_path.name, '0005.txt'))
|
||||
new_message2.to_file(pathlib.Path(self.db_path.name, '0006.yaml'))
|
||||
# read from the DB dir and check if the modified messages have been updated
|
||||
chat_db.read_db()
|
||||
chat_db.db_read()
|
||||
self.assertEqual(len(chat_db.messages), 8)
|
||||
self.assertEqual(chat_db.messages[4].question, 'New Question 1')
|
||||
self.assertEqual(chat_db.messages[5].question, 'New Question 2')
|
||||
@@ -361,7 +361,7 @@ class TestChatDB(unittest.TestCase):
|
||||
new_message3.to_file(pathlib.Path(self.db_path.name, '0007.txt'))
|
||||
new_message4.to_file(pathlib.Path(self.db_path.name, '0008.yaml'))
|
||||
# read and check them
|
||||
chat_db.read_db()
|
||||
chat_db.db_read()
|
||||
self.assertEqual(len(chat_db.messages), 8)
|
||||
# check that they now have the DB path
|
||||
self.assertEqual(chat_db.messages[6].file_path, pathlib.Path(self.db_path.name, '0007.txt'))
|
||||
@@ -378,13 +378,13 @@ class TestChatDB(unittest.TestCase):
|
||||
self.assertEqual(chat_db.messages[3].file_path, pathlib.Path(self.db_path.name, '0004.yaml'))
|
||||
|
||||
# write the messages to the cache directory
|
||||
chat_db.write_cache()
|
||||
chat_db.cache_write()
|
||||
# check if the written files are in the cache directory
|
||||
cache_dir_files = self.message_list(self.cache_path)
|
||||
self.assertEqual(len(cache_dir_files), 4)
|
||||
|
||||
# now rewrite them to the DB dir and check for modified paths
|
||||
chat_db.write_db()
|
||||
chat_db.db_write()
|
||||
db_dir_files = self.message_list(self.db_path)
|
||||
self.assertEqual(len(db_dir_files), 4)
|
||||
self.assertIn(pathlib.Path(self.db_path.name, '0001.txt'), db_dir_files)
|
||||
@@ -399,10 +399,10 @@ class TestChatDB(unittest.TestCase):
|
||||
message_cache = Message(question=Question("What the hell am I doing here?"),
|
||||
answer=Answer("You're a creep!"),
|
||||
file_path=pathlib.Path(self.cache_path.name, '0005.txt'))
|
||||
chat_db.add_messages([message_empty, message_cache])
|
||||
chat_db.msg_add([message_empty, message_cache])
|
||||
|
||||
# clear the cache and check the cache dir
|
||||
chat_db.clear_cache()
|
||||
chat_db.cache_clear()
|
||||
cache_dir_files = self.message_list(self.cache_path)
|
||||
self.assertEqual(len(cache_dir_files), 0)
|
||||
# make sure that the DB messages (and the new message) are still there
|
||||
@@ -423,7 +423,7 @@ class TestChatDB(unittest.TestCase):
|
||||
# add new messages to the cache dir
|
||||
message1 = Message(question=Question("Question 1"),
|
||||
answer=Answer("Answer 1"))
|
||||
chat_db.add_to_cache([message1])
|
||||
chat_db.cache_add([message1])
|
||||
# check if the file_path has been correctly set
|
||||
self.assertIsNotNone(message1.file_path)
|
||||
self.assertEqual(message1.file_path.parent, pathlib.Path(self.cache_path.name)) # type: ignore [union-attr]
|
||||
@@ -433,7 +433,7 @@ class TestChatDB(unittest.TestCase):
|
||||
# add new messages to the DB dir
|
||||
message2 = Message(question=Question("Question 2"),
|
||||
answer=Answer("Answer 2"))
|
||||
chat_db.add_to_db([message2])
|
||||
chat_db.db_add([message2])
|
||||
# check if the file_path has been correctly set
|
||||
self.assertIsNotNone(message2.file_path)
|
||||
self.assertEqual(message2.file_path.parent, pathlib.Path(self.db_path.name)) # type: ignore [union-attr]
|
||||
@@ -441,7 +441,7 @@ class TestChatDB(unittest.TestCase):
|
||||
self.assertEqual(len(db_dir_files), 5)
|
||||
|
||||
with self.assertRaises(ChatError):
|
||||
chat_db.add_to_cache([Message(Question("?"), file_path=pathlib.Path("foo"))])
|
||||
chat_db.cache_add([Message(Question("?"), file_path=pathlib.Path("foo"))])
|
||||
|
||||
def test_chat_db_write_messages(self) -> None:
|
||||
# create a new ChatDB instance
|
||||
@@ -457,11 +457,11 @@ class TestChatDB(unittest.TestCase):
|
||||
message = Message(question=Question("Question 1"),
|
||||
answer=Answer("Answer 1"))
|
||||
with self.assertRaises(ChatError):
|
||||
chat_db.write_messages([message])
|
||||
chat_db.msg_write([message])
|
||||
|
||||
# write a message with a valid file_path
|
||||
message.file_path = pathlib.Path(self.cache_path.name) / '123456.txt'
|
||||
chat_db.write_messages([message])
|
||||
chat_db.msg_write([message])
|
||||
cache_dir_files = self.message_list(self.cache_path)
|
||||
self.assertEqual(len(cache_dir_files), 1)
|
||||
self.assertIn(pathlib.Path(self.cache_path.name, '123456.txt'), cache_dir_files)
|
||||
@@ -479,37 +479,37 @@ class TestChatDB(unittest.TestCase):
|
||||
message = chat_db.messages[0]
|
||||
message.answer = Answer("New answer")
|
||||
# update message without writing
|
||||
chat_db.update_messages([message], write=False)
|
||||
chat_db.msg_update([message], write=False)
|
||||
self.assertEqual(chat_db.messages[0].answer, Answer("New answer"))
|
||||
# re-read the message and check for old content
|
||||
chat_db.read_db()
|
||||
chat_db.db_read()
|
||||
self.assertEqual(chat_db.messages[0].answer, Answer("Answer 1"))
|
||||
# now check with writing (message should be overwritten)
|
||||
chat_db.update_messages([message], write=True)
|
||||
chat_db.read_db()
|
||||
chat_db.msg_update([message], write=True)
|
||||
chat_db.db_read()
|
||||
self.assertEqual(chat_db.messages[0].answer, Answer("New answer"))
|
||||
# test without file_path -> expect error
|
||||
message1 = Message(question=Question("Question 1"),
|
||||
answer=Answer("Answer 1"))
|
||||
with self.assertRaises(ChatError):
|
||||
chat_db.update_messages([message1])
|
||||
chat_db.msg_update([message1])
|
||||
|
||||
def test_chat_db_latest_message(self) -> None:
|
||||
chat_db = ChatDB.from_dir(pathlib.Path(self.cache_path.name),
|
||||
pathlib.Path(self.db_path.name))
|
||||
self.assertEqual(chat_db.latest_message(source='mem'), self.message4)
|
||||
self.assertEqual(chat_db.latest_message(source='db'), self.message4)
|
||||
self.assertEqual(chat_db.latest_message(source='disk'), self.message4)
|
||||
self.assertEqual(chat_db.latest_message(source='all'), self.message4)
|
||||
self.assertEqual(chat_db.msg_latest(source='mem'), self.message4)
|
||||
self.assertEqual(chat_db.msg_latest(source='db'), self.message4)
|
||||
self.assertEqual(chat_db.msg_latest(source='disk'), self.message4)
|
||||
self.assertEqual(chat_db.msg_latest(source='all'), self.message4)
|
||||
# the cache is currently empty:
|
||||
self.assertIsNone(chat_db.latest_message(source='cache'))
|
||||
self.assertIsNone(chat_db.msg_latest(source='cache'))
|
||||
# add new messages to the cache dir
|
||||
new_message = Message(question=Question("New Question"),
|
||||
answer=Answer("New Answer"))
|
||||
chat_db.add_to_cache([new_message])
|
||||
self.assertEqual(chat_db.latest_message(source='cache'), new_message)
|
||||
self.assertEqual(chat_db.latest_message(source='mem'), new_message)
|
||||
self.assertEqual(chat_db.latest_message(source='disk'), new_message)
|
||||
self.assertEqual(chat_db.latest_message(source='all'), new_message)
|
||||
chat_db.cache_add([new_message])
|
||||
self.assertEqual(chat_db.msg_latest(source='cache'), new_message)
|
||||
self.assertEqual(chat_db.msg_latest(source='mem'), new_message)
|
||||
self.assertEqual(chat_db.msg_latest(source='disk'), new_message)
|
||||
self.assertEqual(chat_db.msg_latest(source='all'), new_message)
|
||||
# the DB does not contain the new message
|
||||
self.assertEqual(chat_db.latest_message(source='db'), self.message4)
|
||||
self.assertEqual(chat_db.msg_latest(source='db'), self.message4)
|
||||
|
||||
Reference in New Issue
Block a user