feat: Integrate TimeoutsConfig into LLM provider HTTP clients and refactor OpenRouter error handling.

vinhnx · vinhnx · commit 1c66819f371b · 2025-12-25T14:37:44.000+07:00
diff --git a/vtcode-core/src/llm/providers/anthropic.rs b/vtcode-core/src/llm/providers/anthropic.rs
@@ -45,19 +45,27 @@ impl AnthropicProvider {
             None,
             None,
             AnthropicConfig::default(),
+            TimeoutsConfig::default(),
         )
     }
 
     pub fn with_model(api_key: String, model: String) -> Self {
-        Self::with_model_internal(api_key, model, None, None, AnthropicConfig::default())
+        Self::with_model_internal(
+            api_key,
+            model,
+            None,
+            None,
+            AnthropicConfig::default(),
+            TimeoutsConfig::default(),
+        )
     }
 
     pub fn from_config(
         api_key: Option<String>,
         model: Option<String>,
         base_url: Option<String>,
         prompt_cache: Option<PromptCachingConfig>,
-        _timeouts: Option<TimeoutsConfig>,
+        timeouts: Option<TimeoutsConfig>,
         anthropic_config: Option<AnthropicConfig>,
     ) -> Self {
         let api_key_value = api_key.unwrap_or_default();
@@ -70,6 +78,7 @@ impl AnthropicProvider {
             prompt_cache,
             base_url,
             anthropic_cfg,
+            timeouts.unwrap_or_default(),
         )
     }
 
