diff --git a/router/src/lib.rs b/router/src/lib.rs index b4bb6784..d7cfa4c7 100644 --- a/router/src/lib.rs +++ b/router/src/lib.rs @@ -87,7 +87,7 @@ pub(crate) struct GenerateRequest { } #[derive(Clone, Debug, Deserialize, ToSchema)] -pub(crate) struct LegacyGenerateRequest { +pub(crate) struct CompatGenerateRequest { #[schema(example = "My name is Olivier and I")] pub inputs: String, #[serde(default = "default_parameters")] @@ -97,8 +97,8 @@ pub(crate) struct LegacyGenerateRequest { pub stream: bool, } -impl From for GenerateRequest { - fn from(req: LegacyGenerateRequest) -> Self { +impl From for GenerateRequest { + fn from(req: CompatGenerateRequest) -> Self { Self { inputs: req.inputs, parameters: req.parameters, diff --git a/router/src/server.rs b/router/src/server.rs index ee11a1ec..83b0297e 100644 --- a/router/src/server.rs +++ b/router/src/server.rs @@ -1,8 +1,9 @@ /// HTTP Server logic use crate::infer::{InferError, InferStreamResponse}; use crate::{ - Details, ErrorResponse, FinishReason, GenerateParameters, GenerateRequest, GenerateResponse, - Infer, LegacyGenerateRequest, PrefillToken, StreamDetails, StreamResponse, Token, Validation, + CompatGenerateRequest, Details, ErrorResponse, FinishReason, GenerateParameters, + GenerateRequest, GenerateResponse, Infer, PrefillToken, StreamDetails, StreamResponse, Token, + Validation, }; use axum::extract::Extension; use axum::http::{HeaderMap, Method, StatusCode}; @@ -27,9 +28,9 @@ use utoipa_swagger_ui::SwaggerUi; /// Compatibility route with api-inference and AzureML #[instrument(skip(infer))] -async fn legacy_generate( +async fn compat_generate( infer: Extension, - req: Json, + req: Json, ) -> Result)> { // switch on stream let req = req.0; @@ -423,7 +424,7 @@ pub async fn run( // Create router let app = Router::new() .merge(SwaggerUi::new("/docs").url("/api-doc/openapi.json", ApiDoc::openapi())) - .route("/", post(legacy_generate)) + .route("/", post(compat_generate)) .route("/generate", post(generate)) .route("/generate_stream", post(generate_stream)) .route("/", get(health))