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.'

.sqlx/query-90366e1705a0343bdfe4fc472d701b8e1dbd3a2dabedaadb633ac3542de72fa7.json

@@ -48,7 +48,7 @@
         "name": "maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken",
         "type_info": {
           "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
+          "flags": "BINARY",
           "char_set": 224,
           "max_size": 128
         }

.vscode/settings.json

@@ -1,15 +1,6 @@
 {
-  "files.exclude": {
-    "**/*~": true,
-    ".sqlx/**": true,
-    "_elasticsearch/**": true,
-    "_sql/**": true,
-    "frontend_old/**": true,
-    "includes/**": true,
-    "target/**": true,
-    "test_data/**": true,
-    "tmp/**": true,
-    "virtualenv/**": true,
-    "windows_dlls/**": true,
-  }
+    "files.exclude": {
+        "**/*~": true,
+        "frontend_old/**": true
+    }
 }

Cargo.toml

@@ -4,6 +4,13 @@ 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",
+  "crates/_types/enums",
+  "crates/_types/enums_public",
+  "crates/_types/reusable_types", # TODO(bt, 2022-12-21): Deprecate
+  "crates/_types/tokens",
+
   # CLI tools for operations, etc.
   "crates/cli/devenv/dev-database-seed",
   "crates/cli/devenv/dev-upload-media-file",
@@ -17,23 +24,20 @@ 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",
   "crates/lib/actix_helpers",
   "crates/lib/api_clients/cloud_storage",
-  "crates/lib/api_clients/fal_client",
   "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/openart_client",
-  "crates/lib/api_clients/runwayml_client",
   "crates/lib/api_clients/storyteller_client",
   "crates/lib/api_clients/thumbnail_generator",
   "crates/lib/bootstrap",
   "crates/lib/bucket_paths",
-  "crates/lib/build_metadata",
   "crates/lib/caching/memory_caching",
   "crates/lib/caching/memory_store",
   "crates/lib/caching/redis_caching",
