[Router] Refactor protocol definitions: split spec.rs into modular files (#11677)
Co-authored-by: Chang Su <chang.s.su@oracle.com>
This commit is contained in:
@@ -4,10 +4,13 @@ use crate::core::{
|
||||
};
|
||||
use crate::metrics::RouterMetrics;
|
||||
use crate::policies::PolicyRegistry;
|
||||
use crate::protocols::spec::{
|
||||
ChatCompletionRequest, CompletionRequest, EmbeddingRequest, GenerateRequest, GenerationRequest,
|
||||
RerankRequest, RerankResponse, RerankResult, ResponsesGetParams, ResponsesRequest,
|
||||
};
|
||||
use crate::protocols::chat::ChatCompletionRequest;
|
||||
use crate::protocols::common::GenerationRequest;
|
||||
use crate::protocols::completion::CompletionRequest;
|
||||
use crate::protocols::embedding::EmbeddingRequest;
|
||||
use crate::protocols::generate::GenerateRequest;
|
||||
use crate::protocols::rerank::{RerankRequest, RerankResponse, RerankResult};
|
||||
use crate::protocols::responses::{ResponsesGetParams, ResponsesRequest};
|
||||
use crate::routers::header_utils;
|
||||
use crate::routers::RouterTrait;
|
||||
use axum::body::to_bytes;
|
||||
@@ -628,7 +631,7 @@ impl Router {
|
||||
let rerank_results = serde_json::from_slice::<Vec<RerankResult>>(&body_bytes)?;
|
||||
let mut rerank_response =
|
||||
RerankResponse::new(rerank_results, req.model.clone(), req.rid.clone());
|
||||
rerank_response.sort_by_score();
|
||||
// Sorting is handled by Python worker (serving_rerank.py)
|
||||
if let Some(top_k) = req.top_k {
|
||||
rerank_response.apply_top_k(top_k);
|
||||
}
|
||||
@@ -748,9 +751,6 @@ impl RouterTrait for Router {
|
||||
body: &RerankRequest,
|
||||
model_id: Option<&str>,
|
||||
) -> Response {
|
||||
if let Err(e) = body.validate() {
|
||||
return (StatusCode::BAD_REQUEST, e).into_response();
|
||||
}
|
||||
let response = self
|
||||
.route_typed_request(headers, body, "/v1/rerank", model_id)
|
||||
.await;
|
||||
|
||||
Reference in New Issue
Block a user