Skip to content

Commit e2940c0

Browse files
committed
model_name
1 parent ce47277 commit e2940c0

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

fastdeploy/entrypoints/openai/serving_chat.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,8 @@ async def create_chat_completion(self, request: ChatCompletionRequest):
7878
err_msg = f"Only master node can accept completion request, please send request to master node: {self.pod_ips[0]}"
7979
api_server_logger.error(err_msg)
8080
return ErrorResponse(message=err_msg, code=400)
81-
if request.model == "default" or self.models.model_paths[0].verification is False:
82-
request.model = self.models.model_name()
83-
if not self.models.is_supported_model(request.model):
81+
is_supported, request.model = self.models.is_supported_model(request.model)
82+
if not is_supported:
8483
err_msg = f"Unsupported model: {request.model}, support {', '.join([x.name for x in self.models.model_paths])} or default"
8584
api_server_logger.error(err_msg)
8685
return ErrorResponse(message=err_msg, code=400)

fastdeploy/entrypoints/openai/serving_completion.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,8 @@ async def create_completion(self, request: CompletionRequest):
6868
err_msg = f"Only master node can accept completion request, please send request to master node: {self.pod_ips[0]}"
6969
api_server_logger.error(err_msg)
7070
return ErrorResponse(message=err_msg, code=400)
71-
if request.model == "default" or self.models.model_paths[0].verification is False:
72-
request.model = self.models.model_name()
73-
if not self.models.is_supported_model(request.model):
71+
is_supported, request.model = self.models.is_supported_model(request.model)
72+
if not is_supported:
7473
err_msg = f"Unsupported model: {request.model}, support {', '.join([x.name for x in self.models.model_paths])} or default"
7574
api_server_logger.error(err_msg)
7675
return ErrorResponse(message=err_msg, code=400)

fastdeploy/entrypoints/openai/serving_models.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@ def _check_master(self):
6161
return True
6262
return False
6363

64-
def is_supported_model(self, model_name) -> bool:
64+
def is_supported_model(self, model_name) -> tuple[bool, str]:
6565
"""
6666
Check whether the specified model is supported.
6767
"""
6868
if self.model_paths[0].verification is False:
69-
return True
69+
return True, self.model_name()
7070
if model_name == "default":
71-
return True
72-
return any(model.name == model_name for model in self.model_paths)
71+
return True, self.model_name()
72+
return any(model.name == model_name for model in self.model_paths), model_name
7373

7474
def model_name(self) -> str:
7575
"""

0 commit comments

Comments
 (0)