Merge pull request #261 from FrancescoCaracciolo/master

qwersyk · web-flow · commit 2142584e508f · 2025-07-05T20:35:22.000+02:00
diff --git a/modules/python3-gtts.json b/modules/python3-gtts.json
@@ -7,38 +7,38 @@
     "sources": [
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/1c/d5/c84e1a17bf61d4df64ca866a1c9a913874b4e9bdc131ec689a0ad013fb36/certifi-2024.7.4-py3-none-any.whl",
-            "sha256": "c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90"
+            "url": "https://files.pythonhosted.org/packages/84/ae/320161bd181fc06471eed047ecce67b693fd7515b16d495d8932db763426/certifi-2025.6.15-py3-none-any.whl",
+            "sha256": "2e0c7ce7cb5d8f8634ca55d2ba7e6ec2689a2fd6537d8dec1296a477a4910057"
         },
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/63/09/c1bc53dab74b1816a00d8d030de5bf98f724c52c1635e07681d312f20be8/charset-normalizer-3.3.2.tar.gz",
-            "sha256": "f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5"
+            "url": "https://files.pythonhosted.org/packages/e4/33/89c2ced2b67d1c2a61c19c6751aa8902d46ce3dacb23600a283619f5a12d/charset_normalizer-3.4.2.tar.gz",
+            "sha256": "5baececa9ecba31eff645232d59845c07aa030f0c81ee70184a90d35099a0e63"
         },
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl",
-            "sha256": "ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28"
+            "url": "https://files.pythonhosted.org/packages/7e/d4/7ebdbd03970677812aac39c869717059dbb71a4cfc033ca6e5221787892c/click-8.1.8-py3-none-any.whl",
+            "sha256": "63c132bbbed01578a06712a2d1f497bb62d9c1c0d329b7903a866228027263b2"
         },
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/59/a8/e3434904445eacf03b857ac001755d8ffac49b4f3339d63592b4eda009dc/gTTS-2.5.1-py3-none-any.whl",
-            "sha256": "273ec8a5077b25e60ca5a266ed254b54d1f14032b0af3ba00092d14966148664"
+            "url": "https://files.pythonhosted.org/packages/e3/6c/8b8b1fdcaee7e268536f1bb00183a5894627726b54a9ddc6fc9909888447/gTTS-2.5.4-py3-none-any.whl",
+            "sha256": "5dd579377f9f5546893bc26315ab1f846933dc27a054764b168f141065ca8436"
         },
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/e5/3e/741d8c82801c347547f8a2a06aa57dbb1992be9e948df2ea0eda2c8b79e8/idna-3.7-py3-none-any.whl",
-            "sha256": "82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0"
+            "url": "https://files.pythonhosted.org/packages/76/c6/c88e154df9c4e1a2a66ccf0005a88dfb2650c1dffb6f5ce603dfbd452ce3/idna-3.10-py3-none-any.whl",
+            "sha256": "946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"
         },
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/f9/9b/335f9764261e915ed497fcdeb11df5dfd6f7bf257d4a6a2a686d80da4d54/requests-2.32.3-py3-none-any.whl",
-            "sha256": "70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"
+            "url": "https://files.pythonhosted.org/packages/7c/e4/56027c4a6b4ae70ca9de302488c5ca95ad4a39e190093d6c1a8ace08341b/requests-2.32.4-py3-none-any.whl",
+            "sha256": "27babd3cda2a6d50b30443204ee89830707d396671944c998b5975b031ac2b2c"
         },
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/ca/1c/89ffc63a9605b583d5df2be791a27bc1a42b7c32bab68d3c8f2f73a98cd4/urllib3-2.2.2-py3-none-any.whl",
-            "sha256": "a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472"
+            "url": "https://files.pythonhosted.org/packages/a7/c2/fe1e52489ae3122415c51f387e221dd0773709bad6c6cdaa599e8a2c5185/urllib3-2.5.0-py3-none-any.whl",
+            "sha256": "e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc"
         }
     ]
 }
diff --git a/src/controller.py b/src/controller.py
@@ -242,7 +242,7 @@ def load_extensions(self):
 
     def load_integrations(self):
         """Load integrations"""
