support left truncate

This commit is contained in:
OlivierDehaene 2023-03-09 11:09:36 +01:00
parent a376d8bc59
commit d405880504
2 changed files with 67 additions and 45 deletions

View File

@ -63,7 +63,7 @@ pub(crate) struct GenerateParameters {
pub stop: Vec<String>, pub stop: Vec<String>,
#[serde(default)] #[serde(default)]
#[schema(default = "null", example = "null")] #[schema(default = "null", example = "null")]
pub truncate: Option<i32>, pub truncate: Option<usize>,
#[serde(default)] #[serde(default)]
#[schema(default = "false", example = true)] #[schema(default = "false", example = true)]
pub watermark: bool, pub watermark: bool,

View File

@ -6,6 +6,7 @@ use rand::Rng;
use text_generation_client::{NextTokenChooserParameters, StoppingCriteriaParameters}; use text_generation_client::{NextTokenChooserParameters, StoppingCriteriaParameters};
use thiserror::Error; use thiserror::Error;
use tokenizers::tokenizer::Tokenizer; use tokenizers::tokenizer::Tokenizer;
use tokenizers::TruncationDirection;
use tokio::sync::{mpsc, oneshot}; use tokio::sync::{mpsc, oneshot};
use tracing::{instrument, Span}; use tracing::{instrument, Span};
@ -157,6 +158,7 @@ fn validate(
do_sample, do_sample,
max_new_tokens, max_new_tokens,
stop: stop_sequences, stop: stop_sequences,
truncate,
seed, seed,
watermark, watermark,
.. ..
@ -223,23 +225,45 @@ fn validate(
return Err(EmptyInput); return Err(EmptyInput);
} }
// Get the number of tokens in the input // Check if truncate is strictly positive and less than max_input_length
match tokenizer.encode(request.inputs.clone(), true) { let truncate = truncate
Ok(mut encoding) => { .map(|value| {
encoding.truncate() if value == 0 || value > max_input_length {
return Err(ValidationError::Truncate(max_input_length, value));
}
Ok(Some(value))
})
.unwrap_or(Ok(None))?;
let input_length = encoding.len(); // Get the number of tokens in the input
let total_tokens = input_length + max_new_tokens as usize; let mut encoding = tokenizer
.encode(request.inputs.clone(), true)
.map_err(|err| ValidationError::Tokenizer(err.to_string()))?;
let (inputs, input_length) = if let Some(truncate) = truncate {
// truncate encoding and decode new inputs
encoding.truncate(truncate, 0, TruncationDirection::Left);
let inputs = tokenizer
.decode(Vec::from(encoding.get_ids()), false)
.map_err(|err| ValidationError::Tokenizer(err.to_string()))?;
(inputs, encoding.len())
} else {
(request.inputs, encoding.len())
};
if input_length > max_input_length { if input_length > max_input_length {
Err(ValidationError::InputLength(max_input_length, input_length)) return Err(ValidationError::InputLength(max_input_length, input_length));
} else if total_tokens > max_total_tokens { }
Err(ValidationError::MaxTotalTokens(
let total_tokens = input_length + max_new_tokens as usize;
if total_tokens > max_total_tokens {
return Err(ValidationError::MaxTotalTokens(
max_total_tokens, max_total_tokens,
input_length, input_length,
max_new_tokens, max_new_tokens,
)) ));
} else { }
// Return ValidGenerateRequest // Return ValidGenerateRequest
let parameters = NextTokenChooserParameters { let parameters = NextTokenChooserParameters {
temperature, temperature,
@ -260,16 +284,12 @@ fn validate(
metrics::histogram!("tgi_request_max_new_tokens", max_new_tokens as f64); metrics::histogram!("tgi_request_max_new_tokens", max_new_tokens as f64);
Ok(ValidGenerateRequest { Ok(ValidGenerateRequest {
inputs: request.inputs, inputs,
input_length: input_length as u32, input_length: input_length as u32,
parameters, parameters,
stopping_parameters, stopping_parameters,
}) })
} }
}
Err(err) => Err(ValidationError::Tokenizer(err.to_string())),
}
}
type ValidationRequest = ( type ValidationRequest = (
GenerateRequest, GenerateRequest,
@ -295,6 +315,8 @@ pub enum ValidationError {
TopP, TopP,
#[error("`top_k` must be strictly positive")] #[error("`top_k` must be strictly positive")]
TopK, TopK,
#[error("`truncate` must be strictly positive and less than {0}. Given: {1}")]
Truncate(usize, usize),
#[error("`typical_p` must be > 0.0 and < 1.0")] #[error("`typical_p` must be > 0.0 and < 1.0")]
TypicalP, TypicalP,
#[error("`max_new_tokens` must be strictly positive")] #[error("`max_new_tokens` must be strictly positive")]