diff --git a/Cargo.lock b/Cargo.lock index d8f138e447..e7ccec78f7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3976,6 +3976,7 @@ dependencies = [ "bcrypt", "chrono", "config", + "container_common", "data-encoding", "derive_more", "diesel", diff --git a/crates/service/storyteller_web/Cargo.toml b/crates/service/storyteller_web/Cargo.toml index 180afb2edd..ed2c2e565e 100644 --- a/crates/service/storyteller_web/Cargo.toml +++ b/crates/service/storyteller_web/Cargo.toml @@ -39,6 +39,7 @@ path = "src/w2l_inference_job.rs" # Internal config = { path = "../../lib/config" } +container_common = { path = "../../lib/container_common" } http_server_common = { path = "../../lib/http_server_common" } # External diff --git a/crates/service/storyteller_web/src/common_env.rs b/crates/service/storyteller_web/src/common_env.rs index 9013327abc..77db528953 100644 --- a/crates/service/storyteller_web/src/common_env.rs +++ b/crates/service/storyteller_web/src/common_env.rs @@ -1,5 +1,5 @@ use config::shared_constants::DEFAULT_REDIS_CONNECTION_STRING; -use crate::util::anyhow_result::AnyhowResult; +use container_common::anyhow_result::AnyhowResult; // TODO: Move more shared configs here. diff --git a/crates/service/storyteller_web/src/database/enums/record_visibility.rs b/crates/service/storyteller_web/src/database/enums/record_visibility.rs index 54cfe94006..863d80154f 100644 --- a/crates/service/storyteller_web/src/database/enums/record_visibility.rs +++ b/crates/service/storyteller_web/src/database/enums/record_visibility.rs @@ -1,7 +1,7 @@ //! These are columns where users can control the visibility of their data. use anyhow::anyhow; -use crate::util::anyhow_result::AnyhowResult; +use container_common::anyhow_result::AnyhowResult; /// To use this in a query, the query must have type annotations. /// See: https://www.gitmemory.com/issue/launchbadge/sqlx/1241/847154375 diff --git a/crates/service/storyteller_web/src/database/enums/tts_model_type.rs b/crates/service/storyteller_web/src/database/enums/tts_model_type.rs index 8a5d2b8ae0..3492d744b3 100644 --- a/crates/service/storyteller_web/src/database/enums/tts_model_type.rs +++ b/crates/service/storyteller_web/src/database/enums/tts_model_type.rs @@ -1,7 +1,7 @@ //! These denote the TTS synthesizer model types use anyhow::anyhow; -use crate::util::anyhow_result::AnyhowResult; +use container_common::anyhow_result::AnyhowResult; #[derive(Clone, Copy, PartialEq, Eq, Debug, Serialize, Deserialize, sqlx::Type)] #[serde(rename_all = "lowercase")] diff --git a/crates/service/storyteller_web/src/database/enums/vocoder_type.rs b/crates/service/storyteller_web/src/database/enums/vocoder_type.rs index 8ebcb54278..ec63f25a61 100644 --- a/crates/service/storyteller_web/src/database/enums/vocoder_type.rs +++ b/crates/service/storyteller_web/src/database/enums/vocoder_type.rs @@ -1,7 +1,7 @@ //! These denote the pretrained vocoders use anyhow::anyhow; -use crate::util::anyhow_result::AnyhowResult; +use container_common::anyhow_result::AnyhowResult; #[derive(Clone, Copy, PartialEq, Eq, Debug, Serialize, Deserialize, sqlx::Type)] #[serde(rename_all = "lowercase")] diff --git a/crates/service/storyteller_web/src/database/helpers/tokens.rs b/crates/service/storyteller_web/src/database/helpers/tokens.rs index 8fc0c6bdbb..892c932312 100644 --- a/crates/service/storyteller_web/src/database/helpers/tokens.rs +++ b/crates/service/storyteller_web/src/database/helpers/tokens.rs @@ -1,4 +1,4 @@ -use crate::util::anyhow_result::AnyhowResult; +use container_common::anyhow_result::AnyhowResult; use crate::util::random_prefix_crockford_token::random_prefix_crockford_token; /// Central place to define all the token types. diff --git a/crates/service/storyteller_web/src/database/mediators/badge_granter.rs b/crates/service/storyteller_web/src/database/mediators/badge_granter.rs index 714d4affb2..d1b957b369 100644 --- a/crates/service/storyteller_web/src/database/mediators/badge_granter.rs +++ b/crates/service/storyteller_web/src/database/mediators/badge_granter.rs @@ -1,7 +1,7 @@ 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::anyhow_result::AnyhowResult; use crate::util::random_prefix_crockford_token::random_prefix_crockford_token; use log::{warn,info}; use sqlx::error::Error::Database; diff --git a/crates/service/storyteller_web/src/database/mediators/firehose_publisher.rs b/crates/service/storyteller_web/src/database/mediators/firehose_publisher.rs index d9a1860fb0..a7379bdf84 100644 --- a/crates/service/storyteller_web/src/database/mediators/firehose_publisher.rs +++ b/crates/service/storyteller_web/src/database/mediators/firehose_publisher.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; +use container_common::anyhow_result::AnyhowResult; use crate::database::helpers::tokens::Tokens; -use crate::util::anyhow_result::AnyhowResult; use crate::util::random_prefix_crockford_token::random_prefix_crockford_token; use log::{warn,info}; use sqlx::error::Error::Database; diff --git a/crates/service/storyteller_web/src/database/queries/calculate_tts_model_leaderboard.rs b/crates/service/storyteller_web/src/database/queries/calculate_tts_model_leaderboard.rs index 1aeb5cc3cb..18364cbd18 100644 --- a/crates/service/storyteller_web/src/database/queries/calculate_tts_model_leaderboard.rs +++ b/crates/service/storyteller_web/src/database/queries/calculate_tts_model_leaderboard.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use crate::util::anyhow_result::AnyhowResult; +use container_common::anyhow_result::AnyhowResult; use log::warn; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/database/queries/calculate_w2l_template_leaderboard.rs b/crates/service/storyteller_web/src/database/queries/calculate_w2l_template_leaderboard.rs index 0f830bad3a..94562e359d 100644 --- a/crates/service/storyteller_web/src/database/queries/calculate_w2l_template_leaderboard.rs +++ b/crates/service/storyteller_web/src/database/queries/calculate_w2l_template_leaderboard.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use crate::util::anyhow_result::AnyhowResult; +use container_common::anyhow_result::AnyhowResult; use log::warn; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/database/queries/categories/list_tts_model_category_assignments.rs b/crates/service/storyteller_web/src/database/queries/categories/list_tts_model_category_assignments.rs index f4aabcffb9..bfdd0ccd3d 100644 --- a/crates/service/storyteller_web/src/database/queries/categories/list_tts_model_category_assignments.rs +++ b/crates/service/storyteller_web/src/database/queries/categories/list_tts_model_category_assignments.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use crate::util::anyhow_result::AnyhowResult; +use container_common::anyhow_result::AnyhowResult; use log::warn; use sqlx::MySqlPool; use std::collections::{HashSet, HashMap}; diff --git a/crates/service/storyteller_web/src/database/queries/delete_tts_model.rs b/crates/service/storyteller_web/src/database/queries/delete_tts_model.rs index 7ec6622aed..f01091e14b 100644 --- a/crates/service/storyteller_web/src/database/queries/delete_tts_model.rs +++ b/crates/service/storyteller_web/src/database/queries/delete_tts_model.rs @@ -1,4 +1,4 @@ -use crate::util::anyhow_result::AnyhowResult; +use container_common::anyhow_result::AnyhowResult; use sqlx::MySqlPool; pub async fn delete_tts_model_as_user( diff --git a/crates/service/storyteller_web/src/database/queries/delete_tts_result.rs b/crates/service/storyteller_web/src/database/queries/delete_tts_result.rs index bc9812c095..c5ca6f2f3f 100644 --- a/crates/service/storyteller_web/src/database/queries/delete_tts_result.rs +++ b/crates/service/storyteller_web/src/database/queries/delete_tts_result.rs @@ -1,4 +1,4 @@ -use crate::util::anyhow_result::AnyhowResult; +use container_common::anyhow_result::AnyhowResult; use sqlx::MySqlPool; pub async fn delete_tts_inference_result_as_user( diff --git a/crates/service/storyteller_web/src/database/queries/delete_w2l_result.rs b/crates/service/storyteller_web/src/database/queries/delete_w2l_result.rs index 5218d3a3f2..adaced9ac7 100644 --- a/crates/service/storyteller_web/src/database/queries/delete_w2l_result.rs +++ b/crates/service/storyteller_web/src/database/queries/delete_w2l_result.rs @@ -1,4 +1,4 @@ -use crate::util::anyhow_result::AnyhowResult; +use container_common::anyhow_result::AnyhowResult; use sqlx::MySqlPool; pub async fn delete_w2l_inference_result_as_user( diff --git a/crates/service/storyteller_web/src/database/queries/delete_w2l_template.rs b/crates/service/storyteller_web/src/database/queries/delete_w2l_template.rs index 8c29c56aa1..308684434d 100644 --- a/crates/service/storyteller_web/src/database/queries/delete_w2l_template.rs +++ b/crates/service/storyteller_web/src/database/queries/delete_w2l_template.rs @@ -1,4 +1,4 @@ -use crate::util::anyhow_result::AnyhowResult; +use container_common::anyhow_result::AnyhowResult; use sqlx::MySqlPool; pub async fn delete_w2l_template_as_user( diff --git a/crates/service/storyteller_web/src/database/queries/list_ip_bans.rs b/crates/service/storyteller_web/src/database/queries/list_ip_bans.rs index 998a0d9cd4..4bff642506 100644 --- a/crates/service/storyteller_web/src/database/queries/list_ip_bans.rs +++ b/crates/service/storyteller_web/src/database/queries/list_ip_bans.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use crate::util::anyhow_result::AnyhowResult; +use container_common::anyhow_result::AnyhowResult; use log::warn; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/database/queries/list_tts_models.rs b/crates/service/storyteller_web/src/database/queries/list_tts_models.rs index e0f727a8c3..1988c1cc93 100644 --- a/crates/service/storyteller_web/src/database/queries/list_tts_models.rs +++ b/crates/service/storyteller_web/src/database/queries/list_tts_models.rs @@ -1,7 +1,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; +use container_common::anyhow_result::AnyhowResult; use crate::database::helpers::boolean_converters::i8_to_bool; -use crate::util::anyhow_result::AnyhowResult; use log::{warn, info}; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/database/queries/list_user_badges.rs b/crates/service/storyteller_web/src/database/queries/list_user_badges.rs index 5e597bb9c4..7863bbe3c2 100644 --- a/crates/service/storyteller_web/src/database/queries/list_user_badges.rs +++ b/crates/service/storyteller_web/src/database/queries/list_user_badges.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use crate::util::anyhow_result::AnyhowResult; +use container_common::anyhow_result::AnyhowResult; use log::{warn, info}; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/database/queries/list_user_roles.rs b/crates/service/storyteller_web/src/database/queries/list_user_roles.rs index 129b581fa0..d909889798 100644 --- a/crates/service/storyteller_web/src/database/queries/list_user_roles.rs +++ b/crates/service/storyteller_web/src/database/queries/list_user_roles.rs @@ -1,7 +1,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; +use container_common::anyhow_result::AnyhowResult; use crate::database::helpers::boolean_converters::{nullable_i8_to_optional_bool, i8_to_bool}; -use crate::util::anyhow_result::AnyhowResult; use log::{warn, info}; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/database/queries/list_w2l_templates.rs b/crates/service/storyteller_web/src/database/queries/list_w2l_templates.rs index c403b8c244..2f32f2160c 100644 --- a/crates/service/storyteller_web/src/database/queries/list_w2l_templates.rs +++ b/crates/service/storyteller_web/src/database/queries/list_w2l_templates.rs @@ -1,7 +1,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; +use container_common::anyhow_result::AnyhowResult; use crate::database::helpers::boolean_converters::nullable_i8_to_optional_bool; -use crate::util::anyhow_result::AnyhowResult; use log::{warn, info}; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/database/query_builders/list_assigned_tts_categories_query_builder.rs b/crates/service/storyteller_web/src/database/query_builders/list_assigned_tts_categories_query_builder.rs index b7f618c40a..64279387ad 100644 --- a/crates/service/storyteller_web/src/database/query_builders/list_assigned_tts_categories_query_builder.rs +++ b/crates/service/storyteller_web/src/database/query_builders/list_assigned_tts_categories_query_builder.rs @@ -1,8 +1,8 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; +use container_common::anyhow_result::AnyhowResult; use crate::database::enums::record_visibility::RecordVisibility; use crate::database::helpers::boolean_converters::{i8_to_bool, nullable_i8_to_optional_bool}; -use crate::util::anyhow_result::AnyhowResult; use log::{warn, info}; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/database/query_builders/list_categories_query_builder.rs b/crates/service/storyteller_web/src/database/query_builders/list_categories_query_builder.rs index 45fb053720..e8f64a5158 100644 --- a/crates/service/storyteller_web/src/database/query_builders/list_categories_query_builder.rs +++ b/crates/service/storyteller_web/src/database/query_builders/list_categories_query_builder.rs @@ -1,8 +1,8 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; +use container_common::anyhow_result::AnyhowResult; use crate::database::enums::record_visibility::RecordVisibility; use crate::database::helpers::boolean_converters::{i8_to_bool, nullable_i8_to_optional_bool}; -use crate::util::anyhow_result::AnyhowResult; use log::{warn, info}; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/database/query_builders/list_tts_inference_results_query_builder.rs b/crates/service/storyteller_web/src/database/query_builders/list_tts_inference_results_query_builder.rs index 011629933a..66e38cc1bd 100644 --- a/crates/service/storyteller_web/src/database/query_builders/list_tts_inference_results_query_builder.rs +++ b/crates/service/storyteller_web/src/database/query_builders/list_tts_inference_results_query_builder.rs @@ -1,8 +1,8 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use config::shared_constants::DEFAULT_MYSQL_QUERY_RESULT_PAGE_SIZE; +use container_common::anyhow_result::AnyhowResult; use crate::database::enums::record_visibility::RecordVisibility; -use crate::util::anyhow_result::AnyhowResult; use log::{warn, info}; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/database/query_builders/list_users_query_builder.rs b/crates/service/storyteller_web/src/database/query_builders/list_users_query_builder.rs index d8691d61f3..83752a7af6 100644 --- a/crates/service/storyteller_web/src/database/query_builders/list_users_query_builder.rs +++ b/crates/service/storyteller_web/src/database/query_builders/list_users_query_builder.rs @@ -1,6 +1,6 @@ use chrono::{DateTime, Utc}; +use container_common::anyhow_result::AnyhowResult; use crate::database::helpers::boolean_converters::i8_to_bool; -use crate::util::anyhow_result::AnyhowResult; use sqlx::MySqlPool; /// NB: This is not to be shared externally. diff --git a/crates/service/storyteller_web/src/database/query_builders/list_w2l_inference_results_query_builder.rs b/crates/service/storyteller_web/src/database/query_builders/list_w2l_inference_results_query_builder.rs index 0553bf0552..b9fc2bcf11 100644 --- a/crates/service/storyteller_web/src/database/query_builders/list_w2l_inference_results_query_builder.rs +++ b/crates/service/storyteller_web/src/database/query_builders/list_w2l_inference_results_query_builder.rs @@ -1,8 +1,8 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use config::shared_constants::DEFAULT_MYSQL_QUERY_RESULT_PAGE_SIZE; +use container_common::anyhow_result::AnyhowResult; use crate::database::enums::record_visibility::RecordVisibility; -use crate::util::anyhow_result::AnyhowResult; use log::{warn, info}; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/http_clients/tts_inference_sidecar_client.rs b/crates/service/storyteller_web/src/http_clients/tts_inference_sidecar_client.rs index 354cdfd1b0..149f956239 100644 --- a/crates/service/storyteller_web/src/http_clients/tts_inference_sidecar_client.rs +++ b/crates/service/storyteller_web/src/http_clients/tts_inference_sidecar_client.rs @@ -1,7 +1,7 @@ use actix_web::http::header; use anyhow::anyhow; +use container_common::anyhow_result::AnyhowResult; use crate::database::enums::vocoder_type::VocoderType; -use crate::util::anyhow_result::AnyhowResult; use hyper::client::Client; use hyper::{Body, Request}; use log::info; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/tts/list_tts_models.rs b/crates/service/storyteller_web/src/http_server/endpoints/tts/list_tts_models.rs index 7361749af1..56112f3254 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/tts/list_tts_models.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/tts/list_tts_models.rs @@ -5,12 +5,12 @@ use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; use chrono::{DateTime, Utc}; +use container_common::anyhow_result::AnyhowResult; use crate::database::queries::categories::list_tts_model_category_assignments::fetch_tts_model_category_map; use crate::database::queries::list_tts_models::list_tts_models; 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::anyhow_result::AnyhowResult; use log::{info, warn, log, error}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs b/crates/service/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs index a4b3925b81..d550055c12 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs @@ -7,6 +7,7 @@ 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 crate::database::enums::record_visibility::RecordVisibility; use crate::database::helpers::tokens::Tokens; use crate::http_server::web_utils::ip_address::get_request_ip; @@ -16,7 +17,6 @@ use crate::http_server::web_utils::read_multipart_field_bytes::read_multipart_fi use crate::http_server::web_utils::read_multipart_field_bytes::read_multipart_field_bytes; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use crate::util::anyhow_result::AnyhowResult; 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; diff --git a/crates/service/storyteller_web/src/http_server/web_utils/get_host_header.rs b/crates/service/storyteller_web/src/http_server/web_utils/get_host_header.rs index fd47e41dac..57b4ec37e8 100644 --- a/crates/service/storyteller_web/src/http_server/web_utils/get_host_header.rs +++ b/crates/service/storyteller_web/src/http_server/web_utils/get_host_header.rs @@ -2,7 +2,7 @@ use actix_http::http::HeaderMap; use actix_http::http::HeaderName; use actix_web::HttpRequest; use actix_web::http::HeaderValue; -use crate::util::anyhow_result::AnyhowResult; +use container_common::anyhow_result::AnyhowResult; // NB: This is extracted because CLion is having incredible difficulty with these types. pub fn get_host_header(http_request: &HttpRequest) -> AnyhowResult> { diff --git a/crates/service/storyteller_web/src/job_queries/tts_download_job_queries.rs b/crates/service/storyteller_web/src/job_queries/tts_download_job_queries.rs index 1ff2073a5d..7f84cd2b85 100644 --- a/crates/service/storyteller_web/src/job_queries/tts_download_job_queries.rs +++ b/crates/service/storyteller_web/src/job_queries/tts_download_job_queries.rs @@ -4,8 +4,8 @@ use anyhow::anyhow; use chrono::Utc; +use container_common::anyhow_result::AnyhowResult; use crate::database::helpers::tokens::Tokens; -use crate::util::anyhow_result::AnyhowResult; use crate::util::random_crockford_token::random_crockford_token; use crate::util::random_prefix_crockford_token::random_prefix_crockford_token; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/job_queries/tts_inference_job_queries.rs b/crates/service/storyteller_web/src/job_queries/tts_inference_job_queries.rs index 8ebfb02157..1b8533eca9 100644 --- a/crates/service/storyteller_web/src/job_queries/tts_inference_job_queries.rs +++ b/crates/service/storyteller_web/src/job_queries/tts_inference_job_queries.rs @@ -4,10 +4,10 @@ use anyhow::anyhow; use chrono::{Utc, DateTime}; +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::anyhow_result::AnyhowResult; use crate::util::random_prefix_crockford_token::random_prefix_crockford_token; use log::{warn, info}; use sqlx::{MySqlPool, Transaction, MySql}; diff --git a/crates/service/storyteller_web/src/job_queries/w2l_download_job_queries.rs b/crates/service/storyteller_web/src/job_queries/w2l_download_job_queries.rs index 77998b0327..1d7dc92b3d 100644 --- a/crates/service/storyteller_web/src/job_queries/w2l_download_job_queries.rs +++ b/crates/service/storyteller_web/src/job_queries/w2l_download_job_queries.rs @@ -4,8 +4,8 @@ use anyhow::anyhow; use chrono::Utc; +use container_common::anyhow_result::AnyhowResult; use crate::database::helpers::tokens::Tokens; -use crate::util::anyhow_result::AnyhowResult; use crate::util::random_crockford_token::random_crockford_token; use crate::util::random_prefix_crockford_token::random_prefix_crockford_token; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/job_queries/w2l_inference_job_queries.rs b/crates/service/storyteller_web/src/job_queries/w2l_inference_job_queries.rs index de013eda66..19e670ebb1 100644 --- a/crates/service/storyteller_web/src/job_queries/w2l_inference_job_queries.rs +++ b/crates/service/storyteller_web/src/job_queries/w2l_inference_job_queries.rs @@ -4,9 +4,9 @@ use anyhow::anyhow; 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::anyhow_result::AnyhowResult; use crate::util::random_crockford_token::random_crockford_token; use crate::util::random_prefix_crockford_token::random_prefix_crockford_token; use log::{warn, info}; diff --git a/crates/service/storyteller_web/src/main.rs b/crates/service/storyteller_web/src/main.rs index 534f17254e..e618b7e806 100644 --- a/crates/service/storyteller_web/src/main.rs +++ b/crates/service/storyteller_web/src/main.rs @@ -35,6 +35,7 @@ use actix_web::{HttpServer, web, HttpResponse, App}; use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING; use config::shared_constants::DEFAULT_REDIS_CONNECTION_STRING; use config::shared_constants::DEFAULT_RUST_LOG; +use container_common::anyhow_result::AnyhowResult; use crate::database::mediators::badge_granter::BadgeGranter; use crate::database::mediators::firehose_publisher::FirehosePublisher; use crate::http_server::endpoints::events::list_events::list_events_handler; @@ -146,8 +147,6 @@ const ENV_PUBLIC_BUCKET_NAME : &'static str = "W2L_PUBLIC_DOWNLOAD_BUCKET_NAME"; // Various bucket roots const ENV_AUDIO_UPLOADS_BUCKET_ROOT : &'static str = "AUDIO_UPLOADS_BUCKET_ROOT"; -pub type AnyhowResult = anyhow::Result; - #[actix_web::main] async fn main() -> AnyhowResult<()> { easyenv::init_all_with_default_logging(Some(DEFAULT_RUST_LOG)); diff --git a/crates/service/storyteller_web/src/script_execution/google_drive_download_command.rs b/crates/service/storyteller_web/src/script_execution/google_drive_download_command.rs index 4b4e6ac059..1f8f7b7069 100644 --- a/crates/service/storyteller_web/src/script_execution/google_drive_download_command.rs +++ b/crates/service/storyteller_web/src/script_execution/google_drive_download_command.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use crate::util::anyhow_result::AnyhowResult; +use container_common::anyhow_result::AnyhowResult; use crate::util::random_crockford_token::random_crockford_token; use log::{info, warn}; use std::io::{BufReader, Read}; diff --git a/crates/service/storyteller_web/src/tts_download_job.rs b/crates/service/storyteller_web/src/tts_download_job.rs index 7718e356b5..2c4e6ddf01 100644 --- a/crates/service/storyteller_web/src/tts_download_job.rs +++ b/crates/service/storyteller_web/src/tts_download_job.rs @@ -20,6 +20,7 @@ use anyhow::anyhow; use chrono::Utc; use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING; use config::shared_constants::DEFAULT_RUST_LOG; +use container_common::anyhow_result::AnyhowResult; use crate::common_env::CommonEnv; use crate::database::enums::tts_model_type::TtsModelType; use crate::database::mediators::badge_granter::BadgeGranter; @@ -33,7 +34,6 @@ use crate::job_queries::tts_download_job_queries::query_tts_upload_job_records; use crate::script_execution::google_drive_download_command::GoogleDriveDownloadCommand; use crate::script_execution::tacotron_model_check_command::TacotronModelCheckCommand; use crate::script_execution::talknet_model_check_command::TalknetModelCheckCommand; -use crate::util::anyhow_result::AnyhowResult; use crate::util::buckets::bucket_client::BucketClient; use crate::util::buckets::bucket_path_unifier::BucketPathUnifier; use crate::util::buckets::bucket_paths::hash_to_bucket_path; diff --git a/crates/service/storyteller_web/src/tts_inference_job.rs b/crates/service/storyteller_web/src/tts_inference_job.rs index 89aa39a78a..c7d9c2f0b0 100644 --- a/crates/service/storyteller_web/src/tts_inference_job.rs +++ b/crates/service/storyteller_web/src/tts_inference_job.rs @@ -21,6 +21,7 @@ use anyhow::{anyhow, Error}; 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 crate::common_env::CommonEnv; use crate::database::enums::vocoder_type::VocoderType; use crate::database::mediators::firehose_publisher::FirehosePublisher; @@ -36,7 +37,6 @@ use crate::job_queries::tts_inference_job_queries::mark_tts_inference_job_failur use crate::job_queries::tts_inference_job_queries::mark_tts_inference_job_permanently_dead; use crate::job_queries::tts_inference_job_queries::query_tts_inference_job_records; use crate::script_execution::tacotron_inference_command::TacotronInferenceCommand; -use crate::util::anyhow_result::AnyhowResult; use crate::util::buckets::bucket_client::BucketClient; use crate::util::buckets::bucket_path_unifier::BucketPathUnifier; use crate::util::buckets::bucket_paths::hash_to_bucket_path; diff --git a/crates/service/storyteller_web/src/util/anyhow_result.rs b/crates/service/storyteller_web/src/util/anyhow_result.rs deleted file mode 100644 index 7784374637..0000000000 --- a/crates/service/storyteller_web/src/util/anyhow_result.rs +++ /dev/null @@ -1,2 +0,0 @@ -/// Easier to import than anyhow::Result. -pub type AnyhowResult = anyhow::Result; diff --git a/crates/service/storyteller_web/src/util/buckets/bucket_path_unifier.rs b/crates/service/storyteller_web/src/util/buckets/bucket_path_unifier.rs index 3e24289dab..a5e935f1d9 100644 --- a/crates/service/storyteller_web/src/util/buckets/bucket_path_unifier.rs +++ b/crates/service/storyteller_web/src/util/buckets/bucket_path_unifier.rs @@ -1,4 +1,4 @@ -use crate::util::anyhow_result::AnyhowResult; +use container_common::anyhow_result::AnyhowResult; use crate::util::buckets::bucket_paths::hash_to_bucket_path; use std::path::PathBuf; diff --git a/crates/service/storyteller_web/src/util/buckets/bucket_paths.rs b/crates/service/storyteller_web/src/util/buckets/bucket_paths.rs index 670a0a98e5..eadedbf56c 100644 --- a/crates/service/storyteller_web/src/util/buckets/bucket_paths.rs +++ b/crates/service/storyteller_web/src/util/buckets/bucket_paths.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use anyhow::bail; -use crate::util::anyhow_result::AnyhowResult; +use container_common::anyhow_result::AnyhowResult; use std::path::PathBuf; pub fn hash_to_bucket_path(file_hash: &str, diff --git a/crates/service/storyteller_web/src/util/caching/single_item_ttl_cache.rs b/crates/service/storyteller_web/src/util/caching/single_item_ttl_cache.rs index c40c261164..32cb756213 100644 --- a/crates/service/storyteller_web/src/util/caching/single_item_ttl_cache.rs +++ b/crates/service/storyteller_web/src/util/caching/single_item_ttl_cache.rs @@ -1,5 +1,5 @@ use anyhow::bail; -use crate::util::anyhow_result::AnyhowResult; +use container_common::anyhow_result::AnyhowResult; use lru_time_cache::LruCache; use std::sync::{Arc, Mutex, PoisonError, MutexGuard}; use std::time::Duration; diff --git a/crates/service/storyteller_web/src/util/encrypted_sort_id.rs b/crates/service/storyteller_web/src/util/encrypted_sort_id.rs index aba0ef84eb..56ce681e2b 100644 --- a/crates/service/storyteller_web/src/util/encrypted_sort_id.rs +++ b/crates/service/storyteller_web/src/util/encrypted_sort_id.rs @@ -1,12 +1,11 @@ - -use base64; -use magic_crypt::{MagicCryptTrait, MagicCrypt256}; -use magic_crypt::generic_array::typenum::U256; -use std::io::Cursor; -use magic_crypt::new_magic_crypt; -use crate::util::anyhow_result::AnyhowResult; -use rand::RngCore; use base64::{Config, CharacterSet}; +use base64; +use container_common::anyhow_result::AnyhowResult; +use magic_crypt::generic_array::typenum::U256; +use magic_crypt::new_magic_crypt; +use magic_crypt::{MagicCryptTrait, MagicCrypt256}; +use rand::RngCore; +use std::io::Cursor; // TODO: A protobuf would be more compact! /// This gets encrypted and sent to the frontend as an opaque handle. diff --git a/crates/service/storyteller_web/src/util/filesystem.rs b/crates/service/storyteller_web/src/util/filesystem.rs index d3c84000ac..b4553ed95a 100644 --- a/crates/service/storyteller_web/src/util/filesystem.rs +++ b/crates/service/storyteller_web/src/util/filesystem.rs @@ -1,5 +1,5 @@ use anyhow::bail; -use crate::util::anyhow_result::AnyhowResult; +use container_common::anyhow_result::AnyhowResult; use log::info; use log::warn; use std::fs; diff --git a/crates/service/storyteller_web/src/util/hashing/hash_file_sha2.rs b/crates/service/storyteller_web/src/util/hashing/hash_file_sha2.rs index dd762538f6..b0a31ba68c 100644 --- a/crates/service/storyteller_web/src/util/hashing/hash_file_sha2.rs +++ b/crates/service/storyteller_web/src/util/hashing/hash_file_sha2.rs @@ -1,4 +1,4 @@ -use crate::util::anyhow_result::AnyhowResult; +use container_common::anyhow_result::AnyhowResult; use crate::util::hashing::sha256_digest::sha256_digest; use data_encoding::HEXLOWER_PERMISSIVE; use ring::digest::{Context, Digest, SHA256}; diff --git a/crates/service/storyteller_web/src/util/hashing/hash_string_sha2.rs b/crates/service/storyteller_web/src/util/hashing/hash_string_sha2.rs index b44a4d0f24..a6fe989c72 100644 --- a/crates/service/storyteller_web/src/util/hashing/hash_string_sha2.rs +++ b/crates/service/storyteller_web/src/util/hashing/hash_string_sha2.rs @@ -1,4 +1,4 @@ -use crate::util::anyhow_result::AnyhowResult; +use container_common::anyhow_result::AnyhowResult; use crate::util::hashing::sha256_digest::sha256_digest; use data_encoding::HEXLOWER_PERMISSIVE; use ring::digest::{Context, Digest, SHA256}; diff --git a/crates/service/storyteller_web/src/util/hashing/sha256_digest.rs b/crates/service/storyteller_web/src/util/hashing/sha256_digest.rs index 12474badcc..d66480ee82 100644 --- a/crates/service/storyteller_web/src/util/hashing/sha256_digest.rs +++ b/crates/service/storyteller_web/src/util/hashing/sha256_digest.rs @@ -1,4 +1,4 @@ -use crate::util::anyhow_result::AnyhowResult; +use container_common::anyhow_result::AnyhowResult; use data_encoding::HEXLOWER_PERMISSIVE; use ring::digest::{Context, Digest, SHA256}; use std::fs::File; diff --git a/crates/service/storyteller_web/src/util/jobs/cache_miss_strategizer_multi.rs b/crates/service/storyteller_web/src/util/jobs/cache_miss_strategizer_multi.rs index 554be524cd..34dbf66997 100644 --- a/crates/service/storyteller_web/src/util/jobs/cache_miss_strategizer_multi.rs +++ b/crates/service/storyteller_web/src/util/jobs/cache_miss_strategizer_multi.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::{DateTime, Utc, Duration}; -use crate::util::anyhow_result::AnyhowResult; +use container_common::anyhow_result::AnyhowResult; use crate::util::jobs::cache_miss_strategizer::{CacheMissStrategizer, CacheMissStrategy}; use std::sync::{RwLock, Arc}; diff --git a/crates/service/storyteller_web/src/util/jobs/virtual_lfu_cache.rs b/crates/service/storyteller_web/src/util/jobs/virtual_lfu_cache.rs index 0a25f23fd0..2b88dbd751 100644 --- a/crates/service/storyteller_web/src/util/jobs/virtual_lfu_cache.rs +++ b/crates/service/storyteller_web/src/util/jobs/virtual_lfu_cache.rs @@ -1,9 +1,9 @@ use anyhow::anyhow; -use crate::util::anyhow_result::AnyhowResult; +use container_common::anyhow_result::AnyhowResult; use lfu::LFUCache; -use std::sync::{Arc, RwLock}; -use std::collections::HashSet; use std::borrow::Borrow; +use std::collections::HashSet; +use std::sync::{Arc, RwLock}; /// This stands in front of the python HTTP sidecar and controls which /// models get to remain in memory. The Python sidecar keeps multiple diff --git a/crates/service/storyteller_web/src/util/markdown_to_html.rs b/crates/service/storyteller_web/src/util/markdown_to_html.rs index 9b89017945..2dccc6cafb 100644 --- a/crates/service/storyteller_web/src/util/markdown_to_html.rs +++ b/crates/service/storyteller_web/src/util/markdown_to_html.rs @@ -1,5 +1,5 @@ +use container_common::anyhow_result::AnyhowResult; use pulldown_cmark::{Options, Parser, html}; -use crate::util::anyhow_result::AnyhowResult; pub fn markdown_to_html(markdown_input: &str) -> String { // NB: CommonMark allows for HTML, including