ExternalVendorCode/lollms
1
0
Fork 0
mirror of https://github.com/ParisNeo/lollms.git synced 2025-01-20 19:49:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update app.py

Browse Source
This commit is contained in:
Saifeddine ALOUI 2024-06-20 08:50:33 +02:00 committed by GitHub
parent 5fa1f23d5d
commit 487e18d3ea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lollms/app.py
View File

@ -73,7 +73,9 @@ class LollmsApplication(LoLLMsCom):
self.generate_msg_with_internet: Callable[[str, Dict], None] = None self.generate_msg_with_internet: Callable[[str, Dict], None] = None
self.handle_continue_generate_msg_from: Callable[[str, Dict], None] = None self.handle_continue_generate_msg_from: Callable[[str, Dict], None] = None
# Trust store
self.bk_store = None
# services # services
self.ollama = None self.ollama = None
self.vllm = None self.vllm = None
@ -108,8 +110,11 @@ class LollmsApplication(LoLLMsCom):
from lollmsvectordb.tokenizers.tiktoken_tokenizer import TikTokenTokenizer from lollmsvectordb.tokenizers.tiktoken_tokenizer import TikTokenTokenizer
if self.config.rag_vectorizer == "bert": if self.config.rag_vectorizer == "bert":
self.backup_trust_store()
from lollmsvectordb.vectorizers.bert_vectorizer import BERTVectorizer from lollmsvectordb.vectorizers.bert_vectorizer import BERTVectorizer
v = BERTVectorizer() v = BERTVectorizer()
self.restore_trust_store()
elif self.config.rag_vectorizer == "tfidf": elif self.config.rag_vectorizer == "tfidf":
from lollmsvectordb.vectorizers.tfidf_vectorizer import TFIDFVectorizer from lollmsvectordb.vectorizers.tfidf_vectorizer import TFIDFVectorizer
v = TFIDFVectorizer() v = TFIDFVectorizer()
@ -187,7 +192,16 @@ class LollmsApplication(LoLLMsCom):
self.mount_personalities() self.mount_personalities()
self.mount_extensions() self.mount_extensions()
def backup_trust_store(self):
self.bk_store = None
if 'REQUESTS_CA_BUNDLE' in os.environ:
self.bk_store = os.environ['REQUESTS_CA_BUNDLE']
del os.environ['REQUESTS_CA_BUNDLE']
def restore_trust_store(self):
if self.bk_store is not None:
os.environ['REQUESTS_CA_BUNDLE'] = self.bk_store
def select_model(self, binding_name, model_name): def select_model(self, binding_name, model_name):
self.config["binding_name"] = binding_name self.config["binding_name"] = binding_name
self.config["model_name"] = model_name self.config["model_name"] = model_name
@ -290,13 +304,14 @@ class LollmsApplication(LoLLMsCom):
if not PackageManager.check_package_installed("lollmsvectordb"): if not PackageManager.check_package_installed("lollmsvectordb"):
PackageManager.install_package("lollmsvectordb") PackageManager.install_package("lollmsvectordb")
from lollmsvectordb.vectorizers.bert_vectorizer import BERTVectorizer
from lollmsvectordb import VectorDatabase from lollmsvectordb import VectorDatabase
from lollmsvectordb.text_document_loader import TextDocumentsLoader from lollmsvectordb.text_document_loader import TextDocumentsLoader
from lollmsvectordb.tokenizers.tiktoken_tokenizer import TikTokenTokenizer from lollmsvectordb.tokenizers.tiktoken_tokenizer import TikTokenTokenizer
if self.config.rag_vectorizer == "bert": if self.config.rag_vectorizer == "bert":
self.backup_trust_store()
from lollmsvectordb.vectorizers.bert_vectorizer import BERTVectorizer from lollmsvectordb.vectorizers.bert_vectorizer import BERTVectorizer
v = BERTVectorizer() v = BERTVectorizer()
self.restore_trust_store()
elif self.config.rag_vectorizer == "tfidf": elif self.config.rag_vectorizer == "tfidf":
from lollmsvectordb.vectorizers.tfidf_vectorizer import TFIDFVectorizer from lollmsvectordb.vectorizers.tfidf_vectorizer import TFIDFVectorizer
v = TFIDFVectorizer() v = TFIDFVectorizer()