added new tools to load files

This commit is contained in:
Saifeddine ALOUI 2024-06-17 01:33:00 +02:00
parent 0cbe144f05
commit bdebae5d71
3 changed files with 228 additions and 9 deletions

View File

@ -73,17 +73,19 @@ class LollmsApplication(LoLLMsCom):
# services
self.ollama = None
self.vllm = None
self.whisper = None
self.xtts = None
self.sd = None
self.comfyui = None
self.motion_ctrl = None
self.ollama = None
self.vllm = None
self.whisper = None
self.xtts = None
self.sd = None
self.comfyui = None
self.motion_ctrl = None
self.tti = None
self.tts = None
self.stt = None
self.ttm = None
self.ttv = None
self.rt_com = None
if not free_mode:
@ -251,7 +253,7 @@ class LollmsApplication(LoLLMsCom):
ASCIIColors.yellow("* - * - * - Starting services - * - * - *")
ASCIIColors.blue("Loading TTT services")
if self.config.enable_ollama_service:
try:
from lollms.services.ollama.lollms_ollama import Service
@ -275,6 +277,7 @@ class LollmsApplication(LoLLMsCom):
except Exception as ex:
trace_exception(ex)
ASCIIColors.blue("Loading TTS services")
ASCIIColors.yellow(f" -> self.config.xtts_enable: {self.config.xtts_enable}")
ASCIIColors.yellow(f" -> self.config.active_stt_service: {self.config.active_stt_service}")
if self.config.xtts_enable or self.config.active_tts_service == "xtts":
@ -299,6 +302,7 @@ class LollmsApplication(LoLLMsCom):
except:
self.warning(f"Couldn't load XTTS")
ASCIIColors.blue("Loading TTI services")
if self.config.enable_sd_service:
try:
from lollms.services.sd.lollms_sd import LollmsSD
@ -335,12 +339,15 @@ class LollmsApplication(LoLLMsCom):
from lollms.services.midjourney.lollms_midjourney import LollmsMidjourney
self.tti = LollmsMidjourney(self, self.config.midjourney_key)
ASCIIColors.blue("Loading TTS services")
if self.config.active_tts_service == "openai_tts":
from lollms.services.open_ai_tts.lollms_openai_tts import LollmsOpenAITTS
self.tts = LollmsOpenAITTS(self, self.config.openai_tts_model, self.config.openai_tts_voice, self.config.openai_tts_key)
elif self.config.active_tts_service == "xtts" and self.xtts:
self.tts = self.xtts
ASCIIColors.blue("Loading STT services")
if self.config.active_stt_service == "openai_whisper":
from lollms.services.openai_whisper.lollms_openai_whisper import LollmsOpenAIWhisper
self.stt = LollmsOpenAIWhisper(self, self.config.openai_whisper_model, self.config.openai_whisper_key)

View File

@ -48,6 +48,7 @@ def main():
from lollms.server.endpoints.lollms_binding_infos import router as lollms_binding_infos_router
from lollms.server.endpoints.lollms_models_infos import router as lollms_models_infos_router
from lollms.server.endpoints.lollms_personalities_infos import router as lollms_personalities_infos_router
from lollms.server.endpoints.lollms_file_system import router as lollms_file_system_router
from lollms.server.endpoints.lollms_configuration_infos import router as lollms_configuration_infos_router
@ -73,7 +74,7 @@ def main():
app.include_router(lollms_generator_router)
app.include_router(lollms_configuration_infos_router)
app.include_router(lollms_file_system_router)
lollms_generation_events_add(sio)

View File

