Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dependencies #21

Merged
merged 4 commits into from
Jul 20, 2024
Merged

Update dependencies #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a1eff8
Update dependencies
tombailey Jul 20, 2024
44a0529
Merge branch 'main' into feature/updateDependencies
tombailey Jul 20, 2024
4868322
Fix reqwest-retry-after
tombailey Jul 20, 2024
446e439
Remove unused anyhow
tombailey Jul 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
448 changes: 370 additions & 78 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,16 @@ actix-http = "3.3.1"
actix-rt = "2.8.0"
actix-service = "2.0.2"
actix-web = "4"
anyhow = "1.0.75"
async-trait = "0.1.77"
derive_more = "0.99"
env_logger = "0.11.3"
futures = "0.3.29"
isolang = { version = "2.4.0", features = ["english_names", "local_names", "serde"] }
itertools = "0.12.0"
itertools = "0.13"
log = "0.4.21"
reqwest = "0.11.22"
reqwest-middleware = "0.2.4"
reqwest-retry-after = "0.1.1"
reqwest = "0.12"
reqwest-middleware = { version = "0.3", features = ["json"] }
reqwest-retry = "0.6.0"
serde = { version = "1.0.144", features = ["derive"] }
serde-enum-str = "0.4.0"
serde_json = "1"
Expand Down
3 changes: 0 additions & 3 deletions api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,10 @@ openai = { path = "../openai" }
translation = { path = "../translation" }

actix-web = { workspace = true }
anyhow = { workspace = true }
async-trait = { workspace = true }
env_logger = { workspace = true }
itertools = { workspace = true }
log = { workspace = true }
reqwest = { workspace = true }
reqwest-retry-after = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
thiserror = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion claude/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2021"
async-trait = { workspace = true }
reqwest = { workspace = true }
reqwest-middleware = { workspace = true }
reqwest-retry-after = { workspace = true }
reqwest-retry = { workspace = true }
serde = { workspace = true }
serde-enum-str = { workspace = true }
serde_json = { workspace = true }
Expand Down
6 changes: 4 additions & 2 deletions claude/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
use crate::error::ClaudeError;
use crate::model::ClaudeModel;
use reqwest::StatusCode;
use reqwest_retry_after::RetryAfterMiddleware;
use reqwest_retry::policies::ExponentialBackoff;
use reqwest_retry::RetryTransientMiddleware;
use serde::{Deserialize, Serialize};
use serde_json::json;
use tokio::sync::Semaphore;
Expand Down Expand Up @@ -37,8 +38,9 @@ impl ClaudeClient {
.default_headers(default_headers)
.build()?;

let retry_policy = ExponentialBackoff::builder().build_with_max_retries(3);
let client_with_middleware = reqwest_middleware::ClientBuilder::new(client)
.with(RetryAfterMiddleware::new())
.with(RetryTransientMiddleware::new_with_policy(retry_policy))
.build();

Ok(ClaudeClient {
Expand Down
2 changes: 1 addition & 1 deletion deepl/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ futures = { workspace = true }
itertools = { workspace = true }
reqwest = { workspace = true }
reqwest-middleware = { workspace = true }
reqwest-retry-after = { workspace = true }
reqwest-retry = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
thiserror = { workspace = true }
Expand Down
6 changes: 4 additions & 2 deletions deepl/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ use crate::error::DeepLError;
use futures::future::join_all;
use itertools::Itertools;
use reqwest::StatusCode;
use reqwest_retry_after::RetryAfterMiddleware;
use reqwest_retry::policies::ExponentialBackoff;
use reqwest_retry::RetryTransientMiddleware;
use serde::{Deserialize, Serialize};
use tokio::sync::Semaphore;

Expand Down Expand Up @@ -35,8 +36,9 @@ impl DeepLClient {
.default_headers(default_headers)
.build()?;

let retry_policy = ExponentialBackoff::builder().build_with_max_retries(3);
let client_with_middleware = reqwest_middleware::ClientBuilder::new(client)
.with(RetryAfterMiddleware::new())
.with(RetryTransientMiddleware::new_with_policy(retry_policy))
.build();

Ok(DeepLClient {
Expand Down
2 changes: 1 addition & 1 deletion openai/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = "2021"
async-trait = { workspace = true }
reqwest = { workspace = true }
reqwest-middleware = { workspace = true }
reqwest-retry-after = { workspace = true }
reqwest-retry = { workspace = true }
serde = { workspace = true }
serde-enum-str = { workspace = true }
serde_json = { workspace = true }
Expand Down
6 changes: 4 additions & 2 deletions openai/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
use crate::error::OpenAIError;
use crate::model::OpenAIModel;
use reqwest::StatusCode;
use reqwest_retry_after::RetryAfterMiddleware;
use reqwest_retry::policies::ExponentialBackoff;
use reqwest_retry::RetryTransientMiddleware;
use serde::{Deserialize, Serialize};
use serde_json::json;
use tokio::sync::Semaphore;
Expand Down Expand Up @@ -32,8 +33,9 @@ impl OpenAIClient {
.default_headers(default_headers)
.build()?;

let retry_policy = ExponentialBackoff::builder().build_with_max_retries(3);
let client_with_middleware = reqwest_middleware::ClientBuilder::new(client)
.with(RetryAfterMiddleware::new())
.with(RetryTransientMiddleware::new_with_policy(retry_policy))
.build();

Ok(OpenAIClient {
Expand Down
Loading