From 4fd69c243935104caeb9aa8f20b78d47f05a43fe Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 23 Apr 2025 10:41:45 -0400 Subject: [PATCH] refactor sora client packages so we can make a "recipes" auto-refreshing client --- .../sora/sora_image_generation_command.rs | 8 ++++---- .../commands/sora/sora_image_remix_command.rs | 10 +++++----- .../src/state/sora/sora_credential_manager.rs | 6 +++--- .../src/threads/sora_session_login_thread.rs | 2 +- .../sora/initialize_sora_jwt_bearer_token.rs | 2 +- .../api_clients/openai_sora_client/src/lib.rs | 6 +----- .../src/{ => requests}/bearer/generate.rs | 0 .../src/{ => requests}/bearer/mod.rs | 0 .../src/{ => requests}/image_gen/common.rs | 0 .../image_gen/image_gen_http_request.rs | 0 .../image_gen/image_gen_status.rs | 0 .../src/{ => requests}/image_gen/mod.rs | 0 .../image_gen/sora_image_gen_remix.rs | 15 +++++++-------- .../image_gen/sora_image_gen_simple.rs | 16 ++++++++-------- .../image_gen/test_status_response.json | 0 .../image_gen/test_status_response_long.json | 0 .../src/{ => requests}/job/mod.rs | 0 .../src/{ => requests}/job/sora_job_status.rs | 0 .../openai_sora_client/src/requests/mod.rs | 5 +++++ .../sentinel_refresh/generate/config.rs | 0 .../sentinel_refresh/generate/mod.rs | 0 .../sentinel_refresh/generate/request.rs | 6 +++--- .../sentinel_refresh/generate/token.rs | 0 .../src/{ => requests}/sentinel_refresh/mod.rs | 0 .../{ => requests}/sentinel_refresh/refresh.rs | 1 - .../src/{ => requests}/upload/mod.rs | 0 .../upload/upload_media_from_bytes.rs | 6 +++--- .../upload/upload_media_from_file.rs | 12 ++++++------ .../upload/upload_media_http_request.rs | 3 +-- .../v2/process_single_sora_job.rs | 18 +++++++++--------- .../enqueue_studio_image_generation_handler.rs | 16 ++++++++-------- 31 files changed, 65 insertions(+), 67 deletions(-) rename crates/lib/api_clients/openai_sora_client/src/{ => requests}/bearer/generate.rs (100%) rename crates/lib/api_clients/openai_sora_client/src/{ => requests}/bearer/mod.rs (100%) rename crates/lib/api_clients/openai_sora_client/src/{ => requests}/image_gen/common.rs (100%) rename crates/lib/api_clients/openai_sora_client/src/{ => requests}/image_gen/image_gen_http_request.rs (100%) rename crates/lib/api_clients/openai_sora_client/src/{ => requests}/image_gen/image_gen_status.rs (100%) rename crates/lib/api_clients/openai_sora_client/src/{ => requests}/image_gen/mod.rs (100%) rename crates/lib/api_clients/openai_sora_client/src/{ => requests}/image_gen/sora_image_gen_remix.rs (85%) rename crates/lib/api_clients/openai_sora_client/src/{ => requests}/image_gen/sora_image_gen_simple.rs (84%) rename crates/lib/api_clients/openai_sora_client/src/{ => requests}/image_gen/test_status_response.json (100%) rename crates/lib/api_clients/openai_sora_client/src/{ => requests}/image_gen/test_status_response_long.json (100%) rename crates/lib/api_clients/openai_sora_client/src/{ => requests}/job/mod.rs (100%) rename crates/lib/api_clients/openai_sora_client/src/{ => requests}/job/sora_job_status.rs (100%) create mode 100644 crates/lib/api_clients/openai_sora_client/src/requests/mod.rs rename crates/lib/api_clients/openai_sora_client/src/{ => requests}/sentinel_refresh/generate/config.rs (100%) rename crates/lib/api_clients/openai_sora_client/src/{ => requests}/sentinel_refresh/generate/mod.rs (100%) rename crates/lib/api_clients/openai_sora_client/src/{ => requests}/sentinel_refresh/generate/request.rs (97%) rename crates/lib/api_clients/openai_sora_client/src/{ => requests}/sentinel_refresh/generate/token.rs (100%) rename crates/lib/api_clients/openai_sora_client/src/{ => requests}/sentinel_refresh/mod.rs (100%) rename crates/lib/api_clients/openai_sora_client/src/{ => requests}/sentinel_refresh/refresh.rs (99%) rename crates/lib/api_clients/openai_sora_client/src/{ => requests}/upload/mod.rs (100%) rename crates/lib/api_clients/openai_sora_client/src/{ => requests}/upload/upload_media_from_bytes.rs (88%) rename crates/lib/api_clients/openai_sora_client/src/{ => requests}/upload/upload_media_from_file.rs (95%) rename crates/lib/api_clients/openai_sora_client/src/{ => requests}/upload/upload_media_http_request.rs (99%) diff --git a/crates/desktop/tauri-artcraft/src/commands/sora/sora_image_generation_command.rs b/crates/desktop/tauri-artcraft/src/commands/sora/sora_image_generation_command.rs index 516dcb6a05..121cfda983 100644 --- a/crates/desktop/tauri-artcraft/src/commands/sora/sora_image_generation_command.rs +++ b/crates/desktop/tauri-artcraft/src/commands/sora/sora_image_generation_command.rs @@ -8,10 +8,10 @@ use image::codecs::png::{CompressionType, FilterType, PngEncoder}; use image::{DynamicImage, ImageReader}; use log::{error, info}; use openai_sora_client::credentials::SoraCredentials; -use openai_sora_client::image_gen::common::{ImageSize, NumImages}; -use openai_sora_client::image_gen::sora_image_gen_remix::{sora_image_gen_remix, SoraImageGenRemixRequest}; -use openai_sora_client::upload::upload_media_from_bytes::sora_media_upload_from_bytes; -use openai_sora_client::upload::upload_media_from_file::SoraMediaUploadRequest; +use openai_sora_client::requests::image_gen::common::{ImageSize, NumImages}; +use openai_sora_client::requests::image_gen::sora_image_gen_remix::{sora_image_gen_remix, SoraImageGenRemixRequest}; +use openai_sora_client::requests::upload::upload_media_from_bytes::sora_media_upload_from_bytes; +use openai_sora_client::requests::upload::upload_media_from_file::SoraMediaUploadRequest; use std::fs::read_to_string; use std::io::Cursor; use tauri::{AppHandle, Manager, State}; diff --git a/crates/desktop/tauri-artcraft/src/commands/sora/sora_image_remix_command.rs b/crates/desktop/tauri-artcraft/src/commands/sora/sora_image_remix_command.rs index 8e3d0d3746..591e9c478e 100644 --- a/crates/desktop/tauri-artcraft/src/commands/sora/sora_image_remix_command.rs +++ b/crates/desktop/tauri-artcraft/src/commands/sora/sora_image_remix_command.rs @@ -11,11 +11,11 @@ use image::codecs::png::{CompressionType, FilterType, PngEncoder}; use image::{DynamicImage, ImageReader}; use log::{debug, error, info}; use openai_sora_client::credentials::SoraCredentials; -use openai_sora_client::image_gen::common::{ImageSize, NumImages}; -use openai_sora_client::image_gen::sora_image_gen_remix::{sora_image_gen_remix, SoraImageGenRemixRequest}; -use openai_sora_client::sentinel_refresh::refresh_sentinel; -use openai_sora_client::upload::upload_media_from_bytes::sora_media_upload_from_bytes; -use openai_sora_client::upload::upload_media_from_file::{sora_media_upload_from_file, SoraMediaUploadRequest}; +use openai_sora_client::requests::image_gen::common::{ImageSize, NumImages}; +use openai_sora_client::requests::image_gen::sora_image_gen_remix::{sora_image_gen_remix, SoraImageGenRemixRequest}; +use openai_sora_client::requests::sentinel_refresh::refresh_sentinel; +use openai_sora_client::requests::upload::upload_media_from_bytes::sora_media_upload_from_bytes; +use openai_sora_client::requests::upload::upload_media_from_file::{sora_media_upload_from_file, SoraMediaUploadRequest}; use serde_derive::Deserialize; use std::fs::read_to_string; use std::io::Cursor; diff --git a/crates/desktop/tauri-artcraft/src/state/sora/sora_credential_manager.rs b/crates/desktop/tauri-artcraft/src/state/sora/sora_credential_manager.rs index 63ed2b1282..4be1ec30c0 100644 --- a/crates/desktop/tauri-artcraft/src/state/sora/sora_credential_manager.rs +++ b/crates/desktop/tauri-artcraft/src/state/sora/sora_credential_manager.rs @@ -1,14 +1,14 @@ use crate::state::app_dir::AppDataRoot; use crate::state::sora::read_sora_credentials_from_disk::read_sora_credentials_from_disk; use crate::state::sora::sora_credential_holder::SoraCredentialHolder; +use anyhow::anyhow; use errors::AnyhowResult; use log::{error, info, warn}; use openai_sora_client::credentials::SoraCredentials; -use openai_sora_client::sentinel_refresh::refresh_sentinel; +use openai_sora_client::requests::sentinel_refresh::generate::token::generate_token; +use openai_sora_client::requests::sentinel_refresh::refresh_sentinel; use std::fs::OpenOptions; use std::io::Write; -use anyhow::anyhow; -use openai_sora_client::sentinel_refresh::generate::token::generate_token; #[derive(Clone)] pub struct SoraCredentialManager { diff --git a/crates/desktop/tauri-artcraft/src/threads/sora_session_login_thread.rs b/crates/desktop/tauri-artcraft/src/threads/sora_session_login_thread.rs index d86382173b..de27efe02b 100644 --- a/crates/desktop/tauri-artcraft/src/threads/sora_session_login_thread.rs +++ b/crates/desktop/tauri-artcraft/src/threads/sora_session_login_thread.rs @@ -1,6 +1,7 @@ use crate::state::app_dir::AppDataRoot; use crate::state::sora::sora_credential_holder::SoraCredentialHolder; use crate::state::sora::sora_credential_manager::SoraCredentialManager; +use crate::utils::sora::initialize_sora_jwt_bearer_token::initialize_sora_jwt_bearer_token; use crate::utils::sora_webview_cookies::get_all_sora_cookies_as_string; use anyhow::anyhow; use errors::AnyhowResult; @@ -10,7 +11,6 @@ use reqwest::Url; use std::fs::OpenOptions; use std::io::Write; use tauri::{AppHandle, Manager, Webview}; -use crate::utils::sora::initialize_sora_jwt_bearer_token::initialize_sora_jwt_bearer_token; pub const LOGIN_WINDOW_NAME: &str = "login_window"; diff --git a/crates/desktop/tauri-artcraft/src/utils/sora/initialize_sora_jwt_bearer_token.rs b/crates/desktop/tauri-artcraft/src/utils/sora/initialize_sora_jwt_bearer_token.rs index cfe593a323..2953c64f57 100644 --- a/crates/desktop/tauri-artcraft/src/utils/sora/initialize_sora_jwt_bearer_token.rs +++ b/crates/desktop/tauri-artcraft/src/utils/sora/initialize_sora_jwt_bearer_token.rs @@ -2,7 +2,7 @@ use crate::state::app_dir::AppDataRoot; use anyhow::anyhow; use errors::AnyhowResult; use log::info; -use openai_sora_client::bearer::generate::generate_bearer_with_cookie; +use openai_sora_client::requests::bearer::generate::generate_bearer_with_cookie; /// Loading the JWT bearer token for the first time. pub async fn initialize_sora_jwt_bearer_token(app_data_root: &AppDataRoot) -> AnyhowResult<()> { diff --git a/crates/lib/api_clients/openai_sora_client/src/lib.rs b/crates/lib/api_clients/openai_sora_client/src/lib.rs index 70ceb24dd3..84d743a287 100644 --- a/crates/lib/api_clients/openai_sora_client/src/lib.rs +++ b/crates/lib/api_clients/openai_sora_client/src/lib.rs @@ -1,9 +1,5 @@ -pub mod bearer; pub mod credentials; pub mod creds; -pub mod image_gen; -pub mod job; -pub mod sentinel_refresh; +pub mod requests; pub mod sora_error; -pub mod upload; pub mod utils; \ No newline at end of file diff --git a/crates/lib/api_clients/openai_sora_client/src/bearer/generate.rs b/crates/lib/api_clients/openai_sora_client/src/requests/bearer/generate.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/bearer/generate.rs rename to crates/lib/api_clients/openai_sora_client/src/requests/bearer/generate.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/bearer/mod.rs b/crates/lib/api_clients/openai_sora_client/src/requests/bearer/mod.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/bearer/mod.rs rename to crates/lib/api_clients/openai_sora_client/src/requests/bearer/mod.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/image_gen/common.rs b/crates/lib/api_clients/openai_sora_client/src/requests/image_gen/common.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/image_gen/common.rs rename to crates/lib/api_clients/openai_sora_client/src/requests/image_gen/common.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/image_gen/image_gen_http_request.rs b/crates/lib/api_clients/openai_sora_client/src/requests/image_gen/image_gen_http_request.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/image_gen/image_gen_http_request.rs rename to crates/lib/api_clients/openai_sora_client/src/requests/image_gen/image_gen_http_request.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/image_gen/image_gen_status.rs b/crates/lib/api_clients/openai_sora_client/src/requests/image_gen/image_gen_status.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/image_gen/image_gen_status.rs rename to crates/lib/api_clients/openai_sora_client/src/requests/image_gen/image_gen_status.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/image_gen/mod.rs b/crates/lib/api_clients/openai_sora_client/src/requests/image_gen/mod.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/image_gen/mod.rs rename to crates/lib/api_clients/openai_sora_client/src/requests/image_gen/mod.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/image_gen/sora_image_gen_remix.rs b/crates/lib/api_clients/openai_sora_client/src/requests/image_gen/sora_image_gen_remix.rs similarity index 85% rename from crates/lib/api_clients/openai_sora_client/src/image_gen/sora_image_gen_remix.rs rename to crates/lib/api_clients/openai_sora_client/src/requests/image_gen/sora_image_gen_remix.rs index 7db1564ed1..b5520b012d 100644 --- a/crates/lib/api_clients/openai_sora_client/src/image_gen/sora_image_gen_remix.rs +++ b/crates/lib/api_clients/openai_sora_client/src/requests/image_gen/sora_image_gen_remix.rs @@ -1,7 +1,6 @@ -use errors::AnyhowResult; use crate::credentials::SoraCredentials; -use crate::image_gen::common::{ImageSize, NumImages, SoraImageGenResponse}; -use crate::image_gen::image_gen_http_request::{image_gen_http_request, InpaintItem, InpaintItemType, OperationType, RawSoraImageGenRequest, SoraError, VideoGenType}; +use crate::requests::image_gen::common::{ImageSize, NumImages, SoraImageGenResponse}; +use crate::requests::image_gen::image_gen_http_request::{image_gen_http_request, InpaintItem, InpaintItemType, OperationType, RawSoraImageGenRequest, SoraError, VideoGenType}; pub struct SoraImageGenRemixRequest<'a> { pub prompt: String, @@ -45,12 +44,12 @@ pub async fn sora_image_gen_remix(request: SoraImageGenRemixRequest<'_>) -> Resu #[cfg(test)] mod tests { - use std::fs::read_to_string; - use errors::AnyhowResult; - use testing::test_file_path::test_file_path; use crate::credentials::SoraCredentials; - use crate::image_gen::common::{ImageSize, NumImages}; - use crate::image_gen::sora_image_gen_remix::{sora_image_gen_remix, SoraImageGenRemixRequest}; + use crate::requests::image_gen::common::{ImageSize, NumImages}; + use crate::requests::image_gen::sora_image_gen_remix::{sora_image_gen_remix, SoraImageGenRemixRequest}; + use errors::AnyhowResult; + use std::fs::read_to_string; + use testing::test_file_path::test_file_path; #[ignore] // You can manually run "ignore" tests in the IDE, but they won't run in CI. #[tokio::test] diff --git a/crates/lib/api_clients/openai_sora_client/src/image_gen/sora_image_gen_simple.rs b/crates/lib/api_clients/openai_sora_client/src/requests/image_gen/sora_image_gen_simple.rs similarity index 84% rename from crates/lib/api_clients/openai_sora_client/src/image_gen/sora_image_gen_simple.rs rename to crates/lib/api_clients/openai_sora_client/src/requests/image_gen/sora_image_gen_simple.rs index c2f2131dc8..4cc710aa93 100644 --- a/crates/lib/api_clients/openai_sora_client/src/image_gen/sora_image_gen_simple.rs +++ b/crates/lib/api_clients/openai_sora_client/src/requests/image_gen/sora_image_gen_simple.rs @@ -1,7 +1,7 @@ -use errors::AnyhowResult; use crate::credentials::SoraCredentials; -use crate::image_gen::common::{ImageSize, NumImages, SoraImageGenResponse}; -use crate::image_gen::image_gen_http_request::{image_gen_http_request, OperationType, RawSoraImageGenRequest, VideoGenType}; +use crate::requests::image_gen::common::{ImageSize, NumImages, SoraImageGenResponse}; +use crate::requests::image_gen::image_gen_http_request::{image_gen_http_request, OperationType, RawSoraImageGenRequest, VideoGenType}; +use errors::AnyhowResult; pub struct SoraImageGenSimpleRequest<'a> { pub prompt: String, @@ -32,12 +32,12 @@ pub async fn sora_image_gen_simple(args: SoraImageGenSimpleRequest<'_>) -> Anyho #[cfg(test)] mod tests { - use std::fs::read_to_string; - use errors::AnyhowResult; - use testing::test_file_path::test_file_path; use crate::credentials::SoraCredentials; - use crate::image_gen::common::{ImageSize, NumImages}; - use crate::image_gen::sora_image_gen_simple::{sora_image_gen_simple, SoraImageGenSimpleRequest}; + use crate::requests::image_gen::common::{ImageSize, NumImages}; + use crate::requests::image_gen::sora_image_gen_simple::{sora_image_gen_simple, SoraImageGenSimpleRequest}; + use errors::AnyhowResult; + use std::fs::read_to_string; + use testing::test_file_path::test_file_path; #[ignore] // You can manually run "ignore" tests in the IDE, but they won't run in CI. #[tokio::test] diff --git a/crates/lib/api_clients/openai_sora_client/src/image_gen/test_status_response.json b/crates/lib/api_clients/openai_sora_client/src/requests/image_gen/test_status_response.json similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/image_gen/test_status_response.json rename to crates/lib/api_clients/openai_sora_client/src/requests/image_gen/test_status_response.json diff --git a/crates/lib/api_clients/openai_sora_client/src/image_gen/test_status_response_long.json b/crates/lib/api_clients/openai_sora_client/src/requests/image_gen/test_status_response_long.json similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/image_gen/test_status_response_long.json rename to crates/lib/api_clients/openai_sora_client/src/requests/image_gen/test_status_response_long.json diff --git a/crates/lib/api_clients/openai_sora_client/src/job/mod.rs b/crates/lib/api_clients/openai_sora_client/src/requests/job/mod.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/job/mod.rs rename to crates/lib/api_clients/openai_sora_client/src/requests/job/mod.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/job/sora_job_status.rs b/crates/lib/api_clients/openai_sora_client/src/requests/job/sora_job_status.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/job/sora_job_status.rs rename to crates/lib/api_clients/openai_sora_client/src/requests/job/sora_job_status.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/requests/mod.rs b/crates/lib/api_clients/openai_sora_client/src/requests/mod.rs new file mode 100644 index 0000000000..29da77e446 --- /dev/null +++ b/crates/lib/api_clients/openai_sora_client/src/requests/mod.rs @@ -0,0 +1,5 @@ +pub mod bearer; +pub mod image_gen; +pub mod job; +pub mod sentinel_refresh; +pub mod upload; \ No newline at end of file diff --git a/crates/lib/api_clients/openai_sora_client/src/sentinel_refresh/generate/config.rs b/crates/lib/api_clients/openai_sora_client/src/requests/sentinel_refresh/generate/config.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/sentinel_refresh/generate/config.rs rename to crates/lib/api_clients/openai_sora_client/src/requests/sentinel_refresh/generate/config.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/sentinel_refresh/generate/mod.rs b/crates/lib/api_clients/openai_sora_client/src/requests/sentinel_refresh/generate/mod.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/sentinel_refresh/generate/mod.rs rename to crates/lib/api_clients/openai_sora_client/src/requests/sentinel_refresh/generate/mod.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/sentinel_refresh/generate/request.rs b/crates/lib/api_clients/openai_sora_client/src/requests/sentinel_refresh/generate/request.rs similarity index 97% rename from crates/lib/api_clients/openai_sora_client/src/sentinel_refresh/generate/request.rs rename to crates/lib/api_clients/openai_sora_client/src/requests/sentinel_refresh/generate/request.rs index aabf9be1fd..9393443f15 100644 --- a/crates/lib/api_clients/openai_sora_client/src/sentinel_refresh/generate/request.rs +++ b/crates/lib/api_clients/openai_sora_client/src/requests/sentinel_refresh/generate/request.rs @@ -1,10 +1,10 @@ -use crate::sentinel_refresh::generate::config::{get_random_core_count, get_random_document_key, get_random_navigator_key, get_random_window_key}; +use crate::requests::sentinel_refresh::generate::config::{get_random_core_count, get_random_document_key, get_random_navigator_key, get_random_window_key}; +use base64::prelude::BASE64_STANDARD; +use base64::Engine; use chrono::FixedOffset; use chrono::Utc; use idempotency::uuid::generate_random_uuid; use rand::Rng; -use base64::prelude::BASE64_STANDARD; -use base64::Engine; use sha3::{Digest, Sha3_512}; // [ diff --git a/crates/lib/api_clients/openai_sora_client/src/sentinel_refresh/generate/token.rs b/crates/lib/api_clients/openai_sora_client/src/requests/sentinel_refresh/generate/token.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/sentinel_refresh/generate/token.rs rename to crates/lib/api_clients/openai_sora_client/src/requests/sentinel_refresh/generate/token.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/sentinel_refresh/mod.rs b/crates/lib/api_clients/openai_sora_client/src/requests/sentinel_refresh/mod.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/sentinel_refresh/mod.rs rename to crates/lib/api_clients/openai_sora_client/src/requests/sentinel_refresh/mod.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/sentinel_refresh/refresh.rs b/crates/lib/api_clients/openai_sora_client/src/requests/sentinel_refresh/refresh.rs similarity index 99% rename from crates/lib/api_clients/openai_sora_client/src/sentinel_refresh/refresh.rs rename to crates/lib/api_clients/openai_sora_client/src/requests/sentinel_refresh/refresh.rs index 44c4212267..2cf98be0bc 100644 --- a/crates/lib/api_clients/openai_sora_client/src/sentinel_refresh/refresh.rs +++ b/crates/lib/api_clients/openai_sora_client/src/requests/sentinel_refresh/refresh.rs @@ -18,7 +18,6 @@ pub async fn refresh_sentinel() -> AnyhowResult { let response = client.post(url).send().await?; - let body = response.text().await?; Ok(body) diff --git a/crates/lib/api_clients/openai_sora_client/src/upload/mod.rs b/crates/lib/api_clients/openai_sora_client/src/requests/upload/mod.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/upload/mod.rs rename to crates/lib/api_clients/openai_sora_client/src/requests/upload/mod.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/upload/upload_media_from_bytes.rs b/crates/lib/api_clients/openai_sora_client/src/requests/upload/upload_media_from_bytes.rs similarity index 88% rename from crates/lib/api_clients/openai_sora_client/src/upload/upload_media_from_bytes.rs rename to crates/lib/api_clients/openai_sora_client/src/requests/upload/upload_media_from_bytes.rs index 1877dc4892..1f450f1778 100644 --- a/crates/lib/api_clients/openai_sora_client/src/upload/upload_media_from_bytes.rs +++ b/crates/lib/api_clients/openai_sora_client/src/requests/upload/upload_media_from_bytes.rs @@ -1,7 +1,7 @@ -use std::path::{Path, PathBuf}; -use errors::AnyhowResult; use crate::credentials::SoraCredentials; -use crate::upload::upload_media_http_request::{upload_media_http_request, SoraMediaUploadResponse}; +use crate::requests::upload::upload_media_http_request::{upload_media_http_request, SoraMediaUploadResponse}; +use errors::AnyhowResult; +use std::path::PathBuf; pub struct SoraMediaUploadRequest<'a> { pub file_path: String, diff --git a/crates/lib/api_clients/openai_sora_client/src/upload/upload_media_from_file.rs b/crates/lib/api_clients/openai_sora_client/src/requests/upload/upload_media_from_file.rs similarity index 95% rename from crates/lib/api_clients/openai_sora_client/src/upload/upload_media_from_file.rs rename to crates/lib/api_clients/openai_sora_client/src/requests/upload/upload_media_from_file.rs index d7f00d1556..3b1ed6c4fa 100644 --- a/crates/lib/api_clients/openai_sora_client/src/upload/upload_media_from_file.rs +++ b/crates/lib/api_clients/openai_sora_client/src/requests/upload/upload_media_from_file.rs @@ -1,9 +1,9 @@ +use crate::credentials::SoraCredentials; +use crate::requests::upload::upload_media_http_request::{upload_media_http_request, SoraMediaUploadResponse}; +use errors::AnyhowResult; use std::path::Path; use tokio::fs::File; use tokio::io::AsyncReadExt; -use errors::AnyhowResult; -use crate::credentials::SoraCredentials; -use crate::upload::upload_media_http_request::{upload_media_http_request, SoraMediaUploadResponse}; /// Try to prevent buffer reallocations. /// There's a better way to implement this. @@ -41,11 +41,11 @@ pub async fn sora_media_upload_from_file>(file_path: P, creds: &S #[cfg(test)] mod tests { - use std::fs::read_to_string; - use errors::AnyhowResult; - use testing::test_file_path::test_file_path; use crate::credentials::SoraCredentials; use crate::upload::upload_media_from_file::sora_media_upload_from_file; + use errors::AnyhowResult; + use std::fs::read_to_string; + use testing::test_file_path::test_file_path; #[ignore] // You can manually run "ignore" tests in the IDE, but they won't run in CI. #[tokio::test] diff --git a/crates/lib/api_clients/openai_sora_client/src/upload/upload_media_http_request.rs b/crates/lib/api_clients/openai_sora_client/src/requests/upload/upload_media_http_request.rs similarity index 99% rename from crates/lib/api_clients/openai_sora_client/src/upload/upload_media_http_request.rs rename to crates/lib/api_clients/openai_sora_client/src/requests/upload/upload_media_http_request.rs index bdb0decbe0..be69f14e26 100644 --- a/crates/lib/api_clients/openai_sora_client/src/upload/upload_media_http_request.rs +++ b/crates/lib/api_clients/openai_sora_client/src/requests/upload/upload_media_http_request.rs @@ -1,9 +1,8 @@ use crate::credentials::{SoraCredentials, USER_AGENT}; -use errors::AnyhowResult; +use crate::sora_error::SoraError; use reqwest::multipart::{Form, Part}; use reqwest::Client; use serde::Deserialize; -use crate::sora_error::SoraError; const SORA_UPLOAD_MEDIA_URL: &str = "https://sora.com/backend/uploads"; diff --git a/crates/service/job/inference_job/src/job/job_types/image_generation/v2/process_single_sora_job.rs b/crates/service/job/inference_job/src/job/job_types/image_generation/v2/process_single_sora_job.rs index f32df5d93f..d55cd4d1ce 100644 --- a/crates/service/job/inference_job/src/job/job_types/image_generation/v2/process_single_sora_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/image_generation/v2/process_single_sora_job.rs @@ -17,30 +17,30 @@ use crate::job::job_loop::job_success_result::{JobSuccessResult, ResultEntity}; use crate::job::job_loop::process_single_job_error::ProcessSingleJobError; use crate::state::job_dependencies::JobDependencies; use crate::util::extractors::get_polymorphic_args_from_job::get_polymorphic_args_from_job; +use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use cloud_storage::remote_file_manager::remote_cloud_file_manager::RemoteCloudFileClient; use composite_identifiers::by_table::batch_generations::batch_generation_entity::BatchGenerationEntity; use errors::AnyhowResult; +use filesys::file_read_bytes::file_read_bytes; +use hashing::sha256::sha256_hash_file::sha256_hash_file; +use log::info; +use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes; use mysql_queries::queries::batch_generations::insert_batch_generation_records::{insert_batch_generation_records, InsertBatchArgs}; use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; use openai_sora_client::credentials::SoraCredentials; -use openai_sora_client::image_gen::image_gen_status::TaskStatus; -use openai_sora_client::image_gen::{wait_for_image_gen_status, Generation}; +use openai_sora_client::requests::image_gen::image_gen_status::TaskStatus; +use openai_sora_client::requests::image_gen::{wait_for_image_gen_status, Generation}; use r2d2_redis::r2d2::PooledConnection; use r2d2_redis::redis::Commands; use r2d2_redis::RedisConnectionManager; +use shared_service_components::sora_redis_credentials::get_sora_credentials_from_redis::get_sora_credentials_from_redis; use std::collections::HashMap; use std::fs::File; use std::io::Write; use std::path::PathBuf; -use log::info; use tempdir::TempDir; -use url::Url; -use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; -use filesys::file_read_bytes::file_read_bytes; -use hashing::sha256::sha256_hash_file::sha256_hash_file; -use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes; -use shared_service_components::sora_redis_credentials::get_sora_credentials_from_redis::get_sora_credentials_from_redis; use tokens::tokens::batch_generations::BatchGenerationToken; +use url::Url; const IMAGE_PREFIX : &str = "image_"; const IMAGE_SUFFIX : &str = ".png"; // TODO: Vary based on filetype. diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/prompt/enqueue_studio_image_generation_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/prompt/enqueue_studio_image_generation_handler.rs index a0cb3cd9e4..1c908754ca 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/prompt/enqueue_studio_image_generation_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/prompt/enqueue_studio_image_generation_handler.rs @@ -11,17 +11,17 @@ use actix_web::web::Json; use actix_web::{web, HttpRequest, HttpResponse}; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use cloud_storage::bucket_client::BucketClient; -use log::{debug, error, info}; use log::warn; +use log::{debug, error, info}; use mysql_queries::queries::media_files::get::get_media_file::get_media_file; use openai_sora_client::credentials::SoraCredentials; -use openai_sora_client::image_gen::SoraError; -use openai_sora_client::sentinel_refresh::generate::token::generate_token; -use openai_sora_client::sentinel_refresh::refresh_sentinel; +use openai_sora_client::requests::image_gen::SoraError; +use openai_sora_client::requests::sentinel_refresh::generate::token::generate_token; +use openai_sora_client::requests::sentinel_refresh::refresh_sentinel; use serde::Deserialize; use serde::Serialize; -use shared_service_components::sora_redis_credentials::set_sora_credential_field_in_redis::set_sora_credential_field_in_redis; use shared_service_components::sora_redis_credentials::keys::RedisSoraCredentialSubkey; +use shared_service_components::sora_redis_credentials::set_sora_credential_field_in_redis::set_sora_credential_field_in_redis; use sqlx::MySqlPool; use tempdir::TempDir; use utoipa::ToSchema; @@ -37,9 +37,9 @@ use mysql_queries::payloads::generic_inference_args::generic_inference_args::{Ge use mysql_queries::payloads::generic_inference_args::inner_payloads::sora_image_gen_args::SoraImageGenArgs; use mysql_queries::queries::generic_inference::web::insert_generic_inference_job::{insert_generic_inference_job, InsertGenericInferenceArgs}; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; -use openai_sora_client::image_gen::common::{ImageSize, NumImages}; -use openai_sora_client::image_gen::sora_image_gen_remix::{sora_image_gen_remix, SoraImageGenRemixRequest}; -use openai_sora_client::upload::upload_media_from_file::{sora_media_upload_from_file, SoraMediaUploadRequest}; +use openai_sora_client::requests::image_gen::common::{ImageSize, NumImages}; +use openai_sora_client::requests::image_gen::sora_image_gen_remix::{sora_image_gen_remix, SoraImageGenRemixRequest}; +use openai_sora_client::requests::upload::upload_media_from_file::{sora_media_upload_from_file, SoraMediaUploadRequest}; use tokens::tokens::generic_inference_jobs::InferenceJobToken; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::model_weights::ModelWeightToken;