Merge branch 'main' into feature/rtren

Fix resize attribute not working properly on Textareas
Crudely position the prompt slider and textarea
2026-10-26 11:49:30 -04:00 · 2025-02-14 14:11:17 -05:00 · 2025-02-14 04:30:34 -08:00 · 2025-02-14 04:30:10 -08:00 · 2025-02-14 04:29:51 -08:00 · 2025-02-14 03:50:28 -08:00
10385 changed files with 2604 additions and 1922824 deletions
@@ -1,4 +1,4 @@
-hakari-package = "workspace-build-acceleration"
+hakari-package = "my-workspace-hack"

 resolver = "1"

@@ -11,4 +11,4 @@ platforms = [
    "x86_64-pc-windows-msvc",
 ]

-exact-versions = true
+exact-versions = true
@@ -32,9 +32,6 @@ target/
 crates/lib/database_queries/target/
 crates/lib/sqlite_queries/target/

-# Javascript build directories
-node_modules/
-
 # Vim noise
 *.swo
 *.swp
@@ -69,7 +66,3 @@ scraps/
 # These should be built by the platform
 windows/sqlite/sqlite3.exp
 windows/sqlite/sqlite3.lib
-
-# ArtCraft Windows DLLs
-crates/desktop/src-tauri/*.dll
-windows_dlls/
@@ -2,7 +2,6 @@
  <dictionary name="bt">
    <words>
      <w>arpabet</w>
-      <w>artcraft</w>
      <w>backfill</w>
      <w>backfilling</w>
      <w>backfills</w>
@@ -32,7 +31,6 @@
      <w>hifigan</w>
      <w>hparams</w>
      <w>huggingface</w>
-      <w>kasisnu</w>
      <w>lipsync</w>
      <w>mocap</w>
      <w>mochi</w>
@@ -49,7 +47,6 @@
      <w>techcrunch</w>
      <w>transcoded</w>
      <w>transcodings</w>
-      <w>unet</w>
      <w>unpermitted</w>
      <w>upserting</w>
      <w>upserts</w>
@@ -1,8 +1,6 @@
 [workspace]
 resolver = "2"

-# This block defines the workspace members.
-# When we add a library or binary crate, it needs an entry here.
 members = [
  # Types: common strongly-typed tokens, ids, payloads, etc.
  "crates/_types/composite_identifiers",
@@ -24,8 +22,7 @@ members = [
  "crates/cli/production/migration-tool",

  # Desktop apps
-  "crates/desktop/tauri-4o",
-  "crates/desktop/tauri-realtime",
+  "crates/desktop/src-tauri",

  # Shared libraries
  "crates/lib/actix_cors_configs",
@@ -33,7 +30,6 @@ members = [
  "crates/lib/api_clients/cloud_storage",
  "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/thumbnail_generator",
  "crates/lib/bootstrap",
  "crates/lib/bucket_paths",
@@ -60,20 +56,16 @@ members = [
  "crates/lib/files/mimetypes",
  "crates/lib/files/videos",
  "crates/lib/idempotency",
-  "crates/lib/image_algorithms",
  "crates/lib/jobs_common",
  "crates/lib/logging",
-  "crates/lib/machine_learning/ml_models",
-  "crates/lib/machine_learning/ml_weights_registry",
-  "crates/lib/machine_learning/prompt_engineering",
  "crates/lib/markdown",
  "crates/lib/migration",
  "crates/lib/mysql_queries",
  "crates/lib/password",
+  "crates/lib/prompt_engineering",
  "crates/lib/redis_common",
  "crates/lib/redis_schema",
  "crates/lib/server_environment",
-  "crates/lib/shared_service_components",
  "crates/lib/sqlx_mysql_helpers",
  "crates/lib/storyteller_root",
  "crates/lib/subprocess_common",
@@ -104,57 +96,11 @@ members = [
  "crates/service/plugins/user_traits_component",

  # Vendored code
-  "crates/vendor/candle/candle-core",
-  "crates/vendor/candle/candle-datasets",
-  "crates/vendor/candle/candle-examples",
-  "crates/vendor/candle/candle-flash-attn",
-  "crates/vendor/candle/candle-kernels",
-  "crates/vendor/candle/candle-metal-kernels",
-  "crates/vendor/candle/candle-nn",
-  "crates/vendor/candle/candle-onnx",
-  "crates/vendor/candle/candle-pyo3",
-  "crates/vendor/candle/candle-transformers",
-  "crates/vendor/candle/tensor-tools",
  "crates/vendor/limitation",
  # NB(bt,2023-12-12): Newrelic keeps breaking with upgrades. Kill for now.
  #"crates/vendor/newrelic-telemetry-sdk-rust", 

  # cargo-hakari workspace hack (compilation speedup hack)
  # see usage: https://crates.io/crates/cargo-hakari
-  "crates/workspace-build-acceleration",
+  "crates/my-workspace-hack",
 ]
-
-[workspace.package]
-# Common inheritable settings for monorepo packages
-publish = false
-
-[workspace.dependencies]
-# Hakari workspace hack (faster compile times)
-workspace-build-acceleration = { path = "crates/workspace-build-acceleration" }
-
-# External libs
-# Centrally pinned versions so that we can uniformly upgrade/downgrade versions across the workspace
-# If a crate needs to use an older/newer version, the dependency should be managed in that crate's own Cargo.toml
-anyhow = "1.0.97"
-chrono = { version = "0.4.40", features = ["serde"] }
-log = "0.4.27"
-once_cell = "1.21.3"
-rand = "0.9.0"
-regex = "1.11.1"
-reqwest = { version = "0.12.15", features = ["json", "cookies"] }
-serde = {  version = "1.0.219", features = ["derive"] }
-serde_derive = "1.0.219"
-serde_json = "1.0.140"
-serde_yaml = "0.9.1"
-toml = "0.7.4"
-url = "2.5.4"
-
-# Internal libs
-crockford = { path = "crates/lib/data/crockford" }
-errors = { path = "crates/lib/errors" }
-filesys = { path = "crates/lib/files/filesys" }
-memory_caching = { path = "crates/lib/caching/memory_caching" }
-shared_service_components = { path = "crates/lib/shared_service_components" }
-openai_sora_client = { path = "crates/lib/api_clients/openai_sora_client" }
-primitives = { path = "crates/lib/data/primitives" }
-subprocess_common = { path = "crates/lib/subprocess_common" }
@@ -1,8 +0,0 @@
-image_width: 1024
-image_height: 1024
-#scheduler_steps: 15
-# NB(bt): It looks like we can get down to 2 sampling steps, perhaps ?
-scheduler_steps: 8
-scheduler_samples: 1
-cfg_scale: 15.0
-seed: 42
@@ -13,7 +13,7 @@ name = "composite_identifiers"
 path = "src/lib.rs"

 [package.metadata.cargo-udeps.ignore]
-normal = ["workspace-build-acceleration"]
+normal = ["my-workspace-hack"]

 [dependencies]
 # Internal
@@ -21,7 +21,7 @@ enums = { path = "../enums" }
 tokens = { path = "../tokens" }

 # Workspace hack (faster compile times)
-workspace-build-acceleration = { version = "0.1", path = "../../workspace-build-acceleration" }
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }

 # Serialization
 serde = "1.0.125"
@@ -13,13 +13,13 @@ name = "enums"
 path = "src/lib.rs"

 [package.metadata.cargo-udeps.ignore]
-normal = ["workspace-build-acceleration"]
+normal = ["my-workspace-hack"]

 [dependencies]
 # Internal

 # Workspace hack (faster compile times)
-workspace-build-acceleration = { version = "0.1", path = "../../workspace-build-acceleration" }
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }

 # Serialization
 serde = "1.0.125"
@@ -40,10 +40,6 @@ pub enum InferenceJobType {
  #[serde(rename = "studio_gen2")]
  StudioGen2,

-  /// Sora GPT 4o image gen
-  #[serde(rename = "image_gen_api")]
-  ImageGenApi,
-
  /// A job that turns "FBX" game engine files into "GLTF" files (Bevy-compatible).
  #[serde(rename = "convert_fbx_gltf")]
  ConvertFbxToGltf,
@@ -112,7 +108,6 @@ impl InferenceJobType {
      Self::GptSovits => "gpt_sovits",
      Self::ComfyUi => "comfy_ui",
      Self::StudioGen2 => "studio_gen2",
-      Self::ImageGenApi => "image_gen_api",
      Self::ConvertFbxToGltf => "convert_fbx_gltf",
      Self::MocapNet => "mocap_net",
      Self::RvcV2 => "rvc_v2",
@@ -137,7 +132,6 @@ impl InferenceJobType {
      "gpt_sovits" => Ok(Self::GptSovits),
      "comfy_ui" => Ok(Self::ComfyUi),
      "studio_gen2" => Ok(Self::StudioGen2),
-      "image_gen_api" => Ok(Self::ImageGenApi),
      "convert_fbx_gltf" => Ok(Self::ConvertFbxToGltf),
      "mocap_net" => Ok(Self::MocapNet),
      "rvc_v2" => Ok(Self::RvcV2),
@@ -165,7 +159,6 @@ impl InferenceJobType {
      Self::GptSovits,
      Self::ComfyUi,
      Self::StudioGen2,
-      Self::ImageGenApi,
      Self::ConvertFbxToGltf,
      Self::MocapNet,
      Self::RvcV2,
@@ -204,7 +197,6 @@ mod tests {
      assert_serialization(InferenceJobType::GptSovits, "gpt_sovits");
      assert_serialization(InferenceJobType::ComfyUi, "comfy_ui");
      assert_serialization(InferenceJobType::StudioGen2, "studio_gen2");
-      assert_serialization(InferenceJobType::ImageGenApi, "image_gen_api");
      assert_serialization(InferenceJobType::ConvertFbxToGltf, "convert_fbx_gltf");
      assert_serialization(InferenceJobType::MocapNet, "mocap_net");
      assert_serialization(InferenceJobType::RvcV2, "rvc_v2");
@@ -228,7 +220,6 @@ mod tests {
      assert_eq!(InferenceJobType::GptSovits.to_str(), "gpt_sovits");
      assert_eq!(InferenceJobType::ComfyUi.to_str(), "comfy_ui");
      assert_eq!(InferenceJobType::StudioGen2.to_str(), "studio_gen2");
-      assert_eq!(InferenceJobType::ImageGenApi.to_str(), "image_gen_api");
      assert_eq!(InferenceJobType::ConvertFbxToGltf.to_str(), "convert_fbx_gltf");
      assert_eq!(InferenceJobType::MocapNet.to_str(), "mocap_net");
      assert_eq!(InferenceJobType::RvcV2.to_str(), "rvc_v2");
@@ -252,7 +243,6 @@ mod tests {
      assert_eq!(InferenceJobType::from_str("gpt_sovits").unwrap(), InferenceJobType::GptSovits);
      assert_eq!(InferenceJobType::from_str("comfy_ui").unwrap(), InferenceJobType::ComfyUi);
      assert_eq!(InferenceJobType::from_str("studio_gen2").unwrap(), InferenceJobType::StudioGen2);
-      assert_eq!(InferenceJobType::from_str("image_gen_api").unwrap(), InferenceJobType::ImageGenApi);
      assert_eq!(InferenceJobType::from_str("convert_fbx_gltf").unwrap(), InferenceJobType::ConvertFbxToGltf);
      assert_eq!(InferenceJobType::from_str("mocap_net").unwrap(), InferenceJobType::MocapNet);
      assert_eq!(InferenceJobType::from_str("rvc_v2").unwrap(), InferenceJobType::RvcV2);
@@ -271,7 +261,7 @@ mod tests {
    fn all_variants() {
      // Static check
      let mut variants = InferenceJobType::all_variants();
-      assert_eq!(variants.len(), 17);
+      assert_eq!(variants.len(), 16);
      assert_eq!(variants.pop_first(), Some(InferenceJobType::VideoRender));
      assert_eq!(variants.pop_first(), Some(InferenceJobType::LivePortrait));
      assert_eq!(variants.pop_first(), Some(InferenceJobType::FaceFusion));
@@ -279,7 +269,6 @@ mod tests {
      assert_eq!(variants.pop_first(), Some(InferenceJobType::GptSovits));
      assert_eq!(variants.pop_first(), Some(InferenceJobType::ComfyUi));
      assert_eq!(variants.pop_first(), Some(InferenceJobType::StudioGen2));
-      assert_eq!(variants.pop_first(), Some(InferenceJobType::ImageGenApi));
      assert_eq!(variants.pop_first(), Some(InferenceJobType::ConvertFbxToGltf));
      assert_eq!(variants.pop_first(), Some(InferenceJobType::MocapNet));
      assert_eq!(variants.pop_first(), Some(InferenceJobType::RvcV2));
@@ -33,10 +33,6 @@ pub enum InferenceModelType {
  #[serde(rename = "seed_vc")]
  SeedVc,

-  /// NB: This is for Sora GPT 4o image gen
-  #[serde(rename = "image_gen_api")]
-  ImageGenApi,
-
  #[serde(rename = "tacotron2")]
  Tacotron2,
  #[serde(rename = "vits")]
@@ -74,7 +70,6 @@ impl InferenceModelType {
      Self::VallEX => "vall_e_x",
      Self::RerenderAVideo => "rerender_a_video",
      Self::StableDiffusion => "stable_diffusion",
-      Self::ImageGenApi => "image_gen_api",
      Self::SeedVc => "seed_vc",
      Self::MocapNet => "mocap_net",
      Self::StyleTTS2 => "styletts2",
@@ -95,7 +90,6 @@ impl InferenceModelType {
      "vall_e_x" => Ok(Self::VallEX),
      "rerender_a_video" => Ok(Self::RerenderAVideo),
      "stable_diffusion" => Ok(Self::StableDiffusion),
-      "image_gen_api" => Ok(Self::ImageGenApi),
      "mocap_net" => Ok(Self::MocapNet),
      "styletts2" => Ok(Self::StyleTTS2),
      "comfy_ui" => Ok(Self::ComfyUi),
@@ -119,7 +113,6 @@ impl InferenceModelType {
      Self::VallEX,
      Self::RerenderAVideo,
      Self::StableDiffusion,
-      Self::ImageGenApi,
      Self::MocapNet,
      Self::StyleTTS2,
      Self::ConvertFbxToGltf,
@@ -147,7 +140,6 @@ mod tests {
      assert_serialization(InferenceModelType::VallEX, "vall_e_x");
      assert_serialization(InferenceModelType::RerenderAVideo, "rerender_a_video");
      assert_serialization(InferenceModelType::StableDiffusion, "stable_diffusion");
-      assert_serialization(InferenceModelType::ImageGenApi, "image_gen_api");
      assert_serialization(InferenceModelType::MocapNet, "mocap_net");
      assert_serialization(InferenceModelType::ComfyUi, "comfy_ui");
      assert_serialization(InferenceModelType::StyleTTS2, "styletts2");
@@ -167,7 +159,6 @@ mod tests {
      assert_eq!(InferenceModelType::VallEX.to_str(), "vall_e_x");
      assert_eq!(InferenceModelType::RerenderAVideo.to_str(), "rerender_a_video");
      assert_eq!(InferenceModelType::StableDiffusion.to_str(), "stable_diffusion");
-      assert_eq!(InferenceModelType::ImageGenApi.to_str(), "image_gen_api");
      assert_eq!(InferenceModelType::MocapNet.to_str(), "mocap_net");
      assert_eq!(InferenceModelType::StyleTTS2.to_str(), "styletts2");
      assert_eq!(InferenceModelType::ConvertFbxToGltf.to_str(), "convert_fbx_gltf");
@@ -185,7 +176,6 @@ mod tests {
      assert_eq!(InferenceModelType::from_str("vall_e_x").unwrap(), InferenceModelType::VallEX);
      assert_eq!(InferenceModelType::from_str("rerender_a_video").unwrap(), InferenceModelType::RerenderAVideo);
      assert_eq!(InferenceModelType::from_str("stable_diffusion").unwrap(), InferenceModelType::StableDiffusion);
-      assert_eq!(InferenceModelType::from_str("image_gen_api").unwrap(), InferenceModelType::ImageGenApi);
      assert_eq!(InferenceModelType::from_str("mocap_net").unwrap(), InferenceModelType::MocapNet);
      assert_eq!(InferenceModelType::from_str("styletts2").unwrap(), InferenceModelType::StyleTTS2);
      assert_eq!(InferenceModelType::from_str("comfy_ui").unwrap(), InferenceModelType::ComfyUi);
@@ -197,18 +187,17 @@ mod tests {
    fn all_variants() {
      // Static check
      let mut variants = InferenceModelType::all_variants();
-      assert_eq!(variants.len(), 15);
+      assert_eq!(variants.len(), 13);
      assert_eq!(variants.pop_first(), Some(InferenceModelType::ComfyUi));
      assert_eq!(variants.pop_first(), Some(InferenceModelType::RvcV2));
      assert_eq!(variants.pop_first(), Some(InferenceModelType::SadTalker));
-      assert_eq!(variants.pop_first(), Some(InferenceModelType::SoVitsSvc));
      assert_eq!(variants.pop_first(), Some(InferenceModelType::SeedVc));
+      assert_eq!(variants.pop_first(), Some(InferenceModelType::SoVitsSvc));
      assert_eq!(variants.pop_first(), Some(InferenceModelType::Tacotron2));
      assert_eq!(variants.pop_first(), Some(InferenceModelType::Vits));
      assert_eq!(variants.pop_first(), Some(InferenceModelType::VallEX));
      assert_eq!(variants.pop_first(), Some(InferenceModelType::RerenderAVideo));
      assert_eq!(variants.pop_first(), Some(InferenceModelType::StableDiffusion));
-      assert_eq!(variants.pop_first(), Some(InferenceModelType::ImageGenApi));
      assert_eq!(variants.pop_first(), Some(InferenceModelType::MocapNet));
      assert_eq!(variants.pop_first(), Some(InferenceModelType::StyleTTS2));
      assert_eq!(variants.pop_first(), Some(InferenceModelType::ConvertFbxToGltf));
@@ -57,9 +57,6 @@ pub enum MediaFileOriginModelType {
  #[serde(rename = "studio")]
  StorytellerStudio,

-  #[serde(rename = "studio_ig")]
-  StorytellerStudioImageGen,
-
  #[serde(rename = "vst")]
  VideoStyleTransfer,

@@ -96,7 +93,6 @@ impl MediaFileOriginModelType {
      Self::MocapNet => "mocap_net",
      Self::StyleTTS2 => "styletts2",
      Self::StableDiffusion15 => "stable_diffusion_1_5",
-      Self::StorytellerStudioImageGen => "studio_ig",
      Self::GptSovits => "gpt_sovits",
      Self::StorytellerStudio => "studio",
      Self::VideoStyleTransfer => "vst",
@@ -119,7 +115,6 @@ impl MediaFileOriginModelType {
      "mocap_net" => Ok(Self::MocapNet),
      "styletts2" => Ok(Self::StyleTTS2),
      "stable_diffusion_1_5" => Ok(Self::StableDiffusion15),
-      "studio_ig" => Ok(Self::StorytellerStudioImageGen),
      "gpt_sovits" => Ok(Self::GptSovits),
      "studio" => Ok(Self::StorytellerStudio),
      "vst" => Ok(Self::VideoStyleTransfer),
@@ -147,7 +142,6 @@ impl MediaFileOriginModelType {
      Self::StableDiffusion15,
      Self::GptSovits,
      Self::StorytellerStudio,
-      Self::StorytellerStudioImageGen,
      Self::VideoStyleTransfer,
      Self::ComfyUi,
      Self::VallEX,
@@ -13,11 +13,11 @@ name = "enums_public"
 path = "src/lib.rs"

 [package.metadata.cargo-udeps.ignore]
-normal = ["workspace-build-acceleration"]
+normal = ["my-workspace-hack"]

 [dependencies]
 # Workspace hack (faster compile times)
-workspace-build-acceleration = { version = "0.1", path = "../../workspace-build-acceleration" }
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }

 # Internal
 enums = { path = "../enums" }
@@ -91,10 +91,6 @@ pub enum PublicInferenceJobType {
  /// Re-render a video is a video style transfer algorithm. We developed code
  /// around it, but chose to develop AnimateDiff / ComfyUI support instead.
  RerenderAVideo,
-
-  /// Sora GPT 4o image gen
-  #[serde(rename = "image_gen_api")]
-  ImageGenApi,
 }

 /// NB: Legacy API for older code.
@@ -123,7 +119,6 @@ impl PublicInferenceJobType {
      InferenceJobType::Unknown => Self::Unknown,
      InferenceJobType::BevyToWorkflow => Self::BevyToWorkflow,
      InferenceJobType::RerenderAVideo => Self::RerenderAVideo,
-      InferenceJobType::ImageGenApi => Self::ImageGenApi,
    }
  }
  
@@ -145,7 +140,6 @@ impl PublicInferenceJobType {
      Self::SeedVc => InferenceJobType::SeedVc,
      Self::SoVitsSvc => InferenceJobType::SoVitsSvc,
      Self::StableDiffusion => InferenceJobType::StableDiffusion,
-      Self::ImageGenApi => InferenceJobType::ImageGenApi,
      Self::StyleTTS2 => InferenceJobType::StyleTTS2,
      Self::Tacotron2 => InferenceJobType::Tacotron2,
      Self::Unknown => InferenceJobType::Unknown,
@@ -64,10 +64,6 @@ pub enum PublicMediaFileModelType {
  #[serde(rename = "studio")]
  StorytellerStudio,

-  /// NB: This is GPT4o image generation
-  #[serde(rename = "studio_ig")]
-  StorytellerStudioImageGen,
-
  #[serde(rename = "vst")]
  VideoStyleTransfer,

@@ -93,7 +89,6 @@ impl PublicMediaFileModelType {
      MediaFileOriginModelType::LivePortrait => Self::FaceMirror,
      MediaFileOriginModelType::SadTalker => Self::FaceAnimator,
      MediaFileOriginModelType::StyleTTS2 => Self::VoiceDesigner,
-      MediaFileOriginModelType::StorytellerStudioImageGen => Self::StorytellerStudioImageGen,
      // Conserved variants
      MediaFileOriginModelType::RvcV2 => Self::RvcV2,
      MediaFileOriginModelType::SoVitsSvc => Self::SoVitsSvc,
@@ -118,7 +113,6 @@ impl PublicMediaFileModelType {
      Self::FaceAnimator => MediaFileOriginModelType::SadTalker,
      Self::Lipsync => MediaFileOriginModelType::FaceFusion,
      Self::VoiceDesigner => MediaFileOriginModelType::StyleTTS2,
-      Self::StorytellerStudioImageGen => MediaFileOriginModelType::StorytellerStudioImageGen,
      // Conserved variants
      Self::RvcV2 => MediaFileOriginModelType::RvcV2,
      Self::SoVitsSvc => MediaFileOriginModelType::SoVitsSvc,
@@ -13,7 +13,7 @@ name = "reusable_types"
 path = "src/lib.rs"

 [package.metadata.cargo-udeps.ignore]
-normal = ["workspace-build-acceleration"]
+normal = ["my-workspace-hack"]

 [dependencies]

@@ -21,7 +21,7 @@ normal = ["workspace-build-acceleration"]
 # (none)

 # Workspace hack (faster compile times)
-workspace-build-acceleration = { version = "0.1", path = "../../workspace-build-acceleration" }
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }

 # External
 chrono = { version = "0.4.22", features = ["serde"] }
@@ -13,7 +13,7 @@ name = "tokens"
 path = "src/lib.rs"

 [package.metadata.cargo-udeps.ignore]
-normal = ["workspace-build-acceleration"]
+normal = ["my-workspace-hack"]

 [dependencies]

@@ -21,7 +21,7 @@ normal = ["workspace-build-acceleration"]
 # (none)

 # Workspace hack (faster compile times)
-workspace-build-acceleration = { version = "0.1", path = "../../workspace-build-acceleration" }
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }

 # Serialization
 serde = "1.0.125"
@@ -13,7 +13,7 @@ name = "dev-database-seed"
 path = "src/main.rs"

 [package.metadata.cargo-udeps.ignore]
-normal = ["workspace-build-acceleration"]
+normal = ["my-workspace-hack"]

 [dependencies]
 # Internal
@@ -32,7 +32,7 @@ storyteller_root = { path = "../../../lib/storyteller_root" }
 tokens = { path = "../../../_types/tokens" }

 # Workspace hack (faster compile times)
-workspace-build-acceleration = { version = "0.1", path = "../../../workspace-build-acceleration" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }

 # External
 log = "0.4.14"
@@ -13,7 +13,7 @@ name = "dev-upload-media-file"
 path = "src/main.rs"

 [package.metadata.cargo-udeps.ignore]
-normal = ["workspace-build-acceleration"]
+normal = ["my-workspace-hack"]

 [dependencies]
 # Internal
@@ -29,7 +29,7 @@ mysql_queries = { path = "../../../lib/mysql_queries" }
 tokens = { path = "../../../_types/tokens" }

 # Workspace hack (faster compile times)
-workspace-build-acceleration = { version = "0.1", path = "../../../workspace-build-acceleration" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }

 # External
 clap = "4.4.8"
@@ -13,7 +13,7 @@ name = "scrape-test"
 path = "src/main.rs"

 [package.metadata.cargo-udeps.ignore]
-normal = ["workspace-build-acceleration"]
+normal = ["my-workspace-hack"]

 [dependencies]

@@ -22,7 +22,7 @@ errors = { path = "../../../lib/errors" }
 web_scrapers = { path = "../../../lib/web_scrapers" }

 # Workspace hack (faster compile times)
-workspace-build-acceleration = { version = "0.1", path = "../../../workspace-build-acceleration" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }

 # External
 clap = "4.4.8"
@@ -13,11 +13,11 @@ name = "db-backfill"
 path = "src/main.rs"

 [package.metadata.cargo-udeps.ignore]
-normal = ["workspace-build-acceleration"]
+normal = ["my-workspace-hack"]

 [dependencies]
 # Workspace hack (faster compile times)
-workspace-build-acceleration = { version = "0.1", path = "../../../workspace-build-acceleration" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }

 # Internal
 datetimes = { path = "../../../lib/data/datetimes" }
@@ -13,7 +13,7 @@ name = "db-backup"
 path = "src/main.rs"

 [package.metadata.cargo-udeps.ignore]
-normal = ["workspace-build-acceleration"]
+normal = ["my-workspace-hack"]

 [dependencies]
 # Internal
@@ -21,7 +21,7 @@ easyenv = { path = "../../../lib/easyenv" }
 errors = { path = "../../../lib/errors" }

 # Workspace hack (faster compile times)
-workspace-build-acceleration = { version = "0.1", path = "../../../workspace-build-acceleration" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }

 # External
 anyhow = "1.0.86"
@@ -13,7 +13,7 @@ name = "db-cleanup"
 path = "src/main.rs"

 [package.metadata.cargo-udeps.ignore]
-normal = ["workspace-build-acceleration"]
+normal = ["my-workspace-hack"]

 [dependencies]
 # Internal
@@ -26,7 +26,7 @@ storyteller_root = { path = "../../../lib/storyteller_root" }
 tokens = { path = "../../../_types/tokens" }

 # Workspace hack (faster compile times)
-workspace-build-acceleration = { version = "0.1", path = "../../../workspace-build-acceleration" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }

 # External
 clap = "4.4.8"
@@ -13,7 +13,7 @@ name = "elasticsearch-cli"
 path = "src/main.rs"

 [package.metadata.cargo-udeps.ignore]
-normal = ["workspace-build-acceleration"]
+normal = ["my-workspace-hack"]

 [dependencies]
 # Internal
@@ -29,7 +29,7 @@ storyteller_root = { path = "../../../lib/storyteller_root" }
 tokens = { path = "../../../_types/tokens" }

 # Workspace hack (faster compile times)
-workspace-build-acceleration = { version = "0.1", path = "../../../workspace-build-acceleration" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }

 # External
 clap = "4.4.8"
@@ -13,7 +13,7 @@ name = "kubectl-pod-cleanup"
 path = "src/main.rs"

 [package.metadata.cargo-udeps.ignore]
-normal = ["workspace-build-acceleration"]
+normal = ["my-workspace-hack"]

 [dependencies]
 # Internal
@@ -22,7 +22,7 @@ easyenv = { path = "../../../lib/easyenv" }
 errors = { path = "../../../lib/errors" }

 # Workspace hack (faster compile yytimes)
-workspace-build-acceleration = { version = "0.1", path = "../../../workspace-build-acceleration" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }

 # External
 log = "0.4.20"
@@ -13,7 +13,7 @@ name = "lru-delete-models"
 path = "src/main.rs"

 [package.metadata.cargo-udeps.ignore]
-normal = ["workspace-build-acceleration"]
+normal = ["my-workspace-hack"]

 [dependencies]
 # Internal
@@ -21,7 +21,7 @@ errors = { path = "../../../lib/errors" }
 logging = { path = "../../../lib/logging" }

 # Workspace hack (faster compile times)
-workspace-build-acceleration = { version = "0.1", path = "../../../workspace-build-acceleration" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }

 # External
 clap = { version = "4.4.8", features = ["derive"] }
@@ -13,7 +13,7 @@ name = "migration-tool"
 path = "src/main.rs"

 [package.metadata.cargo-udeps.ignore]
-normal = ["workspace-build-acceleration"]
+normal = ["my-workspace-hack"]

 [dependencies]
 # Internal
@@ -30,7 +30,7 @@ storyteller_root = { path = "../../../lib/storyteller_root" }
 tokens = { path = "../../../_types/tokens" }

 # Workspace hack (faster compile times)
-workspace-build-acceleration = { version = "0.1", path = "../../../workspace-build-acceleration" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }

 # External
 clap = "4.4.8"
@@ -0,0 +1,28 @@
+[package]
+name = "app"
+version = "0.1.0"
+description = "A Tauri App"
+authors = ["you"]
+license = ""
+repository = ""
+edition = "2021"
+rust-version = "1.77.2"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+name = "app_lib"
+crate-type = ["staticlib", "cdylib", "rlib"]
+
+[build-dependencies]
+tauri-build = { version = "2.0.4", features = [] }
+
+[dependencies]
+serde_json = "1.0"
+serde = { version = "1.0", features = ["derive"] }
+log = "0.4"
+tauri = { version = "2.2.4", features = [] }
+tauri-plugin-log = "2.0.0-rc"
+once_cell = "1.20.3"
+image = "0.25.5"
+base64 = "0.22.1"
@@ -6,7 +6,6 @@
    "main"
  ],
  "permissions": [
-    "core:default",
-    "log:default"
+    "core:default"
  ]
-}
+}
@@ -1,11 +1,11 @@
-use base64::prelude::BASE64_STANDARD;
+use std::io::Cursor;
 use base64::Engine;
+use base64::prelude::{BASE64_STANDARD, BASE64_URL_SAFE};
 use image::codecs::png::{CompressionType, FilterType, PngEncoder};
 use image::ImageReader;
-use std::io::Cursor;

 #[tauri::command]
-pub fn flip_image(image: &str) -> Result<String, String> {
+pub fn infer_image(image: &str) -> Result<String, String> {
  println!("infer_image called; processing image...");

  let bytes = BASE64_STANDARD.decode(image)
@@ -18,19 +18,17 @@ pub fn flip_image(image: &str) -> Result<String, String> {
    .map_err(|err| format!("Image decode error: {}", err))?;

  let rotated_image = image.rotate180();
-
+  
  let mut buffer = Vec::new(); // TODO: Preallocate, better data structure
  let mut writer = Cursor::new(&mut buffer);
-
-  let encoder = PngEncoder::new_with_quality
-    (&mut writer, CompressionType::Fast, FilterType::Adaptive);
  
+  let encoder = PngEncoder::new_with_quality(&mut writer, CompressionType::Fast, FilterType::Adaptive);
  rotated_image.write_with_encoder(encoder)
    .map_err(|err| format!("Image encoding error: {}", err))?;

  let encoded = BASE64_STANDARD.encode(&buffer);
-
+  
  println!("Encoded: {:?}", encoded.split_at(10).0);
-
+  
  Ok(encoded)
 }
@@ -0,0 +1,55 @@
+mod image_endpoint;
+
+use std::sync::{Arc, RwLock};
+use once_cell::sync::Lazy;
+use image_endpoint::infer_image;
+
+#[cfg_attr(mobile, tauri::mobile_entry_point)]
+pub fn run() {
+  tauri::Builder::default()
+    .setup(|app| {
+      if cfg!(debug_assertions) {
+        app.handle().plugin(
+          tauri_plugin_log::Builder::default()
+            .level(log::LevelFilter::Info)
+            .build(),
+        )?;
+      }
+      Ok(())
+    })
+    .invoke_handler(tauri::generate_handler![
+      my_custom_command, 
+      test_round_trip, 
+      infer_image,
+    ])
+    .run(tauri::generate_context!())
+    .expect("error while running tauri application");
+}
+
+#[tauri::command]
+fn my_custom_command() {
+  println!("I was invoked from JavaScript!");
+}
+
+static COUNTER : Lazy<Arc<RwLock<u64>>> = Lazy::new(|| Arc::new(RwLock::new(0)));
+
+#[tauri::command]
+fn test_round_trip() -> u64 {
+  let value : u64;
+  {
+    match COUNTER.write() {
+      Ok(mut counter) => {
+        *counter += 1;
+        value = *counter;
+      },
+      Err(_e) => {
+        value = 0;
+      }
+    }
+  }
+
+  println!("I was invoked from JavaScript! {:?}", value);
+
+  value
+}
+
@@ -1,6 +1,6 @@
 {
  "$schema": "https://schema.tauri.app/config/2.0.0-rc",
-  "productName": "ArtCraft",
+  "productName": "Storyteller Desktop App",
  "version": "0.1.0",
  "identifier": "com.unique.value.thing.why",
  "build": {
@@ -12,9 +12,9 @@
  "app": {
    "windows": [
      {
-        "title": "ArtCraft",
-        "width": 2400,
-        "height": 1300,
+        "title": "Storyteller Desktop App Title Goes Here",
+        "width": 800,
+        "height": 600,
        "resizable": true,
        "fullscreen": false
      }
@@ -1,4 +0,0 @@
-# Don't restart the dev server on Rust changes
-crates/
-Cargo.toml
-Cargo.lock
@@ -1,74 +0,0 @@
-[package]
-name = "artcraft"
-version = "0.1.0"
-description = "Artcraft"
-authors = ["you"]
-license = ""
-repository = ""
-edition = "2021"
-rust-version = "1.77.2"
-publish = false
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[lib]
-name = "app_lib"
-crate-type = ["staticlib", "cdylib", "rlib"]
-
-[build-dependencies]
-tauri-build = { version = "2.1.1", features = [] }
-
-[dependencies]
-# Workspace hack (faster compile times)
-workspace-build-acceleration = { workspace =  true }
-
-# Internal
-crockford = { workspace = true }
-errors = { workspace = true }
-filesys = { workspace = true }
-memory_caching = { workspace = true }
-openai_sora_client = { workspace = true }
-primitives = { workspace = true }
-subprocess_common = { workspace = true }
-
-# External
-#openssl = { version = "0.10", features = ["vendored"] }
-# NB(bt,2025-03-10): default-features = false on Windows while I debug openssl / rustls
-anyhow = { workspace = true }
-base64 = "0.22.1"
-bytes = "1.10"
-chrono = { workspace = true }
-const_format = "0.2.34"
-directories = "6.0.0"
-dirs = "6.0.0"
-futures = "0.3"
-image = "0.25.5"
-log = { workspace = true }
-once_cell = { workspace = true }
-rand = { workspace = true }
-reqwest = { workspace = true, features = ["multipart", "stream"], default-features = false }
-serde = { workspace = true }
-serde_derive = { workspace = true }
-serde_json = { workspace = true }
-serde_yaml = { workspace = true }
-tauri = { version = "2.4.1", features = ["unstable"] }
-tauri-plugin-log = "2.3.1"
-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"] }
-
-[dev-dependencies]
-libloading = "0.8.6"
-serial_test = "3.2.0"
-assertor = "0.0.3"
-
-[profile.dev]
-incremental = true # Compile your binary in smaller steps.
-
-[profile.release]
-codegen-units = 1 # Allows LLVM to perform better optimization.
-lto = true # Enables link-time-optimizations.
-opt-level = 3 # `s` prioritizes small binary size. Use `3` if you prefer speed.
-panic = "abort" # Higher performance by disabling panic handlers.
-strip = true # Ensures debug symbols are removed.
@@ -1,12 +0,0 @@
-{
-  "$schema": "../gen/schemas/desktop-schema.json",
-  "identifier": "default",
-  "description": "enables the default permissions",
-  "windows": [
-    "main"
-  ],
-  "permissions": [
-    "core:default",
-    "log:default"
-  ]
-}
@@ -1,90 +0,0 @@
-use std::fs::read_to_string;
-use base64::prelude::BASE64_STANDARD;
-use errors::AnyhowResult;
-use base64::Engine;
-use image::codecs::png::{CompressionType, FilterType, PngEncoder};
-use image::{DynamicImage, ImageReader};
-use std::io::Cursor;
-use log::{error, info};
-use tauri::{AppHandle, Manager, State};
-use openai_sora_client::credentials::SoraCredentials;
-use openai_sora_client::image_gen::common::{ImageSize, NumImages};
-use openai_sora_client::image_gen::sora_image_gen_remix::{sora_image_gen_remix, SoraImageGenRemixRequest};
-use openai_sora_client::upload::upload_media_from_bytes::sora_media_upload_from_bytes;
-use openai_sora_client::upload::upload_media_from_file::SoraMediaUploadRequest;
-use crate::state::app_dir::AppDataRoot;
-
-#[tauri::command]
-pub async fn image_generation_command(
-  image: &str,
-  prompt: &str,
-  app: AppHandle,
-  app_data_root: State<'_, AppDataRoot>,
-) -> Result<String, String> {
-  info!("image_generation_command called; processing image...");
-
-  let bytes = BASE64_STANDARD.decode(image)
-    .map_err(|err| format!("Base64 decode error: {}", err))?;
-
-  generate_image(bytes, prompt, &app_data_root)
-    .await
-    .map_err(|err| {
-      error!("error: {:?}", err);
-      "there was an error".to_string()
-    })?;
-
-  Ok("success".to_string())
-}
-
-pub async fn generate_image(file_bytes: Vec<u8>, prompt: &str, app_data_root: &AppDataRoot) -> AnyhowResult<()> {
-  let sora_credentials = get_credentials(app_data_root)?;
-
-  let filename = "image.png".to_string();
-
-  let response= sora_media_upload_from_bytes(file_bytes, filename, &sora_credentials)
-      .await
-      .map_err(|err| {
-        error!("Failed to upload image to Sora: {:?}", err);
-        err
-      })?;
-
-  let sora_media_tokens = vec![response.id];
-
-  let response = sora_image_gen_remix(SoraImageGenRemixRequest {
-    prompt: prompt.to_string(),
-    num_images: NumImages::One,
-    image_size: ImageSize::Square,
-    sora_media_tokens: sora_media_tokens.clone(),
-    credentials: &sora_credentials,
-  }).await
-      .map_err(|err| {
-        error!("Failed to call Sora image generation: {:?}", err);
-        err
-      })?;
-
-  println!(">> TASK ID: {:?} ", response.task_id);
-
-  Ok(())
-}
-
-fn get_credentials(app_data_root: &AppDataRoot) -> AnyhowResult<SoraCredentials> {
-  let cookie_file = app_data_root.get_sora_cookie_file_path();
-
-  let bearer = read_to_string("/Users/bt/dev/storyteller/storyteller-rust/test_data/temp/bearer.txt")?
-      .trim()
-      .to_string();
-
-  let cookie= read_to_string(cookie_file)?
-      .trim()
-      .to_string();
-
-  let sentinel = read_to_string("/Users/bt/dev/storyteller/storyteller-rust/test_data/temp/sentinel.txt")?
-      .trim()
-      .to_string();
-
-  Ok(SoraCredentials {
-    bearer_token: bearer,
-    cookie: cookie,
-    sentinel: Some(sentinel),
-  })
-}
@@ -1,3 +0,0 @@
-pub mod flip_image;
-pub mod image_generation_command;
-pub mod open_login_command;
@@ -1,72 +0,0 @@
-use std::time::Duration;
-use log::{error, info};
-use once_cell::sync::Lazy;
-use tauri::{AppHandle, Manager, Url, WebviewUrl, WebviewWindowBuilder, WindowBuilder};
-use tokio::time::sleep_until;
-use errors::AnyhowResult;
-use crate::threads::login_thread::{LOGIN_WINDOW_NAME, SORA_LOGIN_URL};
-use crate::utils::clear_all_webview_cookies::clear_all_webview_cookies;
-
-pub const START_URL_STR: &str = "https://storyteller.ai/";
-
-pub static START_URL: Lazy<Url> = Lazy::new(|| {
-  Url::parse(START_URL_STR).expect("URL should parse")
-});
-
-pub const SORA_HOMEPAGE_URL_STR: &str = "https://sora.com/";
-
-pub static SORA_HOMEPAGE_URL : Lazy<Url> = Lazy::new(|| {
-  Url::parse(SORA_HOMEPAGE_URL_STR).expect("URL should parse")
-});
-
-#[tauri::command]
-pub async fn open_login_command(
-  app: AppHandle,
-) -> Result<String, String> {
-  info!("open_login_command called");
-
-  do_open_login(&app)
-    .await
-    .map_err(|err| {
-      error!("Error opening login: {:?}", err);
-      format!("Error opening login: {:?}", err)
-    })?;
-
-  Ok("result".to_string())
-}
-
-async fn do_open_login(app: &AppHandle) -> AnyhowResult<()> {
-  info!("Building login window...");
-
-  let url = WebviewUrl::External(START_URL.clone());
-
-  let window = WebviewWindowBuilder::new(app, LOGIN_WINDOW_NAME, url)
-      //.user_agent(openai_sora_client::credentials::USER_AGENT)
-      .always_on_top(true)
-      .title("Login to OpenAI")
-      .center()
-      .resizable(true)
-      .visible(true)
-      .closable(true)
-      .focused(true)
-      .devtools(true)
-      .build()?;
-
-  for (name, webview) in window.webviews() {
-    if name != LOGIN_WINDOW_NAME {
-      continue;
-    }
-
-    clear_all_webview_cookies(&webview)?;
-
-    // NB: We're starting to get Cloudflare protection screens. Let's try to avoid.
-    webview.navigate(SORA_HOMEPAGE_URL.clone())?;
-    tokio::time::sleep(Duration::from_millis(100)).await;
-
-    webview.navigate(SORA_LOGIN_URL.clone())?;
-    break;
-  }
-
-  info!("Done.");
-  Ok(())
-}
@@ -1 +0,0 @@
-pub mod notification_event;
@@ -1,45 +0,0 @@
-use serde::Serialize;
-
-#[derive(Clone, Copy, Serialize)]
-#[serde(rename_all = "snake_case")]
-pub enum NotificationModelType {
-  ImageSegmentation,
-  TextEncoder,
-  TextTokenizer,
-  Unet,
-  Vae,
-  Json,
-  ClipEncoder,
-  FluxModel,
-}
-
-#[derive(Clone, Serialize)]
-#[serde(rename_all = "snake_case")]
-pub enum NotificationEvent<'a> {
-  ModelDownloadStarted {
-    model_name: &'a str, 
-    model_type: NotificationModelType,
-  },
-  ModelDownloadProgress {
-    model_name: &'a str,
-    model_type: NotificationModelType,
-    currently_downloaded_bytes: usize,
-    total_file_bytes: usize,
-  },
-  ModelDownloadComplete {
-    model_name: &'a str,
-    model_type: NotificationModelType,
-  },
-  ModelLoading {
-    model_name: String,
-    model_type: NotificationModelType,
-  },
-  ModelInference {
-    model_name: String,
-    model_type: NotificationModelType,
-  },
-  ModelInferenceComplete {
-    model_name: String,
-    model_type: NotificationModelType,
-  },
-}
@@ -1,65 +0,0 @@
-pub mod commands;
-pub mod events;
-pub mod state;
-pub mod threads;
-pub mod transfer;
-pub mod utils;
-
-use crate::commands::flip_image::flip_image;
-use crate::commands::image_generation_command::image_generation_command;
-use crate::commands::open_login_command::open_login_command;
-use crate::state::app_config::AppConfig;
-use crate::threads::login_thread::login_thread;
-
-use tauri_plugin_log::Target;
-use tauri_plugin_log::TargetKind;
-
-#[cfg_attr(mobile, tauri::mobile_entry_point)]
-pub fn run() {
-  // NB: Tauri wants to install the logger itself, so we can't rely on the logger crate 
-  // until the tauri runtime begins.
-  println!("Loading model config...");
-
-  let config = AppConfig::init()
-    .expect("config should load");
-
-  let app_data_root = config.app_data_root.clone();
-  let app_data_root2 = config.app_data_root.clone();
-
-  println!("Initializing backend runtime...");
-
-  tauri::Builder::default()
-    .plugin(tauri_plugin_log::Builder::new()
-      .level(log::LevelFilter::Info)
-      .targets(vec![
-        Target::new(TargetKind::Stdout),
-        Target::new(TargetKind::LogDir { file_name: Some(app_data_root.log_file_name_str().to_string()) }),
-      ])
-      .build())
-    .setup(|app| {
-      // TODO(bt): This is broken on windows
-      // log_environment_details();
-
-      //if cfg!(debug_assertions) {
-      //  app.handle().plugin(
-      //    tauri_plugin_log::Builder::default()
-      //      .level(log::LevelFilter::Info)
-      //      .build(),
-      //  )?;
-      //}
-      let app = app.handle().clone();
-
-      tauri::async_runtime::spawn(login_thread(app, app_data_root2));
-
-      Ok(())
-    })
-    .manage(config)
-    .manage(app_data_root)
-    .invoke_handler(tauri::generate_handler![
-      flip_image,
-      image_generation_command,
-      open_login_command,
-    ])
-    .run(tauri::generate_context!("tauri.conf.json"))
-    .expect("error while running tauri application");
-}
@@ -1,58 +0,0 @@
-use crate::state::app_dir::AppDataRoot;
-use crate::state::os_platform::OsPlatform;
-use crate::state::yaml_config::YamlConfig;
-
-const DEFAULT_SD_IMAGE_WIDTH: usize = 1024;
-const DEFAULT_SD_IMAGE_HEIGHT: usize = 1024;
-
-
-/// A central place to configure app-wide details.
-pub struct AppConfig {
-  pub image_height: usize,
-  pub image_width: usize,
-  pub scheduler_steps: usize,
-  pub scheduler_samples: usize,
-  
-  pub seed: Option<u64>,
-
-  pub cfg_scale: Option<f64>,
-  
-  /// Root location for application data.
-  pub app_data_root: AppDataRoot,
-}
-
-impl AppConfig {
-  
-  pub fn init() -> anyhow::Result<Self> {
-    let yaml_configs = YamlConfig::load_from_config_file_recursive();
-    
-    println!("Configs: {:?}", yaml_configs);
-    
-    let os_platform = OsPlatform::get();
-
-    let default_data_root = match os_platform {
-      OsPlatform::Linux => yaml_configs.linux_default_data_path.as_deref(),
-      OsPlatform::MacOs => yaml_configs.mac_default_data_path.as_deref(),
-      OsPlatform::Windows => yaml_configs.windows_default_data_path.as_deref(),
-    };
-    
-    println!("Possible user-defined data root: {:?}", default_data_root);
-
-    let app_data_root = match default_data_root {
-      None => AppDataRoot::create_default()?,
-      Some(path) => AppDataRoot::create_existing(path)?,
-    };
-
-    println!("App data root: {:?}", app_data_root.path());
-
-    Ok(Self {
-      image_height: yaml_configs.image_height.unwrap_or(DEFAULT_SD_IMAGE_HEIGHT),
-      image_width: yaml_configs.image_width.unwrap_or(DEFAULT_SD_IMAGE_WIDTH),
-      scheduler_steps: yaml_configs.scheduler_steps.unwrap_or(4),
-      scheduler_samples: yaml_configs.scheduler_samples.unwrap_or(15),
-      seed: yaml_configs.seed,
-      cfg_scale: yaml_configs.cfg_scale,
-      app_data_root,
-    })
-  }
-}
@@ -1,219 +0,0 @@
-use crate::state::expanduser::expanduser;
-use crate::state::os_platform::OsPlatform;
-use anyhow::anyhow;
-use directories::UserDirs;
-use std::path::{Path, PathBuf};
-use chrono::{DateTime, Local};
-use tempdir::TempDir;
-use tempfile::{Builder, NamedTempFile};
-
-const DEFAULT_DATA_DIR : &str = "artcraft";
-const ASSETS_SUBDIRECTORY : &str = "assets";
-const WEIGHTS_SUBDIRECTORY : &str = "weights";
-
-const TEMPORARY_SUBDIRECTORY : &str = "temp";
-
-/// Note: Tauri appends ".log" to the end of the filename.
-const LOG_FILE_NAME : &str = "application_debug";
-
-/// The path to the application data directory, which includes "asset" and "weights" data.
-#[derive(Clone)]
-pub struct AppDataRoot {
-  path: PathBuf,
-  assets_dir: AppAssetsDir,
-  weights_dir: AppWeightsDir,
-  temp_dir: TemporaryDir,
-  log_file_name: PathBuf,
-  log_file_name_string: String,
-}
-
-#[derive(Clone)]
-pub struct AppAssetsDir {
-  path: PathBuf,
-}
-
-#[derive(Clone)]
-pub struct AppWeightsDir {
-  path: PathBuf,
-}
-
-#[derive(Clone)]
-pub struct TemporaryDir {
-  path: PathBuf,
-}
-
-impl AppDataRoot {
-  pub fn create_default() -> anyhow::Result<Self> {
-    let directory = get_default_data_dir()?;
-    Self::create_existing(directory)
-  }
-
-  pub fn create_existing<P: AsRef<Path>>(dir: P) -> anyhow::Result<Self> {
-    let mut dir = dir.as_ref().to_path_buf();
-    
-    match OsPlatform::get() {
-      OsPlatform::Linux | OsPlatform::MacOs => {
-        if let Some(d) = dir.as_os_str().to_str() {
-          dir = expanduser(d)?;
-        }
-      },
-      OsPlatform::Windows => {}
-    }
-    
-    if !dir.is_dir() {
-      println!("Creating directory {:?}", dir);
-      std::fs::create_dir_all(&dir)?;
-    }
-
-    match dir.canonicalize() {
-      Ok(d) => dir = d,
-      Err(err) => {
-        println!("Error canonicalizing {:?}: {}", dir, err);
-      }
-    }
-    
-    let assets_dir = AppAssetsDir::create_existing(dir.join(ASSETS_SUBDIRECTORY))?;
-    let weights_dir = AppWeightsDir::create_existing(dir.join(WEIGHTS_SUBDIRECTORY))?;
-    let temp_dir = TemporaryDir::create_existing(dir.join(TEMPORARY_SUBDIRECTORY))?;
-    let log_file_name = dir.join(LOG_FILE_NAME);
-    let log_file_name_string = log_file_name
-        .to_str()
-        .ok_or(anyhow!("couldn't convert log path to str"))?
-        .to_string();
-
-    Ok(Self {
-      path: dir,
-      assets_dir,
-      weights_dir,
-      temp_dir,
-      log_file_name,
-      log_file_name_string,
-    })
-  }
-  
-  pub fn assets_dir(&self) -> &AppAssetsDir {
-    &self.assets_dir
-  }
-  
-  pub fn weights_dir(&self) -> &AppWeightsDir {
-    &self.weights_dir
-  }
-
-  pub fn temp_dir(&self) -> &TemporaryDir {
-    &self.temp_dir
-  }
-
-  pub fn path(&self) -> &Path {
-    &self.path
-  }
-
-  pub fn log_file_name(&self) -> &Path {
-    &self.log_file_name
-  }
-
-  pub fn log_file_name_str(&self) -> &str {
-    &self.log_file_name_string
-  }
-
-  pub fn get_sora_cookie_file_path(&self) -> PathBuf {
-    self.path.join("sora_cookies.txt")
-  }
-}
-
-impl AppAssetsDir {
-  pub fn create_existing<P: AsRef<Path>>(dir: P) -> anyhow::Result<Self> {
-    let mut dir = dir.as_ref().to_path_buf();
-    match dir.canonicalize() {
-      Ok(d) => dir = d,
-      Err(err) => {
-        println!("Error canonicalizing {:?}: {}", dir, err);
-      }
-    }
-    if !dir.exists() {
-      println!("Creating directory {:?}", dir);
-      std::fs::create_dir(&dir)?;
-    }
-    Ok(Self {
-      path: dir,
-    })
-  }
-
-  pub fn path(&self) -> &Path {
-    &self.path
-  }
-  
-  /// Return the current date asset directory
-  /// If it doesn't exist, create it.
-  pub fn make_or_get_current_date_dir(&self) -> anyhow::Result<PathBuf> {
-    let format: DateTime<Local> = Local::now();
-    let date_directory_name = format.format("%Y-%d-%m").to_string();
-    let full_path = self.path.join(date_directory_name);
-    if !full_path.exists() {
-      std::fs::create_dir(&full_path)?;
-    }
-    Ok(full_path)
-  }
-}
-
-impl AppWeightsDir {
-  pub fn create_existing<P: AsRef<Path>>(dir: P) -> anyhow::Result<Self> {
-    let mut dir = dir.as_ref().to_path_buf();
-    match dir.canonicalize() {
-      Ok(d) => dir = d,
-      Err(err) => {
-        println!("Error canonicalizing {:?}: {}", dir, err);
-      }
-    }
-    if !dir.exists() {
-      println!("Creating directory {:?}", dir);
-      std::fs::create_dir(&dir)?;
-    }
-    Ok(Self {
-      path: dir,
-    })
-  }
-
-  pub fn path(&self) -> &Path {
-    &self.path
-  }
-}
-
-impl TemporaryDir {
-  pub fn create_existing<P: AsRef<Path>>(dir: P) -> anyhow::Result<Self> {
-    let mut dir = dir.as_ref().to_path_buf();
-    match dir.canonicalize() {
-      Ok(d) => dir = d,
-      Err(err) => {
-        println!("Error canonicalizing {:?}: {}", dir, err);
-      }
-    }
-    if !dir.exists() {
-      println!("Creating directory {:?}", dir);
-      std::fs::create_dir(&dir)?;
-    }
-    Ok(Self {
-      path: dir,
-    })
-  }
-
-  pub fn with_prefix(&self, prefix: &str) -> anyhow::Result<TempDir> {
-    let tempdir = TempDir::new_in(&self.path, prefix)?;
-    Ok(tempdir)
-  }
-
-  pub fn new_named_temp_file(&self) -> anyhow::Result<NamedTempFile> {
-    let tempfile = Builder::new()
-      .prefix("temp_")
-      .suffix(".bin")
-      .tempfile_in(&self.path)?;
-    Ok(tempfile)
-  }
-}
-
-// eg. /home/bob/artcraft, /Users/bob/artcraft, or C:\Users\Alice\artcraft
-fn get_default_data_dir() -> anyhow::Result<PathBuf> {
-  Ok(UserDirs::new()
-      .ok_or_else(|| anyhow!("could not determine user home directory"))?
-      .home_dir()
-      .join(DEFAULT_DATA_DIR))
-}
@@ -1,73 +0,0 @@
-use once_cell::sync::Lazy;
-use std::io;
-use std::path::{PathBuf, MAIN_SEPARATOR};
-
-static PREFIX: Lazy<String> = Lazy::new(|| format!("~{}", MAIN_SEPARATOR));
-
-/// The "expanduser" crate doesn't compile on Windows, so we replace its functionality slightly
-pub fn expanduser<P: AsRef<str>>(path: P) -> io::Result<PathBuf> {
-
-   Ok(match path.as_ref() {
-       // matches an exact "~"
-       s if s == "~" => {
-           home_dir()?
-       },
-       // matches paths that start with `~/`
-       s if s.starts_with(&*PREFIX) => {
-           let home = home_dir()?;
-           home.join(&s[2..])
-       },
-       // // matches paths that start with `~` but not `~/`, might be a `~username/` path
-       // s if s.starts_with("~") => {
-       //     let mut parts = s[1..].splitn(2, MAIN_SEPARATOR);
-       //     let user = parts.next()
-       //         .ok_or_else(|| io::Error::new(io::ErrorKind::Other, "malformed path"))?;
-       //     let user = Passwd::from_name(&user)
-       //         .map_err(|_| io::Error::new(io::ErrorKind::Other, "error searching for user"))?
-       //         .ok_or_else(|| io::Error::new(io::ErrorKind::Other, format!("user '{}', does not exist", &user)))?;
-       //     if let Some(ref path) = parts.next() {
-       //         PathBuf::from(user.dir).join(&path)
-       //     } else {
-       //         PathBuf::from(user.dir)
-       //     }
-       // },
-       // nothing to expand, just make a PathBuf
-       s => PathBuf::from(s)
-   })
-}
-
-pub fn home_dir() -> io::Result<PathBuf> {
-    dirs::home_dir()
-        .ok_or_else(|| io::Error::new(io::ErrorKind::Other, "no home directory is set"))
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::state::expanduser::expanduser;
-    use std::env;
-    use std::path::PathBuf;
-
-    #[test]
-    #[serial_test::serial]
-    fn test_success() {
-        let old_home = env::var("HOME").expect("no home dir set");
-        let new_home = "/home/foo";
-        env::set_var("HOME", new_home);
-        let path = expanduser("~/path/to/directory");
-        env::set_var("HOME", old_home);
-        assert_eq!(path.expect("io error"), PathBuf::from("/home/foo/path/to/directory"));
-    }
-
-    #[test]
-    #[serial_test::serial]
-    fn test_only_tilde() {
-        let old_home = env::var("HOME").expect("no home dir set");
-        let new_home = "/home/foo";
-        env::set_var("HOME", new_home);
-        let pathstr = "~";
-        let path = expanduser(pathstr);
-        env::set_var("HOME", old_home);
-        assert_eq!(path.expect("io error"), PathBuf::from("/home/foo"));
-    }
-
-}
@@ -1,5 +0,0 @@
-pub mod app_config;
-pub mod app_dir;
-pub mod os_platform;
-pub mod yaml_config;
-pub mod expanduser;
@@ -1,20 +0,0 @@
-
-#[derive(Copy,Clone,Eq,PartialEq,Debug)]
-pub enum OsPlatform {
-  Linux,
-  MacOs,
-  Windows,
-}
-
-impl OsPlatform {
-  pub fn get() -> OsPlatform {
-    // Totally scientific.
-    // https://doc.rust-lang.org/std/env/consts/constant.OS.html
-    match std::env::consts::OS {
-      "linux" => OsPlatform::Linux,
-      "windows" => OsPlatform::Windows,
-      "macos" | "apple" => OsPlatform::MacOs,
-      _ => OsPlatform::Linux,
-    }
-  }
-}
@@ -1,52 +0,0 @@
-use filesys::recursively_find_file_by_name::recursively_find_file_by_name;
-use std::fs::File;
-use std::io::BufReader;
-use std::path::Path;
-
-const CONFIG_FILENAME : &str = "app_config.yaml";
-
-/// Configuration read or derived from a YAML config file at startup
-/// This is not meant to contain any runtime config values.
-/// This may not be exhaustive.
-#[derive(serde::Deserialize, serde::Serialize, Clone, Debug, Default)]
-pub struct YamlConfig {
-  pub image_height: Option<usize>,
-  pub image_width: Option<usize>,
-  pub scheduler_steps: Option<usize>,
-  pub scheduler_samples: Option<usize>,
-  pub seed: Option<u64>,
-  pub cfg_scale: Option<f64>,
-
-  /// Override the default location to store data on Linux
-  pub linux_default_data_path: Option<String>,
-
-  /// Override the default location to store data on Windows
-  pub windows_default_data_path: Option<String>,
-  
-  /// Override the default location to store data on Mac
-  pub mac_default_data_path: Option<String>,
-}
-
-impl YamlConfig {
-  pub fn read_from_file<P: AsRef<Path>>(path: P) -> anyhow::Result<Self> {
-    let file = File::open(path)?;
-    let reader = BufReader::new(file);
-    let config = serde_yaml::from_reader(reader)?;
-    Ok(config)
-  }
-
-  pub fn load_from_config_file_recursive() -> YamlConfig {
-    let maybe_path = recursively_find_file_by_name(CONFIG_FILENAME, "../../../", 5)
-      .ok()
-      .flatten();
-    if let Some(path) = maybe_path {
-      let path = path.canonicalize().unwrap_or(path);
-      println!("Attempting to load configs from: {:?}", &path);
-      if let Ok(config) = YamlConfig::read_from_file(path) {
-        return config;
-      }
-    }
-    println!("Couldn't load config file. Using default configs.");
-    YamlConfig::default()
-  }
-}
@@ -1,103 +0,0 @@
-use std::fs::OpenOptions;
-use std::io::Write;
-use anyhow::anyhow;
-use log::{error, info};
-use once_cell::sync::Lazy;
-use reqwest::Url;
-use tauri::{AppHandle, Manager, Webview};
-use errors::AnyhowResult;
-use crate::state::app_dir::AppDataRoot;
-use crate::utils::sora_webview_cookies::get_all_sora_cookies_as_string;
-
-pub const LOGIN_WINDOW_NAME: &str = "login_window";
-
-pub const SORA_LOGIN_URL_STR: &str = "https://sora.com/auth/login?callback_path=/";
-
-pub static SORA_LOGIN_URL: Lazy<Url> = Lazy::new(|| {
-  Url::parse(SORA_LOGIN_URL_STR).expect("URL should parse")
-});
-
-pub const SORA_ROOT_URL_STR: &str = "https://sora.com/";
-
-pub static SORA_ROOT_URL: Lazy<Url> = Lazy::new(|| {
-  Url::parse(SORA_ROOT_URL_STR).expect("URL should parse")
-});
-
-pub async fn login_thread(app: AppHandle, app_data_root: AppDataRoot) -> ! {
-  loop {
-    for (window_name, webview) in app.webviews() {
-      if window_name == LOGIN_WINDOW_NAME {
-        let result = check_login_window(&webview, &app_data_root).await;
-        if let Err(err) = result {
-          error!("Error checking login window: {:?}", err);
-        }
-        break;
-      }
-    }
-    tokio::time::sleep(std::time::Duration::from_millis(2_000)).await;
-  }
-}
-
-async fn check_login_window(webview: &Webview, app_data_root: &AppDataRoot) -> AnyhowResult<()> {
-  clear_browsing_data_on_test_domain(webview)?;
-  //keep_on_task(webview)?;
-  extract_cookies_to_file(webview, app_data_root)?;
-  // TODO: Other maintenance tasks ...
-  Ok(())
-}
-
-fn keep_on_task(webview: &Webview) -> AnyhowResult<()> {
-  let url = webview.url()?;
-  let hostname= url.host()
-      .ok_or(anyhow!("no host in url"))?
-      .to_string();
-  match hostname.as_str() {
-    "auth.openai.com" => {},
-    "openai.com" => {},
-    "sora.com" => {},
-    // Third party SSO
-    "accounts.google.com" => {},
-    "accounts.youtube.com" => {},
-    "login.live.com" => {},
-    "appleid.apple.com" => {},
-    _ => {
-      info!("Non login hostname: {}", hostname);
-      webview.navigate(SORA_LOGIN_URL.clone())?;
-    }
-  }
-  Ok(())
-}
-
-/// This is just so we have a way to clear browsing data.
-fn clear_browsing_data_on_test_domain(webview: &Webview) -> AnyhowResult<()> {
-  let url = webview.url()?;
-  let hostname= url.host()
-      .ok_or(anyhow!("no host in url"))?
-      .to_string();
-  match hostname.as_str() {
-    "storyteller.ai" => {
-      info!("Clearing all browsing data...");
-      webview.clear_all_browsing_data()?;
-    }
-    _ => {}
-  }
-  Ok(())
-}
-
-// TODO(bt,2025-04-07): Heuristic to detect when logged in. Only write when logged in.
-fn extract_cookies_to_file(webview: &Webview, app_data_root: &AppDataRoot) -> AnyhowResult<()> {
-  let cookies = get_all_sora_cookies_as_string(webview)?;
-
-  let cookie_file = app_data_root.get_sora_cookie_file_path();
-
-  let mut file = OpenOptions::new()
-      .create(true)
-      .write(true)
-      .truncate(true)
-      .open(cookie_file)?;
-
-  file.write_all(cookies.as_bytes())?;
-  file.flush()?;
-
-  Ok(())
-}
@@ -1 +0,0 @@
-pub mod login_thread;
@@ -1,241 +0,0 @@
-//! Implemented from https://github.com/huggingface/hf_transfer/blob/main/src/lib.rs
-
-use crate::transfer::error::Error;
-use crate::transfer::util::{exponential_backoff, BASE_WAIT_TIME, MAX_WAIT_TIME};
-use futures::stream::FuturesUnordered;
-use futures::StreamExt;
-use reqwest::header::{
-  HeaderMap, HeaderName, HeaderValue, AUTHORIZATION, CONTENT_RANGE,
-  RANGE,
-};
-use reqwest::Url;
-use std::collections::HashMap;
-use std::fmt::Display;
-use std::fs::remove_file;
-use std::io::SeekFrom;
-use std::path::Path;
-use std::sync::Arc;
-use std::sync::atomic::{AtomicUsize, Ordering};
-use std::sync::mpsc::Sender;
-use std::time::Duration;
-use log::info;
-use tempfile::NamedTempFile;
-use tokio::fs::OpenOptions;
-use tokio::io::AsyncWriteExt;
-use tokio::io::AsyncSeekExt;
-use tokio::sync::Semaphore;
-use tokio::time::sleep;
-
-pub struct ProgressUpdate {
-  pub complete: usize,
-  pub total_length: usize,
-}
-
-/// max_files: Number of open file handles, which determines the maximum number of parallel downloads
-/// parallel_failures:  Number of maximum failures of different chunks in parallel (cannot exceed max_files)
-/// max_retries: Number of maximum attempts per chunk. (Retries are exponentially backed off + jitter)
-///
-/// The number of threads can be tuned by the environment variable `TOKIO_WORKER_THREADS` as documented in
-/// https://docs.rs/tokio/latest/tokio/runtime/struct.Builder.html#method.worker_threads
-#[allow(clippy::too_many_arguments)]
-pub async fn download_async<P: AsRef<Path>>(
-  url: String,
-  filename: NamedTempFile,
-  final_filename: P,
-  max_files: usize,
-  chunk_size: usize,
-  parallel_failures: usize,
-  max_retries: usize,
-  input_headers: Option<HashMap<String, String>>,
-  maybe_progress_sender: Option<Sender<ProgressUpdate>>,
-) -> Result<(), Error> {
-  info!(">>> Downloading: {}", filename.as_ref().display());
-
-  let client = reqwest::Client::builder()
-    // https://github.com/hyperium/hyper/issues/2136#issuecomment-589488526
-    .http2_keep_alive_timeout(Duration::from_secs(15))
-    .build()?;
-
-  let mut headers = HeaderMap::new();
-  let mut auth_token = None;
-  if let Some(input_headers) = input_headers {
-    headers.reserve(input_headers.len());
-    for (k, v) in input_headers {
-      let name: HeaderName = k
-        .try_into()
-        .map_err(|err| Error::new_err(format!("Invalid header: {err}")))?;
-      let value: HeaderValue = AsRef::<str>::as_ref(&v)
-        .try_into()
-        .map_err(|err| Error::new_err(format!("Invalid header value: {err}")))?;
-      if name == AUTHORIZATION {
-        auth_token = Some(value);
-      } else {
-        headers.insert(name, value);
-      }
-    }
-  };
-
-  let response = if let Some(token) = auth_token.as_ref() {
-    client.get(&url).header(AUTHORIZATION, token)
-  } else {
-    client.get(&url)
-  }
-    .headers(headers.clone())
-    .header(RANGE, "bytes=0-0")
-    .send()
-    .await
-    .map_err(|err| Error::new_err(format!("Error while downloading: {err}")))?
-    .error_for_status()
-    .map_err(|err| Error::new_err(err.to_string()))?;
-
-  // Only call the final redirect URL to avoid overloading the Hub with requests and also
-  // altering the download count
-  let redirected_url = response.url();
-  if Url::parse(&url)
-    .map_err(|err| Error::new_err(format!("failed to parse url: {err}")))?
-    .host()
-    == redirected_url.host()
-  {
-    if let Some(token) = auth_token {
-      headers.insert(AUTHORIZATION, token);
-    }
-  }
-
-  let content_range = response
-    .headers()
-    .get(CONTENT_RANGE)
-    .ok_or(Error::new_err("No content length".to_string()))?
-    .to_str()
-    .map_err(|err| Error::new_err(format!("Error while downloading: {err}")))?;
-
-  let size: Vec<&str> = content_range.split('/').collect();
-  // Content-Range: bytes 0-0/702517648
-  // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Range
-  let length: usize = size
-    .last()
-    .ok_or(Error::new_err(
-      "Error while downloading: No size was detected".to_string(),
-    ))?
-    .parse()
-    .map_err(|err| Error::new_err(format!("Error while downloading: {err}")))?;
-
-
-  info!("File {:?} is {:?} length", filename.as_ref(), length);
-
-  let mut handles = FuturesUnordered::new();
-  let semaphore = Arc::new(Semaphore::new(max_files));
-  let parallel_failures_semaphore = Arc::new(Semaphore::new(parallel_failures));
-  let max_chunk_complete = Arc::new(AtomicUsize::new(0));
-
-  for start in (0..length).step_by(chunk_size) {
-    let url = redirected_url.to_string();
-    let filename = filename.as_ref().to_owned();
-    let client = client.clone();
-    let headers = headers.clone();
-
-    let stop = std::cmp::min(start + chunk_size - 1, length);
-    let semaphore = semaphore.clone();
-    let parallel_failures_semaphore = parallel_failures_semaphore.clone();
-    let maybe_progress = maybe_progress_sender.clone();
-    let max_chunk_complete = max_chunk_complete.clone();
-    handles.push(tokio::spawn(async move {
-      let permit = semaphore
-        .acquire_owned()
-        .await
-        .map_err(|err| Error::new_err(format!("Error while downloading: {err}")))?;
-      let mut chunk = download_chunk(&client, &url, &filename, start, stop, headers.clone()).await;
-      let mut i = 0;
-      if parallel_failures > 0 {
-        while let Err(dlerr) = chunk {
-          if i >= max_retries {
-            return Err(Error::new_err(format!(
-              "Failed after too many retries ({max_retries}): {dlerr}"
-            )));
-          }
-          let parallel_failure_permit = parallel_failures_semaphore.clone().try_acquire_owned().map_err(|err| {
-            Error::new_err(format!(
-              "Failed too many failures in parallel ({parallel_failures}): {dlerr} ({err})"
-            ))
-          })?;
-
-          let wait_time = exponential_backoff(BASE_WAIT_TIME, i, MAX_WAIT_TIME);
-          sleep(Duration::from_millis(wait_time as u64)).await;
-
-          chunk = download_chunk(&client, &url, &filename, start, stop, headers.clone()).await;
-          i += 1;
-          drop(parallel_failure_permit);
-          
-          if let Some(sender) = maybe_progress.as_ref() {
-            // NB: Calling fetch_max twice. First call will return the lower value.
-            let _old = max_chunk_complete.fetch_max(stop, Ordering::SeqCst);
-            let max_chunk = max_chunk_complete.fetch_max(stop, Ordering::SeqCst);
-            let progress_update = ProgressUpdate { 
-              complete: max_chunk,
-              total_length: length,
-            };
-            if let Err(_err) = sender.send(progress_update) {
-              // Fail silently, not essential to issue progress updates
-            }
-          }
-        }
-      }
-      drop(permit);
-      chunk.map_err(|e| Error::new_err(format!("Downloading error {e}"))).and(Ok(stop - start))
-    }));
-  }
-
-  // Output the chained result
-  while let Some(result) = handles.next().await {
-    match result {
-      Ok(Ok(size)) => {
-        //if let Some(ref callback) = callback {
-        //  callback.call((size,), None)?;
-        //}
-      }
-      Ok(Err(py_err)) => {
-        return Err(py_err);
-      }
-      Err(err) => {
-        return Err(Error::new_err(format!(
-          "Error while downloading: {err}"
-        )));
-      }
-    }
-  }
-
-  let file = filename.persist(final_filename)
-    .map_err(|e| Error::new_err(format!("Could not rename to final filename: {:?}", e)))?;
-
-  file.sync_all()?;
-
-  Ok(())
-}
-
-async fn download_chunk<P: AsRef<Path>>(
-  client: &reqwest::Client,
-  url: &str,
-  filename: P,
-  start: usize,
-  stop: usize,
-  headers: HeaderMap,
-) -> Result<(), Error> {
-  // Process each socket concurrently.
-  let range = format!("bytes={start}-{stop}");
-  let mut file = OpenOptions::new()
-    .write(true)
-    .truncate(false)
-    .create(true)
-    .open(filename)
-    .await?;
-  file.seek(SeekFrom::Start(start as u64)).await?;
-  let response = client
-    .get(url)
-    .headers(headers)
-    .header(RANGE, range)
-    .send()
-    .await?
-    .error_for_status()?;
-  let content = response.bytes().await?;
-  file.write_all(&content).await?;
-  Ok(())
-}
@@ -1,49 +0,0 @@
-//! Implemented from https://github.com/huggingface/hf_transfer/blob/main/src/lib.rs
-
-use std::fmt::Display;
-use reqwest::header::ToStrError;
-
-#[derive(Debug)]
-pub enum Error {
-  Io(std::io::Error),
-  Request(reqwest::Error),
-  ToStrError(ToStrError),
-  Misc(String),
-}
-
-impl From<std::io::Error> for Error {
-  fn from(value: std::io::Error) -> Self {
-    Self::Io(value)
-  }
-}
-
-impl From<reqwest::Error> for Error {
-  fn from(value: reqwest::Error) -> Self {
-    Self::Request(value)
-  }
-}
-
-impl From<ToStrError> for Error {
-  fn from(value: ToStrError) -> Self {
-    Self::ToStrError(value)
-  }
-}
-
-impl Display for Error {
-  fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-    match self {
-      Self::Io(io) => write!(f, "Io: {io}"),
-      Self::Request(req) => write!(f, "Request: {req}"),
-      Self::ToStrError(req) => write!(f, "Response non ascii: {req}"),
-      Self::Misc(err) => write!(f, "Misc error: {err}"),
-    }
-  }
-}
-
-impl std::error::Error for Error {}
-
-impl Error {
-  pub fn new_err(reason: String) -> Self {
-    Self::Misc(reason)
-  }
-}
@@ -1,4 +0,0 @@
-pub mod download;
-pub mod upload;
-pub mod util;
-pub mod error;
@@ -1,189 +0,0 @@
-//! Implemented from https://github.com/huggingface/hf_transfer/blob/main/src/lib.rs
-
-use crate::transfer::error::Error;
-use crate::transfer::util::{exponential_backoff, BASE_WAIT_TIME, MAX_WAIT_TIME};
-use futures::stream::FuturesUnordered;
-use futures::StreamExt;
-use reqwest::header::CONTENT_LENGTH;
-use std::collections::HashMap;
-use std::fmt::Display;
-use std::io::SeekFrom;
-use std::sync::Arc;
-use std::time::Duration;
-use tokio::fs::OpenOptions;
-use tokio::io::{AsyncReadExt, AsyncSeekExt};
-use tokio::sync::Semaphore;
-use tokio::time::sleep;
-use tokio_util::codec::{BytesCodec, FramedRead};
-
-/// parts_urls: Dictionary consisting of part numbers as keys and the associated url as values
-/// completion_url: The url that should be called when the upload is finished
-/// max_files: Number of open file handles, which determines the maximum number of parallel uploads
-/// parallel_failures:  Number of maximum failures of different chunks in parallel (cannot exceed max_files)
-/// max_retries: Number of maximum attempts per chunk. (Retries are exponentially backed off + jitter)
-///
-/// The number of threads can be tuned by the environment variable `TOKIO_WORKER_THREADS` as documented in
-/// https://docs.rs/tokio/latest/tokio/runtime/struct.Builder.html#method.worker_threads
-///
-/// See https://docs.aws.amazon.com/AmazonS3/latest/userguide/mpuoverview.html for more information
-/// on the multipart upload
-#[allow(clippy::too_many_arguments)]
-fn multipart_upload(
-  file_path: String,
-  parts_urls: Vec<String>,
-  chunk_size: u64,
-  max_files: usize,
-  parallel_failures: usize,
-  max_retries: usize,
-) -> Result<Vec<HashMap<String, String>>, Error> {
-  if parallel_failures > max_files {
-    return Err(Error::new_err(
-      "Error parallel_failures cannot be > max_files".to_string(),
-    ));
-  }
-  if (parallel_failures == 0) != (max_retries == 0) {
-    return Err(Error::new_err(
-      "For retry mechanism you need to set both `parallel_failures` and `max_retries`"
-        .to_string(),
-    ));
-  }
-
-  tokio::runtime::Builder::new_multi_thread()
-    .enable_all()
-    .build()?
-    .block_on(async {
-      upload_async(
-        file_path,
-        parts_urls,
-        chunk_size,
-        max_files,
-        parallel_failures,
-        max_retries,
-      )
-        .await
-    })
-}
-
-
-
-#[allow(clippy::too_many_arguments)]
-async fn upload_async(
-  file_path: String,
-  parts_urls: Vec<String>,
-  chunk_size: u64,
-  max_files: usize,
-  parallel_failures: usize,
-  max_retries: usize,
-) -> Result<Vec<HashMap<String, String>>, Error> {
-  let client = reqwest::Client::new();
-
-  let mut handles = FuturesUnordered::new();
-  let semaphore = Arc::new(Semaphore::new(max_files));
-  let parallel_failures_semaphore = Arc::new(Semaphore::new(parallel_failures));
-
-  for (part_number, part_url) in parts_urls.iter().enumerate() {
-    let url = part_url.to_string();
-    let path = file_path.to_owned();
-    let client = client.clone();
-
-    let start = (part_number as u64) * chunk_size;
-    let semaphore = semaphore.clone();
-    let parallel_failures_semaphore = parallel_failures_semaphore.clone();
-    handles.push(tokio::spawn(async move {
-      let permit = semaphore
-        .clone()
-        .acquire_owned()
-        .await
-        .map_err(|err| Error::new_err(format!("Error acquiring semaphore: {err}")))?;
-      let mut chunk = upload_chunk(&client, &url, &path, start, chunk_size).await;
-      let mut i = 0;
-      if parallel_failures > 0 {
-        while let Err(ul_err) = chunk {
-          if i >= max_retries {
-            return Err(Error::new_err(format!(
-              "Failed after too many retries ({max_retries}): {ul_err}"
-            )));
-          }
-
-          let parallel_failure_permit = parallel_failures_semaphore.clone().try_acquire_owned().map_err(|err| {
-            Error::new_err(format!(
-              "Failed too many failures in parallel ({parallel_failures}): {ul_err} ({err})"
-            ))
-          })?;
-
-          let wait_time = exponential_backoff(BASE_WAIT_TIME, i, MAX_WAIT_TIME);
-          sleep(Duration::from_millis(wait_time as u64)).await;
-
-          chunk = upload_chunk(&client, &url, &path, start, chunk_size).await;
-          i += 1;
-          drop(parallel_failure_permit);
-        }
-      }
-      drop(permit);
-      chunk.map_err(|e|{
-        //match e {
-        //  Error::Io(io) => Error::new_err(format!("Io error {io}")),
-        //  Error::Request(req) => Error::new_err(format!("Error while sending chunk {req}")),
-        //  Error::ToStrError(req) => Error::new_err(format!("Response header contains non ASCII chars: {req}")),
-        //}
-        e
-      }).map(|chunk| (part_number, chunk, chunk_size))
-    }));
-  }
-
-  let mut results: Vec<HashMap<String, String>> = vec![HashMap::default(); parts_urls.len()];
-
-  while let Some(result) = handles.next().await {
-    match result {
-      Ok(Ok((part_number, headers, size))) => {
-        //if let Some(ref callback) = callback {
-        //  callback.call((size,), None)?;
-        //}
-        results[part_number] = headers;
-      }
-      Ok(Err(py_err)) => {
-        return Err(py_err);
-      }
-      Err(err) => {
-        return Err(Error::new_err(format!(
-          "Error occurred while uploading: {err}"
-        )));
-      }
-    }
-  }
-
-  Ok(results)
-}
-
-async fn upload_chunk(
-  client: &reqwest::Client,
-  url: &str,
-  path: &str,
-  start: u64,
-  chunk_size: u64,
-) -> Result<HashMap<String, String>, Error> {
-  let mut options = OpenOptions::new();
-  let mut file = options.read(true).open(path).await?;
-  let file_size = file.metadata().await?.len();
-  let bytes_transferred = std::cmp::min(file_size - start, chunk_size);
-
-  file.seek(SeekFrom::Start(start)).await?;
-  let chunk = file.take(chunk_size);
-
-  let response = client
-    .put(url)
-    .header(CONTENT_LENGTH, bytes_transferred)
-    .body(reqwest::Body::wrap_stream(FramedRead::new(
-      chunk,
-      BytesCodec::new(),
-    )))
-    .send()
-    .await?;
-  let response = response.error_for_status()?;
-  let mut headers = HashMap::new();
-  for (name, value) in response.headers().into_iter() {
-    headers.insert(name.to_string(), value.to_str()?.to_owned());
-  }
-  Ok(headers)
-}
-
@@ -1,15 +0,0 @@
-//! Implemented from https://github.com/huggingface/hf_transfer/blob/main/src/lib.rs
-
-use rand::{thread_rng, Rng};
-use std::fmt::Display;
-
-pub const BASE_WAIT_TIME: usize = 300;
-pub const MAX_WAIT_TIME: usize = 10_000;
-
-fn jitter() -> usize {
-  thread_rng().gen_range(0..=500)
-}
-
-pub fn exponential_backoff(base_wait_time: usize, n: usize, max: usize) -> usize {
-  (base_wait_time + n.pow(2) + jitter()).min(max)
-}
@@ -1,7 +0,0 @@
-use tauri::Webview;
-use errors::AnyhowResult;
-
-pub fn clear_all_webview_cookies(webview: &Webview) -> AnyhowResult<()> {
-  webview.clear_all_browsing_data()?;
-  Ok(())
-}
@@ -1,14 +0,0 @@
-use base64::prelude::BASE64_STANDARD;
-use base64::Engine;
-use image::{DynamicImage, ImageReader};
-use std::io::Cursor;
-
-pub fn decode_base64_image(base64_image: &str) -> anyhow::Result<DynamicImage> {
-  let bytes = BASE64_STANDARD.decode(base64_image)?;
-
-  let image = ImageReader::new(Cursor::new(bytes))
-    .with_guessed_format()?
-    .decode()?;
-
-  Ok(image)
-}
@@ -1,14 +0,0 @@
-use base64::prelude::BASE64_STANDARD;
-use base64::Engine;
-use image::{DynamicImage, ImageFormat};
-use std::io::Cursor;
-
-pub fn encode_dynamic_image_base64_png(image: DynamicImage) -> anyhow::Result<String> {
-  let mut bytes = Vec::with_capacity(1024*1024);
-
-  image.write_to(&mut Cursor::new(&mut bytes), ImageFormat::Png)?;
-
-  let bytes = BASE64_STANDARD.encode(bytes);
-
-  Ok(bytes)
-}
@@ -1,16 +0,0 @@
-use base64::prelude::BASE64_STANDARD;
-use base64::Engine;
-use image::{ImageFormat, RgbImage};
-use std::io::Cursor;
-
-pub fn encode_rgb_image_base64_png(
-  image: RgbImage
-) -> anyhow::Result<String> {
-  let mut bytes = Vec::with_capacity(1024*1024);
-
-  image.write_to(&mut Cursor::new(&mut bytes), ImageFormat::Png)?;
-
-  let bytes = BASE64_STANDARD.encode(bytes);
-
-  Ok(bytes)
-}
@@ -1,3 +0,0 @@
-pub mod decode_base64_image;
-pub mod encode_dynamic_image_base64_png;
-pub mod encode_rgb_image_base64_png;
@@ -1,3 +0,0 @@
-pub mod clear_all_webview_cookies;
-pub mod image;
-pub mod sora_webview_cookies;
@@ -1,26 +0,0 @@
-use once_cell::sync::Lazy;
-use reqwest::Url;
-use tauri::Webview;
-use tauri::webview::Cookie;
-use errors::AnyhowResult;
-
-const SORA_ROOT_COOKIE_URL_STR: &str = "https://sora.com/";
-
-static SORA_ROOT_COOKIE_URL: Lazy<Url> = Lazy::new(|| {
-  Url::parse(SORA_ROOT_COOKIE_URL_STR).expect("URL should parse")
-});
-
-pub fn get_all_sora_cookies(webview: &Webview) -> AnyhowResult<Vec<Cookie>> {
-  let cookies = webview.cookies_for_url(SORA_ROOT_COOKIE_URL.clone())?;
-  Ok(cookies)
-}
-
-pub fn get_all_sora_cookies_as_string(webview: &Webview) -> AnyhowResult<String> {
-  let cookies = get_all_sora_cookies(webview)?;
-  let cookie_string = cookies
-    .iter()
-    .map(|cookie| format!("{}={}", cookie.name(), cookie.value()))
-    .collect::<Vec<String>>()
-    .join("; ");
-  Ok(cookie_string)
-}
@@ -1,37 +0,0 @@
-{
-  "$schema": "https://schema.tauri.app/config/2.0.0-rc",
-  "productName": "ArtCraft",
-  "version": "0.1.0",
-  "identifier": "com.unique.value.thing.why",
-  "build": {
-    "frontendDist": "../../../frontend/realtime/dist",
-    "devUrl": "http://localhost:5174",
-    "beforeDevCommand": "npm run dev",
-    "beforeBuildCommand": "npm run build2"
-  },
-  "app": {
-    "windows": [
-      {
-        "title": "ArtCraft",
-        "width": 2400,
-        "height": 1300,
-        "resizable": true,
-        "fullscreen": false
-      }
-    ],
-    "security": {
-      "csp": null
-    }
-  },
-  "bundle": {
-    "active": true,
-    "targets": "all",
-    "icon": [
-      "icons/32x32.png",
-      "icons/128x128.png",
-      "icons/128x128@2x.png",
-      "icons/icon.icns",
-      "icons/icon.ico"
-    ]
-  }
-}
@@ -1,7 +0,0 @@
-
-#[test]
-fn test_dynamic_library_loading() {
-  let name = libloading::library_filename("cublas");
-
-  assert_eq!(name, "libcublas.so");
-}
@@ -1,4 +0,0 @@
-# Generated by Cargo
-# will have compiled files and executables
-/target/
-/gen/schemas
@@ -1,4 +0,0 @@
-# Don't restart the dev server on Rust changes
-crates/
-Cargo.toml
-Cargo.lock
@@ -1,86 +0,0 @@
-[package]
-name = "tauri-realtime"
-version = "0.1.0"
-description = "A Tauri App"
-authors = ["you"]
-license = ""
-repository = ""
-edition = "2021"
-rust-version = "1.77.2"
-publish = false
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[lib]
-name = "app_lib"
-crate-type = ["staticlib", "cdylib", "rlib"]
-
-[build-dependencies]
-tauri-build = { version = "2.1.1", features = [] }
-
-[dependencies]
-
-# Internal
-crockford = { path = "../../lib/data/crockford" }
-filesys = { path = "../../lib/files/filesys" }
-memory_caching = { path = "../../lib/caching/memory_caching" }
-ml_weights_registry = { path = "../../lib/machine_learning/ml_weights_registry" }
-primitives = { path = "../../lib/data/primitives" }
-
-# Internal ML
-# TODO: Only on Windows and Linux
-#ml_models = { path = "../ml_models", optional = true }
-# Bypass cudarc issues on Windows https://github.com/coreylowman/cudarc/issues/332
-cudarc = { version = "0.13.5", features = ["std", "cublas", "cublaslt", "curand", "driver", "nvrtc", "f16", "cuda-version-from-build-system", "dynamic-linking"], default-features=false }
-
-# External
-#openssl = { version = "0.10", features = ["vendored"] }
-# NB(bt,2025-03-10): default-features = false on Windows while I debug openssl / rustls
-anyhow = "1.0"
-base64 = "0.22.1"
-bytes = "1.10"
-chrono = "0.4.40"
-const_format = "0.2.34"
-directories = "6.0.0"
-dirs = "6.0.0"
-futures = "0.3"
-half = { version = "2.3.1", features = ["num-traits", "use-intrinsics", "rand_distr"] }
-image = "0.25.5"
-log = "0.4"
-once_cell = "1.20.3"
-ort = { version = "1.16.2", features = ["cuda", "load-dynamic"] }
-rand = "0.8.5"
-reqwest = { version = "0.12.12", features = ["stream"], default-features = false }
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-serde_yaml = "0.9"
-tauri = { version = "2.4.1", features = [] }
-tauri-plugin-log = "2.3.1"
-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"] }
-
-# tracing-subscriber = { version = "0.3", features = [ "env-filter", "fmt" ] }
-
-[target.'cfg(not(target_os = "macos"))'.dependencies]
-ml_models = { path = "../../lib/machine_learning/ml_models" }
-
-[dev-dependencies]
-libloading = "0.8.6"
-serial_test = "3.2.0"
-assertor = "0.0.3"
-
-#[target.'cfg(target_os = "macos")'.features]
-#default  = []
-#ml_models = ["dep:ml_models"]
-
-[profile.dev]
-incremental = true # Compile your binary in smaller steps.
-
-[profile.release]
-codegen-units = 1 # Allows LLVM to perform better optimization.
-lto = true # Enables link-time-optimizations.
-opt-level = 3 # `s` prioritizes small binary size. Use `3` if you prefer speed.
-panic = "abort" # Higher performance by disabling panic handlers.
-strip = true # Ensures debug symbols are removed.
@@ -1,3 +0,0 @@
-fn main() {
-  tauri_build::build()
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
ArEnSc	fe4e6437cf	Merge branch 'main' into feature/rtren	2025-02-14 14:11:17 -05:00
Tanish	03f32d7dd8	Fix resize attribute not working properly on Textareas	2025-02-14 04:30:34 -08:00
Tanish	eefbbcad51	Crudely position the prompt slider and textarea	2025-02-14 04:30:10 -08:00
Tanish	b60b9bff6c	Add a prompt textarea	2025-02-14 04:29:51 -08:00
Tanish	0e439c930b	Prompt Slider: Remove unused imports	2025-02-14 03:50:28 -08:00
Tanish	24599c858b	Add a prompt slider (temporarily above toolbar)	2025-02-14 03:49:47 -08:00
Michael Chung	f2fdc9b72e	It streams the image to the other side we just need to hook up a socket.	2025-02-13 20:52:52 -05:00
Michael Chung	5c9dd400c8	Ok should be ok.	2025-02-13 20:03:15 -05:00
Michael Chung	d511ca2256	Remove changes from the basenode	2025-02-13 18:26:50 -05:00
Michael Chung	fa4d59de25	Ok the canvas code appears to save the correct images.	2025-02-13 18:24:38 -05:00
Michael Chung	66ed9760e7	Ok Preview and Place where you have the rendering are side by side.	2025-02-13 17:23:28 -05:00
Michael Chung	bead8db275	Replacing Rendering Engine with RealTimeDrawEngine	2025-02-13 16:37:49 -05:00