huggingface/text-generation-inference
5
0
Fork 0
mirror of https://github.com/huggingface/text-generation-inference.git synced 2025-09-09 19:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

use compat instead of legacy

Browse Source
This commit is contained in:
OlivierDehaene 2023-02-27 14:13:39 +01:00
parent ca955b810e
commit 91b3a2e2b5
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
router/src/lib.rs
View File

@ -87,7 +87,7 @@ pub(crate) struct GenerateRequest {
} }
#[derive(Clone, Debug, Deserialize, ToSchema)] #[derive(Clone, Debug, Deserialize, ToSchema)]
pub(crate) struct LegacyGenerateRequest { pub(crate) struct CompatGenerateRequest {
#[schema(example = "My name is Olivier and I")] #[schema(example = "My name is Olivier and I")]
pub inputs: String, pub inputs: String,
#[serde(default = "default_parameters")] #[serde(default = "default_parameters")]
@ -97,8 +97,8 @@ pub(crate) struct LegacyGenerateRequest {
pub stream: bool, pub stream: bool,
} }
impl From<LegacyGenerateRequest> for GenerateRequest { impl From<CompatGenerateRequest> for GenerateRequest {
fn from(req: LegacyGenerateRequest) -> Self { fn from(req: CompatGenerateRequest) -> Self {
Self { Self {
inputs: req.inputs, inputs: req.inputs,
parameters: req.parameters, parameters: req.parameters,

11
router/src/server.rs
View File

@ -1,8 +1,9 @@
/// HTTP Server logic /// HTTP Server logic
use crate::infer::{InferError, InferStreamResponse}; use crate::infer::{InferError, InferStreamResponse};
use crate::{ use crate::{
Details, ErrorResponse, FinishReason, GenerateParameters, GenerateRequest, GenerateResponse, CompatGenerateRequest, Details, ErrorResponse, FinishReason, GenerateParameters,
Infer, LegacyGenerateRequest, PrefillToken, StreamDetails, StreamResponse, Token, Validation, GenerateRequest, GenerateResponse, Infer, PrefillToken, StreamDetails, StreamResponse, Token,
Validation,
}; };
use axum::extract::Extension; use axum::extract::Extension;
use axum::http::{HeaderMap, Method, StatusCode}; use axum::http::{HeaderMap, Method, StatusCode};
@ -27,9 +28,9 @@ use utoipa_swagger_ui::SwaggerUi;
/// Compatibility route with api-inference and AzureML /// Compatibility route with api-inference and AzureML
#[instrument(skip(infer))] #[instrument(skip(infer))]
async fn legacy_generate( async fn compat_generate(
infer: Extension<Infer>, infer: Extension<Infer>,
req: Json<LegacyGenerateRequest>, req: Json<CompatGenerateRequest>,
) -> Result<impl IntoResponse, (StatusCode, Json<ErrorResponse>)> { ) -> Result<impl IntoResponse, (StatusCode, Json<ErrorResponse>)> {
// switch on stream // switch on stream
let req = req.0; let req = req.0;
@ -423,7 +424,7 @@ pub async fn run(
// Create router // Create router
let app = Router::new() let app = Router::new()
.merge(SwaggerUi::new("/docs").url("/api-doc/openapi.json", ApiDoc::openapi())) .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", post(generate))
.route("/generate_stream", post(generate_stream)) .route("/generate_stream", post(generate_stream))
.route("/", get(health)) .route("/", get(health))