[Diffusion] Unify diffusion request identity on request_id (#3744)
Signed-off-by: jader <yjader@foxmail.com>
This commit is contained in:
1 parent
beb00fce31
commit
6fa9dbbe42
34 files changed
+421
-461
No files matched your search
@@ -38,7 +38,7 @@ class DiffusionRequestState:
|
||||
"""
|
||||
|
||||
# ── Identity / request-level inputs ──
|
||||
req_id: str
|
||||
request_id: str
|
||||
sampling: OmniDiffusionSamplingParams
|
||||
prompts: list[OmniPromptType] | None = None
|
||||
|
||||
@@ -112,7 +112,7 @@ class DiffusionRequestState:
|
||||
|
||||
class BaseRunnerOutput(ABC):
|
||||
@abstractmethod
|
||||
def get_req_output(self, sched_req_id: str) -> RunnerOutput | None:
|
||||
def get_request_output(self, request_id: str) -> RunnerOutput | None:
|
||||
pass
|
||||
|
||||
|
||||
@@ -125,13 +125,13 @@ class RunnerOutput(BaseRunnerOutput):
|
||||
_request_state_cache.
|
||||
"""
|
||||
|
||||
req_id: str
|
||||
request_id: str
|
||||
step_index: int | None = None
|
||||
finished: bool = False
|
||||
result: DiffusionOutput | None = None
|
||||
|
||||
def get_req_output(self, sched_req_id: str) -> RunnerOutput | None:
|
||||
return self if self.req_id == sched_req_id else None
|
||||
def get_request_output(self, request_id: str) -> RunnerOutput | None:
|
||||
return self if self.request_id == request_id else None
|
||||
|
||||
|
||||
@dataclass
|
||||
@@ -140,18 +140,18 @@ class BatchRunnerOutput(BaseRunnerOutput):
|
||||
_id_to_idx: dict[str, int] = field(init=False, repr=False)
|
||||
|
||||
def __post_init__(self) -> None:
|
||||
self._id_to_idx = {out.req_id: i for i, out in enumerate(self.runner_outputs)}
|
||||
self._id_to_idx = {out.request_id: i for i, out in enumerate(self.runner_outputs)}
|
||||
|
||||
def __getitem__(self, req_id: str) -> RunnerOutput | None:
|
||||
"""access single RunnerOutput by req_id"""
|
||||
idx = self._id_to_idx.get(req_id)
|
||||
def __getitem__(self, request_id: str) -> RunnerOutput | None:
|
||||
"""access single RunnerOutput by request_id"""
|
||||
idx = self._id_to_idx.get(request_id)
|
||||
return self.runner_outputs[idx] if idx is not None else None
|
||||
|
||||
def get_req_output(self, sched_req_id: str) -> RunnerOutput | None:
|
||||
return self[sched_req_id]
|
||||
def get_request_output(self, request_id: str) -> RunnerOutput | None:
|
||||
return self[request_id]
|
||||
|
||||
@property
|
||||
def req_ids(self) -> list[str]:
|
||||
def request_ids(self) -> list[str]:
|
||||
return list(self._id_to_idx.keys())
|
||||
|
||||
def __len__(self) -> int:
|
||||
|
||||
Reference in new issue
Block a user