From 2ab2e23bb0539a7fac0d990e3d7e08b7fade1030 Mon Sep 17 00:00:00 2001 From: sigoden Date: Sat, 28 Oct 2023 22:10:17 +0800 Subject: refactor: improve environment variables (#163) Rename `AICHAT_API_KEY` to `OPENAI_API_KEY` Add `LOCALAI_API_KEY` --- src/client/openai.rs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/client/openai.rs') diff --git a/src/client/openai.rs b/src/client/openai.rs index 8ad3bab..885a02d 100644 --- a/src/client/openai.rs +++ b/src/client/openai.rs @@ -1,14 +1,14 @@ -use super::{Client, ModelInfo}; +use super::{set_proxy, Client, ModelInfo}; +use crate::config::SharedConfig; use crate::repl::ReplyStreamHandler; -use crate::{config::SharedConfig, utils::get_env_name}; use anyhow::{anyhow, bail, Context, Result}; use async_trait::async_trait; use eventsource_stream::Eventsource; use futures_util::StreamExt; use inquire::{Confirm, Text}; -use reqwest::{Client as ReqwestClient, Proxy, RequestBuilder}; +use reqwest::{Client as ReqwestClient, RequestBuilder}; use serde::Deserialize; use serde_json::{json, Value}; use std::env; @@ -120,7 +120,7 @@ impl OpenAIClient { fn request_builder(&self, content: &str, stream: bool) -> Result { let api_key = if let Some(api_key) = &self.local_config.api_key { api_key.to_string() - } else if let Ok(api_key) = env::var(get_env_name("api_key")) { + } else if let Ok(api_key) = env::var("OPENAI_API_KEY") { api_key.to_string() } else { bail!("Miss api_key") @@ -145,10 +145,7 @@ impl OpenAIClient { let client = { let mut builder = ReqwestClient::builder(); - if let Some(proxy) = &self.local_config.proxy { - builder = builder - .proxy(Proxy::all(proxy).with_context(|| format!("Invalid proxy `{proxy}`"))?); - } + builder = set_proxy(builder, &self.local_config.proxy)?; let timeout = Duration::from_secs(self.local_config.connect_timeout.unwrap_or(10)); builder .connect_timeout(timeout) -- cgit v1.2.3