build info as a crate

Removed video VideoProcessor and timeline saving and save manager timeline work and ammo.js
Added some todos to move components.
2026-10-30 05:22:51 -04:00 · 2025-05-24 21:23:14 -04:00 · 2025-05-23 18:18:40 -04:00 · 2025-05-23 16:52:10 -04:00 · 2025-05-23 16:27:41 -04:00 · 2025-05-23 16:15:13 -04:00
917 changed files with 10374 additions and 11678 deletions
@@ -74,7 +74,7 @@ checksum = "b340e9cfa5b08690aae90fb61beb44e9b06f44fe3d0f93781aaa58cfba86245e"
 dependencies = [
 "actix-utils",
 "actix-web",
- "derive_more",
+ "derive_more 0.99.17",
 "futures-util",
 "log",
 "once_cell",
@@ -97,7 +97,7 @@ dependencies = [
 "brotli 6.0.0",
 "bytes 1.10.0",
 "bytestring",
- "derive_more",
+ "derive_more 0.99.17",
 "encoding_rs",
 "flate2",
 "futures-core",
@@ -140,7 +140,7 @@ dependencies = [
 "actix-utils",
 "actix-web",
 "bytes 1.10.0",
- "derive_more",
+ "derive_more 0.99.17",
 "futures-core",
 "futures-util",
 "httparse",
@@ -253,7 +253,7 @@ dependencies = [
 "bytestring",
 "cfg-if 1.0.0",
 "cookie 0.16.2",
- "derive_more",
+ "derive_more 0.99.17",
 "encoding_rs",
 "futures-core",
 "futures-util",
@@ -322,7 +322,7 @@ dependencies = [
 "bytes 1.10.0",
 "bytestring",
 "csv",
- "derive_more",
+ "derive_more 0.99.17",
 "futures-core",
 "futures-util",
 "http 0.2.11",
@@ -850,6 +850,7 @@ dependencies = [
 "tokens",
 "tokio",
 "tokio-util",
+ "url",
 "workspace-build-acceleration",
 ]

@@ -1383,6 +1384,15 @@ dependencies = [
 "workspace-build-acceleration",
 ]

+[[package]]
+name = "bincode"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "bindgen"
 version = "0.70.1"
@@ -1662,6 +1672,79 @@ dependencies = [
 "workspace-build-acceleration",
 ]

+[[package]]
+name = "build-info"
+version = "0.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "288657edd15bfa5a7f30ca3b123c1af2c503eaf218e517fa10bc9063dbc2ad99"
+dependencies = [
+ "bincode",
+ "build-info-common",
+ "build-info-proc",
+]
+
+[[package]]
+name = "build-info-build"
+version = "0.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3146483d5bc5081ec26f9c4e60232e770980d750b2802d6cc2563cded665cc73"
+dependencies = [
+ "anyhow",
+ "base64 0.22.1",
+ "bincode",
+ "build-info-common",
+ "cargo_metadata",
+ "chrono",
+ "git2",
+ "glob",
+ "pretty_assertions",
+ "rustc_version 0.4.0",
+ "serde_json",
+ "zstd 0.13.1",
+]
+
+[[package]]
+name = "build-info-common"
+version = "0.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8524ad59f5958f37f95e66bf6c9a8fa8440c4f56c069247c44244434cfca3eb1"
+dependencies = [
+ "chrono",
+ "derive_more 2.0.1",
+ "semver 1.0.23",
+ "serde",
+]
+
+[[package]]
+name = "build-info-proc"
+version = "0.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b58fb02636d968e8327d84a5a256df9704ac27a1eda98429c35dbe50a278f69"
+dependencies = [
+ "anyhow",
+ "base64 0.22.1",
+ "bincode",
+ "build-info-common",
+ "chrono",
+ "num-bigint",
+ "num-traits",
+ "proc-macro-error2",
+ "proc-macro2",
+ "quote",
+ "serde_json",
+ "syn 2.0.87",
+ "zstd 0.13.1",
+]
+
+[[package]]
+name = "build_metadata"
+version = "0.0.1"
+dependencies = [
+ "build-info",
+ "build-info-build",
+ "workspace-build-acceleration",
+]
+
 [[package]]
 name = "built"
 version = "0.7.6"
@@ -3286,6 +3369,27 @@ dependencies = [
 "syn 1.0.109",
 ]

+[[package]]
+name = "derive_more"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "unicode-xid",
+]
+
 [[package]]
 name = "des"
 version = "0.7.0"
@@ -3380,6 +3484,12 @@ dependencies = [
 "syn 2.0.87",
 ]

+[[package]]
+name = "diff"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
+
 [[package]]
 name = "digest"
 version = "0.9.0"
@@ -4248,11 +4358,14 @@ name = "fal_client"
 version = "0.0.1"
 dependencies = [
 "anyhow",
+ "chrono",
 "errors",
 "fal",
 "file_to_base64_url",
 "filesys",
 "futures 0.3.31",
+ "reqwest 0.12.15",
+ "serde",
 "testing",
 "tokio",
 "url",
@@ -5115,6 +5228,19 @@ dependencies = [
 "winapi 0.3.9",
 ]

+[[package]]
+name = "git2"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2deb07a133b1520dc1a5690e9bd08950108873d7ed5de38dcc74d3b5ebffa110"
+dependencies = [
+ "bitflags 2.5.0",
+ "libc",
+ "libgit2-sys",
+ "log",
+ "url",
+]
+
 [[package]]
 name = "glib"
 version = "0.18.5"
@@ -6492,6 +6618,16 @@ dependencies = [
 "zeroize",
 ]

+[[package]]
+name = "jwt_light"
+version = "0.0.1"
+dependencies = [
+ "base64 0.22.1",
+ "chrono",
+ "serde_json",
+ "workspace-build-acceleration",
+]
+
 [[package]]
 name = "k256"
 version = "0.13.3"
@@ -6731,6 +6867,18 @@ dependencies = [
 "cc",
 ]

+[[package]]
+name = "libgit2-sys"
+version = "0.18.1+1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1dcb20f84ffcdd825c7a311ae347cce604a6f084a767dec4a4929829645290e"
+dependencies = [
+ "cc",
+ "libc",
+ "libz-sys",
+ "pkg-config",
+]
+
 [[package]]
 name = "libloading"
 version = "0.7.4"
@@ -6779,6 +6927,18 @@ dependencies = [
 "vcpkg",
 ]

+[[package]]
+name = "libz-sys"
+version = "1.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
 [[package]]
 name = "limitation"
 version = "0.1.1"
@@ -8802,7 +8962,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
 dependencies = [
 "phf_macros 0.11.2",
- "phf_shared 0.11.2",
+ "phf_shared 0.11.3",
 ]

 [[package]]
@@ -8851,7 +9011,7 @@ version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
 dependencies = [
- "phf_shared 0.11.2",
+ "phf_shared 0.11.3",
 "rand 0.8.5",
 ]

@@ -8876,7 +9036,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
 dependencies = [
 "phf_generator 0.11.2",
- "phf_shared 0.11.2",
+ "phf_shared 0.11.3",
 "proc-macro2",
 "quote",
 "syn 2.0.87",
@@ -8888,7 +9048,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
 dependencies = [
- "siphasher",
+ "siphasher 0.3.11",
 ]

 [[package]]
@@ -8897,16 +9057,16 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
 dependencies = [
- "siphasher",
+ "siphasher 0.3.11",
 ]

 [[package]]
 name = "phf_shared"
-version = "0.11.2"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
+checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
 dependencies = [
- "siphasher",
+ "siphasher 1.0.1",
 ]

 [[package]]
@@ -9070,6 +9230,16 @@ dependencies = [
 "termtree",
 ]

+[[package]]
+name = "pretty_assertions"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
+dependencies = [
+ "diff",
+ "yansi",
+]
+
 [[package]]
 name = "prettyplease"
 version = "0.2.25"
@@ -10297,6 +10467,36 @@ dependencies = [
 "realfft",
 ]

+[[package]]
+name = "runwayml_client"
+version = "0.0.1"
+dependencies = [
+ "anyhow",
+ "base64 0.22.1",
+ "chrono",
+ "cookie 0.18.1",
+ "crockford",
+ "errors",
+ "filesys",
+ "hex-literal",
+ "idempotency",
+ "jwt_light",
+ "log",
+ "once_cell",
+ "rand 0.9.1",
+ "reqwest 0.12.15",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "sha3",
+ "subprocess_common",
+ "testing",
+ "thiserror 2.0.12",
+ "tokio",
+ "toml 0.8.22",
+ "workspace-build-acceleration",
+]
+
 [[package]]
 name = "rust-embed"
 version = "8.0.0"
@@ -10774,7 +10974,7 @@ checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe"
 dependencies = [
 "bitflags 1.3.2",
 "cssparser 0.27.2",
- "derive_more",
+ "derive_more 0.99.17",
 "fxhash",
 "log",
 "matches",
@@ -10794,7 +10994,7 @@ checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06"
 dependencies = [
 "bitflags 2.5.0",
 "cssparser 0.31.2",
- "derive_more",
+ "derive_more 0.99.17",
 "fxhash",
 "log",
 "new_debug_unreachable",
@@ -11278,6 +11478,12 @@ version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"

+[[package]]
+name = "siphasher"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
+
 [[package]]
 name = "slab"
 version = "0.4.9"
@@ -11739,7 +11945,7 @@ dependencies = [
 "cookies",
 "crockford",
 "datetimes",
- "derive_more",
+ "derive_more 0.99.17",
 "diesel",
 "dotenv",
 "easyenv",
@@ -11836,6 +12042,7 @@ dependencies = [
 "errors",
 "idempotency",
 "log",
+ "mimetypes",
 "reqwest 0.12.15",
 "serde",
 "serde_derive",
@@ -13895,12 +14102,9 @@ dependencies = [

 [[package]]
 name = "unicase"
-version = "2.7.0"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
-dependencies = [
- "version_check",
-]
+checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"

 [[package]]
 name = "unicode-bidi"
@@ -15270,7 +15474,7 @@ dependencies = [
 "crossbeam-utils 0.8.20",
 "crypto-common",
 "deranged",
- "derive_more",
+ "derive_more 0.99.17",
 "digest 0.10.7",
 "either",
 "flate2",
@@ -15317,7 +15521,7 @@ dependencies = [
 "openssl-sys",
 "parking_lot 0.12.2",
 "phf 0.11.2",
- "phf_shared 0.11.2",
+ "phf_shared 0.11.3",
 "proc-macro2",
 "prost",
 "pyo3",
@@ -15503,6 +15707,12 @@ dependencies = [
 "windows-sys 0.59.0",
 ]

+[[package]]
+name = "yansi"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
+
 [[package]]
 name = "yoke"
 version = "0.7.5"
@@ -34,10 +34,12 @@ members = [
  "crates/lib/api_clients/google_drive_common",
  "crates/lib/api_clients/google_sign_in",
  "crates/lib/api_clients/openai_sora_client",
+  "crates/lib/api_clients/runwayml_client",
  "crates/lib/api_clients/storyteller_client",
  "crates/lib/api_clients/thumbnail_generator",
  "crates/lib/bootstrap",
  "crates/lib/bucket_paths",
+  "crates/lib/build_metadata",
  "crates/lib/caching/memory_caching",
  "crates/lib/caching/memory_store",
  "crates/lib/caching/redis_caching",
@@ -65,6 +67,7 @@ members = [
  "crates/lib/idempotency",
  "crates/lib/image_algorithms",
  "crates/lib/jobs_common",
+  "crates/lib/jwt_light",
  "crates/lib/logging",
  "crates/lib/machine_learning/ml_models",
  "crates/lib/machine_learning/ml_weights_registry",
@@ -191,6 +194,7 @@ fal_client = { path = "crates/lib/api_clients/fal_client" }
 filesys = { path = "crates/lib/files/filesys" }
 idempotency = { path = "crates/lib/idempotency" }
 images = { path = "crates/lib/files/images" }
+jwt_light = { path = "crates/lib/jwt_light" }
 memory_caching = { path = "crates/lib/caching/memory_caching" }
 memory_store = { path = "crates/lib/caching/memory_store" }
 mimetypes = { path = "crates/lib/files/mimetypes" }
@@ -62,6 +62,7 @@ tempdir = "0.3.7"
 tempfile = "3.18.0"
 tokio = { version = "1.42", features = ["rt", "rt-multi-thread", "fs"] }
 tokio-util = { version = "0.7", features = ["codec"] }
+url = { workspace = true }

 # NB: We need to vendor this in so that we can access the cookies inside via the private API
 tauri-plugin-http = { path = "../../vendor/tauri-plugin-http" }
@@ -10,19 +10,12 @@
    "log:default",
    "upload:allow-download",
    "upload:default",
+    "http:allow-fetch",
    {
      "identifier": "http:default",
      "allow": [
        {
-          "url": "https://*.storyteller.ai"
-        },
-        {
-          "url": "https://*.fakeyou.com"
-        }
-      ],
-      "deny": [
-        {
-          "url": "https://private.tauri.app"
+          "url": "https://*"
        }
      ]
    },
@@ -1,5 +1,5 @@
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
+use crate::core::state::app_preferences::app_preferences_manager::AppPreferencesManager;
+use crate::core::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
 use errors::AnyhowResult;
 use log::{error, info};
 use serde_derive::Serialize;
@@ -1,6 +1,6 @@
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-use crate::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::app_preferences::app_preferences_manager::AppPreferencesManager;
+use crate::core::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use anyhow::anyhow;
 use errors::AnyhowResult;
 use log::{error, info};
@@ -1,6 +1,4 @@
 pub mod app_preferences;
 pub mod command_response_wrapper;
-pub mod fal;
 pub mod flip_image;
 pub mod platform_info_command;
-pub mod sora;
@@ -1,4 +1,4 @@
-use crate::state::os_platform::OsPlatform;
+use crate::core::state::os_platform::OsPlatform;
 use base64::prelude::BASE64_STANDARD;
 use base64::Engine;
 use image::codecs::png::{CompressionType, FilterType, PngEncoder};
@@ -1,4 +1,3 @@
 pub mod notification_event;
 pub mod sendable_event_error;
-pub mod sendable_event_trait;
-pub mod sora;
+pub mod sendable_event_trait;
@@ -1,5 +1,5 @@
 use log::info;
-use crate::events::sendable_event_error::SendableEventError;
+use crate::core::events::sendable_event_error::SendableEventError;
 use serde::Serialize;
 use tauri::{AppHandle, Emitter};

@@ -0,0 +1,6 @@
+pub mod commands;
+pub mod events;
+pub mod state;
+pub mod threads;
+pub mod utils;
+pub mod windows;
@@ -1,6 +1,6 @@
-use crate::state::app_preferences::app_preferences_serializable::AppPreferencesSerializable;
-use crate::state::app_preferences::preferred_download_directory::{PreferredDownloadDirectory, SystemDownloadDirectory};
-use crate::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::app_preferences::app_preferences_serializable::AppPreferencesSerializable;
+use crate::core::state::app_preferences::preferred_download_directory::{PreferredDownloadDirectory, SystemDownloadDirectory};
+use crate::core::state::data_dir::app_data_root::AppDataRoot;

 #[derive(Clone)]
 pub struct AppPreferences {
@@ -1,5 +1,5 @@
-use crate::state::app_preferences::app_preferences::AppPreferences;
-use crate::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::app_preferences::app_preferences::AppPreferences;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use memory_store::clone_cell::CloneCell;

 pub type AppPreferencesManager = CloneCell<AppPreferences>;
@@ -1,6 +1,6 @@
-use crate::state::app_preferences::app_preferences::AppPreferences;
-use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-use crate::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::app_preferences::app_preferences::AppPreferences;
+use crate::core::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use errors::AnyhowResult;
 use serde_derive::{Deserialize, Serialize};

@@ -58,8 +58,8 @@ impl Display for SystemDownloadDirectory {

 #[cfg(test)]
 mod tests {
-  use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-  use crate::state::app_preferences::preferred_download_directory::SystemDownloadDirectory;
+  use crate::core::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
+  use crate::core::state::app_preferences::preferred_download_directory::SystemDownloadDirectory;
  use std::str::FromStr;

  mod json {
@@ -1,4 +1,4 @@
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
 use chrono::{DateTime, Local};
 use std::path::{Path, PathBuf};

@@ -1,4 +1,4 @@
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
 use std::path::{Path, PathBuf};

 #[derive(Clone)]
@@ -1,12 +1,12 @@
-use crate::state::data_dir::app_assets_dir::AppAssetsDir;
-use crate::state::data_dir::app_credentials_dir::AppCredentialsDir;
-use crate::state::data_dir::app_downloads_dir::AppDownloadsDir;
-use crate::state::data_dir::app_settings_dir::AppSettingsDir;
-use crate::state::data_dir::app_weights_dir::AppWeightsDir;
-use crate::state::data_dir::temporary_dir::TemporaryDir;
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
-use crate::state::expanduser::expanduser;
-use crate::state::os_platform::OsPlatform;
+use crate::core::state::data_dir::app_assets_dir::AppAssetsDir;
+use crate::core::state::data_dir::app_credentials_dir::AppCredentialsDir;
+use crate::core::state::data_dir::app_downloads_dir::AppDownloadsDir;
+use crate::core::state::data_dir::app_settings_dir::AppSettingsDir;
+use crate::core::state::data_dir::app_weights_dir::AppWeightsDir;
+use crate::core::state::data_dir::temporary_dir::TemporaryDir;
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::core::state::expanduser::expanduser;
+use crate::core::state::os_platform::OsPlatform;
 use anyhow::anyhow;
 use directories::UserDirs;
 use std::path::{Path, PathBuf};
@@ -1,4 +1,4 @@
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
 use std::path::{Path, PathBuf};

 #[derive(Clone)]
@@ -1,5 +1,5 @@
-use crate::state::app_preferences::app_preferences::AppPreferences;
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::core::state::app_preferences::app_preferences::AppPreferences;
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
 use errors::AnyhowResult;
 use serde::Serialize;
 use std::fs::OpenOptions;
@@ -1,4 +1,4 @@
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
 use std::path::{Path, PathBuf};

 #[derive(Clone)]
@@ -1,4 +1,4 @@
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
 use std::path::{Path, PathBuf};
 use tempdir::TempDir;
 use tempfile::{Builder, NamedTempFile};
@@ -36,7 +36,7 @@ impl TemporaryDir {
    Ok(tempfile)
  }

-  pub fn new_named_temp_file_with_extension(&self, extension: &str) -> anyhow::Result<NamedTempFile> {
+  pub fn new_named_temp_file_with_extension(&self, extension: &str) -> Result<NamedTempFile, std::io::Error> {
    let extension = if extension.starts_with(".") {
      extension.to_string()
    } else {
@@ -43,7 +43,7 @@ pub fn home_dir() -> io::Result<PathBuf> {

 #[cfg(test)]
 mod tests {
-    use crate::state::expanduser::expanduser;
+    use crate::core::state::expanduser::expanduser;
    use std::env;
    use std::path::PathBuf;

@@ -1,5 +1,5 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::windows::main_window::constants::MAIN_WINDOW_NAME;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::windows::main_window::constants::MAIN_WINDOW_NAME;
 use errors::AnyhowResult;
 use serde_derive::{Deserialize, Serialize};
 use std::fs::OpenOptions;
@@ -1,6 +1,6 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::utils::best_window_size_heuristic::best_window_size_heuristic;
-use crate::windows::main_window::constants::MAIN_WINDOW_NAME;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::utils::best_window_size_heuristic::best_window_size_heuristic;
+use crate::core::windows::main_window::constants::MAIN_WINDOW_NAME;
 use errors::AnyhowResult;
 use serde_derive::{Deserialize, Serialize};
 use std::fs::OpenOptions;
@@ -2,9 +2,6 @@ pub mod app_preferences;
 pub mod app_startup_time;
 pub mod data_dir;
 pub mod expanduser;
-pub mod fal;
 pub mod main_window_position;
 pub mod main_window_size;
-pub mod os_platform;
-pub mod sora;
-pub mod storyteller;
+pub mod os_platform;
@@ -1,11 +1,11 @@
-use crate::state::app_startup_time::AppStartupTime;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::main_window_position::MainWindowPosition;
-use crate::state::main_window_size::MainWindowSize;
-use crate::state::storyteller::storyteller_credential_manager::StorytellerCredentialManager;
-use crate::threads::main_window_thread::persist_storyteller_cookies_task::persist_storyteller_cookies_task;
-use crate::threads::main_window_thread::persist_window_position_task::persist_window_position_task;
-use crate::threads::main_window_thread::persist_window_resize_task::persist_window_resize_task;
+use crate::core::state::app_startup_time::AppStartupTime;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::main_window_position::MainWindowPosition;
+use crate::core::state::main_window_size::MainWindowSize;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use crate::core::threads::main_window_thread::persist_storyteller_cookies_task::persist_storyteller_cookies_task;
+use crate::core::threads::main_window_thread::persist_window_position_task::persist_window_position_task;
+use crate::core::threads::main_window_thread::persist_window_resize_task::persist_window_resize_task;
 use errors::AnyhowResult;
 use log::{error, info};
 use memory_store::clone_slot::CloneSlot;
@@ -1,6 +1,6 @@
-use crate::state::app_startup_time::AppStartupTime;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::storyteller::storyteller_credential_manager::StorytellerCredentialManager;
+use crate::core::state::app_startup_time::AppStartupTime;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
 use anyhow::anyhow;
 use chrono::TimeDelta;
 use errors::AnyhowResult;
@@ -1,7 +1,7 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::main_window_position::MainWindowPosition;
-use crate::state::main_window_size::MainWindowSize;
-use crate::utils::best_window_size_heuristic::best_window_size_heuristic;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::main_window_position::MainWindowPosition;
+use crate::core::state::main_window_size::MainWindowSize;
+use crate::core::utils::best_window_size_heuristic::best_window_size_heuristic;
 use errors::AnyhowResult;
 use log::info;
 use memory_store::clone_slot::CloneSlot;
@@ -1,6 +1,6 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::main_window_size::MainWindowSize;
-use crate::utils::best_window_size_heuristic::best_window_size_heuristic;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::main_window_size::MainWindowSize;
+use crate::core::utils::best_window_size_heuristic::best_window_size_heuristic;
 use errors::AnyhowResult;
 use log::info;
 use memory_store::clone_slot::CloneSlot;
@@ -0,0 +1,2 @@
+pub mod discord_presence_thread;
+pub mod main_window_thread;
@@ -0,0 +1,29 @@
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::utils::get_url_file_extension::get_url_file_extension;
+use crate::core::utils::simple_http_download_to_tempfile::simple_http_download_to_tempfile;
+use errors::AnyhowResult;
+use storyteller_client::media_files::get_media_file::get_media_file;
+use storyteller_client::utils::api_host::ApiHost;
+use tempfile::NamedTempFile;
+use tokens::tokens::media_files::MediaFileToken;
+
+// TODO: Better more concrete error handling
+
+pub async fn download_media_file_to_temp_dir(app_data_root: &AppDataRoot, token: &MediaFileToken) -> AnyhowResult<NamedTempFile> {
+  let response = get_media_file(&ApiHost::Storyteller, token).await?;
+
+  let media_file_url = &response.media_file.media_links.cdn_url;
+
+  let extension_with_dot = get_url_file_extension(media_file_url)
+      .map(|ext| format!(".{}", ext))
+      .unwrap_or_else(|| ".png".to_string()); // TODO: Better default extension passed by caller as heuristic.
+
+  //let filename = format!("{}{}", response.media_file.token.as_str(), extension_with_dot);
+  //let filename = app_data_root.downloads_dir().path().join(&filename);
+
+  let mut file = app_data_root.temp_dir().new_named_temp_file_with_extension(&extension_with_dot)?;
+
+  simple_http_download_to_tempfile(&media_file_url, &mut file).await?;
+
+  Ok(file) // NB: Must return TempFile to not drop / delete it
+}
@@ -0,0 +1,20 @@
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use errors::AnyhowResult;
+use std::io::Write;
+use tempfile::NamedTempFile;
+use url::Url;
+
+pub async fn download_url_to_temp_dir(url: &str, app_data_root: &AppDataRoot) -> AnyhowResult<NamedTempFile> {
+  let url = Url::parse(&url)?;
+
+  let response = reqwest::get(url.clone()).await?;
+  let response_bytes = response.bytes().await?;
+
+  let ext = url.path().split(".").last().unwrap_or("png");
+
+  let mut temp_file = app_data_root.temp_dir().new_named_temp_file_with_extension(ext)?;
+
+  temp_file.write_all(&response_bytes)?;
+
+  Ok(temp_file)
+}
@@ -1,7 +1,7 @@
 //! Implemented from https://github.com/huggingface/hf_transfer/blob/main/src/lib.rs

-use crate::utils::large_file_transfer::error::Error;
-use crate::utils::large_file_transfer::util::{exponential_backoff, BASE_WAIT_TIME, MAX_WAIT_TIME};
+use crate::core::utils::large_file_transfer::error::Error;
+use crate::core::utils::large_file_transfer::util::{exponential_backoff, BASE_WAIT_TIME, MAX_WAIT_TIME};
 use futures::stream::FuturesUnordered;
 use futures::StreamExt;
 use log::info;
@@ -1,7 +1,7 @@
 //! Implemented from https://github.com/huggingface/hf_transfer/blob/main/src/lib.rs

-use crate::utils::large_file_transfer::error::Error;
-use crate::utils::large_file_transfer::util::{exponential_backoff, BASE_WAIT_TIME, MAX_WAIT_TIME};
+use crate::core::utils::large_file_transfer::error::Error;
+use crate::core::utils::large_file_transfer::util::{exponential_backoff, BASE_WAIT_TIME, MAX_WAIT_TIME};
 use futures::stream::FuturesUnordered;
 use futures::StreamExt;
 use reqwest::header::CONTENT_LENGTH;
@@ -1,10 +1,12 @@
 pub mod best_window_size_heuristic;
 pub mod clear_all_webview_cookies;
+pub mod download_media_file_to_temp_dir;
+pub mod download_url_to_temp_dir;
 pub mod get_url_file_extension;
 pub mod image;
 pub mod large_file_transfer;
 pub mod object_store;
+pub mod save_base64_image_to_temp_dir;
 pub mod simple_http_download;
 pub mod simple_http_download_to_tempfile;
-pub mod sora;
 pub mod webview_unsafe;
@@ -0,0 +1,25 @@
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use base64::prelude::BASE64_STANDARD;
+use base64::Engine;
+use errors::AnyhowResult;
+use mimetypes::mimetype_info::mimetype_info::MimetypeInfo;
+use std::io::Write;
+use tempfile::NamedTempFile;
+
+// TODO: Retain error types (io/decode)
+
+pub async fn save_base64_image_to_temp_dir(app_data_root: &AppDataRoot, base64_image: String) -> AnyhowResult<NamedTempFile> {
+  let bytes = BASE64_STANDARD.decode(base64_image)?;
+
+  let extension = MimetypeInfo::get_for_bytes(&bytes)
+      .map(|info| info.file_extension())
+      .flatten()
+      .map(|ext| ext.extension_with_period().to_string())
+      .unwrap_or_else(|| ".png".to_string());
+
+  let mut file = app_data_root.temp_dir().new_named_temp_file_with_extension(&extension)?;
+
+  file.write_all(bytes.as_ref())?;
+
+  Ok(file) // NB: Must return TempFile to not drop / delete it
+}
@@ -0,0 +1 @@
+pub mod main_window;
@@ -1,36 +1,36 @@
-pub mod commands;
-pub mod events;
-pub mod state;
-pub mod threads;
-pub mod utils;
-pub mod windows;
+pub mod core;
+pub mod services;

 use tauri::Manager;

-use crate::commands::app_preferences::get_app_preferences_command::get_app_preferences_command;
-use crate::commands::app_preferences::update_app_preference_command::update_app_preferences_command;
-use crate::commands::fal::fal_background_removal_command::fal_background_removal_command;
-use crate::commands::fal::get_fal_api_key_command::get_fal_api_key_command;
-use crate::commands::fal::set_fal_api_key_command::set_fal_api_key_command;
-use crate::commands::flip_image::flip_image;
-use crate::commands::platform_info_command::platform_info_command;
-use crate::commands::sora::check_sora_session_command::check_sora_session_command;
-use crate::commands::sora::open_sora_login_command::open_sora_login_command;
-use crate::commands::sora::sora_image_generation_command::sora_image_generation_command;
-use crate::commands::sora::sora_image_remix_command::sora_image_remix_command;
-use crate::commands::sora::sora_logout_command::sora_logout_command;
-use crate::state::app_preferences::app_preferences_manager::load_app_preferences_or_default;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::fal::fal_credential_manager::FalCredentialManager;
-use crate::state::main_window_position::MainWindowPosition;
-use crate::state::main_window_size::MainWindowSize;
-use crate::state::sora::sora_credential_manager::SoraCredentialManager;
-use crate::state::sora::sora_task_queue::SoraTaskQueue;
-use crate::state::storyteller::storyteller_credential_manager::StorytellerCredentialManager;
-use crate::threads::discord_presence_thread::discord_presence_thread;
-use crate::threads::main_window_thread::main_window_thread::main_window_thread;
-use crate::threads::sora_task_polling_thread::sora_task_polling_thread;
-use crate::utils::webview_unsafe::webview_unsafe_for_app;
+use crate::core::commands::app_preferences::get_app_preferences_command::get_app_preferences_command;
+use crate::core::commands::app_preferences::update_app_preference_command::update_app_preferences_command;
+use crate::core::commands::flip_image::flip_image;
+use crate::core::commands::platform_info_command::platform_info_command;
+use crate::core::state::app_preferences::app_preferences_manager::load_app_preferences_or_default;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::main_window_position::MainWindowPosition;
+use crate::core::state::main_window_size::MainWindowSize;
+use crate::core::threads::discord_presence_thread::discord_presence_thread;
+use crate::core::threads::main_window_thread::main_window_thread::main_window_thread;
+use crate::core::utils::webview_unsafe::webview_unsafe_for_app;
+use crate::services::fal::commands::fal_background_removal_command::fal_background_removal_command;
+use crate::services::fal::commands::fal_hunyuan_image_to_3d_command::fal_hunyuan_image_to_3d_command;
+use crate::services::fal::commands::fal_kling_image_to_video_command::fal_kling_image_to_video_command;
+use crate::services::fal::commands::get_fal_api_key_command::get_fal_api_key_command;
+use crate::services::fal::commands::set_fal_api_key_command::set_fal_api_key_command;
+use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
+use crate::services::fal::state::fal_task_queue::FalTaskQueue;
+use crate::services::fal::threads::fal_task_polling_thread::fal_task_polling_thread;
+use crate::services::sora::commands::check_sora_session_command::check_sora_session_command;
+use crate::services::sora::commands::open_sora_login_command::open_sora_login_command;
+use crate::services::sora::commands::sora_image_generation_command::sora_image_generation_command;
+use crate::services::sora::commands::sora_image_remix_command::sora_image_remix_command;
+use crate::services::sora::commands::sora_logout_command::sora_logout_command;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
+use crate::services::sora::threads::sora_task_polling_thread::sora_task_polling_thread;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;

 use tauri_plugin_dialog;
 use tauri_plugin_http;
@@ -59,11 +59,15 @@ pub fn run() {
  
  println!("Attempting to read existing fal credentials...");
  let fal_creds_manager = FalCredentialManager::initialize_from_disk_infallible(&app_data_root);
+  let fal_creds_manager_2 = fal_creds_manager.clone();

  // Other state
  let sora_task_queue = SoraTaskQueue::new();
  let sora_task_queue_2 = sora_task_queue.clone();

+  let fal_task_queue = FalTaskQueue::new();
+  let fal_task_queue_2 = fal_task_queue.clone();
+
  println!("Initializing backend runtime...");

  tauri::Builder::default()
@@ -97,13 +101,19 @@ pub fn run() {
        eprintln!("Error setting webview unsafe: {:?}", err);
      }

+      // TODO(bt): Clean this up. We can just clone at the callsite. Also clean initialization
      let app_2 = app.clone();
      let app_3 = app.clone();
      let app_4 = app.clone();
+      let app_5 = app.clone();
      let app_data_root_3 = app_data_root_2.clone();
      let app_data_root_4 = app_data_root_2.clone();
+      let app_data_root_5 = app_data_root_2.clone();
      let sora_creds_manager_3 = sora_creds_manager_2.clone();
      let storyteller_creds_manager_3 = storyteller_creds_manager.clone();
+      let storyteller_creds_manager_4 = storyteller_creds_manager.clone();
+      let fal_creds_manager_3 = fal_creds_manager_2.clone();
+      let fal_task_queue_3 = fal_task_queue_2.clone();

      match MainWindowSize::from_filesystem_configs(&app_data_root_3) {
        Ok(None) => {}
@@ -136,18 +146,22 @@ pub fn run() {
      tauri::async_runtime::spawn(main_window_thread(app_3, app_data_root_3, storyteller_creds_manager_2));
      tauri::async_runtime::spawn(sora_task_polling_thread(app_4, app_data_root_4, sora_creds_manager_3, storyteller_creds_manager_3, sora_task_queue_2));
      tauri::async_runtime::spawn(discord_presence_thread());
+      tauri::async_runtime::spawn(fal_task_polling_thread(app_5, app_data_root_5, fal_creds_manager_3, storyteller_creds_manager_4, fal_task_queue_3));

      Ok(())
    })
    .manage(app_data_root)
    .manage(app_preferences)
-    .manage(sora_creds_manager)
    .manage(fal_creds_manager)
+    .manage(fal_task_queue)
+    .manage(sora_creds_manager)
    .manage(sora_task_queue)
    .manage(storyteller_creds_manager_3)
    .invoke_handler(tauri::generate_handler![
      check_sora_session_command,
      fal_background_removal_command,
+      fal_hunyuan_image_to_3d_command,
+      fal_kling_image_to_video_command,
      flip_image,
      get_app_preferences_command,
      get_fal_api_key_command,
@@ -1,24 +1,27 @@
-use crate::commands::command_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus, CommandResult, SerializeMarker};
-use crate::events::sendable_event_trait::SendableEvent;
-use crate::events::sora::sora_image_enqueue_failure_event::SoraImageEnqueueFailureEvent;
-use crate::events::sora::sora_image_enqueue_success_event::SoraImageEnqueueSuccessEvent;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
-use crate::state::fal::fal_credential_manager::FalCredentialManager;
-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::state::storyteller::storyteller_credential_manager::StorytellerCredentialManager;
-use crate::utils::get_url_file_extension::get_url_file_extension;
-use crate::utils::simple_http_download::simple_http_download;
-use crate::utils::simple_http_download_to_tempfile::simple_http_download_to_tempfile;
+use crate::core::commands::command_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus, CommandResult, SerializeMarker};
+use crate::core::events::sendable_event_trait::SendableEvent;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::core::utils::download_media_file_to_temp_dir::download_media_file_to_temp_dir;
+use crate::core::utils::get_url_file_extension::get_url_file_extension;
+use crate::core::utils::save_base64_image_to_temp_dir::save_base64_image_to_temp_dir;
+use crate::core::utils::simple_http_download::simple_http_download;
+use crate::core::utils::simple_http_download_to_tempfile::simple_http_download_to_tempfile;
+use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
+use crate::services::sora::events::sora_image_enqueue_failure_event::SoraImageEnqueueFailureEvent;
+use crate::services::sora::events::sora_image_enqueue_success_event::SoraImageEnqueueSuccessEvent;
+use crate::services::sora::state::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
+use crate::services::sora::state::sora_credential_holder::SoraCredentialHolder;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
 use anyhow::anyhow;
 use base64::prelude::BASE64_STANDARD;
 use base64::{DecodeError, Engine};
 use errors::{AnyhowError, AnyhowResult};
 use fal_client::fal_error_plus::FalErrorPlus;
 use fal_client::requests::remove_background_rembg::remove_background_rembg;
+use filesys::file_read_bytes::file_read_bytes;
 use image::codecs::png::{CompressionType, FilterType, PngEncoder};
 use image::{DynamicImage, EncodableLayout, ImageReader};
 use log::{debug, error, info, warn};
@@ -40,14 +43,13 @@ use std::io::{Cursor, Read, Write};
 use std::ops::Add;
 use std::path::PathBuf;
 use std::time::Duration;
-use storyteller_client::api_error::ApiError;
-use storyteller_client::api_error::ApiError::InternalServerError;
+use storyteller_client::error::api_error::ApiError;
+use storyteller_client::error::api_error::ApiError::InternalServerError;
 use storyteller_client::media_files::get_media_file::{get_media_file, GetMediaFileSuccessResponse};
 use storyteller_client::media_files::upload_image_media_file_from_file::upload_image_media_file_from_file;
 use storyteller_client::utils::api_host::ApiHost;
 use tauri::{AppHandle, Emitter, Manager, State};
 use tempfile::NamedTempFile;
-use filesys::file_read_bytes::file_read_bytes;
 use tokens::tokens::media_files::MediaFileToken;

 #[derive(Deserialize)]
@@ -73,7 +75,7 @@ impl SerializeMarker for FalBackgroundRemovalSuccessResponse {}

 #[derive(Serialize, Debug)]
 #[serde(rename_all = "snake_case")]
-pub enum SoraImageRemixErrorType {
+pub enum BackgroundRemovalErrorType {
  /// Generic server error
  ServerError,
  /// No Fal API key available
@@ -87,7 +89,7 @@ pub async fn fal_background_removal_command(
  app_data_root: State<'_, AppDataRoot>,
  fal_creds_manager: State<'_, FalCredentialManager>,
  storyteller_creds_manager: State<'_, StorytellerCredentialManager>,
-) -> CommandResult<FalBackgroundRemovalSuccessResponse, SoraImageRemixErrorType, ()> {
+) -> CommandResult<FalBackgroundRemovalSuccessResponse, BackgroundRemovalErrorType, ()> {
  
  info!("fal_background_removal_command called; image media token: {:?}", request.image_media_token);

@@ -100,7 +102,7 @@ pub async fn fal_background_removal_command(
    return Err(CommandErrorResponseWrapper {
      status: CommandErrorStatus::Unauthorized,
      error_message: Some("You need to set a FAL api key".to_string()),
-      error_type: Some(SoraImageRemixErrorType::NeedsFalApiKey),
+      error_type: Some(BackgroundRemovalErrorType::NeedsFalApiKey),
      error_details: None,
    });
  }
@@ -123,7 +125,7 @@ pub async fn fal_background_removal_command(
      //}
      
      let mut status = CommandErrorStatus::ServerError;
-      let mut error_type = SoraImageRemixErrorType::ServerError;
+      let mut error_type = BackgroundRemovalErrorType::ServerError;
      let mut error_message = "A server error occurred. Please try again. If it continues, please tell our staff about the problem.";
      
      //match (err) {
@@ -143,7 +145,7 @@ pub async fn fal_background_removal_command(
      //if let Err(err) = result {
      //  error!("Failed to emit event: {:?}", err);
      //}
-      
+
      Ok(FalBackgroundRemovalSuccessResponse {
        media_token: result.0.media_file.token,
        cdn_url: result.0.media_file.media_links.cdn_url,
@@ -159,7 +161,6 @@ enum InnerError {
  AnyhowError(AnyhowError),
  StorytellerApiError(ApiError),
  DecodeError(DecodeError),
-  //ImageError(image::ImageError),
  IoError(std::io::Error),
 }

@@ -187,12 +188,6 @@ impl From<DecodeError> for InnerError {
  }
 }

-//impl From<image::ImageError> for InnerError {
-//  fn from(value: image::ImageError) -> Self {
-//    Self::ImageError(value)
-//  }
-//}
-//
 impl From<std::io::Error> for InnerError {
  fn from(value: std::io::Error) -> Self {
    Self::IoError(value)
@@ -212,10 +207,10 @@ pub async fn remove_background(
  let mut temp_download;
  
  if let Some(media_token) = request.image_media_token {
-    temp_download = download_media_file(&app_data_root, &media_token).await?;
+    temp_download = download_media_file_to_temp_dir(&app_data_root, &media_token).await?;
    
  } else if let Some(base64_bytes) = request.base64_image {
-    temp_download = persist_base64(&app_data_root, base64_bytes).await?;
+    temp_download = save_base64_image_to_temp_dir(&app_data_root, base64_bytes).await?;
  } else {
    return Err(InnerError::AnyhowError(anyhow!("No image media token or base64 image provided")));
  }
@@ -260,37 +255,3 @@ pub async fn remove_background(
  Ok((response, base64_bytes))
 }

-async fn download_media_file(app_data_root: &AppDataRoot, token: &MediaFileToken) -> Result<NamedTempFile, InnerError> {
-  let response = get_media_file(&ApiHost::Storyteller, token).await?;
-
-  let media_file_url = &response.media_file.media_links.cdn_url;
-  
-  let extension_with_dot = get_url_file_extension(media_file_url)
-      .map(|ext| format!(".{}", ext))
-      .unwrap_or_else(|| ".png".to_string());
-
-  //let filename = format!("{}{}", response.media_file.token.as_str(), extension_with_dot);
-  //let filename = app_data_root.downloads_dir().path().join(&filename);
-  
-  let mut file = app_data_root.temp_dir().new_named_temp_file_with_extension(&extension_with_dot)?;
-
-  simple_http_download_to_tempfile(&media_file_url, &mut file).await?;
-  
-  Ok(file) // NB: Must return TempFile to not drop / delete it
-}
-
-async fn persist_base64(app_data_root: &AppDataRoot, base64_image: String) -> Result<NamedTempFile, InnerError> {
-  let bytes = BASE64_STANDARD.decode(base64_image)?;
-
-  let extension = MimetypeInfo::get_for_bytes(&bytes)
-      .map(|info| info.file_extension())
-      .flatten()
-      .map(|ext| ext.extension_with_period().to_string())
-      .unwrap_or_else(|| ".png".to_string());
-  
-  let mut file = app_data_root.temp_dir().new_named_temp_file_with_extension(&extension)?;
-  
-  file.write_all(bytes.as_ref())?;
-
-  Ok(file) // NB: Must return TempFile to not drop / delete it
-}
@@ -0,0 +1,220 @@
+use crate::core::commands::command_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus, CommandResult, SerializeMarker};
+use crate::core::events::sendable_event_trait::SendableEvent;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::core::utils::download_media_file_to_temp_dir::download_media_file_to_temp_dir;
+use crate::core::utils::get_url_file_extension::get_url_file_extension;
+use crate::core::utils::save_base64_image_to_temp_dir::save_base64_image_to_temp_dir;
+use crate::core::utils::simple_http_download::simple_http_download;
+use crate::core::utils::simple_http_download_to_tempfile::simple_http_download_to_tempfile;
+use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
+use crate::services::fal::state::fal_task_queue::FalTaskQueue;
+use crate::services::sora::events::sora_image_enqueue_failure_event::SoraImageEnqueueFailureEvent;
+use crate::services::sora::events::sora_image_enqueue_success_event::SoraImageEnqueueSuccessEvent;
+use crate::services::sora::state::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
+use crate::services::sora::state::sora_credential_holder::SoraCredentialHolder;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use anyhow::anyhow;
+use base64::prelude::BASE64_STANDARD;
+use base64::{DecodeError, Engine};
+use errors::{AnyhowError, AnyhowResult};
+use fal_client::fal_error_plus::FalErrorPlus;
+use fal_client::requests::enqueue_hunyuan2_image_to_3d::{enqueue_hunyuan2_image_to_3d, Hunyuan2Args};
+use fal_client::requests::enqueue_kling_16_image_to_video::{enqueue_kling_16_image_to_video, Kling16Args, Kling16Duration};
+use fal_client::requests::remove_background_rembg::remove_background_rembg;
+use filesys::file_read_bytes::file_read_bytes;
+use image::codecs::png::{CompressionType, FilterType, PngEncoder};
+use image::{DynamicImage, EncodableLayout, ImageReader};
+use log::{debug, error, info, warn};
+use mimetypes::mimetype_info::mimetype_info::MimetypeInfo;
+use openai_sora_client::credentials::SoraCredentials;
+use openai_sora_client::creds::credential_migration::CredentialMigrationRef;
+use openai_sora_client::recipes::image_remix_with_session_auto_renew::{image_remix_with_session_auto_renew, ImageRemixAutoRenewRequest};
+use openai_sora_client::recipes::image_upload_from_file_with_session_auto_renew::{image_upload_from_file_with_session_auto_renew, ImageUploadFromFileAutoRenewRequest};
+use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
+use openai_sora_client::requests::image_gen::common::{ImageSize, NumImages};
+use openai_sora_client::requests::image_gen::sora_image_gen_remix::{sora_image_gen_remix, SoraImageGenRemixRequest};
+use openai_sora_client::requests::upload::upload_media_from_bytes::sora_media_upload_from_bytes;
+use openai_sora_client::requests::upload::upload_media_from_file::sora_media_upload_from_file;
+use openai_sora_client::sora_error::SoraError;
+use reqwest::Url;
+use serde_derive::{Deserialize, Serialize};
+use std::fs::read_to_string;
+use std::io::{Cursor, Read, Write};
+use std::ops::Add;
+use std::path::PathBuf;
+use std::time::Duration;
+use storyteller_client::error::api_error::ApiError;
+use storyteller_client::error::api_error::ApiError::InternalServerError;
+use storyteller_client::media_files::get_media_file::{get_media_file, GetMediaFileSuccessResponse};
+use storyteller_client::media_files::upload_image_media_file_from_file::upload_image_media_file_from_file;
+use storyteller_client::utils::api_host::ApiHost;
+use tauri::{AppHandle, Emitter, Manager, State};
+use tempfile::NamedTempFile;
+use tokens::tokens::media_files::MediaFileToken;
+
+#[derive(Deserialize)]
+pub struct FalHunyuanImageTo3dRequest {
+  /// Image media file; the image to remove the background from.
+  pub image_media_token: Option<MediaFileToken>,
+
+  /// Base64-encoded image
+  pub base64_image: Option<String>,
+}
+
+#[derive(Serialize, Debug)]
+#[serde(rename_all = "snake_case")]
+pub enum HunyuanErrorType {
+  /// Generic server error
+  ServerError,
+  /// No Fal API key available
+  NeedsFalApiKey,
+}
+
+
+#[tauri::command]
+pub async fn fal_hunyuan_image_to_3d_command(
+  request: FalHunyuanImageTo3dRequest,
+  app_data_root: State<'_, AppDataRoot>,
+  fal_creds_manager: State<'_, FalCredentialManager>,
+  storyteller_creds_manager: State<'_, StorytellerCredentialManager>,
+  fal_task_queue: State<'_, FalTaskQueue>,
+) -> CommandResult<(), HunyuanErrorType, ()> {
+
+  info!("fal_hunyuan_image_to_3d_command called; image media token: {:?}", request.image_media_token);
+
+  let has_credentials = fal_creds_manager
+      .has_apparent_api_token()
+      .unwrap_or(true); // NB: Failures would be lock issues
+
+  if !has_credentials {
+    warn!("No API key found");
+    return Err(CommandErrorResponseWrapper {
+      status: CommandErrorStatus::Unauthorized,
+      error_message: Some("You need to set a FAL api key".to_string()),
+      error_type: Some(HunyuanErrorType::NeedsFalApiKey),
+      error_details: None,
+    });
+  }
+
+  let result = image_to_3d(
+    request,
+    &app_data_root,
+    &fal_creds_manager,
+    &storyteller_creds_manager,
+    &fal_task_queue,
+  ).await;
+  
+  if let Err(err) = result {
+    error!("error: {:?}", err);
+
+    //let event = SoraImageEnqueueFailureEvent {};
+    //let result = event.send(&app);
+    //if let Err(err) = result {
+    //  error!("Failed to emit event: {:?}", err);
+    //}
+
+    let mut status = CommandErrorStatus::ServerError;
+    let mut error_type = HunyuanErrorType::ServerError;
+    let mut error_message = "A server error occurred. Please try again. If it continues, please tell our staff about the problem.";
+
+    //match (err) {
+    //  _ => {},
+    //}
+
+    return Err(CommandErrorResponseWrapper {
+      status,
+      error_message: Some(error_message.to_string()),
+      error_type: Some(error_type),
+      error_details: None,
+    })
+  }
+  
+  //let event = SoraImageEnqueueSuccessEvent {};
+  //let result = event.send(&app);
+  //if let Err(err) = result {
+  //  error!("Failed to emit event: {:?}", err);
+  //}
+  
+  Ok(().into())
+}
+
+#[derive(Debug)]
+enum InnerError {
+  FalError(FalErrorPlus),
+  AnyhowError(AnyhowError),
+  StorytellerApiError(ApiError),
+  DecodeError(DecodeError),
+  IoError(std::io::Error),
+}
+
+impl From<AnyhowError> for InnerError {
+  fn from(value: AnyhowError) -> Self {
+    Self::AnyhowError(value)
+  }
+}
+
+impl From<FalErrorPlus> for InnerError {
+  fn from(value: FalErrorPlus) -> Self {
+    Self::FalError(value)
+  }
+}
+
+impl From<ApiError> for InnerError {
+  fn from(value: ApiError) -> Self {
+    Self::StorytellerApiError(value)
+  }
+}
+
+impl From<DecodeError> for InnerError {
+  fn from(value: DecodeError) -> Self {
+    Self::DecodeError(value)
+  }
+}
+
+impl From<std::io::Error> for InnerError {
+  fn from(value: std::io::Error) -> Self {
+    Self::IoError(value)
+  }
+}
+
+pub async fn image_to_3d(
+  request: FalHunyuanImageTo3dRequest,
+  app_data_root: &AppDataRoot,
+  fal_creds_manager: &FalCredentialManager,
+  storyteller_creds_manager: &StorytellerCredentialManager,
+  fal_task_queue: &FalTaskQueue,
+) -> Result<(), InnerError> {
+
+  let api_key = fal_creds_manager.get_key_required()?;
+  let creds = storyteller_creds_manager.get_credentials_required()?;
+
+  let mut temp_download;
+
+  if let Some(media_token) = request.image_media_token {
+    temp_download = download_media_file_to_temp_dir(&app_data_root, &media_token).await?;
+
+  } else if let Some(base64_bytes) = request.base64_image {
+    temp_download = save_base64_image_to_temp_dir(&app_data_root, base64_bytes).await?;
+  } else {
+    return Err(InnerError::AnyhowError(anyhow!("No image media token or base64 image provided")));
+  }
+
+  info!("Calling FAL image to 3d ...");
+
+  let filename = temp_download.path().to_path_buf();
+
+  let enqueued = enqueue_hunyuan2_image_to_3d(Hunyuan2Args {
+    image_path: filename,
+    api_key: &api_key,
+  }).await?;
+
+  if let Err(err) = fal_task_queue.insert(&enqueued) {
+    error!("Failed to enqueue task: {:?}", err);
+    return Err(InnerError::AnyhowError(anyhow!("Failed to enqueue task: {:?}", err)));
+  }
+
+  Ok(())
+}
@@ -0,0 +1,220 @@
+use crate::core::commands::command_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus, CommandResult, SerializeMarker};
+use crate::core::events::sendable_event_trait::SendableEvent;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::core::utils::download_media_file_to_temp_dir::download_media_file_to_temp_dir;
+use crate::core::utils::get_url_file_extension::get_url_file_extension;
+use crate::core::utils::save_base64_image_to_temp_dir::save_base64_image_to_temp_dir;
+use crate::core::utils::simple_http_download::simple_http_download;
+use crate::core::utils::simple_http_download_to_tempfile::simple_http_download_to_tempfile;
+use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
+use crate::services::fal::state::fal_task_queue::FalTaskQueue;
+use crate::services::sora::events::sora_image_enqueue_failure_event::SoraImageEnqueueFailureEvent;
+use crate::services::sora::events::sora_image_enqueue_success_event::SoraImageEnqueueSuccessEvent;
+use crate::services::sora::state::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
+use crate::services::sora::state::sora_credential_holder::SoraCredentialHolder;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use anyhow::anyhow;
+use base64::prelude::BASE64_STANDARD;
+use base64::{DecodeError, Engine};
+use errors::{AnyhowError, AnyhowResult};
+use fal_client::fal_error_plus::FalErrorPlus;
+use fal_client::requests::enqueue_kling_16_image_to_video::{enqueue_kling_16_image_to_video, Kling16Args, Kling16Duration};
+use fal_client::requests::remove_background_rembg::remove_background_rembg;
+use filesys::file_read_bytes::file_read_bytes;
+use image::codecs::png::{CompressionType, FilterType, PngEncoder};
+use image::{DynamicImage, EncodableLayout, ImageReader};
+use log::{debug, error, info, warn};
+use mimetypes::mimetype_info::mimetype_info::MimetypeInfo;
+use openai_sora_client::credentials::SoraCredentials;
+use openai_sora_client::creds::credential_migration::CredentialMigrationRef;
+use openai_sora_client::recipes::image_remix_with_session_auto_renew::{image_remix_with_session_auto_renew, ImageRemixAutoRenewRequest};
+use openai_sora_client::recipes::image_upload_from_file_with_session_auto_renew::{image_upload_from_file_with_session_auto_renew, ImageUploadFromFileAutoRenewRequest};
+use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
+use openai_sora_client::requests::image_gen::common::{ImageSize, NumImages};
+use openai_sora_client::requests::image_gen::sora_image_gen_remix::{sora_image_gen_remix, SoraImageGenRemixRequest};
+use openai_sora_client::requests::upload::upload_media_from_bytes::sora_media_upload_from_bytes;
+use openai_sora_client::requests::upload::upload_media_from_file::sora_media_upload_from_file;
+use openai_sora_client::sora_error::SoraError;
+use reqwest::Url;
+use serde_derive::{Deserialize, Serialize};
+use std::fs::read_to_string;
+use std::io::{Cursor, Read, Write};
+use std::ops::Add;
+use std::path::PathBuf;
+use std::time::Duration;
+use storyteller_client::error::api_error::ApiError;
+use storyteller_client::error::api_error::ApiError::InternalServerError;
+use storyteller_client::media_files::get_media_file::{get_media_file, GetMediaFileSuccessResponse};
+use storyteller_client::media_files::upload_image_media_file_from_file::upload_image_media_file_from_file;
+use storyteller_client::utils::api_host::ApiHost;
+use tauri::{AppHandle, Emitter, Manager, State};
+use tempfile::NamedTempFile;
+use tokens::tokens::media_files::MediaFileToken;
+
+#[derive(Deserialize)]
+pub struct FalKlingImageToVideoRequest {
+  /// Image media file; the image to remove the background from.
+  pub image_media_token: Option<MediaFileToken>,
+
+  /// Base64-encoded image
+  pub base64_image: Option<String>,
+}
+
+#[derive(Serialize, Debug)]
+#[serde(rename_all = "snake_case")]
+pub enum KlingImageToVideoErrorType {
+  /// Generic server error
+  ServerError,
+  /// No Fal API key available
+  NeedsFalApiKey,
+}
+
+
+#[tauri::command]
+pub async fn fal_kling_image_to_video_command(
+  request: FalKlingImageToVideoRequest,
+  app_data_root: State<'_, AppDataRoot>,
+  fal_creds_manager: State<'_, FalCredentialManager>,
+  storyteller_creds_manager: State<'_, StorytellerCredentialManager>,
+  fal_task_queue: State<'_, FalTaskQueue>,
+) -> CommandResult<(), KlingImageToVideoErrorType, ()> {
+
+  info!("fal_kling_image_to_video_command called; image media token: {:?}", request.image_media_token);
+
+  let has_credentials = fal_creds_manager
+      .has_apparent_api_token()
+      .unwrap_or(true); // NB: Failures would be lock issues
+
+  if !has_credentials {
+    warn!("No API key found");
+    return Err(CommandErrorResponseWrapper {
+      status: CommandErrorStatus::Unauthorized,
+      error_message: Some("You need to set a FAL api key".to_string()),
+      error_type: Some(KlingImageToVideoErrorType::NeedsFalApiKey),
+      error_details: None,
+    });
+  }
+
+  let result = image_to_video(
+    request,
+    &app_data_root,
+    &fal_creds_manager,
+    &storyteller_creds_manager,
+    &fal_task_queue,
+  ).await;
+  
+  if let Err(err) = result {
+    error!("error: {:?}", err);
+
+    //let event = SoraImageEnqueueFailureEvent {};
+    //let result = event.send(&app);
+    //if let Err(err) = result {
+    //  error!("Failed to emit event: {:?}", err);
+    //}
+
+    let mut status = CommandErrorStatus::ServerError;
+    let mut error_type = KlingImageToVideoErrorType::ServerError;
+    let mut error_message = "A server error occurred. Please try again. If it continues, please tell our staff about the problem.";
+
+    //match (err) {
+    //  _ => {},
+    //}
+
+    return Err(CommandErrorResponseWrapper {
+      status,
+      error_message: Some(error_message.to_string()),
+      error_type: Some(error_type),
+      error_details: None,
+    })
+  }
+  
+  //let event = SoraImageEnqueueSuccessEvent {};
+  //let result = event.send(&app);
+  //if let Err(err) = result {
+  //  error!("Failed to emit event: {:?}", err);
+  //}
+  
+  Ok(().into())
+}
+
+#[derive(Debug)]
+enum InnerError {
+  FalError(FalErrorPlus),
+  AnyhowError(AnyhowError),
+  StorytellerApiError(ApiError),
+  DecodeError(DecodeError),
+  IoError(std::io::Error),
+}
+
+impl From<AnyhowError> for InnerError {
+  fn from(value: AnyhowError) -> Self {
+    Self::AnyhowError(value)
+  }
+}
+
+impl From<FalErrorPlus> for InnerError {
+  fn from(value: FalErrorPlus) -> Self {
+    Self::FalError(value)
+  }
+}
+
+impl From<ApiError> for InnerError {
+  fn from(value: ApiError) -> Self {
+    Self::StorytellerApiError(value)
+  }
+}
+
+impl From<DecodeError> for InnerError {
+  fn from(value: DecodeError) -> Self {
+    Self::DecodeError(value)
+  }
+}
+
+impl From<std::io::Error> for InnerError {
+  fn from(value: std::io::Error) -> Self {
+    Self::IoError(value)
+  }
+}
+
+pub async fn image_to_video(
+  request: FalKlingImageToVideoRequest,
+  app_data_root: &AppDataRoot,
+  fal_creds_manager: &FalCredentialManager,
+  storyteller_creds_manager: &StorytellerCredentialManager,
+  fal_task_queue: &FalTaskQueue,
+) -> Result<(), InnerError> {
+
+  let api_key = fal_creds_manager.get_key_required()?;
+  let creds = storyteller_creds_manager.get_credentials_required()?;
+
+  let mut temp_download;
+
+  if let Some(media_token) = request.image_media_token {
+    temp_download = download_media_file_to_temp_dir(&app_data_root, &media_token).await?;
+
+  } else if let Some(base64_bytes) = request.base64_image {
+    temp_download = save_base64_image_to_temp_dir(&app_data_root, base64_bytes).await?;
+  } else {
+    return Err(InnerError::AnyhowError(anyhow!("No image media token or base64 image provided")));
+  }
+
+  info!("Calling FAL image to video ...");
+
+  let filename = temp_download.path().to_path_buf();
+
+  let enqueued = enqueue_kling_16_image_to_video(Kling16Args {
+    image_path: filename,
+    api_key: &api_key,
+    duration: Kling16Duration::Default,
+  }).await?;
+
+  if let Err(err) = fal_task_queue.insert(&enqueued) {
+    error!("Failed to enqueue task: {:?}", err);
+    return Err(InnerError::AnyhowError(anyhow!("Failed to enqueue task: {:?}", err)));
+  }
+
+  Ok(())
+}
@@ -1,8 +1,8 @@
-use crate::commands::command_response_wrapper::{CommandResult, SerializeMarker};
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::fal::fal_credential_manager::FalCredentialManager;
+use crate::core::commands::command_response_wrapper::{CommandResult, SerializeMarker};
+use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
+use crate::core::state::app_preferences::app_preferences_manager::AppPreferencesManager;
+use crate::core::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use anyhow::anyhow;
 use errors::AnyhowResult;
 use fal_client::creds::fal_api_key::FalApiKey;
@@ -1,3 +1,5 @@
 pub mod fal_background_removal_command;
+pub mod fal_hunyuan_image_to_3d_command;
+pub mod fal_kling_image_to_video_command;
 pub mod get_fal_api_key_command;
 pub mod set_fal_api_key_command;
@@ -1,8 +1,8 @@
-use crate::commands::command_response_wrapper::CommandResult;
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::fal::fal_credential_manager::FalCredentialManager;
+use crate::core::commands::command_response_wrapper::CommandResult;
+use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
+use crate::core::state::app_preferences::app_preferences_manager::AppPreferencesManager;
+use crate::core::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use anyhow::anyhow;
 use errors::AnyhowResult;
 use fal_client::creds::fal_api_key::FalApiKey;
@@ -0,0 +1,3 @@
+pub mod commands;
+pub mod state;
+pub mod threads;
@@ -1,5 +1,5 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::fal::read_fal_api_key_from_disk::read_fal_api_key_from_disk;
+use crate::services::fal::state::read_fal_api_key_from_disk::read_fal_api_key_from_disk;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use anyhow::anyhow;
 use errors::AnyhowResult;
 use fal_client::creds::fal_api_key::FalApiKey;
@@ -0,0 +1,164 @@
+use chrono::{DateTime, Utc};
+use errors::AnyhowResult;
+use fal_client::model::enqueued_request::EnqueuedRequest;
+use fal_client::model::fal_request_id::FalRequestId;
+use indexmap::IndexMap;
+use std::collections::HashSet;
+use std::sync::{Arc, RwLock};
+
+#[derive(Clone)]
+pub struct FalTaskDetails {
+  pub enqueue_time: DateTime<Utc>,
+  pub enqueued_request: EnqueuedRequest,
+}
+
+impl FalTaskDetails {
+  pub fn for_request(request: EnqueuedRequest) -> Self {
+    Self {
+      enqueue_time: Utc::now(),
+      enqueued_request: request,
+    }
+  }
+}
+
+#[derive(Clone)]
+pub struct FalTaskQueue {
+  // Insertion-order map of task IDs to task details
+  queue: Arc<RwLock<IndexMap<FalRequestId, FalTaskDetails>>>
+}
+
+impl FalTaskQueue {
+  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())
+    }
+  }
+  
+  /// Get the task at an index.
+  /// This is an O(1) operation.
+  pub fn get_index(&self, i: usize) -> AnyhowResult<Option<FalTaskDetails>> {
+    match self.queue.read() {
+      Err(err) => {
+        Err(anyhow::anyhow!("Failed to acquire read lock: {:?}", err))
+      }
+      Ok(lock) => {
+        if i >= lock.len() {
+          Ok(None)
+        } else {
+          match lock.get_index(i) {
+            None => Ok(None),
+            Some((_key, value)) => {
+              Ok(Some(value.clone()))
+            }
+          }
+        }
+      }
+    }
+  }
+
+  /// Determine if the key is in the queue
+  /// This is an O(1) operation.
+  pub fn contains_key(&self, request_id: &FalRequestId) -> AnyhowResult<bool> {
+    match self.queue.read() {
+      Err(err) => {
+        Err(anyhow::anyhow!("Failed to acquire read lock: {:?}", err))
+      }
+      Ok(lock) => Ok(lock.contains_key(request_id))
+    }
+  }
+
+  /// Get the first enqueued task
+  /// This is an O(1) operation.
+  pub fn first(&self) -> AnyhowResult<Option<FalTaskDetails>> {
+    match self.queue.read() {
+      Err(err) => {
+        Err(anyhow::anyhow!("Failed to acquire read lock: {:?}", err))
+      }
+      Ok(lock) => match lock.first() {
+        None => Ok(None),
+        Some((request_id, task_details)) => Ok(Some(task_details.clone()))
+      }
+    }
+  }
+
+  /// Get the last enqueued task
+  /// This is an O(1) operation.
+  pub fn last(&self) -> AnyhowResult<Option<FalTaskDetails>> {
+    match self.queue.read() {
+      Err(err) => {
+        Err(anyhow::anyhow!("Failed to acquire read lock: {:?}", err))
+      }
+      Ok(lock) => match lock.last() {
+        None => Ok(None),
+        Some((request_id, task_details)) => Ok(Some(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, request: &EnqueuedRequest) -> AnyhowResult<Option<FalTaskDetails>> {
+    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 = FalTaskDetails::for_request(request.clone());
+        Ok(lock.insert(request.request_id.clone(), task_details))
+      }
+    }
+  }
+
+  /// Remove a task by ID.
+  /// This is an O(n) operation.
+  pub fn remove(&self, request_id: &FalRequestId) -> AnyhowResult<Option<FalTaskDetails>> {
+    match self.queue.write() {
+      Err(err) => {
+        Err(anyhow::anyhow!("Failed to acquire write lock: {:?}", err))
+      }
+      Ok(mut lock) => {
+        Ok(lock.shift_remove(request_id))
+      }
+    }
+  }
+
+  /// Remove a list of tasks by ID.
+  /// This is an O(n) operation.
+  pub fn remove_list(&self, request_ids: &[&FalRequestId]) -> 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<&FalRequestId, _> = HashSet::with_capacity(request_ids.len());
+        set.extend(request_ids);
+        lock.retain(|k, v| !set.contains(k));
+        Ok(())
+      }
+    }
+  }
+}
@@ -1,2 +1,3 @@
 pub mod fal_credential_manager;
+pub mod fal_task_queue;
 pub mod read_fal_api_key_from_disk;
@@ -1,4 +1,4 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use anyhow::anyhow;
 use errors::AnyhowResult;
 use fal_client::creds::fal_api_key::FalApiKey;
@@ -0,0 +1,234 @@
+use crate::core::events::sendable_event_trait::SendableEvent;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::core::utils::download_url_to_temp_dir::download_url_to_temp_dir;
+use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
+use crate::services::fal::state::fal_task_queue::FalTaskQueue;
+use crate::services::sora::events::sora_image_generation_complete_event::SoraImageGenerationCompleteEvent;
+use crate::services::sora::events::sora_image_generation_failed_event::SoraImageGenerationFailedEvent;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use errors::AnyhowResult;
+use fal_client::export::queue::Status;
+use fal_client::fal_error_plus::FalErrorPlus;
+use fal_client::model::fal_request_id::FalRequestId;
+use fal_client::utils::queue_status_checker::QueueStatusChecker;
+use log::{error, info, warn};
+use mimetypes::mimetype_for_file::get_mimetype_for_file;
+use mimetypes::mimetype_info::file_extension::FileExtension;
+use mimetypes::mimetype_info::mimetype_info::MimetypeInfo;
+use openai_sora_client::requests::image_gen::image_gen_status::{Generation, TaskId, TaskStatus};
+use serde_derive::Serialize;
+use std::fs::File;
+use std::io::Write;
+use std::path::PathBuf;
+use storyteller_client::error::api_error::ApiError;
+use storyteller_client::media_files::upload_image_media_file_from_file::upload_image_media_file_from_file;
+use storyteller_client::media_files::upload_new_engine_asset_from_file::upload_new_engine_asset_from_file;
+use storyteller_client::media_files::upload_video_media_file_from_file::{upload_video_media_file_from_file, UploadVideoMediaFileSuccessResponse};
+use storyteller_client::recipes::upload_media_file_from_file::upload_media_file_from_file;
+use storyteller_client::utils::api_host::ApiHost;
+use tauri::{AppHandle, Emitter};
+use tempdir::TempDir;
+use tempfile::NamedTempFile;
+use tokens::tokens::media_files::MediaFileToken;
+use url::Url;
+
+pub async fn fal_task_polling_thread(
+  app_handle: AppHandle,
+  app_data_root: AppDataRoot,
+  fal_creds_manager: FalCredentialManager,
+  storyteller_creds_manager: StorytellerCredentialManager,
+  fal_task_queue: FalTaskQueue,
+) -> ! {
+  loop {
+    let res = polling_loop(
+      &app_handle,
+      &fal_creds_manager,
+      &storyteller_creds_manager,
+      &fal_task_queue,
+      &app_data_root,
+    ).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(
+  app_handle: &AppHandle,
+  fal_creds_manager: &FalCredentialManager,
+  storyteller_creds_manager: &StorytellerCredentialManager,
+  fal_task_queue: &FalTaskQueue,
+  app_data_root: &AppDataRoot,
+) -> AnyhowResult<()> {
+  loop {
+    if fal_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.", fal_task_queue.len()?);
+
+    let key = fal_creds_manager.get_key_required()?;
+    let storyteller_creds = storyteller_creds_manager.get_credentials_required()?;
+
+    let queue_status_checker = QueueStatusChecker::new(key);
+
+    let mut succeeded_tasks = Vec::new();
+    //let mut failed_tasks = Vec::new(); // TODO
+
+    let len = fal_task_queue.len()?;
+
+    for i in 0..len {
+      let task = match fal_task_queue.get_index(i)? {
+        Some(task) => task,
+        None => {
+          warn!("Failed to get task ID at index {}", i);
+          break;
+        }
+      };
+      
+      let task_id = task.enqueued_request.request_id.clone();
+
+      info!("Checking task status for task ID: {:?}", &task_id);
+
+      let result = queue_status_checker.check_status(&task.enqueued_request).await;
+
+      let url = match result {
+        Err(err) => {
+          warn!("Error checking job status: {:?}", err);
+          tokio::time::sleep(std::time::Duration::from_millis(2_000)).await;
+          
+          // TODO: Some failures will be permanent job failures and the jobs will need to be removed.
+          
+          continue;
+        }
+        Ok(status) => {
+          info!("Status: {:?}", status);
+          match status.status {
+            Status::Completed => {
+              let result = queue_status_checker.get_download_url(&task.enqueued_request).await;
+              
+              let url = match result {
+                Ok(url) => url,
+                Err(err) => {
+                  warn!("Failed to get download url: {:?}", err);
+                  
+                  // TODO: Some failures will be permanent job failures.
+                  
+                  continue; 
+                }
+              };
+              
+              url
+            }
+            _ => {
+              continue;
+            },
+          }
+        }
+      };
+
+      // TODO: Clean up
+      
+      let download_file = download_url_to_temp_dir(&url, &app_data_root).await?;
+      
+      let result = upload_media_file_from_file(
+        &ApiHost::Storyteller,
+        Some(&storyteller_creds),
+        download_file
+      ).await;
+
+      match result {
+        Ok(success) => {
+          info!("Uploaded to API backend: {:?}", success.media_file_token);
+
+          //let event = SoraImageGenerationCompleteEvent {
+          //  media_file_token: success.media_file_token,
+          //};
+          //event.send(&app_handle)?;
+
+          succeeded_tasks.push(task_id);
+        }
+        Err(err) => {
+          warn!("Failed to upload media file: {:?}", err);
+          continue;
+        }
+      }
+
+    }
+
+
+//    // 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(_) => {}
+//      }
+//    }
+//
+//    for task in failed_tasks.iter() {
+//      if fal_task_queue.contains_key(&task.id)? {
+//        let event = SoraImageGenerationFailedEvent {
+//          prompt: task.prompt.clone(),
+//        };
+//        event.send(&app_handle)?;
+//      }
+//    }
+//
+//    let failed_task_ids: Vec<&TaskId> = failed_tasks
+//        .iter()
+//        .map(|task| &task.id)
+//        .collect();
+//
+//    fal_task_queue.remove_list(&failed_task_ids)?;
+//
+//    let creds = storyteller_creds_manager.get_credentials_required()?;
+//    let api_host = ApiHost::Storyteller;
+//
+//    for task in succeeded_tasks.iter() {
+//      if !fal_task_queue.contains_key(&task.id)? {
+//        continue;
+//      }
+//      info!("Task succeeded: {:?}", task.id);
+//
+//      for (i, generation) in task.generations.iter().enumerate() {
+//        info!("Downloading generated file...");
+//        let download_path = download_generation(generation, &app_data_root).await?;
+//
+//        info!("Uploading to backend...");
+//        let result = upload_image_media_file_from_file(&api_host, Some(&creds), download_path).await?;
+//
+//        info!("Uploaded to API backend: {:?}", result.media_file_token);
+//
+//        let event = SoraImageGenerationCompleteEvent {
+//          media_file_token: result.media_file_token,
+//        };
+//
+//        event.send(&app_handle)?;
+//      }
+//    }
+//
+    let succeeded_task_ids : Vec<&FalRequestId> = succeeded_tasks
+        .iter()
+        .map(|task| task)
+        .collect::<Vec<_>>();
+
+    fal_task_queue.remove_list(&succeeded_task_ids)?;
+
+    tokio::time::sleep(std::time::Duration::from_millis(6_000)).await;
+  }
+}
+
@@ -0,0 +1 @@
+pub mod fal_task_polling_thread;
@@ -0,0 +1,3 @@
+pub mod fal;
+pub mod sora;
+pub mod storyteller;
@@ -1,10 +1,9 @@
-use std::ops::Add;
+use crate::core::commands::app_preferences::get_app_preferences_command::AppPreferencesPayload;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::core::state::app_preferences::app_preferences_manager::AppPreferencesManager;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::services::sora::windows::sora_login_window::open_sora_login_window::open_sora_login_window;
 use chrono::{DateTime, TimeDelta, Utc};
-use crate::commands::app_preferences::get_app_preferences_command::AppPreferencesPayload;
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::sora::sora_credential_manager::SoraCredentialManager;
-use crate::windows::sora_login_window::open_sora_login_window::open_sora_login_window;
 use errors::AnyhowResult;
 use log::{error, info};
 use once_cell::sync::Lazy;
@@ -12,6 +11,7 @@ use openai_sora_client::creds::sora_credential_set::SoraCredentialSet;
 use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
 use openai_sora_client::requests::list_media::list_media::list_media;
 use serde_derive::Serialize;
+use std::ops::Add;
 use tauri::{AppHandle, State};

 const CACHE_PERIOD : TimeDelta = TimeDelta::milliseconds(1000 * 60 * 5); // 5 minutes
@@ -1,7 +1,7 @@
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::sora::sora_credential_manager::SoraCredentialManager;
-use crate::windows::sora_login_window::open_sora_login_window::open_sora_login_window;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::core::state::app_preferences::app_preferences_manager::AppPreferencesManager;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::services::sora::windows::sora_login_window::open_sora_login_window::open_sora_login_window;
 use errors::AnyhowResult;
 use log::{error, info};
 use once_cell::sync::Lazy;
@@ -1,6 +1,6 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::sora::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
-use crate::state::sora::sora_credential_holder::SoraCredentialHolder;
+use crate::services::sora::state::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
+use crate::services::sora::state::sora_credential_holder::SoraCredentialHolder;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use base64::prelude::BASE64_STANDARD;
 use base64::Engine;
 use errors::AnyhowResult;
@@ -1,15 +1,15 @@
-use crate::commands::command_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus, CommandResult};
-use crate::events::sendable_event_trait::SendableEvent;
-use crate::events::sora::sora_image_enqueue_failure_event::SoraImageEnqueueFailureEvent;
-use crate::events::sora::sora_image_enqueue_success_event::SoraImageEnqueueSuccessEvent;
-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 crate::core::commands::command_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus, CommandResult};
+use crate::core::events::sendable_event_trait::SendableEvent;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::core::utils::get_url_file_extension::get_url_file_extension;
+use crate::core::utils::simple_http_download::simple_http_download;
+use crate::services::sora::events::sora_image_enqueue_failure_event::SoraImageEnqueueFailureEvent;
+use crate::services::sora::events::sora_image_enqueue_success_event::SoraImageEnqueueSuccessEvent;
+use crate::services::sora::state::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
+use crate::services::sora::state::sora_credential_holder::SoraCredentialHolder;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
 use base64::prelude::BASE64_STANDARD;
 use base64::Engine;
 use errors::{AnyhowError, AnyhowResult};
@@ -31,8 +31,8 @@ use std::fs::read_to_string;
 use std::io::Cursor;
 use std::ops::Add;
 use std::time::Duration;
-use storyteller_client::api_error::ApiError;
-use storyteller_client::api_error::ApiError::InternalServerError;
+use storyteller_client::error::api_error::ApiError;
+use storyteller_client::error::api_error::ApiError::InternalServerError;
 use storyteller_client::media_files::get_media_file::get_media_file;
 use storyteller_client::utils::api_host::ApiHost;
 use tauri::{AppHandle, Emitter, Manager, State};
@@ -42,7 +42,9 @@ const SORA_IMAGE_UPLOAD_TIMEOUT: Duration = Duration::from_millis(1000 * 30); //

 const SORA_IMAGE_REMIX_TIMEOUT: Duration = Duration::from_millis(1000 * 30); // 30 seconds

-#[derive(Deserialize)]
+const DEFAULT_ASPECT_RATIO : SoraAspectRatio = SoraAspectRatio::Square;
+
+#[derive(Deserialize, Debug)]
 pub struct SoraImageRemixCommand {
  /// Image media file; the engine or canvas snapshot (screenshot).
  pub snapshot_media_token: MediaFileToken,
@@ -57,6 +59,17 @@ pub struct SoraImageRemixCommand {
  pub maybe_additional_images: Option<Vec<MediaFileToken>>,

  pub maybe_number_of_samples: Option<u32>,
+  
+  /// Aspect ratio.
+  pub aspect_ratio: Option<SoraAspectRatio>,
+}
+
+#[derive(Deserialize, Debug, Copy, Clone)]
+#[serde(rename_all = "snake_case")]
+pub enum SoraAspectRatio {
+  Square,
+  Wide,
+  Tall,
 }

 #[derive(Serialize, Debug)]
@@ -74,7 +87,6 @@ pub enum SoraImageRemixErrorType {
  SoraIsHavingProblems,
 }

-
 #[tauri::command]
 pub async fn sora_image_remix_command(
  app: AppHandle,
@@ -84,8 +96,8 @@ pub async fn sora_image_remix_command(
  sora_task_queue: State<'_, SoraTaskQueue>,
 ) -> CommandResult<(), SoraImageRemixErrorType, ()> {
  
-  info!("image_generation_command called; scene media token: {:?}, additional images: {:?}", 
-    request.snapshot_media_token, request.maybe_additional_images);
+  info!("image_generation_command called; scene media token: {:?}, additional images: {:?}, full request: {:?}", 
+    &request.snapshot_media_token, &request.maybe_additional_images, &request);

  // TODO(bt,2025-04-24): Better error messages to caller

@@ -240,6 +252,14 @@ pub async fn generate_image(
    sora_media_tokens.push(response.id);
  }

+  let aspect_ratio = request.aspect_ratio.unwrap_or(DEFAULT_ASPECT_RATIO);
+  
+  let aspect_ratio = match aspect_ratio {
+    SoraAspectRatio::Square => ImageSize::Square,
+    SoraAspectRatio::Wide => ImageSize::Wide,
+    SoraAspectRatio::Tall => ImageSize::Tall,
+  };
+
  info!("Calling image generation...");

  // TODO(bt,2025-04-21): Download media tokens.
@@ -250,7 +270,7 @@ pub async fn generate_image(
      image_remix_with_session_auto_renew(ImageRemixAutoRenewRequest {
        prompt: request.prompt.to_string(),
        num_images: NumImages::One,
-        image_size: ImageSize::Square,
+        image_size: aspect_ratio,
        sora_media_tokens: sora_media_tokens.clone(),
        credentials: &creds,
        request_timeout: Some(SORA_IMAGE_REMIX_TIMEOUT),
@@ -1,9 +1,9 @@
-use crate::commands::app_preferences::get_app_preferences_command::AppPreferencesPayload;
-use crate::commands::command_response_wrapper::{CommandResult, CommandSuccessResponseWrapper, SimpleCommandResult};
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::sora::sora_credential_manager::SoraCredentialManager;
-use crate::windows::sora_login_window::open_sora_login_window::open_sora_login_window;
+use crate::core::commands::app_preferences::get_app_preferences_command::AppPreferencesPayload;
+use crate::core::commands::command_response_wrapper::{CommandResult, CommandSuccessResponseWrapper, SimpleCommandResult};
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::core::state::app_preferences::app_preferences_manager::AppPreferencesManager;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::services::sora::windows::sora_login_window::open_sora_login_window::open_sora_login_window;
 use errors::{AnyhowError, AnyhowResult};
 use log::{error, info};
 use once_cell::sync::Lazy;
@@ -1,4 +1,4 @@
-use crate::events::sendable_event_trait::SendableEvent;
+use crate::core::events::sendable_event_trait::SendableEvent;
 use serde_derive::Serialize;

 #[derive(Debug, Clone, Serialize)]
@@ -1,4 +1,4 @@
-use crate::events::sendable_event_trait::SendableEvent;
+use crate::core::events::sendable_event_trait::SendableEvent;
 use serde_derive::Serialize;

 #[derive(Debug, Clone, Serialize)]
@@ -1,6 +1,6 @@
 use serde_derive::Serialize;
 use tokens::tokens::media_files::MediaFileToken;
-use crate::events::sendable_event_trait::SendableEvent;
+use crate::core::events::sendable_event_trait::SendableEvent;

 #[derive(Debug, Clone, Serialize)]
 pub struct SoraImageGenerationCompleteEvent {
@@ -1,5 +1,5 @@
 use serde_derive::Serialize;
-use crate::events::sendable_event_trait::SendableEvent;
+use crate::core::events::sendable_event_trait::SendableEvent;

 #[derive(Debug, Clone, Serialize)]
 pub struct SoraImageGenerationFailedEvent {
@@ -1,4 +1,4 @@
-use crate::events::sendable_event_trait::SendableEvent;
+use crate::core::events::sendable_event_trait::SendableEvent;
 use serde_derive::Serialize;

 #[derive(Debug, Clone, Serialize)]
@@ -0,0 +1,5 @@
+pub mod commands;
+pub mod events;
+pub mod state;
+pub mod threads;
+pub mod windows;
@@ -1,4 +1,4 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use anyhow::anyhow;
 use errors::AnyhowResult;
 use log::info;
@@ -1,3 +1,4 @@
+pub mod initialize_sora_jwt_bearer_token;
 pub mod read_sora_credentials_from_disk;
 pub mod read_sora_credentials_from_disk_with_upgrade;
 pub mod sora_credential_holder;
@@ -1,4 +1,4 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use anyhow::anyhow;
 use errors::AnyhowResult;
 use openai_sora_client::creds::sora_cookies::SoraCookies;
@@ -1,4 +1,4 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use anyhow::anyhow;
 use errors::AnyhowResult;
 use log::{info, warn};
@@ -1,7 +1,7 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::sora::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
-use crate::state::sora::sora_credential_holder::SoraCredentialHolder;
-use crate::state::sora::sora_credential_stats::SoraCredentialStats;
+use crate::services::sora::state::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
+use crate::services::sora::state::sora_credential_holder::SoraCredentialHolder;
+use crate::services::sora::state::sora_credential_stats::SoraCredentialStats;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use anyhow::anyhow;
 use errors::AnyhowResult;
 use log::{error, info, warn};
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Brandon Thomas	921e58a308	build info as a crate	2025-05-24 21:23:14 -04:00
CrossPr0duct	65531dc63e	Removed video VideoProcessor and timeline saving and save manager timeline work and ammo.js	2025-05-23 18:18:40 -04:00
CrossPr0duct	0b60835bbc	Added some todos to move components. need to fix some todos.	2025-05-23 16:52:10 -04:00
CrossPr0duct	cca897d24d	Remove the Wizard	2025-05-23 16:27:41 -04:00
CrossPr0duct	ea76917264	Replace the button component with the shared one.	2025-05-23 16:15:13 -04:00
CrossPr0duct	fc824a10ae	Removing not needed files and components.	2025-05-23 14:34:23 -04:00
Michael Chung	0ee9b7c442	fix: remove DialogTitle from DialogEditText	2025-05-23 11:33:48 -04:00
bflatastic	17495276e7	Refactor GalleryModal refresh logic and add refresh button - Simplified the refresh logic by extracting it into a separate `refreshGallery` function. - Added a refresh button with a tooltip to allow users to manually refresh the gallery items. - Updated the useEffect to call the new refresh function when the modal opens, ensuring the gallery is always up-to-date.	2025-05-23 20:47:29 +07:00
bflatastic	2d78fd5a6f	library always refreshed on open	2025-05-23 20:39:40 +07:00
BFlat	98e513e917	gallery dnd code refactor (#630 ) - cleaner code + reusable image drop function for later 2d image drop implementation	2025-05-23 09:21:43 +07:00
ArEnScandMichael Chung	97eb1c65ca	Fix cors allow all urls for now, since there isn't really a way to ha… (#628 ) …ck the app lol. Co-authored-by: Michael Chung <michaelchung@mac.home>	2025-05-22 18:43:59 -04:00
bflatastic	ba82a438dd	image not dropping at correct position fix	2025-05-23 02:11:54 +07:00
bflatastic	de7b990ec5	bug fix: select mode library modal not closing on X click	2025-05-23 01:35:50 +07:00
BFlat	7b90c59675	library modal signals bug fix (#627 ) - fixed weird behavior with library modal not opening - image drag and drop more accurate position (production drag and drop still doesnt work - looking into it)	2025-05-23 01:31:49 +07:00
Brandon Thomas	11f1a5f41a	sora aspect ratios (#626 )	2025-05-22 00:09:59 -04:00
BFlat	b92cd58f81	Enhance GalleryModal UX with Filters, Drag-and-Drop, Pagination, and UI Improvements (#625 ) ✨ Features & Enhancements: - GalleryModal Filters: Replaced tab-based navigation with a more scalable filter system. - Image Fit Toggle: Allows toggling image fit display mode for better previewing. - Pagination & Infinite Scroll: Improved item loading performance using soft refresh and infinite scroll logic. - Drag-and-drop setup for gallery items - Prevented dragging for video items - Added support for image drop in PageEditor (3D) - "My Library" Label Updates	2025-05-21 23:29:06 +07:00
Brandon Thomas	914c26b4c6	classify gateway timeout	2025-05-21 11:04:32 -04:00
Brandon Thomas	fe8939a0f6	incomplete runwayml implementation (pausing for now) (#624 )	2025-05-20 23:39:34 -04:00
Tanish Manku	c809ff88fa	Add save/load support for character poses (#623 )	2025-05-20 20:13:04 -04:00
bflatastic	86675568a8	Update modal components for improved drag functionality and styling - Increased the height of the drag handle in AssetModal and GalleryModal for better usability. - Adjusted z-index properties for elements within AssetModal to ensure proper layering. - Enhanced the modal's drag behavior to allow overflow beyond viewport edges, improving user experience when repositioning.	2025-05-21 02:32:20 +07:00
bflatastic	a8927cc78d	Refactor expand button in modal component for improved styling and functionality - Updated the ExpandButton component to accept size props for better responsiveness. - Replaced SVG icons with FontAwesome icons for a more consistent design. - Adjusted the GalleryModal layout to include a gap between buttons for enhanced usability.	2025-05-21 02:17:17 +07:00
bflatastic	0e8dd19ecf	Enhance modal functionality with draggable support and expand button - Added draggable functionality to the modal, allowing users to reposition it. - Introduced an expand button to toggle full-screen mode for the modal. - Updated modal backdrop to support interaction options and improved styling. - Adjusted AssetModal and GalleryModal components to utilize new modal features.	2025-05-21 02:06:51 +07:00
bflatastic	b32a2e79b9	promptbox height bug fix	2025-05-20 22:47:38 +07:00
bflatastic	a662c5809d	lightbox videos fix	2025-05-20 22:31:27 +07:00
Michael Chung	7498720674	Fixing the gallery modal to show videos and images.	2025-05-20 11:14:36 -04:00
ArEnScandMichael Chung	c8a4490b52	Feature/add to scene video 2 (#621 ) Co-authored-by: Michael Chung <michaelchung@michaels-mbp-2.home>	2025-05-20 09:22:46 -04:00
Brandon Thomas	c4e30e6dc7	swap out the background (#620 )	2025-05-19 23:01:33 -04:00
ArEnScandMichael Chung	12070f14ad	Feature/add to scene video 2 (#619 ) Adding videos to scene via signal. --------- Co-authored-by: Michael Chung <michaelchung@michaels-mbp-2.home>	2025-05-19 02:19:31 -04:00
BFlat	77a103de06	gallery videos tab (#617 ) - 16/9 ratio grid items - lightbox for videos will only show download button	2025-05-19 10:58:34 +07:00
BFlat	82f5805f24	image-to-video generation page with background gallery and UI components (#616 )	2025-05-19 09:51:52 +07:00
ArEnSc Michael Chung Michael Chung	f7c9ebfaa3	Feature/video addition (#615 ) Co-authored-by: Michael Chung <michaelchung@Michaels-MacBook-Pro-2.local> Co-authored-by: Michael Chung <michaelchung@michaels-mbp-2.home>	2025-05-18 20:38:12 -04:00
Brandon Thomas	76cd00cc13	add fal hunyuan image-to-3d (#614 )	2025-05-18 15:37:55 -04:00
Brandon Thomas	cb64f45b48	refactor artcraft crates to organize by service (module reorg) (#613 )	2025-05-18 00:53:00 -04:00
Brandon Thomas	6751ab0b60	fal video integration (#612 )	2025-05-17 19:47:40 -04:00
ArEnScandMichael Chung	9827a3efc5	Feature/add scene (#611 ) Co-authored-by: Michael Chung <michaelchung@michaels-mbp-2.home>	2025-05-15 22:09:38 -04:00
Brandon Thomas	93b53d84cd	remove some dead code + fix missing "dev" assets (#610 )	2025-05-15 18:32:03 -04:00
Brandon Thomas	a7794f6338	don't need to build for editor2d anymore	2025-05-15 17:20:56 -04:00
ArEnScandMichael Chung	ef03e292c3	Add scene to 2d Lightbox modal. (#609 ) Co-authored-by: Michael Chung <michaelchung@michaels-mbp-2.home>	2025-05-14 12:11:19 -04:00
BFlat	0e8c1fa3e7	Update landing2 mobile videos fix	2025-05-14 12:07:07 +07:00
BFlat	af08834de7	artcraft landing 2 (#608 )	2025-05-14 02:28:05 +07:00
Brandon Thomas	e728806c04	more csp fixes	2025-05-13 14:18:29 -04:00
Brandon Thomas	3e605e7b18	add google analytics to CSP	2025-05-13 14:03:31 -04:00
Brandon Thomas	d244524abc	fal api integration in tauri + frontend controls + background removal (#607 )	2025-05-13 13:12:49 -04:00
bflatastic	8e455e27a9	fixed: Artcraft login in onboarding shown when already logged into Artcraft	2025-05-13 11:55:44 +07:00