Ok fixed some minor issues.

.github/workflows/tauri-publish-2d.yml

@@ -48,13 +48,13 @@ jobs:
         # You can remove the one that doesn't apply to your app to speed up the workflow a bit.
 
       - name: install frontend dependencies
-        run: cd ./crates/desktop/artcraft && yarn install # change this to npm, pnpm or bun depending on which one you use.
+        run: cd ./crates/desktop/tauri-artcraft && yarn install # change this to npm, pnpm or bun depending on which one you use.
 
       - uses: tauri-apps/tauri-action@v0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          projectPath: ./crates/desktop/artcraft
+          projectPath: ./crates/desktop/tauri-artcraft
           tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
           releaseName: 'App v__VERSION__'
           releaseBody: 'See the assets to download this version and install.'

.idea/codeStyles/Project.xml

@@ -1,13 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <codeStyleSettings language="Rust">
-      <option name="RIGHT_MARGIN" value="180" />
-      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="false" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

Cargo.toml

@@ -24,7 +24,8 @@ members = [
   "crates/cli/production/migration-tool",
 
   # Desktop apps
-  "crates/desktop/artcraft",
+  "crates/desktop/tauri-artcraft",
+  "crates/desktop/tauri-realtime",
 
   # Shared libraries
   "crates/lib/actix_cors_configs",
@@ -38,7 +39,6 @@ members = [
   "crates/lib/bootstrap",
   "crates/lib/bucket_paths",
   "crates/lib/caching/memory_caching",
-  "crates/lib/caching/memory_store",
   "crates/lib/caching/redis_caching",
   "crates/lib/concurrency",
   "crates/lib/cookies",
@@ -117,7 +117,6 @@ members = [
   "crates/vendor/candle/candle-transformers",
   "crates/vendor/candle/tensor-tools",
   "crates/vendor/limitation",
-  "crates/vendor/tauri-plugin-http",
   # NB(bt,2023-12-12): Newrelic keeps breaking with upgrades. Kill for now.
   #"crates/vendor/newrelic-telemetry-sdk-rust",
 
@@ -148,10 +147,6 @@ publish = false
 #  - tauri-runtime-wry
 #  - tauri-utils
 #
-# Broken on Windows:
-#  - core-foundation
-#  - core-foundation-sys
-#
 workspace-build-acceleration = { path = "crates/workspace-build-acceleration" }
 
 # External libs
@@ -162,7 +157,6 @@ base64 = "0.22.1"
 chrono = { version = "0.4.40", features = ["serde"] }
 cookie = "0.18.1"
 hex-literal = "1.0.0"
-indexmap = "2.9.0"
 log = "0.4.27"
 once_cell = "1.21.3"
 rand = "0.9.0"
@@ -173,7 +167,6 @@ serde_derive = "1.0.219"
 serde_json = "1.0.140"
 serde_yaml = "0.9.1"
 sha3 = "0.10.8"
-tauri = { version = "2.4.1", features = ["unstable", "devtools"] } # NB: "devtools" prevents App Store distribution
 thiserror = "2.0.12"
 toml = "0.8.20"
 url = { version = "2.5.4", features = ["serde"] }
@@ -184,10 +177,8 @@ enums = { path = "crates/_types/enums" }
 enums_public = { path = "crates/_types/enums_public" }
 errors = { path = "crates/lib/errors" }
 filesys = { path = "crates/lib/files/filesys" }
-idempotency = { path = "crates/lib/idempotency" }
 images = { path = "crates/lib/files/images" }
 memory_caching = { path = "crates/lib/caching/memory_caching" }
-memory_store = { path = "crates/lib/caching/memory_store" }
 mimetypes = { path = "crates/lib/files/mimetypes" }
 openai_sora_client = { path = "crates/lib/api_clients/openai_sora_client" }
 primitives = { path = "crates/lib/data/primitives" }

crates/desktop/artcraft/capabilities/default.json

@@ -1,31 +0,0 @@
-{
-  "$schema": "../gen/schemas/desktop-schema.json",
-  "identifier": "default",
-  "description": "enables the default permissions",
-  "windows": [
-    "main"
-  ],
-  "permissions": [
-    "core:default",
-    "log:default",
-    "upload:allow-download",
-    "upload:default",
-    {
-      "identifier": "http:default",
-      "allow": [
-        {
-          "url": "https://*.storyteller.ai"
-        },
-        {
-          "url": "https://*.fakeyou.com"
-        }
-      ],
-      "deny": [
-        {
-          "url": "https://private.tauri.app"
-        }
-      ]
-    },
-    "dialog:default"
-  ]
-}

crates/desktop/artcraft/src/commands/app_preferences/get_app_preferences_command.rs

@@ -1,70 +0,0 @@
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-use errors::AnyhowResult;
-use log::{error, info};
-use serde_derive::Serialize;
-use tauri::{AppHandle, State};
-
-#[derive(Serialize)]
-pub struct GetAppPreferencesResponse {
-  pub preferences: AppPreferencesPayload,
-}
-
-#[derive(Serialize)]
-pub struct AppPreferencesPayload {
-  /// The downloads directory to use when a user downloads a file.
-  pub preferred_download_directory: PreferredDownloadDirectory,
-  
-  /// Play sounds on events.
-  pub play_sounds: bool,
-
-  /// Key pointing to file; defined in the frontend code.
-  /// Defined for enqueue since image enqueue can be async
-  pub enqueue_success_sound: Option<String>,
-
-  /// Key pointing to file; defined in the frontend code.
-  /// Defined for enqueue since image enqueue can be async
-  pub enqueue_failure_sound: Option<String>,
-
-  /// Key pointing to file; defined in the frontend code.
-  pub generation_success_sound: Option<String>,
-
-  /// Key pointing to file; defined in the frontend code.
-  pub generation_failure_sound: Option<String>,
-
-  /// Key pointing to file; defined in the frontend code.
-  #[deprecated]
-  pub generation_enqueue_sound: Option<String>,
-}
-
-
-#[tauri::command]
-pub async fn get_app_preferences_command(
-  app_prefs: State<'_, AppPreferencesManager>,
-) -> Result<GetAppPreferencesResponse, String> {
-  info!("get_app_preferences_command called");
-
-  let result = get_prefs(&app_prefs)
-      .await
-      .map_err(|err| {
-        error!("Error getting app preferences: {:?}", err);
-        format!("Error getting app preferences: {:?}", err)
-      })?;
-
-  Ok(GetAppPreferencesResponse {
-    preferences: result,
-  })
-}
-
-async fn get_prefs(app_prefs: &AppPreferencesManager) -> AnyhowResult<AppPreferencesPayload> {
-  let prefs = app_prefs.get_clone()?;
-  Ok(AppPreferencesPayload {
-    preferred_download_directory: prefs.preferred_download_directory,
-    play_sounds: prefs.play_sounds,
-    enqueue_success_sound: prefs.enqueue_success_sound,
-    enqueue_failure_sound: prefs.enqueue_failure_sound,
-    generation_success_sound: prefs.generation_success_sound,
-    generation_failure_sound: prefs.generation_failure_sound,
-    generation_enqueue_sound: prefs.generation_enqueue_sound,
-  })
-}

crates/desktop/artcraft/src/commands/app_preferences/mod.rs

@@ -1,2 +0,0 @@
-pub mod get_app_preferences_command;
-pub mod update_app_preference_command;

crates/desktop/artcraft/src/commands/app_preferences/update_app_preference_command.rs

@@ -1,122 +0,0 @@
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use anyhow::anyhow;
-use errors::AnyhowResult;
-use log::{error, info};
-use openai_sora_client::sora_error::SoraError::AnyhowError;
-use serde_derive::{Deserialize, Serialize};
-use tauri::{AppHandle, State};
-
-/// For now, we'll only update a single preference at a time.
-#[derive(Deserialize)]
-pub struct UpdateAppPreferencesRequest {
-  pub preference: PreferenceName,
-  /// We'll decode this with respect to the preference value.
-  pub value: Option<ValueType>,
-}
-
-#[derive(Deserialize, Debug)]
-#[serde(untagged)]
-pub enum ValueType {
-  Bool(bool),
-  String(String),
-  DownloadDirectory(PreferredDownloadDirectory),
-}
-
-#[derive(Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum PreferenceName {
-  PreferredDownloadDirectory,
-  PlaySounds,
-  EnqueueSuccessSound,
-  EnqueueFailureSound,
-  GenerationSuccessSound,
-  GenerationFailureSound,
-}
-
-#[derive(Serialize)]
-pub struct UpdateAppPreferencesResponse {
-  pub success: bool,
-}
-
-#[tauri::command]
-pub async fn update_app_preferences_command(
-  request: UpdateAppPreferencesRequest,
-  app_prefs: State<'_, AppPreferencesManager>,
-  app_data_root: State<'_, AppDataRoot>,
-) -> Result<UpdateAppPreferencesResponse, String> {
-  info!("update_app_preferences_command called");
-
-  update_prefs(request, &app_prefs, &app_data_root)
-      .await
-      .map_err(|err| {
-        error!("Error getting app preferences: {:?}", err);
-        format!("Error getting app preferences: {:?}", err)
-      })?;
-
-  Ok(UpdateAppPreferencesResponse {
-    success: true,
-  })
-}
-
-async fn update_prefs(
-  request: UpdateAppPreferencesRequest, 
-  app_prefs: &AppPreferencesManager,
-  app_data_root: &AppDataRoot,
-) -> AnyhowResult<()> {
-  let mut prefs = app_prefs.get_clone()?;
-  
-  info!("Value is: {:?}", request.value);
-  
-  match request.preference {
-    PreferenceName::PreferredDownloadDirectory => {
-      match request.value {
-        Some(ValueType::DownloadDirectory(dir)) => 
-          prefs.preferred_download_directory = dir,
-        _ =>
-          return Err(anyhow!("Invalid value: {:?}", request.value)),
-      }
-    }
-    PreferenceName::PlaySounds => {
-      match request.value {
-        Some(ValueType::Bool(val)) => 
-          prefs.play_sounds = val,
-        _ => 
-          return Err(anyhow!("Invalid value: {:?}", request.value)),
-      }
-    }
-    PreferenceName::EnqueueSuccessSound => {
-      prefs.enqueue_success_sound = request.value
-          .map(|val| string_value(&val))
-          .transpose()?;
-    }
-    PreferenceName::EnqueueFailureSound => {
-      prefs.enqueue_failure_sound = request.value
-          .map(|val| string_value(&val))
-          .transpose()?;
-    }
-    PreferenceName::GenerationSuccessSound => {
-      prefs.generation_success_sound = request.value
-          .map(|val| string_value(&val))
-          .transpose()?;
-    }
-    PreferenceName::GenerationFailureSound => {
-      prefs.generation_failure_sound = request.value
-          .map(|val| string_value(&val))
-          .transpose()?;
-    }
-  }
-  
-  app_prefs.set_clone(&prefs)?;
-  app_data_root.settings_dir().write_app_preferences(&prefs)?;
-  
-  Ok(())
-}
-
-fn string_value(value: &ValueType) -> AnyhowResult<String> {
-  match value {
-    ValueType::String(val) => Ok(val.to_string()),
-    _ => Err(anyhow!("Invalid value type: {:?}", value)),
-  }
-}

crates/desktop/artcraft/src/commands/command_response_wrapper.rs

@@ -1,132 +0,0 @@
-use serde::Serialize;
-use std::error::Error;
-use std::str::FromStr;
-
-/// Easy to use Result<T, E> type.
-pub type CommandResult<SuccessPayload, ErrType, ErrPayload> = 
-  Result<CommandSuccessResponseWrapper<SuccessPayload>, CommandErrorResponseWrapper<ErrType, ErrPayload>>;
-
-/// No inner payloads for this type. Just strings as messages.
-pub type SimpleCommandResult = CommandResult<(), (), ()>;
-
-/// Statuses for successful commands.
-#[derive(Serialize, Clone, Debug)]
-#[serde(rename_all = "snake_case")]
-pub enum CommandSuccessStatus {
-  Success, // 200
-}
-
-/// Statuses for errorful commands.
-#[derive(Serialize, Clone, Debug)]
-#[serde(rename_all = "snake_case")]
-pub enum CommandErrorStatus {
-  BadRequest, // 400
-  Unauthorized, // 401
-  TooManyRequests, // 429
-  ServerError, // 500
-}
-
-#[derive(Serialize, Debug)]
-pub struct CommandSuccessResponseWrapper<T: Serialize> {
-  /// Both "success" and "error" types have a `status` field for the frontend.
-  pub status: CommandSuccessStatus,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub success_message: Option<String>,
-  
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub payload: Option<T>,
-}
-
-#[derive(Serialize, Debug)]
-pub struct CommandErrorResponseWrapper<ErrType: Serialize, ErrPayload: Serialize> {
-  /// Both "success" and "error" types have a `status` field for the frontend.
-  pub status: CommandErrorStatus,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub error_message: Option<String>,
-  
-  /// Represents a "type" of error, preferably an enum without payloads.
-  /// Preferably this serializes to a string.
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub error_type: Option<ErrType>,
-  
-  /// Represents a full error details object or payload.
-  /// This could be a structure, message, or whatever.
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub error_details: Option<ErrPayload>,
-}
-
-
-impl CommandSuccessResponseWrapper<()> {
-  pub fn empty() -> Self {
-    CommandSuccessResponseWrapper {
-      status: CommandSuccessStatus::Success,
-      success_message: None,
-      payload: None,
-    }
-  }
-}
-
-/// NB: This is a hack because of `()` (a.k.a. the "unit" type) and `Serialize` trait coherence and overlap.
-/// We cannot currently implement a trait for `()` and generic `Serialize` because `()` itself implements 
-/// `Serialize`. Rust's `"specialization"`, which would let us account for this, is an unstable, nightly-only
-/// feature. So instead we manually mark all types other than `()` with `SerializeMarker` as a hack to 
-/// distinguish the two.
-trait SerializeMarker : Serialize {}
-
-// NB: () is Serialize! So we can't broadly implement just `T: Serialize`.
-impl From<()> for CommandSuccessResponseWrapper<()> {
-  fn from(_: ()) -> Self {
-    CommandSuccessResponseWrapper {
-      status: CommandSuccessStatus::Success,
-      success_message: None,
-      payload: None,
-    }
-  }
-}
-
-/// NB: Note the `"+ SerializeMarker"` bound here. This is a hack to distinguish between `()` and other types
-/// for which we will manually mark as `SerializeMarker`.
-impl <T> From<T> for CommandSuccessResponseWrapper<T> where T: Serialize + SerializeMarker {
-  fn from(val: T) -> Self {
-    CommandSuccessResponseWrapper {
-      status: CommandSuccessStatus::Success,
-      success_message: None,
-      payload: Some(val),
-    }
-  }
-}
-
-impl From<&str> for CommandSuccessResponseWrapper<String> {
-  fn from(msg: &str) -> Self {
-    CommandSuccessResponseWrapper {
-      status: CommandSuccessStatus::Success,
-      success_message: Some(msg.to_string()),
-      payload: None,
-    }
-  }
-}
-
-impl From<&str> for CommandErrorResponseWrapper<(), ()> {
-  fn from(value: &str) -> Self {
-    CommandErrorResponseWrapper {
-      status: CommandErrorStatus::BadRequest, // NB: Default to 500 error.
-      error_message: Some(value.to_string()),
-      error_type: None,
-      error_details: None,
-    }
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  
-  #[test]
-  fn test_empty_tuple_serialize() {
-    let response = super::CommandSuccessResponseWrapper::<()>::from(());
-    let serialized = serde_json::to_string(&response).unwrap();
-    // NB: This tests that the blanket "Serialize" impl doesn't produce a "null payload" field.
-    assert_eq!(serialized, r#"{"status":"success"}"#);
-  }
-}

crates/desktop/artcraft/src/commands/mod.rs

@@ -1,5 +0,0 @@
-pub mod app_preferences;
-pub mod command_response_wrapper;
-pub mod flip_image;
-pub mod platform_info_command;
-pub mod sora;

crates/desktop/artcraft/src/commands/platform_info_command.rs

@@ -1,63 +0,0 @@
-use crate::state::os_platform::OsPlatform;
-use base64::prelude::BASE64_STANDARD;
-use base64::Engine;
-use image::codecs::png::{CompressionType, FilterType, PngEncoder};
-use image::ImageReader;
-use log::info;
-use serde_derive::Serialize;
-use std::io::Cursor;
-
-#[derive(Debug, Serialize)]
-pub struct PlatformInfoResponse {
-  pub os_platform: DetectedOs,
-  pub webview_runtime: WebviewRuntime,
-}
-
-#[derive(Copy, Clone, Debug, Serialize)]
-#[serde(rename_all = "snake_case")]
-pub enum DetectedOs {
-  Windows,
-  #[serde(rename = "macos")]
-  MacOS,
-  Linux,
-  Unknown,
-}
-
-#[derive(Copy, Clone, Debug, Serialize)]
-#[serde(rename_all = "snake_case")]
-pub enum WebviewRuntime {
-  #[serde(rename = "webkit_safari")]
-  WebkitSafari,
-  #[serde(rename = "webkit_gtk")]
-  WebkitGtk,
-  #[serde(rename = "edge_webview_2")]
-  EdgeWebview2,
-  Unknown,
-}
-
-#[tauri::command]
-pub fn platform_info_command() -> Result<PlatformInfoResponse, String> {
-  info!("platform_info_command called...");
-
-  let os_platform = match OsPlatform::maybe_get() {
-    Some(OsPlatform::Linux) => DetectedOs::Linux,
-    Some(OsPlatform::MacOs) => DetectedOs::MacOS,
-    Some(OsPlatform::Windows) => DetectedOs::Windows,
-    None => DetectedOs::Unknown,
-  };
-
-  // These are the webviews that Tauri uses on each OS:
-  // https://tauri.app/reference/webview-versions/
-  let webview_runtime = match os_platform {
-    DetectedOs::Windows => WebviewRuntime::EdgeWebview2,
-    DetectedOs::MacOS => WebviewRuntime::WebkitSafari,
-    DetectedOs::Linux => WebviewRuntime::WebkitGtk,
-    DetectedOs::Unknown => WebviewRuntime::Unknown,
-  };
-
-  Ok(PlatformInfoResponse {
-    os_platform,
-    webview_runtime,
-  })
-}
-

crates/desktop/artcraft/src/commands/sora/check_sora_session_command.rs

@@ -1,114 +0,0 @@
-use std::ops::Add;
-use chrono::{DateTime, TimeDelta, Utc};
-use crate::commands::app_preferences::get_app_preferences_command::AppPreferencesPayload;
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::sora::sora_credential_manager::SoraCredentialManager;
-use crate::windows::sora_login_window::open_sora_login_window::open_sora_login_window;
-use errors::AnyhowResult;
-use log::{error, info};
-use once_cell::sync::Lazy;
-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::requests::list_media::list_media::list_media;
-use serde_derive::Serialize;
-use tauri::{AppHandle, State};
-
-const CACHE_PERIOD : TimeDelta = TimeDelta::milliseconds(1000 * 60 * 5); // 5 minutes
-
-#[derive(Serialize)]
-#[serde(rename_all = "snake_case")]
-pub struct CheckSoraSessionCommand {
-  pub state: SoraSessionState,
-  pub maybe_account_email: Option<String>,
-}
-
-#[derive(Serialize)]
-#[serde(rename_all = "snake_case")]
-pub enum SoraSessionState{
-  #[serde(rename = "not_set_up")]
-  NotSetUp,
-  #[serde(rename = "expired_or_error")]
-  ExpiredOrError,
-  #[serde(rename = "valid")]
-  Valid,
-}
-
-
-#[tauri::command]
-pub async fn check_sora_session_command(
-  app: AppHandle,
-  sora_creds_manager: State<'_, SoraCredentialManager>,
-) -> Result<CheckSoraSessionCommand, CheckSoraSessionCommand> {
-  info!("check_sora_session_command called");
-
-  match do_check(&sora_creds_manager).await {
-    Ok(state) => Ok(state),
-    Err(err) => {
-      error!("Error checking session state: {:?}", err);
-      Err(CheckSoraSessionCommand {
-        state: SoraSessionState::ExpiredOrError,
-        maybe_account_email: None,
-      })
-    }
-  }
-}
-
-async fn do_check(
-  sora_creds_manager: &SoraCredentialManager,
-) -> AnyhowResult<CheckSoraSessionCommand> {
-  
-  let mut creds = match sora_creds_manager.get_credentials()? {
-    Some(creds) => creds,
-    None => {
-      return Ok(CheckSoraSessionCommand {
-        state: SoraSessionState::NotSetUp,
-        maybe_account_email: None,
-      });
-    }
-  };
-
-  let mut needs_upgrade_or_check = false;
-  
-  let stats = sora_creds_manager.get_credential_stats()?;
-
-  match stats.last_consecutive_credential_success {
-    None => {
-      info!("Session never checked, needs upgrade or status checking.");
-      needs_upgrade_or_check= true;
-    }
-    Some(last_success) => {
-      let now = chrono::Utc::now();
-      let expires = last_success.add(CACHE_PERIOD);
-      if now.gt(&expires) {
-        info!("Session success expired, needs upgrade or status checking.");
-        needs_upgrade_or_check = true;
-      }
-    }
-  }
-  
-  let mut upgraded = false;
-  
-  if needs_upgrade_or_check {
-    info!("Attempting to upgrade session...");
-    upgraded = maybe_upgrade_or_renew_session(&mut creds).await?;
-    info!("Attempting to check session...");
-    list_media(&creds).await?;
-    sora_creds_manager.record_credential_success()?;
-  }
-
-  if upgraded {
-    info!("Saving upgraded session to manager and disk...");
-    sora_creds_manager.set_credentials(&creds)?;
-    sora_creds_manager.persist_all_to_disk()?;
-  }
-  
-  let maybe_account_email = creds
-      .jwt_bearer_token
-      .map(|token| token.jwt_claims().email.clone());
-
-  Ok(CheckSoraSessionCommand {
-    state: SoraSessionState::Valid,
-    maybe_account_email,
-  })
-}

crates/desktop/artcraft/src/commands/sora/open_sora_login_command.rs

@@ -1,39 +0,0 @@
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::sora::sora_credential_manager::SoraCredentialManager;
-use crate::windows::sora_login_window::open_sora_login_window::open_sora_login_window;
-use errors::AnyhowResult;
-use log::{error, info};
-use once_cell::sync::Lazy;
-use tauri::{AppHandle, State};
-
-#[tauri::command]
-pub async fn open_sora_login_command(
-  app: AppHandle,
-  app_data_root: State<'_, AppDataRoot>,
-  sora_creds_manager: State<'_, SoraCredentialManager>,
-) -> Result<String, String> {
-  info!("open_login_command called");
-
-  do_open_login(&app, &app_data_root, &sora_creds_manager)
-    .await
-    .map_err(|err| {
-      error!("Error opening login: {:?}", err);
-      format!("Error opening login: {:?}", err)
-    })?;
-
-  Ok("result".to_string())
-}
-
-async fn do_open_login(
-  app: &AppHandle,
-  app_data_root: &AppDataRoot,
-  sora_creds_manager: &SoraCredentialManager,
-) -> AnyhowResult<()> {
-  info!("Building login window...");
-
-  open_sora_login_window(app, app_data_root, sora_creds_manager).await?;
-
-  info!("Done.");
-  Ok(())
-}

crates/desktop/artcraft/src/commands/sora/sora_logout_command.rs

@@ -1,39 +0,0 @@
-use crate::commands::app_preferences::get_app_preferences_command::AppPreferencesPayload;
-use crate::commands::command_response_wrapper::{CommandResult, CommandSuccessResponseWrapper, SimpleCommandResult};
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::sora::sora_credential_manager::SoraCredentialManager;
-use crate::windows::sora_login_window::open_sora_login_window::open_sora_login_window;
-use errors::{AnyhowError, AnyhowResult};
-use log::{error, info};
-use once_cell::sync::Lazy;
-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::requests::list_media::list_media::list_media;
-use serde_derive::Serialize;
-use std::fmt::format;
-use tauri::{AppHandle, State};
-
-#[tauri::command]
-pub async fn sora_logout_command(
-  sora_creds_manager: State<'_, SoraCredentialManager>,
-) -> SimpleCommandResult {
-  info!("sora_logout_command called");
-
-  if let Err(err) = sora_creds_manager.purge_credentials_from_disk() {
-    error!("Error purging credentials from disk: {:?}", err);
-    return Err("error purging credentials from disk".into());
-  }
-  
-  if let Err(err) = sora_creds_manager.clear_credentials() {
-    error!("Error clearing credentials from memory: {:?}", err);
-    return Err("error clearing credentials from memory".into());
-  }
-  
-  if let Err(err) = sora_creds_manager.reset_credential_stats() {
-    error!("Error resetting credential stats: {:?}", err);
-    return Err("error resetting credential stats".into());
-  }
-  
-  Ok(().into())
-}

crates/desktop/artcraft/src/events/mod.rs

@@ -1,4 +0,0 @@
-pub mod notification_event;
-pub mod sendable_event_error;
-pub mod sendable_event_trait;
-pub mod sora;

crates/desktop/artcraft/src/events/sendable_event_error.rs

@@ -1,31 +0,0 @@
-use std::error::Error;
-use std::fmt::{Display, Formatter};
-
-#[derive(Debug)]
-pub enum SendableEventError {
-  TauriError(tauri::Error),
-  AnyhowError(anyhow::Error),
-}
-
-impl Error for SendableEventError {}
-
-impl Display for SendableEventError {
-  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-    match self {
-      Self::TauriError(err) => write!(f, "SendableEventError::TauriError: {}", err),
-      Self::AnyhowError(err) => write!(f, "SendableEventError::AnyhowError: {}", err),
-    }
-  }
-}
-
-impl From<anyhow::Error> for SendableEventError {
-  fn from(err: anyhow::Error) -> Self {
-    SendableEventError::AnyhowError(err)
-  }
-}
-
-impl From<tauri::Error> for SendableEventError {
-  fn from(err: tauri::Error) -> Self {
-    SendableEventError::TauriError(err)
-  }
-}

crates/desktop/artcraft/src/events/sendable_event_trait.rs

@@ -1,21 +0,0 @@
-use log::info;
-use crate::events::sendable_event_error::SendableEventError;
-use serde::Serialize;
-use tauri::{AppHandle, Emitter};
-
-/// Implement this on a Serializable object to be able to send it as an event to the frontend.
-pub trait SendableEvent : Serialize {
-  /// This is the name of the event that the frontend subscribes to.
-  const FRONTEND_EVENT_NAME: &'static str;
-  
-  /// Default implementation of send(). 
-  /// This serializes and sends the event to the frontend.
-  fn send(&self, app: &AppHandle) -> Result<(), SendableEventError> {
-    info!("Sending event to frontend: {}", Self::FRONTEND_EVENT_NAME);
-    let result = app.emit(Self::FRONTEND_EVENT_NAME, self);
-    if let Err(err) = result {
-      return Err(SendableEventError::from(err));
-    }
-    Ok(())
-  }
-}

crates/desktop/artcraft/src/events/sora/mod.rs

@@ -1,5 +0,0 @@
-pub mod sora_image_enqueue_failure_event;
-pub mod sora_image_enqueue_success_event;
-pub mod sora_image_generation_complete_event;
-pub mod sora_image_generation_failed_event;
-pub mod sora_login_success_event;

crates/desktop/artcraft/src/events/sora/sora_image_enqueue_failure_event.rs

@@ -1,11 +0,0 @@
-use crate::events::sendable_event_trait::SendableEvent;
-use serde_derive::Serialize;
-
-#[derive(Debug, Clone, Serialize)]
-pub struct SoraImageEnqueueFailureEvent {
-  // TODO: Reason.
-}
-
-impl SendableEvent for SoraImageEnqueueFailureEvent {
-  const FRONTEND_EVENT_NAME: &'static str = "sora-image-enqueue-failure";
-}

crates/desktop/artcraft/src/events/sora/sora_image_enqueue_success_event.rs

@@ -1,11 +0,0 @@
-use crate::events::sendable_event_trait::SendableEvent;
-use serde_derive::Serialize;
-
-#[derive(Debug, Clone, Serialize)]
-pub struct SoraImageEnqueueSuccessEvent {
-  // TODO: Token, etc.
-}
-
-impl SendableEvent for SoraImageEnqueueSuccessEvent {
-  const FRONTEND_EVENT_NAME: &'static str = "sora-image-enqueue-success";
-}

crates/desktop/artcraft/src/events/sora/sora_image_generation_complete_event.rs

@@ -1,12 +0,0 @@
-use serde_derive::Serialize;
-use tokens::tokens::media_files::MediaFileToken;
-use crate::events::sendable_event_trait::SendableEvent;
-
-#[derive(Debug, Clone, Serialize)]
-pub struct SoraImageGenerationCompleteEvent {
-  pub media_file_token: MediaFileToken,
-}
-
-impl SendableEvent for SoraImageGenerationCompleteEvent {
-  const FRONTEND_EVENT_NAME: &'static str = "sora-image-generation-complete";
-}

crates/desktop/artcraft/src/events/sora/sora_image_generation_failed_event.rs

@@ -1,12 +0,0 @@
-use serde_derive::Serialize;
-use crate::events::sendable_event_trait::SendableEvent;
-
-#[derive(Debug, Clone, Serialize)]
-pub struct SoraImageGenerationFailedEvent {
-  pub prompt: String,
-}
-
-impl SendableEvent for SoraImageGenerationFailedEvent {
-  const FRONTEND_EVENT_NAME: &'static str = "sora-image-generation-failed";
-}
-

crates/desktop/artcraft/src/events/sora/sora_login_success_event.rs

@@ -1,11 +0,0 @@
-use crate::events::sendable_event_trait::SendableEvent;
-use serde_derive::Serialize;
-
-#[derive(Debug, Clone, Serialize)]
-pub struct SoraLoginSuccessEvent {
-  // TODO: Reason.
-}
-
-impl SendableEvent for SoraLoginSuccessEvent {
-  const FRONTEND_EVENT_NAME: &'static str = "sora-login-success";
-}

crates/desktop/artcraft/src/lib.rs

@@ -1,151 +0,0 @@
-pub mod commands;
-pub mod events;
-pub mod state;
-pub mod threads;
-pub mod utils;
-pub mod windows;
-
-use tauri::Manager;
-
-use crate::commands::app_preferences::get_app_preferences_command::get_app_preferences_command;
-use crate::commands::app_preferences::update_app_preference_command::update_app_preferences_command;
-use crate::commands::flip_image::flip_image;
-use crate::commands::platform_info_command::platform_info_command;
-use crate::commands::sora::check_sora_session_command::check_sora_session_command;
-use crate::commands::sora::open_sora_login_command::open_sora_login_command;
-use crate::commands::sora::sora_image_generation_command::sora_image_generation_command;
-use crate::commands::sora::sora_image_remix_command::sora_image_remix_command;
-use crate::commands::sora::sora_logout_command::sora_logout_command;
-use crate::state::app_preferences::app_preferences_manager::load_app_preferences_or_default;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::main_window_position::MainWindowPosition;
-use crate::state::main_window_size::MainWindowSize;
-use crate::state::sora::sora_credential_manager::SoraCredentialManager;
-use crate::state::sora::sora_task_queue::SoraTaskQueue;
-use crate::state::storyteller::storyteller_credential_manager::StorytellerCredentialManager;
-use crate::threads::discord_presence_thread::discord_presence_thread;
-use crate::threads::main_window_thread::main_window_thread::main_window_thread;
-use crate::threads::sora_task_polling_thread::sora_task_polling_thread;
-use crate::utils::webview_unsafe::webview_unsafe_for_app;
-
-use tauri_plugin_dialog;
-use tauri_plugin_http;
-use tauri_plugin_log::Target;
-use tauri_plugin_log::TargetKind;
-
-#[cfg_attr(mobile, tauri::mobile_entry_point)]
-pub fn run() {
-  // NB: Tauri wants to install the logger itself, so we can't rely on the logger crate
-  // until the tauri runtime begins.
-  println!("Loading config...");
-  let app_data_root = AppDataRoot::create_default().expect("data directory should be created");
-  let app_data_root_2 = app_data_root.clone();
-
-  println!("Loading app preferences...");
-  let app_preferences = load_app_preferences_or_default(&app_data_root);
-  
-  println!("Attempting to read existing artcraft credentials...");
-  let storyteller_creds_manager = StorytellerCredentialManager::initialize_from_disk_infallible(&app_data_root);
-  let storyteller_creds_manager_2 = storyteller_creds_manager.clone();
-  
-  println!("Attempting to read existing credentials...");
-  let sora_creds_manager = SoraCredentialManager::initialize_from_disk_infallible(&app_data_root);
-  let sora_creds_manager_2 = sora_creds_manager.clone();
-
-  // Other state
-  let sora_task_queue = SoraTaskQueue::new();
-  let sora_task_queue_2 = sora_task_queue.clone();
-
-  println!("Initializing backend runtime...");
-
-  tauri::Builder::default()
-    .plugin(tauri_plugin_dialog::init())
-    .plugin(tauri_plugin_http::init())
-    .plugin(tauri_plugin_upload::init())
-    .plugin(tauri_plugin_log::Builder::new()
-      .level(log::LevelFilter::Info)
-      .targets(vec![
-        Target::new(TargetKind::Stdout),
-        Target::new(TargetKind::LogDir {
-          file_name: Some(app_data_root.log_file_name_str().to_string())
-        }),
-      ])
-      .build())
-    .setup(move |app| {
-      // TODO(bt): This is broken on windows
-      // log_environment_details();
-
-      //if cfg!(debug_assertions) {
-      //  app.handle().plugin(
-      //    tauri_plugin_log::Builder::default()
-      //      .level(log::LevelFilter::Info)
-      //      .build(),
-      //  )?;
-      //}
-      let app = app.handle().clone();
-      
-      let result = webview_unsafe_for_app(&app);
-      if let Err(err) = result {
-        eprintln!("Error setting webview unsafe: {:?}", err);
-      }
-
-      let app_2 = app.clone();
-      let app_3 = app.clone();
-      let app_4 = app.clone();
-      let app_data_root_3 = app_data_root_2.clone();
-      let app_data_root_4 = app_data_root_2.clone();
-      let sora_creds_manager_3 = sora_creds_manager_2.clone();
-      let storyteller_creds_manager_3 = storyteller_creds_manager.clone();
-
-      match MainWindowSize::from_filesystem_configs(&app_data_root_3) {
-        Ok(None) => {}
-        Ok(Some(size)) => {
-          println!("Resizing window to: {:?}", size);
-          let result = size.apply_to_main_window(&app);
-          if let Err(err) = result {
-            eprintln!("Could not set window size: {:?}", err);
-          }
-        }
-        Err(err) => {
-          eprintln!("Failed to read window size from disk: {:?}", err);
-        }
-      }
-
-      match MainWindowPosition::from_filesystem_configs(&app_data_root_3) {
-        Ok(None) => {}
-        Ok(Some(pos)) => {
-          println!("Moving window to: {:?}", pos);
-          let result = pos.apply_to_main_window(&app);
-          if let Err(err) = result {
-            eprintln!("Could not set window position: {:?}", err);
-          }
-        }
-        Err(err) => {
-          eprintln!("Failed to read window position from disk: {:?}", err);
-        }
-      }
-
-      tauri::async_runtime::spawn(main_window_thread(app_3, app_data_root_3, storyteller_creds_manager_2));
-      tauri::async_runtime::spawn(sora_task_polling_thread(app_4, app_data_root_4, sora_creds_manager_3, storyteller_creds_manager_3, sora_task_queue_2));
-      tauri::async_runtime::spawn(discord_presence_thread());
-
-      Ok(())
-    })
-    .manage(app_data_root)
-    .manage(app_preferences)
-    .manage(sora_creds_manager)
-    .manage(sora_task_queue)
-    .invoke_handler(tauri::generate_handler![
-      check_sora_session_command,
-      flip_image,
-      get_app_preferences_command,
-      open_sora_login_command,
-      platform_info_command,
-      sora_image_generation_command,
-      sora_image_remix_command,
-      sora_logout_command,
-      update_app_preferences_command,
-    ])
-    .run(tauri::generate_context!("tauri.conf.json"))
-    .expect("error while running tauri application");
-}

crates/desktop/artcraft/src/state/app_preferences/app_preferences.rs

@@ -1,71 +0,0 @@
-use crate::state::app_preferences::app_preferences_serializable::AppPreferencesSerializable;
-use crate::state::app_preferences::preferred_download_directory::{PreferredDownloadDirectory, SystemDownloadDirectory};
-use crate::state::data_dir::app_data_root::AppDataRoot;
-
-#[derive(Clone)]
-pub struct AppPreferences {
-  /// The downloads directory to use when a user downloads a file.
-  pub preferred_download_directory: PreferredDownloadDirectory,
-
-  /// Play sounds on events.
-  pub play_sounds: bool,
-
-  /// Key pointing to file; defined in the frontend code.
-  /// Defined for enqueue since image enqueue can be async
-  pub enqueue_success_sound: Option<String>,
-
-  /// Key pointing to file; defined in the frontend code.
-  /// Defined for enqueue since image enqueue can be async
-  pub enqueue_failure_sound: Option<String>,
-  
-  /// Key pointing to file; defined in the frontend code.
-  pub generation_success_sound: Option<String>,
-  
-  /// Key pointing to file; defined in the frontend code.
-  pub generation_failure_sound: Option<String>,
-  
-  /// Key pointing to file; defined in the frontend code.
-  #[deprecated]
-  pub generation_enqueue_sound: Option<String>,
-}
-
-impl Default for AppPreferences {
-  fn default() -> Self {
-    Self {
-      preferred_download_directory: PreferredDownloadDirectory::System(SystemDownloadDirectory::Downloads),
-      play_sounds: true,
-      // NB: These are defined in the frontend.
-      enqueue_success_sound: Some("done".to_string()),
-      enqueue_failure_sound: Some("spike_throw".to_string()),
-      generation_success_sound: Some("special_flower".to_string()),
-      generation_failure_sound: Some("crumble".to_string()),
-      generation_enqueue_sound: Some("done".to_string()),
-    }
-  }
-}
-
-impl AppPreferences {
-  pub fn load_from_file_or_default(data_root: &AppDataRoot) -> Self {
-    let filename = data_root.settings_dir().get_app_preferences_path();
-    if !filename.exists() {
-      return Self::default();
-    }
-
-    match AppPreferencesSerializable::load_from_file(data_root) {
-      Ok(Some(serializable)) => {
-        serializable.to_preferences()
-      }
-      Ok(None) => {
-        Self::default()
-      }
-      Err(err) => {
-        println!("Error loading app preferences: {}", err);
-        Self::default()
-      }
-    }
-  }
-  
-  pub fn to_serializable(&self) -> AppPreferencesSerializable {
-    AppPreferencesSerializable::from_preferences(self)
-  }
-}

crates/desktop/artcraft/src/state/app_preferences/app_preferences_manager.rs

@@ -1,10 +0,0 @@
-use crate::state::app_preferences::app_preferences::AppPreferences;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use memory_store::clone_cell::CloneCell;
-
-pub type AppPreferencesManager = CloneCell<AppPreferences>;
-
-pub fn load_app_preferences_or_default(data_root: &AppDataRoot) -> AppPreferencesManager {
-  let prefs = AppPreferences::load_from_file_or_default(data_root);
-  AppPreferencesManager::with_owned(prefs)
-}

crates/desktop/artcraft/src/state/app_preferences/app_preferences_serializable.rs

@@ -1,71 +0,0 @@
-use crate::state::app_preferences::app_preferences::AppPreferences;
-use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use errors::AnyhowResult;
-use serde_derive::{Deserialize, Serialize};
-
-/// Vector clock versioning string rather than semver.
-const CURRENT_VERSION: &str = "1";
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct AppPreferencesSerializable {
-  /// Versioning string.
-  pub version: String,
-  
-  /// The downloads directory to use when a user downloads a file.
-  pub preferred_download_directory: Option<PreferredDownloadDirectory>,
-
-  /// Play sounds on events.
-  pub play_sounds: Option<bool>,
-  
-  /// Key pointing to file; defined in the frontend code.
-  pub generation_success_sound: Option<String>,
-  
-  /// Key pointing to file; defined in the frontend code.
-  pub generation_failure_sound: Option<String>,
-  
-  /// Key pointing to file; defined in the frontend code.
-  pub generation_enqueue_sound: Option<String>,
-}
-
-impl AppPreferencesSerializable {
-  pub fn load_from_file(app_data_root: &AppDataRoot) -> AnyhowResult<Option<Self>> {
-    let filename = app_data_root.settings_dir().get_app_preferences_path();
-    if !filename.exists() {
-      return Ok(None);
-    }
-
-    let contents = std::fs::read_to_string(filename)?;
-    let data: Self = serde_json::from_str(&contents)?;
-    Ok(Some(data))
-  }
-
-  pub fn from_preferences(preferences: &AppPreferences) -> Self {
-    Self {
-      version: CURRENT_VERSION.to_string(),
-      preferred_download_directory: Some(preferences.preferred_download_directory.clone()),
-      play_sounds: Some(preferences.play_sounds),
-      generation_success_sound: preferences.generation_success_sound.clone(),
-      generation_failure_sound: preferences.generation_failure_sound.clone(),
-      generation_enqueue_sound: preferences.generation_enqueue_sound.clone(),
-    }
-  }
-
-  pub fn to_preferences(&self) -> AppPreferences {
-    let mut preferences = AppPreferences::default();
-
-    if let Some(preferred_download_directory) = &self.preferred_download_directory {
-      preferences.preferred_download_directory = preferred_download_directory.clone();
-    }
-
-    if let Some(play_sounds) = self.play_sounds {
-      preferences.play_sounds = play_sounds;
-    }
-    
-    preferences.generation_success_sound = self.generation_success_sound.clone();
-    preferences.generation_failure_sound = self.generation_failure_sound.clone();
-    preferences.generation_enqueue_sound = self.generation_enqueue_sound.clone();
-    
-    preferences
-  }
-}

crates/desktop/artcraft/src/state/app_preferences/mod.rs

@@ -1,4 +0,0 @@
-pub mod app_preferences;
-pub mod app_preferences_manager;
-pub mod app_preferences_serializable;
-pub mod preferred_download_directory;

crates/desktop/artcraft/src/state/app_preferences/preferred_download_directory.rs

@@ -1,82 +0,0 @@
-use errors::AnyhowError;
-use serde_derive::{Deserialize, Serialize};
-use std::fmt::{Display, Formatter};
-use std::path::PathBuf;
-use std::str::FromStr;
-
-const SYSTEM_DEFAULT_SENTINEL_VALUE: &str = "system_default";
-
-/// NB: The reason these are not flat is so that they serialize/deserialize nicely to/from JSON.
-#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq)]
-#[serde(rename_all = "snake_case")]
-pub enum PreferredDownloadDirectory {
-  /// The system-default downloads directory, which varies by OS.
-  /// NB: Serializes as `"system_default"` in JSON.
-  System(SystemDownloadDirectory),
-  
-  /// A user-defined path
-  /// NB: Serializes as `{"custom": "/path/to/dir"}` in JSON.
-  Custom(PathBuf),
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq)]
-#[serde(rename_all = "snake_case")]
-pub enum SystemDownloadDirectory {
-  Downloads,
-  Documents,
-}
-
-impl FromStr for SystemDownloadDirectory {
-  type Err = AnyhowError;
-
-  fn from_str(s: &str) -> Result<Self, Self::Err> {
-    match (s) {
-      "downloads" => Ok(SystemDownloadDirectory::Downloads),
-      "documents" => Ok(SystemDownloadDirectory::Documents),
-      _ => Err(AnyhowError::msg(format!("Invalid system download directory: {}", s))),
-    }
-  }
-}
-
-impl Display for PreferredDownloadDirectory {
-  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-    match self {
-      PreferredDownloadDirectory::System(system) => system.fmt(f),
-      PreferredDownloadDirectory::Custom(path) => write!(f, "{}", path.to_string_lossy()),
-    }
-  }
-}
-
-impl Display for SystemDownloadDirectory {
-  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-    match self {
-      SystemDownloadDirectory::Downloads => write!(f, "downloads"),
-      SystemDownloadDirectory::Documents => write!(f, "documents"),
-    }
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-  use crate::state::app_preferences::preferred_download_directory::SystemDownloadDirectory;
-  use std::str::FromStr;
-
-  mod json {
-    use super::*;
-
-    #[test]
-    fn to_json_system_default() {
-      let val = PreferredDownloadDirectory::System(SystemDownloadDirectory::Documents);
-      let val = serde_json::to_string(&val).unwrap();
-      assert_eq!(&val, "{\"system\":\"documents\"}");
-    }
-    
-    #[test]
-    fn to_json_custom() {
-      let val = PreferredDownloadDirectory::Custom("/tmp".into());
-      let val = serde_json::to_string(&val).unwrap();
-      assert_eq!(&val, "{\"custom\":\"/tmp\"}");
-    }
-  }
-}

crates/desktop/artcraft/src/state/app_startup_time.rs

@@ -1,22 +0,0 @@
-use chrono::{DateTime, TimeDelta, Utc};
-
-pub struct AppStartupTime {
-  startup_time: DateTime<Utc>,
-}
-
-impl AppStartupTime {
-  pub fn new() -> Self {
-    Self {
-      startup_time: Utc::now(),
-    }
-  }
-
-  pub fn get_startup_time(&self) -> DateTime<Utc> {
-    self.startup_time
-  }
-  
-  pub fn time_delta_since(&self) -> TimeDelta {
-    let now = Utc::now();
-    now.signed_duration_since(self.startup_time)
-  }
-}

crates/desktop/artcraft/src/state/data_dir/app_assets_dir.rs

@@ -1,36 +0,0 @@
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
-use chrono::{DateTime, Local};
-use std::path::{Path, PathBuf};
-
-#[derive(Clone)]
-pub struct AppAssetsDir {
-  path: PathBuf,
-}
-
-impl  DataSubdir for AppAssetsDir {
-  const DIRECTORY_NAME: &'static str = "assets";
-
-  fn new_from<P: AsRef<Path>>(dir: P) -> Self {
-    Self {
-      path: dir.as_ref().to_path_buf(),
-    }
-  }
-
-  fn path(&self) -> &Path {
-    &self.path
-  }
-}
-
-impl AppAssetsDir {
-  /// Return the current date asset directory
-  /// If it doesn't exist, create it.
-  pub fn make_or_get_current_date_dir(&self) -> anyhow::Result<PathBuf> {
-    let format: DateTime<Local> = Local::now();
-    let date_directory_name = format.format("%Y-%d-%m").to_string();
-    let full_path = self.path.join(date_directory_name);
-    if !full_path.exists() {
-      std::fs::create_dir(&full_path)?;
-    }
-    Ok(full_path)
-  }
-}

crates/desktop/artcraft/src/state/data_dir/app_credentials_dir.rs

@@ -1,43 +0,0 @@
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
-use std::path::{Path, PathBuf};
-
-#[derive(Clone)]
-pub struct AppCredentialsDir {
-  path: PathBuf,
-}
-
-impl DataSubdir for AppCredentialsDir {
-  const DIRECTORY_NAME: &'static str = "credentials";
-
-  fn new_from<P: AsRef<Path>> (dir: P) -> Self {
-    Self {
-      path: dir.as_ref().to_path_buf(),
-    }
-  }
-
-  fn path(&self) -> &Path {
-    &self.path
-  }
-}
-
-impl AppCredentialsDir {
-  pub fn get_sora_cookie_file_path(&self) -> PathBuf {
-    self.path.join("sora_cookies.txt")
-  }
-
-  pub fn get_sora_bearer_token_file_path(&self) -> PathBuf {
-    self.path.join("sora_bearer_token.txt")
-  }
-
-  pub fn get_sora_sentinel_file_path(&self) -> PathBuf {
-    self.path.join("sora_sentinel.txt")
-  }
-
-  pub fn get_storyteller_avt_cookie_file_path(&self) -> PathBuf {
-    self.path.join("artcraft_avt.txt")
-  }
-  
-  pub fn get_storyteller_session_cookie_file_path(&self) -> PathBuf {
-    self.path.join("artcraft_session.txt")
-  }
-}

crates/desktop/artcraft/src/state/data_dir/app_data_root.rs

@@ -1,151 +0,0 @@
-use crate::state::data_dir::app_assets_dir::AppAssetsDir;
-use crate::state::data_dir::app_credentials_dir::AppCredentialsDir;
-use crate::state::data_dir::app_downloads_dir::AppDownloadsDir;
-use crate::state::data_dir::app_settings_dir::AppSettingsDir;
-use crate::state::data_dir::app_weights_dir::AppWeightsDir;
-use crate::state::data_dir::temporary_dir::TemporaryDir;
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
-use crate::state::expanduser::expanduser;
-use crate::state::os_platform::OsPlatform;
-use anyhow::anyhow;
-use directories::UserDirs;
-use std::path::{Path, PathBuf};
-
-const DEFAULT_DATA_DIR : &str = "Artcraft";
-
-/// Note: Tauri appends ".log" to the end of the filename.
-const LOG_FILE_NAME : &str = "application_debug";
-
-/// The path to the application data directory, which includes "asset" and "weights" data.
-#[derive(Clone)]
-pub struct AppDataRoot {
-  path: PathBuf,
-  assets_dir: AppAssetsDir,
-  credentials_dir: AppCredentialsDir,
-  downloads_dir: AppDownloadsDir,
-  settings_dir: AppSettingsDir,
-  weights_dir: AppWeightsDir,
-  temp_dir: TemporaryDir,
-  log_file_name: PathBuf,
-  log_file_name_string: String,
-}
-
-impl AppDataRoot {
-  pub fn create_default() -> anyhow::Result<Self> {
-    let directory = get_default_data_dir()?;
-    Self::create_existing(directory)
-  }
-
-  pub fn create_existing<P: AsRef<Path>>(dir: P) -> anyhow::Result<Self> {
-    let mut dir = dir.as_ref().to_path_buf();
-    
-    match OsPlatform::get() {
-      OsPlatform::Linux | OsPlatform::MacOs => {
-        if let Some(d) = dir.as_os_str().to_str() {
-          dir = expanduser(d)?;
-        }
-      },
-      OsPlatform::Windows => {}
-    }
-    
-    if !dir.is_dir() {
-      println!("Creating directory {:?}", dir);
-      std::fs::create_dir_all(&dir)?;
-    }
-
-    match dir.canonicalize() {
-      Ok(d) => dir = d,
-      Err(err) => {
-        println!("Error canonicalizing {:?}: {}", dir, err);
-      }
-    }
-    
-    let assets_dir = AppAssetsDir::get_or_create_in_root_dir(&dir)?;
-    let credentials_dir = AppCredentialsDir::get_or_create_in_root_dir(&dir)?;
-    let downloads_dir = AppDownloadsDir::get_or_create_in_root_dir(&dir)?;
-    let settings_dir = AppSettingsDir::get_or_create_in_root_dir(&dir)?;
-    let temp_dir = TemporaryDir::get_or_create_in_root_dir(&dir)?;
-    let weights_dir = AppWeightsDir::get_or_create_in_root_dir(&dir)?;
-    let log_file_name = dir.join(LOG_FILE_NAME);
-    let log_file_name_string = log_file_name
-        .to_str()
-        .ok_or(anyhow!("couldn't convert log path to str"))?
-        .to_string();
-
-    Ok(Self {
-      path: dir,
-      assets_dir,
-      credentials_dir,
-      downloads_dir,
-      settings_dir,
-      weights_dir,
-      temp_dir,
-      log_file_name,
-      log_file_name_string,
-    })
-  }
-  
-  pub fn assets_dir(&self) -> &AppAssetsDir {
-    &self.assets_dir
-  }
-
-  pub fn credentials_dir(&self) -> &AppCredentialsDir {
-    &self.credentials_dir
-  }
-
-  pub fn downloads_dir(&self) -> &AppDownloadsDir {
-    &self.downloads_dir
-  }
-
-  pub fn settings_dir(&self) -> &AppSettingsDir {
-    &self.settings_dir
-  }
-
-  pub fn weights_dir(&self) -> &AppWeightsDir {
-    &self.weights_dir
-  }
-
-  pub fn temp_dir(&self) -> &TemporaryDir {
-    &self.temp_dir
-  }
-
-  pub fn path(&self) -> &Path {
-    &self.path
-  }
-
-  pub fn log_file_name(&self) -> &Path {
-    &self.log_file_name
-  }
-
-  pub fn log_file_name_str(&self) -> &str {
-    &self.log_file_name_string
-  }
-
-  pub fn get_sora_cookie_file_path(&self) -> PathBuf {
-    self.credentials_dir().get_sora_cookie_file_path()
-  }
-
-  pub fn get_sora_bearer_token_file_path(&self) -> PathBuf {
-    self.credentials_dir().get_sora_bearer_token_file_path()
-  }
-
-  pub fn get_sora_sentinel_file_path(&self) -> PathBuf {
-    self.credentials_dir().get_sora_sentinel_file_path()
-  }
-
-  pub fn get_window_size_config_file(&self) -> PathBuf {
-    self.path.join("window_size.json")
-  }
-  
-  pub fn get_window_position_config_file(&self) -> PathBuf {
-    self.path.join("window_position.json")
-  }
-}
-
-// eg. /home/bob/artcraft, /Users/bob/artcraft, or C:\Users\Alice\artcraft
-fn get_default_data_dir() -> anyhow::Result<PathBuf> {
-  Ok(UserDirs::new()
-      .ok_or_else(|| anyhow!("could not determine user home directory"))?
-      .home_dir()
-      .join(DEFAULT_DATA_DIR))
-}

crates/desktop/artcraft/src/state/data_dir/app_downloads_dir.rs

@@ -1,21 +0,0 @@
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
-use std::path::{Path, PathBuf};
-
-#[derive(Clone)]
-pub struct AppDownloadsDir {
-  path: PathBuf,
-}
-
-impl DataSubdir for AppDownloadsDir {
-  const DIRECTORY_NAME: &'static str = "downloads";
-
-  fn new_from<P: AsRef<Path>>(dir: P) -> Self {
-    Self {
-      path: dir.as_ref().to_path_buf(),
-    }
-  }
-
-  fn path(&self) -> &Path {
-    &self.path
-  }
-}

crates/desktop/artcraft/src/state/data_dir/app_settings_dir.rs

@@ -1,56 +0,0 @@
-use crate::state::app_preferences::app_preferences::AppPreferences;
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
-use errors::AnyhowResult;
-use serde::Serialize;
-use std::fs::OpenOptions;
-use std::io::Write;
-use std::path::{Path, PathBuf};
-
-/// For now, let's just keep a collection of loose json files in a settings dir.
-/// Once we know the structure and schema, we can standardize on a single json file.
-#[derive(Clone)]
-pub struct AppSettingsDir {
-  path: PathBuf,
-}
-
-impl DataSubdir for AppSettingsDir {
-  const DIRECTORY_NAME: &'static str = "settings";
-
-  fn new_from<P: AsRef<Path>> (dir: P) -> Self {
-    Self {
-      path: dir.as_ref().to_path_buf(),
-    }
-  }
-
-  fn path(&self) -> &Path {
-    &self.path
-  }
-}
-
-impl AppSettingsDir {
-  pub fn get_app_preferences_path(&self) -> PathBuf {
-    self.path.join("app_preferences.json")
-  }
-  
-  pub fn write_app_preferences(&self, prefs: &AppPreferences) -> AnyhowResult<()> {
-    let serializable = prefs.to_serializable();
-
-    let formatter = serde_json::ser::PrettyFormatter::with_indent(b"  ");
-    let mut buf = Vec::new();
-    let mut ser = serde_json::Serializer::with_formatter(&mut buf, formatter);
-    serializable.serialize(&mut ser)?;
-
-    let filename = self.get_app_preferences_path();
-
-    let mut file = OpenOptions::new()
-        .create(true)
-        .write(true)
-        .truncate(true)
-        .open(filename)?;
-
-    file.write_all(&buf)?;
-    file.flush()?;
-    
-    Ok(())
-  }
-}

crates/desktop/artcraft/src/state/data_dir/app_weights_dir.rs

@@ -1,21 +0,0 @@
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
-use std::path::{Path, PathBuf};
-
-#[derive(Clone)]
-pub struct AppWeightsDir {
-  path: PathBuf,
-}
-
-impl DataSubdir for AppWeightsDir {
-  const DIRECTORY_NAME: &'static str = "weights";
-
-  fn new_from<P: AsRef<Path>>(dir: P) -> Self {
-    Self {
-      path: dir.as_ref().to_path_buf(),
-    }
-  }
-
-  fn path(&self) -> &Path {
-    &self.path
-  }
-}

crates/desktop/artcraft/src/state/data_dir/mod.rs

@@ -1,8 +0,0 @@
-pub mod app_assets_dir;
-pub mod app_credentials_dir;
-pub mod app_data_root;
-pub mod app_downloads_dir;
-pub mod app_settings_dir;
-pub mod app_weights_dir;
-pub mod temporary_dir;
-pub mod trait_data_subdir;

crates/desktop/artcraft/src/state/data_dir/temporary_dir.rs

@@ -1,38 +0,0 @@
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
-use std::path::{Path, PathBuf};
-use tempdir::TempDir;
-use tempfile::{Builder, NamedTempFile};
-
-#[derive(Clone)]
-pub struct TemporaryDir {
-  path: PathBuf,
-}
-
-impl DataSubdir for TemporaryDir {
-  const DIRECTORY_NAME: &'static str = "temp";
-
-  fn new_from<P: AsRef<Path>>(dir: P) -> Self {
-    Self {
-      path: dir.as_ref().to_path_buf(),
-    }
-  }
-
-  fn path(&self) -> &Path {
-    &self.path
-  }
-}
-
-impl TemporaryDir {
-  pub fn with_prefix(&self, prefix: &str) -> anyhow::Result<TempDir> {
-    let tempdir = TempDir::new_in(&self.path, prefix)?;
-    Ok(tempdir)
-  }
-
-  pub fn new_named_temp_file(&self) -> anyhow::Result<NamedTempFile> {
-    let tempfile = Builder::new()
-        .prefix("temp_")
-        .suffix(".bin")
-        .tempfile_in(&self.path)?;
-    Ok(tempfile)
-  }
-}

crates/desktop/artcraft/src/state/data_dir/trait_data_subdir.rs

@@ -1,31 +0,0 @@
-use std::path::Path;
-
-pub trait DataSubdir  : Sized {
-  const DIRECTORY_NAME: &'static str;
-
-  fn new_from<P: AsRef<Path>>(dir: P) -> Self;
-
-  fn path(&self) -> &Path;
-
-  fn get_or_create_in_root_dir<P: AsRef<Path>>(root_dir: P) -> anyhow::Result<Self> {
-    Self::get_or_create_dir(root_dir.as_ref().join(Self::DIRECTORY_NAME))
-  }
-
-  fn get_or_create_dir<P: AsRef<Path>>(dir: P) -> anyhow::Result<Self> {
-    let mut dir = dir.as_ref().to_path_buf();
-
-    match dir.canonicalize() {
-      Ok(d) => dir = d,
-      Err(err) => {
-        println!("Error canonicalizing {:?}: {}", dir, err);
-      }
-    }
-
-    if !dir.exists() {
-      println!("Creating directory {:?}", dir);
-      std::fs::create_dir(&dir)?;
-    }
-
-    Ok(Self::new_from(dir))
-  }
-}

crates/desktop/artcraft/src/state/main_window_position.rs

@@ -1,73 +0,0 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::windows::main_window::constants::MAIN_WINDOW_NAME;
-use errors::AnyhowResult;
-use serde_derive::{Deserialize, Serialize};
-use std::fs::OpenOptions;
-use std::io::Write;
-use tauri::{AppHandle, Manager, PhysicalPosition, Window};
-
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq)]
-pub struct MainWindowPosition {
-  pub x: i32,
-  pub y: i32,
-}
-
-impl MainWindowPosition {
-  pub fn new(x: i32, y: i32) -> Self {
-    Self { x, y }
-  }
-
-  pub fn from_main_window(app: &AppHandle) -> AnyhowResult<Self> {
-    let windows = app.windows();
-    windows.get(MAIN_WINDOW_NAME)
-        .map(|window| Self::from_window(window))
-        .unwrap_or_else(|| Err(anyhow::anyhow!("Main window not found")))
-  }
-
-  pub fn from_window(window: &Window) -> AnyhowResult<Self> {
-    let position = window.outer_position()?;
-    Ok(Self {
-      x: position.x,
-      y: position.y,
-    })
-  }
-
-  pub fn from_filesystem_configs(app_data_root: &AppDataRoot) -> AnyhowResult<Option<Self>> {
-    let filename = app_data_root.get_window_position_config_file();
-    if !filename.exists() {
-      return Ok(None);
-    }
-    let contents = std::fs::read_to_string(filename)?;
-    let pos : MainWindowPosition = serde_json::from_str(&contents)?;
-    Ok(Some(pos))
-  }
-
-  pub fn apply_to_main_window(&self, app: &AppHandle) -> AnyhowResult<()> {
-    let windows = app.windows();
-    let window = windows.get(MAIN_WINDOW_NAME)
-        .ok_or_else(|| anyhow::anyhow!("Main window not found"))?;
-    window.set_position(PhysicalPosition::new(self.x, self.y))?;
-    Ok(())
-  }
-
-  pub fn persist_to_filesystem(&self, app_data_root: &AppDataRoot) -> AnyhowResult<()> {
-    let filename = app_data_root.get_window_position_config_file();
-    let json = serde_json::to_string(self)?;
-    let mut file = OpenOptions::new()
-        .create(true)
-        .write(true)
-        .truncate(true)
-        .open(filename)?;
-    file.write_all(json.as_bytes())?;
-    file.flush()?;
-    Ok(())
-  }
-
-  pub fn to_physical_position(&self) -> PhysicalPosition<i32> {
-    PhysicalPosition::new(self.x, self.y)
-  }
-
-  pub fn matches_physical_position(&self, pos: &PhysicalPosition<i32>) -> bool {
-    self.x == pos.x && self.y == pos.y
-  }
-}

