Changed version

README.md

@@ -86,3 +86,15 @@ Want to add a language? Visit [this discussion](https://github.com/Jeffser/Alpac
 - [Aleksana](https://github.com/Aleksanaa) for her help with better handling of directories
 - Sponsors for giving me enough money to be able to take a ride to my campus every time I need to <3
 - Everyone that has shared kind words of encouragement!
+
+---
+
+## Dependencies
+
+- [Requests](https://github.com/psf/requests)
+- [Pillow](https://github.com/python-pillow/Pillow)
+- [Pypdf](https://github.com/py-pdf/pypdf)
+- [Pytube](https://github.com/pytube/pytube)
+- [Html2Text](https://github.com/aaronsw/html2text)
+- [Ollama](https://github.com/ollama/ollama)
+- [Numactl](https://github.com/numactl/numactl)

data/com.jeffser.Alpaca.metainfo.xml.in

@@ -78,6 +78,16 @@
   <url type="contribute">https://github.com/Jeffser/Alpaca/discussions/154</url>
   <url type="vcs-browser">https://github.com/Jeffser/Alpaca</url>
   <releases>
+    <release version="2.0.2" date="2024-09-11">
+      <url type="details">https://github.com/Jeffser/Alpaca/releases/tag/2.0.2</url>
+      <description>
+        <p>Fixes</p>
+        <ul>
+          <li>Fixed error on first run (welcome dialog)</li>
+          <li>Fixed checker for Ollama instance (used on system packages)</li>
+        </ul>
+      </description>
+    </release>
     <release version="2.0.1" date="2024-09-11">
       <url type="details">https://github.com/Jeffser/Alpaca/releases/tag/2.0.1</url>
       <description>

meson.build

@@ -1,5 +1,5 @@
 project('Alpaca', 'c',
-          version: '2.0.1',
+          version: '2.0.2',
     meson_version: '>= 0.62.0',
   default_options: [ 'warning_level=2', 'werror=false', ],
 )

src/window.py

@@ -50,7 +50,6 @@ class AlpacaWindow(Adw.ApplicationWindow):
     _ = gettext.gettext
 
     #Variables
-    ready = False #Used with welcome dialog
     attachments = {}
     header_bar = Gtk.Template.Child()
 
@@ -207,8 +206,11 @@ class AlpacaWindow(Adw.ApplicationWindow):
             self.welcome_carousel.scroll_to(self.welcome_carousel.get_nth_page(self.welcome_carousel.get_position()+1), True)
         else:
             self.welcome_dialog.force_close()
-            if not self.ready:
-                self.launch_dialog.present(self)
+            if shutil.which('ollama'):
+                threading.Thread(target=self.prepare_alpaca, args=(11435, '', False, {'temperature': 0.7, 'seed': 0, 'keep_alive': 5}, {}, '', 0, True, True)).start()
+            else:
+                threading.Thread(target=self.prepare_alpaca, args=(11435, 'http://0.0.0.0:11434', True, {'temperature': 0.7, 'seed': 0, 'keep_alive': 5}, {}, '', 0, True, False)).start()
+            self.powersaver_warning_switch.set_active(True)
 
     @Gtk.Template.Callback()
     def change_remote_connection(self, switcher, *_):
@@ -329,16 +331,17 @@ class AlpacaWindow(Adw.ApplicationWindow):
     @Gtk.Template.Callback()
     def model_search_changed(self, entry):
         results = 0
-        for model in list(self.model_manager.available_list):
-            model.set_visible(re.search(entry.get_text(), '{} {} {} {} {}'.format(model.get_name(), model.model_title, model.model_author, model.model_description, (_('image') if model.image_recognition else '')), re.IGNORECASE))
-            if model.get_visible():
-                results += 1
-        if entry.get_text() and results == 0:
-            self.no_results_page.set_visible(True)
-            self.model_scroller.set_visible(False)
-        else:
-            self.model_scroller.set_visible(True)
-            self.no_results_page.set_visible(False)
+        if self.model_manager:
+            for model in list(self.model_manager.available_list):
+                model.set_visible(re.search(entry.get_text(), '{} {} {} {} {}'.format(model.get_name(), model.model_title, model.model_author, model.model_description, (_('image') if model.image_recognition else '')), re.IGNORECASE))
+                if model.get_visible():
+                    results += 1
+            if entry.get_text() and results == 0:
+                self.no_results_page.set_visible(True)
+                self.model_scroller.set_visible(False)
+            else:
+                self.model_scroller.set_visible(True)
+                self.no_results_page.set_visible(False)
 
     @Gtk.Template.Callback()
     def on_clipboard_paste(self, textview):
@@ -836,7 +839,6 @@ Generate a title following these rules:
             self.save_server_config()
 
         time.sleep(.5) #This is to prevent errors with gtk creating the launch dialog and closing it too quickly
-        self.ready = True
         #Close launch dialog
         GLib.idle_add(self.launch_dialog.force_close)
 
@@ -906,8 +908,6 @@ Generate a title following these rules:
                 threading.Thread(target=self.prepare_alpaca, args=(11435, '', False, {'temperature': 0.7, 'seed': 0, 'keep_alive': 5}, {}, '', 0, True, True)).start()
                 self.powersaver_warning_switch.set_active(True)
         else:
-            threading.Thread(target=self.prepare_alpaca, args=(11435, '', False, {'temperature': 0.7, 'seed': 0, 'keep_alive': 5}, {}, '', 0, True, False)).start()
-            self.powersaver_warning_switch.set_active(True)
             self.welcome_dialog.present(self)
 
         if self.powersaver_warning_switch.get_active():