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

Replaced some variable names and removed an unsused overlay

Browse Source
This commit is contained in:
jeffser 2024-05-24 12:43:25 -06:00
parent a1397ef09e
commit 999f7a7151
2 changed files with 80 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/window.py
View File

@ -65,12 +65,11 @@ class AlpacaWindow(Adw.ApplicationWindow):
bot_message_box : Gtk.Box = None bot_message_box : Gtk.Box = None
bot_message_view : Gtk.TextView = None bot_message_view : Gtk.TextView = None
welcome_dialog = Gtk.Template.Child() welcome_dialog = Gtk.Template.Child()
connection_carousel = Gtk.Template.Child() welcome_carousel = Gtk.Template.Child()
connection_previous_button = Gtk.Template.Child() welcome_previous_button = Gtk.Template.Child()
connection_next_button = Gtk.Template.Child() welcome_next_button = Gtk.Template.Child()
main_overlay = Gtk.Template.Child() main_overlay = Gtk.Template.Child()
manage_models_overlay = Gtk.Template.Child() manage_models_overlay = Gtk.Template.Child()
connection_overlay = Gtk.Template.Child()
chat_container = Gtk.Template.Child() chat_container = Gtk.Template.Child()
chat_window = Gtk.Template.Child() chat_window = Gtk.Template.Child()
message_text_view = Gtk.Template.Child() message_text_view = Gtk.Template.Child()
@ -256,7 +255,6 @@ class AlpacaWindow(Adw.ApplicationWindow):
return return
else: else:
self.connection_error() self.connection_error()
self.show_toast("error", 2, self.connection_overlay)
def verify_connection(self): def verify_connection(self):
response = simple_get(self.ollama_url) response = simple_get(self.ollama_url)
@ -391,7 +389,6 @@ class AlpacaWindow(Adw.ApplicationWindow):
self.attached_image = {"path": None, "base64": None} self.attached_image = {"path": None, "base64": None}
# GLib.idle_add(self.message_text_view.set_sensitive, True) # GLib.idle_add(self.message_text_view.set_sensitive, True)
if response['status'] == 'error': if response['status'] == 'error':
GLib.idle_add(self.show_toast, 'error', 1, self.connection_overlay)
GLib.idle_add(self.connection_error) GLib.idle_add(self.connection_error)
def send_message(self, button=None): def send_message(self, button=None):
@ -459,7 +456,6 @@ class AlpacaWindow(Adw.ApplicationWindow):
if response['status'] == 'ok': if response['status'] == 'ok':
self.show_toast("good", 0, self.manage_models_overlay) self.show_toast("good", 0, self.manage_models_overlay)
else: else:
self.show_toast("error", 3, self.connection_overlay)
self.manage_models_dialog.close() self.manage_models_dialog.close()
self.connection_error() self.connection_error()
@ -483,7 +479,6 @@ class AlpacaWindow(Adw.ApplicationWindow):
del self.pulling_models[f"{model_name}:{tag}"] del self.pulling_models[f"{model_name}:{tag}"]
else: else:
GLib.idle_add(self.show_notification, _("Pull Model Error"), _("Failed to pull model '{}' due to network error.").format(f"{model_name}:{tag}"), True, Gio.ThemedIcon.new("dialog-error-symbolic")) GLib.idle_add(self.show_notification, _("Pull Model Error"), _("Failed to pull model '{}' due to network error.").format(f"{model_name}:{tag}"), True, Gio.ThemedIcon.new("dialog-error-symbolic"))
GLib.idle_add(self.show_toast, "error", 4, self.connection_overlay)
GLib.idle_add(self.pulling_models[f"{model_name}:{tag}"].get_parent().remove, self.pulling_models[f"{model_name}:{tag}"]) GLib.idle_add(self.pulling_models[f"{model_name}:{tag}"].get_parent().remove, self.pulling_models[f"{model_name}:{tag}"])
del self.pulling_models[f"{model_name}:{tag}"] del self.pulling_models[f"{model_name}:{tag}"]
GLib.idle_add(self.manage_models_dialog.close) GLib.idle_add(self.manage_models_dialog.close)
@ -605,23 +600,21 @@ class AlpacaWindow(Adw.ApplicationWindow):
self.update_list_local_models() self.update_list_local_models()
self.manage_models_dialog.present(self) self.manage_models_dialog.present(self)
def connection_carousel_page_changed(self, carousel, index): def welcome_carousel_page_changed(self, carousel, index):
if index == 0: self.connection_previous_button.set_sensitive(False) if index == 0: self.welcome_previous_button.set_sensitive(False)
else: self.connection_previous_button.set_sensitive(True) else: self.welcome_previous_button.set_sensitive(True)
if index == carousel.get_n_pages()-1: self.connection_next_button.set_label("Connect") if index == carousel.get_n_pages()-1: self.welcome_next_button.set_label("Connect")
else: self.connection_next_button.set_label("Next") else: self.welcome_next_button.set_label("Next")
def connection_previous_button_activate(self, button): def welcome_previous_button_activate(self, button):
self.connection_carousel.scroll_to(self.connection_carousel.get_nth_page(self.connection_carousel.get_position()-1), True) self.welcome_carousel.scroll_to(self.welcome_carousel.get_nth_page(self.welcome_carousel.get_position()-1), True)
def connection_next_button_activate(self, button): def welcome_next_button_activate(self, button):
if button.get_label() == "Next": self.connection_carousel.scroll_to(self.connection_carousel.get_nth_page(self.connection_carousel.get_position()+1), True) if button.get_label() == "Next": self.welcome_carousel.scroll_to(self.welcome_carousel.get_nth_page(self.welcome_carousel.get_position()+1), True)
else: else:
if self.verify_connection():
self.welcome_dialog.force_close() self.welcome_dialog.force_close()
else: if not self.verify_connection():
self.connection_error() self.connection_error()
self.show_toast("error", 1, self.connection_overlay)
def clear_chat(self): def clear_chat(self):
for widget in list(self.chat_container): self.chat_container.remove(widget) for widget in list(self.chat_container): self.chat_container.remove(widget)
@ -1013,9 +1006,9 @@ class AlpacaWindow(Adw.ApplicationWindow):
self.set_default_widget(self.send_button) self.set_default_widget(self.send_button)
self.model_drop_down.connect("notify", self.verify_if_image_can_be_used) self.model_drop_down.connect("notify", self.verify_if_image_can_be_used)
self.chat_list_box.connect("row-selected", self.chat_changed) self.chat_list_box.connect("row-selected", self.chat_changed)
self.connection_carousel.connect("page-changed", self.connection_carousel_page_changed) self.welcome_carousel.connect("page-changed", self.welcome_carousel_page_changed)
self.connection_previous_button.connect("clicked", self.connection_previous_button_activate) self.welcome_previous_button.connect("clicked", self.welcome_previous_button_activate)
self.connection_next_button.connect("clicked", self.connection_next_button_activate) self.welcome_next_button.connect("clicked", self.welcome_next_button_activate)
self.export_chat_button.connect("clicked", lambda button : self.export_current_chat()) self.export_chat_button.connect("clicked", lambda button : self.export_current_chat())
self.import_chat_button.connect("clicked", lambda button : self.import_chat()) self.import_chat_button.connect("clicked", lambda button : self.import_chat())

