Add back button to login and signup pages for 2d navigation

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

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

Cargo.toml

@@ -24,7 +24,8 @@ members = [
   "crates/cli/production/migration-tool",
 
   # Desktop apps
-  "crates/desktop/artcraft",
+  "crates/desktop/tauri-artcraft",
+  "crates/desktop/tauri-realtime",
 
   # Shared libraries
   "crates/lib/actix_cors_configs",
@@ -173,7 +174,7 @@ serde_derive = "1.0.219"
 serde_json = "1.0.140"
 serde_yaml = "0.9.1"
 sha3 = "0.10.8"
-tauri = { version = "2.4.1", features = ["unstable", "devtools"] } # NB: "devtools" prevents App Store distribution
+tauri = { version = "2.4.1", features = ["unstable"] }
 thiserror = "2.0.12"
 toml = "0.8.20"
 url = { version = "2.5.4", features = ["serde"] }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

crates/desktop/artcraft/src/utils/webview_unsafe.rs

@@ -1,38 +0,0 @@
-use errors::AnyhowResult;
-use tauri::{AppHandle, Manager};
-
-const MAIN_WINDOW_NAME: &str = "main";
-
-pub fn webview_unsafe_for_app(app: &AppHandle) -> AnyhowResult<()> {
-  let windows = app.windows();
-  let maybe_window = windows.get(MAIN_WINDOW_NAME);
-  
-  /*if let Some(window) = maybe_window {
-    let webview = window.get_webview(MAIN_WINDOW_NAME);
-    if let Some(webview) = webview {
-      webview_unsafe(&webview);
-    }
-  } else {
-    return Err(anyhow::anyhow!("Main window not found"));
-  }*/
-
-  Ok(())
-}
-
-/*pub fn webview_unsafe(webview: &Webview) {
-  let r = webview.with_webview(|webview| {
-    webview.controller();
-    #[cfg(target_os = "macos")]
-    unsafe {
-      let view: &objc2_web_kit::WKWebView = &*webview.inner().cast();
-      let controller: &objc2_web_kit::WKUserContentController = &*webview.controller().cast();
-      let window: &objc2_app_kit::NSWindow = &*webview.ns_window().cast();
-
-      //view.setPageZoom(40.);
-      //controller.removeAllUserScripts();
-      let bg_color = objc2_app_kit::NSColor::colorWithDeviceRed_green_blue_alpha(1.0, 0.2, 0.4, 1.);
-      window.setBackgroundColor(Some(&bg_color));
-    }
-
-  });
-}*/

crates/desktop/artcraft/tauri.artcraft_3d.no_dev.conf.json

@@ -1,8 +0,0 @@
-{
-  "build": {
-    "frontendDist": "../../../frontend/apps/editor3d/dist",
-    "beforeDevCommand": "echo 'no dev'",
-    "devUrl": "http://localhost:5173",
-    "beforeBuildCommand": "nx run editor3d:build"
-  }
-}

crates/desktop/tauri-artcraft/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "artcraft"
+name = "tauri-artcraft"
 version = "0.1.0"
 description = "Artcraft"
 authors = ["you"]
@@ -12,7 +12,7 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [lib]
-name = "artcraft_app_lib"
+name = "tauri_artcraft_app_lib"
 crate-type = ["staticlib", "cdylib", "rlib"]
 
 [build-dependencies]
@@ -55,7 +55,6 @@ serde_json = { workspace = true }
 serde_yaml = { workspace = true }
 tauri = { workspace = true }
 tauri-plugin-log = "2.3.1"
-tauri-plugin-upload = "2.2.1"
 tempdir = "0.3.7"
 tempfile = "3.18.0"
 tokio = { version = "1.42", features = ["rt", "rt-multi-thread", "fs"] }
@@ -67,7 +66,6 @@ tauri-plugin-http = { path = "../../vendor/tauri-plugin-http" }
 # NB: The version of the `discord-rich-presence` crate (0.2.5) last published has non-Send/Sync error
 # types and can't do threading. We need to wait for a new version to unpin from Git.
 discord-rich-presence = { git = "https://github.com/vionya/discord-rich-presence" }
-tauri-plugin-dialog = "2"
 
 [dev-dependencies]
 libloading = "0.8.6"

crates/desktop/tauri-artcraft/capabilities/default.json

@@ -8,24 +8,13 @@
   "permissions": [
     "core:default",
     "log:default",
-    "upload:allow-download",
-    "upload:default",
     {
       "identifier": "http:default",
       "allow": [
-        {
-          "url": "https://*.storyteller.ai"
-        },
-        {
-          "url": "https://*.fakeyou.com"
-        }
+        { "url": "https://*.storyteller.ai" },
+        { "url": "https://*.fakeyou.com" }
       ],
-      "deny": [
-        {
-          "url": "https://private.tauri.app"
-        }
-      ]
-    },
-    "dialog:default"
+      "deny": [{ "url": "https://private.tauri.app" }]
+    }
   ]
 }

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

