cleanup refactor #2 (#1164)

- move a lot of "deprecated" crates so we don't use them
- kill several dead crates
- rename crates to be more semantic/clear
- roll back broken sha3 version bump

Cargo.lock

@@ -339,10 +339,10 @@ dependencies = [
  "actix-web",
  "actix_helpers",
  "anyhow",
- "cookies",
  "enums",
  "errors",
  "http_headers",
+ "jwt_signer",
  "log",
  "tokens",
  "workspace-build-acceleration",
@@ -405,7 +405,7 @@ checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
 dependencies = [
  "cfg-if",
  "cipher 0.3.0",
- "cpufeatures 0.2.12",
+ "cpufeatures",
  "opaque-debug",
 ]
 
@@ -417,7 +417,7 @@ checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
 dependencies = [
  "cfg-if",
  "cipher 0.4.4",
- "cpufeatures 0.2.12",
+ "cpufeatures",
 ]
 
 [[package]]
@@ -656,15 +656,6 @@ version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
 
-[[package]]
-name = "archives"
-version = "0.0.1"
-dependencies = [
- "errors",
- "workspace-build-acceleration",
- "zip 0.6.6",
-]
-
 [[package]]
 name = "arcstr"
 version = "1.2.0"
@@ -715,7 +706,6 @@ dependencies = [
  "filesys",
  "futures 0.3.32",
  "grok_client",
- "idempotency",
  "image",
  "images",
  "indexmap 2.13.0",
@@ -748,6 +738,7 @@ dependencies = [
  "tokio-util",
  "url",
  "url_utils",
+ "uuid_utils",
  "web_base64",
  "workspace-build-acceleration",
  "worldlabs_consumer_client",
@@ -783,7 +774,6 @@ dependencies = [
  "enums",
  "enums_public",
  "errors",
- "idempotency",
  "log",
  "mimetypes",
  "reqwest 0.12.23",
@@ -795,6 +785,7 @@ dependencies = [
  "url",
  "url-builder",
  "uuid 1.22.0",
+ "uuid_utils",
  "workspace-build-acceleration",
 ]
 
@@ -1222,19 +1213,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "atom_syndication"
-version = "0.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "571832dcff775e26562e8e6930cd483de5587301d40d3a3b85d532b6383e15a7"
-dependencies = [
- "chrono",
- "derive_builder",
- "diligent-date-parser",
- "never",
- "quick-xml 0.30.0",
-]
-
 [[package]]
 name = "atomic-waker"
 version = "1.1.2"
@@ -2398,13 +2376,6 @@ dependencies = [
  "static_assertions",
 ]
 
-[[package]]
-name = "component_subsystem_inference_workloads"
-version = "0.0.1"
-dependencies = [
- "workspace-build-acceleration",
-]
-
 [[package]]
 name = "component_traits"
 version = "0.0.1"
@@ -2597,17 +2568,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "cookies"
-version = "0.0.1"
-dependencies = [
- "errors",
- "hmac 0.10.1",
- "jwt",
- "sha2 0.9.9",
- "workspace-build-acceleration",
-]
-
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -2711,15 +2671,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "cpufeatures"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "crc"
 version = "3.0.1"
@@ -2880,19 +2831,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "cssparser"
-version = "0.31.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b3df4f93e5fbbe73ec01ec8d3f68bba73107993a5b1e7519273c32db9b0d5be"
-dependencies = [
- "cssparser-macros",
- "dtoa-short",
- "itoa 1.0.11",
- "phf 0.11.2",
- "smallvec",
-]
-
 [[package]]
 name = "cssparser"
 version = "0.35.0"
@@ -2963,16 +2901,6 @@ dependencies = [
  "darling_macro 0.13.4",
 ]
 
-[[package]]
-name = "darling"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
-dependencies = [
- "darling_core 0.14.4",
- "darling_macro 0.14.4",
-]
-
 [[package]]
 name = "darling"
 version = "0.20.10"
@@ -2997,20 +2925,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "darling_core"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim 0.10.0",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "darling_core"
 version = "0.20.10"
@@ -3036,17 +2950,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "darling_macro"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
-dependencies = [
- "darling_core 0.14.4",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "darling_macro"
 version = "0.20.10"
@@ -3207,37 +3110,6 @@ dependencies = [
  "syn 2.0.117",
 ]
 
-[[package]]
-name = "derive_builder"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8"
-dependencies = [
- "derive_builder_macro",
-]
-
-[[package]]
-name = "derive_builder_core"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f"
-dependencies = [
- "darling 0.14.4",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "derive_builder_macro"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e"
-dependencies = [
- "derive_builder_core",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "derive_more"
 version = "0.99.17"
@@ -3303,7 +3175,6 @@ dependencies = [
  "errors",
  "filesys",
  "hashing",
- "idempotency",
  "log",
  "mimetypes",
  "mysql_queries",
@@ -3312,6 +3183,7 @@ dependencies = [
  "storyteller_root",
  "tokens",
  "tokio",
+ "uuid_utils",
  "workspace-build-acceleration",
 ]
 
@@ -3410,22 +3282,6 @@ dependencies = [
  "crypto-common 0.2.1",
 ]
 
-[[package]]
-name = "diligent-date-parser"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6cf7fe294274a222363f84bcb63cdea762979a0443b4cf1f4f8fd17c86b1182"
-dependencies = [
- "chrono",
-]
-
-[[package]]
-name = "dimensions"
-version = "0.0.1"
-dependencies = [
- "workspace-build-acceleration",
-]
-
 [[package]]
 name = "directories"
 version = "6.0.0"
@@ -3604,7 +3460,7 @@ dependencies = [
  "enums",
  "errors",
  "filesys",
- "google_drive_common",
+ "google_drive_downloader",
  "hashing",
  "hostname 0.4.0",
  "hyper 1.6.0",
@@ -3748,12 +3604,6 @@ dependencies = [
  "getrandom 0.2.14",
 ]
 
-[[package]]
-name = "ego-tree"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a68a4904193147e0a8dec3314640e6db742afd5f6e634f428a6af230d9b3591"
-
 [[package]]
 name = "ego-tree"
 version = "0.10.0"
@@ -4926,7 +4776,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "google_drive_common"
+name = "google_drive_downloader"
 version = "0.0.1"
 dependencies = [
  "anyhow",
@@ -4998,7 +4848,7 @@ dependencies = [
  "log4rs",
  "once_cell",
  "regex",
- "scraper 0.24.0",
+ "scraper",
  "serde",
  "serde_json",
  "sha2 0.11.0-rc.5",
@@ -5320,20 +5170,6 @@ dependencies = [
  "windows 0.52.0",
 ]
 
-[[package]]
-name = "html5ever"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7"
-dependencies = [
- "log",
- "mac",
- "markup5ever 0.11.0",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "html5ever"
 version = "0.29.1"
@@ -5806,14 +5642,6 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
 
-[[package]]
-name = "idempotency"
-version = "0.0.1"
-dependencies = [
- "uuid 1.22.0",
- "workspace-build-acceleration",
-]
-
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -5988,7 +5816,7 @@ dependencies = [
  "errors",
  "ffmpeg_utils",
  "filesys",
- "google_drive_common",
+ "google_drive_downloader",
  "hashing",
  "hostname 0.4.0",
  "images",
@@ -6348,6 +6176,17 @@ dependencies = [
  "workspace-build-acceleration",
 ]
 
+[[package]]
+name = "jwt_signer"
+version = "0.0.1"
+dependencies = [
+ "errors",
+ "hmac 0.10.1",
+ "jwt",
+ "sha2 0.9.9",
+ "workspace-build-acceleration",
+]
+
 [[package]]
 name = "k256"
 version = "0.13.3"
@@ -6364,12 +6203,11 @@ dependencies = [
 
 [[package]]
 name = "keccak"
-version = "0.2.0"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e24a010dd405bd7ed803e5253182815b41bf2e6a80cc3bfc066658e03a198aa"
+checksum = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653"
 dependencies = [
- "cfg-if",
- "cpufeatures 0.3.0",
+ "cpufeatures",
 ]
 
 [[package]]
@@ -6862,20 +6700,6 @@ dependencies = [
  "workspace-build-acceleration",
 ]
 
-[[package]]
-name = "markup5ever"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016"
-dependencies = [
- "log",
- "phf 0.10.1",
- "phf_codegen 0.10.0",
- "string_cache",
- "string_cache_codegen",
- "tendril",
-]
-
 [[package]]
 name = "markup5ever"
 version = "0.14.1"
@@ -7328,7 +7152,6 @@ dependencies = [
  "composite_identifiers",
  "enums",
  "errors",
- "idempotency",
  "log",
  "num-traits",
  "once_cell",
@@ -7342,6 +7165,7 @@ dependencies = [
  "sqlx",
  "tokens",
  "tokio",
+ "uuid_utils",
  "workspace-build-acceleration",
 ]
 
@@ -7452,12 +7276,6 @@ dependencies = [
  "jni-sys",
 ]
 
-[[package]]
-name = "never"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c96aba5aa877601bb3f6dd6a63a969e1f82e60646e81e71b14496995e9853c91"
-
 [[package]]
 name = "new_debug_unreachable"
 version = "1.0.4"
@@ -8040,7 +7858,6 @@ dependencies = [
  "cloudflare_errors",
  "cookie 0.18.1",
  "errors",
- "idempotency",
  "log",
  "once_cell",
  "rand 0.9.2",
@@ -8053,6 +7870,7 @@ dependencies = [
  "tokio",
  "toml 1.0.7+spec-1.1.0",
  "url",
+ "uuid_utils",
  "workspace-build-acceleration",
  "wreq",
  "wreq-util",
@@ -8070,7 +7888,6 @@ dependencies = [
  "errors",
  "filesys",
  "hex-literal",
- "idempotency",
  "log",
  "once_cell",
  "rand 0.9.2",
@@ -8084,6 +7901,7 @@ dependencies = [
  "thiserror 2.0.18",
  "tokio",
  "toml 1.0.7+spec-1.1.0",
+ "uuid_utils",
  "workspace-build-acceleration",
 ]
 
@@ -8504,16 +8322,6 @@ dependencies = [
  "phf_shared 0.8.0",
 ]
 
-[[package]]
-name = "phf_codegen"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
-dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
-]
-
 [[package]]
 name = "phf_codegen"
 version = "0.11.3"
@@ -9072,16 +8880,6 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
-[[package]]
-name = "quick-xml"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956"
-dependencies = [
- "encoding_rs",
- "memchr",
-]
-
 [[package]]
 name = "quick-xml"
 version = "0.32.0"
@@ -9911,18 +9709,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "rss"
-version = "2.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e6c0ea0e621c2a3aa34850ebd711526f0ac7385921f57d2430a47cecc7b9cbc"
-dependencies = [
- "atom_syndication",
- "derive_builder",
- "never",
- "quick-xml 0.30.0",
-]
-
 [[package]]
 name = "runwayml_client"
 version = "0.0.1"
@@ -9935,7 +9721,6 @@ dependencies = [
  "errors",
  "filesys",
  "hex-literal",
- "idempotency",
  "jwt_light",
  "log",
  "once_cell",
@@ -9950,6 +9735,7 @@ dependencies = [
  "thiserror 2.0.18",
  "tokio",
  "toml 1.0.7+spec-1.1.0",
+ "uuid_utils",
  "workspace-build-acceleration",
 ]
 
@@ -10371,34 +10157,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
-[[package]]
-name = "scrape-test"
-version = "0.0.1"
-dependencies = [
- "clap 4.6.0",
- "errors",
- "tokio",
- "web_scrapers",
- "workspace-build-acceleration",
-]
-
-[[package]]
-name = "scraper"
-version = "0.17.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c95a930e03325234c18c7071fd2b60118307e025d6fff3e12745ffbf63a3d29c"
-dependencies = [
- "ahash 0.8.12",
- "cssparser 0.31.2",
- "ego-tree 0.6.2",
- "getopts",
- "html5ever 0.26.0",
- "once_cell",
- "selectors 0.25.0",
- "smallvec",
- "tendril",
-]
-
 [[package]]
 name = "scraper"
 version = "0.24.0"
@@ -10406,7 +10164,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5f3a24d916e78954af99281a455168d4a9515d65eca99a18da1b813689c4ad9"
 dependencies = [
  "cssparser 0.35.0",
- "ego-tree 0.10.0",
+ "ego-tree",
  "getopts",
  "html5ever 0.35.0",
  "precomputed-hash",
@@ -10557,25 +10315,6 @@ dependencies = [
  "smallvec",
 ]
 
-[[package]]
-name = "selectors"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06"
-dependencies = [
- "bitflags 2.11.0",
- "cssparser 0.31.2",
- "derive_more 0.99.17",
- "fxhash",
- "log",
- "new_debug_unreachable",
- "phf 0.10.1",
- "phf_codegen 0.10.0",
- "precomputed-hash",
- "servo_arc 0.3.0",
- "smallvec",
-]
-
 [[package]]
 name = "selectors"
 version = "0.30.0"
@@ -10949,15 +10688,6 @@ dependencies = [
  "stable_deref_trait",
 ]
 
-[[package]]
-name = "servo_arc"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d036d71a959e00c77a63538b90a6c2390969f9772b096ea837205c6bd0491a44"
-dependencies = [
- "stable_deref_trait",
-]
-
 [[package]]
 name = "servo_arc"
 version = "0.4.1"
@@ -10983,7 +10713,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
  "cfg-if",
- "cpufeatures 0.2.12",
+ "cpufeatures",
  "digest 0.10.7",
 ]
 
@@ -11001,7 +10731,7 @@ checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
 dependencies = [
  "block-buffer 0.9.0",
  "cfg-if",
- "cpufeatures 0.2.12",
+ "cpufeatures",
  "digest 0.9.0",
  "opaque-debug",
 ]
@@ -11013,7 +10743,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
  "cfg-if",
- "cpufeatures 0.2.12",
+ "cpufeatures",
  "digest 0.10.7",
 ]
 
@@ -11024,17 +10754,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c5f3b1e2dc8aad28310d8410bd4d7e180eca65fca176c52ab00d364475d0024"
 dependencies = [
  "cfg-if",
- "cpufeatures 0.2.12",
+ "cpufeatures",
  "digest 0.11.2",
 ]
 
 [[package]]
 name = "sha3"
-version = "0.11.0-rc.8"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95f78cd62cc39ece5aefbeb6caaa2ea44f70b4815d4b85f7e150ac685ada2bb5"
+checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
 dependencies = [
- "digest 0.11.2",
+ "digest 0.10.7",
  "keccak",
 ]
 
@@ -11585,7 +11315,6 @@ dependencies = [
  "component_traits",
  "composite_identifiers",
  "config",
- "cookies",
  "crockford",
  "datetimes",
  "derive_more 0.99.17",
@@ -11606,9 +11335,9 @@ dependencies = [
  "hashing",
  "hostname 0.4.0",
  "http_server_common",
- "idempotency",
  "images",
  "infer 0.16.0",
+ "jwt_signer",
  "language-tags",
  "lexical-sort",
  "limitation",
@@ -11662,6 +11391,7 @@ dependencies = [
  "users",
  "utoipa",
  "utoipa-swagger-ui",
+ "uuid_utils",
  "videos",
  "workspace-build-acceleration",
  "worldlabs_api_client",
@@ -13254,7 +12984,7 @@ dependencies = [
  "enums",
  "errors",
  "filesys",
- "google_drive_common",
+ "google_drive_downloader",
  "hashing",
  "hostname 0.4.0",
  "hyper 1.6.0",
@@ -13685,6 +13415,14 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "uuid_utils"
+version = "0.0.1"
+dependencies = [
+ "uuid 1.22.0",
+ "workspace-build-acceleration",
+]
+
 [[package]]
 name = "v_frame"
 version = "0.3.8"
@@ -13819,7 +13557,7 @@ dependencies = [
  "easyenv",
  "errors",
  "filesys",
- "google_drive_common",
+ "google_drive_downloader",
  "hashing",
  "hostname 0.4.0",
  "hyper 1.6.0",
@@ -13850,7 +13588,7 @@ dependencies = [
  "easyenv",
  "errors",
  "filesys",
- "google_drive_common",
+ "google_drive_downloader",
  "hostname 0.4.0",
  "hyper 1.6.0",
  "jobs_common",
@@ -14163,26 +13901,6 @@ dependencies = [
  "workspace-build-acceleration",
 ]
 
-[[package]]
-name = "web_scrapers"
-version = "0.0.1"
-dependencies = [
- "bytes",
- "chrono",
- "enums",
- "errors",
- "log",
- "once_cell",
- "reqwest 0.12.23",
- "rss",
- "scraper 0.17.1",
- "serde",
- "serde_derive",
- "serde_json",
- "strum 0.26.2",
- "workspace-build-acceleration",
-]
-
 [[package]]
 name = "webkit2gtk"
 version = "2.0.1"
@@ -15215,7 +14933,7 @@ dependencies = [
  "log4rs",
  "once_cell",
  "regex",
- "scraper 0.24.0",
+ "scraper",
  "serde",
  "serde_json",
  "sha2 0.11.0-rc.5",
@@ -15628,6 +15346,15 @@ dependencies = [
  "zstd 0.13.3",
 ]
 
+[[package]]
+name = "zip_archives"
+version = "0.0.1"
+dependencies = [
+ "errors",
+ "workspace-build-acceleration",
+ "zip 0.6.6",
+]
+
 [[package]]
 name = "zmij"
 version = "1.0.21"

Cargo.toml

@@ -10,7 +10,7 @@ members = [
   "crates/api_clients/artcraft/artcraft_client",
   "crates/api_clients/cloud_storage",
   "crates/api_clients/fal_client",
-  "crates/api_clients/google_drive_common",
+  "crates/api_clients/google_drive_downloader",
   "crates/api_clients/google_sign_in",
   "crates/api_clients/grok_client",
   "crates/api_clients/midjourney_client",
@@ -26,7 +26,6 @@ members = [
   # CLI tools for operations, etc.
   "crates/cli/devenv/dev-database-seed",
   "crates/cli/devenv/dev-upload-media-file",
-  "crates/cli/devenv/scrape-test",
   "crates/cli/production/db-backfill",
   "crates/cli/production/db-backup",
   "crates/cli/production/db-cleanup",
@@ -53,7 +52,7 @@ members = [
   "crates/lib/cloudflare_mitigation",
   "crates/lib/concurrency",
   "crates/lib/cookie_store",
-  "crates/lib/cookies",
+  "crates/lib/jwt_signer",
   "crates/lib/data/collections",
   "crates/lib/data/crockford",
   "crates/lib/data/datetimes",
@@ -61,12 +60,11 @@ members = [
   "crates/lib/data/web_base64",
   "crates/lib/deprecated/config", # TODO(bt, 2023-02-13): Deprecate or repurpose
   "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/email_sender",
+  "crates/lib/deprecated/email_sender",
   "crates/lib/errors",
   "crates/lib/ffmpeg_utils",
-  "crates/lib/files/archives",
+  "crates/lib/files/zip_archives",
   "crates/lib/files/file_to_base64_url",
   "crates/lib/files/filesys",
   "crates/lib/files/hashing",
@@ -75,31 +73,30 @@ members = [
   "crates/lib/files/mimetypes",
   "crates/lib/files/videos",
   "crates/lib/http_headers",
-  "crates/lib/idempotency",
+  "crates/lib/uuid_utils",
   "crates/api_clients/artcraft/artcraft_router",
-  "crates/lib/image_algorithms",
+  "crates/lib/deprecated/image_algorithms",
   "crates/lib/jobs_common",
   "crates/lib/jwt_light",
   "crates/lib/logging",
-  "crates/lib/machine_learning/ml_weights_registry",
-  "crates/lib/machine_learning/prompt_engineering",
+  "crates/lib/deprecated/machine_learning/ml_weights_registry",
+  "crates/lib/deprecated/machine_learning/prompt_engineering",
   "crates/lib/markdown",
-  "crates/lib/migration",
+  "crates/schema/database/migration",
   "crates/lib/password",
   "crates/lib/server_environment",
   "crates/lib/sqlx_mysql_helpers",
   "crates/lib/storyteller_root",
-  "crates/lib/subprocess_common",
+  "crates/lib/deprecated/subprocess_common",
   "crates/lib/test_data",
   "crates/lib/testing",
-  "crates/lib/tts_common",
+  "crates/lib/deprecated/tts_common",
   "crates/lib/url_config",
   "crates/lib/url_utils",
   "crates/lib/user_input_common",
   "crates/lib/users",
-  "crates/lib/web_scrapers",
   #"crates/lib/api_clients/fakeyou_client",
-  #"crates/lib/machine_learning/ml_models",
+  #"crates/lib/deprecated/machine_learning/ml_models",
 
   # Schema (database): queries, database layouts, Redis keys, etc.
   "crates/schema/database/elasticsearch_schema",
@@ -117,18 +114,18 @@ members = [
   "crates/schema/public/tokens",
 
   # Services: API servers, jobs, workers, etc.
-  "crates/service/job/analytics_job",
-  "crates/service/job/download_job",
-  "crates/service/job/email_sender_job",
-  "crates/service/job/es-update-job",
-  "crates/service/job/inference_job",
   "crates/service/job/seedance2_pro_job",
   "crates/service/job/video_thumbnail_job",
   "crates/service/job/worldlabs_job",
-  "crates/service/job/tts_download_job",
-  "crates/service/job/tts_inference_job",
-  "crates/service/job/w2l_download_job",
-  "crates/service/job/w2l_inference_job",
+  "crates/service/job/deprecated/analytics_job",
+  "crates/service/job/deprecated/download_job",
+  "crates/service/job/deprecated/email_sender_job",
+  "crates/service/job/deprecated/es-update-job",
+  "crates/service/job/deprecated/inference_job",
+  "crates/service/job/deprecated/tts_download_job",
+  "crates/service/job/deprecated/tts_inference_job",
+  "crates/service/job/deprecated/w2l_download_job",
+  "crates/service/job/deprecated/w2l_inference_job",
   "crates/service/web/dummy_service",
   "crates/service/web/storyteller_web",
 
@@ -136,7 +133,6 @@ members = [
   "crates/service/plugins/billing",
   "crates/service/plugins/billing_artcraft",
   "crates/service/plugins/component_traits",
-  "crates/service/plugins/inference_workloads",
   "crates/service/plugins/user_traits_component",
 
   # Vendored code
@@ -228,7 +224,7 @@ collections = { path = "crates/lib/data/collections" }
 component_traits = { path = "crates/service/plugins/component_traits" }
 concurrency = { path = "crates/lib/concurrency" }
 cookie_store = { path = "crates/lib/cookie_store" }
-cookies = { path = "crates/lib/cookies" }
+jwt_signer = { path = "crates/lib/jwt_signer" }
 crockford = { path = "crates/lib/data/crockford" }
 easyenv = { path = "crates/lib/easyenv" }
 enums = { path = "crates/schema/public/enums" }
@@ -240,7 +236,7 @@ file_to_base64_url = { path = "crates/lib/files/file_to_base64_url" }
 filesys = { path = "crates/lib/files/filesys" }
 grok_client = { path = "crates/api_clients/grok_client" }
 http_headers = { path = "crates/lib/http_headers" }
-idempotency = { path = "crates/lib/idempotency" }
+uuid_utils = { path = "crates/lib/uuid_utils" }
 images = { path = "crates/lib/files/images" }
 jobs_common = { path = "crates/lib/jobs_common" }
 jwt_light = { path = "crates/lib/jwt_light" }
@@ -255,7 +251,7 @@ primitives = { path = "crates/lib/data/primitives" }
 seedance2pro_client = { path = "crates/api_clients/seedance2pro_client" }
 shared_service_components = { path = "crates/lib/shared_service_components" }
 sqlite_tasks = { path = "crates/schema/database/sqlite_tasks" }
-subprocess_common = { path = "crates/lib/subprocess_common" }
+subprocess_common = { path = "crates/lib/deprecated/subprocess_common" }
 test_data = { path = "crates/lib/test_data" }
 testing = { path = "crates/lib/testing" }
 tokens = { path = "crates/schema/public/tokens" }
@@ -304,7 +300,7 @@ serde_derive = "1.0.228"
 serde_json = "1.0.149"
 serde_yaml = "0.9.34+deprecated"
 sha2 = "0.11.0-rc.5"
-sha3 = "0.11.0-rc.8"
+sha3 = "0.10.8"
 strum = { version = "0.28.0", features = ["derive"] }
 tauri = { version = "2.8.3", features = ["unstable", "devtools"] } # NB: "devtools" prevents App Store distribution; "ubstable" is needed for window access
 tauri-plugin-dialog = "2.3.3"

build/service_gpu.Dockerfile

@@ -178,11 +178,11 @@ RUN touch .env-secrets
 
 # Some services have default env files that live under their code directories
 # These should also be readable from the relative current path
-COPY crates/service/job/download_job/config/download-job.common.env .
-COPY crates/service/job/download_job/config/download-job.production.env .
+COPY crates/service/job/deprecated/download_job/config/download-job.common.env .
+COPY crates/service/job/deprecated/download_job/config/download-job.production.env .
 
-COPY crates/service/job/inference_job/config/inference-job.common.env .
-COPY crates/service/job/inference_job/config/inference-job.production.env .
+COPY crates/service/job/deprecated/inference_job/config/inference-job.common.env .
+COPY crates/service/job/deprecated/inference_job/config/inference-job.production.env .
 
 # # Need python to make use of other containers' venv
 # # TODO(bt,2023-04-26): This is only necessary for download-job and inference-job

crates/api_clients/artcraft/artcraft_client/Cargo.toml

@@ -28,7 +28,7 @@ cloudflare_errors.workspace = true
 enums.workspace = true
 enums_public.workspace = true
 errors.workspace = true
-idempotency.workspace = true
+uuid_utils.workspace = true
 mimetypes.workspace = true
 tokens.workspace = true
 

crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/legacy_upload_media_file_from_file.rs

@@ -16,7 +16,7 @@ use enums::common::generation_provider::GenerationProvider;
 use enums::common::visibility::Visibility;
 use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
 use reqwest::Client;

crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_bytes.rs

@@ -15,7 +15,7 @@ use enums::by_table::model_weights::weights_category::WeightsCategory;
 use enums::common::visibility::Visibility;
 use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
 use reqwest::Client;

crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_file.rs

@@ -16,7 +16,7 @@ use enums::common::generation_provider::GenerationProvider;
 use enums::common::visibility::Visibility;
 use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
 use reqwest::Client;

crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_new_engine_asset_from_file.rs

@@ -13,7 +13,7 @@ use enums::by_table::model_weights::weights_category::WeightsCategory;
 use enums::common::visibility::Visibility;
 use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
 use reqwest::Client;

crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_video_media_file_from_file.rs

@@ -13,7 +13,7 @@ use enums::by_table::model_weights::weights_category::WeightsCategory;
 use enums::common::visibility::Visibility;
 use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
 use reqwest::Client;

crates/api_clients/cloud_storage/Cargo.toml

@@ -16,13 +16,13 @@ path = "src/lib.rs"
 normal = ["workspace-build-acceleration"]
 
 [dependencies]
-# Workspace hack (faster compile times)
+# cargo-hakari workspace hack (faster compile times)
 workspace-build-acceleration.workspace = true
 
 # Internal
 bucket_paths.workspace = true
 crockford.workspace = true
-easyenv = { path = "../../lib/easyenv" }
+easyenv.workspace = true
 errors.workspace = true
 filesys.workspace = true
 hashing = { path = "../../lib/files/hashing" }
@@ -31,12 +31,11 @@ storyteller_root = { path = "../../lib/storyteller_root" }
 
 # External
 anyhow.workspace = true
-log.workspace = true
-env_logger = "0.11.3"
 async-trait = "0.1.75"
+env_logger.workspace = true
+log.workspace = true
+tokio.workspace = true
+
 # The "never-encode-slash" feature seems to have been removed:
 # https://github.com/durch/rust-s3/pull/254
 rust-s3 = { version = "0.36.0-beta.2", default-features = false, features = ["fail-on-err", "tags", "tokio-rustls-tls"] }
-
-# Runtime
-tokio.workspace = true

crates/api_clients/google_drive_downloader/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "google_drive_common"
+name = "google_drive_downloader"
 edition = "2018"
 version = "0.0.1"
 authors = [
@@ -12,7 +12,7 @@ publish = false
 normal = ["workspace-build-acceleration"]
 
 [lib]
-name = "google_drive_common"
+name = "google_drive_downloader"
 path = "src/lib.rs"
 
 [dependencies]
@@ -22,7 +22,7 @@ workspace-build-acceleration.workspace = true
 # Internal
 crockford.workspace = true
 errors.workspace = true
-subprocess_common = { path = "../../lib/subprocess_common" }
+subprocess_common = { path = "../../lib/deprecated/subprocess_common" }
 
 # External
 anyhow.workspace = true

crates/api_clients/openai_sora_client/Cargo.toml

@@ -17,7 +17,7 @@ workspace-build-acceleration.workspace = true
 
 # Internal
 errors.workspace = true
-idempotency.workspace = true
+uuid_utils.workspace = true
 
 # External
 anyhow.workspace = true

crates/api_clients/openai_sora_client/src/requests/auth_sentinel/generate_sentinel_token.rs

@@ -4,7 +4,7 @@ use crate::error::sora_error::SoraError;
 use crate::error::sora_generic_api_error::SoraGenericApiError;
 use crate::utils_internal::classify_general_http_error::classify_general_http_error;
 use errors::AnyhowResult;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::error;
 use serde_derive::{Deserialize, Serialize};
 use thiserror::Error;

crates/api_clients/openai_sora_client/src/requests/auth_sentinel/request.rs

@@ -3,7 +3,7 @@ use base64::prelude::BASE64_STANDARD;
 use base64::Engine;
 use chrono::FixedOffset;
 use chrono::Utc;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use rand::Rng;
 use sha3::{Digest, Sha3_512};
 

crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/generate_sentinel_token_2.rs

@@ -10,7 +10,7 @@ use crate::requests::auth_sentinel_2::response::SentinelResponse;
 use crate::utils_internal::classify_general_http_error::classify_general_http_error;
 use chrono::{DateTime, NaiveDateTime, TimeDelta, TimeZone, Utc};
 use errors::AnyhowResult;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{debug, error, info};
 use serde_derive::{Deserialize, Serialize};
 use std::io::Write;

crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/request.rs

@@ -1,4 +1,4 @@
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use serde_derive::Serialize;
 
 // TODO: Support more of these.

crates/api_clients/openart_client/Cargo.toml

@@ -19,8 +19,8 @@ workspace-build-acceleration.workspace = true
 # Internal
 crockford.workspace = true
 errors.workspace = true
-idempotency.workspace = true
-subprocess_common = { path = "../../lib/subprocess_common" }
+uuid_utils.workspace = true
+subprocess_common = { path = "../../lib/deprecated/subprocess_common" }
 
 # External
 anyhow.workspace = true

crates/api_clients/runwayml_client/Cargo.toml

@@ -19,9 +19,9 @@ workspace-build-acceleration.workspace = true
 # Internal
 crockford.workspace = true
 errors.workspace = true
-idempotency.workspace = true
+uuid_utils.workspace = true
 jwt_light.workspace = true
-subprocess_common = { path = "../../lib/subprocess_common" }
+subprocess_common = { path = "../../lib/deprecated/subprocess_common" }
 
 # External
 anyhow.workspace = true

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

@@ -28,7 +28,7 @@ enums.workspace = true
 errors.workspace = true
 filesys.workspace = true
 hashing = { path = "../../../lib/files/hashing" }
-idempotency.workspace = true
+uuid_utils.workspace = true
 mimetypes.workspace = true
 mysql_queries = { path = "../../../schema/database/mysql_queries" }
 storyteller_root = { path = "../../../lib/storyteller_root" }

crates/cli/devenv/dev-database-seed/src/seeding/zero_shot_tts.rs

@@ -11,7 +11,7 @@ use enums::by_table::zs_voices::model_type::ZsVoiceModelType;
 use enums::common::visibility::Visibility;
 use errors::{anyhow, AnyhowResult};
 use filesys::file_read_bytes::file_read_bytes;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes;
 use mysql_queries::queries::users::user::get::get_user_token_by_username::get_user_token_by_username;
 use mysql_queries::queries::voice_designer::datasets::create_dataset::{create_dataset, CreateDatasetArgs};

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

@@ -1,28 +0,0 @@
-[package]
-name = "scrape-test"
-publish = false
-edition = "2021"
-version = "0.0.1"
-authors = [
-    "Brandon Thomas <bt@brand.io>",
-    "Brandon Thomas <echelon@gmail.com>",
-]
-
-[[bin]]
-name = "scrape-test"
-path = "src/main.rs"
-
-[package.metadata.cargo-udeps.ignore]
-normal = ["workspace-build-acceleration"]
-
-[dependencies]
-# Workspace hack (faster compile times)
-workspace-build-acceleration = { workspace = true }
-
-# Internal
-errors = { path = "../../../lib/errors" }
-web_scrapers = { path = "../../../lib/web_scrapers" }
-
-# External
-clap = "4.4.8"
-tokio = { version = "1.38.0", features = ["macros"] }

crates/cli/devenv/scrape-test/src/main.rs

@@ -1,32 +0,0 @@
-use clap::Parser;
-
-use errors::AnyhowResult;
-use web_scrapers::scrape_supported_webpage::scrape_supported_webpage;
-
-#[derive(Parser, Debug)]
-#[command(name = "scrape-test")]
-pub struct Args {
-  #[arg(name="url", short='u', long = "url", help = "URL of the page to scrape", required = true)]
-  url: String,
-
-  #[arg(name="print_html", long = "html", help = "Print the HTML scraped", required = true)]
-  print_html: bool,
-}
-
-#[tokio::main]
-pub async fn main() -> AnyhowResult<()> {
-  let args = Args::parse();
-
-  let url = args.url.trim().to_string();
-  let print_html = args.print_html;
-
-  let scrape_result = scrape_supported_webpage(&url).await?;
-
-  if print_html {
-    println!("{}", scrape_result.original_html)
-  } else {
-    println!("{:#?}", scrape_result.result)
-  }
-
-  Ok(())
-}

crates/desktop/artcraft/Cargo.toml

@@ -35,7 +35,7 @@ enums.workspace = true
 errors.workspace = true
 filesys.workspace = true
 grok_client.workspace = true
-idempotency.workspace = true
+uuid_utils.workspace = true
 images.workspace = true
 memory_store.workspace = true
 midjourney_client.workspace = true

crates/desktop/artcraft/src/core/commands/enqueue/image_bg_removal/artcraft/handle_generic_bg_removal_artcraft.rs

@@ -16,7 +16,7 @@ use anyhow::anyhow;
 use artcraft_api_defs::generate::image::bg_removal::remove_image_background::RemoveImageBackgroundRequest;
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info};
 use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
 use artcraft_client::endpoints::generate::image::bg_removal::remove_image_background::remove_image_background;

crates/desktop/artcraft/src/core/commands/enqueue/image_edit/artcraft/handle_artcraft_flux_kontext_edit.rs

@@ -15,7 +15,7 @@ use artcraft_api_defs::generate::image::edit::flux_pro_kontext_max_edit_image::{
 use artcraft_api_defs::generate::image::edit::gpt_image_1_edit_image::{GptImage1EditImageImageQuality, GptImage1EditImageImageSize, GptImage1EditImageNumImages, GptImage1EditImageRequest};
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info};
 use artcraft_client::endpoints::generate::image::edit::flux_pro_kontext_max_edit_image::flux_pro_kontext_max_edit_image;
 use artcraft_client::endpoints::generate::image::edit::gpt_image_1_edit_image::gpt_image_1_edit_image;

crates/desktop/artcraft/src/core/commands/enqueue/image_edit/artcraft/handle_artcraft_gpt_image_1_edit.rs

@@ -14,7 +14,7 @@ use anyhow::anyhow;
 use artcraft_api_defs::generate::image::edit::gpt_image_1_edit_image::{GptImage1EditImageImageQuality, GptImage1EditImageImageSize, GptImage1EditImageNumImages, GptImage1EditImageRequest};
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info};
 use artcraft_client::endpoints::generate::image::edit::gpt_image_1_edit_image::gpt_image_1_edit_image;
 use tauri::AppHandle;

crates/desktop/artcraft/src/core/commands/enqueue/image_edit/sora/handle_sora_gpt_image_1_edit.rs

@@ -20,7 +20,7 @@ use anyhow::anyhow;
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
 use errors::AnyhowResult;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info, warn};
 use openai_sora_client::recipes::image_remix_with_session_auto_renew::{image_remix_with_session_auto_renew, ImageRemixAutoRenewRequest};
 use openai_sora_client::recipes::image_upload_from_file_with_session_auto_renew::{image_upload_from_file_with_session_auto_renew, ImageUploadFromFileAutoRenewRequest};

crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/handle_artcraft_flux_dev_juggernaut_inpaint.rs

@@ -18,7 +18,7 @@ use artcraft_api_defs::generate::image::edit::gpt_image_1_edit_image::{GptImage1
 use artcraft_api_defs::generate::image::inpaint::flux_dev_juggernaut_inpaint_image::{FluxDevJuggernautInpaintImageNumImages, FluxDevJuggernautInpaintImageRequest};
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use images::encoding::image_bytes_to_png_bytes::image_bytes_to_png_bytes;
 use images::encoding::image_bytes_to_png_bytes_with_dimensions::image_bytes_to_png_bytes_with_dimensions;
 use images::mask_images::normalize_image_bytes_to_flux_mask::normalize_image_bytes_to_flux_mask;

crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/handle_artcraft_flux_pro_1_inpaint.rs

@@ -18,7 +18,7 @@ use artcraft_api_defs::generate::image::edit::gpt_image_1_edit_image::{GptImage1
 use artcraft_api_defs::generate::image::inpaint::flux_pro_1_inpaint_image::{FluxPro1InpaintImageNumImages, FluxPro1InpaintImageRequest};
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use images::encoding::image_bytes_to_png_bytes::image_bytes_to_png_bytes;
 use images::encoding::image_bytes_to_png_bytes_with_dimensions::image_bytes_to_png_bytes_with_dimensions;
 use images::mask_images::normalize_image_bytes_to_flux_mask::normalize_image_bytes_to_flux_mask;

crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/handle_artcraft_flux_pro_kontext_inpaint.rs

@@ -19,7 +19,7 @@ use artcraft_api_defs::generate::image::edit::gpt_image_1_edit_image::{GptImage1
 use artcraft_api_defs::generate::image::inpaint::flux_pro_1_inpaint_image::{FluxPro1InpaintImageNumImages, FluxPro1InpaintImageRequest};
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use images::encoding::image_bytes_to_png_bytes::image_bytes_to_png_bytes;
 use images::encoding::image_bytes_to_png_bytes_with_dimensions::image_bytes_to_png_bytes_with_dimensions;
 use images::mask_images::normalize_image_bytes_to_flux_mask::normalize_image_bytes_to_flux_mask;

crates/desktop/artcraft/src/core/commands/enqueue/image_inpaint/artcraft/handle_artcraft_nano_banana_inpaint.rs

@@ -20,7 +20,7 @@ use artcraft_api_defs::generate::image::edit::gpt_image_1_edit_image::{GptImage1
 use artcraft_api_defs::generate::image::inpaint::flux_pro_1_inpaint_image::{FluxPro1InpaintImageNumImages, FluxPro1InpaintImageRequest};
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use images::encoding::image_bytes_to_png_bytes::image_bytes_to_png_bytes;
 use images::encoding::image_bytes_to_png_bytes_with_dimensions::image_bytes_to_png_bytes_with_dimensions;
 use images::mask_images::normalize_image_bytes_to_flux_mask::normalize_image_bytes_to_flux_mask;

crates/desktop/artcraft/src/core/commands/enqueue/image_to_gaussian/worldlabs/handle_worldlabs_marble.rs

@@ -13,7 +13,7 @@ use crate::services::storyteller::state::storyteller_credential_manager::Storyte
 use crate::services::worldlabs::state::worldlabs_credential_manager::WorldlabsCredentialManager;
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info};
 use std::path::PathBuf;
 use artcraft_client::endpoints::media_files::get_media_file::get_media_file;

crates/desktop/artcraft/src/core/commands/enqueue/image_to_object/artcraft/handle_artcraft_object.rs

@@ -12,7 +12,7 @@ use artcraft_api_defs::generate::object::generate_hunyuan_2_0_image_to_3d::Gener
 use artcraft_api_defs::generate::object::generate_hunyuan_2_1_image_to_3d::GenerateHunyuan21ImageTo3dRequest;
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info};
 use artcraft_client::endpoints::generate::object::generate_hunyuan_3d_2_0_image_to_3d::generate_hunyuan3d_2_0_image_to_3d;
 use artcraft_client::endpoints::generate::object::generate_hunyuan_3d_2_1_image_to_3d::generate_hunyuan3d_2_1_image_to_3d;

crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_kling_1p6_pro.rs

@@ -15,7 +15,7 @@ use crate::services::storyteller::state::storyteller_credential_manager::Storyte
 use artcraft_api_defs::generate::video::generate_kling_1_6_pro_image_to_video::{GenerateKling16ProAspectRatio, GenerateKling16ProDuration, GenerateKling16ProImageToVideoRequest};
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info};
 use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
 use artcraft_client::endpoints::generate::video::generate_kling_16_pro_image_to_video::generate_kling_16_pro_image_to_video;

crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_kling_2p1_master.rs

@@ -15,7 +15,7 @@ use crate::services::storyteller::state::storyteller_credential_manager::Storyte
 use artcraft_api_defs::generate::video::generate_kling_2_1_master_image_to_video::{GenerateKling21MasterAspectRatio, GenerateKling21MasterDuration, GenerateKling21MasterImageToVideoRequest};
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info};
 use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
 use artcraft_client::endpoints::generate::video::generate_kling_21_master_image_to_video::generate_kling_21_master_image_to_video;

crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_kling_2p1_pro.rs

@@ -15,7 +15,7 @@ use crate::services::storyteller::state::storyteller_credential_manager::Storyte
 use artcraft_api_defs::generate::video::generate_kling_2_1_pro_image_to_video::{GenerateKling21ProAspectRatio, GenerateKling21ProDuration, GenerateKling21ProImageToVideoRequest};
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info};
 use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
 use artcraft_client::endpoints::generate::video::generate_kling_21_pro_image_to_video::generate_kling_21_pro_image_to_video;

crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_kling_2p5_turbo_pro.rs

@@ -15,7 +15,7 @@ use crate::services::storyteller::state::storyteller_credential_manager::Storyte
 use artcraft_api_defs::generate::video::multi_function::kling_2_5_turbo_multi_function_video_gen::{Kling2p5TurboProMultiFunctionVideoGenAspectRatio, Kling2p5TurboProMultiFunctionVideoGenDuration, Kling2p5TurboProMultiFunctionVideoGenRequest};
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info};
 use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
 use artcraft_client::endpoints::generate::video::multi_function::kling_2p5_turbo_pro_multi_function_video_gen::kling_2p5_turbo_pro_multi_function_video_gen;

crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_kling_2p6_pro.rs

@@ -16,7 +16,7 @@ use artcraft_api_defs::generate::video::generate_kling_1_6_pro_image_to_video::{
 use artcraft_api_defs::generate::video::multi_function::kling_2_6_multi_function_video_gen::{Kling2p6ProMultiFunctionVideoGenAspectRatio, Kling2p6ProMultiFunctionVideoGenDuration, Kling2p6ProMultiFunctionVideoGenRequest};
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info};
 use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
 use artcraft_client::endpoints::generate::video::generate_kling_16_pro_image_to_video::generate_kling_16_pro_image_to_video;

crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_seedance_1_lite.rs

@@ -15,7 +15,7 @@ use crate::services::storyteller::state::storyteller_credential_manager::Storyte
 use artcraft_api_defs::generate::video::generate_seedance_1_0_lite_image_to_video::{GenerateSeedance10LiteDuration, GenerateSeedance10LiteImageToVideoRequest, GenerateSeedance10LiteResolution};
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info};
 use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
 use artcraft_client::endpoints::generate::video::generate_kling_16_pro_image_to_video::generate_kling_16_pro_image_to_video;

crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_sora2.rs

@@ -16,7 +16,7 @@ use artcraft_api_defs::generate::video::generate_kling_1_6_pro_image_to_video::{
 use artcraft_api_defs::generate::video::multi_function::sora_2_multi_function_video_gen::{Sora2MultiFunctionVideoGenAspectRatio, Sora2MultiFunctionVideoGenDuration, Sora2MultiFunctionVideoGenRequest, Sora2MultiFunctionVideoGenResolution};
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info};
 use openai_sora_client::recipes::generate_sora2_video::generate_sora2_video_with_session_auto_renew::generate_sora2_video_with_session_auto_renew;
 use openai_sora_client::recipes::list_sora2_drafts::list_sora2_drafts_with_session_auto_renew::list_sora2_drafts_with_session_auto_renew;

crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_sora2_pro.rs

@@ -15,7 +15,7 @@ use crate::services::storyteller::state::storyteller_credential_manager::Storyte
 use artcraft_api_defs::generate::video::multi_function::sora_2_pro_multi_function_video_gen::{Sora2ProMultiFunctionVideoGenAspectRatio, Sora2ProMultiFunctionVideoGenDuration, Sora2ProMultiFunctionVideoGenRequest, Sora2ProMultiFunctionVideoGenResolution};
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info};
 use openai_sora_client::recipes::generate_sora2_video::generate_sora2_video_with_session_auto_renew::generate_sora2_video_with_session_auto_renew;
 use openai_sora_client::recipes::list_sora2_drafts::list_sora2_drafts_with_session_auto_renew::list_sora2_drafts_with_session_auto_renew;

crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_veo2.rs

@@ -15,7 +15,7 @@ use crate::services::storyteller::state::storyteller_credential_manager::Storyte
 use artcraft_api_defs::generate::video::generate_veo_2_image_to_video::{GenerateVeo2AspectRatio, GenerateVeo2ImageToVideoRequest};
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info};
 use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
 use artcraft_client::endpoints::generate::video::generate_veo_2_image_to_video::generate_veo_2_image_to_video;

crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_veo3.rs

@@ -16,7 +16,7 @@ use artcraft_api_defs::generate::video::generate_kling_1_6_pro_image_to_video::{
 use artcraft_api_defs::generate::video::generate_veo_3_image_to_video::{GenerateVeo3AspectRatio, GenerateVeo3ImageToVideoRequest};
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info};
 use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
 use artcraft_client::endpoints::generate::video::generate_veo_3_image_to_video::generate_veo_3_image_to_video;

crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_veo3_fast.rs

@@ -16,7 +16,7 @@ use artcraft_api_defs::generate::video::generate_kling_1_6_pro_image_to_video::{
 use artcraft_api_defs::generate::video::generate_veo_3_fast_image_to_video::GenerateVeo3FastImageToVideoRequest;
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info};
 use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
 use artcraft_client::endpoints::generate::video::generate_veo_3_fast_image_to_video::generate_veo_3_fast_image_to_video;

crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_veo3p1.rs

@@ -16,7 +16,7 @@ use artcraft_api_defs::generate::video::generate_kling_1_6_pro_image_to_video::{
 use artcraft_api_defs::generate::video::multi_function::veo_3p1_multi_function_video_gen::{Veo3p1MultiFunctionVideoGenAspectRatio, Veo3p1MultiFunctionVideoGenDuration, Veo3p1MultiFunctionVideoGenRequest, Veo3p1MultiFunctionVideoGenResolution};
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info};
 use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
 use artcraft_client::endpoints::generate::video::multi_function::veo_3p1_multi_function_video_gen::veo_3p1_multi_function_video_gen;

crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_veo3p1_fast.rs

@@ -15,7 +15,7 @@ use crate::services::storyteller::state::storyteller_credential_manager::Storyte
 use artcraft_api_defs::generate::video::multi_function::veo_3p1_fast_multi_function_video_gen::{Veo3p1FastMultiFunctionVideoGenAspectRatio, Veo3p1FastMultiFunctionVideoGenDuration, Veo3p1FastMultiFunctionVideoGenRequest, Veo3p1FastMultiFunctionVideoGenResolution};
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info};
 use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
 use artcraft_client::endpoints::generate::video::multi_function::veo_3p1_fast_multi_function_video_gen::veo_3p1_fast_multi_function_video_gen;

crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/artcraft/handle_artcraft_gpt_image_1_text_to_image.rs

@@ -14,7 +14,7 @@ use crate::services::storyteller::state::storyteller_credential_manager::Storyte
 use artcraft_api_defs::generate::image::text::generate_gpt_image_1_text_to_image::{GenerateGptImage1TextToImageImageQuality, GenerateGptImage1TextToImageImageSize, GenerateGptImage1TextToImageNumImages, GenerateGptImage1TextToImageRequest};
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info};
 use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
 use openai_sora_client::recipes::simple_image_gen_with_session_auto_renew::{simple_image_gen_with_session_auto_renew, SimpleImageGenAutoRenewRequest};

crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/grok/handle_grok.rs

@@ -9,7 +9,7 @@ use crate::services::grok::state::grok_image_prompt_queue::{GrokImagePromptQueue
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
 use grok_client::requests::image_websocket::messages::websocket_client_message::ClientMessageAspectRatio;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use tauri::AppHandle;
 
 pub async fn handle_grok(

crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/midjourney/handle_midjourney.rs

@@ -17,7 +17,7 @@ use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
 use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
 use enums::common::generation_provider::GenerationProvider;
 use enums::tauri::tasks::task_type::TaskType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info};
 use midjourney_client::client::midjourney_hostname::MidjourneyHostname;
 use midjourney_client::endpoints::submit_job::{submit_job, SubmitJobRequest};

crates/desktop/artcraft/src/services/grok/threads/grok_image_websocket_thread/grok_image_websocket_thread.rs

@@ -25,7 +25,7 @@ use grok_client::requests::image_websocket::grok_wrapped_websocket::GrokWrappedW
 use grok_client::requests::image_websocket::listen_for_websocket_images::{listen_for_websocket_images, ImageResults, ListenForWebsocketImagesArgs};
 use grok_client::requests::image_websocket::messages::websocket_client_message::ClientMessageAspectRatio;
 use grok_client::requests::image_websocket::prompt_websocket_image::{prompt_websocket_image, PromptWebsocketImageArgs};
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info, warn};
 use sqlite_tasks::queries::get_task_by_provider_and_provider_job_id::{get_task_by_provider_and_provider_job_id, GetTaskByProviderAndProviderJobIdArgs};
 use sqlite_tasks::queries::list_tasks_by_provider_and_status::{list_tasks_by_provider_and_status, ListTasksByProviderAndStatusArgs};

crates/desktop/artcraft/src/services/grok/threads/grok_video_task_polling/grok_video_task_polling_thread.rs

@@ -25,7 +25,7 @@ use grok_client::error::grok_error::GrokError;
 use grok_client::requests::download_video_file::download_video_file::{download_video_file, DownloadVideoFileArgs};
 use grok_client::requests::download_video_file::grok_download_video::GrokDownloadVideo;
 use grok_client::requests::media_posts::list_media_posts::grok_list_media_posts::{GrokMediaPostList, GrokMediaPostListRequest, VideoData};
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info};
 use midjourney_client::client::midjourney_hostname::MidjourneyHostname;
 use midjourney_client::credentials::midjourney_user_id::MidjourneyUserId;

crates/desktop/artcraft/src/services/midjourney/threads/midjourney_long_polling_thread.rs

@@ -19,7 +19,7 @@ use enums::common::model_type::ModelType;
 use enums::tauri::tasks::task_media_file_class::TaskMediaFileClass;
 use enums::tauri::tasks::task_status::TaskStatus;
 use errors::AnyhowResult;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info};
 use midjourney_client::client::midjourney_hostname::MidjourneyHostname;
 use midjourney_client::credentials::midjourney_user_id::MidjourneyUserId;

crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/handle_successful_generations.rs

@@ -20,7 +20,7 @@ use enums::common::model_type::ModelType;
 use enums::tauri::tasks::task_media_file_class::TaskMediaFileClass;
 use enums::tauri::tasks::task_status;
 use errors::AnyhowResult;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info, warn};
 use once_cell::sync::Lazy;
 use openai_sora_client::creds::sora_credential_set::SoraCredentialSet;

crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/poll_classic_sora_tasks.rs

@@ -19,7 +19,7 @@ use enums::common::generation_provider::GenerationProvider;
 use enums::common::model_type::ModelType;
 use enums::tauri::tasks::task_status;
 use errors::AnyhowResult;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info, warn};
 use once_cell::sync::Lazy;
 use openai_sora_client::creds::sora_credential_set::SoraCredentialSet;

crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/poll_sora_2_tasks.rs

@@ -19,7 +19,7 @@ use enums::common::generation_provider::GenerationProvider;
 use enums::common::model_type::ModelType;
 use enums::tauri::tasks::task_status;
 use errors::AnyhowResult;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info, warn};
 use once_cell::sync::Lazy;
 use openai_sora_client::creds::sora_credential_set::SoraCredentialSet;

crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/sora_task_polling_thread.rs

@@ -20,7 +20,7 @@ use enums::common::generation_provider::GenerationProvider;
 use enums::common::model_type::ModelType;
 use enums::tauri::tasks::task_status;
 use errors::AnyhowResult;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info, warn};
 use once_cell::sync::Lazy;
 use openai_sora_client::creds::sora_credential_set::SoraCredentialSet;

crates/desktop/artcraft/src/services/worldlabs/threads/worldlabs_marble_task_polling.rs

@@ -28,7 +28,7 @@ use grok_client::error::grok_error::GrokError;
 use grok_client::requests::download_video_file::download_video_file::{download_video_file, DownloadVideoFileArgs};
 use grok_client::requests::download_video_file::grok_download_video::GrokDownloadVideo;
 use grok_client::requests::media_posts::list_media_posts::grok_list_media_posts::{GrokMediaPostList, GrokMediaPostListRequest, VideoData};
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::{error, info};
 use midjourney_client::client::midjourney_hostname::MidjourneyHostname;
 use midjourney_client::credentials::midjourney_user_id::MidjourneyUserId;

crates/desktop/tauri-realtime/Cargo.toml

@@ -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 = "../../lib/deprecated/machine_learning/ml_weights_registry" }
 primitives = { path = "../../lib/data/primitives" }
 
 # Internal ML
@@ -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 = "../../lib/deprecated/machine_learning/ml_models" }
 
 [dev-dependencies]
 libloading = "0.8.6"

crates/lib/actix_artcraft/Cargo.toml

@@ -22,7 +22,7 @@ workspace-build-acceleration.workspace = true
 
 # Internal
 actix_helpers.workspace = true
-cookies.workspace = true
+jwt_signer.workspace = true
 enums.workspace = true
 errors.workspace = true
 http_headers.workspace = true

crates/lib/actix_artcraft/src/sessions/payload_signer.rs

@@ -1,7 +1,7 @@
 use std::collections::BTreeMap;
 
 use crate::sessions::http_user_session_payload::HttpUserSessionPayload;
-use cookies::jwt_signer::JwtSigner;
+use jwt_signer::jwt_signer::JwtSigner;
 use errors::AnyhowResult;
 use tokens::tokens::user_sessions::UserSessionToken;
 use tokens::tokens::users::UserToken;

crates/lib/data/primitives/Cargo.toml

@@ -17,19 +17,24 @@ path = "src/lib.rs"
 normal = ["workspace-build-acceleration"]
 
 [dependencies]
-# Workspace hack (faster compile times)
-workspace-build-acceleration = { version = "0.1", path = "../../../workspace-build-acceleration" }
+# cargo-hakari workspace hack (faster compile times)
+workspace-build-acceleration.workspace = true
 
 # NB: This is designed to be a central crate with few dependencies.
 # Consider the dependencies here wisely.
 # This is used in MySQL, etc., so dependencies are ill-advised.
 
 # Internal
-#errors = { path = "../../errors" }
+# **DO NOT ADD ANY!**
+# (None)
 
 # External
+# **DO NOT ADD ANY!**
 # (None)
 
 [dev-dependencies]
-testing = { path = "../../testing" }
+# Internal
+testing.workspace = true
+
+# External
 assertor = "0.0.3"

crates/lib/deprecated/email_sender/Cargo.toml

@@ -14,10 +14,10 @@ normal = ["workspace-build-acceleration"]
 
 [dependencies]
 # Internal
-errors = { path = "../errors" }
+errors = { path = "../../errors" }
 
 # Workspace hack (faster compile times)
-workspace-build-acceleration = { version = "0.1", path = "../../workspace-build-acceleration" }
+workspace-build-acceleration = { version = "0.1", path = "../../../workspace-build-acceleration" }
 
 # External
 lettre = { version = "0.11.2", default-features = false, features = ["smtp-transport", "pool", "hostname", "builder", "rustls-tls"] }

crates/lib/deprecated/image_algorithms/Cargo.toml

@@ -18,13 +18,13 @@ normal = ["workspace-build-acceleration"]
 [dependencies]
 
 # Workspace hack (faster compile times)
-workspace-build-acceleration = { version = "0.1", path = "../../workspace-build-acceleration" }
+workspace-build-acceleration = { version = "0.1", path = "../../../workspace-build-acceleration" }
 
 # Internal
-errors = { path = "../errors" }
+errors = { path = "../../errors" }
 
 # External
 image = "0.25.6"
 
 [dev-dependencies]
-testing = { path = "../testing" }
+testing = { path = "../../testing" }

crates/lib/deprecated/machine_learning/ml_models/Cargo.toml

@@ -22,11 +22,11 @@ normal = ["workspace-build-acceleration"]
 workspace-build-acceleration = { workspace =  true }
 
 # Internal
-filesys = { path = "../../files/filesys" }
-image_algorithms = { path = "../../image_algorithms" }
-memory_caching = { path = "../../caching/memory_caching" }
+filesys = { path = "../../../files/filesys" }
+image_algorithms = { path = "../image_algorithms" }
+memory_caching = { path = "../../../caching/memory_caching" }
 ml_weights_registry = { path = "../ml_weights_registry" }
-primitives = { path = "../../data/primitives" }
+primitives = { path = "../../../data/primitives" }
 
 # Bypass cudarc issues on Windows https://github.com/coreylowman/cudarc/issues/332
 cudarc = "0.13.7"
@@ -35,9 +35,9 @@ cudarc = "0.13.7"
 anyhow = { workspace = true }
 base64 = { workspace = true }
 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"