weiweiw
/
Langchain-Chatchat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

将 MiniMax 和 千帆 在线 Embedding 改为 10 个文本一批，防止接口数量限制 (#2161)

This commit is contained in:
liunux4odoo 2023-11-24 16:42:20 +08:00 committed by GitHub
parent 76151e884a
commit 824c29a6d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/kb_config.py.example
View File

@ -100,7 +100,7 @@ kbs_config = {
"index_name": "test_index",
"user": "",
"password": ""
}
}
}
# TextSplitter配置项，如果你不明白其中的含义，就不要修改。

35
server/model_workers/minimax.py
View File

@ -106,7 +106,7 @@ class MiniMaxWorker(ApiModelWorker):
data = {
"model": params.embed_model or self.DEFAULT_EMBED_MODEL,
"texts": params.texts,
"texts": [],
"type": "query" if params.to_query else "db",
}
if log_verbose:
@ -115,21 +115,26 @@ class MiniMaxWorker(ApiModelWorker):
logger.info(f'{self.__class__.__name__}:headers: {headers}')
with get_httpx_client() as client:
r = client.post(url, headers=headers, json=data).json()
if embeddings := r.get("vectors"):
return {"code": 200, "data": embeddings}
elif error := r.get("base_resp"):
return {
"code": error["status_code"],
"msg": error["status_msg"],
"error": {
"message": error["status_msg"],
"type": "invalid_request_error",
"param": None,
"code": None,
result = []
i = 0
for texts in params.texts[i:i+10]:
data["texts"] = texts
r = client.post(url, headers=headers, json=data).json()
if embeddings := r.get("vectors"):
result += embeddings
elif error := r.get("base_resp"):
return {
"code": error["status_code"],
"msg": error["status_msg"],
"error": {
"message": error["status_msg"],
"type": "invalid_request_error",
"param": None,
"code": None,
}
}
}
i += 10
return {"code": 200, "data": embeddings}
def get_embeddings(self, params):
# TODO: 支持embeddings

33
server/model_workers/qianfan.py
View File

@ -184,21 +184,26 @@ class QianFanWorker(ApiModelWorker):
logger.info(f'{self.__class__.__name__}:url: {url}')
with get_httpx_client() as client:
resp = client.post(url, json={"input": params.texts}).json()
if "error_cdoe" not in resp:
embeddings = [x["embedding"] for x in resp.get("data", [])]
return {"code": 200, "data": embeddings}
else:
return {
"code": resp["error_code"],
"msg": resp["error_msg"],
"error": {
"message": resp["error_msg"],
"type": "invalid_request_error",
"param": None,
"code": None,
result = []
i = 0
for texts in params.texts[i:i+10]:
resp = client.post(url, json={"input": texts}).json()
if "error_cdoe" in resp:
return {
"code": resp["error_code"],
"msg": resp["error_msg"],
"error": {
"message": resp["error_msg"],
"type": "invalid_request_error",
"param": None,
"code": None,
}
}
}
else:
embeddings = [x["embedding"] for x in resp.get("data", [])]
result += embeddings
i += 10
return {"code": 200, "data": result}
# TODO: qianfan支持续写模型
def get_embeddings(self, params):