move a few more utilities to common code (tokens, uuids)

Cargo.lock

@@ -1081,6 +1081,8 @@ name = "container_common"
 version = "0.0.1"
 dependencies = [
  "anyhow",
+ "rand 0.8.4",
+ "uuid",
 ]
 
 [[package]]

crates/lib/container_common/Cargo.toml

@@ -16,3 +16,5 @@ path = "src/lib.rs"
 
 # External
 anyhow = "1.0.40"
+rand = "0.8.3"
+uuid = { version = "0.8.2", features = ["v4"] }

crates/lib/container_common/src/lib.rs

@@ -1 +1,2 @@
 pub mod anyhow_result;
+pub mod token;

crates/lib/container_common/src/token/mod.rs

@@ -0,0 +1,3 @@
+pub mod random_crockford_token;
+pub mod random_prefix_crockford_token;
+pub mod random_uuid;

crates/lib/container_common/src/token/random_crockford_token.rs

@@ -18,7 +18,7 @@ pub fn random_crockford_token(length: usize) -> String {
 
 #[cfg(test)]
 mod tests {
-  use crate::util::random_crockford_token::random_crockford_token;
+  use crate::token::random_crockford_token::random_crockford_token;
 
   #[test]
   fn random_token_length() {

crates/lib/container_common/src/token/random_prefix_crockford_token.rs

@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use container_common::anyhow_result::AnyhowResult;
+use crate::anyhow_result::AnyhowResult;
 use rand::Rng;
 
 // Crockford characters
@@ -44,7 +44,7 @@ pub fn random_prefix_crockford_token(prefix: &str, length: usize, uppercase: boo
 
 #[cfg(test)]
 mod tests {
-  use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
+  use crate::token::random_prefix_crockford_token::random_prefix_crockford_token;
 
   #[test]
   fn no_prefix_error() {

crates/service/storyteller_web/src/database/helpers/tokens.rs

@@ -1,12 +1,10 @@
 use container_common::anyhow_result::AnyhowResult;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
+use container_common::token::random_prefix_crockford_token::random_prefix_crockford_token;
 
 /// Central place to define all the token types.
 // TODO: Make tokens strongly typed.
 pub struct Tokens {}
 
-//TODO TODO TODO
-
 impl Tokens {
 
   // ========== Tokens with high visibility (make these nice) ==========

crates/service/storyteller_web/src/database/mediators/badge_granter.rs

@@ -2,7 +2,6 @@ use anyhow::anyhow;
 use container_common::anyhow_result::AnyhowResult;
 use crate::database::helpers::tokens::Tokens;
 use crate::database::mediators::firehose_publisher::FirehosePublisher;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use log::{warn,info};
 use sqlx::error::Error::Database;
 use sqlx::mysql::MySqlQueryResult;

crates/service/storyteller_web/src/database/mediators/firehose_publisher.rs

@@ -1,7 +1,6 @@
 use anyhow::anyhow;
 use container_common::anyhow_result::AnyhowResult;
 use crate::database::helpers::tokens::Tokens;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use log::{warn,info};
 use sqlx::error::Error::Database;
 use sqlx::mysql::MySqlQueryResult;

crates/service/storyteller_web/src/database/queries/create_session.rs

@@ -1,8 +1,6 @@
 use anyhow::anyhow;
 use crate::AnyhowResult;
 use crate::database::helpers::tokens::Tokens;
-use crate::util::random_crockford_token::random_crockford_token;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use log::{info, warn};
 use sqlx::MySqlPool;
 

crates/service/storyteller_web/src/http_server/endpoints/categories/assign_tts_category.rs

@@ -18,8 +18,6 @@ use crate::http_server::web_utils::response_success_helpers::simple_json_success
 use crate::server_state::ServerState;
 use crate::util::email_to_gravatar::email_to_gravatar;
 use crate::util::markdown_to_html::markdown_to_html;
-use crate::util::random_crockford_token::random_crockford_token;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use crate::validations::check_for_slurs::contains_slurs;
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
 use log::{info, warn, log};

crates/service/storyteller_web/src/http_server/endpoints/categories/create_category.rs

@@ -15,8 +15,6 @@ use crate::http_server::web_utils::response_success_helpers::simple_json_success
 use crate::server_state::ServerState;
 use crate::util::email_to_gravatar::email_to_gravatar;
 use crate::util::markdown_to_html::markdown_to_html;
-use crate::util::random_crockford_token::random_crockford_token;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use crate::validations::check_for_slurs::contains_slurs;
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
 use log::{info, warn, log};

crates/service/storyteller_web/src/http_server/endpoints/categories/get_category.rs

@@ -17,8 +17,6 @@ use crate::http_server::web_utils::response_success_helpers::simple_json_success
 use crate::server_state::ServerState;
 use crate::util::email_to_gravatar::email_to_gravatar;
 use crate::util::markdown_to_html::markdown_to_html;
-use crate::util::random_crockford_token::random_crockford_token;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use crate::validations::check_for_slurs::contains_slurs;
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
 use log::{info, warn, log};

crates/service/storyteller_web/src/http_server/endpoints/categories/list_tts_categories.rs

@@ -16,8 +16,6 @@ use crate::http_server::web_utils::response_success_helpers::simple_json_success
 use crate::server_state::ServerState;
 use crate::util::email_to_gravatar::email_to_gravatar;
 use crate::util::markdown_to_html::markdown_to_html;
-use crate::util::random_crockford_token::random_crockford_token;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use crate::validations::check_for_slurs::contains_slurs;
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
 use lexical_sort::natural_lexical_cmp;

crates/service/storyteller_web/src/http_server/endpoints/categories/list_tts_model_assigned_categories.rs

@@ -15,8 +15,6 @@ use crate::http_server::web_utils::response_success_helpers::simple_json_success
 use crate::server_state::ServerState;
 use crate::util::email_to_gravatar::email_to_gravatar;
 use crate::util::markdown_to_html::markdown_to_html;
-use crate::util::random_crockford_token::random_crockford_token;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use crate::validations::check_for_slurs::contains_slurs;
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
 use log::{info, warn, log};

crates/service/storyteller_web/src/http_server/endpoints/moderation/categories/delete_category.rs

@@ -14,8 +14,6 @@ use crate::http_server::web_utils::response_success_helpers::simple_json_success
 use crate::server_state::ServerState;
 use crate::util::email_to_gravatar::email_to_gravatar;
 use crate::util::markdown_to_html::markdown_to_html;
-use crate::util::random_crockford_token::random_crockford_token;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use crate::validations::check_for_slurs::contains_slurs;
 use log::{info, warn, log};
 use regex::Regex;

crates/service/storyteller_web/src/http_server/endpoints/moderation/categories/edit_category.rs

@@ -15,8 +15,6 @@ use crate::http_server::web_utils::response_success_helpers::simple_json_success
 use crate::server_state::ServerState;
 use crate::util::email_to_gravatar::email_to_gravatar;
 use crate::util::markdown_to_html::markdown_to_html;
-use crate::util::random_crockford_token::random_crockford_token;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use crate::validations::check_for_slurs::contains_slurs;
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
 use log::{info, warn, log};

crates/service/storyteller_web/src/http_server/endpoints/moderation/categories/list_tts_categories_for_moderation.rs

@@ -16,8 +16,6 @@ use crate::http_server::web_utils::response_success_helpers::simple_json_success
 use crate::server_state::ServerState;
 use crate::util::email_to_gravatar::email_to_gravatar;
 use crate::util::markdown_to_html::markdown_to_html;
-use crate::util::random_crockford_token::random_crockford_token;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use crate::validations::check_for_slurs::contains_slurs;
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
 use log::{info, warn, log};

crates/service/storyteller_web/src/http_server/endpoints/moderation/ip_bans/add_ip_ban.rs

@@ -10,7 +10,6 @@ use crate::http_server::web_utils::ip_address::get_request_ip;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::http_server::web_utils::response_success_helpers::simple_json_success;
 use crate::server_state::ServerState;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use crate::validations::check_for_slurs::contains_slurs;
 use crate::validations::ip_addresses::validate_moderator_provided_ip_address;
 use crate::validations::model_uploads::validate_model_title;

crates/service/storyteller_web/src/http_server/endpoints/moderation/ip_bans/delete_ip_ban.rs

@@ -11,7 +11,6 @@ use crate::http_server::web_utils::ip_address::get_request_ip;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::http_server::web_utils::response_success_helpers::simple_json_success;
 use crate::server_state::ServerState;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use crate::validations::check_for_slurs::contains_slurs;
 use crate::validations::model_uploads::validate_model_title;
 use crate::validations::passwords::validate_passwords;

crates/service/storyteller_web/src/http_server/endpoints/moderation/ip_bans/get_ip_ban.rs

@@ -12,7 +12,6 @@ use crate::http_server::web_utils::ip_address::get_request_ip;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::http_server::web_utils::response_success_helpers::simple_json_success;
 use crate::server_state::ServerState;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use crate::validations::check_for_slurs::contains_slurs;
 use crate::validations::model_uploads::validate_model_title;
 use crate::validations::passwords::validate_passwords;

crates/service/storyteller_web/src/http_server/endpoints/moderation/ip_bans/list_ip_bans.rs

@@ -12,7 +12,6 @@ use crate::http_server::web_utils::ip_address::get_request_ip;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::http_server::web_utils::response_success_helpers::simple_json_success;
 use crate::server_state::ServerState;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use crate::validations::check_for_slurs::contains_slurs;
 use crate::validations::model_uploads::validate_model_title;
 use crate::validations::passwords::validate_passwords;

crates/service/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_roles.rs

@@ -14,7 +14,6 @@ use crate::http_server::web_utils::ip_address::get_request_ip;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::http_server::web_utils::response_success_helpers::simple_json_success;
 use crate::server_state::ServerState;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use crate::validations::check_for_slurs::contains_slurs;
 use crate::validations::model_uploads::validate_model_title;
 use crate::validations::passwords::validate_passwords;

crates/service/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_staff.rs

@@ -12,7 +12,6 @@ use crate::http_server::web_utils::ip_address::get_request_ip;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::http_server::web_utils::response_success_helpers::simple_json_success;
 use crate::server_state::ServerState;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use crate::validations::check_for_slurs::contains_slurs;
 use crate::validations::model_uploads::validate_model_title;
 use crate::validations::passwords::validate_passwords;

crates/service/storyteller_web/src/http_server/endpoints/moderation/user_roles/set_user_role.rs

@@ -13,7 +13,6 @@ use crate::http_server::web_utils::ip_address::get_request_ip;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::http_server::web_utils::response_success_helpers::simple_json_success;
 use crate::server_state::ServerState;
-use crate::util::random_crockford_token::random_crockford_token;
 use crate::validations::model_uploads::validate_model_title;
 use crate::validations::passwords::validate_passwords;
 use crate::validations::username::validate_username;

crates/service/storyteller_web/src/http_server/endpoints/tts/delete_tts_result.rs

@@ -17,7 +17,6 @@ use crate::http_server::web_utils::response_success_helpers::simple_json_success
 use crate::server_state::ServerState;
 use crate::util::delete_role_disambiguation::DeleteRole;
 use crate::util::delete_role_disambiguation::delete_role_disambiguation;
-use crate::util::random_crockford_token::random_crockford_token;
 use crate::validations::model_uploads::validate_model_title;
 use crate::validations::passwords::validate_passwords;
 use crate::validations::username::validate_username;

crates/service/storyteller_web/src/http_server/endpoints/tts/edit_tts_model.rs

@@ -14,8 +14,6 @@ use crate::http_server::web_utils::response_success_helpers::simple_json_success
 use crate::server_state::ServerState;
 use crate::util::email_to_gravatar::email_to_gravatar;
 use crate::util::markdown_to_html::markdown_to_html;
-use crate::util::random_crockford_token::random_crockford_token;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use crate::validations::check_for_slurs::contains_slurs;
 use derive_more::{Display, Error};
 use log::{info, warn, log};

crates/service/storyteller_web/src/http_server/endpoints/tts/edit_tts_result.rs

@@ -15,8 +15,6 @@ use crate::http_server::web_utils::response_success_helpers::simple_json_success
 use crate::server_state::ServerState;
 use crate::util::email_to_gravatar::email_to_gravatar;
 use crate::util::markdown_to_html::markdown_to_html;
-use crate::util::random_crockford_token::random_crockford_token;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use crate::validations::check_for_slurs::contains_slurs;
 use derive_more::{Display, Error};
 use log::{info, warn, log};

crates/service/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts.rs

@@ -11,7 +11,6 @@ use crate::database::helpers::tokens::Tokens;
 use crate::http_server::web_utils::ip_address::get_request_ip;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::server_state::ServerState;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use crate::util::redis::redis_keys::RedisKeys;
 use crate::validations::check_for_slurs::contains_slurs;
 use crate::validations::model_uploads::validate_model_title;

crates/service/storyteller_web/src/http_server/endpoints/tts/enqueue_upload_tts_model.rs

@@ -10,8 +10,6 @@ use crate::database::helpers::tokens::Tokens;
 use crate::http_server::web_utils::ip_address::get_request_ip;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::server_state::ServerState;
-use crate::util::random_crockford_token::random_crockford_token;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use crate::validations::model_uploads::validate_model_title;
 use crate::validations::passwords::validate_passwords;
 use crate::validations::username::validate_username;

crates/service/storyteller_web/src/http_server/endpoints/tts/get_tts_result.rs

@@ -14,7 +14,6 @@ use crate::http_server::web_utils::ip_address::get_request_ip;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::http_server::web_utils::session_checker::SessionRecord;
 use crate::server_state::ServerState;
-use crate::util::random_crockford_token::random_crockford_token;
 use crate::validations::passwords::validate_passwords;
 use crate::validations::username::validate_username;
 use derive_more::{Display, Error};

crates/service/storyteller_web/src/http_server/endpoints/users/create_account.rs

@@ -13,8 +13,6 @@ use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::http_server::web_utils::serialize_as_json_error::serialize_as_json_error;
 use crate::server_state::ServerState;
 use crate::util::email_to_gravatar::email_to_gravatar;
-use crate::util::random_crockford_token::random_crockford_token;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use crate::validations::check_for_slurs::contains_slurs;
 use crate::validations::passwords::validate_passwords;
 use crate::validations::username::validate_username;

crates/service/storyteller_web/src/http_server/endpoints/users/edit_profile.rs

@@ -14,8 +14,6 @@ use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::server_state::ServerState;
 use crate::util::email_to_gravatar::email_to_gravatar;
 use crate::util::markdown_to_html::markdown_to_html;
-use crate::util::random_crockford_token::random_crockford_token;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use crate::validations::cashapp_username::{validate_cashapp_username, normalize_cashapp_username_for_storage};
 use crate::validations::check_for_slurs::contains_slurs;
 use crate::validations::discord_username::validate_discord_username;

crates/service/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_template.rs

@@ -18,7 +18,6 @@ use crate::http_server::web_utils::response_success_helpers::simple_json_success
 use crate::server_state::ServerState;
 use crate::util::delete_role_disambiguation::DeleteRole;
 use crate::util::delete_role_disambiguation::delete_role_disambiguation;
-use crate::util::random_crockford_token::random_crockford_token;
 use crate::validations::model_uploads::validate_model_title;
 use crate::validations::passwords::validate_passwords;
 use crate::validations::username::validate_username;

crates/service/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_result.rs

@@ -14,8 +14,6 @@ use crate::http_server::web_utils::response_success_helpers::simple_json_success
 use crate::server_state::ServerState;
 use crate::util::email_to_gravatar::email_to_gravatar;
 use crate::util::markdown_to_html::markdown_to_html;
-use crate::util::random_crockford_token::random_crockford_token;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use crate::validations::check_for_slurs::contains_slurs;
 use derive_more::{Display, Error};
 use log::{info, warn, log};

crates/service/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_template.rs

@@ -14,8 +14,6 @@ use crate::http_server::web_utils::response_success_helpers::simple_json_success
 use crate::server_state::ServerState;
 use crate::util::email_to_gravatar::email_to_gravatar;
 use crate::util::markdown_to_html::markdown_to_html;
-use crate::util::random_crockford_token::random_crockford_token;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use crate::validations::check_for_slurs::contains_slurs;
 use derive_more::{Display, Error};
 use log::{info, warn, log};

crates/service/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l.rs

@@ -10,7 +10,6 @@ use crate::database::helpers::enums::{DownloadUrlType, W2lTemplateType};
 use crate::http_server::web_utils::ip_address::get_request_ip;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::server_state::ServerState;
-use crate::util::random_crockford_token::random_crockford_token;
 use crate::util::redis::redis_keys::RedisKeys;
 use crate::validations::model_uploads::validate_model_title;
 use crate::validations::passwords::validate_passwords;

crates/service/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs

@@ -1,13 +1,14 @@
 use actix_http::http::header;
 use actix_multipart::{Multipart, Field};
-use actix_web::body::ResponseBody::Body;
 use actix_web::HttpResponseBuilder;
+use actix_web::body::ResponseBody::Body;
 use actix_web::http::StatusCode;
 use actix_web::http::header::ContentDisposition;
 use actix_web::web::{Data, Json, BytesMut};
 use actix_web::{middleware, web, App, Error, HttpResponse, HttpServer, HttpRequest, Either, ResponseError};
 use anyhow::anyhow;
 use container_common::anyhow_result::AnyhowResult;
+use container_common::token::random_uuid::generate_random_uuid;
 use crate::database::enums::record_visibility::RecordVisibility;
 use crate::database::helpers::tokens::Tokens;
 use crate::http_server::web_utils::ip_address::get_request_ip;
@@ -19,9 +20,6 @@ use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::server_state::ServerState;
 use crate::util::buckets::bucket_client::BucketClient;
 use crate::util::buckets::bucket_paths::hash_to_bucket_path;
-use crate::util::random_crockford_token::random_crockford_token;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
-use crate::util::random_uuid::generate_random_uuid;
 use crate::util::redis::redis_keys::RedisKeys;
 use derive_more::{Display, Error};
 use futures::{StreamExt, TryStreamExt};
@@ -31,7 +29,6 @@ use sqlx::MySqlPool;
 use sqlx::error::Error::Database;
 use std::io::Write;
 use std::sync::Arc;
-use uuid::Uuid;
 
 const BUCKET_AUDIO_FILE_NAME : &'static str = "input_audio_file";
 const BUCKET_IMAGE_FILE_NAME: &'static str = "input_image_file";

crates/service/storyteller_web/src/http_server/endpoints/w2l/enqueue_upload_w2l_template.rs

@@ -10,8 +10,6 @@ use crate::database::helpers::tokens::Tokens;
 use crate::http_server::web_utils::ip_address::get_request_ip;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::server_state::ServerState;
-use crate::util::random_crockford_token::random_crockford_token;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use crate::validations::check_for_slurs::contains_slurs;
 use crate::validations::model_uploads::validate_model_title;
 use crate::validations::passwords::validate_passwords;

crates/service/storyteller_web/src/http_server/endpoints/w2l/get_w2l_template.rs

@@ -14,7 +14,6 @@ use crate::database::queries::query_w2l_template::select_w2l_template_by_token;
 use crate::http_server::web_utils::ip_address::get_request_ip;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::server_state::ServerState;
-use crate::util::random_crockford_token::random_crockford_token;
 use crate::validations::passwords::validate_passwords;
 use crate::validations::username::validate_username;
 use derive_more::{Display, Error};

crates/service/storyteller_web/src/http_server/endpoints/w2l/set_w2l_template_mod_approval.rs

@@ -11,7 +11,6 @@ use crate::database::queries::query_w2l_template::select_w2l_template_by_token;
 use crate::http_server::web_utils::ip_address::get_request_ip;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::server_state::ServerState;
-use crate::util::random_crockford_token::random_crockford_token;
 use crate::validations::model_uploads::validate_model_title;
 use crate::validations::passwords::validate_passwords;
 use crate::validations::username::validate_username;

crates/service/storyteller_web/src/job_queries/tts_download_job_queries.rs

@@ -6,8 +6,6 @@ use anyhow::anyhow;
 use chrono::Utc;
 use container_common::anyhow_result::AnyhowResult;
 use crate::database::helpers::tokens::Tokens;
-use crate::util::random_crockford_token::random_crockford_token;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use sqlx::MySqlPool;
 use std::path::Path;
 

crates/service/storyteller_web/src/job_queries/tts_inference_job_queries.rs

@@ -8,7 +8,6 @@ use container_common::anyhow_result::AnyhowResult;
 use crate::database::enums::record_visibility::RecordVisibility;
 use crate::database::enums::vocoder_type::VocoderType;
 use crate::database::helpers::tokens::Tokens;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use log::{warn, info};
 use sqlx::{MySqlPool, Transaction, MySql};
 use std::error;

crates/service/storyteller_web/src/job_queries/w2l_download_job_queries.rs

@@ -6,8 +6,6 @@ use anyhow::anyhow;
 use chrono::Utc;
 use container_common::anyhow_result::AnyhowResult;
 use crate::database::helpers::tokens::Tokens;
-use crate::util::random_crockford_token::random_crockford_token;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use sqlx::MySqlPool;
 
 /// table: w2l_template_upload_jobs

crates/service/storyteller_web/src/job_queries/w2l_inference_job_queries.rs

@@ -7,8 +7,6 @@ use chrono::{Utc, DateTime};
 use container_common::anyhow_result::AnyhowResult;
 use crate::database::enums::record_visibility::RecordVisibility;
 use crate::database::helpers::tokens::Tokens;
-use crate::util::random_crockford_token::random_crockford_token;
-use crate::util::random_prefix_crockford_token::random_prefix_crockford_token;
 use log::{warn, info};
 use sqlx::MySqlPool;
 use std::path::Path;

crates/service/storyteller_web/src/script_execution/google_drive_download_command.rs

@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use container_common::anyhow_result::AnyhowResult;
-use crate::util::random_crockford_token::random_crockford_token;
+use container_common::token::random_crockford_token::random_crockford_token;
 use log::{info, warn};
 use std::io::{BufReader, Read};
 use std::path::{PathBuf, Path};

crates/service/storyteller_web/src/tts_download_job.rs

@@ -42,7 +42,6 @@ use crate::util::filesystem::safe_delete_temp_file;
 use crate::util::filesystem::{check_directory_exists, check_file_exists};
 use crate::util::hashing::hash_file_sha2::hash_file_sha2;
 use crate::util::noop_logger::NoOpLogger;
-use crate::util::random_crockford_token::random_crockford_token;
 use crate::util::redis::redis_job_status_logger::RedisJobStatusLogger;
 use data_encoding::{HEXUPPER, HEXLOWER, HEXLOWER_PERMISSIVE};
 use log::{warn, info};

crates/service/storyteller_web/src/tts_inference_job.rs

@@ -22,6 +22,7 @@ use chrono::{Utc, DateTime, TimeZone};
 use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING;
 use config::shared_constants::DEFAULT_RUST_LOG;
 use container_common::anyhow_result::AnyhowResult;
+use container_common::token::random_uuid::generate_random_uuid;
 use crate::common_env::CommonEnv;
 use crate::database::enums::vocoder_type::VocoderType;
 use crate::database::mediators::firehose_publisher::FirehosePublisher;
@@ -51,7 +52,6 @@ use crate::util::jobs::cache_miss_strategizer::CacheMissStrategy;
 use crate::util::jobs::cache_miss_strategizer_multi::SyncMultiCacheMissStrategizer;
 use crate::util::jobs::virtual_lfu_cache::SyncVirtualLfuCache;
 use crate::util::noop_logger::NoOpLogger;
-use crate::util::random_crockford_token::random_crockford_token;
 use crate::util::redis::redis_job_status_logger::RedisJobStatusLogger;
 use crate::util::semi_persistent_cache_dir::SemiPersistentCacheDir;
 use data_encoding::{HEXUPPER, HEXLOWER, HEXLOWER_PERMISSIVE};
@@ -75,7 +75,6 @@ use std::process::Command;
 use std::thread;
 use std::time::{Duration, SystemTime, UNIX_EPOCH, Instant};
 use tempdir::TempDir;
-use crate::util::random_uuid::generate_random_uuid;
 
 // Buckets (shared config)
 const ENV_ACCESS_KEY : &'static str = "ACCESS_KEY";

crates/service/storyteller_web/src/util/mod.rs

@@ -8,8 +8,5 @@ pub mod hashing;
 pub mod jobs;
 pub mod markdown_to_html;
 pub mod noop_logger;
-pub mod random_crockford_token;
-pub mod random_prefix_crockford_token;
-pub mod random_uuid;
 pub mod redis;
 pub mod semi_persistent_cache_dir;

crates/service/storyteller_web/src/w2l_download_job.rs

@@ -44,7 +44,6 @@ use crate::util::filesystem::safe_delete_temp_directory;
 use crate::util::filesystem::safe_delete_temp_file;
 use crate::util::hashing::hash_file_sha2::hash_file_sha2;
 use crate::util::noop_logger::NoOpLogger;
-use crate::util::random_crockford_token::random_crockford_token;
 use crate::util::redis::redis_job_status_logger::RedisJobStatusLogger;
 use data_encoding::{HEXUPPER, HEXLOWER, HEXLOWER_PERMISSIVE};
 use log::{warn, info};

crates/service/storyteller_web/src/w2l_inference_job.rs

@@ -44,7 +44,6 @@ use crate::util::filesystem::safe_delete_temp_directory;
 use crate::util::filesystem::safe_delete_temp_file;
 use crate::util::hashing::hash_file_sha2::hash_file_sha2;
 use crate::util::noop_logger::NoOpLogger;
-use crate::util::random_crockford_token::random_crockford_token;
 use crate::util::redis::redis_job_status_logger::RedisJobStatusLogger;
 use crate::util::semi_persistent_cache_dir::SemiPersistentCacheDir;
 use data_encoding::{HEXUPPER, HEXLOWER, HEXLOWER_PERMISSIVE};