Added reference images to the generation

enqueueImageGeneration now accepts additionalImages
enqueueImageGeneration needs testing.
Polling for jobs doesn't work,
most api calls don't work and need integration testing.

.config/hakari.toml

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

.gitignore

@@ -32,9 +32,6 @@ target/
 crates/lib/database_queries/target/
 crates/lib/sqlite_queries/target/
 
-# Javascript build directories
-node_modules/
-
 # Vim noise
 *.swo
 *.swp

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,8 +22,9 @@ members = [
   "crates/cli/production/migration-tool",
 
   # Desktop apps
-  "crates/desktop/tauri-4o",
-  "crates/desktop/tauri-realtime",
+  "crates/desktop/src-tauri",
+  "crates/desktop/ml_models",
+  "crates/desktop/ml_weights_registry",
 
   # Shared libraries
   "crates/lib/actix_cors_configs",
@@ -33,7 +32,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",
@@ -63,17 +61,14 @@ members = [
   "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",
@@ -121,40 +116,5 @@ members = [
 
   # 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" }

crates/_types/composite_identifiers/Cargo.toml

@@ -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"

crates/_types/enums/Cargo.toml

@@ -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"

crates/_types/enums/src/by_table/generic_inference_jobs/inference_job_type.rs

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

crates/_types/enums/src/by_table/generic_inference_jobs/inference_model_type.rs

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

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

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

crates/_types/enums_public/Cargo.toml

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

crates/_types/enums_public/src/by_table/generic_inference_jobs/public_inference_job_type.rs

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

crates/_types/enums_public/src/by_table/media_files/public_media_file_model_type.rs

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

crates/_types/reusable_types/Cargo.toml

@@ -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"] }

crates/_types/tokens/Cargo.toml

@@ -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"

crates/cli/devenv/dev-database-seed/Cargo.toml

@@ -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"

crates/cli/devenv/dev-upload-media-file/Cargo.toml

@@ -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"

crates/cli/devenv/scrape-test/Cargo.toml

@@ -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"

crates/cli/production/db-backfill/Cargo.toml

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

crates/cli/production/db-backup/Cargo.toml

@@ -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"

crates/cli/production/db-cleanup/Cargo.toml

@@ -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"

crates/cli/production/elasticsearch-cli/Cargo.toml

@@ -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"

crates/cli/production/kubectl-pod-cleanup/Cargo.toml

@@ -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"

crates/cli/production/lru-delete-models/Cargo.toml

@@ -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"] }

crates/cli/production/migration-tool/Cargo.toml

@@ -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"

crates/desktop/ml_models/Cargo.toml

@@ -14,19 +14,16 @@ path = "src/lib.rs"
 crate-type = ["staticlib", "cdylib", "rlib"]
 
 [package.metadata.cargo-udeps.ignore]
-normal = ["workspace-build-acceleration"]
+normal = ["my-workspace-hack"]
 
 [dependencies]
 
-# Workspace hack (faster compile times)
-workspace-build-acceleration = { workspace =  true }
-
 # Internal
-filesys = { path = "../../files/filesys" }
-image_algorithms = { path = "../../image_algorithms" }
-memory_caching = { path = "../../caching/memory_caching" }
+filesys = { path = "../../lib/files/filesys" }
+image_algorithms = { path = "../../lib/image_algorithms" }
+memory_caching = { path = "../../lib/caching/memory_caching" }
 ml_weights_registry = { path = "../ml_weights_registry" }
-primitives = { path = "../../data/primitives" }
+primitives = { path = "../../lib/data/primitives" }
 
 # Bypass cudarc issues on Windows https://github.com/coreylowman/cudarc/issues/332
 cudarc = "0.13.7"
@@ -35,9 +32,9 @@ cudarc = "0.13.7"
 anyhow = "1.0"
 base64 = "0.22.1"
 bytes = "1.10"
-candle-core = { path = "../../../vendor/candle/candle-core", features = ["cuda"] }
-candle-nn = { path = "../../../vendor/candle/candle-nn", features = ["cuda"] }
-candle-transformers = { path = "../../../vendor/candle/candle-transformers", features = ["cuda"] }
+candle-core = { path = "../../vendor/candle/candle-core", features = ["cuda"] }
+candle-nn = { path = "../../vendor/candle/candle-nn", features = ["cuda"] }
+candle-transformers = { path = "../../vendor/candle/candle-transformers", features = ["cuda"] }
 const_format = "0.2.34"
 directories = "6.0.0"
 dirs = "6.0.0"

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]
 
@@ -24,7 +24,7 @@ tauri-build = { version = "2.1.1", features = [] }
 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" }
+ml_weights_registry = { path = "../ml_weights_registry" }
 primitives = { path = "../../lib/data/primitives" }
 
 # Internal ML
@@ -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"] }
@@ -64,7 +64,7 @@ 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" }
+ml_models = { path = "../ml_models" }
 
 [dev-dependencies]
 libloading = "0.8.6"