Use npx nx instead of nx since it's installed that way

Use 3JS size api instead of direct domElement access (avoids implicit
pixel density scaling)

Co-authored-by: Tanish Manku <-h>

.idea/codeStyles/Project.xml

@@ -0,0 +1,13 @@
+<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

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

.sqlx/query-2bd7a5b886c9624ae48533ddac409cfca0668f30ab1f7016c412876b5904168b.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nUPDATE generic_inference_jobs\nSET\n  status = \"complete_success\",\n  on_success_result_entity_type = ?,\n  on_success_result_entity_token = ?,\n  failure_reason = NULL,\n  internal_debugging_failure_reason = NULL,\n  success_execution_millis = ?,\n  success_inference_execution_millis = ?,\n  retry_at = NULL,\n  successfully_completed_at = NOW()\nWHERE token = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 5
+    },
+    "nullable": []
+  },
+  "hash": "2bd7a5b886c9624ae48533ddac409cfca0668f30ab1f7016c412876b5904168b"
+}

Cargo.lock

@@ -1921,7 +1921,7 @@ checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f"
 dependencies = [
  "byteorder",
  "fnv",
- "uuid",
+ "uuid 1.8.0",
 ]
 
 [[package]]
@@ -3258,6 +3258,20 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "discord-rich-presence"
+version = "0.2.5"
+source = "git+https://github.com/vionya/discord-rich-presence#9c6cabe04a70cfcc822affd1bf8be51321f8a821"
+dependencies = [
+ "log",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "serde_repr",
+ "thiserror 2.0.12",
+ "uuid 0.8.2",
+]
+
 [[package]]
 name = "dispatch"
 version = "0.2.0"
@@ -5547,7 +5561,7 @@ dependencies = [
 name = "idempotency"
 version = "0.0.1"
 dependencies = [
- "uuid",
+ "uuid 1.8.0",
  "workspace-build-acceleration",
 ]
 
@@ -5653,8 +5667,10 @@ dependencies = [
 name = "images"
 version = "0.0.1"
 dependencies = [
+ "anyhow",
  "errors",
  "image",
+ "mimetypes",
  "testing",
  "workspace-build-acceleration",
 ]
@@ -6868,7 +6884,9 @@ dependencies = [
 name = "mimetypes"
 version = "0.0.1"
 dependencies = [
- "infer 0.16.0",
+ "anyhow",
+ "infer 0.19.0",
+ "testing",
  "workspace-build-acceleration",
 ]
 
@@ -7793,7 +7811,7 @@ dependencies = [
  "toml 0.8.20",
  "ureq",
  "url",
- "uuid",
+ "uuid 1.8.0",
  "walkdir",
 ]
 
@@ -9700,7 +9718,7 @@ dependencies = [
  "rkyv_derive",
  "seahash",
  "tinyvec",
- "uuid",
+ "uuid 1.8.0",
 ]
 
 [[package]]
@@ -10101,7 +10119,7 @@ dependencies = [
  "serde",
  "serde_json",
  "url",
- "uuid",
+ "uuid 1.8.0",
 ]
 
 [[package]]
@@ -11191,6 +11209,7 @@ dependencies = [
  "hostname 0.4.0",
  "http_server_common",
  "idempotency",
+ "images",
  "infer 0.16.0",
  "language-tags",
  "lexical-sort",
@@ -11248,7 +11267,7 @@ dependencies = [
  "user_traits_component",
  "utoipa",
  "utoipa-swagger-ui",
- "uuid",
+ "uuid 1.8.0",
  "videos",
  "workspace-build-acceleration",
  "zip 0.6.6",
@@ -12042,10 +12061,12 @@ dependencies = [
  "crockford",
  "directories 6.0.0",
  "dirs 6.0.0",
+ "discord-rich-presence",
  "errors",
  "filesys",
  "futures 0.3.29",
  "image",
+ "indexmap 2.9.0",
  "libloading 0.8.6",
  "log",
  "memory_caching",
@@ -12117,7 +12138,7 @@ dependencies = [
  "thiserror 2.0.12",
  "time",
  "url",
- "uuid",
+ "uuid 1.8.0",
  "walkdir",
 ]
 
@@ -12296,7 +12317,7 @@ dependencies = [
  "toml 0.8.20",
  "url",
  "urlpattern",
- "uuid",
+ "uuid 1.8.0",
  "walkdir",
 ]
 
@@ -13540,6 +13561,15 @@ dependencies = [
  "zip 1.1.4",
 ]
 
+[[package]]
+name = "uuid"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
+dependencies = [
+ "getrandom 0.2.14",
+]
+
 [[package]]
 name = "uuid"
 version = "1.8.0"
@@ -14701,7 +14731,7 @@ dependencies = [
  "unicode-normalization",
  "ureq",
  "url",
- "uuid",
+ "uuid 1.8.0",
  "void",
  "winapi 0.3.9",
  "windows-sys 0.48.0",

Cargo.toml

@@ -147,6 +147,10 @@ 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
@@ -157,6 +161,7 @@ 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"
@@ -177,7 +182,9 @@ enums = { path = "crates/_types/enums" }
 enums_public = { path = "crates/_types/enums_public" }
 errors = { path = "crates/lib/errors" }
 filesys = { path = "crates/lib/files/filesys" }
+images = { path = "crates/lib/files/images" }
 memory_caching = { path = "crates/lib/caching/memory_caching" }
+mimetypes = { path = "crates/lib/files/mimetypes" }
 openai_sora_client = { path = "crates/lib/api_clients/openai_sora_client" }
 primitives = { path = "crates/lib/data/primitives" }
 shared_service_components = { path = "crates/lib/shared_service_components" }

crates/_types/enums/src/by_table/media_files/media_file_origin_category.rs

@@ -28,11 +28,12 @@ pub enum MediaFileOriginCategory {
   DeviceApi,
 
   /// From Storyteller Studio Engine
+  #[deprecated(note="This db field should only denote file provenance, not the product.")]
   #[serde(rename = "studio")]
   StorytellerStudio,
 
   /// From Storyteller Studio Engine
-  #[deprecated(note = "Use StorytellerStudio instead")]
+  #[deprecated(note = "DO NOT USE. Originally deprecated in favor of `StorytellerStudio`.")]
   StoryEngine,
 }
 

crates/_types/enums/src/by_table/media_files/media_file_origin_product_category.rs

@@ -39,6 +39,10 @@ pub enum MediaFileOriginProductCategory {
   #[serde(rename = "vst")]
   VideoStyleTransfer,
 
+  /// Image Studio
+  #[serde(rename = "image_studio")]
+  ImageStudio,
+
   /// Storyteller Studio
   #[serde(rename = "studio")]
   StorytellerStudio,
@@ -87,6 +91,7 @@ impl MediaFileOriginProductCategory {
       Self::FaceFusion => "face_fusion",
       Self::FaceMirror => "face_mirror",
       Self::VideoStyleTransfer => "vst",
+      Self::ImageStudio => "image_studio",
       Self::StorytellerStudio => "studio",
       Self::TextToSpeech => "tts",
       Self::VoiceConversion => "voice_conversion",
@@ -105,6 +110,7 @@ impl MediaFileOriginProductCategory {
       "face_fusion" => Ok(Self::FaceFusion),
       "face_mirror" => Ok(Self::FaceMirror),
       "vst" => Ok(Self::VideoStyleTransfer),
+      "image_studio" => Ok(Self::ImageStudio),
       "studio" => Ok(Self::StorytellerStudio),
       "tts" => Ok(Self::TextToSpeech),
       "voice_conversion" => Ok(Self::VoiceConversion),
@@ -126,6 +132,7 @@ impl MediaFileOriginProductCategory {
       Self::FaceFusion,
       Self::FaceMirror,
       Self::VideoStyleTransfer,
+      Self::ImageStudio,
       Self::StorytellerStudio,
       Self::TextToSpeech,
       Self::VoiceConversion,
@@ -153,6 +160,7 @@ mod tests {
       assert_serialization(MediaFileOriginProductCategory::FaceFusion, "face_fusion");
       assert_serialization(MediaFileOriginProductCategory::FaceMirror, "face_mirror");
       assert_serialization(MediaFileOriginProductCategory::VideoStyleTransfer, "vst");
+      assert_serialization(MediaFileOriginProductCategory::ImageStudio, "image_studio");
       assert_serialization(MediaFileOriginProductCategory::StorytellerStudio, "studio");
       assert_serialization(MediaFileOriginProductCategory::TextToSpeech, "tts");
       assert_serialization(MediaFileOriginProductCategory::VoiceConversion, "voice_conversion");
@@ -170,6 +178,7 @@ mod tests {
       assert_eq!(MediaFileOriginProductCategory::FaceFusion.to_str(), "face_fusion");
       assert_eq!(MediaFileOriginProductCategory::FaceMirror.to_str(), "face_mirror");
       assert_eq!(MediaFileOriginProductCategory::VideoStyleTransfer.to_str(), "vst");
+      assert_eq!(MediaFileOriginProductCategory::ImageStudio.to_str(), "image_studio");
       assert_eq!(MediaFileOriginProductCategory::StorytellerStudio.to_str(), "studio");
       assert_eq!(MediaFileOriginProductCategory::TextToSpeech.to_str(), "tts");
       assert_eq!(MediaFileOriginProductCategory::VoiceConversion.to_str(), "voice_conversion");
@@ -187,6 +196,7 @@ mod tests {
       assert_eq!(MediaFileOriginProductCategory::from_str("face_fusion").unwrap(), MediaFileOriginProductCategory::FaceFusion);
       assert_eq!(MediaFileOriginProductCategory::from_str("face_mirror").unwrap(), MediaFileOriginProductCategory::FaceMirror);
       assert_eq!(MediaFileOriginProductCategory::from_str("vst").unwrap(), MediaFileOriginProductCategory::VideoStyleTransfer);
+      assert_eq!(MediaFileOriginProductCategory::from_str("image_studio").unwrap(), MediaFileOriginProductCategory::ImageStudio);
       assert_eq!(MediaFileOriginProductCategory::from_str("studio").unwrap(), MediaFileOriginProductCategory::StorytellerStudio);
       assert_eq!(MediaFileOriginProductCategory::from_str("tts").unwrap(), MediaFileOriginProductCategory::TextToSpeech);
       assert_eq!(MediaFileOriginProductCategory::from_str("voice_conversion").unwrap(), MediaFileOriginProductCategory::VoiceConversion);
@@ -200,12 +210,13 @@ mod tests {
     #[test]
     fn all_variants() {
       let mut variants = MediaFileOriginProductCategory::all_variants();
-      assert_eq!(variants.len(), 13);
+      assert_eq!(variants.len(), 14);
       assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::Unknown));
       assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::FaceAnimator));
       assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::FaceFusion));
       assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::FaceMirror));
       assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::VideoStyleTransfer));
+      assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::ImageStudio));
       assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::StorytellerStudio));
       assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::TextToSpeech));
       assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::VoiceConversion));

crates/desktop/tauri-artcraft/Cargo.toml

@@ -34,10 +34,8 @@ subprocess_common = { workspace = true }
 tokens = { workspace = true }
 
 # External
-#openssl = { version = "0.10", features = ["vendored"] }
-# NB(bt,2025-03-10): default-features = false on Windows while I debug openssl / rustls
 anyhow = { workspace = true }
-base64 = "0.22.1"
+base64 = { workspace = true }
 bytes = "1.10"
 chrono = { workspace = true }
 const_format = "0.2.34"
@@ -45,10 +43,11 @@ directories = "6.0.0"
 dirs = "6.0.0"
 futures = "0.3"
 image = "0.25.5"
+indexmap = { workspace = true }
 log = { workspace = true }
 once_cell = { workspace = true }
 rand = { workspace = true }
-reqwest = { workspace = true, features = ["multipart", "stream"], default-features = false }
+reqwest = { workspace = true, features = ["multipart", "stream"], default-features = false } # NB(bt,2025-03-10): default-features = false on Windows while I debug openssl / rustls
 serde = { workspace = true }
 serde_derive = { workspace = true }
 serde_json = { workspace = true }
@@ -60,6 +59,10 @@ tempfile = "3.18.0"
 tokio = { version = "1.42", features = ["rt", "rt-multi-thread", "fs"] }
 tokio-util = { version = "0.7", features = ["codec"] }
 
+# NB: The version of the `discord-rich-presence` crate (0.2.5) last published has non-Send/Sync error
+# types and can't do threading. We need to wait for a new version to unpin from Git.
+discord-rich-presence = { git = "https://github.com/vionya/discord-rich-presence" }
+
 [dev-dependencies]
 libloading = "0.8.6"
 serial_test = "3.2.0"

crates/desktop/tauri-artcraft/src/commands/sora/sora_image_generation_command.rs

@@ -1,4 +1,4 @@
-use crate::state::app_dir::AppDataRoot;
+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 base64::prelude::BASE64_STANDARD;

crates/desktop/tauri-artcraft/src/commands/sora/sora_image_remix_command.rs

@@ -1,7 +1,9 @@
-use crate::state::app_dir::AppDataRoot;
+use crate::state::data_dir::app_data_root::AppDataRoot;
+use crate::state::data_dir::trait_data_subdir::DataSubdir;
 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::sora::sora_credential_manager::SoraCredentialManager;
+use crate::state::sora::sora_task_queue::SoraTaskQueue;
 use crate::utils::get_url_file_extension::get_url_file_extension;
 use crate::utils::simple_http_download::simple_http_download;
 use base64::prelude::BASE64_STANDARD;