@@ -1,4 +1,3 @@
-pub mod app_preferences;
 pub mod flip_image;
 pub mod platform_info_command;
 pub mod sora;

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

@@ -21,23 +21,13 @@ 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 serde_derive::{Deserialize, Serialize};
+use serde_derive::Deserialize;
 use std::fs::read_to_string;
 use std::io::Cursor;
 use storyteller_client::media_files::get_media_file::get_media_file;
 use storyteller_client::utils::api_host::ApiHost;
-use tauri::{AppHandle, Emitter, Manager, State};
+use tauri::{AppHandle, Manager, State};
 use tokens::tokens::media_files::MediaFileToken;
-use crate::threads::sora_task_polling_thread::SoraImageGenerationComplete;
-
-#[derive(Debug, Clone, Serialize)]
-pub struct SoraImageEnqueueFailure {
-  // TODO: Reason.
-}
-
-#[derive(Debug, Clone, Serialize)]
-pub struct SoraImageEnqueueSuccess {
-}
 
 #[derive(Deserialize)]
 pub struct SoraImageRemixCommand {
@@ -58,35 +48,22 @@ pub struct SoraImageRemixCommand {
 
 #[tauri::command]
 pub async fn sora_image_remix_command(
-  app: AppHandle,
+  _app: AppHandle,
   request: SoraImageRemixCommand,
   app_data_root: State<'_, AppDataRoot>,
   sora_creds_manager: State<'_, SoraCredentialManager>,
   sora_task_queue: State<'_, SoraTaskQueue>,
 ) -> Result<String, String> {
-  
-  info!("image_generation_command called; scene media token: {:?}, additional images: {:?}", 
-    request.snapshot_media_token, request.maybe_additional_images);
+  info!("image_generation_command called; processing image...");
 
   // TODO(bt,2025-04-24): Better error messages to caller
 
-  let result = generate_image(request, &app_data_root, &sora_creds_manager, &sora_task_queue).await;
-  
-  if let Err(err) = result {
-    error!("error: {:?}", err);
-
-    let result = app.emit("sora-image-enqueue-failure", SoraImageEnqueueFailure{});
-    if let Err(err) = result {
-      error!("Failed to emit event: {:?}", err);
-    }
-    
-    return Err("there was an error".to_string());
-  }
-
-  let result = app.emit("sora-image-enqueue-success", SoraImageEnqueueSuccess{});
-  if let Err(err) = result {
-    error!("Failed to emit event: {:?}", err);
-  }
+  generate_image(request, &app_data_root, &sora_creds_manager, &sora_task_queue)
+    .await
+    .map_err(|err| {
+      error!("error: {:?}", err);
+      "there was an error".to_string()
+    })?;
 
   Ok("success".to_string())
 }

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

@@ -7,13 +7,11 @@ pub mod utils;
 use tauri::Manager;
 
 use crate::commands::flip_image::flip_image;
-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::platform_info_command::platform_info_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::state::data_dir::app_data_root::AppDataRoot;
+use crate::state::app_config::AppConfig;
 use crate::state::main_window_size::MainWindowSize;
 use crate::state::sora::sora_credential_manager::SoraCredentialManager;
 use crate::state::sora::sora_task_queue::SoraTaskQueue;
@@ -22,11 +20,8 @@ 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_session_login_thread::sora_session_login_thread;
 use crate::threads::sora_task_polling_thread::sora_task_polling_thread;
-use crate::utils::webview_unsafe::webview_unsafe_for_app;
 
-use crate::state::app_preferences::app_preferences_manager::load_app_preferences_or_default;
 use tauri_plugin_http;
-use tauri_plugin_dialog;
 use tauri_plugin_log::Target;
 use tauri_plugin_log::TargetKind;
 
@@ -34,13 +29,14 @@ use tauri_plugin_log::TargetKind;
 pub fn run() {
   // NB: Tauri wants to install the logger itself, so we can't rely on the logger crate
   // until the tauri runtime begins.
-  println!("Loading config...");
-  let app_data_root = AppDataRoot::create_default().expect("data directory should be created");
-  let app_data_root_2 = app_data_root.clone();
+  println!("Loading model config...");
+
+  let config = AppConfig::init()
+    .expect("config should load");
+
+  let app_data_root = config.app_data_root.clone();
+  let app_data_root_2 = config.app_data_root.clone();
 
-  println!("Loading app preferences...");
-  let app_preferences = load_app_preferences_or_default(&app_data_root);
-  
   println!("Attempting to read existing artcraft credentials...");
   let storyteller_creds_manager = StorytellerCredentialManager::initialize_from_disk_infallible(&app_data_root);
   let storyteller_creds_manager_2 = storyteller_creds_manager.clone();
@@ -56,9 +52,7 @@ pub fn run() {
   println!("Initializing backend runtime...");
 
   tauri::Builder::default()
-    .plugin(tauri_plugin_dialog::init())
     .plugin(tauri_plugin_http::init())
-    .plugin(tauri_plugin_upload::init())
     .plugin(tauri_plugin_log::Builder::new()
       .level(log::LevelFilter::Info)
       .targets(vec![
@@ -80,15 +74,9 @@ pub fn run() {
       //  )?;
       //}
       let app = app.handle().clone();
-      
-      let result = webview_unsafe_for_app(&app);
-      if let Err(err) = result {
-        eprintln!("Error setting webview unsafe: {:?}", err);
-      }
 
       let app_2 = app.clone();
       let app_3 = app.clone();
-      let app_4 = app.clone();
       let app_data_root_3 = app_data_root_2.clone();
       let app_data_root_4 = app_data_root_2.clone();
       let sora_creds_manager_3 = sora_creds_manager_2.clone();
@@ -110,19 +98,17 @@ pub fn run() {
 
       tauri::async_runtime::spawn(sora_session_login_thread(app_2, app_data_root_2, sora_creds_manager_2));
       tauri::async_runtime::spawn(main_window_thread(app_3, app_data_root_3, 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(sora_task_polling_thread(app_data_root_4, sora_creds_manager_3, storyteller_creds_manager_3, sora_task_queue_2));
       tauri::async_runtime::spawn(discord_presence_thread());
 
       Ok(())
     })
     .manage(app_data_root)
-    .manage(app_preferences)
+    .manage(config)
     .manage(sora_creds_manager)
     .manage(sora_task_queue)
     .invoke_handler(tauri::generate_handler![
       flip_image,
-      get_app_preferences_command,
-      update_app_preferences_command,
       open_sora_login_command,
       platform_info_command,
       sora_image_generation_command,

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

@@ -2,5 +2,5 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
 fn main() {
-  artcraft_app_lib::run();
+  tauri_artcraft_app_lib::run();
 }

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

@@ -0,0 +1,58 @@
+use crate::state::data_dir::app_data_root::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,
+    })
+  }
+}