hueso/Alpaca
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better handling of remote connection lost

Browse Source
This commit is contained in:
jeffser 2024-05-22 21:10:16 -06:00
parent f2e6f1aac8
commit 1a04082564
1 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/window.py
View File

@ -884,11 +884,46 @@ class AlpacaWindow(Adw.ApplicationWindow):
if self.ollama_instance is not None: self.stop_instance() if self.ollama_instance is not None: self.stop_instance()
start_instance(self) start_instance(self)
def reconnect_remote(self, dialog, task=None, entry=None):
response = dialog.choose_finish(task)
if not task or response == "connect":
self.ollama_url = entry.get_text()
self.remote_url = self.ollama_url
if self.verify_connection() == False: self.connection_error()
else:
dialog.force_close()
elif response == "local":
self.run_remote = False
self.ollama_url = f"http://127.0.0.1:{self.local_ollama_port}"
self.start_instance()
if self.verify_connection() == False: self.connection_error()
else:
self.remote_connection_switch.set_active(False)
dialog.force_close()
elif response == "close":
self.destroy()
def connection_error(self): def connection_error(self):
if self.run_remote: if self.run_remote:
self.preferences_dialog.present(self) entry = Gtk.Entry(
self.remote_connection_entry.set_css_classes(["error"]) css_classes = ["error"],
self.show_toast("error", 1, self.preferences_dialog) text = self.ollama_url
)
dialog = Adw.AlertDialog(
heading=_("Connection Error"),
body=_("The remote instance has disconnected"),
extra_child=entry
)
entry.connect("activate", lambda entry, dialog=dialog: self.reconnect_remote(dialog=dialog, entry=entry))
dialog.add_response("close", _("Close Alpaca"))
dialog.add_response("local", _("Use local instance"))
dialog.add_response("remote", _("Connect"))
dialog.set_response_appearance("remote", Adw.ResponseAppearance.SUGGESTED)
dialog.choose(
parent = self,
cancellable = None,
callback = lambda dialog, task, entry=entry: self.reconnect_remote(dialog=dialog, task=task, entry=entry)
)
else: else:
self.restart_instance() self.restart_instance()
self.show_toast("error", 7, self.main_overlay) self.show_toast("error", 7, self.main_overlay)
@ -1013,7 +1048,7 @@ class AlpacaWindow(Adw.ApplicationWindow):
self.ollama_url = f"http://127.0.0.1:{self.local_ollama_port}" self.ollama_url = f"http://127.0.0.1:{self.local_ollama_port}"
self.first_time_setup = True self.first_time_setup = True
self.welcome_dialog.present(self) self.welcome_dialog.present(self)
if self.verify_connection() is False: self.connection_error() if self.verify_connection() is False and self.run_remote == False: self.connection_error()
self.update_list_available_models() self.update_list_available_models()
self.load_history() self.load_history()
self.update_chat_list() self.update_chat_list()