@@ -50,12 +52,13 @@ pub async fn sora_image_remix_command(
   request: SoraImageRemixCommand,
   app_data_root: State<'_, AppDataRoot>,
   sora_creds_manager: State<'_, SoraCredentialManager>,
+  sora_task_queue: State<'_, SoraTaskQueue>,
 ) -> Result<String, String> {
   info!("image_generation_command called; processing image...");
 
   // TODO(bt,2025-04-24): Better error messages to caller
 
-  generate_image(request, &app_data_root, &sora_creds_manager)
+  generate_image(request, &app_data_root, &sora_creds_manager, &sora_task_queue)
     .await
     .map_err(|err| {
       error!("error: {:?}", err);
@@ -69,6 +72,7 @@ pub async fn generate_image(
   request: SoraImageRemixCommand,
   app_data_root: &AppDataRoot,
   sora_creds_manager: &SoraCredentialManager,
+  sora_task_queue: &SoraTaskQueue,
 ) -> AnyhowResult<()> {
 
   let response = get_media_file(&ApiHost::Storyteller, &request.snapshot_media_token).await?;
@@ -85,8 +89,6 @@ pub async fn generate_image(
 
   let files_to_upload = vec![filename];
 
-
-
   let mut creds = sora_creds_manager.get_credentials_required()?;
 
   let credential_updated = maybe_upgrade_or_renew_session(&mut creds)
@@ -141,7 +143,9 @@ pub async fn generate_image(
     sora_creds_manager.set_credentials(&new_creds)?;
   }
 
-  println!(">> TASK ID: {:?} ", response.task_id);
+  info!("New Sora Task ID: {:?} ", response.task_id);
+
+  sora_task_queue.insert(&response.task_id)?;
 
   Ok(())
 }

crates/desktop/tauri-artcraft/src/lib.rs

@@ -4,20 +4,27 @@ pub mod state;
 pub mod threads;
 pub mod utils;
 
+use tauri::{Manager};
+
 use crate::commands::flip_image::flip_image;
 use crate::commands::sora::open_sora_login_command::open_sora_login_command;
+use crate::state::main_window_size::MainWindowSize;
 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::state::app_config::AppConfig;
 use crate::state::sora::sora_credential_manager::SoraCredentialManager;
+use crate::state::sora::sora_task_queue::SoraTaskQueue;
+use crate::threads::discord_presence_thread::discord_presence_thread;
+use crate::threads::main_window_thread::main_window_thread;
 use crate::threads::sora_session_login_thread::sora_session_login_thread;
+use crate::threads::sora_task_polling_thread::sora_task_polling_thread;
 
 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 
+  // NB: Tauri wants to install the logger itself, so we can't rely on the logger crate
   // until the tauri runtime begins.
   println!("Loading model config...");
 
@@ -25,11 +32,15 @@ pub fn run() {
     .expect("config should load");
 
   let app_data_root = config.app_data_root.clone();
-  let app_data_root2 = config.app_data_root.clone();
+  let app_data_root_2 = config.app_data_root.clone();
 
   println!("Attempting to read existing credentials...");
   let sora_creds_manager = SoraCredentialManager::initialize_from_disk_infallible(&app_data_root);
-  let sora_creds_manager2 = sora_creds_manager.clone();
+  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...");
 
@@ -56,13 +67,37 @@ pub fn run() {
       //}
       let app = app.handle().clone();
 
-      tauri::async_runtime::spawn(sora_session_login_thread(app, app_data_root2, sora_creds_manager2));
+      let app_2 = app.clone();
+      let app_3 = 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();
+
+      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);
+        }
+      }
+
+      tauri::async_runtime::spawn(sora_session_login_thread(app_2, app_data_root_2, sora_creds_manager_2));
+      tauri::async_runtime::spawn(main_window_thread(app_3, app_data_root_3));
+      tauri::async_runtime::spawn(sora_task_polling_thread(app_data_root_4, sora_creds_manager_3, sora_task_queue_2));
+      tauri::async_runtime::spawn(discord_presence_thread());
 
       Ok(())
     })
-    .manage(config)
     .manage(app_data_root)
+    .manage(config)
     .manage(sora_creds_manager)
+    .manage(sora_task_queue)
     .invoke_handler(tauri::generate_handler![
       flip_image,
       open_sora_login_command,

crates/desktop/tauri-artcraft/src/state/app_config.rs

@@ -1,4 +1,4 @@
-use crate::state::app_dir::AppDataRoot;
+use crate::state::data_dir::app_data_root::AppDataRoot;
 use crate::state::os_platform::OsPlatform;
 use crate::state::yaml_config::YamlConfig;
 

crates/desktop/tauri-artcraft/src/state/app_dir.rs

@@ -1,264 +0,0 @@
-use crate::state::expanduser::expanduser;
-use crate::state::os_platform::OsPlatform;
-use anyhow::anyhow;
-use directories::UserDirs;
-use std::path::{Path, PathBuf};
-use chrono::{DateTime, Local};
-use tempdir::TempDir;
-use tempfile::{Builder, NamedTempFile};
-
-const DEFAULT_DATA_DIR : &str = "artcraft";
-const ASSETS_SUBDIRECTORY : &str = "assets";
-const DOWNLOADS_SUBDIRECTORY : &str = "downloads";
-const WEIGHTS_SUBDIRECTORY : &str = "weights";
-
-const TEMPORARY_SUBDIRECTORY : &str = "temp";
-
-/// 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,
-  downloads_dir: AppDownloadsDir,
-  weights_dir: AppWeightsDir,
-  temp_dir: TemporaryDir,
-  log_file_name: PathBuf,
-  log_file_name_string: String,
-}
-
-#[derive(Clone)]
-pub struct AppAssetsDir {
-  path: PathBuf,
-}
-
-#[derive(Clone)]
-pub struct AppDownloadsDir {
-  path: PathBuf,
-}
-
-#[derive(Clone)]
-pub struct AppWeightsDir {
-  path: PathBuf,
-}
-
-#[derive(Clone)]
-pub struct TemporaryDir {
-  path: PathBuf,
-}
-
-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::create_existing(dir.join(ASSETS_SUBDIRECTORY))?;
-    let downloads_dir = AppDownloadsDir::create_existing(dir.join(DOWNLOADS_SUBDIRECTORY))?;
-    let weights_dir = AppWeightsDir::create_existing(dir.join(WEIGHTS_SUBDIRECTORY))?;
-    let temp_dir = TemporaryDir::create_existing(dir.join(TEMPORARY_SUBDIRECTORY))?;
-    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,
-      downloads_dir,
-      weights_dir,
-      temp_dir,
-      log_file_name,
-      log_file_name_string,
-    })
-  }
-  
-  pub fn assets_dir(&self) -> &AppAssetsDir {
-    &self.assets_dir
-  }
-
-  pub fn downloads_dir(&self) -> &AppDownloadsDir {
-    &self.downloads_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.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")
-  }
-}
-
-impl AppAssetsDir {
-  pub fn create_existing<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 {
-      path: dir,
-    })
-  }
-
-  pub fn path(&self) -> &Path {
-    &self.path
-  }
-  
-  /// 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)
-  }
-}
-
-impl AppDownloadsDir {
-  pub fn create_existing<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 {
-      path: dir,
-    })
-  }
-
-  pub fn path(&self) -> &Path {
-    &self.path
-  }
-}
-
-
-impl AppWeightsDir {
-  pub fn create_existing<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 {
-      path: dir,
-    })
-  }
-
-  pub fn path(&self) -> &Path {
-    &self.path
-  }
-}
-
-impl TemporaryDir {
-  pub fn create_existing<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 {
-      path: dir,
-    })
-  }
-
-  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)
-  }
-}
-
-// 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/tauri-artcraft/src/state/data_dir/app_assets_dir.rs

@@ -0,0 +1,36 @@
+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/tauri-artcraft/src/state/data_dir/app_credentials_dir.rs

@@ -0,0 +1,35 @@
+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")
+  }
+}

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

@@ -0,0 +1,140 @@
+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_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,
+  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 downloads_dir = AppDownloadsDir::get_or_create_in_root_dir(&dir)?;
+    let credentials_dir = AppCredentialsDir::get_or_create_in_root_dir(&dir)?;
+    let weights_dir = AppWeightsDir::get_or_create_in_root_dir(&dir)?;
+    let temp_dir = TemporaryDir::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,
+      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 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")
+  }
+}
+
+// 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/tauri-artcraft/src/state/data_dir/app_downloads_dir.rs

@@ -0,0 +1,21 @@
+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/tauri-artcraft/src/state/data_dir/app_weights_dir.rs

@@ -0,0 +1,21 @@
+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/tauri-artcraft/src/state/data_dir/mod.rs

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

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

@@ -0,0 +1,38 @@
+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/tauri-artcraft/src/state/data_dir/trait_data_subdir.rs

@@ -0,0 +1,31 @@
+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/tauri-artcraft/src/state/main_window_size.rs

@@ -0,0 +1,74 @@
+use crate::state::data_dir::app_data_root::AppDataRoot;
+use errors::AnyhowResult;
+use serde_derive::{Deserialize, Serialize};
+use std::fs::OpenOptions;
+use std::io::Write;
+use tauri::{AppHandle, Manager, PhysicalSize, Window};
+
+const MAIN_WINDOW_NAME: &str = "main";
+
+#[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 = window.inner_size()?;
+    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/tauri-artcraft/src/state/mod.rs

@@ -1,6 +1,8 @@
 pub mod app_config;
-pub mod app_dir;
+pub mod data_dir;
 pub mod expanduser;
+pub mod main_window_size;
 pub mod os_platform;
 pub mod sora;
+pub mod storyteller;
 pub mod yaml_config;

crates/desktop/tauri-artcraft/src/state/sora/mod.rs

@@ -1,4 +1,5 @@
 pub mod read_sora_credentials_from_disk;
 pub mod read_sora_credentials_from_disk_with_upgrade;
 pub mod sora_credential_holder;
-pub mod sora_credential_manager;
+pub mod sora_credential_manager;
+pub mod sora_task_queue;

crates/desktop/tauri-artcraft/src/state/sora/read_sora_credentials_from_disk.rs

@@ -1,4 +1,4 @@
-use crate::state::app_dir::AppDataRoot;
+use crate::state::data_dir::app_data_root::AppDataRoot;
 use anyhow::anyhow;
 use errors::AnyhowResult;
 use openai_sora_client::creds::sora_cookies::SoraCookies;

crates/desktop/tauri-artcraft/src/state/sora/read_sora_credentials_from_disk_with_upgrade.rs

@@ -1,4 +1,4 @@
-use crate::state::app_dir::AppDataRoot;
+use crate::state::data_dir::app_data_root::AppDataRoot;
 use anyhow::anyhow;
 use errors::AnyhowResult;
 use log::{info, warn};

crates/desktop/tauri-artcraft/src/state/sora/sora_credential_manager.rs

@@ -1,4 +1,4 @@
-use crate::state::app_dir::AppDataRoot;
+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 anyhow::anyhow;

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

@@ -0,0 +1,231 @@
+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/tauri-artcraft/src/threads/discord_presence_thread.rs

@@ -0,0 +1,42 @@
+use anyhow::anyhow;
+use discord_rich_presence::{DiscordIpc, DiscordIpcClient};
+use errors::AnyhowResult;
+use log::info;
+
+/// Our Discord App ID. Not sure if this is a secret.
+const DISCORD_APP_ID : &str = "1366596912593113138";
+
+pub async fn discord_presence_thread() -> ! {
+  loop {
+    let client = DiscordIpcClient::new(DISCORD_APP_ID);
+    let _err = discord_main_loop(client).await;
+    tokio::time::sleep(std::time::Duration::from_millis(10_000)).await;
+  }
+}
+
+async fn discord_main_loop(mut client: DiscordIpcClient) -> AnyhowResult<()> {
+  info!("Connecting Discord IPC client");
+
+  client.connect()
+      .map_err(|err| anyhow!("Error connecting to Discord IPC: {:?}", err))?;
+
+  loop {
+    info!("Notifying discord...");
+
+    let assets = discord_rich_presence::activity::Assets::new()
+        .large_image("https://storyteller.ai/android-chrome-512x512.png")
+        .large_text("https://GetArtCraft.com");
+        //.small_image("https://storyteller.ai/android-chrome-192x192.png")
+        //.small_text("small text");
+
+    client.set_activity(discord_rich_presence::activity::Activity::new()
+        //.state("Anyone can make arts!")
+        .state("GetArtCraft.com")
+        .details("Making Arts with ArtCraft")
+        .activity_type(discord_rich_presence::activity::ActivityType::Playing)
+        .assets(assets))
+        .map_err(|err| anyhow!("Error setting Discord activity: {:?}", err))?;
+
+    tokio::time::sleep(std::time::Duration::from_millis(30_000)).await;
+  }
+}

crates/desktop/tauri-artcraft/src/threads/main_window_thread.rs

@@ -0,0 +1,48 @@
+use crate::state::data_dir::app_data_root::AppDataRoot;
+use crate::state::main_window_size::MainWindowSize;
+use errors::AnyhowResult;
+use log::{error, info};
+use tauri::{AppHandle, Manager, Webview, Window};
+
+const MAIN_WINDOW_NAME : &str = "main";
+
+pub async fn main_window_thread(
+  app: AppHandle,
+  app_data_root: AppDataRoot,
+) -> ! {
+  loop {
+    for (window_name, window) in app.windows() {
+      if window_name == MAIN_WINDOW_NAME {
+        let result = handle_main_window(
+          &window,
+          &app_data_root,
+        ).await;
+        if let Err(err) = result {
+          error!("Error handling main window: {:?}", err);
+        }
+      }
+    }
+    tokio::time::sleep(std::time::Duration::from_millis(1_000)).await;
+  }
+}
+
+pub async fn handle_main_window(
+  window: &Window,
+  app_data_root: &AppDataRoot,
+) -> AnyhowResult<()> {
+  let mut window_size = MainWindowSize::from_window(window)?;
+
+  loop {
+    let old_size = window_size.to_physical_size();
+    let new_size = window.inner_size()?;
+
+    if !window_size.matches_physical_size(&new_size) {
+      info!("Window size changed from {:?} to {:?}", old_size, new_size);
+      window_size = MainWindowSize::from_window(&window)?;
+      info!("Saving window size configs to disk...");
+      window_size.persist_to_filesystem(app_data_root)?;
+    }
+
+    tokio::time::sleep(std::time::Duration::from_millis(10_000)).await;
+  }
+}

crates/desktop/tauri-artcraft/src/threads/mod.rs

@@ -1 +1,4 @@
-pub mod sora_session_login_thread;
+pub mod discord_presence_thread;
+pub mod main_window_thread;
+pub mod sora_session_login_thread;
+pub mod sora_task_polling_thread;

crates/desktop/tauri-artcraft/src/threads/sora_session_login_thread.rs

@@ -1,22 +1,22 @@
-use std::fs;
-use crate::state::app_dir::AppDataRoot;
+use crate::state::data_dir::app_data_root::AppDataRoot;
 use crate::state::sora::sora_credential_holder::SoraCredentialHolder;
 use crate::state::sora::sora_credential_manager::SoraCredentialManager;
 use crate::utils::sora::initialize_sora_jwt_bearer_token::initialize_sora_jwt_bearer_token;
 use crate::utils::sora_webview_cookies::get_all_sora_cookies_as_string;
 use anyhow::anyhow;
+use chrono::{DateTime, NaiveDateTime, TimeDelta};
 use errors::AnyhowResult;
 use log::{error, info, warn};
 use once_cell::sync::Lazy;
-use reqwest::Url;
-use std::fs::{read_to_string, OpenOptions};
-use std::io::Write;
-use std::ops::Sub;
-use chrono::{DateTime, NaiveDateTime, TimeDelta};
-use tauri::{AppHandle, Manager, Webview};
 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 reqwest::Url;
+use std::fs;
+use std::fs::{read_to_string, OpenOptions};
+use std::io::Write;
+use std::ops::Sub;
+use tauri::{AppHandle, Manager, Webview};
 
 pub const LOGIN_WINDOW_NAME: &str = "login_window";
 

crates/desktop/tauri-artcraft/src/threads/sora_task_polling_thread.rs

