From e4473607b245b9c19d34ebb397b062932bcb66b2 Mon Sep 17 00:00:00 2001 From: Saifeddine ALOUI Date: Mon, 24 Feb 2025 23:18:08 +0100 Subject: [PATCH] upgraded --- lollms/app.py | 16 +++++++++++++++- lollms/paths.py | 5 ++++- lollms/prompting.py | 5 +++-- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/lollms/app.py b/lollms/app.py index 71fd372..3be2524 100644 --- a/lollms/app.py +++ b/lollms/app.py @@ -476,8 +476,22 @@ class LollmsApplication(LoLLMsCom): if rag_server["type"]=="lightrag": try: self.ShowBlockingMessage("Installing Lightrag\nPlease wait...") + # Define the path to the apps folder if not pm.is_installed("lightrag-hku"): - pm.install("https://github.com/ParisNeo/LightRAG.git[api,tools]") + apps_folder = self.lollms_paths.personal_user_infos_path / "apps" + apps_folder.mkdir(parents=True, exist_ok=True) # Ensure the apps folder exists + # Define the path to clone the repository + clone_path = apps_folder / "LightRAG" + + # Clone the repository if it doesn't already exist + if not clone_path.exists(): + subprocess.run(["git", "clone", "https://github.com/ParisNeo/LightRAG.git", str(clone_path)]) + print(f"Repository cloned to: {clone_path}") + else: + print(f"Repository already exists at: {clone_path}") + + # Install the package in editable mode with extras + subprocess.run([sys.executable, "-m", "pip", "install", "-e", f"{str(clone_path)}[api,tools]"]) subprocess.Popen( ["lightrag-server", "--llm-binding", "lollms", "--embedding-binding", "lollms", "--input-dir", rag_server["input_path"], "--working-dir", rag_server["working_path"]], text=True, diff --git a/lollms/paths.py b/lollms/paths.py index 1d3f65a..cfb9f38 100644 --- a/lollms/paths.py +++ b/lollms/paths.py @@ -73,7 +73,7 @@ class LollmsPaths: self.personal_certificates = self.personal_path / "certs" self.personal_outputs_path = self.personal_path / "outputs" self.personal_user_infos_path = self.personal_path / "user_infos" - + self.personal_apps_path = self.personal_path / "apps" self.personal_services_path = self.personal_path / "services" self.personal_stt_services_path = self.personal_services_path / "stt" @@ -173,6 +173,7 @@ class LollmsPaths: ("Skills Path", self.personal_skills_path), ("Models Path", self.personal_models_path), ("User Info Path", self.personal_user_infos_path), + ("User Info Path", self.personal_apps_path), ("Custom Personalities", self.custom_personalities_path), ("Custom Voices", self.custom_voices_path), ("Custom function calls",self.custom_function_calls_path) @@ -230,6 +231,7 @@ class LollmsPaths: "Bindings Zoo Path": self.bindings_zoo_path, "Personalities Zoo Path": self.personalities_zoo_path, "Personal user infos path": self.personal_user_infos_path, + "apps path": self.personal_apps_path, "Personal trainers path": self.personal_trainers_path, "Personal gptqlora trainer path": self.gptqlora_path, @@ -260,6 +262,7 @@ class LollmsPaths: self.personal_outputs_path.mkdir(parents=True, exist_ok=True) self.personal_uploads_path.mkdir(parents=True, exist_ok=True) self.personal_user_infos_path.mkdir(parents=True, exist_ok=True) + self.personal_apps_path.mkdir(parents=True, exist_ok=True) self.personal_services_path.mkdir(parents=True, exist_ok=True) self.personal_stt_services_path.mkdir(parents=True, exist_ok=True) diff --git a/lollms/prompting.py b/lollms/prompting.py index ab62eb4..f3b242a 100644 --- a/lollms/prompting.py +++ b/lollms/prompting.py @@ -146,12 +146,13 @@ class LollmsContextDetails: # Append each field to the full context if it exists and is not suppressed append_context("conditionning") append_context("documentation", template.system_custom_header("documentation")) + append_context("internet_search_results", template.system_custom_header("Internet search results")) append_context("user_description", template.system_custom_header("user_description")) append_context("positive_boost", template.system_custom_header("positive_boost")) append_context("negative_boost", template.system_custom_header("negative_boost")) append_context("current_language", template.system_custom_header("current_language")) - append_context("fun_mode", template.system_custom_header("fun_mode")) - append_context("think_first_mode", template.system_custom_header("think_first_mode")) + append_context("fun_mode") + append_context("think_first_mode") append_context("extra") found_classic_function = False