From 003d6a3d5fb6f8e395774d83c8392f9e2008ee86 Mon Sep 17 00:00:00 2001 From: jeffser Date: Fri, 2 Aug 2024 15:30:03 -0600 Subject: [PATCH] Restore last model used --- src/window.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/window.py b/src/window.py index 9555446..3da7dbd 100644 --- a/src/window.py +++ b/src/window.py @@ -282,8 +282,10 @@ class AlpacaWindow(Adw.ApplicationWindow): self.chats["selected_chat"] = row.get_child().get_name() self.load_history_into_chat() if len(self.chats["chats"][self.chats["selected_chat"]]["messages"].keys()) > 0: + last_model_used = self.chats["chats"][self.chats["selected_chat"]]["messages"][list(self.chats["chats"][self.chats["selected_chat"]]["messages"].keys())[-1]]["model"] + last_model_used = "{} ({})".format(last_model_used.split(":")[0].replace("-", " ").title(), last_model_used.split(":")[1]) for i in range(self.model_string_list.get_n_items()): - if self.model_string_list.get_string(i) == self.chats["chats"][self.chats["selected_chat"]]["messages"][list(self.chats["chats"][self.chats["selected_chat"]]["messages"].keys())[-1]]["model"]: + if self.model_string_list.get_string(i) == last_model_used: self.model_drop_down.set_selected(i) break self.save_history() @@ -773,7 +775,6 @@ Generate a title following these rules: self.model_string_list.append(f"{model['name'].split(':')[0].replace('-', ' ').title()} ({model['name'].split(':')[1]})") self.local_models.append(model["name"]) - self.model_drop_down.set_selected(0) self.verify_if_image_can_be_used() return else: @@ -1134,6 +1135,14 @@ Generate a title following these rules: self.chats["order"] = [] for chat_name in self.chats["chats"].keys(): self.chats["order"].append(chat_name) + if len(self.chats["chats"][self.chats["selected_chat"]]["messages"].keys()) > 0: + last_model_used = self.chats["chats"][self.chats["selected_chat"]]["messages"][list(self.chats["chats"][self.chats["selected_chat"]]["messages"].keys())[-1]]["model"] + last_model_used = "{} ({})".format(last_model_used.split(":")[0].replace("-", " ").title(), last_model_used.split(":")[1]) + print('huh') + for i in range(self.model_string_list.get_n_items()): + if self.model_string_list.get_string(i) == last_model_used: + self.model_drop_down.set_selected(i) + break except Exception as e: logger.error(e) self.chats = {"chats": {}, "selected_chat": None, "order": []}