Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 1 addition & 8 deletions fastdeploy/entrypoints/engine_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -207,14 +207,7 @@ async def add_requests(self, task):
task["prompt_token_ids_len"] = len(task["prompt_token_ids"])
input_ids_len = task["prompt_token_ids_len"]

completion_token_len = len(task["completion_token_ids"]) if task.get("completion_token_ids") else 0
task["max_tokens"] = min(
self.max_model_len - input_ids_len, max(0, task.get("max_tokens") - completion_token_len)
)

if task.get("min_tokens") is not None:
task["min_tokens"] = max(1, task["min_tokens"] - completion_token_len)

task["max_tokens"] = min(self.max_model_len - input_ids_len, task.get("max_tokens"))
min_tokens = task.get("min_tokens", 1)
if "messages" in task:
del task["messages"]
Expand Down
10 changes: 2 additions & 8 deletions fastdeploy/input/ernie4_5_vl_processor/ernie4_5_vl_processor.py
Original file line number Diff line number Diff line change
Expand Up @@ -250,9 +250,7 @@ def process_request_dict(self, request, max_model_len=None):
else:
raise ValueError(f"Request must contain 'prompt', or 'messages': {request}")

completion_token_len = 0
if request.get("completion_token_ids"):
completion_token_len = len(request.get("completion_token_ids"))
self.append_completion_tokens(outputs, request["completion_token_ids"])

outputs = self.pack_outputs(outputs)
Expand All @@ -264,16 +262,12 @@ def process_request_dict(self, request, max_model_len=None):
if max_model_len is not None and len(request["prompt_token_ids"]) > max_model_len:
request["prompt_token_ids"] = request["prompt_token_ids"][: max_model_len - 1]

tmp_max_tokens = 0
if request.get("max_tokens") is None:
request["max_tokens"] = max(1, max_model_len - len(request["prompt_token_ids"]))
tmp_max_tokens = request["max_tokens"]
else:
tmp_max_tokens = min(
max_model_len - len(request["prompt_token_ids"]), max(0, request["max_tokens"] - completion_token_len)
)
request["max_tokens"] = min(max_model_len - len(request["prompt_token_ids"]), request["max_tokens"])
if request.get("reasoning_max_tokens") is None:
request["reasoning_max_tokens"] = max(int(tmp_max_tokens * 0.8), 1)
request["reasoning_max_tokens"] = max(int(request["max_tokens"] * 0.8), 1)
data_processor_logger.info(f"Processed request {request}")

return request
Expand Down
139 changes: 0 additions & 139 deletions tests/entrypoints/openai/test_max_and_min_tokens.py

This file was deleted.

Loading