Merge pull request #249 from FrancescoCaracciolo/master

Author: qwersyk

data/icons/detach-symbolic.svg

@@ -32,6 +32,8 @@ install_data (
     'settings-symbolic.svg',
     'sidebar-show-right-symbolic.svg',
     'go-home-symbolic.svg',
+    'detach-symbolic.svg',
+    'sidebar-show-left-symbolic.svg',
     install_dir: symbolic_dir
 )
 install_data (

data/icons/meson.build

@@ -161,5 +161,20 @@
 	      <key name="window-height" type="i">
           <default>800</default>
         </key>
+        <key name="external-browser" type="b">
+          <default>false</default>
+        </key>
+        <key name="initial-browser-page" type="s">
+          <default>"https://duckduckgo.com"</default>
+        </key>
+        <key name="browser-search-string" type="s">
+          <default>"https://duckduckgo.com/?q=%s"</default>
+        </key>
+        <key name="browser-session-persist" type="b">
+          <default>true</default>
+        </key>
+        <key name="editor-color-scheme" type="s">
+          <default>"Adwaita-dark"</default>
+        </key>
 	</schema>
 </schemalist>

data/icons/sidebar-show-left-symbolic.svg

@@ -1,5 +1,5 @@
 from typing import Any
-from gi.repository import GLib, Gio
+from gi.repository import GLib, Gio, Adw
 import os
 import base64
 
@@ -25,9 +25,8 @@
 from .utility import override_prompts
 from enum import Enum 
 from .handlers import Handler
-
+from .ui_controller import UIController
 """
-Not yet used in the code.
 Manage Newelle Application, create handlers, check integrity, manage settings...
 """
 
@@ -44,7 +43,7 @@ class ReloadType(Enum):
         RAG: Reload RAG 
         MEMORIES: Reload MEMORIES 
         EMBEDDINGS: Reload EMBEDDINGS 
-        EXTENSIONS: Reload EXTENSIONS 
+EXTENSIONS: Reload EXTENSIONS 
         SECONDARY_LLM: Reload SECONDARY_LLM
         RELOAD_CHAT: Reload RELOAD_CHAT
     """
@@ -85,6 +84,7 @@ class NewelleController:
     def __init__(self, python_path) -> None:
         self.settings = Gio.Settings.new(SCHEMA_ID)
         self.python_path = python_path
+        self.ui_controller : UIController | None = None
 
     def ui_init(self):
         """Init necessary variables for the UI and load models and handlers"""
@@ -116,8 +116,13 @@ def init_paths(self) -> None:
         self.extension_path = os.path.join(self.config_dir, "extensions")
         self.extensions_cache = os.path.join(self.cache_dir, "extensions_cache")
         self.newelle_dir = os.path.join(self.config_dir, DIR_NAME)
-        print(self.pip_path, self.models_dir)
 
+    def set_ui_controller(self, ui_controller):
+        """Set add tab function"""
+        if ui_controller is not None:
+            self.ui_controller = ui_controller
+            self.extensionloader.set_ui_controller(ui_controller)
+            self.integrationsloader.set_ui_controller(ui_controller)
 
     def load_chats(self, chat_id):
         """Load chats"""
@@ -228,12 +233,14 @@ def load_extensions(self):
         self.extensionloader.load_extensions()
         self.extensionloader.add_handlers(AVAILABLE_LLMS, AVAILABLE_TTS, AVAILABLE_STT, AVAILABLE_MEMORIES, AVAILABLE_EMBEDDINGS, AVAILABLE_RAGS, AVAILABLE_WEBSEARCH)
         self.extensionloader.add_prompts(PROMPTS, AVAILABLE_PROMPTS)
+        self.set_ui_controller(self.ui_controller)
 
     def load_integrations(self):
         """Load integrations"""
         self.integrationsloader = ExtensionLoader(self.extension_path, pip_path=self.pip_path, settings=self.settings)
         self.integrationsloader.load_integrations(AVAILABLE_INTEGRATIONS)
-        
+        self.set_ui_controller(self.ui_controller)
+
     def create_profile(self, profile_name, picture=None, settings={}, settings_groups=[]):
         """Create a profile
 
@@ -371,7 +378,12 @@ def load_settings(self, settings):
         self.websearch_on = self.settings.get_boolean("websearch-on")
         self.websearch_model = self.settings.get_string("websearch-model")
         self.websearch_settings = self.settings.get_string("websearch-settings")
-
+        
+        self.external_browser = settings.get_boolean("external-browser")
+        self.initial_browser_page = settings.get_string("initial-browser-page")
+        self.browser_search_string = settings.get_string("browser-search-string")
+        self.browser_session_persist = settings.get_boolean("browser-session-persist")
+        self.editor_color_scheme = settings.get_string("editor-color-scheme")
         self.load_prompts()
         # Adjust paths
         if os.path.exists(os.path.expanduser(self.main_path)):
@@ -489,7 +501,10 @@ def fix_handlers_integrity(self, newelle_settings: NewelleSettings):
             newelle_settings.stt_engine = list(AVAILABLE_STT.keys())[0]
         if newelle_settings.websearch_model not in AVAILABLE_WEBSEARCH:
             newelle_settings.websearch_model = list(AVAILABLE_WEBSEARCH.keys())[0]
-       
+      
+    def set_ui_controller(self, ui_controller):
+        self.ui_controller = ui_controller
+
     def select_handlers(self, newelle_settings: NewelleSettings):
         """Assign the selected handlers
 

data/icons/sidebar-show-right-symbolic.svg

@@ -1,9 +1,10 @@
+from collections.abc import Callable
 import importlib 
 import os 
 import json 
 import shutil
 import sys
-from gi.repository import Gtk
+from gi.repository import Gtk, Adw
 
 from .handlers import Handler
 
@@ -14,6 +15,7 @@
 from .handlers.memory import MemoryHandler
 from .handlers.embeddings import EmbeddingHandler
 from .handlers.websearch import WebSearchHandler
+from .ui_controller import UIController
 
 class NewelleExtension(Handler):
     """The base class for all extensions"""
@@ -258,6 +260,8 @@ def postprocess_history(self, history: list, bot_response: str) -> tuple[list, s
         """
         return history, bot_response
 
+    def set_ui_controller(self, ui_controller: UIController):
+        self.ui_controller = ui_controller
 
 class ExtensionLoader:
     """
@@ -311,6 +315,9 @@ def load_integrations(self, AVAILABLE_INTEGRATIONS):
             self.extensions.append(integration_class)
             self.extensionsmap[integration_class.id] = integration_class
 
+    def set_ui_controller(self, ui_controller):
+        for extension in self.get_enabled_extensions():
+            extension.set_ui_controller(ui_controller)
 
     def load_extensions(self):
         """Load extensions from the extension directory"""

data/io.github.qwersyk.Newelle.gschema.xml

@@ -50,6 +50,7 @@ def restore_gtk_widget(self, codeblock: str, lang: str) -> Gtk.Widget | None:
             cache = self.widget_cache.get(codeblock, None)
             if cache is not None:
                 search_widget = WebSearchWidget(codeblock)
+                search_widget.connect("website-clicked", lambda widget,link : self.ui_controller.open_link(link, False, not self.settings.get_boolean("external-browser")))
                 if "websites" in cache:
                     for title, link, favicon in cache["websites"]:
                         search_widget.add_website(title, link, favicon)
@@ -61,6 +62,7 @@ def restore_gtk_widget(self, codeblock: str, lang: str) -> Gtk.Widget | None:
 
     def get_gtk_widget(self, codeblock: str, lang: str) -> Gtk.Widget | None:
         search_widget = WebSearchWidget(search_term=codeblock)
+        search_widget.connect("website-clicked", lambda widget,link : self.ui_controller.open_link(link, False, not self.settings.get_boolean("external-browser")))
         self.widgets[codeblock] = search_widget 
         self.widget_cache[codeblock] = {}
         self.widget_cache[codeblock]["websites"] = []

src/controller.py

@@ -4,6 +4,7 @@
 import threading
 from ..utility.message_chunk import get_message_chunks
 from newspaper import Article
+from ..ui import load_image_with_callback
 
 CHUNK_SIZE = 512 
 MAX_CONTEXT = 5000
@@ -15,7 +16,6 @@ class WebsiteReader(NewelleExtension):
     def __init__(self, pip_path: str, extension_path: str, settings):
         super().__init__(pip_path, extension_path, settings)
         self.caches = {}
-
     def get_replace_codeblocks_langs(self) -> list:
         return ["website"]
 
@@ -59,9 +59,13 @@ def get_gtk_widget(self, codeblock: str, lang: str) -> Gtk.Widget | None:
         website_url = codeblock
 
         button = WebsiteButton(website_url)
+        button.connect("clicked", self.open_website)
         threading.Thread(target=self.get_article, args=(button,)).start()
         return button
 
+    def open_website(self, button: WebsiteButton):
+        self.ui_controller.open_link(button.url, False, not self.settings.get_boolean("external-browser"))
+
     def restore_gtk_widget(self, codeblock: str, lang: str) -> Gtk.Widget | None:
         return super().restore_gtk_widget(codeblock, lang)
 
@@ -88,23 +92,6 @@ def update_button():
             button.title.set_text(title)
             button.description.set_text(description) 
         GLib.idle_add(update_button)
-        threading.Thread(target=self.load_image, args=(favicon, button.icon)).start()
-
+        load_image_with_callback(favicon, lambda pixbuf_loader : button.icon.set_from_pixbuf(pixbuf_loader.get_pixbuf()))
 
-    def load_image(self, url, image: Gtk.Image):
-        import requests
-        # Create a pixbuf loader that will load the image
-        pixbuf_loader = GdkPixbuf.PixbufLoader()
-        pixbuf_loader.connect("area-prepared", self.on_area_prepared, image)
-        try:
-            response = requests.get(url, stream=True) #stream = True prevent download the whole file into RAM
-            response.raise_for_status()
-            for chunk in response.iter_content(chunk_size=1024): #Load in chunks to avoid consuming too much memory for large files
-                pixbuf_loader.write(chunk)
-            pixbuf_loader.close()
-        except Exception as e:
-            print("Exception generating the image: " + str(e))
 
-    def on_area_prepared(self, loader: GdkPixbuf.PixbufLoader, image: Gtk.Image):
-        # Function runs when the image loaded. Remove the spinner and open the image
-        image.set_from_pixbuf(loader.get_pixbuf())

src/extensions.py

@@ -249,7 +249,10 @@ def new_chat(self,*a):
                 Adw.Toast(title=_('Chat is created')))
 
     def start_recording(self,*a):
-        self.win.start_recording(self.win.recording_button)
+        if not self.win.recording:
+            self.win.start_recording(self.win.recording_button)
+        else:
+            self.win.stop_recording(self.win.recording_button)
 
     def stop_tts(self,*a):
         self.win.mute_tts(self.win.mute_tts_button)
@@ -271,15 +274,19 @@ def zoom_out(self, *a):
         zoom = max(100, self.settings.get_int("zoom") - 10)
         self.win.set_zoom(zoom)
         self.settings.set_int("zoom", zoom)
+    
+    def save(self, *a):
+        self.win.save()
 
 def main(version):
     app = MyApp(application_id="io.github.qwersyk.Newelle", version = version)
     app.create_action('reload_chat', app.reload_chat, ['<primary>r'])
     app.create_action('reload_folder', app.reload_folder, ['<primary>e'])
     app.create_action('new_chat', app.new_chat, ['<primary>t'])
     app.create_action('focus_message', app.focus_message, ['<primary>l'])
-    app.create_action('start_recording', app.start_recording, ['<primary>s'])
+    app.create_action('start_recording', app.start_recording, ['<primary>g'])
     app.create_action('stop_tts', app.stop_tts, ['<primary>k'])
+    app.create_action('save', app.save, ['<primary>s'])
     app.create_action('zoom', app.zoom, ['<primary>plus'])
     app.create_action('zoom', app.zoom, ['<primary>equal'])
     app.create_action('zoom_out', app.zoom_out, ['<primary>minus'])