Some bug fixes and improvements for FK

Cargo.toml

@@ -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,10 +22,9 @@ members = [
   "crates/cli/production/migration-tool",
 
   # Desktop apps
+  "crates/desktop/src-tauri",
   "crates/desktop/ml_models",
   "crates/desktop/ml_weights_registry",
-  "crates/desktop/tauri-4o",
-  "crates/desktop/tauri-realtime",
 
   # Shared libraries
   "crates/lib/actix_cors_configs",
@@ -124,33 +121,21 @@ members = [
 ]
 
 [workspace.package]
-# Common inheritable settings for monorepo packages
 publish = false
 
 [workspace.dependencies]
 # Hakari workspace hack (faster compile times)
 my-workspace-hack = { path = "crates/my-workspace-hack" }
 
+# Internal libs
+errors = { path = "crates/lib/errors" }
+
 # 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 = "0.4.40"
 log = "0.4.27"
-once_cell = "1.21.3"
-rand = "0.9.0"
 reqwest = { version = "0.12.15", features = ["json", "cookies"] }
-serde = {  version = "1.0.219", features = ["derive"] }
+serde = "1.0.219"
 serde_derive = "1.0.219"
 serde_json = "1.0.140"
-serde_yaml = "0.9.1"
-toml = "0.7.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" }
-openai_sora_client = { path = "crates/lib/api_clients/openai_sora_client" }
-primitives = { path = "crates/lib/data/primitives" }
-subprocess_common = { path = "crates/lib/subprocess_common" }

crates/desktop/src-tauri/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "tauri-realtime"
+name = "app"
 version = "0.1.0"
 description = "A Tauri App"
 authors = ["you"]
@@ -16,7 +16,7 @@ name = "app_lib"
 crate-type = ["staticlib", "cdylib", "rlib"]
 
 [build-dependencies]
-tauri-build = { version = "2.1.1", features = [] }
+tauri-build = { version = "2.0.4", features = [] }
 
 [dependencies]
 
@@ -54,8 +54,8 @@ 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"
+tauri = { version = "2.2.4", features = [] }
+tauri-plugin-log = "2"
 tempdir = "0.3.7"
 tempfile = "3.18.0"
 tokio = { version = "1.42", features = ["rt", "rt-multi-thread", "fs"] }

crates/desktop/tauri-4o/Cargo.toml

@@ -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)
-my-workspace-hack = { 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.

crates/desktop/tauri-4o/src/commands/image_generation_command.rs

@@ -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),
-  })
-}

crates/desktop/tauri-4o/src/commands/mod.rs

@@ -1,3 +0,0 @@
-pub mod flip_image;
-pub mod image_generation_command;
-pub mod open_login_command;

crates/desktop/tauri-4o/src/commands/open_login_command.rs

@@ -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(())
-}

crates/desktop/tauri-4o/src/lib.rs

@@ -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");
-}

crates/desktop/tauri-4o/src/main.rs

@@ -1,6 +0,0 @@
-// Prevents additional console window on Windows in release, DO NOT REMOVE!!
-#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
-
-fn main() {
-  app_lib::run();
-}

crates/desktop/tauri-4o/src/state/app_config.rs

@@ -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,
-    })
-  }
-}

crates/desktop/tauri-4o/src/state/app_dir.rs

@@ -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))
-}

crates/desktop/tauri-4o/src/threads/login_thread.rs

@@ -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(())
-}

crates/desktop/tauri-4o/src/threads/mod.rs

@@ -1 +0,0 @@
-pub mod login_thread;

crates/desktop/tauri-4o/src/utils/clear_all_webview_cookies.rs

@@ -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(())
-}

crates/desktop/tauri-4o/src/utils/mod.rs

@@ -1,3 +0,0 @@
-pub mod clear_all_webview_cookies;
-pub mod image;
-pub mod sora_webview_cookies;

crates/desktop/tauri-4o/src/utils/sora_webview_cookies.rs

@@ -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)
-}

crates/desktop/tauri-realtime/.gitignore

@@ -1,4 +0,0 @@
-# Generated by Cargo
-# will have compiled files and executables
-/target/
-/gen/schemas

crates/desktop/tauri-realtime/.taurignore

@@ -1,4 +0,0 @@
-# Don't restart the dev server on Rust changes
-crates/
-Cargo.toml
-Cargo.lock

crates/desktop/tauri-realtime/build.rs

@@ -1,3 +0,0 @@
-fn main() {
-  tauri_build::build()
-}

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

@@ -1,12 +0,0 @@
-{
-  "$schema": "../gen/schemas/desktop-schema.json",
-  "identifier": "default",
-  "description": "enables the default permissions",
-  "windows": [
-    "main"
-  ],
-  "permissions": [
-    "core:default",
-    "log:default"
-  ]
-}

crates/desktop/tauri-realtime/src/endpoints/flip_image.rs

@@ -1,36 +0,0 @@
-use base64::prelude::BASE64_STANDARD;
-use base64::Engine;
-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> {
-  println!("infer_image called; processing image...");
-
-  let bytes = BASE64_STANDARD.decode(image)
-    .map_err(|err| format!("Base64 decode error: {}", err))?;
-
-  let image = ImageReader::new(Cursor::new(bytes))
-    .with_guessed_format()
-    .map_err(|err| format!("Image format error: {}", err))?
-    .decode()
-    .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);
-  
-  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)
-}

crates/desktop/tauri-realtime/src/events/mod.rs

@@ -1 +0,0 @@
-pub mod notification_event;

crates/desktop/tauri-realtime/src/events/notification_event.rs

@@ -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,
-  },
-}

crates/desktop/tauri-realtime/src/state/expanduser.rs

@@ -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"));
-    }
-
-}

crates/desktop/tauri-realtime/src/state/mod.rs

@@ -1,5 +0,0 @@
-pub mod app_config;
-pub mod app_dir;
-pub mod os_platform;
-pub mod yaml_config;
-pub mod expanduser;

crates/desktop/tauri-realtime/src/state/os_platform.rs

@@ -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,
-    }
-  }
-}