@ -0,0 +1,211 @@
"""
project: lollms
file: lollms_binding_files_server.py
author: ParisNeo
description:
This module contains a set of FastAPI routes that provide information about the Lord of Large Language and Multimodal Systems (LoLLMs) Web UI
application. These routes are specific to serving files
"""
from fastapi import APIRouter, Request, Depends
from fastapi import HTTPException
from pydantic import BaseModel, validator
import pkg_resources
from lollms.server.elf_server import LOLLMSElfServer
from fastapi.responses import FileResponse
from lollms.binding import BindingBuilder, InstallOption
from lollms.security import sanitize_path_from_endpoint
from ascii_colors import ASCIIColors
from lollms.utilities import load_config, trace_exception, gc, PackageManager
from pathlib import Path
from typing import List, Optional, Dict
from lollms.security import check_access
import os
import re
# ----------------------- Defining router and main class ------------------------------
router = APIRouter()
lollmsElfServer = LOLLMSElfServer.get_instance()
# Tools
def open_folder() -> Optional[Path]:
"""
Opens a folder selection dialog and returns the selected folder path.
Returns:
Optional[Path]: The path of the selected folder or None if no folder was selected.
"""
import tkinter as tk
from tkinter import filedialog
try:
# Create a new Tkinter root window and hide it
root = tk.Tk()
root.withdraw()
# Make the window appear on top
root.attributes('-topmost', True)
# Open the folder selection dialog
folder_path = filedialog.askdirectory()
# Destroy the root window
root.destroy()
if folder_path:
return Path(folder_path)
else:
return None
except Exception as e:
print(f"An error occurred: {e}")
return None
def open_file(file_types: List[str]) -> Optional[Path]:
"""
Opens a file selection dialog and returns the selected file path.
Args:
file_types (List[str]): A list of file types to filter in the dialog (e.g., ["*.txt", "*.pdf"]).
Returns:
Optional[Path]: The path of the selected file or None if no file was selected.
"""
import tkinter as tk
from tkinter import filedialog
try:
# Create a new Tkinter root window and hide it
root = tk.Tk()
root.withdraw()
# Make the window appear on top
root.attributes('-topmost', True)
# Open the file selection dialog
file_path = filedialog.askopenfilename(filetypes=[("Files", file_types)])
# Destroy the root window
root.destroy()
if file_path:
return Path(file_path)
else:
return None
except Exception as e:
print(f"An error occurred: {e}")
return None
def select_rag_database() -> Optional[Dict[str, Path]]:
"""
Opens a folder selection dialog and then a string input dialog to get the database name.
Returns:
Optional[Dict[str, Path]]: A dictionary with the database name and the database path, or None if no folder was selected.
"""
try:
import tkinter as tk
from tkinter import simpledialog, filedialog
# Create a new Tkinter root window and hide it
root = tk.Tk()
root.withdraw()
# Make the window appear on top
root.attributes('-topmost', True)
# Open the folder selection dialog
folder_path = filedialog.askdirectory()
if folder_path:
# Ask for the database name
db_name = simpledialog.askstring("Database Name", "Please enter the database name:")
# Destroy the root window
root.destroy()
if db_name:
try:
lollmsElfServer.ShowBlockingMessage("Adding a new database.\nVectorizing the database")
if not PackageManager.check_package_installed("lollmsvectordb"):
PackageManager.install_package("lollmsvectordb")
from lollmsvectordb.vectorizers.bert_vectorizer import BERTVectorizer
from lollmsvectordb import VectorDatabase
from lollmsvectordb.text_document_loader import TextDocumentsLoader
v = BERTVectorizer()
vdb = VectorDatabase(Path(folder_path)/"db_name.sqlite", v)
# Get all files in the folder
folder = Path(folder_path)
file_types = ['*.txt', '*.pdf', '*.docx', '*.pptx', '*.msg']
files = []
for file_type in file_types:
files.extend(folder.glob(file_type))
# Load and add each document to the database
for fn in files:
try:
text = TextDocumentsLoader.read_file(fn)
title = fn.stem # Use the file name without extension as the title
vdb.add_document(title, text)
print(f"Added document: {title}")
except Exception as e:
print(f"Failed to add document {fn}: {e}")
return {"database_name": db_name, "database_path": Path(folder_path)}
except:
lollmsElfServer.HideBlockingMessage()
else:
return None
else:
# Destroy the root window if no folder was selected
root.destroy()
return None
except Exception as e:
print(f"An error occurred: {e}")
return None
# ----------------------------------- Personal files -----------------------------------------
class SelectDatabase(BaseModel):
client_id: str
class MountDatabase(BaseModel):
client_id: str
database_name:str
class FolderOpenRequest(BaseModel):
client_id: str
class FileOpenRequest(BaseModel):
client_id: str
file_types: List[str]
@router.post("/get_folder")
def get_folder(folder_infos: FolderOpenRequest):
"""
Open
"""
check_access(lollmsElfServer, folder_infos.client_id)
return open_folder()
@router.post("/get_file")
def get_file(file_infos: FileOpenRequest):
"""
Open
"""
check_access(lollmsElfServer, file_infos.client_id)
return open_file(file_infos.file_types)
@router.post("/add_rag_database")
async def add_rag_database(database_infos: SelectDatabase):
"""
Selects and names a database
"""
check_access(lollmsElfServer, database_infos.client_id)
return select_rag_database()
@router.post("/mount_rag_database")
def mount_rag_database(database_infos: MountDatabase):
"""
Selects and names a database
"""
check_access(lollmsElfServer, database_infos.client_id)
return select_rag_database()