From dfd229974adc7e5e1a7aee5ed5094f20f514de6a Mon Sep 17 00:00:00 2001 From: async-rustacean Date: Fri, 10 Feb 2023 22:49:02 +0800 Subject: [PATCH 1/3] feat: Create Client with Client::default(); use default parameters --- async-openai/src/client.rs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/async-openai/src/client.rs b/async-openai/src/client.rs index e1a31f27..f4fc97e4 100644 --- a/async-openai/src/client.rs +++ b/async-openai/src/client.rs @@ -14,7 +14,7 @@ use crate::{ Completions, Embeddings, FineTunes, Models, }; -#[derive(Debug, Default, Clone)] +#[derive(Debug, Clone)] /// Client is a container for api key, base url, organization id, and backoff /// configuration used to make API calls. pub struct Client { @@ -29,15 +29,23 @@ pub const API_BASE: &str = "https://api.openai.com/v1"; /// Name for organization header pub const ORGANIZATION_HEADER: &str = "OpenAI-Organization"; -impl Client { - /// Create client with default [API_BASE] url and default API key from OPENAI_API_KEY env var - pub fn new() -> Self { +impl Default for Client { + // Create client with default [API_BASE] url and default API key from OPENAI_API_KEY env var + fn default() -> Self { Self { api_base: API_BASE.to_string(), api_key: std::env::var("OPENAI_API_KEY").unwrap_or_else(|_| "".to_string()), - ..Default::default() + org_id: Default::default(), + backoff: Default::default(), } } +} + +impl Client { + /// Create client with default parameters + pub fn new() -> Self { + Default::default() + } /// To use a different API key different from default OPENAI_API_KEY env var pub fn with_api_key>(mut self, api_key: S) -> Self { From 0b25412745b7ca89f61694bb7b157fd9b1e18cd3 Mon Sep 17 00:00:00 2001 From: ZGY <1786718956@qq.com> Date: Sat, 11 Feb 2023 09:51:59 +0800 Subject: [PATCH 2/3] update docs Co-authored-by: Himanshu Neema --- async-openai/src/client.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/async-openai/src/client.rs b/async-openai/src/client.rs index f4fc97e4..9fd3d72a 100644 --- a/async-openai/src/client.rs +++ b/async-openai/src/client.rs @@ -30,7 +30,7 @@ pub const API_BASE: &str = "https://api.openai.com/v1"; pub const ORGANIZATION_HEADER: &str = "OpenAI-Organization"; impl Default for Client { - // Create client with default [API_BASE] url and default API key from OPENAI_API_KEY env var + /// Create client with default [API_BASE] url and default API key from OPENAI_API_KEY env var fn default() -> Self { Self { api_base: API_BASE.to_string(), From 37a87b9945de883a6789e795c34ef4a3fb9d1ba1 Mon Sep 17 00:00:00 2001 From: ZGY <1786718956@qq.com> Date: Sat, 11 Feb 2023 09:53:03 +0800 Subject: [PATCH 3/3] update docs Co-authored-by: Himanshu Neema --- async-openai/src/client.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/async-openai/src/client.rs b/async-openai/src/client.rs index 9fd3d72a..83270510 100644 --- a/async-openai/src/client.rs +++ b/async-openai/src/client.rs @@ -42,7 +42,7 @@ impl Default for Client { } impl Client { - /// Create client with default parameters + /// Create client with default [API_BASE] url and default API key from OPENAI_API_KEY env var pub fn new() -> Self { Default::default() }