@@ -0,0 +1,89 @@
+use crate::state::data_dir::app_data_root::AppDataRoot;
+use crate::state::sora::sora_credential_manager::SoraCredentialManager;
+use crate::state::sora::sora_task_queue::SoraTaskQueue;
+use errors::AnyhowResult;
+use log::{error, info};
+use openai_sora_client::recipes::list_sora_task_status_with_session_auto_renew::{list_sora_task_status_with_session_auto_renew, StatusRequestArgs};
+use openai_sora_client::requests::image_gen::image_gen_status::{TaskId, TaskStatus};
+use tauri::AppHandle;
+
+pub async fn sora_task_polling_thread(
+  app_data_root: AppDataRoot,
+  sora_creds_manager: SoraCredentialManager,
+  sora_task_queue: SoraTaskQueue,
+) -> ! {
+  loop {
+    let res = polling_loop(&sora_creds_manager, &sora_task_queue).await;
+    if let Err(err) = res {
+      error!("An error occurred: {:?}", err);
+    }
+    tokio::time::sleep(std::time::Duration::from_millis(30_000)).await;
+  }
+}
+
+async fn polling_loop(
+  sora_creds_manager: &SoraCredentialManager,
+  sora_task_queue: &SoraTaskQueue,
+) -> AnyhowResult<()> {
+  loop {
+    if sora_task_queue.is_empty()? {
+      // No need to poll if we don't have pending tasks.
+      tokio::time::sleep(std::time::Duration::from_millis(1_000)).await;
+      continue;
+    }
+
+    info!("Task queue has {} pending tasks.", sora_task_queue.len()?);
+
+    let creds = sora_creds_manager.get_credentials_required()?;
+
+    let (response, maybe_new_creds) = list_sora_task_status_with_session_auto_renew(StatusRequestArgs {
+      limit: None,
+      // TODO: How can we use the task id to poll better? Our existing code doesn't seem to illuminate this.
+      before: None,
+      credentials: creds,
+    }).await?;
+
+    if let Some(new_creds) = maybe_new_creds {
+      info!("Saving new credentials.");
+      sora_creds_manager.set_credentials(&new_creds)?;
+    }
+
+    let mut succeeded_tasks = Vec::new();
+    let mut failed_tasks = Vec::new();
+
+    // TODO: The cursoring logic likely needs to improve.
+    for task in response.task_responses {
+      let status = TaskStatus::from_str(&task.status);
+
+      match status {
+        TaskStatus::Succeeded => {
+          succeeded_tasks.push(task);
+        }
+        TaskStatus::Failed => {
+          failed_tasks.push(task);
+        }
+        TaskStatus::Queued => {}
+        TaskStatus::Running => {}
+        TaskStatus::Unknown(_) => {}
+      }
+    }
+
+    let failed_task_ids: Vec<&TaskId> = failed_tasks
+        .iter()
+        .map(|task| &task.id)
+        .collect();
+
+    sora_task_queue.remove_list(&failed_task_ids)?;
+
+    // TODO: Handle succeeded tasks.
+
+    let succeeded_task_ids : Vec<&TaskId> = succeeded_tasks
+        .iter()
+        .map(|task| &task.id)
+        .collect();
+
+    sora_task_queue.remove_list(&succeeded_task_ids)?;
+
+    tokio::time::sleep(std::time::Duration::from_millis(2_000)).await;
+  }
+}

crates/desktop/tauri-artcraft/src/utils/mod.rs

@@ -3,5 +3,5 @@ pub mod get_url_file_extension;
 pub mod image;
 pub mod large_file_transfer;
 pub mod simple_http_download;
-pub mod sora_webview_cookies;
-pub mod sora;
+pub mod sora;
+pub mod sora_webview_cookies;

crates/desktop/tauri-artcraft/src/utils/sora/initialize_sora_jwt_bearer_token.rs

@@ -1,4 +1,4 @@
-use crate::state::app_dir::AppDataRoot;
+use crate::state::data_dir::app_data_root::AppDataRoot;
 use anyhow::anyhow;
 use errors::AnyhowResult;
 use log::info;

crates/desktop/tauri-artcraft/tauri.artcraft_2d.conf.toml

@@ -1,5 +1,5 @@
 # For some reason, we can't pass json files to the tauri dev command
 [build]
 frontendDist = "../../../frontend/apps/editor2d/dist"
-beforeDevCommand = "nx run editor2d:dev"
+beforeDevCommand = "npx nx run editor2d:dev"
 devUrl = "http://localhost:5741"

crates/desktop/tauri-artcraft/tauri.artcraft_3d.conf.toml

@@ -1,5 +1,5 @@
 # For some reason, we can't pass json files to the tauri dev command
 [build]
 frontendDist = "../../../frontend/apps/editor3d/dist"
-beforeDevCommand = "nx run editor3d:dev"
+beforeDevCommand = "npx nx run editor3d:dev"
 devUrl = "http://localhost:5173"

crates/desktop/tauri-artcraft/tauri.artcraft_3d.no_dev.conf.toml

@@ -0,0 +1,6 @@
+# For some reason, we can't pass json files to the tauri dev command
+[build]
+frontendDist = "../../../frontend/apps/editor3d/dist"
+#beforeDevCommand = "nx run editor3d:dev"
+beforeDevCommand = "echo 'no dev'"
+devUrl = "http://localhost:5173"

crates/desktop/tauri-artcraft/tauri.conf.json

@@ -4,7 +4,7 @@
   "version": "0.0.1",
   "identifier": "ai.artcraft.app",
   "build": {
-    "frontendDist": "../../../frontend/apps/editor2d/dist",
+    "frontendDist": "../../../",
     "devUrl": "http://localhost:5741",
     "beforeDevCommand": "nx run editor2d:dev",
     "beforeBuildCommand": "nx run editor2d:build"

crates/desktop/tauri-artcraft/tauri2.conf.json

@@ -0,0 +1,37 @@
+{
+  "$schema": "https://schema.tauri.app/config/2.0.0-rc",
+  "productName": "ArtCraft",
+  "version": "0.0.1",
+  "identifier": "ai.artcraft.app",
+  "build": {
+    "frontendDist": "../../../frontend/apps/editor3d/dist",
+    "devUrl": "http://localhost:5173",
+    "beforeDevCommand": "echo",
+    "beforeBuildCommand": "nx run editor2d:build"
+  },
+  "app": {
+    "windows": [
+      {
+        "title": "ArtCraft",
+        "width": 2400,
+        "height": 1300,
+        "resizable": true,
+        "fullscreen": false
+      }
+    ],
+    "security": {
+      "csp": null
+    }
+  },
+  "bundle": {
+    "active": true,
+    "targets": "all",
+    "icon": [
+      "icons/32x32.png",
+      "icons/128x128.png",
+      "icons/128x128@2x.png",
+      "icons/icon.icns",
+      "icons/icon.ico"
+    ]
+  }
+}

crates/lib/api_clients/openai_sora_client/src/recipes/image_remix_with_session_auto_renew.rs

@@ -21,6 +21,7 @@ pub struct ImageRemixAutoRenewRequest<'a> {
 }
 
 /// Image request with retry and session auto-renewal.
