Revert "feat: Support logprobs for vLLM models in OpenAI Frontend (#8538)"

This reverts commit d107e48.

Author: yinggeh

python/openai/openai_frontend/engine/triton_engine.py

@@ -57,8 +57,6 @@
     _create_trtllm_generate_request,
     _create_vllm_embedding_request,
     _create_vllm_generate_request,
-    _get_openai_chat_format_logprobs_from_vllm_response,
-    _get_openai_completion_format_logprobs_from_vllm_response,
     _get_output,
     _get_usage_from_response,
     _get_vllm_lora_names,
@@ -68,7 +66,6 @@
 from schemas.openai import (
     ChatCompletionChoice,
     ChatCompletionFinishReason,
-    ChatCompletionLogprobs,
     ChatCompletionMessageToolCall,
     ChatCompletionMessageToolCallChunk,
     ChatCompletionNamedToolChoice,
@@ -258,22 +255,13 @@ async def chat(
             response, metadata.backend, RequestKind.GENERATION
         )
 
-        # Parse logprobs if requested
-        logprobs_data = None
-        if request.logprobs:
-            openai_logprobs = _get_openai_chat_format_logprobs_from_vllm_response(
-                response
-            )
-            if openai_logprobs:
-                logprobs_data = ChatCompletionLogprobs(content=openai_logprobs)
-
         return CreateChatCompletionResponse(
             id=request_id,
             choices=[
                 ChatCompletionChoice(
                     index=0,
                     message=response_message,
-                    logprobs=logprobs_data,
+                    logprobs=None,
                     finish_reason=finish_reason,
                 )
             ],
@@ -372,17 +360,10 @@ async def completion(
             response, metadata.backend, RequestKind.GENERATION
         )
 
-        # Parse logprobs if requested
-        logprobs_data = None
-        if request.logprobs is not None and request.logprobs > 0:
-            logprobs_data = _get_openai_completion_format_logprobs_from_vllm_response(
-                response
-            )
-
         choice = Choice(
             finish_reason=FinishReason.stop,
             index=0,
-            logprobs=logprobs_data,
+            logprobs=None,
             text=text,
         )
         return CreateCompletionResponse(
@@ -624,15 +605,6 @@ async def _streaming_chat_iterator(
             )
             previous_text = current_text
 
-            # Parse logprobs for this chunk if requested
-            chunk_logprobs = None
-            if request.logprobs:
-                openai_logprobs = _get_openai_chat_format_logprobs_from_vllm_response(
-                    response
-                )
-                if openai_logprobs:
-                    chunk_logprobs = ChatCompletionLogprobs(content=openai_logprobs)
-
             # if the response delta is None (e.g. because it was a
             # "control token" for tool calls or the parser otherwise
             # wasn't ready to send a token, then
@@ -646,7 +618,7 @@ async def _streaming_chat_iterator(
             choice = ChatCompletionStreamingResponseChoice(
                 index=0,
                 delta=response_delta,
-                logprobs=chunk_logprobs,
+                logprobs=None,
                 finish_reason=finish_reason,
             )
 
@@ -819,19 +791,8 @@ def _validate_chat_request(
                 f"Received n={request.n}, but only single choice (n=1) is currently supported"
             )
 
-        if request.logit_bias is not None:
-            raise ClientError("logit bias is not currently supported")
-
-        # Logprobs are only supported for vLLM backend currently
-        if metadata.backend != "vllm" and (
-            request.logprobs is not None or request.top_logprobs is not None
-        ):
-            raise ClientError(
-                "logprobs are currently available only for the vLLM backend"
-            )
-
-        if request.top_logprobs is not None and not request.logprobs:
-            raise ClientError("`top_logprobs` can only be used when `logprobs` is True")
+        if request.logit_bias is not None or request.logprobs:
+            raise ClientError("logit bias and log probs not currently supported")
 
         self._verify_chat_tool_call_settings(request=request)
 
@@ -886,32 +847,16 @@ async def _streaming_completion_iterator(
         model = request.model
         include_usage = request.stream_options and request.stream_options.include_usage
         usage_accumulator = _StreamingUsageAccumulator(backend)
-        current_offset = 0
 
         async for response in responses:
             if include_usage:
                 usage_accumulator.update(response)
 
             text = _get_output(response)
-
-            # Parse logprobs for this chunk if requested
-            chunk_logprobs = None
-            if request.logprobs is not None and request.logprobs > 0:
-                chunk_logprobs = (
-                    _get_openai_completion_format_logprobs_from_vllm_response(response)
-                )
-                # Adjust text offsets based on accumulated output
-                if chunk_logprobs and chunk_logprobs.text_offset:
-                    chunk_logprobs.text_offset = [
-                        offset + current_offset for offset in chunk_logprobs.text_offset
-                    ]
-
-            current_offset += len(text)
-
             choice = Choice(
                 finish_reason=FinishReason.stop if response.final else None,
                 index=0,
-                logprobs=chunk_logprobs,
+                logprobs=None,
                 text=text,
             )
             chunk = CreateCompletionResponse(
@@ -997,18 +942,8 @@ def _validate_completion_request(
                 f"Received best_of={request.best_of}, but only single choice (best_of=1) is currently supported"
             )
 
-        if request.logit_bias is not None:
-            raise ClientError("logit bias is not supported")
-
-        # Logprobs are only supported for vLLM backend currently
-        if (
-            request.logprobs is not None
-            and request.logprobs > 0
-            and metadata.backend != "vllm"
-        ):
-            raise ClientError(
-                "logprobs are currently available only for the vLLM backend"
-            )
+        if request.logit_bias is not None or request.logprobs is not None:
+            raise ClientError("logit bias and log probs not supported")
 
         if request.stream_options and not request.stream:
             raise ClientError("`stream_options` can only be used when `stream` is True")