ivanwu/jarvis-models
1
0
Fork 0
mirror of https://github.com/BoardWare-Genius/jarvis-models.git synced 2025-12-13 16:53:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

update blackbox chroma and chat

Browse Source
This commit is contained in:
ACBBZ
2024-05-28 08:23:10 +00:00
parent 347eea2f9c
commit ca34962376
4 changed files with 113 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/blackbox/chat.py
View File

@ -82,14 +82,52 @@ class Chat(Blackbox):
if user_model_key is None or user_model_key.isspace() or user_model_key == "": if user_model_key is None or user_model_key.isspace() or user_model_key == "":
user_model_key = "YOUR_API_KEY" user_model_key = "YOUR_API_KEY"
# 文心格式和openai的不一样，需要单独处理
if re.search(r"ernie", user_model_name):
# key = "24.22873ef3acf61fb343812681e4df251a.2592000.1719453781.282335-46723715" 没充钱，只有ernie-speed-128k能用
key = user_model_key
if re.search(r"ernie-speed-128k", user_model_name):
url = "https://aip.baidubce.com/rpc/2.0/ai_custom/v1/wenxinworkshop/chat/ernie-speed-128k?access_token=" + key
elif re.search(r"ernie-3.5-8k", user_model_name):
url = "https://aip.baidubce.com/rpc/2.0/ai_custom/v1/wenxinworkshop/chat/completions?access_token=" + key
elif re.search(r"ernie-4.0-8k", user_model_name):
url = "https://aip.baidubce.com/rpc/2.0/ai_custom/v1/wenxinworkshop/chat/completions_pro?access_token=" + key
payload = json.dumps({
"system": prompt_template,
"messages": user_context + [
{
"role": "user",
"content": user_question
}
],
"temperature": user_temperature,
"top_p": user_top_p,
"stop": [str(user_stop)],
"max_output_tokens": user_max_tokens
})
headers = {
'Content-Type': 'application/json'
}
response = requests.request("POST", url, headers=headers, data=payload)
return response.json()["result"]
# gpt-4， gpt-3.5-turbo # gpt-4， gpt-3.5-turbo
if re.search(r"gpt", user_model_name): elif re.search(r"gpt", user_model_name):
url = 'https://api.openai.com/v1/completions' url = 'https://api.openai.com/v1/completions'
key = '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' # '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'
key = user_model_key
# 自定义model
else: else:
url = user_model_url url = user_model_url
key = user_model_key key = user_model_key
prompt_template = [ prompt_template = [
{"role": "system", "content": user_template}, {"role": "system", "content": user_template},
] ]

15
src/blackbox/chroma_chat.py
View File

@ -33,20 +33,20 @@ class ChromaChat(Blackbox):
# chroma_chat settings # chroma_chat settings
# { # {
# "chroma_embedding_model": "bge-large-zh-v1.5", # "chroma_embedding_model": "/model/Weight/BAAI/bge-large-zh-v1.5",
# "chroma_host": "10.6.82.192", # "chroma_host": "10.6.82.192",
# "chroma_port": "8000", # "chroma_port": "8000",
# "chroma_collection_id": "123", # "chroma_collection_id": "g2e",
# "chroma_n_results": 3, # "chroma_n_results": 3,
# "model_name": "Qwen1.5-14B-Chat", # "model_name": "Qwen1.5-14B-Chat",
# "context": [], # "context": [],
# "template": "", # "template": "",
# "temperature": 0.8, # "temperature": 0,
# "top_p": 0.8, # "top_p": 0,
# "n": 1, # "n": 1,
# "max_tokens": 1024, # "max_tokens": 1024,
# "frequency_penalty": 0.5, # "frequency_penalty": 0,
# "presence_penalty": 0.8, # "presence_penalty": 0,
# "stop": 100, # "stop": 100,
# "model_url": "http://120.196.116.194:48892/v1/chat/completions", # "model_url": "http://120.196.116.194:48892/v1/chat/completions",
# "model_key": "YOUR_API_KEY" # "model_key": "YOUR_API_KEY"
@ -87,5 +87,4 @@ class ChromaChat(Blackbox):
setting: dict = data.get("settings") setting: dict = data.get("settings")
return JSONResponse( return JSONResponse(
content={"response": self.processing(user_question, user_context, setting)}, content={"response": self.processing(user_question, user_context, setting)}, status_code=status.HTTP_200_OK)
status_code=status.HTTP_200_OK)

5
src/blackbox/chroma_query.py
View File