@@ -79,6 +88,7 @@ impl AnthropicProvider {
         prompt_cache: Option<PromptCachingConfig>,
         base_url: Option<String>,
         anthropic_config: AnthropicConfig,
+        timeouts: TimeoutsConfig,
     ) -> Self {
         use crate::llm::http_client::HttpClientFactory;
         
@@ -100,7 +110,7 @@ impl AnthropicProvider {
 
         Self {
             api_key,
-            http_client: HttpClientFactory::default_client(),
+            http_client: HttpClientFactory::for_llm(&timeouts),
             base_url: base_url_value,
             model,
             prompt_cache_enabled,
diff --git a/vtcode-core/src/llm/providers/deepseek.rs b/vtcode-core/src/llm/providers/deepseek.rs
@@ -40,32 +40,40 @@ impl DeepSeekProvider {
             models::deepseek::DEFAULT_MODEL.to_string(),
             None,
             None,
+            TimeoutsConfig::default(),
         )
     }
 
     pub fn with_model(api_key: String, model: String) -> Self {
-        Self::with_model_internal(api_key, model, None, None)
+        Self::with_model_internal(api_key, model, None, None, TimeoutsConfig::default())
     }
 
     pub fn from_config(
         api_key: Option<String>,
         model: Option<String>,
         base_url: Option<String>,
         prompt_cache: Option<PromptCachingConfig>,
-        _timeouts: Option<TimeoutsConfig>,
+        timeouts: Option<TimeoutsConfig>,
         _anthropic: Option<AnthropicConfig>,
     ) -> Self {
         let api_key_value = api_key.unwrap_or_default();
         let model_value = resolve_model(model, models::deepseek::DEFAULT_MODEL);
 
-        Self::with_model_internal(api_key_value, model_value, prompt_cache, base_url)
+        Self::with_model_internal(
+            api_key_value,
+            model_value,
+            prompt_cache,
+            base_url,
+            timeouts.unwrap_or_default(),
+        )
     }
 
     fn with_model_internal(
         api_key: String,
         model: String,
         prompt_cache: Option<PromptCachingConfig>,
         base_url: Option<String>,
+        timeouts: TimeoutsConfig,
     ) -> Self {
         use crate::llm::http_client::HttpClientFactory;
         
@@ -77,7 +85,7 @@ impl DeepSeekProvider {
 
         Self {
             api_key,
-            http_client: HttpClientFactory::default_client(),
+            http_client: HttpClientFactory::for_llm(&timeouts),
             base_url: override_base_url(
                 urls::DEEPSEEK_API_BASE,
                 base_url,
diff --git a/vtcode-core/src/llm/providers/gemini.rs b/vtcode-core/src/llm/providers/gemini.rs
@@ -122,7 +122,7 @@ impl GeminiProvider {
 
         Self {
             api_key: Arc::from(api_key.as_str()),
-            http_client: HttpClientFactory::default_client(),
+            http_client: HttpClientFactory::for_llm(&timeouts),
             base_url: Arc::from(
                 override_base_url(
                     urls::GEMINI_API_BASE,
diff --git a/vtcode-core/src/llm/providers/openrouter.rs b/vtcode-core/src/llm/providers/openrouter.rs
@@ -659,33 +659,43 @@ impl OpenRouterProvider {
             models::openrouter::DEFAULT_MODEL.to_string(),
             None,
             None,
+            TimeoutsConfig::default(),
         )
     }
 
     pub fn with_model(api_key: String, model: String) -> Self {
-        Self::with_model_internal(api_key, model, None, None)
+        Self::with_model_internal(api_key, model, None, None, TimeoutsConfig::default())
     }
 
     pub fn from_config(
         api_key: Option<String>,
         model: Option<String>,
         base_url: Option<String>,
         prompt_cache: Option<PromptCachingConfig>,
-        _timeouts: Option<TimeoutsConfig>,
+        timeouts: Option<TimeoutsConfig>,
         _anthropic: Option<AnthropicConfig>,
     ) -> Self {
         let api_key_value = api_key.unwrap_or_default();
         let model_value = resolve_model(model, models::openrouter::DEFAULT_MODEL);
 
-        Self::with_model_internal(api_key_value, model_value, prompt_cache, base_url)
+        Self::with_model_internal(
+            api_key_value,
+            model_value,
+            prompt_cache,
+            base_url,
+            timeouts.unwrap_or_default(),
+        )
     }
 
     fn with_model_internal(
         api_key: String,
         model: String,
         prompt_cache: Option<PromptCachingConfig>,
         base_url: Option<String>,
+        timeouts: TimeoutsConfig,
     ) -> Self {
+        use crate::llm::http_client::HttpClientFactory;
+        
         let (prompt_cache_enabled, prompt_cache_settings) = extract_prompt_cache_settings(
             prompt_cache,
             |providers| &providers.openrouter,
@@ -694,7 +704,7 @@ impl OpenRouterProvider {
 
         Self {
             api_key,
-            http_client: HttpClient::new(),
+            http_client: HttpClientFactory::for_llm(&timeouts),
             base_url: override_base_url(
                 urls::OPENROUTER_API_BASE,
                 base_url,
@@ -886,14 +896,9 @@ impl OpenRouterProvider {
             });
         }
 
-        let formatted_error = error_display::format_llm_error(
-            "OpenRouter",
-            &format!("HTTP {}: {}", status, error_text),
-        );
-        Err(LLMError::Provider {
-            message: formatted_error,
-            metadata: None,
-        })
+        // Use unified error parsing for consistent error categorization
+        use super::error_handling::parse_api_error;
+        Err(parse_api_error("OpenRouter", status, &error_text))
     }
 
     fn parse_chat_request(&self, value: &Value) -> Option<LLMRequest> {
diff --git a/vtcode-core/src/llm/providers/zai.rs b/vtcode-core/src/llm/providers/zai.rs
@@ -49,12 +49,13 @@ impl ZAIProvider {
         model: String,
         base_url: Option<String>,
         _prompt_cache: Option<PromptCachingConfig>,
+        timeouts: TimeoutsConfig,
     ) -> Self {
         use crate::llm::http_client::HttpClientFactory;
         
         Self {
             api_key,
-            http_client: HttpClientFactory::default_client(),
+            http_client: HttpClientFactory::for_llm(&timeouts),
             base_url: override_base_url(
                 urls::Z_AI_API_BASE,
                 base_url,
@@ -66,24 +67,36 @@ impl ZAIProvider {
     }
 
     pub fn new(api_key: String) -> Self {
-        Self::with_model_internal(api_key, models::zai::DEFAULT_MODEL.to_string(), None, None)
+        Self::with_model_internal(
+            api_key,
+            models::zai::DEFAULT_MODEL.to_string(),
+            None,
+            None,
+            TimeoutsConfig::default(),
+        )
     }
 
     pub fn with_model(api_key: String, model: String) -> Self {
-        Self::with_model_internal(api_key, model, None, None)
+        Self::with_model_internal(api_key, model, None, None, TimeoutsConfig::default())
     }
 
     pub fn from_config(
         api_key: Option<String>,
         model: Option<String>,
         base_url: Option<String>,
         prompt_cache: Option<PromptCachingConfig>,
-        _timeouts: Option<TimeoutsConfig>,
+        timeouts: Option<TimeoutsConfig>,
         _anthropic: Option<AnthropicConfig>,
     ) -> Self {
         let api_key_value = api_key.unwrap_or_default();
         let model_value = resolve_model(model, models::zai::DEFAULT_MODEL);
-        Self::with_model_internal(api_key_value, model_value, base_url, prompt_cache)
+        Self::with_model_internal(
+            api_key_value,
+            model_value,
+            base_url,
+            prompt_cache,
+            timeouts.unwrap_or_default(),
+        )
     }
 
     fn parse_client_prompt(&self, prompt: &str) -> LLMRequest {
