summaryrefslogtreecommitdiffstats
path: root/src/client.rs
diff options
context:
space:
mode:
authorsigoden <sigoden@gmail.com>2023-03-11 21:45:34 +0800
committerGitHub <noreply@github.com>2023-03-11 21:45:34 +0800
commit4aab872ee1033df31827a35a1af2ee9f1ec2e2e7 (patch)
tree3e8f8dae818103fc551589d22b15c68068498921 /src/client.rs
parentcfb6ce6958751da5e13683ea07f42a5dbc4eae01 (diff)
downloadaichat-4aab872ee1033df31827a35a1af2ee9f1ec2e2e7.tar.gz
feat: add support for NO_COLOR (#67)
Diffstat (limited to 'src/client.rs')
-rw-r--r--src/client.rs16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/client.rs b/src/client.rs
index 29dc592..7fc2824 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -69,8 +69,8 @@ impl ChatGptClient {
}
async fn send_message_inner(&self, content: &str) -> Result<String> {
- if self.config.lock().dry_run {
- return Ok(self.config.lock().echo_messages(content));
+ if self.config.read().dry_run {
+ return Ok(self.config.read().echo_messages(content));
}
let builder = self.request_builder(content, false)?;
let data: Value = builder.send().await?.json().await?;
@@ -90,8 +90,8 @@ impl ChatGptClient {
content: &str,
handler: &mut ReplyStreamHandler,
) -> Result<()> {
- if self.config.lock().dry_run {
- handler.text(&self.config.lock().echo_messages(content))?;
+ if self.config.read().dry_run {
+ handler.text(&self.config.read().echo_messages(content))?;
return Ok(());
}
let builder = self.request_builder(content, true)?;
@@ -125,7 +125,7 @@ impl ChatGptClient {
fn build_client(&self) -> Result<Client> {
let mut builder = Client::builder();
- if let Some(proxy) = self.config.lock().proxy.as_ref() {
+ if let Some(proxy) = self.config.read().proxy.as_ref() {
builder = builder.proxy(Proxy::all(proxy).with_context(|| "Invalid config.proxy")?);
}
let client = builder
@@ -136,13 +136,13 @@ impl ChatGptClient {
}
fn request_builder(&self, content: &str, stream: bool) -> Result<RequestBuilder> {
- let messages = self.config.lock().build_messages(content)?;
+ let messages = self.config.read().build_messages(content)?;
let mut body = json!({
"model": MODEL,
"messages": messages,
});
- if let Some(v) = self.config.lock().get_temperature() {
+ if let Some(v) = self.config.read().get_temperature() {
body.as_object_mut()
.and_then(|m| m.insert("temperature".into(), json!(v)));
}
@@ -155,7 +155,7 @@ impl ChatGptClient {
let builder = self
.build_client()?
.post(API_URL)
- .bearer_auth(self.config.lock().get_api_key())
+ .bearer_auth(self.config.read().get_api_key())
.json(&body);
Ok(builder)