Use OpenAI Config

Author: par4m

src/llm/litellm.rs

@@ -4,16 +4,13 @@ use async_openai::Client as OpenAIClient;
 pub use super::openai::Client;
 
 impl Client {
-    pub async fn new(spec: super::LlmSpec) -> anyhow::Result<Self> {
+    pub async fn new_litellm(spec: super::LlmSpec) -> anyhow::Result<Self> {
         let address = spec.address.clone().unwrap_or_else(|| "http://127.0.0.1:4000".to_string());
         let api_key = std::env::var("LITELLM_API_KEY").ok();
         let mut config = OpenAIConfig::new().with_api_base(address);
         if let Some(api_key) = api_key {
             config = config.with_api_key(api_key);
         }
-        Ok(Self {
-            client: OpenAIClient::with_config(config),
-            model: spec.model,
-        })
+        Ok(Client::from_parts(OpenAIClient::with_config(config), spec.model))
     }
 }

src/llm/mod.rs

@@ -74,7 +74,7 @@ pub async fn new_llm_generation_client(spec: LlmSpec) -> Result<Box<dyn LlmGener
             Box::new(anthropic::Client::new(spec).await?) as Box<dyn LlmGenerationClient>
         }
         LlmApiType::LiteLlm => {
-            Box::new(litellm::Client::new(spec).await?) as Box<dyn LlmGenerationClient>
+            Box::new(litellm::Client::new_litellm(spec).await?) as Box<dyn LlmGenerationClient>
         }
     };
     Ok(client)

src/llm/openai.rs

@@ -20,6 +20,10 @@ pub struct Client {
 }
 
 impl Client {
+    pub(crate) fn from_parts(client: async_openai::Client<OpenAIConfig>, model: String) -> Self {
+        Self { client, model }
+    }
+
     pub async fn new(spec: super::LlmSpec) -> Result<Self> {
         if let Some(address) = spec.address {
             api_bail!("OpenAI doesn't support custom API address: {address}");