Allow typical_p = 1.0

This value has no effect so allowing it means more possibility for misunderstanding imo, but this makes it consistent with top_p. It would be a breaking change to prohibit top_p from being 1.0.

Author: njhill

router/src/grpc_server.rs

@@ -423,15 +423,16 @@ fn convert_params(params: Option<Parameters>) -> Result<GenerateParameters, Vali
                     gp.temperature = s.temperature;
                     gp.top_k = s.top_k as i32;
                     if s.top_p != 0.0 { gp.top_p = s.top_p }
-                    gp.typical_p = s.typical_p;
+                    if s.typical_p != 0.0 { gp.typical_p = s.typical_p }
                     gp.seed = s.seed;
                 }
                 if gp.temperature == 0.0 {
                     gp.temperature = 1.0; // sampling and temp 0 => disabled i.e. temp 1
                 }
             } else if STRICT_PARAMETER_VALIDATION {
                 if let Some(s) = p.sampling {
-                    if s.temperature != 0.0 || s.top_p != 0.0 || s.top_k != 0 || s.seed.is_some() {
+                    if s.temperature != 0.0 || s.top_p != 0.0 || s.typical_p != 0.0
+                        || s.top_k != 0 || s.seed.is_some() {
                         return Err(ValidationError::SampleParametersGreedy)
                     }
                 }

router/src/validation.rs

@@ -184,7 +184,7 @@ fn validate(
     if params.top_p <= 0.0 || params.top_p > 1.0 {
         return Err(ValidationError::TopP);
     }
-    if params.typical_p >= 1.0 {
+    if params.typical_p > 1.0 {
         return Err(ValidationError::TypicalP);
     }
     if params.top_k < 0 {
@@ -320,7 +320,7 @@ pub enum ValidationError {
     TopP,
     #[error("top_k must be strictly positive")]
     TopK,
-    #[error("typical_p must be < 1.0")]
+    #[error("typical_p must be <= 1.0")]
     TypicalP,
     #[error("repetition_penalty must be > 0.0")]
     RepetitionPenalty,