-        self.integrationsloader = ExtensionLoader(self.extension_path, pip_path=self.pip_path, settings=self.settings)
+        self.integrationsloader = ExtensionLoader(self.extension_path, pip_path=self.pip_path, settings=self.settings, extension_cache=self.extensions_cache)
         self.integrationsloader.load_integrations(AVAILABLE_INTEGRATIONS)
         self.set_ui_controller(self.ui_controller)
 
diff --git a/src/handlers/llm/gemini_handler.py b/src/handlers/llm/gemini_handler.py
@@ -19,7 +19,7 @@ class GeminiHandler(LLMHandler):
     Official Google Gemini APIs, they support history and system prompts
     """
 
-    default_models = [("Gemini 2.0 Flash","gemini-2.0-flash"), ("Gemini 2.0 Flash Lite", "gemini-2.0-flash-lite")]
+    default_models = [("Gemini 2.0 Flash","gemini-2.0-flash"), ("Gemini 2.5 Flash", "gemini-2.5-flash")]
     
     def __init__(self, settings, path):
         super().__init__(settings, path)
diff --git a/src/handlers/stt/whispercpp_handler.py b/src/handlers/stt/whispercpp_handler.py
@@ -44,7 +44,7 @@ def get_extra_settings(self) -> list:
                 "default": "tiny",
                 "website": "https://github.com/openai/whisper/blob/main/model-card.md#model-details",
             },
-            ExtraSettings.EntrySetting("language", _("Language"), _("Language of the recognition."), "auto"),
+            ExtraSettings.EntrySetting("language", _("Language"), _("Language of the recognition. For example en, it..."), "auto"),
             ExtraSettings.NestedSetting("model_library", _("Model Library"), _("Manage Whisper models"), self.get_model_library()),
             ExtraSettings.NestedSetting("advanced_settings", _("Advanced Settings"), _("More advanced settings"), [
                 ExtraSettings.ScaleSetting("temperature", _("Temperature"), _("Temperature to use"), 0.0, 0.0, 1.0, 2),
@@ -75,6 +75,7 @@ def get_percentage(self, model: str):
     def install_model(self, model_name):
         if self.is_model_installed(model_name):
             os.remove(os.path.join(self.path, "whisper", "whisper.cpp/models/ggml-" + model_name + ".bin"))
+            self.settings_update()
         else:
             path = os.path.join(self.path, "whisper/whisper.cpp/models/download-ggml-model.sh")
             f = subprocess.check_output(get_spawn_command() + ["bash", "-c", f"sh {path} " + model_name])
diff --git a/src/handlers/tts/kokoro_handler.py b/src/handlers/tts/kokoro_handler.py
@@ -8,8 +8,9 @@
 class KokoroTTSHandler(TTSHandler):
     key = "kokoro"
     def install(self):
-        extra_deps = "pyopenjtalk fugashi jaconv mojimoji mecab-python3 unidic-lite"
-        install_module("kokoro==0.9.4 soundfile espeakng-loader " + extra_deps, self.pip_path)
+        extra_deps = "fugashi jaconv mojimoji mecab-python3 unidic-lite"
+        index_url = " --extra-index-url https://download.pytorch.org/whl/cpu --trusted-host download.pytorch.org"
+        install_module("kokoro==0.9.4 soundfile espeakng-loader " + extra_deps + index_url, self.pip_path, update=False)
         if not self.is_installed():
             self.throw("Kokoro installation failed", ErrorSeverity.ERROR)
 
diff --git a/src/integrations/websearch.py b/src/integrations/websearch.py
@@ -2,6 +2,8 @@
 from ..extensions import NewelleExtension
 from ..ui.widgets import WebSearchWidget
 from gi.repository import Gtk, GLib
+import os
+import json 
 
 
 class WebsearchIntegration(NewelleExtension):
@@ -12,6 +14,7 @@ def __init__(self, pip_path, extension_path, settings):
         super().__init__(pip_path, extension_path, settings)
         self.widgets = {}
         self.load_widet_cache()
+        self.msgid = 0
 
     def get_replace_codeblocks_langs(self) -> list:
         return ["search"]
@@ -20,53 +23,54 @@ def provides_both_widget_and_answer(self, codeblock: str, lang: str) -> bool:
         return True 
 
     def get_answer(self, codeblock: str, lang: str) -> str | None:
+        msgid = self.msgid
         if self.websearch.supports_streaming_query():
-            text, sources = self.websearch.query_streaming(codeblock, lambda title, link, favicon, codeblock=codeblock: self.add_website(codeblock, title, link, favicon))  
+            text, sources = self.websearch.query_streaming(codeblock, lambda title, link, favicon, codeblock=codeblock, msgid=msgid: self.add_website(codeblock, title, link, favicon, msgid))  
         else:
             text, sources = self.websearch.query(codeblock)
             for source in sources:
-                self.add_website(codeblock, source, source, "")
-        self.finish(codeblock, text)
+                self.add_website(codeblock, source, source, "", msgid)
+        self.finish(codeblock, text, sources, msgid)
         return "Here is the web search result for query '"+ codeblock + "':\n" + text
 
-    def finish(self, codeblock: str, result: str):
-        self.widget_cache[codeblock]["result"] = result
+    def finish(self, codeblock: str, result: str, sources, msgid):
+        self.widget_cache[msgid]["result"] = result
         self.save_widget_cache()
         search_widget = self.widgets.get(codeblock, None)
         if search_widget is not None:
             GLib.idle_add(search_widget.finish, result)
 
-    def add_website(self, term, title, link, favicon):
+    def add_website(self, term, title, link, favicon, msgid):
         search_widget = self.widgets.get(term, None)
         if search_widget is not None:
             GLib.idle_add(search_widget.add_website, title, link, favicon)
-        self.widget_cache[term]["websites"].append((title, link, favicon))
+        self.widget_cache[msgid]["websites"].append((title, link, favicon))
 
-    def restore_gtk_widget(self, codeblock: str, lang: str) -> Gtk.Widget | None:
-        search_widget = self.widgets.get(codeblock, None)
-        if search_widget is not None and False:
-            return search_widget
+    def load_search_widget(self, query, sources, result):
+        widget = WebSearchWidget(query)
+        for title, link, favicon in tuple(sources):
+            widget.add_website(title, link, favicon)
+        widget.finish(result)
+        widget.connect("website-clicked", lambda widget,link : self.ui_controller.open_link(link, False, not self.settings.get_boolean("external-browser")))
+        return widget 
+
+    def restore_gtk_widget(self, codeblock: str, lang: str, msgid) -> Gtk.Widget | None:
+        cache = self.widget_cache.get(msgid, None)
+        if cache is not None:
+            return self.load_search_widget(codeblock, cache["websites"], cache["result"])
         else:
-            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)
-                search_widget.finish(cache["result"])
-            else:
-                search_widget = WebSearchWidget(codeblock)
-                search_widget.finish("No result found")
+            search_widget = WebSearchWidget(codeblock)
+            search_widget.finish("No result found")
         return search_widget
 
-    def get_gtk_widget(self, codeblock: str, lang: str) -> Gtk.Widget | None:
+    def get_gtk_widget(self, codeblock: str, lang: str, msgid) -> Gtk.Widget | None:
+        self.msgid = msgid
         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"] = []
-        self.widget_cache[codeblock]["result"] = "No result found"
+        self.widget_cache[msgid] = {}
+        self.widget_cache[msgid]["websites"] = []
+        self.widget_cache[msgid]["result"] = "No result found"
         return search_widget
 
     def postprocess_history(self, history: list, bot_response: str) -> tuple[list, str]:
@@ -78,8 +82,16 @@ def postprocess_history(self, history: list, bot_response: str) -> tuple[list, s
         return history, bot_response
 
     def save_widget_cache(self):
-        self.set_setting("widget_cache", self.widget_cache)
+        with open(os.path.join(self.extension_path, "websearch_cache.json"), "w+") as f:
+            json.dump(self.widget_cache, f)
 
     def load_widet_cache(self):
-        self.widget_cache = self.get_setting("widget_cache", False, {})
+        if os.path.exists(os.path.join(self.extension_path, "websearch_cache.json")):
+            with open(os.path.join(self.extension_path, "websearch_cache.json")) as f:
+                self.widget_cache = json.load(f)
+            for key in self.widget_cache.copy():
+                self.widget_cache[int(key)] = self.widget_cache[key]
+                del self.widget_cache[key]
+        else:
+            self.widget_cache = {}
 
diff --git a/src/ui/stdout_monitor.py b/src/ui/stdout_monitor.py
@@ -27,7 +27,7 @@ def show_window(self):
             return
             
         # Create the window
-        self.window = Gtk.Window()
+        self.window = Gtk.Window(decorated=False)
         self.window.set_title(_("Program Output Monitor"))
         self.window.set_default_size(800, 600)
         self.window.set_transient_for(self.parent_window)
diff --git a/src/ui/widgets/thinking.py b/src/ui/widgets/thinking.py
@@ -14,7 +14,6 @@ class ThinkingWidget(Gtk.Box):
 
     def __init__(self, **kwargs):
         super().__init__(orientation=Gtk.Orientation.VERTICAL, **kwargs)
-        self.add_css_class("code")
         self.add_css_class("card")
         self.set_margin_top(10)
         self.set_margin_end(10)
diff --git a/src/utility/pip.py b/src/utility/pip.py
@@ -48,7 +48,7 @@ def runtime_find_module(full_module_name):
     except Exception as _:
         return None
 
-def install_module(module, path):
+def install_module(module, path, update=True):
     # Manage pip path locking
     global PIP_INSTALLED 
     LOCK_SEMAPHORE.acquire()
@@ -58,17 +58,25 @@ def install_module(module, path):
         LOCKS[path] = lock
     LOCK_SEMAPHORE.release()
     lock.acquire()
+    # Set temp path 
+    origTemp = os.environ.get("TMPDIR")
+    os.environ["TMPDIR"] = os.path.join(os.getcwd(), "tmp")
     try:
         if find_module("pip") is None and not PIP_INSTALLED:
             print("Downloading pip...")
             subprocess.check_output(["bash", "-c", "cd " + os.path.dirname(path) + " && wget https://bootstrap.pypa.io/get-pip.py && python get-pip.py"])
             subprocess.check_output(["bash", "-c", "cd " + os.path.dirname(path) + " && rm get-pip.py || true"])
             PIP_INSTALLED = True
-        r = subprocess.run([sys.executable, "-m", "pip", "install","--target", path, "--upgrade"] + module.split(" ") , capture_output=False) 
+        command = [sys.executable, "-m", "pip", "install","--target", path]
+        if update:
+            command.append("--upgrade")
+        r = subprocess.run(command + module.split(" ") , capture_output=False) 
         print(module + " installed")
     except Exception as e:
         PIP_INSTALLED = False
         print("Error installing " + module + " " + str(e))
         r = None
+    if origTemp:
+        os.environ["TMPDIR"] = origTemp
     lock.release()
     return r
diff --git a/src/utility/strings.py b/src/utility/strings.py
@@ -65,7 +65,7 @@ def markwon_to_pango(markdown_text):
     processed_text = re.sub(r'~(.*?)~', r'<span strikethrough="true">\1</span>', processed_text)
 
     # Convert exponents and subscripts (handle digits or parenthesized text)
-    processed_text = re.sub(r'_(\d+|\([^)]+\))', lambda m: f'<sub>{m.group(1).strip("()")}</sub>', processed_text)
+    processed_text = re.sub(r'_(\d+|\([^)]+\))\b', lambda m: f'<sub>{m.group(1).strip("()")}</sub>', processed_text)
     processed_text = re.sub(r'\^(\d+|\([^)]+\))', lambda m: f'<sup>{m.group(1).strip("()")}</sup>', processed_text)
     
     # Convert links

Original file line number	Diff line number	Diff line change
`@@ -7,38 +7,38 @@`
`7`	`7`	`"sources": [`
`8`	`8`	`{`
`9`	`9`	`"type": "file",`
`10`		`- "url": "https://files.pythonhosted.org/packages/1c/d5/c84e1a17bf61d4df64ca866a1c9a913874b4e9bdc131ec689a0ad013fb36/certifi-2024.7.4-py3-none-any.whl",`
`11`		`- "sha256": "c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90"`
	`10`	`+ "url": "https://files.pythonhosted.org/packages/84/ae/320161bd181fc06471eed047ecce67b693fd7515b16d495d8932db763426/certifi-2025.6.15-py3-none-any.whl",`
	`11`	`+ "sha256": "2e0c7ce7cb5d8f8634ca55d2ba7e6ec2689a2fd6537d8dec1296a477a4910057"`
`12`	`12`	`},`
`13`	`13`	`{`
`14`	`14`	`"type": "file",`
`15`		`- "url": "https://files.pythonhosted.org/packages/63/09/c1bc53dab74b1816a00d8d030de5bf98f724c52c1635e07681d312f20be8/charset-normalizer-3.3.2.tar.gz",`
`16`		`- "sha256": "f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5"`
	`15`	`+ "url": "https://files.pythonhosted.org/packages/e4/33/89c2ced2b67d1c2a61c19c6751aa8902d46ce3dacb23600a283619f5a12d/charset_normalizer-3.4.2.tar.gz",`
	`16`	`+ "sha256": "5baececa9ecba31eff645232d59845c07aa030f0c81ee70184a90d35099a0e63"`
`17`	`17`	`},`
`18`	`18`	`{`
`19`	`19`	`"type": "file",`
`20`		`- "url": "https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl",`
`21`		`- "sha256": "ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28"`
	`20`	`+ "url": "https://files.pythonhosted.org/packages/7e/d4/7ebdbd03970677812aac39c869717059dbb71a4cfc033ca6e5221787892c/click-8.1.8-py3-none-any.whl",`
	`21`	`+ "sha256": "63c132bbbed01578a06712a2d1f497bb62d9c1c0d329b7903a866228027263b2"`
`22`	`22`	`},`
`23`	`23`	`{`
`24`	`24`	`"type": "file",`
`25`		`- "url": "https://files.pythonhosted.org/packages/59/a8/e3434904445eacf03b857ac001755d8ffac49b4f3339d63592b4eda009dc/gTTS-2.5.1-py3-none-any.whl",`
`26`		`- "sha256": "273ec8a5077b25e60ca5a266ed254b54d1f14032b0af3ba00092d14966148664"`
	`25`	`+ "url": "https://files.pythonhosted.org/packages/e3/6c/8b8b1fdcaee7e268536f1bb00183a5894627726b54a9ddc6fc9909888447/gTTS-2.5.4-py3-none-any.whl",`
	`26`	`+ "sha256": "5dd579377f9f5546893bc26315ab1f846933dc27a054764b168f141065ca8436"`
`27`	`27`	`},`
`28`	`28`	`{`
`29`	`29`	`"type": "file",`
`30`		`- "url": "https://files.pythonhosted.org/packages/e5/3e/741d8c82801c347547f8a2a06aa57dbb1992be9e948df2ea0eda2c8b79e8/idna-3.7-py3-none-any.whl",`
`31`		`- "sha256": "82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0"`
	`30`	`+ "url": "https://files.pythonhosted.org/packages/76/c6/c88e154df9c4e1a2a66ccf0005a88dfb2650c1dffb6f5ce603dfbd452ce3/idna-3.10-py3-none-any.whl",`
	`31`	`+ "sha256": "946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"`
`32`	`32`	`},`
`33`	`33`	`{`
`34`	`34`	`"type": "file",`
`35`		`- "url": "https://files.pythonhosted.org/packages/f9/9b/335f9764261e915ed497fcdeb11df5dfd6f7bf257d4a6a2a686d80da4d54/requests-2.32.3-py3-none-any.whl",`
`36`		`- "sha256": "70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"`
	`35`	`+ "url": "https://files.pythonhosted.org/packages/7c/e4/56027c4a6b4ae70ca9de302488c5ca95ad4a39e190093d6c1a8ace08341b/requests-2.32.4-py3-none-any.whl",`
	`36`	`+ "sha256": "27babd3cda2a6d50b30443204ee89830707d396671944c998b5975b031ac2b2c"`
`37`	`37`	`},`
`38`	`38`	`{`
`39`	`39`	`"type": "file",`
`40`		`- "url": "https://files.pythonhosted.org/packages/ca/1c/89ffc63a9605b583d5df2be791a27bc1a42b7c32bab68d3c8f2f73a98cd4/urllib3-2.2.2-py3-none-any.whl",`
`41`		`- "sha256": "a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472"`
	`40`	`+ "url": "https://files.pythonhosted.org/packages/a7/c2/fe1e52489ae3122415c51f387e221dd0773709bad6c6cdaa599e8a2c5185/urllib3-2.5.0-py3-none-any.whl",`
	`41`	`+ "sha256": "e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc"`
`42`	`42`	`}`
`43`	`43`	`]`
`44`	`44`	`}`