Convert formatting to use ruff instead of yapf + isort (#26247)
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
This commit is contained in:
+47
-38
@@ -51,13 +51,15 @@ class CompletionOutput:
|
||||
return self.finish_reason is not None
|
||||
|
||||
def __repr__(self) -> str:
|
||||
return (f"CompletionOutput(index={self.index}, "
|
||||
f"text={self.text!r}, "
|
||||
f"token_ids={self.token_ids}, "
|
||||
f"cumulative_logprob={self.cumulative_logprob}, "
|
||||
f"logprobs={self.logprobs}, "
|
||||
f"finish_reason={self.finish_reason}, "
|
||||
f"stop_reason={self.stop_reason})")
|
||||
return (
|
||||
f"CompletionOutput(index={self.index}, "
|
||||
f"text={self.text!r}, "
|
||||
f"token_ids={self.token_ids}, "
|
||||
f"cumulative_logprob={self.cumulative_logprob}, "
|
||||
f"logprobs={self.logprobs}, "
|
||||
f"finish_reason={self.finish_reason}, "
|
||||
f"stop_reason={self.stop_reason})"
|
||||
)
|
||||
|
||||
|
||||
@dataclass
|
||||
@@ -67,14 +69,16 @@ class PoolingOutput:
|
||||
Args:
|
||||
data: The extracted hidden states.
|
||||
"""
|
||||
|
||||
data: torch.Tensor
|
||||
|
||||
def __repr__(self) -> str:
|
||||
return (f"PoolingOutput(data={self.data})")
|
||||
return f"PoolingOutput(data={self.data})"
|
||||
|
||||
def __eq__(self, other: object) -> bool:
|
||||
return (isinstance(other, self.__class__) and bool(
|
||||
(self.data == other.data).all()))
|
||||
return isinstance(other, self.__class__) and bool(
|
||||
(self.data == other.data).all()
|
||||
)
|
||||
|
||||
|
||||
class RequestOutput:
|
||||
@@ -122,8 +126,9 @@ class RequestOutput:
|
||||
**kwargs: Any,
|
||||
) -> None:
|
||||
if kwargs:
|
||||
logger.warning_once("RequestOutput: Ignoring extra arguments: %s",
|
||||
str(kwargs))
|
||||
logger.warning_once(
|
||||
"RequestOutput: Ignoring extra arguments: %s", str(kwargs)
|
||||
)
|
||||
self.request_id = request_id
|
||||
self.prompt = prompt
|
||||
self.prompt_token_ids = prompt_token_ids
|
||||
@@ -150,16 +155,15 @@ class RequestOutput:
|
||||
if aggregate:
|
||||
# Merge outputs with same index
|
||||
completion.text += next_completion.text
|
||||
if not isinstance(completion.token_ids,
|
||||
MutableSequence):
|
||||
if not isinstance(completion.token_ids, MutableSequence):
|
||||
completion.token_ids = list(completion.token_ids)
|
||||
completion.token_ids.extend(next_completion.token_ids)
|
||||
if next_completion.logprobs:
|
||||
assert completion.logprobs is not None
|
||||
completion.logprobs.extend(
|
||||
next_completion.logprobs)
|
||||
completion.logprobs.extend(next_completion.logprobs)
|
||||
completion.cumulative_logprob = (
|
||||
next_completion.cumulative_logprob)
|
||||
next_completion.cumulative_logprob
|
||||
)
|
||||
completion.finish_reason = next_completion.finish_reason
|
||||
completion.stop_reason = next_completion.stop_reason
|
||||
else:
|
||||
@@ -170,18 +174,20 @@ class RequestOutput:
|
||||
self.outputs.append(next_completion)
|
||||
|
||||
def __repr__(self) -> str:
|
||||
return (f"RequestOutput(request_id={self.request_id}, "
|
||||
f"prompt={self.prompt!r}, "
|
||||
f"prompt_token_ids={self.prompt_token_ids}, "
|
||||
f"encoder_prompt={self.encoder_prompt!r}, "
|
||||
f"encoder_prompt_token_ids={self.encoder_prompt_token_ids}, "
|
||||
f"prompt_logprobs={self.prompt_logprobs}, "
|
||||
f"outputs={self.outputs}, "
|
||||
f"finished={self.finished}, "
|
||||
f"metrics={self.metrics}, "
|
||||
f"lora_request={self.lora_request}, "
|
||||
f"num_cached_tokens={self.num_cached_tokens}, "
|
||||
f"multi_modal_placeholders={self.multi_modal_placeholders})")
|
||||
return (
|
||||
f"RequestOutput(request_id={self.request_id}, "
|
||||
f"prompt={self.prompt!r}, "
|
||||
f"prompt_token_ids={self.prompt_token_ids}, "
|
||||
f"encoder_prompt={self.encoder_prompt!r}, "
|
||||
f"encoder_prompt_token_ids={self.encoder_prompt_token_ids}, "
|
||||
f"prompt_logprobs={self.prompt_logprobs}, "
|
||||
f"outputs={self.outputs}, "
|
||||
f"finished={self.finished}, "
|
||||
f"metrics={self.metrics}, "
|
||||
f"lora_request={self.lora_request}, "
|
||||
f"num_cached_tokens={self.num_cached_tokens}, "
|
||||
f"multi_modal_placeholders={self.multi_modal_placeholders})"
|
||||
)
|
||||
|
||||
|
||||
_O = TypeVar("_O", default=PoolingOutput)
|
||||
@@ -198,18 +204,21 @@ class PoolingRequestOutput(Generic[_O]):
|
||||
finished (bool): A flag indicating whether the pooling is completed.
|
||||
"""
|
||||
|
||||
def __init__(self, request_id: str, outputs: _O,
|
||||
prompt_token_ids: list[int], finished: bool):
|
||||
def __init__(
|
||||
self, request_id: str, outputs: _O, prompt_token_ids: list[int], finished: bool
|
||||
):
|
||||
self.request_id = request_id
|
||||
self.prompt_token_ids = prompt_token_ids
|
||||
self.finished = finished
|
||||
self.outputs = outputs
|
||||
|
||||
def __repr__(self):
|
||||
return (f"{type(self).__name__}(request_id={self.request_id!r}, "
|
||||
f"outputs={self.outputs!r}, "
|
||||
f"prompt_token_ids={self.prompt_token_ids}, "
|
||||
f"finished={self.finished})")
|
||||
return (
|
||||
f"{type(self).__name__}(request_id={self.request_id!r}, "
|
||||
f"outputs={self.outputs!r}, "
|
||||
f"prompt_token_ids={self.prompt_token_ids}, "
|
||||
f"finished={self.finished})"
|
||||
)
|
||||
|
||||
|
||||
@dataclass
|
||||
@@ -220,6 +229,7 @@ class EmbeddingOutput:
|
||||
embedding: The embedding vector, which is a list of floats.
|
||||
Its length depends on the hidden dimension of the model.
|
||||
"""
|
||||
|
||||
embedding: list[float]
|
||||
|
||||
@staticmethod
|
||||
@@ -239,7 +249,6 @@ class EmbeddingOutput:
|
||||
|
||||
|
||||
class EmbeddingRequestOutput(PoolingRequestOutput[EmbeddingOutput]):
|
||||
|
||||
@staticmethod
|
||||
def from_base(request_output: PoolingRequestOutput):
|
||||
return EmbeddingRequestOutput(
|
||||
@@ -258,6 +267,7 @@ class ClassificationOutput:
|
||||
probs: The probability vector, which is a list of floats.
|
||||
Its length depends on the number of classes.
|
||||
"""
|
||||
|
||||
probs: list[float]
|
||||
|
||||
@staticmethod
|
||||
@@ -278,7 +288,6 @@ class ClassificationOutput:
|
||||
|
||||
|
||||
class ClassificationRequestOutput(PoolingRequestOutput[ClassificationOutput]):
|
||||
|
||||
@staticmethod
|
||||
def from_base(request_output: PoolingRequestOutput):
|
||||
return ClassificationRequestOutput(
|
||||
@@ -296,6 +305,7 @@ class ScoringOutput:
|
||||
Args:
|
||||
score: The similarity score, which is a scalar value.
|
||||
"""
|
||||
|
||||
score: float
|
||||
|
||||
@staticmethod
|
||||
@@ -314,7 +324,6 @@ class ScoringOutput:
|
||||
|
||||
|
||||
class ScoringRequestOutput(PoolingRequestOutput[ScoringOutput]):
|
||||
|
||||
@staticmethod
|
||||
def from_base(request_output: PoolingRequestOutput):
|
||||
return ScoringRequestOutput(
|
||||
|
||||
Reference in New Issue
Block a user