+/// If a new sora credential is returned, replace the old one with the new one.
 pub async fn image_remix_with_session_auto_renew(request: ImageRemixAutoRenewRequest<'_>) -> Result<(SoraImageGenResponse, Option<SoraCredentialSet>), SoraError> {
   let result = sora_image_gen_remix(SoraImageGenRemixRequest {
     prompt: request.prompt.clone(), // NB: Clone because used again

crates/lib/api_clients/openai_sora_client/src/recipes/image_upload_from_bytes_with_session_auto_renew.rs

@@ -23,6 +23,7 @@ pub struct ImageUploadFromBytesAutoRenewRequest<'a> {
 }
 
 /// Image upload with retry and session auto-renewal.
+/// If a new sora credential is returned, replace the old one with the new one.
 pub async fn image_upload_from_bytes_with_session_auto_renew(
   request: ImageUploadFromBytesAutoRenewRequest<'_>
 ) -> Result<(SoraMediaUploadResponse, Option<SoraCredentialSet>), SoraError> {

crates/lib/api_clients/openai_sora_client/src/recipes/image_upload_from_file_with_session_auto_renew.rs

@@ -13,6 +13,7 @@ pub struct ImageUploadFromFileAutoRenewRequest<'a, P: AsRef<Path>> {
 }
 
 /// Image upload with retry and session auto-renewal.
+/// If a new sora credential is returned, replace the old one with the new one.
 pub async fn image_upload_from_file_with_session_auto_renew<P: AsRef<Path>>(
   request: ImageUploadFromFileAutoRenewRequest<'_, P>
 ) -> Result<(SoraMediaUploadResponse, Option<SoraCredentialSet>), SoraError> {

crates/lib/api_clients/openai_sora_client/src/recipes/list_sora_task_status_with_session_auto_renew.rs

@@ -0,0 +1,62 @@
+use crate::creds::credential_migration::CredentialMigrationRef;
+use crate::creds::sora_credential_set::SoraCredentialSet;
+use crate::recipes::image_upload_from_file_with_session_auto_renew::ImageUploadFromFileAutoRenewRequest;
+use crate::recipes::maybe_refresh_credentials_on_sora_error::maybe_refresh_credentials_on_sora_error;
+use crate::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
+use crate::requests::image_gen::image_gen_status::{get_image_gen_status, StatusRequest, TaskId, TaskResponse, VideoGenStatusResponse};
+use crate::requests::upload::upload_media_from_file::sora_media_upload_from_file;
+use crate::requests::upload::upload_media_http_request::SoraMediaUploadResponse;
+use crate::sora_error::SoraError;
+use anyhow::Error;
+use log::{info, warn};
+use std::path::Path;
+
+pub struct StatusRequestArgs {
+  pub limit: Option<u32>,
+  pub before: Option<TaskId>,
+  pub credentials: SoraCredentialSet,
+}
+
+/// Check Sora task statuses with session auto-renewal.
+/// If a new sora credential is returned, replace the old one with the new one.
+pub async fn list_sora_task_status_with_session_auto_renew(
+  args: StatusRequestArgs,
+) -> Result<(VideoGenStatusResponse, Option<SoraCredentialSet>), SoraError> {
+
+  let request = StatusRequest {
+    limit: args.limit,
+    before: args.before.map(|t| t.0),
+  };
+
+  let mut new_creds = None;
+
+  if args.credentials.jwt_bearer_token.is_none() {
+    info!("JWT not set. Upgrading credentials...");
+    let mut updated_creds = args.credentials.clone();
+    if let Err(err) = maybe_upgrade_or_renew_session(&mut updated_creds).await {
+      warn!("Failed to upgrade or renew session: {:?}", err);
+    }
+    new_creds = Some(updated_creds);
+  }
+
+  let legacy_creds = new_creds.as_ref()
+      .unwrap_or_else(|| &args.credentials)
+      .to_legacy_credentials()?;
+
+  let result = get_image_gen_status(&request, &legacy_creds).await;
+
+  let err = match result {
+    Ok(response) => return Ok((response, new_creds)),
+    Err(err) => err,
+  };
+
+  warn!("Task status polling failed: {:?}", err);
+
+  let new_creds = maybe_refresh_credentials_on_sora_error(&args.credentials, err).await?;
+
+  info!("Retrying image upload with new credentials...");
+
+  let result = get_image_gen_status(&request, &legacy_creds).await?;
+
+  Ok((result, Some(new_creds)))
+}

crates/lib/api_clients/openai_sora_client/src/recipes/mod.rs

@@ -1,6 +1,7 @@
 pub mod image_remix_with_session_auto_renew;
 pub mod image_upload_from_bytes_with_session_auto_renew;
 pub mod image_upload_from_file_with_session_auto_renew;
+pub mod list_sora_task_status_with_session_auto_renew;
 pub mod maybe_refresh_credentials_on_sora_error;
 pub mod maybe_upgrade_or_renew_session;
 pub mod wait_for_image_gen_status;

crates/lib/api_clients/openai_sora_client/src/recipes/wait_for_image_gen_status.rs

@@ -47,5 +47,5 @@ pub async fn wait_for_image_gen_status(task_id: &String, credentials: &SoraCrede
 }
 
 fn find_task_response_by_id(status_response: &VideoGenStatusResponse, task_id: String) -> Option<&TaskResponse> {
-  status_response.task_responses.iter().find(|task| task.id == task_id)
+  status_response.task_responses.iter().find(|task| task.id.0 == task_id)
 }

crates/lib/api_clients/openai_sora_client/src/requests/image_gen/common.rs

@@ -1,7 +1,8 @@
+use crate::requests::image_gen::image_gen_status::TaskId;
 
 #[derive(Debug, Clone)]
 pub struct SoraImageGenResponse {
-  pub task_id: String,
+  pub task_id: TaskId,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]

crates/lib/api_clients/openai_sora_client/src/requests/image_gen/image_gen_http_request.rs

@@ -1,6 +1,7 @@
 use crate::creds::credential_migration::CredentialMigrationRef;
 use serde_derive::{Deserialize, Serialize};
 use thiserror::Error;
+use crate::requests::image_gen::image_gen_status::TaskId;
 
 const SORA_IMAGE_GEN_URL: &str = "https://sora.com/backend/video_gen";
 
@@ -94,7 +95,7 @@ pub (crate) struct RawSoraImageGenRequest {
 #[serde(rename_all = "snake_case")]
 pub (crate) struct RawSoraResponse {
   /// eg. "task_01jqsz9dsae9tvjygf1abrv3xf"
-  pub id: String,
+  pub id: TaskId,
   /// not known
   pub priority: Option<String>,
 }
@@ -227,3 +228,17 @@ pub (crate) async fn image_gen_http_request(sora_request: RawSoraImageGenRequest
 
   Ok(response)
 }
+
+#[cfg(test)]
+mod tests {
+  use errors::AnyhowResult;
+  use crate::requests::image_gen::image_gen_http_request::RawSoraResponse;
+
+  #[test]
+  fn deserialize_task_id() -> AnyhowResult<()> {
+    let json = "{\"id\": \"task_foobarbaz\"}";
+    let response : RawSoraResponse = serde_json::from_str(json)?;
+    assert_eq!(response.id.0, "task_foobarbaz");
+    Ok(())
+  }
+}

crates/lib/api_clients/openai_sora_client/src/requests/image_gen/image_gen_status.rs

@@ -1,15 +1,28 @@
-use std::{fs::File, io::Write, path::Path};
-
 use crate::credentials::SoraCredentials;
+use crate::sora_error::SoraError;
+use anyhow::anyhow;
 use errors::AnyhowResult;
 use reqwest::Url;
-use serde_derive::Deserialize;
+use serde_derive::{Deserialize, Serialize};
+use std::fmt::{Debug, Display};
+use std::{fs::File, io::Write, path::Path};
+use log::debug;
 
 const SORA_STATUS_URL: &str = "https://sora.com/backend/video_gen";
 
 /// This user agent is tied to the sentinel generation. If we need to change it, we may need to change sentinel generation too.
 const USER_AGENT: &str = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36";
 
+/// A strongly typed task ID for Sora tasks.
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Serialize, Deserialize)]
+pub struct TaskId(pub String);
+
+impl Display for TaskId {
+  fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+    std::fmt::Display::fmt(&self.0, f)
+  }
+}
+
 #[derive(Debug, Clone, PartialEq, Eq, Deserialize)]
 pub enum TaskStatus {
   Queued,
@@ -42,7 +55,7 @@ pub struct VideoGenStatusResponse {
 #[derive(Deserialize, Clone, Debug)]
 #[serde(rename_all = "snake_case")]
 pub struct TaskResponse {
-  pub id: String,
+  pub id: TaskId,
   pub user: String,
   pub created_at: String,
   pub status: String,
@@ -79,7 +92,7 @@ pub struct TaskResponse {
 #[serde(rename_all = "snake_case")]
 pub struct Generation {
   pub id: String,
-  pub task_id: String,
+  pub task_id: TaskId,
   pub created_at: String,
   pub deleted_at: Option<String>,
   pub url: String,
@@ -170,7 +183,7 @@ pub struct ModerationResult {
   pub results_by_frame_index: serde_json::Value,
   pub code: Option<String>,
   pub is_output_rejection: bool,
-  pub task_id: String,
+  pub task_id: TaskId,
 }
 
 pub struct StatusRequest {
@@ -186,10 +199,11 @@ impl StatusRequest {
 }
 
 /// Gets the status of image generation tasks from Sora API
-pub async fn get_image_gen_status(status_request: &StatusRequest, credentials: &SoraCredentials) -> AnyhowResult<VideoGenStatusResponse> {
+pub async fn get_image_gen_status(status_request: &StatusRequest, credentials: &SoraCredentials) -> Result<VideoGenStatusResponse, SoraError> {
   let client = reqwest::Client::new();
 
-  let mut url = reqwest::Url::parse(SORA_STATUS_URL)?;
+  let mut url = reqwest::Url::parse(SORA_STATUS_URL)
+      .map_err(|err| anyhow!("error parsing URL: {:?}", err))?;
 
   // Add query parameters
   if let Some(limit) = status_request.limit {
@@ -200,7 +214,11 @@ pub async fn get_image_gen_status(status_request: &StatusRequest, credentials: &
     url.query_pairs_mut().append_pair("before", &before);
   }
 
-  let http_request = client.get(url).header("User-Agent", USER_AGENT).header("Cookie", &credentials.cookie).header("Authorization", credentials.authorization_header_value()).header("Content-Type", "application/json");
+  let http_request = client.get(url)
+      .header("User-Agent", USER_AGENT)
+      .header("Cookie", &credentials.cookie)
+      .header("Authorization", credentials.authorization_header_value())
+      .header("Content-Type", "application/json");
 
   let http_request = http_request.build()?;
 
@@ -209,10 +227,12 @@ pub async fn get_image_gen_status(status_request: &StatusRequest, credentials: &
   let status = response.status();
 
   let response_body = &response.text().await?;
-  println!("response_body: {}", response_body);
+
+  debug!("response_body: {}", response_body);
 
   if status != reqwest::StatusCode::OK {
-    return Err(anyhow::anyhow!("The status request failed; status = {:?}, message = {:?}", status, response_body));
+    // TODO: Handle non-200 status codes, esp. JWT errors and credential errors
+    return Err(SoraError::AnyhowError(anyhow::anyhow!("The status request failed; status = {:?}, message = {:?}", status, response_body)));
   }
 
   let response: VideoGenStatusResponse = serde_json::from_str(response_body)?;
@@ -285,7 +305,7 @@ mod tests {
 
     let task_id = response.task_responses[0].id.clone();
     let task_response = wait_for_image_gen_status(
-      &task_id,
+      &task_id.0,
       &creds,
       Some(10)
     ).await?;

crates/lib/api_clients/openai_sora_client/src/requests/image_gen/sora_image_gen_remix.rs

@@ -84,7 +84,7 @@ mod tests {
 
     println!("task_id: {}", response.task_id);
 
-    assert!(response.task_id.starts_with("task_"));
+    assert!(response.task_id.0.starts_with("task_"));
     Ok(())
   }
 }

crates/lib/api_clients/openai_sora_client/src/requests/image_gen/sora_image_gen_simple.rs

@@ -68,7 +68,7 @@ mod tests {
 
     println!("task_id: {}", response.task_id);
 
-    assert!(response.task_id.starts_with("task_"));
+    assert!(response.task_id.0.starts_with("task_"));
     Ok(())
   }
 }

crates/lib/api_clients/openai_sora_client/src/sora_error.rs

@@ -5,12 +5,14 @@ use std::io;
 /// The single error type this crate should surface to all callers.
 #[derive(Debug)]
 pub enum SoraError {
-  /// We haven't received a bearer token yet (this is our application error)
+  /// We haven't received a bearer token yet
+  /// This is our own internal application state error, not something Sora returns.
   NoBearerTokenAvailable,
 
   /// We're sending too many tasks to Sora.
   TooManyConcurrentTasks,
 
+  // TODO: Try to make concrete error types for these.
   /// Unauthorized, cookie and/or bearer token expired. We'll need to ask for a refreshed login.
   ///
   /// Example message, e.g. from the upload endpoint:
@@ -27,7 +29,7 @@ pub enum SoraError {
   /// Another error occurred.
   OtherBadStatus(anyhow::Error),
 
-  /// Reqwest Error
+  /// Reqwest Error, eg. connection failures.
   ReqwestError(reqwest::Error),
 
   /// std::io Error that arises from our end, eg. reading from the filesystem.
@@ -35,6 +37,9 @@ pub enum SoraError {
 
   /// anyhow::Error arises from our end
   AnyhowError(anyhow::Error),
+
+  /// serde_json::Error, likely from JSON deserialization schema mismatch.
+  JsonError(serde_json::Error),
 }
 
 impl Error for SoraError {}
@@ -63,6 +68,9 @@ impl Display for SoraError {
       Self::AnyhowError(err) => {
         write!(f, "Anyhow error: {}", err)
       }
+      Self::JsonError(err) => {
+        write!(f, "serde_json error: {}", err)
+      }
     }
   }
 }
@@ -84,3 +92,9 @@ impl From<anyhow::Error> for SoraError {
     Self::AnyhowError(err)
   }
 }
+
+impl From<serde_json::Error> for SoraError {
+  fn from(err: serde_json::Error) -> Self {
+    Self::JsonError(err)
+  }
+}

crates/lib/api_clients/storyteller_client/src/credentials/mod.rs

@@ -0,0 +1,3 @@
+pub mod storyteller_avt_cookie;
+pub mod storyteller_credential_set;
+pub mod storyteller_session_cookie;

crates/lib/api_clients/storyteller_client/src/credentials/storyteller_avt_cookie.rs

@@ -0,0 +1,25 @@
+
+/// The "anonymous visitor token" cookie allows users to interact with
+/// the service in a logged-out state with some continuity.
+#[derive(Clone)]
+pub struct StorytellerAvtCookie {
+  cookie: String,
+}
+
+impl StorytellerAvtCookie {
+  pub fn new(cookie: String) -> Self {
+    Self { cookie }
+  }
+
+  pub fn as_str(&self) -> &str {
+    &self.cookie
+  }
+
+  pub fn as_bytes(&self) -> &[u8] {
+    self.cookie.as_bytes()
+  }
+
+  pub fn to_string(&self) -> String {
+    self.cookie.clone()
+  }
+}

crates/lib/api_clients/storyteller_client/src/credentials/storyteller_credential_set.rs

@@ -0,0 +1,31 @@
+use crate::credentials::storyteller_avt_cookie::StorytellerAvtCookie;
+use crate::credentials::storyteller_session_cookie::StorytellerSessionCookie;
+
+#[derive(Clone)]
+pub struct StorytellerCredentialSet {
+  pub cookie: Option<StorytellerSessionCookie>,
+  pub avt: Option<StorytellerAvtCookie>,
+}
+
+impl StorytellerCredentialSet {
+  pub fn initialize(
+    cookie: Option<StorytellerSessionCookie>,
+    avt: Option<StorytellerAvtCookie>,
+  ) -> Self {
+    Self { cookie, avt }
+  }
+
+  pub fn initialize_with_just_cookie(cookie: StorytellerSessionCookie) -> Self {
+    Self {
+      cookie: Some(cookie),
+      avt: None,
+    }
+  }
+
+  pub fn initialize_with_just_avt(avt: StorytellerAvtCookie) -> Self {
+    Self {
+      cookie: None,
+      avt: Some(avt),
+    }
+  }
+}

crates/lib/api_clients/storyteller_client/src/credentials/storyteller_session_cookie.rs

@@ -0,0 +1,24 @@
+
+/// The primary FakeYou / Storyteller / Artcraft backend session identifier.
+#[derive(Clone)]
+pub struct StorytellerSessionCookie {
+  cookie: String,
+}
+
+impl StorytellerSessionCookie {
+  pub fn new(cookie: String) -> Self {
+    Self { cookie }
+  }
+
+  pub fn as_str(&self) -> &str {
+    &self.cookie
+  }
+
+  pub fn as_bytes(&self) -> &[u8] {
+    self.cookie.as_bytes()
+  }
+
+  pub fn to_string(&self) -> String {
+    self.cookie.clone()
+  }
+}

crates/lib/api_clients/storyteller_client/src/lib.rs

@@ -1,4 +1,7 @@
+//! An API client for Storyteller / FakeYou
+
+pub mod api_error;
+pub mod credentials;
 pub mod media_files;
 pub mod shared_response_types;
 pub mod utils;
-mod api_error;

crates/lib/files/images/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "images"
-edition = "2018"
+edition = "2024"
 version = "0.0.1"
 authors = [
     "Brandon Thomas <bt@brand.io>",
@@ -18,15 +18,16 @@ path = "src/lib.rs"
 normal = ["workspace-build-acceleration"]
 
 [dependencies]
+# Workspace hack (faster compile times)
+workspace-build-acceleration = { workspace =  true }
 
 # Internal
-errors = { path = "../../errors" }
-
-# Workspace hack (faster compile times)
-workspace-build-acceleration = { version = "0.1", path = "../../../workspace-build-acceleration" }
+errors = { workspace = true}
+mimetypes = { workspace = true }
 
 # External
-image = "0.25.1"
+image = "0.25.6"
 
 [dev-dependencies]
+anyhow = { workspace = true }
 testing = { path = "../../testing" }

crates/lib/files/images/src/image_info/image_info.rs

@@ -0,0 +1,100 @@
+use crate::image_info::image_info_error::ImageInfoError;
+use image::{GenericImageView, ImageReader};
+use mimetypes::mimetype_info::file_extension::FileExtension;
+use mimetypes::mimetype_info::mimetype_info::MimetypeInfo;
+use std::io::Cursor;
+use std::path::Path;
+
+#[derive(Clone, Debug)]
+pub struct ImageInfo {
+  /// The mimetype we determined
+  mimetype_info: MimetypeInfo,
+
+  /// The width of the image in pixels
+  width: u32,
+
+  /// The height  of the image in pixels
+  height: u32,
+}
+
+impl ImageInfo {
+  /// Note: This has to do a full file read, and we throw the parsed image on the floor.
+  pub fn decode_image_from_bytes(bytes: &[u8]) -> Result<Self, ImageInfoError> {
+    let image = ImageReader::new(Cursor::new(bytes)).with_guessed_format()?.decode()?;
+    let (width, height) = image.dimensions();
+    Ok(ImageInfo {
+      mimetype_info: MimetypeInfo::get_for_bytes(bytes)
+          .ok_or_else(|| ImageInfoError::CouldNotDetermineMimetype)?,
+      width,
+      height,
+    })
+  }
+
+  /// Note: This has to do a full file read, and we throw the parsed image on the floor.
+  pub fn decode_image_from_path<P: AsRef<Path>>(path: P) -> Result<Self, ImageInfoError> {
+    let image = ImageReader::open(&path)?.decode()?;
+    let (width, height) = image.dimensions();
+    Ok(ImageInfo {
+      mimetype_info: MimetypeInfo::get_for_path(path)?
+          .ok_or_else(|| ImageInfoError::CouldNotDetermineMimetype)?,
+      width,
+      height,
+    })
+  }
+
+  pub fn width(&self) -> u32 {
+    self.width
+  }
+
+  pub fn height(&self) -> u32 {
+    self.height
+  }
+
+  pub fn dimensions(&self) -> (u32, u32) {
+    (self.width, self.height)
+  }
+
+  pub fn mime_type(&self) -> &str {
+    self.mimetype_info.mime_type()
+  }
+
+  pub fn file_extension(&self) -> Option<FileExtension> {
+    self.mimetype_info.file_extension()
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use crate::image_info::image_info::ImageInfo;
+  use mimetypes::mimetype_info::file_extension::FileExtension;
+  use testing::test_file_path::test_file_path;
+
+  #[test]
+  fn jpg_file() -> anyhow::Result<()> {
+    let path = test_file_path("test_data/image/mochi.jpg")?;
+    let info = ImageInfo::decode_image_from_path(path)?;
+    assert_eq!(info.width(), 753);
+    assert_eq!(info.height(), 1000);
+    assert_eq!(info.mime_type(), "image/jpeg");
+    let ext = info.file_extension().expect("should have extension");
+    assert_eq!(ext, FileExtension::Jpg);
+    assert_eq!(ext.extension_with_period(), ".jpg");
+    assert_eq!(ext.extension_without_period(), "jpg");
+    Ok(())
+  }
+
+  #[test]
+  fn jpg_bytes() -> anyhow::Result<()> {
+    let path = test_file_path("test_data/image/juno.jpg")?;
+    let bytes = std::fs::read(path)?;
+    let info = ImageInfo::decode_image_from_bytes(&bytes)?;
+    assert_eq!(info.width(), 1000);
+    assert_eq!(info.height(), 750);
+    assert_eq!(info.mime_type(), "image/jpeg");
+    let ext = info.file_extension().expect("should have extension");
+    assert_eq!(ext, FileExtension::Jpg);
+    assert_eq!(ext.extension_with_period(), ".jpg");
+    assert_eq!(ext.extension_without_period(), "jpg");
+    Ok(())
+  }
+}

crates/lib/files/images/src/image_info/image_info_error.rs

@@ -0,0 +1,39 @@
+use std::error::Error;
+use std::fmt::{Display, Formatter};
+use std::io;
+
+#[derive(Debug)]
+pub enum ImageInfoError {
+  CouldNotDetermineMimetype,
+  ImageError(image::ImageError),
+  IoError(io::Error),
+}
+
+impl Error for ImageInfoError {}
+
+impl Display for ImageInfoError {
+  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+    match self {
+      ImageInfoError::CouldNotDetermineMimetype => {
+        write!(f, "ImageInfoError::CouldNotDetermineMimetype")
+      }
+      ImageInfoError::ImageError(err) => {
+        write!(f, "ImageInfoError::ImageError: {}", err)
+      }
+      ImageInfoError::IoError(err) => {
+        write!(f, "ImageInfoError::IoError: {}", err)
+      }
+    }
+  }
+}
+
+impl From<image::ImageError> for ImageInfoError {
+  fn from(err: image::ImageError) -> Self {
+    ImageInfoError::ImageError(err)
+  }
+}
+impl From<io::Error> for ImageInfoError {
+  fn from(err: io::Error) -> Self {
+    ImageInfoError::IoError(err)
+  }
+}

crates/lib/files/images/src/image_info/mod.rs

@@ -0,0 +1,2 @@
+pub mod image_info;
+pub mod image_info_error;

crates/lib/files/images/src/lib.rs

@@ -23,6 +23,7 @@
 // Re-export image to everyone importing this library
 pub use image;
 
+pub mod image_info;
 pub mod resize_image_file_preserving_aspect;
 pub mod resize_preserving_aspect;
 

crates/lib/files/media/Cargo.toml

@@ -16,15 +16,14 @@ path = "src/lib.rs"
 normal = ["workspace-build-acceleration"]
 
 [dependencies]
+# Workspace hack (faster compile times)
+workspace-build-acceleration = { workspace =  true }
 
 # Internal
-errors = { path = "../../errors" }
-
-# Workspace hack (faster compile times)
-workspace-build-acceleration = { version = "0.1", path = "../../../workspace-build-acceleration" }
+errors = { workspace = true }
 
 # External
-log = "0.4.14"
+log = { workspace = true }
 
 # Powerful audio decoder and demuxer
 #symphonia = { version = "0.5.2", features = ["aac", "alac", "flac", "isomp4", "mkv", "mp3", "ogg", "vorbis", "wav"] }

crates/lib/files/mimetypes/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mimetypes"
-edition = "2018"
+edition = "2024"
 version = "0.0.1"
 authors = [
     "Brandon Thomas <bt@brand.io>",
@@ -18,11 +18,11 @@ normal = ["workspace-build-acceleration"]
 
 [dependencies]
 # Workspace hack (faster compile times)
-workspace-build-acceleration = { version = "0.1", path = "../../../workspace-build-acceleration" }
+workspace-build-acceleration = { workspace =  true }
 
 # External
-infer = "0.16.0" # Mimetype detection
-
+infer = "0.19.0" # Mimetype detection
 
 [dev-dependencies]
-# None yet
+testing = { path = "../../testing" }
+anyhow = { workspace = true }

crates/lib/files/mimetypes/src/lib.rs

@@ -21,4 +21,5 @@
 
 pub mod mimetype_for_bytes;
 pub mod mimetype_for_file;
+pub mod mimetype_info;
 pub mod mimetype_to_extension;

crates/lib/files/mimetypes/src/mimetype_info/file_extension.rs

@@ -0,0 +1,68 @@
+
+/// This is a constrained set of file extensions that:
+///  1. we care about
+///  2. we can detect with magic bytes
+///  3. are not text formats / are binary formats
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash, Ord, PartialOrd)]
+pub enum FileExtension {
+  Aac,
+  Flac,
+  Gif,
+  Jpg,
+  Mov,
+  Mp3,
+  Mp4,
+  Ogg,
+  Opus,
+  Png,
+  Wav,
+  Webm,
+  Webp,
+}
+
+impl FileExtension {
+  pub fn from_mimetype(mimetype: &str) -> Option<Self> {
+    match mimetype {
+      "audio/aac" => Some(FileExtension::Aac),
+      "audio/flac" => Some(FileExtension::Flac),
+      "image/gif" => Some(FileExtension::Gif),
+      "image/jpeg" => Some(FileExtension::Jpg),
+      "video/quicktime" => Some(FileExtension::Mov),
+      "audio/mpeg" => Some(FileExtension::Mp3),
+      "video/mp4" => Some(FileExtension::Mp4),
+      "audio/ogg" => Some(FileExtension::Ogg),
+      "audio/opus" => Some(FileExtension::Opus),
+      "image/png" => Some(FileExtension::Png),
+      "audio/wav" => Some(FileExtension::Wav),
+      "video/webm" => Some(FileExtension::Webm),
+      "image/webp" => Some(FileExtension::Webp),
+      _ => None,
+    }
+  }
+
+  pub fn extension_with_period(&self) -> &'static str {
+    self.with_and_without_period().0
+  }
+
+  pub fn extension_without_period(&self) -> &'static str {
+    self.with_and_without_period().1
+  }
+
+  fn with_and_without_period(&self) -> (&'static str, &'static str) {
+    match self {
+      FileExtension::Aac => (".aac", "aac"),
+      FileExtension::Flac => (".flac", "flac"),
+      FileExtension::Gif => (".gif", "gif"),
+      FileExtension::Jpg => (".jpg", "jpg"),
+      FileExtension::Mov => (".mov", "mov"),
+      FileExtension::Mp3 => (".mp3", "mp3"),
+      FileExtension::Mp4 => (".mp4", "mp4"),
+      FileExtension::Ogg => (".ogg", "ogg"),
+      FileExtension::Opus => (".opus", "opus"),
+      FileExtension::Png => (".png", "png"),
+      FileExtension::Wav => (".wav", "wav"),
+      FileExtension::Webm => (".webm", "webm"),
+      FileExtension::Webp => (".webp", "webp"),
+    }
+  }
+}

crates/lib/files/mimetypes/src/mimetype_info/mimetype_info.rs

@@ -0,0 +1,80 @@
+use crate::mimetype_info::file_extension::FileExtension;
+use infer::Type;
+use std::io;
+use std::path::Path;
+
+#[derive(Clone, Debug)]
+pub struct MimetypeInfo {
+  /// The mimetype we determined
+  mime_type: String,
+
+  /// The extension for the mimetype, if we could determine it.
+  file_extension: Option<FileExtension>,
+}
+
+impl MimetypeInfo {
+  pub fn get_for_bytes(bytes: &[u8]) -> Option<Self> {
+    infer::get(bytes)
+        .map(|t| Self::for_type(t))
+  }
+
+  pub fn get_for_path<P: AsRef<Path>>(path: P) -> io::Result<Option<Self>> {
+    infer::get_from_path(path)
+        .map(|maybe_type| maybe_type.map(|t| Self::for_type(t)))
+  }
+
+  fn for_type(r#type: Type) -> Self {
+    let mime_type = r#type.mime_type().to_string();
+    MimetypeInfo {
+      file_extension: FileExtension::from_mimetype(&mime_type),
+      mime_type,
+    }
+  }
+
+  pub fn mime_type(&self) -> &str {
+    &self.mime_type
+  }
+
+  pub fn file_extension(&self) -> Option<FileExtension> {
+    self.file_extension
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use crate::mimetype_info::file_extension::FileExtension;
+  use crate::mimetype_info::mimetype_info::MimetypeInfo;
+
+  mod for_bytes {
+    use super::*;
+
+    #[test]
+    fn png() {
+      // NB: From "Hanashi Mask.png"
+      let bytes: Vec<u8> = vec![137, 80, 78, 71, 13, 10, 26, 10];
+      let t = MimetypeInfo::get_for_bytes(&bytes).expect("should detect bytes");
+      assert_eq!(t.mime_type(), "image/png");
+      let ext = t.file_extension.expect("should have extension");
+      assert_eq!(ext, FileExtension::Png);
+      assert_eq!(ext.extension_with_period(), ".png");
+      assert_eq!(ext.extension_without_period(), "png");
+    }
+  }
+
+  mod for_files {
+    use testing::test_file_path::test_file_path;
+    use super::*;
+
+    #[test]
+    fn mp3() -> anyhow::Result<()> {
+      let path = test_file_path("test_data/audio/mp3/super_mario_rpg_beware_the_forests_mushrooms.mp3")?;
+      let t = MimetypeInfo::get_for_path(path)?.expect("should detect type");
+      assert_eq!(t.mime_type(), "audio/mpeg");
+      let ext = t.file_extension.expect("should have extension");
+      assert_eq!(ext, FileExtension::Mp3);
+      assert_eq!(ext.extension_with_period(), ".mp3");
+      assert_eq!(ext.extension_without_period(), "mp3");
+      Ok(())
+    }
+  }
+}

crates/lib/files/mimetypes/src/mimetype_info/mod.rs

@@ -0,0 +1,2 @@
+pub mod file_extension;
+pub mod mimetype_info;

crates/lib/files/videos/Cargo.toml

@@ -18,14 +18,14 @@ normal = ["workspace-build-acceleration"]
 
 [dependencies]
 # Workspace hack (faster compile times)
-workspace-build-acceleration = { version = "0.1", path = "../../../workspace-build-acceleration" }
+workspace-build-acceleration = { workspace =  true }
 
 # Internal
-errors = { path = "../../errors" }
+errors = { workspace = true }
 
 # External
 ffprobe = "0.4.0"
-log = "0.4.20"
+log = { workspace = true }
 # TODO(bt,2024-08-08): We might drop `mp4` crate because it crashes on reading
 #  some videos with the message "avcc not found"
 mp4 = "0.14.0"

crates/lib/mysql_queries/src/queries/generic_inference/web/mark_generic_inference_job_successfully_done_by_token.rs

@@ -0,0 +1,57 @@
+use std::time::Duration;
+
+use anyhow::anyhow;
+use sqlx::MySqlPool;
+
+use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType;
+use errors::AnyhowResult;
+use tokens::tokens::generic_inference_jobs::InferenceJobToken;
+use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;
+
+pub async fn mark_generic_inference_job_successfully_done_by_token(
+  pool: &MySqlPool,
+  token: &InferenceJobToken,
+  maybe_entity_type: Option<InferenceResultType>,
+  maybe_entity_token: Option<&str>,
+  total_job_duration: Option<Duration>,
+  inference_duration: Option<Duration>,
+) -> AnyhowResult<()>
+{
+  // NB: MySql's unsigned int (32 bits) can store integers up to 4,294,967,295.
+  // Given milliseconds, this is ~49.71 days, which should be plenty for us.
+  let truncated_total_job_execution_millis = total_job_duration
+      .map(|duration| duration.as_millis() as u32)
+      .unwrap_or(0);
+  let truncated_inference_execution_millis = inference_duration
+      .map(|duration| duration.as_millis() as u32)
+      .unwrap_or(0);
+
+  let query_result = sqlx::query!(
+        r#"
+UPDATE generic_inference_jobs
+SET
+  status = "complete_success",
+  on_success_result_entity_type = ?,
+  on_success_result_entity_token = ?,
+  failure_reason = NULL,
+  internal_debugging_failure_reason = NULL,
+  success_execution_millis = ?,
+  success_inference_execution_millis = ?,
+  retry_at = NULL,
+  successfully_completed_at = NOW()
+WHERE token = ?
+        "#,
+        maybe_entity_type,
+        maybe_entity_token,
+        truncated_total_job_execution_millis,
+        truncated_inference_execution_millis,
+        token.as_str()
+    )
+      .execute(pool)
+      .await;
+
+  match query_result {
+    Err(err) => Err(anyhow!("error with query: {:?}", err)),
+    Ok(_r) => Ok(()),
+  }
+}

crates/lib/mysql_queries/src/queries/generic_inference/web/mod.rs

@@ -7,4 +7,5 @@ pub mod job_status;
 pub mod kill_generic_inference_jobs;
 pub mod kill_jobs_in_development;
 pub mod list_session_jobs;
-pub mod mark_generic_inference_job_cancelled_by_user;
+pub mod mark_generic_inference_job_cancelled_by_user;
+pub mod mark_generic_inference_job_successfully_done_by_token;

crates/lib/mysql_queries/src/queries/media_files/create/insert_builder/media_file_insert_builder.rs

@@ -0,0 +1,269 @@
+use crate::queries::media_files::create::generic_insert::insert_media_file_generic::{insert_media_file_generic, InsertArgs};
+use anyhow::anyhow;
+use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath;
+use enums::by_table::generic_synthetic_ids::id_category::IdCategory;
+use enums::by_table::media_files::media_file_class::MediaFileClass;
+use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
+use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
+use enums::by_table::media_files::media_file_type::MediaFileType;
+use enums::common::visibility::Visibility;
+use errors::AnyhowResult;
+use sqlx::MySqlPool;
+use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken;
+use tokens::tokens::media_files::MediaFileToken;
+use tokens::tokens::users::UserToken;
+use crate::queries::media_files::create::insert_builder::media_file_insert_builder_error::MediaFileInsertBuilderError;
+
+/// Builder for inserting a media files into the database.
+/// Resembles an ORM, but can still use statically type checked queries (which is probably
+/// really important since we don't have tests on database functionality yet).
+#[derive(Clone)]
+pub struct MediaFileInsertBuilder {
+  // TODO: Allow specifying the token externally
+  // token: MediaFileToken,
+
+  // Creator info
+  maybe_creator_user_token: Option<UserToken>,
+  maybe_creator_anonymous_visitor_token: Option<AnonymousVisitorTrackingToken>,
+  creator_ip_address: Option<String>, // NB: Non-nullable field
+  creator_set_visibility: Visibility, // NB: Non-nullable field
+
+  // Important database indices
+  media_file_class: MediaFileClass, // NB: Non-nullable field
+  media_file_type: Option<MediaFileType>, // NB: Non-nullable field
+  is_user_upload: bool,
+  is_intermediate_system_file: bool,
+
+  // Product and other origination information
+  origin_category: Option<MediaFileOriginCategory>, // NB: Non-nullable field
+  origin_product_category: MediaFileOriginProductCategory, // NB: Non-nullable field
+  // maybe_origin_model_type: Option<MediaFileOriginModelType>,
+  // maybe_origin_model_token: Option<&'a ModelWeightToken>,
+  // maybe_origin_filename: Option<String>,
+
+  // Media info
+  maybe_mime_type: Option<String>,
+  file_size_bytes: u64, // NB: Non-nullable field
+  // maybe_duration_millis: Option<u64>,
+  // maybe_audio_encoding: Option<&'a str>,
+  // maybe_video_encoding: Option<&'a str>,
+  maybe_frame_width: Option<u32>,
+  maybe_frame_height: Option<u32>,
+  checksum_sha2: Option<String>, // NB: Non-nullable field
+
+  // // User text information
+  // maybe_title: Option<&'a str>,
+  // maybe_text_transcript: Option<&'a str>,
+
+  // // If generated from a scene, this is the scene media file token.
+  // maybe_scene_source_media_file_token: Option<&'a MediaFileToken>,
+
+  // // If additional prompt details are stored, this is the prompt token.
+  // maybe_prompt_token: Option<&'a PromptToken>,
+
+  // // If batch generated, this is the batch token.
+  // maybe_batch_token: Option<&'a BatchGenerationToken>,
+
+  // Storage details
+  public_bucket_directory_hash: Option<MediaFileBucketPath>, // NB: Non-nullable field(s)
+
+  // Remaining fields...
+}
+
+impl MediaFileInsertBuilder {
+  //pub fn generate_token() -> Self {
+  //  Self::with_token(&MediaFileToken::generate())
+  //}
+
+  pub fn new() -> Self {
+    MediaFileInsertBuilder {
+      //token: token.clone(),
+      maybe_creator_user_token: None,
+      maybe_creator_anonymous_visitor_token: None,
+      creator_ip_address: None,
+      creator_set_visibility: Visibility::Public,
+      media_file_class: MediaFileClass::Unknown,
+      media_file_type: None,
+      is_user_upload: false,
+      is_intermediate_system_file: false,
+      origin_category: None,
+      origin_product_category: MediaFileOriginProductCategory::Unknown,
+      maybe_mime_type: None,
+      file_size_bytes: 0,
+      maybe_frame_width: None,
+      maybe_frame_height: None,
+      checksum_sha2: None,
+      public_bucket_directory_hash: None,
+    }
+  }
+
+  pub fn creator_user(mut self, user_token: &UserToken) -> Self {
+    self.maybe_creator_user_token = Some(user_token.clone());
+    self
+  }
+
+  pub fn maybe_creator_user(mut self, maybe_user: Option<&UserToken>) -> Self {
+    self.maybe_creator_user_token = maybe_user.map(|token| token.clone());
+    self
+  }
+
+  pub fn creator_anonymous_visitor(mut self, avt: &AnonymousVisitorTrackingToken) -> Self {
+    self.maybe_creator_anonymous_visitor_token = Some(avt.clone());
+    self
+  }
+
+  pub fn maybe_creator_anonymous_visitor(mut self, maybe_avt: Option<&AnonymousVisitorTrackingToken>) -> Self {
+    self.maybe_creator_anonymous_visitor_token = maybe_avt.map(|token| token.clone());
+    self
+  }
+
+  pub fn creator_ip_address(mut self, ip_address: &str) -> Self {
+    self.creator_ip_address = Some(ip_address.to_string());
+    self
+  }
+
+  pub fn creator_set_visibility(mut self, visibility: Visibility) -> Self {
+    self.creator_set_visibility = visibility;
+    self
+  }
+
+  pub fn media_file_class(mut self, media_file_class: MediaFileClass) -> Self {
+    self.media_file_class = media_file_class;
+    self
+  }
+
+  pub fn media_file_type(mut self, media_file_type: MediaFileType) -> Self {
+    self.media_file_type = Some(media_file_type);
+    self
+  }
+
+  #[allow(clippy::wrong_self_convention)]
+  pub fn is_user_upload(mut self, is_user_upload: bool) -> Self {
+    self.is_user_upload = is_user_upload;
+    self
+  }
+
+  #[allow(clippy::wrong_self_convention)]
+  pub fn is_intermediate_system_file(mut self, is_intermediate_system_file: bool) -> Self {
+    self.is_intermediate_system_file = is_intermediate_system_file;
+    self
+  }
+
+  pub fn media_file_origin_category(mut self, origin_category: MediaFileOriginCategory) -> Self {
+    self.origin_category = Some(origin_category);
+    self
+  }
+
+  pub fn media_file_origin_product_category(mut self, origin_category: MediaFileOriginProductCategory) -> Self {
+    self.origin_product_category = origin_category;
+    self
+  }
+
+  // TODO: Method for maybe_origin_model_type
+  // TODO: Method for maybe_origin_model_token
+  // TODO: Method for maybe_origin_filename
+
+  pub fn mime_type(mut self, mime_type: &str) -> Self {
+    self.maybe_mime_type = Some(mime_type.to_string());
+    self
+  }
+
+  pub fn file_size_bytes(mut self, file_size_bytes: u64) -> Self {
+    self.file_size_bytes = file_size_bytes;
+    self
+  }
+
+  // TODO: maybe_duration_millis
+  // TODO: maybe_audio_encoding
+  // TODO: maybe_video_encoding
+
+  pub fn frame_width(mut self, frame_width: u32) -> Self {
+    self.maybe_frame_width = Some(frame_width);
+    self
+  }
+
+  pub fn frame_height(mut self, frame_height: u32) -> Self {
+    self.maybe_frame_height = Some(frame_height);
+    self
+  }
+
+  pub fn checksum_sha2(mut self, checksum_sha2: &str) -> Self {
+    self.checksum_sha2 = Some(checksum_sha2.to_string());
+    self
+  }
+
+  // TODO: maybe_title
+  // TODO: maybe_text_transcript
+  // TODO: maybe_scene_source_media_file_token
+  // TODO: maybe_prompt_token
+  // TODO: maybe_batch_token
+
+  pub fn public_bucket_directory_hash(mut self, public_bucket_directory_hash: &MediaFileBucketPath) -> Self {
+    self.public_bucket_directory_hash = Some(public_bucket_directory_hash.clone());
+    self
+  }
+
+  // TODO(bt,2025-04-26): Other connector options.
+  pub async fn insert_pool(self, mysql_pool: &MySqlPool) -> Result<MediaFileToken, MediaFileInsertBuilderError> {
+    let media_file_type = self.media_file_type
+        .ok_or_else(|| MediaFileInsertBuilderError::MissingRequiredField(
+          "Media file type is required".to_string()))?;
+
+    let origin_category = self.origin_category
+        .ok_or_else(|| MediaFileInsertBuilderError::MissingRequiredField(
+          "Origin category is required".to_string()))?;
+
+    let checksum_sha2 = self.checksum_sha2
+        .ok_or_else(|| MediaFileInsertBuilderError::MissingRequiredField(
+          "Checksum SHA2 is required".to_string()))?;
+
+    let bucket_path = self.public_bucket_directory_hash
+        .ok_or_else(|| MediaFileInsertBuilderError::MissingRequiredField(
+          "Public bucket directory hash is required".to_string()))?;
+
+    let result = insert_media_file_generic(InsertArgs {
+      pool: mysql_pool,
+      maybe_creator_user_token: self.maybe_creator_user_token.as_ref(),
+      maybe_creator_anonymous_visitor_token: self.maybe_creator_anonymous_visitor_token.as_ref(),
+      creator_ip_address: self.creator_ip_address.as_deref().unwrap_or("127.0.0.1"),
+      creator_set_visibility: self.creator_set_visibility,
+      media_class: self.media_file_class,
+      media_type: media_file_type,
+      is_user_upload: self.is_user_upload,
+      is_intermediate_system_file: self.is_intermediate_system_file,
+      origin_category,
+      origin_product_category: self.origin_product_category,
+      maybe_origin_model_type: None, // TODO
+      maybe_origin_model_token: None, // TODO
+      maybe_origin_filename: None, // TODO
+      maybe_mime_type: self.maybe_mime_type.as_deref(),
+      file_size_bytes: self.file_size_bytes,
+      maybe_duration_millis: None, // TODO
+      maybe_audio_encoding: None, // TODO
+      maybe_video_encoding: None, // TODO
+      maybe_frame_width: self.maybe_frame_width,
+      maybe_frame_height: self.maybe_frame_height,
+      checksum_sha2: &checksum_sha2,
+      maybe_title: None, // TODO
+      maybe_text_transcript: None, // TODO
+      maybe_scene_source_media_file_token: None, // TODO
+      maybe_prompt_token: None, // TODO
+      maybe_batch_token: None, // TODO
+      public_bucket_directory_hash: bucket_path.get_object_hash(),
+      maybe_public_bucket_prefix: bucket_path.get_optional_prefix(),
+      maybe_public_bucket_extension: bucket_path.get_optional_extension(),
+      maybe_creator_file_synthetic_id_category: IdCategory::MediaFile, // TODO: Remove this
+      maybe_creator_category_synthetic_id_category: IdCategory::FileUpload, // TODO: Remove this
+      maybe_extra_media_info: None, // TODO
+      is_generated_on_prem: false, // TODO
+      generated_by_worker: None, // TODO
+      generated_by_cluster: None, // TODO
+      maybe_mod_user_token: None, // TODO
+    }).await;
+
+    match result {
+      Ok(result) => Ok(result.0),
+      Err(err) => Err(MediaFileInsertBuilderError::ProbablyDatabaseError(err)),
+    }
+  }
+}

crates/lib/mysql_queries/src/queries/media_files/create/insert_builder/media_file_insert_builder_error.rs

@@ -0,0 +1,27 @@
+use std::error::Error;
+use std::fmt::{Debug, Display, Formatter};
+use errors::AnyhowError;
+
+#[derive(Debug)]
+pub enum MediaFileInsertBuilderError {
+  /// A user-provided field is missing (400 error).
+  MissingRequiredField(String),
+
+  // TODO: We need to refactor to ensure these are actually DB errors (500s).
+  ProbablyDatabaseError(AnyhowError),
+}
+
+impl Error for MediaFileInsertBuilderError {}
+
+impl Display for MediaFileInsertBuilderError {
+  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+    match self {
+      MediaFileInsertBuilderError::MissingRequiredField(reason) => {
+        write!(f, "Missing required field: {}", reason)
+      }
+      MediaFileInsertBuilderError::ProbablyDatabaseError(reason) => {
+        write!(f, "Probably database error: {:?}", reason)
+      }
+    }
+  }
+}

crates/lib/mysql_queries/src/queries/media_files/create/insert_builder/mod.rs

@@ -0,0 +1,2 @@
+pub mod media_file_insert_builder;
+mod media_file_insert_builder_error;

crates/lib/mysql_queries/src/queries/media_files/create/mod.rs

@@ -1,4 +1,5 @@
 pub mod generic_insert;
+pub mod insert_builder;
 pub mod insert_media_file_from_face_fusion;
 pub mod insert_media_file_from_gptsovits;
 pub mod insert_media_file_from_live_portrait;

crates/service/web/storyteller_web/Cargo.toml

@@ -51,11 +51,12 @@ google_sign_in = { path = "../../../lib/api_clients/google_sign_in" }
 hashing = { path = "../../../lib/files/hashing" }
 http_server_common = { path = "../../../lib/deprecated/http_server_common" }
 idempotency = { path = "../../../lib/idempotency" }
+images = { workspace = true }
 markdown = { path = "../../../lib/markdown" }
 media = { path = "../../../lib/files/media" }
 memory_caching = { path = "../../../lib/caching/memory_caching" }
 migration = { path = "../../../lib/migration" }
-mimetypes = { path = "../../../lib/files/mimetypes" }
+mimetypes = { workspace = true }
 mysql_queries = { path = "../../../lib/mysql_queries" }
 openai_sora_client = { path = "../../../lib/api_clients/openai_sora_client" }
 password = { path = "../../../lib/password" }

crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/mod.rs

@@ -1,3 +1,4 @@
 pub mod upload;
 pub mod prompt;
-pub mod get_sora_credentials_from_request;
+pub mod get_sora_credentials_from_request;
+pub mod update_gpt_image_job_status_handler;

crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/prompt/enqueue_studio_image_generation_handler.rs

@@ -142,18 +142,16 @@ impl Display for EnqueueImageGenRequestError {
   post,
   tag = "Image Studio",
   path = "/v1/image_studio/prompt",
+  params(
+    ("request" = EnqueueStudioImageGenRequest, description = "Payload for Image Generation Request"),
+  ),
   responses(
-        (
-            status = 200,
-            description = "Enqueue TTS generically",
-            body = EnqueueImageGenRequestSuccessResponse,
-        ),
-        (status = 400, description = "Bad input", body = EnqueueImageGenRequestError),
-        (status = 401, description = "Not authorized", body = EnqueueImageGenRequestError),
-        (status = 429, description = "Rate limited", body = EnqueueImageGenRequestError),
-        (status = 500, description = "Server error", body = EnqueueImageGenRequestError)
+    (status = 200, description = "Success response", body = EnqueueImageGenRequestSuccessResponse),
+    (status = 400, description = "Bad input", body = EnqueueImageGenRequestError),
+    (status = 401, description = "Not authorized", body = EnqueueImageGenRequestError),
+    (status = 429, description = "Rate limited", body = EnqueueImageGenRequestError),
+    (status = 500, description = "Server error", body = EnqueueImageGenRequestError),
   ),
-  params(("request" = EnqueueStudioImageGenRequest, description = "Payload for Image Generation Request"))
 )]
 pub async fn enqueue_studio_image_generation_handler(http_request: HttpRequest, request: Json<EnqueueStudioImageGenRequest>, server_state: Data<Arc<ServerState>>) -> Result<HttpResponse, EnqueueImageGenRequestError> {
   validate_request(&request)?;

crates/service/web/storyteller_web/src/http_server/endpoints/image_studio/update_gpt_image_job_status_handler.rs

@@ -0,0 +1,296 @@
+use std::fmt;
+use std::sync::Arc;
+
+use crate::http_server::endpoints::engine::create_scene_handler::CreateSceneError;
+use crate::http_server::endpoints::inference_job::get::get_inference_job_status_handler::GetInferenceJobStatusError;
+use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError;
+use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
+use crate::http_server::web_utils::user_session::require_user_session::require_user_session;
+use crate::state::server_state::ServerState;
+use actix_web::error::ResponseError;
+use actix_web::http::StatusCode;
+use actix_web::web::{Data, Json, Path};
+use actix_web::{web, HttpMessage, HttpRequest, HttpResponse};
+use base64::alphabet::STANDARD;
+use base64::prelude::BASE64_STANDARD;
+use base64::Engine;
+use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath;
+use cloud_storage::bucket_client::BucketClient;
+use enums::by_table::media_files::media_file_class::MediaFileClass;
+use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
+use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
+use enums::by_table::media_files::media_file_type::MediaFileType;
+use enums::common::job_status::JobStatus;
+use enums::common::job_status_plus::JobStatusPlus;
+use errors::AnyhowResult;
+use hashing::sha256::sha256_hash_bytes::sha256_hash_bytes;
+use http_server_common::request::get_request_ip::get_request_ip;
+use images::image_info::image_info::ImageInfo;
+use log::{error, info, warn};
+use mysql_queries::queries::generic_inference::job::mark_generic_inference_job_completely_failed::mark_generic_inference_job_completely_failed;
+use mysql_queries::queries::generic_inference::web::dismiss_finished_jobs_for_user::dismiss_finished_jobs_for_user;
+use mysql_queries::queries::generic_inference::web::get_inference_job_status::{get_inference_job_status, get_inference_job_status_from_connection};
+use mysql_queries::queries::generic_inference::web::job_status::GenericInferenceJobStatus;
+use mysql_queries::queries::generic_inference::web::mark_generic_inference_job_cancelled_by_user::mark_generic_inference_job_cancelled_by_user;
+use mysql_queries::queries::media_files::create::generic_insert::insert_media_file_generic::{insert_media_file_generic, InsertArgs};
+use mysql_queries::queries::media_files::create::insert_builder::media_file_insert_builder::MediaFileInsertBuilder;
+use mysql_queries::queries::media_files::create::specialized_insert::insert_media_file_from_file_upload::{insert_media_file_from_file_upload, InsertMediaFileFromUploadArgs, UploadType};
+use mysql_queries::queries::tts::tts_inference_jobs::mark_tts_inference_job_permanently_dead::mark_tts_inference_job_permanently_dead;
+use sqlx::{MySqlConnection, MySqlPool};
+use tokens::tokens::generic_inference_jobs::InferenceJobToken;
+use tokens::tokens::media_files::MediaFileToken;
+use utoipa::ToSchema;
+use mysql_queries::queries::generic_inference::web::mark_generic_inference_job_successfully_done_by_token::mark_generic_inference_job_successfully_done_by_token;
+
+#[derive(Deserialize, ToSchema)]
+pub struct UpdateGptImageJobStatusRequest {
+  /// The token of the job we're updating.
+  pub job_token: InferenceJobToken,
+
+  /// How to mark the job.
+  /// A subset of the job states that are relevant to image completion status.
+  pub job_status: UpdatedJobStatus,
+
+  /// Base64-encoded image data.
+  /// Only present on success.
+  /// In the success case, there may be one or more images.
+  pub images: Option<Vec<String>>,
+}
+
+#[derive(Deserialize, ToSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum UpdatedJobStatus {
+  Started,
+  CompleteSuccess,
+  CompleteFailure,
+  AttemptFailed,
+  Dead,
+}
+
+#[derive(Serialize, ToSchema)]
+pub struct UpdateGptImageJobStatusSuccessResponse {
+  pub success: bool,
+}
+
+#[derive(Debug, ToSchema)]
+pub enum UpdateGptImageJobStatusError {
+  ServerError,
+  NotFound,
+  NotAuthorized,
+}
+
+impl ResponseError for UpdateGptImageJobStatusError {
+  fn status_code(&self) -> StatusCode {
+    match *self {
+      UpdateGptImageJobStatusError::ServerError => StatusCode::INTERNAL_SERVER_ERROR,
+      UpdateGptImageJobStatusError::NotFound => StatusCode::NOT_FOUND,
+      UpdateGptImageJobStatusError::NotAuthorized => StatusCode::UNAUTHORIZED,
+    }
+  }
+
+  fn error_response(&self) -> HttpResponse {
+    let error_reason = match self {
+      Self::ServerError => "server error".to_string(),
+      Self::NotFound => "not found".to_string(),
+      Self::NotAuthorized => "unauthorized".to_string(),
+    };
+
+    to_simple_json_error(&error_reason, self.status_code())
+  }
+}
+
+// NB: Not using derive_more::Display since Clion doesn't understand it.
+impl fmt::Display for UpdateGptImageJobStatusError {
+  fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+    write!(f, "{:?}", self)
+  }
+}
+
+/// [INTERNAL ENDPOINT] Update a GPT Image generation job status.
+/// This is called by our internal infra, not users. Keep it guarded.
+/// We can do secrets-based auth later.
+#[utoipa::path(
+  post,
+  tag = "Jobs",
+  path = "/v1/image_studio/update_job_status",
+  responses(
+    (status = 200, body = UpdateGptImageJobStatusSuccessResponse),
+    (status = 500, body = UpdateGptImageJobStatusError),
+  ),
+  params(
+    ("request" = UpdateGptImageJobStatusRequest, description = "Request"),
+  )
+)]
+pub async fn update_gpt_image_job_status_handler(
+  http_request: HttpRequest,
+  request: Json<UpdateGptImageJobStatusRequest>,
+  server_state: web::Data<Arc<ServerState>>) -> Result<Json<UpdateGptImageJobStatusSuccessResponse>, UpdateGptImageJobStatusError>
+{
+  //// TODO(bt,2024-06-16): Reuse connection
+  //let mut mysql_connection = server_state.mysql_pool.acquire()
+  //    .await
+  //    .map_err(|e| {
+  //      warn!("Could not acquire DB pool: {:?}", e);
+  //      UpdateGptImageJobStatusError::ServerError
+  //    })?;
+
+  let inference_job = get_inference_job_status(
+    &request.job_token,
+    &server_state.mysql_pool
+  ).await;
+
+  let inference_job = match inference_job {
+    Ok(Some(record)) => record,
+    Ok(None) => return Err(UpdateGptImageJobStatusError::NotFound),
+    Err(err) => {
+      error!("tts job query error: {:?}", err);
+      return Err(UpdateGptImageJobStatusError::ServerError);
+    }
+  };
+
+
+  match inference_job.status {
+    JobStatusPlus::CompleteSuccess => {
+      // Job has already been completed. Don't replay the request.
+      return Ok(Json(UpdateGptImageJobStatusSuccessResponse { success: true }))
+    },
+    // TODO: Handle other states as terminal states?
+    //JobStatusPlus::CompleteFailure => return Err(UpdateGptImageJobStatusError::ServerError),
+    //JobStatusPlus::AttemptFailed => {}
+    //JobStatusPlus::Dead => {}
+    //JobStatusPlus::CancelledByUser => return Err(UpdateGptImageJobStatusError::ServerError),
+    //JobStatusPlus::CancelledBySystem => {}
+    _ => {} // Intentional fall through.
+  }
+
+  let target_status = match request.job_status {
+    UpdatedJobStatus::Started => JobStatusPlus::Started,
+    UpdatedJobStatus::CompleteSuccess => JobStatusPlus::CompleteSuccess,
+    UpdatedJobStatus::CompleteFailure => JobStatusPlus::CompleteFailure,
+    UpdatedJobStatus::AttemptFailed => JobStatusPlus::AttemptFailed,
+    UpdatedJobStatus::Dead => JobStatusPlus::Dead,
+  };
+
+  if let Some(images) = &request.images {
+    for image in images.iter() {
+      let result = upload_and_save_image(
+        image,
+        &inference_job,
+        &server_state.mysql_pool,
+        &server_state.public_bucket_client,
+      ).await;
+      let media_token = match result {
+        Ok(media_token) => media_token,
+        Err(err) => {
+          error!("Error uploading image: {:?}", err);
+          return Err(UpdateGptImageJobStatusError::ServerError);
+        }
+      };
+    }
+  }
+
+  info!("Updating job record for job: {:?}", request.job_token);
+
+  update_job_record(&request, &server_state, inference_job, target_status)
+      .await
+      .map_err(|err| {
+        error!("Error updating job: {:?}", err);
+        UpdateGptImageJobStatusError::ServerError
+      })?;
+
+  info!("Job record updated for job: {:?}", request.job_token);
+
+  Ok(Json(UpdateGptImageJobStatusSuccessResponse {
+    success: true,
+  }))
+}
+
+async fn upload_and_save_image(
+  base64_image: &str,
+  inference_job: &GenericInferenceJobStatus,
+  mysql_pool: &MySqlPool,
+  public_bucket_client: &BucketClient,
+) -> AnyhowResult<MediaFileToken> {
+
+  let image_bytes = BASE64_STANDARD.decode(base64_image)?;
+
+  // Read file metadata
+  let file_size_bytes = image_bytes.len();
+  let file_hash = sha256_hash_bytes(&image_bytes)?;
+  let image_info = ImageInfo::decode_image_from_bytes(&image_bytes)?;
+  let mimetype = image_info.mime_type();
+
+  // Upload file
+  const PREFIX : Option<&str> = Some("image_");
+
+  let extension_with_period = image_info.file_extension()
+      .map(|ext| ext.extension_with_period())
+      .unwrap_or_else(|| ".png");
+
+  let media_file_type = match mimetype {
+    "image/png" => MediaFileType::Png,
+    "image/jpeg" => MediaFileType::Jpg,
+    _ => MediaFileType::Png,
+  };
+
+  let bucket_upload_path = MediaFileBucketPath::generate_new(
+    PREFIX, Some(extension_with_period));
+
+  info!("Uploading media to bucket path: {}", bucket_upload_path.get_full_object_path_str());
+
+  public_bucket_client.upload_file_with_content_type(
+    bucket_upload_path.get_full_object_path_str(),
+    image_bytes.as_ref(),
+    mimetype
+  ).await?;
+
+  let media_token = MediaFileInsertBuilder::new()
+      .maybe_creator_user(inference_job.user_details.maybe_creator_user_token.as_ref())
+      .maybe_creator_anonymous_visitor(inference_job.user_details.maybe_creator_anonymous_visitor_token.as_ref())
+      .creator_ip_address(&inference_job.user_details.creator_ip_address)
+      .public_bucket_directory_hash(&bucket_upload_path)
+      .media_file_class(MediaFileClass::Image)
+      .media_file_type(media_file_type)
+      .media_file_origin_category(MediaFileOriginCategory::Inference)
+      .media_file_origin_product_category(MediaFileOriginProductCategory::ImageStudio)
+      .mime_type(mimetype)
+      .file_size_bytes(file_size_bytes as u64)
+      .frame_width(image_info.width())
+      .frame_height(image_info.height())
+      .checksum_sha2(&file_hash)
+      .insert_pool(mysql_pool)
+      .await?;
+
+  Ok(media_token)
+}
+
+async fn update_job_record(
+  request: &Json<UpdateGptImageJobStatusRequest>,
+  server_state: &Data<Arc<ServerState>>,
+  inference_job: GenericInferenceJobStatus,
+  target_status: JobStatusPlus,
+) -> AnyhowResult<()> {
+
+  match target_status {
+    JobStatusPlus::Pending => {}
+    JobStatusPlus::Started => {}
+    JobStatusPlus::CompleteSuccess => {
+      info!("Matched job status complete_success");
+      mark_generic_inference_job_successfully_done_by_token(
+        &server_state.mysql_pool,
+        &request.job_token,
+        None,
+        None,
+        None,
+        None,
+      ).await?;
+    }
+    // TODO: Handle terminal states
+    JobStatusPlus::CompleteFailure => {}
+    JobStatusPlus::AttemptFailed => {}
+    JobStatusPlus::Dead => {}
+    JobStatusPlus::CancelledByUser => {}
+    JobStatusPlus::CancelledBySystem => {}
+  }
+  Ok(())
+}

crates/service/web/storyteller_web/src/http_server/routes/add_image_studio_routes.rs

@@ -1,4 +1,5 @@
 use crate::http_server::endpoints::image_studio::prompt::enqueue_studio_image_generation_handler::enqueue_studio_image_generation_handler;
+use crate::http_server::endpoints::image_studio::update_gpt_image_job_status_handler::update_gpt_image_job_status_handler;
 use crate::http_server::endpoints::image_studio::upload::upload_snapshot_media_file_handler::upload_snapshot_media_file_handler;
 use actix_http::body::MessageBody;
 use actix_service::ServiceFactory;
@@ -25,5 +26,9 @@ where
       .route(web::post().to(enqueue_studio_image_generation_handler))
       .route(web::head().to(|| HttpResponse::Ok()))
     )
+    .service(web::resource("/update_job_status")
+      .route(web::post().to(update_gpt_image_job_status_handler))
+      .route(web::head().to(|| HttpResponse::Ok()))
+    )
   )
 }

