From db4e5ada29d10ab81d37b702273c090a1aea9904 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sat, 23 May 2026 18:23:49 -0400 Subject: [PATCH] refactor --- crates/api_clients/grok_api_client/src/api/mod.rs | 2 ++ .../{ => api}/requests/delete_file/delete_file.rs | 4 ++-- .../src/{ => api}/requests/delete_file/mod.rs | 0 .../requests/delete_file/request_types.rs | 0 .../requests/download_file/download_file.rs | 2 +- .../src/{ => api}/requests/download_file/mod.rs | 0 .../get_file_metadata/get_file_metadata.rs | 4 ++-- .../{ => api}/requests/get_file_metadata/mod.rs | 0 .../requests/get_file_metadata/request_types.rs | 0 .../{ => api}/requests/image_edit/image_edit.rs | 14 +++++++------- .../src/{ => api}/requests/image_edit/mod.rs | 0 .../{ => api}/requests/image_edit/request_types.rs | 0 .../requests/image_generation/image_generation.rs | 14 +++++++------- .../src/{ => api}/requests/image_generation/mod.rs | 0 .../requests/image_generation/request_types.rs | 0 .../grok_api_client/src/{ => api}/requests/mod.rs | 1 - .../src/{ => api}/requests/upload_file/mod.rs | 0 .../requests/upload_file/request_types.rs | 0 .../{ => api}/requests/upload_file/upload_file.rs | 12 ++++++------ .../src/{ => api}/requests/video_edit/mod.rs | 0 .../{ => api}/requests/video_edit/request_types.rs | 0 .../{ => api}/requests/video_edit/video_edit.rs | 6 +++--- .../src/{ => api}/requests/video_extension/mod.rs | 0 .../requests/video_extension/request_types.rs | 0 .../requests/video_extension/video_extension.rs | 6 +++--- .../src/{ => api}/requests/video_generation/mod.rs | 0 .../requests/video_generation/request_types.rs | 0 .../requests/video_generation/video_generation.rs | 6 +++--- .../src/{ => api}/requests/video_status/mod.rs | 0 .../requests/video_status/request_types.rs | 0 .../requests/video_status/video_status.rs | 4 ++-- .../src/{ => api}/requests/xai_host.rs | 0 .../types}/image_types/image_aspect_ratio.rs | 0 .../types}/image_types/image_model.rs | 0 .../types}/image_types/image_resolution.rs | 0 .../types}/image_types/image_response_format.rs | 0 .../src/{requests => api/types}/image_types/mod.rs | 4 ++-- .../grok_api_client/src/api/types/mod.rs | 1 + crates/api_clients/grok_api_client/src/lib.rs | 2 +- 39 files changed, 42 insertions(+), 40 deletions(-) create mode 100644 crates/api_clients/grok_api_client/src/api/mod.rs rename crates/api_clients/grok_api_client/src/{ => api}/requests/delete_file/delete_file.rs (96%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/delete_file/mod.rs (100%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/delete_file/request_types.rs (100%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/download_file/download_file.rs (98%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/download_file/mod.rs (100%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/get_file_metadata/get_file_metadata.rs (96%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/get_file_metadata/mod.rs (100%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/get_file_metadata/request_types.rs (100%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/image_edit/image_edit.rs (94%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/image_edit/mod.rs (100%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/image_edit/request_types.rs (100%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/image_generation/image_generation.rs (94%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/image_generation/mod.rs (100%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/image_generation/request_types.rs (100%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/mod.rs (92%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/upload_file/mod.rs (100%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/upload_file/request_types.rs (100%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/upload_file/upload_file.rs (94%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/video_edit/mod.rs (100%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/video_edit/request_types.rs (100%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/video_edit/video_edit.rs (97%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/video_extension/mod.rs (100%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/video_extension/request_types.rs (100%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/video_extension/video_extension.rs (97%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/video_generation/mod.rs (100%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/video_generation/request_types.rs (100%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/video_generation/video_generation.rs (98%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/video_status/mod.rs (100%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/video_status/request_types.rs (100%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/video_status/video_status.rs (98%) rename crates/api_clients/grok_api_client/src/{ => api}/requests/xai_host.rs (100%) rename crates/api_clients/grok_api_client/src/{requests => api/types}/image_types/image_aspect_ratio.rs (100%) rename crates/api_clients/grok_api_client/src/{requests => api/types}/image_types/image_model.rs (100%) rename crates/api_clients/grok_api_client/src/{requests => api/types}/image_types/image_resolution.rs (100%) rename crates/api_clients/grok_api_client/src/{requests => api/types}/image_types/image_response_format.rs (100%) rename crates/api_clients/grok_api_client/src/{requests => api/types}/image_types/mod.rs (61%) create mode 100644 crates/api_clients/grok_api_client/src/api/types/mod.rs diff --git a/crates/api_clients/grok_api_client/src/api/mod.rs b/crates/api_clients/grok_api_client/src/api/mod.rs new file mode 100644 index 0000000000..e5bccbbe5a --- /dev/null +++ b/crates/api_clients/grok_api_client/src/api/mod.rs @@ -0,0 +1,2 @@ +pub mod requests; +pub mod types; diff --git a/crates/api_clients/grok_api_client/src/requests/delete_file/delete_file.rs b/crates/api_clients/grok_api_client/src/api/requests/delete_file/delete_file.rs similarity index 96% rename from crates/api_clients/grok_api_client/src/requests/delete_file/delete_file.rs rename to crates/api_clients/grok_api_client/src/api/requests/delete_file/delete_file.rs index 0fcb951062..c08a9c7d0f 100644 --- a/crates/api_clients/grok_api_client/src/requests/delete_file/delete_file.rs +++ b/crates/api_clients/grok_api_client/src/api/requests/delete_file/delete_file.rs @@ -5,8 +5,8 @@ use crate::error::classify_grok_http_error::classify_grok_http_error; use crate::error::grok_client_error::GrokClientError; use crate::error::grok_error::GrokError; use crate::error::grok_generic_api_error::GrokGenericApiError; -use crate::requests::delete_file::request_types::*; -use crate::requests::xai_host::XAI_API_BASE_URL; +use crate::api::requests::delete_file::request_types::*; +use crate::api::requests::xai_host::XAI_API_BASE_URL; // ── Public args ── diff --git a/crates/api_clients/grok_api_client/src/requests/delete_file/mod.rs b/crates/api_clients/grok_api_client/src/api/requests/delete_file/mod.rs similarity index 100% rename from crates/api_clients/grok_api_client/src/requests/delete_file/mod.rs rename to crates/api_clients/grok_api_client/src/api/requests/delete_file/mod.rs diff --git a/crates/api_clients/grok_api_client/src/requests/delete_file/request_types.rs b/crates/api_clients/grok_api_client/src/api/requests/delete_file/request_types.rs similarity index 100% rename from crates/api_clients/grok_api_client/src/requests/delete_file/request_types.rs rename to crates/api_clients/grok_api_client/src/api/requests/delete_file/request_types.rs diff --git a/crates/api_clients/grok_api_client/src/requests/download_file/download_file.rs b/crates/api_clients/grok_api_client/src/api/requests/download_file/download_file.rs similarity index 98% rename from crates/api_clients/grok_api_client/src/requests/download_file/download_file.rs rename to crates/api_clients/grok_api_client/src/api/requests/download_file/download_file.rs index 0754b87610..e13a62a302 100644 --- a/crates/api_clients/grok_api_client/src/requests/download_file/download_file.rs +++ b/crates/api_clients/grok_api_client/src/api/requests/download_file/download_file.rs @@ -5,7 +5,7 @@ use crate::error::classify_grok_http_error::classify_grok_http_error; use crate::error::grok_client_error::GrokClientError; use crate::error::grok_error::GrokError; use crate::error::grok_generic_api_error::GrokGenericApiError; -use crate::requests::xai_host::XAI_API_BASE_URL; +use crate::api::requests::xai_host::XAI_API_BASE_URL; // ── Public args ── diff --git a/crates/api_clients/grok_api_client/src/requests/download_file/mod.rs b/crates/api_clients/grok_api_client/src/api/requests/download_file/mod.rs similarity index 100% rename from crates/api_clients/grok_api_client/src/requests/download_file/mod.rs rename to crates/api_clients/grok_api_client/src/api/requests/download_file/mod.rs diff --git a/crates/api_clients/grok_api_client/src/requests/get_file_metadata/get_file_metadata.rs b/crates/api_clients/grok_api_client/src/api/requests/get_file_metadata/get_file_metadata.rs similarity index 96% rename from crates/api_clients/grok_api_client/src/requests/get_file_metadata/get_file_metadata.rs rename to crates/api_clients/grok_api_client/src/api/requests/get_file_metadata/get_file_metadata.rs index 7d8a7b605a..0a955ec0a2 100644 --- a/crates/api_clients/grok_api_client/src/requests/get_file_metadata/get_file_metadata.rs +++ b/crates/api_clients/grok_api_client/src/api/requests/get_file_metadata/get_file_metadata.rs @@ -5,8 +5,8 @@ use crate::error::classify_grok_http_error::classify_grok_http_error; use crate::error::grok_client_error::GrokClientError; use crate::error::grok_error::GrokError; use crate::error::grok_generic_api_error::GrokGenericApiError; -use crate::requests::get_file_metadata::request_types::*; -use crate::requests::xai_host::XAI_API_BASE_URL; +use crate::api::requests::get_file_metadata::request_types::*; +use crate::api::requests::xai_host::XAI_API_BASE_URL; // ── Public args ── diff --git a/crates/api_clients/grok_api_client/src/requests/get_file_metadata/mod.rs b/crates/api_clients/grok_api_client/src/api/requests/get_file_metadata/mod.rs similarity index 100% rename from crates/api_clients/grok_api_client/src/requests/get_file_metadata/mod.rs rename to crates/api_clients/grok_api_client/src/api/requests/get_file_metadata/mod.rs diff --git a/crates/api_clients/grok_api_client/src/requests/get_file_metadata/request_types.rs b/crates/api_clients/grok_api_client/src/api/requests/get_file_metadata/request_types.rs similarity index 100% rename from crates/api_clients/grok_api_client/src/requests/get_file_metadata/request_types.rs rename to crates/api_clients/grok_api_client/src/api/requests/get_file_metadata/request_types.rs diff --git a/crates/api_clients/grok_api_client/src/requests/image_edit/image_edit.rs b/crates/api_clients/grok_api_client/src/api/requests/image_edit/image_edit.rs similarity index 94% rename from crates/api_clients/grok_api_client/src/requests/image_edit/image_edit.rs rename to crates/api_clients/grok_api_client/src/api/requests/image_edit/image_edit.rs index 68e997268b..f6d248c17a 100644 --- a/crates/api_clients/grok_api_client/src/requests/image_edit/image_edit.rs +++ b/crates/api_clients/grok_api_client/src/api/requests/image_edit/image_edit.rs @@ -6,12 +6,12 @@ use crate::error::grok_client_error::GrokClientError; use crate::error::grok_error::GrokError; use crate::error::grok_generic_api_error::GrokGenericApiError; use crate::error::grok_specific_api_error::GrokSpecificApiError; -use crate::requests::image_edit::request_types::*; -use crate::requests::image_types::image_aspect_ratio::ImageAspectRatio; -use crate::requests::image_types::image_model::ImageModel; -use crate::requests::image_types::image_resolution::ImageResolution; -use crate::requests::image_types::image_response_format::ImageResponseFormat; -use crate::requests::xai_host::XAI_API_BASE_URL; +use crate::api::requests::image_edit::request_types::*; +use crate::api::types::image_types::image_aspect_ratio::ImageAspectRatio; +use crate::api::types::image_types::image_model::ImageModel; +use crate::api::types::image_types::image_resolution::ImageResolution; +use crate::api::types::image_types::image_response_format::ImageResponseFormat; +use crate::api::requests::xai_host::XAI_API_BASE_URL; // ── Public args ── @@ -53,7 +53,7 @@ pub enum ImageSource { Url(String), /// xAI file identifier (`file_...`) obtained from a successful upload via - /// [`crate::requests::upload_file::upload_file::upload_file`]. The file + /// [`crate::api::requests::upload_file::upload_file::upload_file`]. The file /// must still exist at request time (it has not been deleted and any /// `expires_after` has not lapsed). /// diff --git a/crates/api_clients/grok_api_client/src/requests/image_edit/mod.rs b/crates/api_clients/grok_api_client/src/api/requests/image_edit/mod.rs similarity index 100% rename from crates/api_clients/grok_api_client/src/requests/image_edit/mod.rs rename to crates/api_clients/grok_api_client/src/api/requests/image_edit/mod.rs diff --git a/crates/api_clients/grok_api_client/src/requests/image_edit/request_types.rs b/crates/api_clients/grok_api_client/src/api/requests/image_edit/request_types.rs similarity index 100% rename from crates/api_clients/grok_api_client/src/requests/image_edit/request_types.rs rename to crates/api_clients/grok_api_client/src/api/requests/image_edit/request_types.rs diff --git a/crates/api_clients/grok_api_client/src/requests/image_generation/image_generation.rs b/crates/api_clients/grok_api_client/src/api/requests/image_generation/image_generation.rs similarity index 94% rename from crates/api_clients/grok_api_client/src/requests/image_generation/image_generation.rs rename to crates/api_clients/grok_api_client/src/api/requests/image_generation/image_generation.rs index 555b433812..1113e8a6a1 100644 --- a/crates/api_clients/grok_api_client/src/requests/image_generation/image_generation.rs +++ b/crates/api_clients/grok_api_client/src/api/requests/image_generation/image_generation.rs @@ -5,12 +5,12 @@ use crate::error::classify_grok_http_error::classify_grok_http_error; use crate::error::grok_client_error::GrokClientError; use crate::error::grok_error::GrokError; use crate::error::grok_generic_api_error::GrokGenericApiError; -use crate::requests::image_generation::request_types::*; -use crate::requests::image_types::image_aspect_ratio::ImageAspectRatio; -use crate::requests::image_types::image_model::ImageModel; -use crate::requests::image_types::image_resolution::ImageResolution; -use crate::requests::image_types::image_response_format::ImageResponseFormat; -use crate::requests::xai_host::XAI_API_BASE_URL; +use crate::api::requests::image_generation::request_types::*; +use crate::api::types::image_types::image_aspect_ratio::ImageAspectRatio; +use crate::api::types::image_types::image_model::ImageModel; +use crate::api::types::image_types::image_resolution::ImageResolution; +use crate::api::types::image_types::image_response_format::ImageResponseFormat; +use crate::api::requests::xai_host::XAI_API_BASE_URL; // ── Public args ── @@ -201,7 +201,7 @@ mod tests { } // (Enum-specific round-trips live in their own modules under - // `requests::image_types::*`; here we just verify the public args wire up.) + // `api::types::image_types::*`; here we just verify the public args wire up.) #[tokio::test] async fn args_with_enums_serializes_correct_strings() { diff --git a/crates/api_clients/grok_api_client/src/requests/image_generation/mod.rs b/crates/api_clients/grok_api_client/src/api/requests/image_generation/mod.rs similarity index 100% rename from crates/api_clients/grok_api_client/src/requests/image_generation/mod.rs rename to crates/api_clients/grok_api_client/src/api/requests/image_generation/mod.rs diff --git a/crates/api_clients/grok_api_client/src/requests/image_generation/request_types.rs b/crates/api_clients/grok_api_client/src/api/requests/image_generation/request_types.rs similarity index 100% rename from crates/api_clients/grok_api_client/src/requests/image_generation/request_types.rs rename to crates/api_clients/grok_api_client/src/api/requests/image_generation/request_types.rs diff --git a/crates/api_clients/grok_api_client/src/requests/mod.rs b/crates/api_clients/grok_api_client/src/api/requests/mod.rs similarity index 92% rename from crates/api_clients/grok_api_client/src/requests/mod.rs rename to crates/api_clients/grok_api_client/src/api/requests/mod.rs index 7463f1d002..741a8e368f 100644 --- a/crates/api_clients/grok_api_client/src/requests/mod.rs +++ b/crates/api_clients/grok_api_client/src/api/requests/mod.rs @@ -3,7 +3,6 @@ pub mod download_file; pub mod get_file_metadata; pub mod image_edit; pub mod image_generation; -pub mod image_types; pub mod upload_file; pub mod video_edit; pub mod video_extension; diff --git a/crates/api_clients/grok_api_client/src/requests/upload_file/mod.rs b/crates/api_clients/grok_api_client/src/api/requests/upload_file/mod.rs similarity index 100% rename from crates/api_clients/grok_api_client/src/requests/upload_file/mod.rs rename to crates/api_clients/grok_api_client/src/api/requests/upload_file/mod.rs diff --git a/crates/api_clients/grok_api_client/src/requests/upload_file/request_types.rs b/crates/api_clients/grok_api_client/src/api/requests/upload_file/request_types.rs similarity index 100% rename from crates/api_clients/grok_api_client/src/requests/upload_file/request_types.rs rename to crates/api_clients/grok_api_client/src/api/requests/upload_file/request_types.rs diff --git a/crates/api_clients/grok_api_client/src/requests/upload_file/upload_file.rs b/crates/api_clients/grok_api_client/src/api/requests/upload_file/upload_file.rs similarity index 94% rename from crates/api_clients/grok_api_client/src/requests/upload_file/upload_file.rs rename to crates/api_clients/grok_api_client/src/api/requests/upload_file/upload_file.rs index 620d649459..2d536e63fb 100644 --- a/crates/api_clients/grok_api_client/src/requests/upload_file/upload_file.rs +++ b/crates/api_clients/grok_api_client/src/api/requests/upload_file/upload_file.rs @@ -6,8 +6,8 @@ use crate::error::classify_grok_http_error::classify_grok_http_error; use crate::error::grok_client_error::GrokClientError; use crate::error::grok_error::GrokError; use crate::error::grok_generic_api_error::GrokGenericApiError; -use crate::requests::upload_file::request_types::*; -use crate::requests::xai_host::XAI_API_BASE_URL; +use crate::api::requests::upload_file::request_types::*; +use crate::api::requests::xai_host::XAI_API_BASE_URL; const MAX_FILE_BYTES: u64 = 50 * 1024 * 1024; @@ -42,10 +42,10 @@ pub struct UploadFileArgs { #[derive(Debug, Clone)] pub struct UploadFileSuccess { /// The xAI file identifier. Use this in the `FileId(_)` variant of - /// [`crate::requests::image_edit::image_edit::ImageSource`], - /// [`crate::requests::video_generation::video_generation::VideoImageSource`], - /// [`crate::requests::video_edit::video_edit::VideoSource`], or - /// [`crate::requests::video_extension::video_extension::VideoExtensionSource`]. + /// [`crate::api::requests::image_edit::image_edit::ImageSource`], + /// [`crate::api::requests::video_generation::video_generation::VideoImageSource`], + /// [`crate::api::requests::video_edit::video_edit::VideoSource`], or + /// [`crate::api::requests::video_extension::video_extension::VideoExtensionSource`]. pub file_id: String, pub bytes: Option, diff --git a/crates/api_clients/grok_api_client/src/requests/video_edit/mod.rs b/crates/api_clients/grok_api_client/src/api/requests/video_edit/mod.rs similarity index 100% rename from crates/api_clients/grok_api_client/src/requests/video_edit/mod.rs rename to crates/api_clients/grok_api_client/src/api/requests/video_edit/mod.rs diff --git a/crates/api_clients/grok_api_client/src/requests/video_edit/request_types.rs b/crates/api_clients/grok_api_client/src/api/requests/video_edit/request_types.rs similarity index 100% rename from crates/api_clients/grok_api_client/src/requests/video_edit/request_types.rs rename to crates/api_clients/grok_api_client/src/api/requests/video_edit/request_types.rs diff --git a/crates/api_clients/grok_api_client/src/requests/video_edit/video_edit.rs b/crates/api_clients/grok_api_client/src/api/requests/video_edit/video_edit.rs similarity index 97% rename from crates/api_clients/grok_api_client/src/requests/video_edit/video_edit.rs rename to crates/api_clients/grok_api_client/src/api/requests/video_edit/video_edit.rs index d68b583b1c..cf8aabccd4 100644 --- a/crates/api_clients/grok_api_client/src/requests/video_edit/video_edit.rs +++ b/crates/api_clients/grok_api_client/src/api/requests/video_edit/video_edit.rs @@ -5,8 +5,8 @@ use crate::error::classify_grok_http_error::classify_grok_http_error; use crate::error::grok_client_error::GrokClientError; use crate::error::grok_error::GrokError; use crate::error::grok_generic_api_error::GrokGenericApiError; -use crate::requests::video_edit::request_types::*; -use crate::requests::xai_host::XAI_API_BASE_URL; +use crate::api::requests::video_edit::request_types::*; +use crate::api::requests::xai_host::XAI_API_BASE_URL; const DEFAULT_MODEL: &str = "grok-imagine-video"; @@ -41,7 +41,7 @@ pub enum VideoSource { Url(String), /// xAI file identifier (`file_...`) obtained from a successful upload via - /// [`crate::requests::upload_file::upload_file::upload_file`]. + /// [`crate::api::requests::upload_file::upload_file::upload_file`]. /// /// Docs: /// - diff --git a/crates/api_clients/grok_api_client/src/requests/video_extension/mod.rs b/crates/api_clients/grok_api_client/src/api/requests/video_extension/mod.rs similarity index 100% rename from crates/api_clients/grok_api_client/src/requests/video_extension/mod.rs rename to crates/api_clients/grok_api_client/src/api/requests/video_extension/mod.rs diff --git a/crates/api_clients/grok_api_client/src/requests/video_extension/request_types.rs b/crates/api_clients/grok_api_client/src/api/requests/video_extension/request_types.rs similarity index 100% rename from crates/api_clients/grok_api_client/src/requests/video_extension/request_types.rs rename to crates/api_clients/grok_api_client/src/api/requests/video_extension/request_types.rs diff --git a/crates/api_clients/grok_api_client/src/requests/video_extension/video_extension.rs b/crates/api_clients/grok_api_client/src/api/requests/video_extension/video_extension.rs similarity index 97% rename from crates/api_clients/grok_api_client/src/requests/video_extension/video_extension.rs rename to crates/api_clients/grok_api_client/src/api/requests/video_extension/video_extension.rs index 795e655286..1349eaac38 100644 --- a/crates/api_clients/grok_api_client/src/requests/video_extension/video_extension.rs +++ b/crates/api_clients/grok_api_client/src/api/requests/video_extension/video_extension.rs @@ -5,8 +5,8 @@ use crate::error::classify_grok_http_error::classify_grok_http_error; use crate::error::grok_client_error::GrokClientError; use crate::error::grok_error::GrokError; use crate::error::grok_generic_api_error::GrokGenericApiError; -use crate::requests::video_extension::request_types::*; -use crate::requests::xai_host::XAI_API_BASE_URL; +use crate::api::requests::video_extension::request_types::*; +use crate::api::requests::xai_host::XAI_API_BASE_URL; const DEFAULT_MODEL: &str = "grok-imagine-video"; @@ -41,7 +41,7 @@ pub enum VideoExtensionSource { Url(String), /// xAI file identifier (`file_...`) obtained from a successful upload via - /// [`crate::requests::upload_file::upload_file::upload_file`]. + /// [`crate::api::requests::upload_file::upload_file::upload_file`]. /// /// Docs: /// - diff --git a/crates/api_clients/grok_api_client/src/requests/video_generation/mod.rs b/crates/api_clients/grok_api_client/src/api/requests/video_generation/mod.rs similarity index 100% rename from crates/api_clients/grok_api_client/src/requests/video_generation/mod.rs rename to crates/api_clients/grok_api_client/src/api/requests/video_generation/mod.rs diff --git a/crates/api_clients/grok_api_client/src/requests/video_generation/request_types.rs b/crates/api_clients/grok_api_client/src/api/requests/video_generation/request_types.rs similarity index 100% rename from crates/api_clients/grok_api_client/src/requests/video_generation/request_types.rs rename to crates/api_clients/grok_api_client/src/api/requests/video_generation/request_types.rs diff --git a/crates/api_clients/grok_api_client/src/requests/video_generation/video_generation.rs b/crates/api_clients/grok_api_client/src/api/requests/video_generation/video_generation.rs similarity index 98% rename from crates/api_clients/grok_api_client/src/requests/video_generation/video_generation.rs rename to crates/api_clients/grok_api_client/src/api/requests/video_generation/video_generation.rs index 763f3d3429..6c0f66650f 100644 --- a/crates/api_clients/grok_api_client/src/requests/video_generation/video_generation.rs +++ b/crates/api_clients/grok_api_client/src/api/requests/video_generation/video_generation.rs @@ -6,8 +6,8 @@ use crate::error::grok_client_error::GrokClientError; use crate::error::grok_error::GrokError; use crate::error::grok_generic_api_error::GrokGenericApiError; use crate::error::grok_specific_api_error::GrokSpecificApiError; -use crate::requests::video_generation::request_types::*; -use crate::requests::xai_host::XAI_API_BASE_URL; +use crate::api::requests::video_generation::request_types::*; +use crate::api::requests::xai_host::XAI_API_BASE_URL; const DEFAULT_MODEL: &str = "grok-imagine-video"; @@ -57,7 +57,7 @@ pub enum VideoImageSource { Url(String), /// xAI file identifier (`file_...`) obtained from a successful upload via - /// [`crate::requests::upload_file::upload_file::upload_file`]. The file + /// [`crate::api::requests::upload_file::upload_file::upload_file`]. The file /// must still exist at request time. /// /// Docs: diff --git a/crates/api_clients/grok_api_client/src/requests/video_status/mod.rs b/crates/api_clients/grok_api_client/src/api/requests/video_status/mod.rs similarity index 100% rename from crates/api_clients/grok_api_client/src/requests/video_status/mod.rs rename to crates/api_clients/grok_api_client/src/api/requests/video_status/mod.rs diff --git a/crates/api_clients/grok_api_client/src/requests/video_status/request_types.rs b/crates/api_clients/grok_api_client/src/api/requests/video_status/request_types.rs similarity index 100% rename from crates/api_clients/grok_api_client/src/requests/video_status/request_types.rs rename to crates/api_clients/grok_api_client/src/api/requests/video_status/request_types.rs diff --git a/crates/api_clients/grok_api_client/src/requests/video_status/video_status.rs b/crates/api_clients/grok_api_client/src/api/requests/video_status/video_status.rs similarity index 98% rename from crates/api_clients/grok_api_client/src/requests/video_status/video_status.rs rename to crates/api_clients/grok_api_client/src/api/requests/video_status/video_status.rs index 52335661f7..5e04664c57 100644 --- a/crates/api_clients/grok_api_client/src/requests/video_status/video_status.rs +++ b/crates/api_clients/grok_api_client/src/api/requests/video_status/video_status.rs @@ -5,8 +5,8 @@ use crate::error::classify_grok_http_error::classify_grok_http_error; use crate::error::grok_client_error::GrokClientError; use crate::error::grok_error::GrokError; use crate::error::grok_generic_api_error::GrokGenericApiError; -use crate::requests::video_status::request_types::*; -use crate::requests::xai_host::XAI_API_BASE_URL; +use crate::api::requests::video_status::request_types::*; +use crate::api::requests::xai_host::XAI_API_BASE_URL; // ── Public args ── diff --git a/crates/api_clients/grok_api_client/src/requests/xai_host.rs b/crates/api_clients/grok_api_client/src/api/requests/xai_host.rs similarity index 100% rename from crates/api_clients/grok_api_client/src/requests/xai_host.rs rename to crates/api_clients/grok_api_client/src/api/requests/xai_host.rs diff --git a/crates/api_clients/grok_api_client/src/requests/image_types/image_aspect_ratio.rs b/crates/api_clients/grok_api_client/src/api/types/image_types/image_aspect_ratio.rs similarity index 100% rename from crates/api_clients/grok_api_client/src/requests/image_types/image_aspect_ratio.rs rename to crates/api_clients/grok_api_client/src/api/types/image_types/image_aspect_ratio.rs diff --git a/crates/api_clients/grok_api_client/src/requests/image_types/image_model.rs b/crates/api_clients/grok_api_client/src/api/types/image_types/image_model.rs similarity index 100% rename from crates/api_clients/grok_api_client/src/requests/image_types/image_model.rs rename to crates/api_clients/grok_api_client/src/api/types/image_types/image_model.rs diff --git a/crates/api_clients/grok_api_client/src/requests/image_types/image_resolution.rs b/crates/api_clients/grok_api_client/src/api/types/image_types/image_resolution.rs similarity index 100% rename from crates/api_clients/grok_api_client/src/requests/image_types/image_resolution.rs rename to crates/api_clients/grok_api_client/src/api/types/image_types/image_resolution.rs diff --git a/crates/api_clients/grok_api_client/src/requests/image_types/image_response_format.rs b/crates/api_clients/grok_api_client/src/api/types/image_types/image_response_format.rs similarity index 100% rename from crates/api_clients/grok_api_client/src/requests/image_types/image_response_format.rs rename to crates/api_clients/grok_api_client/src/api/types/image_types/image_response_format.rs diff --git a/crates/api_clients/grok_api_client/src/requests/image_types/mod.rs b/crates/api_clients/grok_api_client/src/api/types/image_types/mod.rs similarity index 61% rename from crates/api_clients/grok_api_client/src/requests/image_types/mod.rs rename to crates/api_clients/grok_api_client/src/api/types/image_types/mod.rs index 47f24cbca6..93ae060304 100644 --- a/crates/api_clients/grok_api_client/src/requests/image_types/mod.rs +++ b/crates/api_clients/grok_api_client/src/api/types/image_types/mod.rs @@ -1,7 +1,7 @@ //! Shared image-endpoint enums (model, aspect ratio, resolution, response format). //! -//! These are reused by both [`crate::requests::image_generation`] and -//! [`crate::requests::image_edit`] so callers can pass type-safe values +//! These are reused by both [`crate::api::requests::image_generation`] and +//! [`crate::api::requests::image_edit`] so callers can pass type-safe values //! instead of memorising the allowed strings. pub mod image_aspect_ratio; diff --git a/crates/api_clients/grok_api_client/src/api/types/mod.rs b/crates/api_clients/grok_api_client/src/api/types/mod.rs new file mode 100644 index 0000000000..bc20be50a2 --- /dev/null +++ b/crates/api_clients/grok_api_client/src/api/types/mod.rs @@ -0,0 +1 @@ +pub mod image_types; diff --git a/crates/api_clients/grok_api_client/src/lib.rs b/crates/api_clients/grok_api_client/src/lib.rs index e9c19b8190..ed30825f99 100644 --- a/crates/api_clients/grok_api_client/src/lib.rs +++ b/crates/api_clients/grok_api_client/src/lib.rs @@ -2,6 +2,6 @@ pub(crate) mod test_utils; // Public API +pub mod api; pub mod creds; pub mod error; -pub mod requests;