Rename customer label -> custom label (#10899)
Co-authored-by: Yingchun Lai <laiyingchun@apache.org> Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
This commit is contained in:
co-authored by
Yingchun Lai
gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
parent
35ec2a45a8
commit
f68dd998b9
@@ -235,8 +235,8 @@ class CompletionRequest(BaseModel):
|
||||
# Priority for the request
|
||||
priority: Optional[int] = None
|
||||
|
||||
# For customer metric labels
|
||||
customer_labels: Optional[Dict[str, str]] = None
|
||||
# For custom metric labels
|
||||
custom_labels: Optional[Dict[str, str]] = None
|
||||
|
||||
@field_validator("max_tokens")
|
||||
@classmethod
|
||||
|
||||
@@ -27,10 +27,10 @@ class OpenAIServingBase(ABC):
|
||||
self.tokenizer_manager = tokenizer_manager
|
||||
self.allowed_custom_labels = (
|
||||
set(
|
||||
self.tokenizer_manager.server_args.tokenizer_metrics_allowed_customer_labels
|
||||
self.tokenizer_manager.server_args.tokenizer_metrics_allowed_custom_labels
|
||||
)
|
||||
if isinstance(self.tokenizer_manager.server_args, ServerArgs)
|
||||
and self.tokenizer_manager.server_args.tokenizer_metrics_allowed_customer_labels
|
||||
and self.tokenizer_manager.server_args.tokenizer_metrics_allowed_custom_labels
|
||||
else None
|
||||
)
|
||||
|
||||
@@ -178,14 +178,14 @@ class OpenAIServingBase(ABC):
|
||||
)
|
||||
return json.dumps({"error": error.model_dump()})
|
||||
|
||||
def extract_customer_labels(self, raw_request):
|
||||
def extract_custom_labels(self, raw_request):
|
||||
if (
|
||||
not self.allowed_custom_labels
|
||||
or not self.tokenizer_manager.server_args.tokenizer_metrics_custom_labels_header
|
||||
):
|
||||
return None
|
||||
|
||||
customer_labels = None
|
||||
custom_labels = None
|
||||
header = (
|
||||
self.tokenizer_manager.server_args.tokenizer_metrics_custom_labels_header
|
||||
)
|
||||
@@ -200,9 +200,9 @@ class OpenAIServingBase(ABC):
|
||||
raw_labels = None
|
||||
|
||||
if isinstance(raw_labels, dict):
|
||||
customer_labels = {
|
||||
custom_labels = {
|
||||
label: value
|
||||
for label, value in raw_labels.items()
|
||||
if label in self.allowed_custom_labels
|
||||
}
|
||||
return customer_labels
|
||||
return custom_labels
|
||||
|
||||
@@ -128,8 +128,8 @@ class OpenAIServingChat(OpenAIServingBase):
|
||||
else:
|
||||
prompt_kwargs = {"input_ids": processed_messages.prompt_ids}
|
||||
|
||||
# Extract customer labels from raw request headers
|
||||
customer_labels = self.extract_customer_labels(raw_request)
|
||||
# Extract custom labels from raw request headers
|
||||
custom_labels = self.extract_custom_labels(raw_request)
|
||||
|
||||
adapted_request = GenerateReqInput(
|
||||
**prompt_kwargs,
|
||||
@@ -151,7 +151,7 @@ class OpenAIServingChat(OpenAIServingBase):
|
||||
rid=request.rid,
|
||||
extra_key=self._compute_extra_key(request),
|
||||
priority=request.priority,
|
||||
customer_labels=customer_labels,
|
||||
custom_labels=custom_labels,
|
||||
)
|
||||
|
||||
return adapted_request, request
|
||||
|
||||
@@ -90,8 +90,8 @@ class OpenAIServingCompletion(OpenAIServingBase):
|
||||
else:
|
||||
prompt_kwargs = {"input_ids": prompt}
|
||||
|
||||
# Extract customer labels from raw request headers
|
||||
customer_labels = self.extract_customer_labels(raw_request)
|
||||
# Extract custom labels from raw request headers
|
||||
custom_labels = self.extract_custom_labels(raw_request)
|
||||
|
||||
adapted_request = GenerateReqInput(
|
||||
**prompt_kwargs,
|
||||
@@ -109,7 +109,7 @@ class OpenAIServingCompletion(OpenAIServingBase):
|
||||
rid=request.rid,
|
||||
extra_key=self._compute_extra_key(request),
|
||||
priority=request.priority,
|
||||
customer_labels=customer_labels,
|
||||
custom_labels=custom_labels,
|
||||
)
|
||||
|
||||
return adapted_request, request
|
||||
|
||||
Reference in New Issue
Block a user