@@ -47,10 +51,10 @@ members = [
   "crates/lib/deprecated/http_server_common", # TODO(bt, 2023-03-20): Move useful pieces to actix_helpers
   "crates/lib/dimensions",
   "crates/lib/easyenv", # NB: Vendored version of https://github.com/echelon/easyenv.rs that we'll improve.
+  "crates/lib/elasticsearch_schema",
   "crates/lib/email_sender",
   "crates/lib/errors",
   "crates/lib/files/archives",
-  "crates/lib/files/file_to_base64_url",
   "crates/lib/files/filesys",
   "crates/lib/files/hashing",
   "crates/lib/files/images",
@@ -60,13 +64,16 @@ members = [
   "crates/lib/idempotency",
   "crates/lib/image_algorithms",
   "crates/lib/jobs_common",
-  "crates/lib/jwt_light",
   "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/redis_common",
+  "crates/lib/redis_schema",
   "crates/lib/server_environment",
   "crates/lib/shared_service_components",
   "crates/lib/sqlx_mysql_helpers",
@@ -78,21 +85,7 @@ members = [
   "crates/lib/user_input_common",
   "crates/lib/web_scrapers",
   #"crates/lib/api_clients/fakeyou_client",
-  #"crates/lib/machine_learning/ml_models",
-
-  # Schema (database): queries, database layouts, Redis keys, etc.
-  "crates/schema/database/elasticsearch_schema",
-  "crates/schema/database/mysql_queries",
-  "crates/schema/database/redis_common",
-  "crates/schema/database/redis_schema",
-  #"crates/schema/database/sqlite_queries",
-
-  # Schema (public): common strongly-typed tokens, ids, payloads, etc.
-  "crates/schema/public/composite_identifiers",
-  "crates/schema/public/enums",
-  "crates/schema/public/enums_public",
-  "crates/schema/public/reusable_types", # TODO(bt, 2022-12-21): Deprecate
-  "crates/schema/public/tokens",
+  #"crates/lib/sqlite_queries",
 
   # Services: API servers, jobs, workers, etc.
   "crates/service/job/analytics_job",
@@ -113,23 +106,19 @@ members = [
   "crates/service/plugins/user_traits_component",
 
   # Vendored code
-  "crates/vendor/fal-rs",
-  "crates/vendor/fal-rs/fal-derive",
-  "crates/vendor/fal-rs/generate",
+  "crates/vendor/candle/candle-core",
+  "crates/vendor/candle/candle-datasets",
+  "crates/vendor/candle/candle-examples",
+  "crates/vendor/candle/candle-flash-attn",
+  "crates/vendor/candle/candle-kernels",
+  "crates/vendor/candle/candle-metal-kernels",
+  "crates/vendor/candle/candle-nn",
+  "crates/vendor/candle/candle-onnx",
+  "crates/vendor/candle/candle-pyo3",
+  "crates/vendor/candle/candle-transformers",
+  "crates/vendor/candle/tensor-tools",
   "crates/vendor/limitation",
   "crates/vendor/tauri-plugin-http",
-  # NB(bt,2025-05-25): Too many failures on Mac. Disable for now.
-  #"crates/vendor/candle/candle-core",
-  #"crates/vendor/candle/candle-datasets",
-  #"crates/vendor/candle/candle-examples",
-  #"crates/vendor/candle/candle-flash-attn",
-  #"crates/vendor/candle/candle-kernels",
-  #"crates/vendor/candle/candle-metal-kernels",
-  #"crates/vendor/candle/candle-nn",
-  #"crates/vendor/candle/candle-onnx",
-  #"crates/vendor/candle/candle-pyo3",
-  #"crates/vendor/candle/candle-transformers",
-  #"crates/vendor/candle/tensor-tools",
   # NB(bt,2023-12-12): Newrelic keeps breaking with upgrades. Kill for now.
   #"crates/vendor/newrelic-telemetry-sdk-rust",
 
@@ -169,50 +158,35 @@ 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
-actix = "0.13.5"
-actix-cors = "0.6.4" # TODO(bt): Carefully upgrade this. CORS broke last time.
-actix-http = "3.7.0"
-actix-multipart = "0.6.2"
-actix-rt = "2.10.0"
-actix-service = "2.0.3"
-actix-utils = "3.0.1"
-actix-web = "4.7.0" # TODO(bt): We're behind and need to bump versions.
-actix-web-actors = "4.3.1+deprecated"
-actix-web-lab = "0.20.2"
-anyhow = "1.0.98"
+anyhow = "1.0.97"
 base64 = "0.22.1"
-chrono = { version = "0.4.41", features = ["serde"] }
+chrono = { version = "0.4.40", features = ["serde"] }
 cookie = "0.18.1"
-futures = { version = "0.3.31" }
 hex-literal = "1.0.0"
 indexmap = "2.9.0"
 log = "0.4.27"
 once_cell = "1.21.3"
-rand = "0.9.1"
+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.34+deprecated"
+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"
-tokio = { version = "1.45.1", features = ["macros"] }
-toml = "0.8.22"
+toml = "0.8.20"
 url = { version = "2.5.4", features = ["serde"] }
 
 # Internal libs
-build_metadata = { path = "crates/lib/build_metadata" }
 crockford = { path = "crates/lib/data/crockford" }
-enums = { path = "crates/schema/public/enums" }
-enums_public = { path = "crates/schema/public/enums_public" }
+enums = { path = "crates/_types/enums" }
+enums_public = { path = "crates/_types/enums_public" }
 errors = { path = "crates/lib/errors" }
-fal_client = { path = "crates/lib/api_clients/fal_client" }
 filesys = { path = "crates/lib/files/filesys" }
 idempotency = { path = "crates/lib/idempotency" }
 images = { path = "crates/lib/files/images" }
-jwt_light = { path = "crates/lib/jwt_light" }
 memory_caching = { path = "crates/lib/caching/memory_caching" }
 memory_store = { path = "crates/lib/caching/memory_store" }
 mimetypes = { path = "crates/lib/files/mimetypes" }
@@ -221,4 +195,4 @@ primitives = { path = "crates/lib/data/primitives" }
 shared_service_components = { path = "crates/lib/shared_service_components" }
 storyteller_client = { path = "crates/lib/api_clients/storyteller_client" }
 subprocess_common = { path = "crates/lib/subprocess_common" }
-tokens = { path = "crates/schema/public/tokens" }
+tokens = { path = "crates/_types/tokens" }

_sql/migrations/2025-06-02-085011_jobs_add_third_party_columns/down.sql

@@ -1,6 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
-ALTER TABLE generic_inference_jobs DROP COLUMN maybe_external_third_party_id;
-ALTER TABLE generic_inference_jobs DROP COLUMN maybe_external_third_party;

_sql/migrations/2025-06-02-085011_jobs_add_third_party_columns/up.sql

@@ -1,9 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
-ALTER TABLE generic_inference_jobs
-ADD COLUMN maybe_external_third_party VARCHAR(16) DEFAULT NULL;
-
-ALTER TABLE generic_inference_jobs
-ADD COLUMN maybe_external_third_party_id VARCHAR(64) DEFAULT NULL;

_sql/migrations/2025-06-02-085015_jobs_add_third_party_indices/down.sql

@@ -1,9 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
-DROP INDEX `index_maybe_external_third_party_id`
-    ON `generic_inference_jobs`;
-
-DROP INDEX `index_maybe_external_third_party_and_id`
-    ON `generic_inference_jobs`;

_sql/migrations/2025-06-02-085015_jobs_add_third_party_indices/up.sql

@@ -1,11 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
-ALTER TABLE generic_inference_jobs
-    ADD UNIQUE INDEX index_maybe_external_third_party_and_id (maybe_external_third_party, maybe_external_third_party_id),
-    ALGORITHM=INPLACE, LOCK=NONE;
-
-ALTER TABLE generic_inference_jobs
-    ADD INDEX index_maybe_external_third_party_id (maybe_external_third_party_id),
-    ALGORITHM=INPLACE, LOCK=NONE;

_sql/migrations_squashed/generic_inference_jobs.sql

@@ -41,15 +41,6 @@ CREATE TABLE generic_inference_jobs (
   --  * voice_conversion
   inference_category VARCHAR(32) NOT NULL,
 
-  -- If the job is externally enqueued, this is the third-party service
-  -- responsible for the job. Typically, we won't run an inference job for
-  -- jobs being run on a third party.
-  maybe_external_third_party VARCHAR(16) DEFAULT NULL,
-
-  -- If the job is externally enqueued, this is the ID the third-party
-  -- service uses.
-  maybe_external_third_party_id VARCHAR(64) DEFAULT NULL,
-
   -- There is an index on this column.
   -- NB: See notes on inference_category. This is becoming a problematic field. We're using
   -- this to load the container spin-up arguments and dependencies, but the former is being
@@ -296,13 +287,11 @@ CREATE TABLE generic_inference_jobs (
   PRIMARY KEY (id),
   UNIQUE KEY (token),
   UNIQUE KEY (uuid_idempotency_token),
-  UNIQUE KEY (maybe_external_third_party, maybe_external_third_party_id),
   KEY index_job_type (job_type),
   KEY index_product_category (product_category),
   KEY index_inference_category (inference_category),
   KEY index_maybe_model_type_and_maybe_model_token (maybe_model_type, maybe_model_token),
   KEY index_maybe_model_type (maybe_model_type),
-  KEY index_maybe_external_third_party_id (maybe_external_third_party_id),
   KEY fk_maybe_model_token (maybe_model_token),
   KEY fk_maybe_input_source_token (maybe_input_source_token),
   KEY fk_maybe_input_source_token_and_type (maybe_input_source_token, maybe_input_source_token_type),

crates/_types/composite_identifiers/Cargo.toml

@@ -16,13 +16,12 @@ path = "src/lib.rs"
 normal = ["workspace-build-acceleration"]
 
 [dependencies]
-# Workspace hack (faster compile times)
-workspace-build-acceleration = { workspace = true }
-
 # Internal
-enums = { workspace = true }
-tokens = { workspace = true }
+enums = { path = "../enums" }
+tokens = { path = "../tokens" }
 
+# Workspace hack (faster compile times)
+workspace-build-acceleration = { version = "0.1", path = "../../workspace-build-acceleration" }
 
 # Serialization
 serde = "1.0.125"

crates/_types/enums/Cargo.toml

@@ -16,15 +16,14 @@ path = "src/lib.rs"
 normal = ["workspace-build-acceleration"]
 
 [dependencies]
-# Workspace hack (faster compile times)
-workspace-build-acceleration = { workspace = true }
-
 # Internal
-# (None yet)
+
+# Workspace hack (faster compile times)
+workspace-build-acceleration = { version = "0.1", path = "../../workspace-build-acceleration" }
 
 # Serialization
-serde = { workspace = true }
-serde_derive = { workspace = true }
+serde = "1.0.125"
+serde_derive = "1.0.125"
 
 sqlx = { version = "0.7.2", features = [ "mysql", "sqlite", "runtime-tokio-native-tls", "chrono" ] }
 sqlx-core = { version = "0.7.2" }
@@ -38,5 +37,5 @@ utoipa = { version = "4", features = ["chrono","actix_extras"] }
 strum = { version = "0.26", features = ["derive"] }
 
 # Test serialization
-serde_json = { workspace = true }
-toml = { workspace = true }
+serde_json = "1.0.108"
+toml = "0.8.14"