Quick fixes

This commit is contained in:
jeffser 2024-05-26 00:01:14 -06:00
parent 605d837716
commit d619f55ff2
2 changed files with 10 additions and 4 deletions

View File

@ -5,15 +5,16 @@
<project_license>GPL-3.0-or-later</project_license> <project_license>GPL-3.0-or-later</project_license>
<launchable type="desktop-id">com.jeffser.Alpaca.desktop</launchable> <launchable type="desktop-id">com.jeffser.Alpaca.desktop</launchable>
<name>Alpaca</name> <name>Alpaca</name>
<summary>Chat with local AI models</summary> <summary>Chat with local AI models powered by Ollama</summary>
<description> <description>
<p>An Ollama client</p> <p>An Ollama client</p>
<p>Features</p> <p>Features</p>
<ul> <ul>
<li>Built in Ollama instance</li>
<li>Talk to multiple models in the same conversation</li> <li>Talk to multiple models in the same conversation</li>
<li>Pull and delete models from the app</li> <li>Pull and delete models from the app</li>
<li>Have multiple conversations</li> <li>Have multiple conversations</li>
<li>Image recognition (Only available with LLaVA Model)</li> <li>Image recognition (Only available with compatible models)</li>
<li>Import and export chats</li> <li>Import and export chats</li>
</ul> </ul>
<p>Disclaimer</p> <p>Disclaimer</p>
@ -36,6 +37,8 @@
</requires> </requires>
<recommends> <recommends>
<control>keyboard</control> <control>keyboard</control>
<control>pointing</control>
<control>touch</control>
</recommends> </recommends>
<branding> <branding>
<color type="primary" scheme_preference="light">#8cdef5</color> <color type="primary" scheme_preference="light">#8cdef5</color>

View File

@ -126,9 +126,11 @@ class AlpacaWindow(Adw.ApplicationWindow):
selected = self.model_drop_down.get_selected_item().get_string().split(":")[0] selected = self.model_drop_down.get_selected_item().get_string().split(":")[0]
if selected in ['llava', 'bakllava', 'moondream', 'llava-llama3']: if selected in ['llava', 'bakllava', 'moondream', 'llava-llama3']:
self.image_button.set_sensitive(True) self.image_button.set_sensitive(True)
self.image_button.set_tooltip_text(_("Upload image"))
return True return True
else: else:
self.image_button.set_sensitive(False) self.image_button.set_sensitive(False)
self.image_button.set_tooltip_text(_("Only available on selected models"))
self.image_button.set_css_classes([]) self.image_button.set_css_classes([])
self.image_button.get_child().set_icon_name("image-x-generic-symbolic") self.image_button.get_child().set_icon_name("image-x-generic-symbolic")
self.attached_image = {"path": None, "base64": None} self.attached_image = {"path": None, "base64": None}
@ -763,7 +765,8 @@ class AlpacaWindow(Adw.ApplicationWindow):
if self.run_remote: if self.run_remote:
dialogs.reconnect_remote(self) dialogs.reconnect_remote(self)
else: else:
local_instance.restart() local_instance.stop()
local_instance.start(self.data_dir)
self.show_toast("error", 7, self.main_overlay) self.show_toast("error", 7, self.main_overlay)
def connection_switched(self): def connection_switched(self):
@ -773,7 +776,7 @@ class AlpacaWindow(Adw.ApplicationWindow):
if self.run_remote: if self.run_remote:
connection_handler.url = self.remote_url connection_handler.url = self.remote_url
if self.verify_connection() == False: self.connection_error() if self.verify_connection() == False: self.connection_error()
else: local_instance.stop(self) else: local_instance.stop()
else: else:
connection_handler.url = f"http://127.0.0.1:{local_instance.port}" connection_handler.url = f"http://127.0.0.1:{local_instance.port}"
local_instance.start(self.data_dir) local_instance.start(self.data_dir)