From 510fe83b6fd761434c94d6e9ecfb6730af65813c Mon Sep 17 00:00:00 2001 From: jeffser Date: Mon, 8 Jul 2024 19:41:31 -0600 Subject: [PATCH] Better format for date on footer of messages --- src/window.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/window.py b/src/window.py index 014d74b..be598f6 100644 --- a/src/window.py +++ b/src/window.py @@ -895,8 +895,9 @@ Generate a title following these rules: if id not in self.chats["chats"][self.chats["selected_chat"]]["messages"] or vadjustment.get_value() + 50 >= vadjustment.get_upper() - vadjustment.get_page_size(): GLib.idle_add(vadjustment.set_value, vadjustment.get_upper()) if data['done']: - formated_datetime = datetime.now().strftime("%Y/%m/%d %H:%M") - text = f"\n{data['model']}\t{formated_datetime}" + date = datetime.strptime(self.chats["chats"][self.chats["selected_chat"]]["messages"][id]["date"], '%Y/%m/%d %H:%M:%S') + formated_date = GLib.DateTime.new(GLib.DateTime.new_now_local().get_timezone(), date.year, date.month, date.day, date.hour, date.minute, date.second).format("%c") + text = f"\n\n{data['model'].split(':')[0].replace('-', ' ').title()} ({data['model'].split(':')[1]})\t\t{formated_date}" GLib.idle_add(self.bot_message.insert_markup, self.bot_message.get_end_iter(), text, len(text)) self.save_history() GLib.idle_add(self.bot_message_button_container.set_visible, True) @@ -910,7 +911,7 @@ Generate a title following these rules: self.chats["chats"][self.chats["selected_chat"]]["messages"][id] = { "role": "assistant", "model": data['model'], - "date": datetime.now().strftime("%Y/%m/%d %H:%M"), + "date": datetime.now().strftime("%Y/%m/%d %H:%M:%S"), "content": '' } GLib.idle_add(self.bot_message.insert, self.bot_message.get_end_iter(), data['message']['content']) @@ -1054,10 +1055,12 @@ Generate a title following these rules: for widget in list(self.chat_container): self.chat_container.remove(widget) for key, message in self.chats['chats'][self.chats["selected_chat"]]['messages'].items(): if message: + date = datetime.strptime(message['date'] + (":00" if message['date'].count(":") == 1 else ""), '%Y/%m/%d %H:%M:%S') + formated_date = GLib.DateTime.new(GLib.DateTime.new_now_local().get_timezone(), date.year, date.month, date.day, date.hour, date.minute, date.second).format("%c") if message['role'] == 'user': - self.show_message(message['content'], False, f"\n\n{message['date']}", message['images'] if 'images' in message else None, message['files'] if 'files' in message else None, id=key) + self.show_message(message['content'], False, f"\n\n{formated_date}", message['images'] if 'images' in message else None, message['files'] if 'files' in message else None, id=key) else: - self.show_message(message['content'], True, f"\n\n{message['model']}\t|\t{message['date']}", id=key) + self.show_message(message['content'], True, f"\n\n{message['model'].split(':')[0].replace('-', ' ').title()} ({message['model'].split(':')[1]})\n{formated_date}", id=key) self.add_code_blocks() self.bot_message = None