crates/desktop/artcraft/src/state/main_window_size.rs

@@ -1,74 +0,0 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::utils::best_window_size_heuristic::best_window_size_heuristic;
-use crate::windows::main_window::constants::MAIN_WINDOW_NAME;
-use errors::AnyhowResult;
-use serde_derive::{Deserialize, Serialize};
-use std::fs::OpenOptions;
-use std::io::Write;
-use tauri::{AppHandle, Manager, PhysicalSize, Window};
-
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq)]
-pub struct MainWindowSize {
-  pub width: u32,
-  pub height: u32,
-}
-
-impl MainWindowSize {
-  pub fn new(width: u32, height: u32) -> Self {
-    Self { width, height }
-  }
-
-  pub fn from_main_window(app: &AppHandle) -> AnyhowResult<Self> {
-    let windows = app.windows();
-    windows.get(MAIN_WINDOW_NAME)
-        .map(|window| Self::from_window(window))
-        .unwrap_or_else(|| Err(anyhow::anyhow!("Main window not found")))
-  }
-
-  pub fn from_window(window: &Window) -> AnyhowResult<Self> {
-    let size = best_window_size_heuristic(window)?;
-    Ok(Self {
-      width: size.width,
-      height: size.height,
-    })
-  }
-
-  pub fn from_filesystem_configs(app_data_root: &AppDataRoot) -> AnyhowResult<Option<Self>> {
-    let filename = app_data_root.get_window_size_config_file();
-    if !filename.exists() {
-      return Ok(None);
-    }
-    let contents = std::fs::read_to_string(filename)?;
-    let size: MainWindowSize = serde_json::from_str(&contents)?;
-    Ok(Some(size))
-  }
-
-  pub fn apply_to_main_window(&self, app: &AppHandle) -> AnyhowResult<()> {
-    let windows = app.windows();
-    let window = windows.get(MAIN_WINDOW_NAME)
-        .ok_or_else(|| anyhow::anyhow!("Main window not found"))?;
-    window.set_size(PhysicalSize::new(self.width, self.height))?;
-    Ok(())
-  }
-
-  pub fn persist_to_filesystem(&self, app_data_root: &AppDataRoot) -> AnyhowResult<()> {
-    let filename = app_data_root.get_window_size_config_file();
-    let json = serde_json::to_string(self)?;
-    let mut file = OpenOptions::new()
-        .create(true)
-        .write(true)
-        .truncate(true)
-        .open(filename)?;
-    file.write_all(json.as_bytes())?;
-    file.flush()?;
-    Ok(())
-  }
-
-  pub fn to_physical_size(&self) -> PhysicalSize<u32> {
-    PhysicalSize::new(self.width, self.height)
-  }
-
-  pub fn matches_physical_size(&self, size: &PhysicalSize<u32>) -> bool {
-    self.width == size.width && self.height == size.height
-  }
-}

