Some bug fixes and improvements for FK

.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",
@@ -63,17 +62,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 +117,25 @@ 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" }
+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 = { 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 = "1.0.219"
 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/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/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"