@ -51,7 +51,7 @@ class ChromaQuery(Blackbox):
return JSONResponse(content={"error": "question is required"}, status_code=status.HTTP_400_BAD_REQUEST) return JSONResponse(content={"error": "question is required"}, status_code=status.HTTP_400_BAD_REQUEST)
if chroma_embedding_model is None or chroma_embedding_model.isspace() or chroma_embedding_model == "": if chroma_embedding_model is None or chroma_embedding_model.isspace() or chroma_embedding_model == "":
chroma_embedding_model = "bge-large-zh-v1.5" chroma_embedding_model = "/model/Weight/BAAI/bge-large-zh-v1.5"
if chroma_host is None or chroma_host.isspace() or chroma_host == "": if chroma_host is None or chroma_host.isspace() or chroma_host == "":
chroma_host = "10.6.82.192" chroma_host = "10.6.82.192"
@ -71,10 +71,9 @@ class ChromaQuery(Blackbox):
else: else:
client = chromadb.HttpClient(host=chroma_host, port=chroma_port) client = chromadb.HttpClient(host=chroma_host, port=chroma_port)
if re.search(r"bge-large-zh-v1.5", chroma_embedding_model): if re.search(r"/model/Weight/BAAI/bge-large-zh-v1.5", chroma_embedding_model):
embedding_model = self.embedding_model_1 embedding_model = self.embedding_model_1
else: else:
chroma_embedding_model = "/model/Weight/BAAI/" + chroma_embedding_model
embedding_model = embedding_functions.SentenceTransformerEmbeddingFunction(model_name=chroma_embedding_model, device = "cuda") embedding_model = embedding_functions.SentenceTransformerEmbeddingFunction(model_name=chroma_embedding_model, device = "cuda")
# load collection # load collection

99
src/blackbox/chroma_upsert.py
View File