crates/desktop/artcraft/src/state/mod.rs

@@ -1,9 +0,0 @@
-pub mod app_preferences;
-pub mod app_startup_time;
-pub mod data_dir;
-pub mod expanduser;
-pub mod main_window_position;
-pub mod main_window_size;
-pub mod os_platform;
-pub mod sora;
-pub mod storyteller;

crates/desktop/artcraft/src/state/os_platform.rs

@@ -1,24 +0,0 @@
-
-#[derive(Copy,Clone,Eq,PartialEq,Debug)]
-pub enum OsPlatform {
-  Linux,
-  MacOs,
-  Windows,
-}
-
-impl OsPlatform {
-  pub fn maybe_get() -> Option<Self> {
-    // Totally scientific.
-    // https://doc.rust-lang.org/std/env/consts/constant.OS.html
-    match std::env::consts::OS {
-      "linux" => Some(Self::Linux),
-      "windows" => Some(Self::Windows),
-      "macos" | "apple" => Some(Self::MacOs),
-      _ => None,
-    }
-  }
-
-  pub fn get() -> Self {
-    Self::maybe_get().unwrap_or(Self::Linux)
-  }
-}

crates/desktop/artcraft/src/state/sora/sora_credential_stats.rs

@@ -1,47 +0,0 @@
-
-/// This is meant to track 401s and other credential failures, not 500s.
-#[derive(Clone)]
-pub struct SoraCredentialStats {
-  pub last_credential_failure: Option<chrono::DateTime<chrono::Utc>>,
-  pub last_credential_success: Option<chrono::DateTime<chrono::Utc>>,
-  pub credential_success_count: u32,
-  pub credential_failure_count: u32,
-  /// This resets on each failure
-  pub last_consecutive_credential_success: Option<chrono::DateTime<chrono::Utc>>,
-  /// This resets on each failure
-  pub consecutive_credential_success_count: u32,
-  /// This resets on each success
-  pub consecutive_credential_failure_count: u32,
-}
-
-impl SoraCredentialStats {
-  pub fn new() -> Self {
-    Self {
-      last_credential_failure: None,
-      last_credential_success: None,
-      last_consecutive_credential_success: None,
-      credential_success_count: 0,
-      credential_failure_count: 0,
-      consecutive_credential_success_count: 0,
-      consecutive_credential_failure_count: 0,
-    }
-  }
-  
-  pub fn record_credential_success(&mut self) {
-    let now = chrono::Utc::now();
-    self.last_credential_success = Some(now);
-    self.last_consecutive_credential_success = Some(now);
-    self.credential_success_count += 1;
-    self.consecutive_credential_success_count += 1;
-    self.consecutive_credential_failure_count = 0;
-  }
-
-  pub fn record_credential_failure(&mut self) {
-    let now = chrono::Utc::now();
-    self.last_credential_failure = Some(now);
-    self.last_consecutive_credential_success = None;
-    self.credential_failure_count += 1;
-    self.consecutive_credential_failure_count += 1;
-    self.consecutive_credential_success_count = 0;
-  }
-}

