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
6 changes: 5 additions & 1 deletion fastdeploy/engine/common_engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,9 @@ def insert_tasks(self, tasks: List[Request], current_id=-1):
for task in tasks:
if self.cfg.scheduler_config.splitwise_role != "mixed":
status, msg = self.split_connector.check_decode_allocated(task)
if not status:
if status:
task.metrics.ask_decode_resource_finish_time = time.time()
else:
self.llm_logger.error(f"{task.request_id} prefill failed with msg:{msg}.")
self.scheduler.put_results(
[
Expand Down Expand Up @@ -660,6 +662,8 @@ def _schedule_request_to_worker(self):

llm_logger.debug(f"get tasks from scheduler: {tasks}")
if self.cfg.scheduler_config.splitwise_role != "mixed":
for task in tasks:
task.metrics.ask_decode_resource_start_time = time.time()
self.split_connector.send_splitwise_tasks(tasks, current_id)

insert_successful = self.insert_tasks(tasks, current_id)
Expand Down
12 changes: 10 additions & 2 deletions fastdeploy/engine/request.py
Original file line number Diff line number Diff line change
Expand Up @@ -677,8 +677,16 @@ def __repr__(self) -> str:
@classmethod
def from_dict(cls, d: dict):
"""Create instance from dict arguments"""
completion_output = CompletionOutput.from_dict(d.pop("outputs"))
metrics = RequestMetrics.from_dict(d.pop("metrics"))
if "outputs" in d and isinstance(d["outputs"], dict):
completion_output = CompletionOutput.from_dict(d.pop("outputs"))
else:
d.pop("outputs", None)
completion_output = None
if "metrics" in d and isinstance(d["metrics"], dict):
metrics = RequestMetrics.from_dict(d.pop("metrics"))
else:
d.pop("metrics", None)
metrics = None
return RequestOutput(**d, outputs=completion_output, metrics=metrics)

def to_dict(self):
Expand Down
Loading