mirror of
https://github.com/storytold/artcraft.git
synced 2026-11-17 15:15:17 +00:00
plumb dependency
This commit is contained in:
1 parent
2ad6a23400
commit
9b776b5f0f
4 files changed
+34
-16
No files matched your search
@@ -8,6 +8,7 @@ use crate::core::lifecycle::startup::tasks::spawn_sora_task_polling_thread::spaw
|
||||
use crate::core::lifecycle::startup::tasks::spawn_storyteller_threads::spawn_storyteller_threads;
|
||||
use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
|
||||
use crate::core::state::artcraft_platform_info::ArtcraftPlatformInfo;
|
||||
use crate::core::state::artcraft_usage_tracker::artcraft_usage_tracker::ArtcraftUsageTracker;
|
||||
use crate::core::state::data_dir::app_data_root::AppDataRoot;
|
||||
use crate::services::grok::state::grok_credential_manager::GrokCredentialManager;
|
||||
use crate::services::grok::state::grok_image_prompt_queue::GrokImagePromptQueue;
|
||||
@@ -29,6 +30,7 @@ pub async fn handle_tauri_startup(
|
||||
root: AppDataRoot,
|
||||
app_env_configs: AppEnvConfigs,
|
||||
artcraft_platform_info: ArtcraftPlatformInfo,
|
||||
artcraft_usage_tracker: ArtcraftUsageTracker,
|
||||
storyteller_creds_manager: StorytellerCredentialManager,
|
||||
sora_credential_manager: SoraCredentialManager,
|
||||
sora_task_queue: SoraTaskQueue,
|
||||
@@ -61,6 +63,7 @@ pub async fn handle_tauri_startup(
|
||||
spawn_storyteller_threads(
|
||||
&app,
|
||||
&app_env_configs,
|
||||
&artcraft_usage_tracker,
|
||||
&artcraft_platform_info,
|
||||
&task_database,
|
||||
&storyteller_creds_manager,
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
|
||||
use crate::core::state::artcraft_platform_info::ArtcraftPlatformInfo;
|
||||
use crate::core::state::artcraft_usage_tracker::artcraft_usage_tracker::ArtcraftUsageTracker;
|
||||
use crate::core::state::task_database::TaskDatabase;
|
||||
use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
|
||||
use crate::services::storyteller::threads::storyteller_activity_thread::storyteller_activity_thread;
|
||||
@@ -10,6 +11,7 @@ use tauri::{AppHandle, Manager};
|
||||
pub fn spawn_storyteller_threads(
|
||||
app: &AppHandle,
|
||||
app_env_configs: &AppEnvConfigs,
|
||||
artcraft_usage_tracker: &ArtcraftUsageTracker,
|
||||
artcraft_platform_info: &ArtcraftPlatformInfo,
|
||||
task_database: &TaskDatabase,
|
||||
storyteller_creds_manager: &StorytellerCredentialManager,
|
||||
@@ -25,6 +27,7 @@ pub fn spawn_storyteller_threads(
|
||||
tauri::async_runtime::spawn(storyteller_activity_thread(
|
||||
app_env_configs.clone(),
|
||||
artcraft_platform_info.clone(),
|
||||
artcraft_usage_tracker.clone(),
|
||||
storyteller_creds_manager.clone(),
|
||||
));
|
||||
|
||||
|
||||
@@ -72,6 +72,7 @@ use tauri_plugin_dialog;
|
||||
use tauri_plugin_http;
|
||||
use tauri_plugin_log::Target;
|
||||
use tauri_plugin_log::TargetKind;
|
||||
use crate::core::state::artcraft_usage_tracker::artcraft_usage_tracker::ArtcraftUsageTracker;
|
||||
|
||||
#[cfg_attr(mobile, tauri::mobile_entry_point)]
|
||||
pub fn run() {
|
||||
@@ -124,6 +125,9 @@ pub fn run() {
|
||||
|
||||
let worldlabs_bearer_bridge = WorldlabsBearerBridge::empty();
|
||||
let worldlabs_bearer_bridge_2 = worldlabs_bearer_bridge.clone();
|
||||
|
||||
let artcraft_usage_tracker = ArtcraftUsageTracker::new();
|
||||
let artcraft_usage_tracker_2 = artcraft_usage_tracker.clone();
|
||||
|
||||
println!("Initializing backend runtime...");
|
||||
|
||||
@@ -159,6 +163,7 @@ pub fn run() {
|
||||
root,
|
||||
env_config,
|
||||
artcraft_platform_info_2,
|
||||
artcraft_usage_tracker_2,
|
||||
storyteller_creds,
|
||||
sora_creds,
|
||||
sora_tasks,
|
||||
@@ -181,6 +186,7 @@ pub fn run() {
|
||||
.manage(app_env_configs)
|
||||
.manage(app_preferences)
|
||||
.manage(artcraft_platform_info)
|
||||
.manage(artcraft_usage_tracker)
|
||||
.manage(grok_creds_manager)
|
||||
.manage(grok_prompt_queue)
|
||||
.manage(midjourney_creds_manager)
|
||||
|
||||
+22
-16
@@ -29,6 +29,7 @@ use storyteller_client::error::api_error::ApiError;
|
||||
use storyteller_client::error::storyteller_error::StorytellerError;
|
||||
use tauri::AppHandle;
|
||||
use tokens::tokens::app_session::AppSessionToken;
|
||||
use crate::core::state::artcraft_usage_tracker::artcraft_usage_tracker::ArtcraftUsageTracker;
|
||||
|
||||
// TODO: Configure this with the build and increment.
|
||||
const CLIENT_NAME : &str = "artcraft";
|
||||
@@ -39,6 +40,7 @@ const ERROR_SLEEP_MILLIS : u64 = 1_000 * 60 * 3; // 3 minutes;
|
||||
pub async fn storyteller_activity_thread(
|
||||
app_env_configs: AppEnvConfigs,
|
||||
artcraft_platform_info: ArtcraftPlatformInfo,
|
||||
artcraft_usage_tracker: ArtcraftUsageTracker,
|
||||
storyteller_creds_manager: StorytellerCredentialManager,
|
||||
) -> ! {
|
||||
let startup = Instant::now();
|
||||
@@ -49,6 +51,7 @@ pub async fn storyteller_activity_thread(
|
||||
loop {
|
||||
let res = polling_loop(
|
||||
&app_env_configs,
|
||||
&artcraft_usage_tracker,
|
||||
&storyteller_creds_manager,
|
||||
startup,
|
||||
&artcraft_platform_info,
|
||||
@@ -64,6 +67,7 @@ pub async fn storyteller_activity_thread(
|
||||
|
||||
async fn polling_loop(
|
||||
app_env_configs: &AppEnvConfigs,
|
||||
artcraft_usage_tracker: &ArtcraftUsageTracker,
|
||||
storyteller_creds_manager: &StorytellerCredentialManager,
|
||||
startup: Instant,
|
||||
artcraft_platform_info: &ArtcraftPlatformInfo,
|
||||
@@ -86,6 +90,8 @@ async fn polling_loop(
|
||||
},
|
||||
};
|
||||
|
||||
let usage_data = artcraft_usage_tracker.get()?;
|
||||
|
||||
let time_since_startup = Instant::now().duration_since(startup);
|
||||
|
||||
let request = LogAppActiveUserRequest {
|
||||
@@ -95,22 +101,22 @@ async fn polling_loop(
|
||||
maybe_os_platform: Some(artcraft_platform_info.os_platform.as_str().to_owned()),
|
||||
maybe_os_version: Some(artcraft_platform_info.os_version.clone()),
|
||||
maybe_session_duration_seconds: Some(time_since_startup.as_secs()),
|
||||
total_generation_count: None,
|
||||
image_generation_count: None,
|
||||
video_generation_count: None,
|
||||
object_generation_count: None,
|
||||
text_to_image_count: None,
|
||||
image_to_image_count: None,
|
||||
text_to_video_count: None,
|
||||
image_to_video_count: None,
|
||||
text_to_object_count: None,
|
||||
image_to_object_count: None,
|
||||
image_page_prompt_count: None,
|
||||
video_page_prompt_count: None,
|
||||
edit_page_prompt_count: None,
|
||||
stage_page_prompt_count: None,
|
||||
object_page_prompt_count: None,
|
||||
other_page_prompt_count: None,
|
||||
total_generation_count: Some(usage_data.total_generation_count),
|
||||
image_generation_count: Some(usage_data.image_generation_count),
|
||||
video_generation_count: Some(usage_data.video_generation_count),
|
||||
object_generation_count: Some(usage_data.object_generation_count),
|
||||
text_to_image_count: Some(usage_data.text_to_image_count),
|
||||
image_to_image_count: Some(usage_data.image_to_image_count),
|
||||
text_to_video_count: Some(usage_data.text_to_video_count),
|
||||
image_to_video_count: Some(usage_data.image_to_video_count),
|
||||
text_to_object_count: Some(usage_data.text_to_object_count),
|
||||
image_to_object_count: Some(usage_data.image_to_object_count),
|
||||
image_page_prompt_count: Some(usage_data.image_page_prompt_count),
|
||||
video_page_prompt_count: Some(usage_data.video_page_prompt_count),
|
||||
edit_page_prompt_count: Some(usage_data.edit_page_prompt_count),
|
||||
stage_page_prompt_count: Some(usage_data.stage_page_prompt_count),
|
||||
object_page_prompt_count: Some(usage_data.object_page_prompt_count),
|
||||
other_page_prompt_count: Some(usage_data.other_page_prompt_count),
|
||||
};
|
||||
|
||||
debug!("Logging active user with storyteller.");
|
||||
|
||||
Reference in new issue
Block a user