crates/desktop/artcraft/src/state/sora/sora_task_queue.rs

@@ -1,231 +0,0 @@
-use std::collections::HashSet;
-use chrono::{DateTime, Utc};
-use errors::AnyhowResult;
-use indexmap::IndexMap;
-use openai_sora_client::requests::image_gen::image_gen_status::TaskId;
-use std::sync::{Arc, RwLock};
-
-#[derive(Clone)]
-pub struct TaskDetails {
-  pub enqueue_time: DateTime<Utc>
-}
-
-impl TaskDetails {
-  pub fn new() -> Self {
-    Self {
-      enqueue_time: Utc::now()
-    }
-  }
-}
-
-#[derive(Clone)]
-pub struct TaskIdAndDetails {
-  pub task_id: TaskId,
-  pub details: TaskDetails,
-}
-
-#[derive(Clone)]
-pub struct SoraTaskQueue {
-  // Insertion-order map of task IDs to task details
-  queue: Arc<RwLock<IndexMap<TaskId, TaskDetails>>>
-}
-
-impl SoraTaskQueue {
-  pub fn new() -> Self {
-    Self {
-      queue: Arc::new(RwLock::new(IndexMap::new()))
-    }
-  }
-
-  /// Determine if queue is empty
-  /// This is an O(1) operation.
-  pub fn is_empty(&self) -> AnyhowResult<bool> {
-    match self.queue.read() {
-      Err(err) => {
-        Err(anyhow::anyhow!("Failed to acquire read lock: {:?}", err))
-      }
-      Ok(lock) => Ok(lock.is_empty())
-    }
-  }
-
-  /// Get length of set
-  /// This is an O(1) operation.
-  pub fn len(&self) -> AnyhowResult<usize> {
-    match self.queue.read() {
-      Err(err) => {
-        Err(anyhow::anyhow!("Failed to acquire read lock: {:?}", err))
-      }
-      Ok(lock) => Ok(lock.len())
-    }
-  }
-
-  /// Determine if the key is in the queue
-  /// This is an O(1) operation.
-  pub fn contains_key(&self, task_id: &TaskId) -> AnyhowResult<bool> {
-    match self.queue.read() {
-      Err(err) => {
-        Err(anyhow::anyhow!("Failed to acquire read lock: {:?}", err))
-      }
-      Ok(lock) => Ok(lock.contains_key(task_id))
-    }
-  }
-
-  /// Get the first enqueued task
-  /// This is an O(1) operation.
-  pub fn first(&self) -> AnyhowResult<Option<TaskIdAndDetails>> {
-    match self.queue.read() {
-      Err(err) => {
-        Err(anyhow::anyhow!("Failed to acquire read lock: {:?}", err))
-      }
-      Ok(lock) => match lock.first() {
-        None => Ok(None),
-        Some((task_id, task_details)) => Ok(Some(TaskIdAndDetails {
-          task_id: task_id.clone(),
-          details: task_details.clone(),
-        }))
-      }
-    }
-  }
-
-  /// Get the last enqueued task
-  /// This is an O(1) operation.
-  pub fn last(&self) -> AnyhowResult<Option<TaskIdAndDetails>> {
-    match self.queue.read() {
-      Err(err) => {
-        Err(anyhow::anyhow!("Failed to acquire read lock: {:?}", err))
-      }
-      Ok(lock) => match lock.last() {
-        None => Ok(None),
-        Some((task_id, task_details)) => Ok(Some(TaskIdAndDetails {
-          task_id: task_id.clone(),
-          details: task_details.clone(),
-        }))
-      }
-    }
-  }
-
-  /// Insert a new task. If a task already exists, we update its value.
-  /// This is an O(1) operation.
-  pub fn insert(&self, task_id: &TaskId) -> AnyhowResult<Option<TaskDetails>> {
-    match self.queue.write() {
-      Err(err) => {
-        Err(anyhow::anyhow!("Failed to acquire write lock: {:?}", err))
-      }
-      Ok(mut lock) => {
-        // NB: Probably fine to compute TaskDetails here for now. We may eventually expose this if we include additional info.
-        let task_details = TaskDetails::new();
-        Ok(lock.insert(task_id.clone(), task_details))
-      }
-    }
-  }
-
-  /// Remove a task by ID.
-  /// This is an O(n) operation.
-  pub fn remove(&self, task_id: &TaskId) -> AnyhowResult<Option<TaskDetails>> {
-    match self.queue.write() {
-      Err(err) => {
-        Err(anyhow::anyhow!("Failed to acquire write lock: {:?}", err))
-      }
-      Ok(mut lock) => {
-        Ok(lock.shift_remove(task_id))
-      }
-    }
-  }
-
-  /// Remove a list of tasks by ID.
-  /// This is an O(n) operation.
-  pub fn remove_list(&self, task_ids: &[&TaskId]) -> AnyhowResult<()> {
-    match self.queue.write() {
-      Err(err) => {
-        Err(anyhow::anyhow!("Failed to acquire write lock: {:?}", err))
-      }
-      Ok(mut lock) => {
-        // TODO: Cleaner way to do this?
-        let mut set : HashSet<&TaskId, _> = HashSet::with_capacity(task_ids.len());
-        set.extend(task_ids);
-        lock.retain(|k, v| !set.contains(k));
-        Ok(())
-      }
-    }
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use errors::AnyhowResult;
-  use openai_sora_client::requests::image_gen::image_gen_status::TaskId;
-  use crate::state::sora::sora_task_queue::SoraTaskQueue;
-
-  #[test]
-  fn remove_list() -> AnyhowResult<()> {
-    let task_queue = SoraTaskQueue::new();
-
-    assert!(task_queue.is_empty()?);
-    assert_eq!(task_queue.len()?, 0);
-
-    task_queue.insert(&TaskId("a".to_string()))?;
-    task_queue.insert(&TaskId("b".to_string()))?;
-    task_queue.insert(&TaskId("c".to_string()))?;
-    task_queue.insert(&TaskId("d".to_string()))?;
-    task_queue.insert(&TaskId("e".to_string()))?;
-    task_queue.insert(&TaskId("f".to_string()))?;
-
-    assert!(!task_queue.is_empty()?);
-    assert_eq!(task_queue.len()?, 6);
-
-    task_queue.insert(&TaskId("a".to_string()))?;
-    task_queue.insert(&TaskId("b".to_string()))?;
-    task_queue.insert(&TaskId("c".to_string()))?;
-    task_queue.insert(&TaskId("d".to_string()))?;
-    task_queue.insert(&TaskId("e".to_string()))?;
-    task_queue.insert(&TaskId("f".to_string()))?;
-
-    assert!(!task_queue.is_empty()?);
-    assert_eq!(task_queue.len()?, 6);
-
-    task_queue.remove_list(&[
-      &TaskId("a".to_string()),
-      &TaskId("c".to_string()),
-      &TaskId("e".to_string()),
-    ])?;
-
-    assert!(!task_queue.is_empty()?);
-    assert_eq!(task_queue.len()?, 3);
-
-    assert!(task_queue.contains_key(&TaskId("b".to_string()))?);
-    assert!(task_queue.contains_key(&TaskId("d".to_string()))?);
-    assert!(task_queue.contains_key(&TaskId("f".to_string()))?);
-
-    assert!(!task_queue.contains_key(&TaskId("a".to_string()))?);
-    assert!(!task_queue.contains_key(&TaskId("c".to_string()))?);
-    assert!(!task_queue.contains_key(&TaskId("e".to_string()))?);
-
-    task_queue.remove_list(&[
-      &TaskId("foo".to_string()),
-      &TaskId("bar".to_string()),
-      &TaskId("baz".to_string()),
-    ])?;
-
-    assert!(!task_queue.is_empty()?);
-    assert_eq!(task_queue.len()?, 3);
-
-    assert!(task_queue.contains_key(&TaskId("b".to_string()))?);
-    assert!(task_queue.contains_key(&TaskId("d".to_string()))?);
-    assert!(task_queue.contains_key(&TaskId("f".to_string()))?);
-
-    task_queue.remove_list(&[
-      &TaskId("b".to_string()),
-      &TaskId("d".to_string()),
-      &TaskId("f".to_string()),
-    ])?;
-
-    assert!(task_queue.is_empty()?);
-    assert_eq!(task_queue.len()?, 0);
-
-    assert!(!task_queue.contains_key(&TaskId("b".to_string()))?);
-    assert!(!task_queue.contains_key(&TaskId("d".to_string()))?);
-    assert!(!task_queue.contains_key(&TaskId("f".to_string()))?);
-
-    Ok(())
-  }
-}

crates/desktop/artcraft/src/state/storyteller/mod.rs

@@ -1,3 +0,0 @@
-pub mod read_storyteller_credentials_from_disk;
-pub mod storyteller_credential_holder;
-pub mod storyteller_credential_manager;

crates/desktop/artcraft/src/state/storyteller/read_storyteller_credentials_from_disk.rs

@@ -1,39 +0,0 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use errors::AnyhowResult;
-use std::fs::read_to_string;
-use storyteller_client::credentials::storyteller_avt_cookie::StorytellerAvtCookie;
-use storyteller_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
-use storyteller_client::credentials::storyteller_session_cookie::StorytellerSessionCookie;
-
-pub fn read_storyteller_credentials_from_disk(app_data_root: &AppDataRoot) -> AnyhowResult<StorytellerCredentialSet> {
-  let creds_dir= app_data_root.credentials_dir();
-
-  let mut avt = None;
-
-  {
-    let avt_file = creds_dir.get_storyteller_avt_cookie_file_path();
-    if avt_file.exists() {
-      let contents = read_to_string(&avt_file)?
-          .trim()
-          .to_string();
-      avt = Some(StorytellerAvtCookie::new(contents));
-    }
-  }  
-
-  let mut session = None;
-
-  {
-    let session_file = creds_dir.get_storyteller_session_cookie_file_path();
-    if session_file.exists() {
-      let contents = read_to_string(&session_file)?
-          .trim()
-          .to_string();
-      session = Some(StorytellerSessionCookie::new(contents));
-    }
-  }
-
-  Ok(StorytellerCredentialSet::initialize(
-    avt,
-    session,
-  ))
-}

crates/desktop/artcraft/src/state/storyteller/storyteller_credential_holder.rs

@@ -1,57 +0,0 @@
-use anyhow::anyhow;
-use errors::AnyhowResult;
-use std::sync::{Arc, RwLock};
-use storyteller_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
-
-/// Hold credentials for the application.
-#[derive(Clone)]
-pub struct StorytellerCredentialHolder {
-  credentials: Arc<RwLock<Option<StorytellerCredentialSet>>>,
-}
-
-impl StorytellerCredentialHolder {
-  pub fn new() -> Self {
-    Self {
-      credentials: Arc::new(RwLock::new(None)),
-    }
-  }
-
-  pub fn set_credentials(&self, credentials: &StorytellerCredentialSet) -> AnyhowResult<()> {
-    match self.credentials.write() {
-      Err(err) => Err(anyhow!("Failed to acquire write lock: {:?}", err)),
-      Ok(mut creds) => {
-        *creds = Some(credentials.clone());
-        Ok(())
-      }
-    }
-  }
-
-  pub fn clear_credentials(&self) -> AnyhowResult<()> {
-    match self.credentials.write() {
-      Err(err) => Err(anyhow!("Failed to acquire write lock: {:?}", err)),
-      Ok(mut creds) => {
-        *creds = None;
-        Ok(())
-      }
-    }
-  }
-
-  pub fn get_credentials(&self) -> AnyhowResult<Option<StorytellerCredentialSet>> {
-    match self.credentials.read() {
-      Err(err) => Err(anyhow!("Failed to acquire read lock: {:?}", err)),
-      Ok(creds) => {
-        Ok(creds.clone())
-      }
-    }
-  }
-
-  pub fn get_credentials_required(&self) -> AnyhowResult<StorytellerCredentialSet> {
-    match self.credentials.read() {
-      Err(err) => Err(anyhow!("Failed to acquire read lock: {:?}", err)),
-      Ok(creds) => match &*creds {
-        None => Err(anyhow!("Credentials not set")),
-        Some(creds) => Ok(creds.clone()),
-      }
-    }
-  }
-}

crates/desktop/artcraft/src/state/storyteller/storyteller_credential_manager.rs

@@ -1,109 +0,0 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::sora::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
-use crate::state::sora::sora_credential_holder::SoraCredentialHolder;
-use crate::state::storyteller::read_storyteller_credentials_from_disk::read_storyteller_credentials_from_disk;
-use crate::state::storyteller::storyteller_credential_holder::StorytellerCredentialHolder;
-use anyhow::anyhow;
-use errors::AnyhowResult;
-use log::{error, info, warn};
-use std::fs::OpenOptions;
-use std::io::Write;
-use storyteller_client::credentials::storyteller_avt_cookie::StorytellerAvtCookie;
-use storyteller_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
-use storyteller_client::credentials::storyteller_session_cookie::StorytellerSessionCookie;
-
-#[derive(Clone)]
-pub struct StorytellerCredentialManager {
-  holder: StorytellerCredentialHolder,
-  app_data_root: AppDataRoot,
-}
-
-impl StorytellerCredentialManager {
-
-  pub fn initialize_from_disk_infallible(app_data_root: &AppDataRoot) -> Self {
-    let holder = StorytellerCredentialHolder::new();
-
-    match read_storyteller_credentials_from_disk(app_data_root) {
-      Err(err) => warn!("Failed to read credentials from disk: {:?}", err),
-      Ok(creds) => {
-        holder.set_credentials(&creds).expect("Failed to set credentials");
-      }
-    }
-
-    Self {
-      holder,
-      app_data_root: app_data_root.clone(),
-    }
-  }
-
-  pub fn set_credentials(&self, creds: &StorytellerCredentialSet) -> AnyhowResult<()> {
-    self.holder.set_credentials(creds)
-  }
-
-  pub fn clear_credentials(&self) -> AnyhowResult<()> {
-    self.holder.clear_credentials()?;
-    Ok(())
-  }
-
-  pub fn get_credentials(&self) -> AnyhowResult<Option<StorytellerCredentialSet>> {
-    self.holder.get_credentials()
-  }
-
-  pub fn get_credentials_required(&self) -> AnyhowResult<StorytellerCredentialSet> {
-    self.holder.get_credentials_required()
-  }
-
-  pub fn reset_from_disk(&self) -> AnyhowResult<StorytellerCredentialSet> {
-    let creds = read_storyteller_credentials_from_disk(&self.app_data_root)?;
-    self.holder.set_credentials(&creds)?;
-    Ok(creds)
-  }
-
-  pub fn persist_all_to_disk(&self) -> AnyhowResult<()> {
-    let credentials = self.holder.get_credentials_required()?;
-
-    info!("Persisting avt cookie to disk...");
-    if let Some(avt) = credentials.avt.as_ref() {
-      persist_avt_to_disk(&avt, &self.app_data_root)?;
-    }
-
-    info!("Persisting session cookie to disk...");
-    if let Some(session) = credentials.session.as_ref() {
-      persist_session_to_disk(&session, &self.app_data_root)?;
-    }
-
-    Ok(())
-  }
-}
-
-fn persist_session_to_disk(session: &StorytellerSessionCookie, app_data_root: &AppDataRoot) -> AnyhowResult<()> {
-  let creds_dir = app_data_root.credentials_dir();
-  let filename = creds_dir.get_storyteller_session_cookie_file_path();
-
-  let mut file = OpenOptions::new()
-      .create(true)
-      .write(true)
-      .truncate(true)
-      .open(filename)?;
-
-  file.write_all(session.as_bytes())?;
-  file.flush()?;
-
-  Ok(())
-}
-
-fn persist_avt_to_disk(avt: &StorytellerAvtCookie, app_data_root: &AppDataRoot) -> AnyhowResult<()> {
-  let creds_dir = app_data_root.credentials_dir();
-  let filename = creds_dir.get_storyteller_avt_cookie_file_path();
-
-  let mut file = OpenOptions::new()
-      .create(true)
-      .write(true)
-      .truncate(true)
-      .open(filename)?;
-
-  file.write_all(avt.as_bytes())?;
-  file.flush()?;
-
-  Ok(())
-}