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
4 changes: 2 additions & 2 deletions internal/proxy/connector_lmcache.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ func (s *Server) runLMCacheProtocol(w http.ResponseWriter, r *http.Request, pref
ctx := r.Context()
preq := r.Clone(ctx)

completionRequest["max_tokens"] = 1
completionRequest["max_completion_tokens"] = 1
completionRequest[requestFieldMaxTokens] = 1
completionRequest[requestFieldMaxCompletionTokens] = 1

pbody, err := json.Marshal(completionRequest)
if err != nil {
Expand Down
6 changes: 6 additions & 0 deletions internal/proxy/connector_nixlv2.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ func (s *Server) runNIXLProtocolV2(w http.ResponseWriter, r *http.Request, prefi
streamValue, streamOk := completionRequest[requestFieldStream]
streamOptionsValue, streamOptionsOk := completionRequest[requestFieldStreamOptions]
maxTokensValue, maxTokensOk := completionRequest[requestFieldMaxTokens]
maxCompletionTokensValue, maxCompletionTokensOk := completionRequest[requestFieldMaxCompletionTokens]

completionRequest[requestFieldKVTransferParams] = map[string]any{
requestFieldDoRemoteDecode: true,
Expand All @@ -80,6 +81,7 @@ func (s *Server) runNIXLProtocolV2(w http.ResponseWriter, r *http.Request, prefi
completionRequest[requestFieldStream] = false
delete(completionRequest, requestFieldStreamOptions)
completionRequest[requestFieldMaxTokens] = 1
completionRequest[requestFieldMaxCompletionTokens] = 1

pbody, err := json.Marshal(completionRequest)
if err != nil {
Expand Down Expand Up @@ -146,6 +148,10 @@ func (s *Server) runNIXLProtocolV2(w http.ResponseWriter, r *http.Request, prefi
if maxTokensOk {
completionRequest[requestFieldMaxTokens] = maxTokensValue
}
delete(completionRequest, requestFieldMaxCompletionTokens)
if maxCompletionTokensOk {
completionRequest[requestFieldMaxCompletionTokens] = maxCompletionTokensValue
}
completionRequest[requestFieldKVTransferParams] = pKVTransferParams

dbody, err := json.Marshal(completionRequest)
Expand Down
21 changes: 11 additions & 10 deletions internal/proxy/proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,17 @@ const (
requestHeaderPrefillHostPort = "x-prefiller-host-port"
requestHeaderRequestID = "x-request-id"

requestFieldKVTransferParams = "kv_transfer_params"
requestFieldMaxTokens = "max_tokens"
requestFieldDoRemotePrefill = "do_remote_prefill"
requestFieldDoRemoteDecode = "do_remote_decode"
requestFieldRemoteBlockIDs = "remote_block_ids"
requestFieldRemoteEngineID = "remote_engine_id"
requestFieldRemoteHost = "remote_host"
requestFieldRemotePort = "remote_port"
requestFieldStream = "stream"
requestFieldStreamOptions = "stream_options"
requestFieldKVTransferParams = "kv_transfer_params"
requestFieldMaxTokens = "max_tokens"
requestFieldMaxCompletionTokens = "max_completion_tokens"
requestFieldDoRemotePrefill = "do_remote_prefill"
requestFieldDoRemoteDecode = "do_remote_decode"
requestFieldRemoteBlockIDs = "remote_block_ids"
requestFieldRemoteEngineID = "remote_engine_id"
requestFieldRemoteHost = "remote_host"
requestFieldRemotePort = "remote_port"
requestFieldStream = "stream"
requestFieldStreamOptions = "stream_options"

// ConnectorNIXLV1 enables the (now deprecated) P/D NIXL v1 protocol
ConnectorNIXLV1 = "nixl"
Expand Down