Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Nov 24, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configs/kb_config.py.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ kbs_config = {
"index_name": "test_index",
"user": "",
"password": ""
}
}
}

# TextSplitter配置项，如果你不明白其中的含义，就不要修改。
Expand Down
35 changes: 20 additions & 15 deletions server/model_workers/minimax.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def do_embeddings(self, params: ApiEmbeddingsParams) -> Dict:

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:
Expand All @@ -115,21 +115,26 @@ def do_embeddings(self, params: ApiEmbeddingsParams) -> Dict:
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
Expand Down
33 changes: 19 additions & 14 deletions server/model_workers/qianfan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,21 +184,26 @@ def do_embeddings(self, params: ApiEmbeddingsParams) -> Dict:
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):
Expand Down