12
src/window.ui
View File

@ -358,8 +358,6 @@
<property name="can-close">false</property> <property name="can-close">false</property>
<property name="width-request">450</property> <property name="width-request">450</property>
<property name="height-request">450</property> <property name="height-request">450</property>
<child>
<object class="AdwToastOverlay" id="connection_overlay">
<child> <child>
<object class="AdwToolbarView"> <object class="AdwToolbarView">
<child type="bottom"> <child type="bottom">
@ -369,7 +367,7 @@
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-bottom">5</property> <property name="margin-bottom">5</property>
<child type="start"> <child type="start">
<object class="GtkButton" id="connection_previous_button"> <object class="GtkButton" id="welcome_previous_button">
<property name="tooltip-text" translatable="yes">Previous</property> <property name="tooltip-text" translatable="yes">Previous</property>
<property name="label">Previous</property> <property name="label">Previous</property>
<property name="sensitive">false</property> <property name="sensitive">false</property>
@ -380,11 +378,11 @@
</child> </child>
<child type="center"> <child type="center">
<object class="AdwCarouselIndicatorDots"> <object class="AdwCarouselIndicatorDots">
<property name="carousel">connection_carousel</property> <property name="carousel">welcome_carousel</property>
</object> </object>
</child> </child>
<child type="end"> <child type="end">
<object class="GtkButton" id="connection_next_button"> <object class="GtkButton" id="welcome_next_button">
<property name="tooltip-text" translatable="yes">Next</property> <property name="tooltip-text" translatable="yes">Next</property>
<property name="label">Next</property> <property name="label">Next</property>
<style> <style>
@ -396,7 +394,7 @@
</child> </child>
<child> <child>
<object class="AdwCarousel" id="connection_carousel"> <object class="AdwCarousel" id="welcome_carousel">
<property name="hexpand">true</property> <property name="hexpand">true</property>
<property name="vexpand">true</property> <property name="vexpand">true</property>
<property name="allow-long-swipes">true</property> <property name="allow-long-swipes">true</property>
@ -440,8 +438,6 @@
</object> </object>
</child> </child>
</object> </object>
</child>
</object>
</template> </template>
<menu id="primary_menu"> <menu id="primary_menu">