@ -17,7 +17,12 @@ import chromadb
import os import os
import tempfile import tempfile
from ..utils import chroma_setting import logging
from ..log.logging_time import logging_time
import re
logger = logging.getLogger
DEFAULT_COLLECTION_ID = "123"
from injector import singleton from injector import singleton
@singleton @singleton
@ -26,9 +31,9 @@ class ChromaUpsert(Blackbox):
def __init__(self, *args, **kwargs) -> None: def __init__(self, *args, **kwargs) -> None:
# config = read_yaml(args[0]) # config = read_yaml(args[0])
# load embedding model # load embedding model
self.embedding_model = SentenceTransformerEmbeddings(model_name='/model/Weight/BAAI/bge-small-en-v1.5', model_kwargs={"device": "cuda"}) self.embedding_model_1 = SentenceTransformerEmbeddings(model_name="/model/Weight/BAAI/bge-large-zh-v1.5", model_kwargs={"device": "cuda"})
# load chroma db # load chroma db
self.client = chromadb.HttpClient(host='10.6.82.192', port=8000) self.client_1 = chromadb.HttpClient(host='10.6.82.192', port=8000)
def __call__(self, *args, **kwargs): def __call__(self, *args, **kwargs):
return self.processing(*args, **kwargs) return self.processing(*args, **kwargs)
@ -37,30 +42,59 @@ class ChromaUpsert(Blackbox):
data = args[0] data = args[0]
return isinstance(data, list) return isinstance(data, list)
def processing(self, collection_id, file, string, context, setting: chroma_setting) -> str: @logging_time(logger=logger)
def processing(self, file, string, context: list, settings: dict) -> str:
# 用户的操作历史 # 用户的操作历史
if context is None: if context is None:
context = [] context = []
context = [ # context = [
{ # {
"collection_id": "123", # "collection_id": "123",
"action": "query", # "action": "query",
"content": "你吃饭了吗", # "content": "你吃饭了吗",
"answer": "吃了", # "answer": "吃了",
}, # },
{ # {
"collection_id": "123", # "collection_id": "123",
"action": "upsert", # "action": "upsert",
"content": "file_name or string", # "content": "file_name or string",
"answer": "collection 123 has 12472 documents. /tmp/Cheap and Quick：Efficient Vision-Language Instruction Tuning for Large Language Models.pdf ids is 0~111", # "answer": "collection 123 has 12472 documents. /tmp/Cheap and Quick：Efficient Vision-Language Instruction Tuning for Large Language Models.pdf ids is 0~111",
}, # },
] # ]
if collection_id is None and setting.ChromaSetting.collection_ids[0] != []: if settings is None:
collection_id = setting.ChromaSetting.collection_ids[0] settings = {}
# # chroma_query settings
chroma_embedding_model = settings.get("chroma_embedding_model")
chroma_host = settings.get("chroma_host")
chroma_port = settings.get("chroma_port")
chroma_collection_id = settings.get("chroma_collection_id")
if chroma_embedding_model is None or chroma_embedding_model.isspace() or chroma_embedding_model == "":
chroma_embedding_model = "/model/Weight/BAAI/bge-large-zh-v1.5"
if chroma_host is None or chroma_host.isspace() or chroma_host == "":
chroma_host = "10.6.82.192"
if chroma_port is None or chroma_port.isspace() or chroma_port == "":
chroma_port = "8000"
if chroma_collection_id is None or chroma_collection_id.isspace() or chroma_collection_id == "":
chroma_collection_id = "g2e"
# load client and embedding model from init
if re.search(r"10.6.82.192", chroma_host) and re.search(r"8000", chroma_port):
client = self.client_1
else: else:
collection_id = "123" client = chromadb.HttpClient(host=chroma_host, port=chroma_port)
if re.search(r"/model/Weight/BAAI/bge-large-zh-v1.5", chroma_embedding_model):
embedding_model = self.embedding_model_1
else:
embedding_model = SentenceTransformerEmbeddings(model_name=chroma_embedding_model, device = "cuda")
if file is not None: if file is not None:
file_type = file.split(".")[-1] file_type = file.split(".")[-1]
@ -79,7 +113,6 @@ class ChromaUpsert(Blackbox):
loader = Docx2txtLoader(file) loader = Docx2txtLoader(file)
elif file_type == "xlsx": elif file_type == "xlsx":
loader = UnstructuredExcelLoader(file) loader = UnstructuredExcelLoader(file)
documents = loader.load() documents = loader.load()
text_splitter = RecursiveCharacterTextSplitter(chunk_size=512, chunk_overlap=0) text_splitter = RecursiveCharacterTextSplitter(chunk_size=512, chunk_overlap=0)
@ -88,21 +121,21 @@ class ChromaUpsert(Blackbox):
ids = [str(file)+str(i) for i in range(len(docs))] ids = [str(file)+str(i) for i in range(len(docs))]
Chroma.from_documents(documents=docs, embedding=self.embedding_model, ids=ids, collection_name=collection_id, client=self.client) Chroma.from_documents(documents=docs, embedding=embedding_model, ids=ids, collection_name=chroma_collection_id, client=client)
collection_number = self.client.get_collection(collection_id).count() collection_number = client.get_collection(chroma_collection_id).count()
response_file = f"collection {collection_id} has {collection_number} documents. {file} ids is 0~{len(docs)-1}" response_file = f"collection {chroma_collection_id} has {collection_number} documents. {file} ids is 0~{len(docs)-1}"
if string is not None: if string is not None:
# 生成一个新的id ids_string: 1 # 生成一个新的id ids_string: 1
# ids = setting.ChromaSetting.string_ids[0] + 1 # ids = setting.ChromaSetting.string_ids[0] + 1
ids = "1" ids = "1"
Chroma.from_texts(texts=[string], embedding=self.embedding_model, ids=[ids], collection_name=collection_id, client=self.client) Chroma.from_texts(texts=[string], embedding=embedding_model, ids=[ids], collection_name=chroma_collection_id, client=client)
collection_number = self.client.get_collection(collection_id).count() collection_number = client.get_collection(chroma_collection_id).count()
response_string = f"collection {collection_id} has {collection_number} documents. {string} ids is {ids}" response_string = f"collection {chroma_collection_id} has {collection_number} documents. {string} ids is {ids}"
if file is not None and string is not None: if file is not None and string is not None:
@ -116,14 +149,10 @@ class ChromaUpsert(Blackbox):
async def fast_api_handler(self, request: Request) -> Response: async def fast_api_handler(self, request: Request) -> Response:
user_collection_id = (await request.form()).get("collection_id")
user_file = (await request.form()).get("file") user_file = (await request.form()).get("file")
user_string = (await request.form()).get("string") user_string = (await request.form()).get("string")
user_context = (await request.form()).get("context") context = (await request.form()).get("context")
user_setting = (await request.form()).get("setting") setting: dict = (await request.form()).get("settings")
if user_collection_id is None and user_setting["collections"] == []:
return JSONResponse(content={"error": "The first creation requires a collection id"}, status_code=status.HTTP_400_BAD_REQUEST)
if user_file is None and user_string is None: if user_file is None and user_string is None:
return JSONResponse(content={"error": "file or string is required"}, status_code=status.HTTP_400_BAD_REQUEST) return JSONResponse(content={"error": "file or string is required"}, status_code=status.HTTP_400_BAD_REQUEST)
@ -142,5 +171,5 @@ class ChromaUpsert(Blackbox):
return JSONResponse( return JSONResponse(
content={"response": self.processing(user_collection_id, safe_filename, user_string, user_context, user_setting)}, content={"response": self.processing(safe_filename, user_string, context, setting)},
status_code=status.HTTP_200_OK) status_code=status.HTTP_200_OK)