crates/workspace-build-acceleration/Cargo.toml

@@ -33,8 +33,8 @@ bytes = { version = "1.10.0", features = ["serde"] }
 chrono = { version = "0.4.40", features = ["serde"] }
 clap = { version = "4.5.13", features = ["derive"] }
 cookie = { version = "0.18.1", default-features = false, features = ["percent-encode"] }
-core-foundation = { version = "0.9.4" }
-core-foundation-sys = { version = "0.8.7" }
+#core-foundation = { version = "0.9.4" }
+#core-foundation-sys = { version = "0.8.7" }
 crossbeam-utils = { version = "0.8.20" }
 crypto-common = { version = "0.1.6", default-features = false, features = ["std"] }
 #cudarc = { version = "0.13.7", features = ["cuda-version-from-build-system", "cudnn", "dynamic-linking", "f16", "nccl"] }

frontend/README.md

@@ -55,4 +55,13 @@ npm install
 2.import it first in code
 3.nx sync
 4.nx build
+
+or
+
+# frontend build
+in frontend folder
+
+% nx build -project type
+% nx build editor3d
+% nx dev editor3d
 ```

frontend/apps/artcraft-website/netlify.toml

@@ -0,0 +1,23 @@
+[build]
+command = "./apps/artcraft-website/script/netlify_build.sh"
+publish = "apps/artcraft-website/dist/"
+
+[[headers]]
+for = "/build/*"
+
+[headers.values]
+"Cache-Control" = "public, max-age=31560000, immutable"
+
+# [[redirects]]
+#   from = "/ingest/static/*"
+#   to = "https://us-assets.i.posthog.com/static/:splat"
+#   host = "us-assets.i.posthog.com"
+#   status = 200
+#   force = true
+# 
+# [[redirects]]
+#   from = "/ingest/*"
+#   to = "https://us.i.posthog.com/:splat"
+#   host = "us.i.posthog.com"
+#   status = 200
+#   force = true

frontend/apps/artcraft-website/script/netlify_build.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -euxo pipefail 
+
+echo "Run build script (TODO: Make strict)"
+nx build artcraft-website
+
+echo "Change to project dir"
+pushd apps/artcraft-website/
+
+#echo "Copy netlify configs into dist"
+#cp _headers dist/
+#cp _redirects dist/
+
+#echo "Copy netlify 404.html page into dist"
+#cp "404.html" dist/
+
+echo "List final files in build"
+find dist/
+

frontend/apps/editor2d/src/Classes/ApiManager/UsersApi.ts

@@ -63,6 +63,7 @@ export class UsersApi extends ApiManager {
     password: string;
   }): Promise<ApiResponse<{ signedSession?: string }>> {
     const endpoint = `${this.ApiTargets.BaseApi}/v1/login`;
+  
     const body = {
       username_or_email: usernameOrEmail,
       password: password,

frontend/apps/editor2d/src/app/pages/login.tsx

@@ -5,10 +5,11 @@ import { faKey, faUser } from "@fortawesome/pro-solid-svg-icons";
 import { Button, Input, LoadingSpinner } from "~/components/ui";
 import { authentication } from "~/signals";
 import { twMerge } from "tailwind-merge";
+import { UsersApi } from "@storyteller/api";
 
 export const Login = () => {
   const {
-    signals: { status: authStatus },
+    signals: { status: authStatus, userInfo },
     fetchers: { login },
     enums: { AUTH_STATUS },
   } = authentication;
@@ -36,17 +37,33 @@ export const Login = () => {
     return "Getting Session...";
   }
 
-  const handleOnSumbit = (ev: React.FormEvent<HTMLFormElement>) => {
+  const handleOnSumbit = async (ev: React.FormEvent<HTMLFormElement>) => {
     ev.preventDefault();
     if (formRef.current) {
       const form = new FormData(formRef.current);
+
       const usernameOrEmail = form.get("usernameOrEmail")?.toString();
       const password = form.get("password")?.toString();
-      if (usernameOrEmail && password && login) {
-        login({
+   
+      if (usernameOrEmail && password) {
+        let api = new UsersApi();
+        
+        let response = await api.Login({
           usernameOrEmail,
           password,
         });
+
+        if (response.success) {
+          let session = response.data?.signedSession;
+          if (session) {
+            localStorage.setItem("session", session);
+            authStatus.value = AUTH_STATUS.LOGGED_IN;
+            let response = await api.GetUserProfile(usernameOrEmail);
+            if (response.success) {
+              userInfo.value = response.data?.user;
+            }
+          }
+        }
       }
     }
   }; // end handleOnSubmit
@@ -82,6 +99,7 @@ export const Login = () => {
               shouldShowLoader && "opacity-0",
             )}
           >
+            
             <Input
               label="Username or Email"
               icon={faUser}

frontend/apps/editor2d/src/app/pages/main/index.tsx

@@ -1,7 +1,7 @@
 import { useParams } from "react-router-dom";
 import { withProtectionRoute } from "~/components/hoc";
 import { useRenderCounter } from "~/hooks/useRenderCounter";
-import { Resource, invoke } from "@tauri-apps/api/core";
+import { invoke } from "@tauri-apps/api/core";
 //Components of the Konva App are all in the KonvaComponent
 import { KonvaRootComponent } from "~/KonvaRootComponent";
 import { ToolbarTopLeft } from "~/components/features/ToolbarTopLeft";
@@ -14,6 +14,7 @@ import { EditModeRootComponent } from "~/EditModeRootComponent/EditModeRootCompo
 import { useRef } from "react";
 import { GenerationEngine } from "~/KonvaApp/GenerationEngine";
 import { GalleryRootComponent } from "~/GalleryRootComponent";
+
 import { DemoModal } from "@storyteller/ui-demo-modal";
 
 export const isTauri = (): boolean => {

frontend/apps/editor2d/src/components/PromptBox.tsx

@@ -13,6 +13,7 @@ import { Tooltip } from "~/components/reusable/Tooltip";
 import { Button } from "~/components/reusable/Button";
 import { ToggleButton } from "~/components/reusable/ToggleButton";
 import { Toaster } from "~/components/ui/Toast";
+import { Modal } from "@storyteller/ui-modal";
 import {
   faMessageXmark,
   faMessageCheck,
@@ -49,13 +50,14 @@ export const PromptBox = () => {
   useSignals();
   const isDesktopApp = window.navigator.userAgent.includes("Tauri");
   console.log("Is this a desktop app?", isDesktopApp);
-
+  const [isModalOpen, setIsModalOpen] = useState(false);
+  const [content, setContent] = useState("");
   const { jobTokens, addJobToken, removeJobToken, clearJobTokens } =
     useJobContext();
 
   //const { lastRenderedBitmap } = useCanvasSignal();
   const [prompt, setPrompt] = useState("");
-  const [isEnqueueing, setisEnqueueing] = useState(false);
+  const [isEnqueueing, setIsEnqueueing] = useState(false);
   const [useSystemPrompt, setUseSystemPrompt] = useState(true);
   const [isGalleryModalOpen, setIsGalleryModalOpen] = useState(false);
   const [selectedGalleryImages, setSelectedGalleryImages] = useState<string[]>(
@@ -317,10 +319,9 @@ export const PromptBox = () => {
     }
   };
   const handleEnqueue = async () => {
+    if (isEnqueueing) return;
+    setIsEnqueueing(true);
     if (!prompt.trim()) return;
-
-    setisEnqueueing(true);
-
     try {
       console.log(
         "Enqueuing with prompt:",
@@ -333,9 +334,9 @@ export const PromptBox = () => {
       console.log("Is this a desktop app?", isDesktop);
 
       if (isDesktop) {
-        handleTauriEnqueue();
+        await handleTauriEnqueue();
       } else {
-        handleWebEnqueue();
+        await handleWebEnqueue();
       }
     } catch (error) {
       console.error("Error during image generation:", error);
@@ -343,7 +344,8 @@ export const PromptBox = () => {
         "An error occurred while generating the image. Please try again.",
       );
     } finally {
-      setisEnqueueing(false);
+      await new Promise((resolve) => setTimeout(resolve, 100));
+      setIsEnqueueing(false);
     }
   };
 
@@ -363,6 +365,15 @@ export const PromptBox = () => {
 
   return (
     <>
+      <Modal
+        isOpen={isModalOpen}
+        onClose={() => {
+          setIsModalOpen(false);
+          setContent("");
+        }}
+      >
+        {content}
+      </Modal>
       <div className="absolute bottom-4 left-1/2 flex -translate-x-1/2 flex-col gap-3">
         {(referenceImages.length > 0 || uploadingImages.length > 0) && (
           <div className="flex w-full gap-2">

frontend/apps/editor2d/src/components/features/ToolbarTopRight/index.tsx

@@ -1,10 +1,12 @@
 import { faGear, faImages } from "@fortawesome/pro-solid-svg-icons";
 import { twMerge } from "tailwind-merge";
 import { Activity } from "~/components/ui/Activity/Activity";
+
 import { GalleryModal } from "@storyteller/ui-gallery-modal";
 import { Button } from "@storyteller/ui-button";
 import { SettingsModal } from "@storyteller/ui-settings-modal";
 import { useState } from "react";
+import { AuthButtons } from "~/components/shared_authentication/AuthButtons";
 
 export const ToolbarTopRight = () => {
   const [isSettingsModalOpen, setIsSettingsModalOpen] = useState(false);
@@ -29,8 +31,8 @@ export const ToolbarTopRight = () => {
           My Gallery
         </Button>
         <Activity />
+        <AuthButtons/>
       </div>
-
       <SettingsModal
         isOpen={isSettingsModalOpen}
         onClose={() => setIsSettingsModalOpen(false)}

frontend/apps/editor2d/src/components/features/ToolbarUserProfile/ProfileDropdown.tsx

@@ -23,22 +23,7 @@ export function ProfileDropdown() {
   } = authentication;
 
   if (!userInfo.value) return null;
-
-  // Extract user info for better readability
-  const {
-    core_info: {
-      username,
-      gravatar_hash: emailHash,
-      display_name,
-      default_avatar: {
-        image_index: avatarIndex,
-        color_index: backgroundColorIndex,
-      },
-    },
-  } = userInfo.value;
-
-  const profileUrl = `https://storyteller.ai/profile/${display_name}`;
-
+  const profileUrl = `https://storyteller.ai/profile/${userInfo.value.display_name}`;
   const menuOptions = [
     {
       label: "Logout",
@@ -57,10 +42,10 @@ export function ProfileDropdown() {
       >
         <Gravatar
           size={34}
-          username={username}
-          email_hash={emailHash}
-          avatarIndex={avatarIndex}
-          backgroundIndex={backgroundColorIndex}
+          username={userInfo.value.display_name}
+          email_hash={userInfo.value.email_gravatar_hash}
+          avatarIndex={Number(userInfo.value.core_info.default_avatar.image_index) || 0}
+          backgroundIndex={Number(userInfo.value.core_info.default_avatar.color_index) || 0}
         />
         <FontAwesomeIcon icon={faChevronDown} />
       </MenuButton>

frontend/apps/editor2d/src/components/reusable/ButtonLink/ButtonLink.tsx

@@ -1,11 +1,15 @@
-import { Link, LinkProps } from "@remix-run/react";
+import React from "react";
+import { useNavigate } from "react-router-dom";
 import { IconDefinition } from "@fortawesome/fontawesome-svg-core";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { twMerge } from "tailwind-merge";
 
-interface LinkButtonProps extends LinkProps {
+interface ButtonLinkProps {
   icon?: IconDefinition;
   variant?: "primary" | "secondary";
+  className?: string;
+  to: string;
+  children: React.ReactNode;
 }
 
 export const ButtonLink = ({
@@ -13,9 +17,11 @@ export const ButtonLink = ({
   children,
   className: propsClassName,
   variant = "primary",
+  to,
   ...rest
-}: LinkButtonProps) => {
-  //TODO: Duplicated from Button.tsx
+}: ButtonLinkProps) => {
+  const navigate = useNavigate();
+  
   function getVariantClassNames(variant: string) {
     switch (variant) {
       case "secondary": {
@@ -31,14 +37,19 @@ export const ButtonLink = ({
     "text-sm font-medium whitespace-nowrap rounded-lg px-3 py-2 shadow-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 transition-all duration-150";
   const variantClassNames = getVariantClassNames(variant);
   const className = twMerge(baseClassName, variantClassNames, propsClassName);
-  // END TODO
+  
+  const handleClick = () => {
+    navigate(to);
+  };
 
   return (
-    <Link {...rest}>
-      <button className={className}>
-        {icon && <FontAwesomeIcon className="mr-2" icon={icon} size="sm" />}
-        {children}
-      </button>
-    </Link>
+    <button 
+      className={className} 
+      onClick={handleClick}
+      {...rest}
+    >
+      {icon && <FontAwesomeIcon className="mr-2" icon={icon} size="sm" />}
+      {children}
+    </button>
   );
 };

frontend/apps/editor2d/src/components/shared_authentication/AuthButtons.tsx

@@ -0,0 +1,38 @@
+import { useSignals } from "@preact/signals-react/runtime";
+import { AUTH_STATUS } from "~/signals/authentication/enums";
+import { authentication } from "~/signals";
+import { ButtonLink } from "~/components/reusable/ButtonLink/ButtonLink";
+import { ProfileDropdown } from "../features/ToolbarUserProfile/ProfileDropdown";
+
+// TODO MAKE THIS A SHARED COMPONENT ART CRAFT
+export const AuthButtons = () => {
+  useSignals();
+  const { status } = authentication.signals;
+  console.log("status", status.value);
+
+  if (status.value === AUTH_STATUS.LOGGED_IN) {
+    return <ProfileDropdown />;
+  } else {
+    return (
+      <div className="flex items-center gap-3.5">
+        <span className="text-white/20">|</span>
+        <div className="flex items-center gap-2">
+          <ButtonLink
+            to="/login"
+            variant="primary"
+            className="bg-[#5F5F68]/60 backdrop-blur-lg hover:bg-[#5F5F68]/90" // TODO(bt,2025-04-19): Once we have in-page routing, get rid of this.
+          >
+            Login
+          </ButtonLink>
+          <ButtonLink
+            to="/signup"
+            variant="primary"
+            className="bg-[#5F5F68]/60 backdrop-blur-lg hover:bg-[#5F5F68]/90" // TODO(bt,2025-04-19): Once we have in-page routing, get rid of this.
+          >
+            Sign Up
+          </ButtonLink>
+        </div>
+      </div>
+    );
+  }
+};

frontend/apps/editor2d/src/components/shared_authentication/signup.tsx

@@ -0,0 +1,193 @@
+// import { faEnvelope, faKey, faUser } from "@fortawesome/pro-solid-svg-icons";
+// // import { GlobalSettingsManager } from "./pages/PageEnigma/GlobalSettingsManager";
+
+// import { Button } from "@storyteller/ui-button";
+// import { Input } from "@storyteller/ui-input";
+// import { Toaster } from "@storyteller/ui-toaster";
+
+// // import { authentication, signUp } from "~/signals";
+// import { FormEvent, useRef, useState, StrictMode } from "react";
+// // import { AUTH_STATUS, ToastTypes } from "~/enums";
+// import { useSignalEffect, useSignals } from "@preact/signals-react/runtime";
+// import { useNavigate, useSearchParams, BrowserRouter } from "react-router-dom";
+// import { createRoot } from "react-dom/client";
+
+// // import "./styles/normalize.css";
+// // import "./styles/tailwind.css";
+// // import "./styles/base.css";
+
+// import "@fortawesome/fontawesome-svg-core/styles.css";
+
+// import { config } from "@fortawesome/fontawesome-svg-core";
+
+// config.autoAddCss = false; /* eslint-disable import/first */
+// // TODO MAKE THIS A SHARED COMPONENT ART CRAFT
+// const regEx =
+//   /^(([^<>()[\].,;:\s@"]+(.[^<>()[\].,;:\s@"]+)*)|(".+"))@(([^<>()[\].,;:\s@"]+\.)+[^<>()[\].,;:\s@"]{2,})$/i;
+
+// // TODO(bt,2025-04-19): Make these configurable
+// const ENV = {
+//   BASE_API: "https://api.storyteller.ai",
+//   GOOGLE_API: "https://studio.storyteller.ai",
+//   FUNNEL_API: "https://studio.storyteller.ai",
+//   CDN_API: "https://cdn-2.fakeyou.com",
+//   GRAVATAR_API: "https://studio.storyteller.ai",
+//   DEPLOY_PRIME_URL: "https://studio.storyteller.ai",
+// };
+
+// export default function SignUpScreen() {
+//   useSignals();
+//   const navigate = useNavigate();
+//   const formRef = useRef<HTMLFormElement | null>(null);
+//   const [usernameError, setUsernameError] = useState("");
+//   const [emailError, setEmailError] = useState("");
+//   const [passwordError, setPasswordError] = useState("");
+//   const [passwordConfirmationError, setPasswordConfirmationError] =
+//     useState("");
+//   const [searchParams] = useSearchParams();
+//   // const { status: authStatus } = authentication;
+
+//   const handleOnSubmit = (ev: FormEvent<HTMLFormElement>) => {
+//     ev.preventDefault();
+//     if (formRef.current) {
+//       const form = new FormData(formRef.current);
+//       const email = form.get("email")?.toString();
+//       const password = form.get("password")?.toString();
+//       const passwordConfirmation = form
+//         .get("password-confirmation")
+//         ?.toString();
+//       const username = form.get("username")?.toString();
+//       setUsernameError("");
+//       if (!username || username.length < 6) {
+//         setUsernameError("Username must be at least 6 characters long");
+//       }
+//       setEmailError("");
+//       if (!email || !email.match(regEx)) {
+//         setEmailError("Email must be a valid email address");
+//       }
+//       setPasswordError("");
+//       if (!password || password.length < 8) {
+//         setPasswordError("Password must be at least 8 characters long");
+//       }
+//       setPasswordConfirmationError("");
+//       if (!passwordError && passwordConfirmation !== password) {
+//         setPasswordConfirmationError("Passwords do not match");
+//       }
+
+//       if (
+//         !usernameError &&
+//         !passwordError &&
+//         !emailError &&
+//         !passwordConfirmationError &&
+//         signUp
+//       ) {
+//         signUp({
+//           username: username!,
+//           email: email!,
+//           password: password!,
+//           passwordConfirmation: passwordConfirmation!,
+//         }).then((error) => {
+//           console.log("Error occured", error);
+//           if (error) {
+//             Toaster.toast(ToastTypes.ERROR, error);
+//           }
+//         });
+//       }
+//     }
+//   }; // end handleOnSubmit
+
+//   useSignalEffect(() => {
+//     const redirectPath = searchParams.get("redirect");
+//     if (authStatus.value === AUTH_STATUS.LOGGED_IN) {
+//       navigate(redirectPath ? redirectPath : "/");
+//       return;
+//     }
+//     if (authStatus.value === AUTH_STATUS.NO_ACCESS) {
+//       window.open("https://storyteller.ai/", "_self");
+//       return;
+//     }
+//   });
+
+//   return (
+//     <div className="fixed flex h-full w-full flex-col items-center justify-center overflow-auto bg-[#1b1b1f] bg-center bg-repeat">
+//       <div className="mb-7 flex w-10/12 max-w-2xl items-center justify-center gap-4">
+//         <img
+//           src="/resources/images/artcraft-logo-3.png"
+//           alt="ArtCraft Logo"
+//           className="h-9 select-none"
+//         />
+//       </div>
+//       <div className="w-full max-w-xl rounded-xl shadow-lg">
+//         <div className="glass glass-no-hover relative mx-auto w-full rounded-none rounded-t-xl p-6 shadow-none">
+//           <h1 className="mb-8 text-center text-2xl font-bold">Sign up</h1>
+//           <form
+//             ref={formRef}
+//             onSubmit={handleOnSubmit}
+//             className="flex flex-col gap-4"
+//           >
+//             <Input
+//               label="Username"
+//               icon={faUser}
+//               placeholder="Username"
+//               name="username"
+//               errorMessage={usernameError}
+//               required
+//             />
+//             <Input
+//               type="email"
+//               label="Email"
+//               icon={faEnvelope}
+//               placeholder="Email"
+//               name="email"
+//               errorMessage={emailError}
+//               required
+//             />
+//             <Input
+//               type="password"
+//               label="Password"
+//               icon={faKey}
+//               name="password"
+//               placeholder="Password"
+//               autoComplete="current-password"
+//               errorMessage={passwordError}
+//               required
+//             />
+//             <Input
+//               type="password"
+//               label="Password Confirmation"
+//               icon={faKey}
+//               placeholder="Password Confirmation"
+//               name="password-confirmation"
+//               errorMessage={passwordConfirmationError}
+//               required
+//             />
+//             <Button className="mt-4 py-3">Sign up</Button>
+//           </form>
+//         </div>
+//         <div className="align-items flex w-full max-w-xl rounded-b-xl bg-ui-controls px-6 py-4">
+//           <div className="flex w-full justify-end gap-1 text-sm">
+//             <p className="opacity-75">Already have an account?</p>
+//             <a
+//               href="/login"
+//               className="text-brand-primary-400 hover:text-brand-primary-300 font-medium"
+//             >
+//               Log in
+//             </a>
+//           </div>
+//         </div>
+//       </div>
+//     </div>
+//   );
+// }
+
+// // TODO: Replace environment variables from `root.tsx`
+// createRoot(document.getElementById("root")!).render(
+//   <>
+//     <StrictMode>
+//       <BrowserRouter>
+//         {/* <GlobalSettingsManager env={ENV} /> */}
+//         <SignUpScreen />
+//       </BrowserRouter>
+//     </StrictMode>
+//   </>,
+// );

frontend/apps/editor2d/src/signals/authentication/auth_signals.ts

@@ -1,5 +1,4 @@
 import { computed, signal } from "@preact/signals-react";
-
 import { UserInfo } from "@ApiManager/models/Users";
 import { ActiveSubscriptions } from "@ApiManager/models/Billing";
 import { LoyaltyProgram } from "@ApiManager/enums/Billing";

frontend/apps/editor2d/src/signals/authentication/fetchers.ts

@@ -1,5 +1,5 @@
-import { signals } from "./signals";
-import { UsersApi } from "@ApiManager/UsersApi";
+import { signals } from "./auth_signals";
+import { UsersApi } from "@storyteller/api";
 import { BillingApi } from "@ApiManager/BillingApi";
 
 import {

frontend/apps/editor2d/src/signals/authentication/index.ts

@@ -1,4 +1,4 @@
-import { signals } from "./signals";
+import { signals } from "./auth_signals";
 import * as fetchers from "./fetchers";
 import * as enums from "./enums";