mirror of
https://github.com/storytold/artcraft.git
synced 2026-11-18 07:35:19 +00:00
rename consumer client
This commit is contained in:
1 parent
315ae3bdb7
commit
85aa28520e
63 files changed
+62
-62
No files matched your search
Generated
+39
-39
@@ -731,7 +731,7 @@ dependencies = [
|
||||
"url_utils",
|
||||
"web_base64",
|
||||
"workspace-build-acceleration",
|
||||
"world_labs_consumer_client",
|
||||
"worldlabs_consumer_client",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -15093,44 +15093,6 @@ dependencies = [
|
||||
"zstd-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "world_labs_consumer_client"
|
||||
version = "0.0.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"base64 0.22.1",
|
||||
"bstr",
|
||||
"byteorder",
|
||||
"chrono",
|
||||
"cloudflare_errors",
|
||||
"cloudflare_mitigation",
|
||||
"cookie_store 0.0.1",
|
||||
"env",
|
||||
"env_logger 0.11.9",
|
||||
"errors",
|
||||
"filesys",
|
||||
"futures 0.3.31",
|
||||
"http_headers",
|
||||
"indexmap 2.9.0",
|
||||
"jwt_light",
|
||||
"log",
|
||||
"log4rs",
|
||||
"once_cell",
|
||||
"regex",
|
||||
"scraper 0.24.0",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"sha2 0.11.0-rc.2",
|
||||
"test_data",
|
||||
"testing",
|
||||
"tokio",
|
||||
"url",
|
||||
"uuid 1.18.1",
|
||||
"workspace-build-acceleration",
|
||||
"wreq",
|
||||
"wreq-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "worldlabs-job"
|
||||
version = "0.0.1"
|
||||
@@ -15182,6 +15144,44 @@ dependencies = [
|
||||
"wreq",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "worldlabs_consumer_client"
|
||||
version = "0.0.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"base64 0.22.1",
|
||||
"bstr",
|
||||
"byteorder",
|
||||
"chrono",
|
||||
"cloudflare_errors",
|
||||
"cloudflare_mitigation",
|
||||
"cookie_store 0.0.1",
|
||||
"env",
|
||||
"env_logger 0.11.9",
|
||||
"errors",
|
||||
"filesys",
|
||||
"futures 0.3.31",
|
||||
"http_headers",
|
||||
"indexmap 2.9.0",
|
||||
"jwt_light",
|
||||
"log",
|
||||
"log4rs",
|
||||
"once_cell",
|
||||
"regex",
|
||||
"scraper 0.24.0",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"sha2 0.11.0-rc.2",
|
||||
"test_data",
|
||||
"testing",
|
||||
"tokio",
|
||||
"url",
|
||||
"uuid 1.18.1",
|
||||
"workspace-build-acceleration",
|
||||
"wreq",
|
||||
"wreq-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wreq"
|
||||
version = "6.0.0-rc.28"
|
||||
|
||||
+2
-2
@@ -21,7 +21,7 @@ members = [
|
||||
"crates/api_clients/runwayml_client",
|
||||
"crates/api_clients/thumbnail_generator",
|
||||
"crates/api_clients/worldlabs_api_client",
|
||||
"crates/api_clients/world_labs_consumer_client",
|
||||
"crates/api_clients/worldlabs_consumer_client",
|
||||
|
||||
# CLI tools for operations, etc.
|
||||
"crates/cli/devenv/dev-database-seed",
|
||||
@@ -263,7 +263,7 @@ url_utils = { path = "crates/lib/url_utils" }
|
||||
users = { path = "crates/lib/users" }
|
||||
web_base64 = { path = "crates/lib/data/web_base64" }
|
||||
worldlabs_api_client = { path = "crates/api_clients/worldlabs_api_client" }
|
||||
world_labs_consumer_client = { path = "crates/api_clients/world_labs_consumer_client" }
|
||||
worldlabs_consumer_client = { path = "crates/api_clients/worldlabs_consumer_client" }
|
||||
|
||||
# External libs
|
||||
# Centrally pinned versions so that we can uniformly upgrade/downgrade versions across the workspace
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
[package]
|
||||
name = "world_labs_consumer_client"
|
||||
name = "worldlabs_consumer_client"
|
||||
edition = "2024"
|
||||
version = "0.0.1"
|
||||
publish = false
|
||||
@@ -8,7 +8,7 @@ publish = false
|
||||
normal = ["workspace-build-acceleration"]
|
||||
|
||||
[lib]
|
||||
name = "world_labs_consumer_client"
|
||||
name = "worldlabs_consumer_client"
|
||||
path = "src/lib.rs"
|
||||
|
||||
[dependencies]
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -46,7 +46,7 @@ sqlite_tasks.workspace = true
|
||||
tokens.workspace = true
|
||||
url_utils.workspace = true
|
||||
web_base64.workspace = true
|
||||
world_labs_consumer_client.workspace = true
|
||||
worldlabs_consumer_client.workspace = true
|
||||
|
||||
# External
|
||||
anyhow.workspace = true
|
||||
|
||||
@@ -11,7 +11,7 @@ use midjourney_client::error::midjourney_error::MidjourneyError;
|
||||
use openai_sora_client::error::sora_error::SoraError;
|
||||
use artcraft_client::error::storyteller_error::StorytellerError;
|
||||
use artcraft_router::errors::download_error::DownloadError;
|
||||
use world_labs_consumer_client::error::world_labs_error::WorldLabsError;
|
||||
use worldlabs_consumer_client::error::world_labs_error::WorldLabsError;
|
||||
//use fal_client::error::fal_error_plus::FalErrorPlus;
|
||||
|
||||
#[derive(Debug)]
|
||||
|
||||
+2
-2
@@ -19,8 +19,8 @@ use std::path::PathBuf;
|
||||
use artcraft_client::endpoints::media_files::get_media_file::get_media_file;
|
||||
use tauri::AppHandle;
|
||||
use tokens::tokens::media_files::MediaFileToken;
|
||||
use world_labs_consumer_client::credentials::world_labs_cookies::WorldLabsCookies;
|
||||
use world_labs_consumer_client::recipes::upload_image_and_create_world_with_retry::{upload_image_and_create_world_with_retry, FileBytesOrPath, UploadImageAndCreateWorldWithRetryArgs};
|
||||
use worldlabs_consumer_client::credentials::world_labs_cookies::WorldLabsCookies;
|
||||
use worldlabs_consumer_client::recipes::upload_image_and_create_world_with_retry::{upload_image_and_create_world_with_retry, FileBytesOrPath, UploadImageAndCreateWorldWithRetryArgs};
|
||||
|
||||
pub(super) const MAX_IMAGES: usize = 10;
|
||||
|
||||
|
||||
+2
-2
@@ -5,8 +5,8 @@ use errors::AnyhowResult;
|
||||
use log::{error, info};
|
||||
use serde_derive::Serialize;
|
||||
use tauri::State;
|
||||
use world_labs_consumer_client::credentials::jwt_claims::JwtClaims;
|
||||
use world_labs_consumer_client::error::world_labs_error::WorldLabsError;
|
||||
use worldlabs_consumer_client::credentials::jwt_claims::JwtClaims;
|
||||
use worldlabs_consumer_client::error::world_labs_error::WorldLabsError;
|
||||
|
||||
#[derive(Serialize)]
|
||||
pub struct WorldlabsGetCredentialInfoResponse {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use cookie_store::cookie_store::CookieStore;
|
||||
use world_labs_consumer_client::credentials::world_labs_bearer_token::WorldLabsBearerToken;
|
||||
use world_labs_consumer_client::credentials::world_labs_cookies::WorldLabsCookies;
|
||||
use world_labs_consumer_client::credentials::worldlabs_refresh_token::WorldLabsRefreshToken;
|
||||
use worldlabs_consumer_client::credentials::world_labs_bearer_token::WorldLabsBearerToken;
|
||||
use worldlabs_consumer_client::credentials::world_labs_cookies::WorldLabsCookies;
|
||||
use worldlabs_consumer_client::credentials::worldlabs_refresh_token::WorldLabsRefreshToken;
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct WorldlabsCredentialHolder {
|
||||
|
||||
+3
-3
@@ -6,9 +6,9 @@ use errors::AnyhowResult;
|
||||
use log::{info, warn};
|
||||
use std::fs::read_to_string;
|
||||
use std::sync::{Arc, RwLock};
|
||||
use world_labs_consumer_client::credentials::world_labs_bearer_token::WorldLabsBearerToken;
|
||||
use world_labs_consumer_client::credentials::world_labs_cookies::WorldLabsCookies;
|
||||
use world_labs_consumer_client::credentials::worldlabs_refresh_token::WorldLabsRefreshToken;
|
||||
use worldlabs_consumer_client::credentials::world_labs_bearer_token::WorldLabsBearerToken;
|
||||
use worldlabs_consumer_client::credentials::world_labs_cookies::WorldLabsCookies;
|
||||
use worldlabs_consumer_client::credentials::worldlabs_refresh_token::WorldLabsRefreshToken;
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct WorldlabsCredentialManager {
|
||||
|
||||
+5
-5
@@ -58,11 +58,11 @@ use tauri::AppHandle;
|
||||
use tokens::tokens::batch_generations::BatchGenerationToken;
|
||||
use url::Url;
|
||||
use url_utils::download_extension::extract_download_extension_from_url::extract_download_extension_from_url_str;
|
||||
use world_labs_consumer_client::api::api_types::world_id::WorldObjectId;
|
||||
use world_labs_consumer_client::api::requests::worlds::poll_world_status::{poll_world_status, PollWorldStatusArgs};
|
||||
use world_labs_consumer_client::credentials::world_labs_bearer_token::WorldLabsBearerToken;
|
||||
use world_labs_consumer_client::credentials::world_labs_cookies::WorldLabsCookies;
|
||||
use world_labs_consumer_client::credentials::worldlabs_refresh_token::WorldLabsRefreshToken;
|
||||
use worldlabs_consumer_client::api::api_types::world_id::WorldObjectId;
|
||||
use worldlabs_consumer_client::api::requests::worlds::poll_world_status::{poll_world_status, PollWorldStatusArgs};
|
||||
use worldlabs_consumer_client::credentials::world_labs_bearer_token::WorldLabsBearerToken;
|
||||
use worldlabs_consumer_client::credentials::world_labs_cookies::WorldLabsCookies;
|
||||
use worldlabs_consumer_client::credentials::worldlabs_refresh_token::WorldLabsRefreshToken;
|
||||
|
||||
pub async fn worldlabs_marble_task_polling(
|
||||
app_handle: AppHandle,
|
||||
|
||||
+2
-2
@@ -24,8 +24,8 @@ use openai_sora_client::creds::sora_credential_set::SoraCredentialSet;
|
||||
use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
|
||||
use openai_sora_client::utils::has_session_cookie::{has_session_cookie, SessionCookiePresence};
|
||||
use tauri::{AppHandle, Manager, WebviewWindow};
|
||||
use world_labs_consumer_client::credentials::world_labs_bearer_token::WorldLabsBearerToken;
|
||||
use world_labs_consumer_client::credentials::worldlabs_refresh_token::WorldLabsRefreshToken;
|
||||
use worldlabs_consumer_client::credentials::world_labs_bearer_token::WorldLabsBearerToken;
|
||||
use worldlabs_consumer_client::credentials::worldlabs_refresh_token::WorldLabsRefreshToken;
|
||||
|
||||
pub async fn worldlabs_login_window_thread(
|
||||
app: AppHandle,
|
||||
|
||||
Reference in new issue
Block a user