mirror of
https://github.com/storytold/artcraft.git
synced 2026-11-16 06:42:14 +00:00
refactor
This commit is contained in:
1 parent
e1fc1e678c
commit
db4e5ada29
39 files changed
+42
-40
No files matched your search
@@ -0,0 +1,2 @@
|
||||
pub mod requests;
|
||||
pub mod types;
|
||||
+2
-2
@@ -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 ──
|
||||
|
||||
File renamed without changes.
File renamed without changes.
+1
-1
@@ -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 ──
|
||||
|
||||
File renamed without changes.
+2
-2
@@ -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 ──
|
||||
|
||||
File renamed without changes.
File renamed without changes.
+7
-7
@@ -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).
|
||||
///
|
||||
File renamed without changes.
File renamed without changes.
+7
-7
@@ -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() {
|
||||
File renamed without changes.
File renamed without changes.
-1
@@ -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;
|
||||
File renamed without changes.
File renamed without changes.
+6
-6
@@ -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<u64>,
|
||||
File renamed without changes.
File renamed without changes.
+3
-3
@@ -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:
|
||||
/// - <https://docs.x.ai/developers/rest-api-reference/files/upload>
|
||||
File renamed without changes.
File renamed without changes.
+3
-3
@@ -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:
|
||||
/// - <https://docs.x.ai/developers/rest-api-reference/files/upload>
|
||||
File renamed without changes.
File renamed without changes.
+3
-3
@@ -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:
|
||||
File renamed without changes.
File renamed without changes.
+2
-2
@@ -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 ──
|
||||
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+2
-2
@@ -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;
|
||||
@@ -0,0 +1 @@
|
||||
pub mod image_types;
|
||||
@@ -2,6 +2,6 @@
|
||||
pub(crate) mod test_utils;
|
||||
|
||||
// Public API
|
||||
pub mod api;
|
||||
pub mod creds;
|
||||
pub mod error;
|
||||
pub mod requests;
|
||||
Reference in new issue
Block a user