chore: use serde default for rate limit

TabbyML · Nov 25, 2024 · 3d90296 · 3d90296
1 parent 76ca9d6
commit 3d90296
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/crates/http-api-bindings/src/embedding/mod.rs b/crates/http-api-bindings/src/embedding/mod.rs
@@ -8,16 +8,13 @@ use std::sync::Arc;
 
 use llama::LlamaCppEngine;
 use rate_limit::RateLimitedEmbedding;
-use tabby_common::config::{HttpModelConfig, RateLimit};
+use tabby_common::config::HttpModelConfig;
 use tabby_inference::Embedding;
 
 use self::{openai::OpenAIEmbeddingEngine, voyage::VoyageEmbeddingEngine};
 
 pub async fn create(config: &HttpModelConfig) -> Arc<dyn Embedding> {
-    let rpm = config.rate_limit.as_ref().map_or_else(
-        || RateLimit::default().request_per_minute,
-        |rl| rl.request_per_minute,
-    );
+    let rpm = config.rate_limit.request_per_minute;
 
     let embedding: Arc<dyn Embedding> = match config.kind.as_str() {
         "llama.cpp/embedding" => {

diff --git a/crates/tabby-common/src/config.rs b/crates/tabby-common/src/config.rs
@@ -290,7 +290,8 @@ pub struct HttpModelConfig {
     pub api_key: Option<String>,
 
     #[builder(default)]
-    pub rate_limit: Option<RateLimit>,
+    #[serde(default)]
+    pub rate_limit: RateLimit,
 
     /// Used by OpenAI style API for model name.
     #[builder(default)]