Skip to content

Commit 7d20ac3

Browse files
authored
grab bag of refactoring, cleanup, etc. (#1160)
- rename seedance2pro crate - deprecate methods - remove smtp client - etc.
1 parent f9c1201 commit 7d20ac3

File tree

59 files changed

+56
-66
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+56
-66
lines changed

Cargo.lock

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ members = [
1717
"crates/api_clients/openai_sora_client",
1818
"crates/api_clients/openart_client",
1919
"crates/api_clients/muapi_client",
20-
"crates/api_clients/seedance2pro",
20+
"crates/api_clients/seedance2pro_client",
2121
"crates/api_clients/runwayml_client",
2222
"crates/api_clients/thumbnail_generator",
2323
"crates/api_clients/world_labs_api",
@@ -252,7 +252,7 @@ muapi_client = { path = "crates/api_clients/muapi_client" }
252252
mysql_queries = { path = "crates/schema/database/mysql_queries" }
253253
openai_sora_client = { path = "crates/api_clients/openai_sora_client" }
254254
primitives = { path = "crates/lib/data/primitives" }
255-
seedance2pro = { path = "crates/api_clients/seedance2pro" }
255+
seedance2pro_client = { path = "crates/api_clients/seedance2pro_client" }
256256
shared_service_components = { path = "crates/lib/shared_service_components" }
257257
sqlite_tasks = { path = "crates/schema/database/sqlite_tasks" }
258258
subprocess_common = { path = "crates/lib/subprocess_common" }

crates/api_clients/artcraft/artcraft_router/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ artcraft_api_defs.workspace = true
2020
artcraft_client.workspace = true
2121
fal_client.workspace = true
2222
muapi_client.workspace = true
23-
seedance2pro.workspace = true
23+
seedance2pro_client.workspace = true
2424
tokens.workspace = true
2525
url_utils.workspace = true
2626
world_labs_api.workspace = true

crates/api_clients/artcraft/artcraft_router/src/client/router_seedance2pro_client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use seedance2pro::creds::seedance2pro_session::Seedance2ProSession;
1+
use seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession;
22

33
pub struct RouterSeedance2ProClient {
44
pub(crate) session: Seedance2ProSession,

crates/api_clients/artcraft/artcraft_router/src/errors/provider_error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::fmt::{Display, Formatter};
33
use artcraft_client::error::storyteller_error::StorytellerError;
44
use fal_client::error::fal_error_plus::FalErrorPlus;
55
use muapi_client::error::muapi_error::MuapiError;
6-
use seedance2pro::error::seedance2pro_error::Seedance2ProError;
6+
use seedance2pro_client::error::seedance2pro_error::Seedance2ProError;
77

88
#[derive(Debug)]
99
pub enum ProviderError {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/cost/artcraft/estimate_video_cost_artcraft_seedance2p0.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use artcraft_api_defs::generate::video::multi_function::seedance_2p0_multi_function_video_gen::Seedance2p0BatchCount;
2-
use seedance2pro::creds::seedance2pro_session::Seedance2ProSession;
3-
use seedance2pro::requests::generate_video::generate_video::{BatchCount, GenerateVideoArgs, Resolution};
2+
use seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession;
3+
use seedance2pro_client::requests::generate_video::generate_video::{BatchCount, GenerateVideoArgs, Resolution};
44

55
use crate::generate::generate_video::plan::artcraft::plan_generate_video_artcraft_seedance2p0::PlanArtcraftSeedance2p0;
66
use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/cost/seedance2pro/estimate_video_cost_seedance2pro_seedance2p0.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use seedance2pro::creds::seedance2pro_session::Seedance2ProSession;
2-
use seedance2pro::requests::generate_video::generate_video::{GenerateVideoArgs, Resolution};
1+
use seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession;
2+
use seedance2pro_client::requests::generate_video::generate_video::{GenerateVideoArgs, Resolution};
33

44
use crate::generate::generate_video::plan::seedance2pro::plan_generate_video_seedance2pro_seedance2p0::PlanSeedance2proSeedance2p0;
55
use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/execute/seedance2pro/execute_seedance2pro_seedance2p0.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ use crate::generate::generate_video::generate_video_response::{
66
};
77
use crate::generate::generate_video::plan::seedance2pro::plan_generate_video_seedance2pro_seedance2p0::PlanSeedance2proSeedance2p0;
88
use crate::utils::download_file::download_file;
9-
use seedance2pro::requests::generate_video::generate_video::{
9+
use seedance2pro_client::requests::generate_video::generate_video::{
1010
generate_video, GenerateVideoArgs,
1111
};
12-
use seedance2pro::requests::prepare_file_upload::prepare_file_upload::{
12+
use seedance2pro_client::requests::prepare_file_upload::prepare_file_upload::{
1313
prepare_file_upload, PrepareFileUploadArgs,
1414
};
15-
use seedance2pro::requests::upload_file::upload_file::{
15+
use seedance2pro_client::requests::upload_file::upload_file::{
1616
upload_file, UploadFileArgs,
1717
};
1818
use url_utils::extension::extract_extension_from_url::{
@@ -58,7 +58,7 @@ pub async fn execute_seedance2pro_seedance2p0(
5858

5959
/// Downloads a file from a source URL and re-uploads it to seedance2pro CDN.
6060
async fn upload_to_seedance2pro(
61-
session: &seedance2pro::creds::seedance2pro_session::Seedance2ProSession,
61+
session: &seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession,
6262
source_url: &str,
6363
) -> Result<String, ArtcraftRouterError> {
6464
let extension = extract_extension_from_url_str(source_url, &ExtractExtensions::All)
@@ -85,7 +85,7 @@ async fn upload_to_seedance2pro(
8585
}
8686

8787
async fn upload_optional_url(
88-
session: &seedance2pro::creds::seedance2pro_session::Seedance2ProSession,
88+
session: &seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession,
8989
url: Option<&str>,
9090
) -> Result<Option<String>, ArtcraftRouterError> {
9191
match url {
@@ -95,7 +95,7 @@ async fn upload_optional_url(
9595
}
9696

9797
async fn upload_optional_url_list(
98-
session: &seedance2pro::creds::seedance2pro_session::Seedance2ProSession,
98+
session: &seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession,
9999
urls: Option<&[String]>,
100100
) -> Result<Option<Vec<String>>, ArtcraftRouterError> {
101101
match urls {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/plan/seedance2pro/plan_generate_video_seedance2pro_seedance2p0.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use crate::errors::artcraft_router_error::ArtcraftRouterError;
88
use crate::errors::client_error::ClientError;
99
use crate::generate::generate_video::generate_video_request::GenerateVideoRequest;
1010
use crate::generate::generate_video::video_generation_plan::VideoGenerationPlan;
11-
use seedance2pro::requests::generate_video::generate_video::{BatchCount, Resolution};
11+
use seedance2pro_client::requests::generate_video::generate_video::{BatchCount, Resolution};
1212

1313
#[derive(Debug, Clone)]
1414
pub struct PlanSeedance2proSeedance2p0 {

crates/api_clients/seedance2pro/Cargo.toml renamed to crates/api_clients/seedance2pro_client/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "seedance2pro"
2+
name = "seedance2pro_client"
33
edition = "2024"
44
version = "0.0.1"
55
publish = false
@@ -8,7 +8,7 @@ publish = false
88
normal = ["workspace-build-acceleration"]
99

1010
[lib]
11-
name = "seedance2pro"
11+
name = "seedance2pro_client"
1212
path = "src/lib.rs"
1313

1414
[dependencies]

0 commit comments

Comments
 (0)