From c45a6da8a5f4331b69fd565e33ba3f79e66b72ac Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Fri, 10 Mar 2023 02:55:57 -0500 Subject: [PATCH] rid database_queries of container_common::anyhow_result --- crates/lib/database_queries/src/column_types/job_status.rs | 2 +- crates/lib/database_queries/src/column_types/tts_model_type.rs | 2 +- .../database_queries/src/column_types/twitch_event_category.rs | 2 +- crates/lib/database_queries/src/column_types/vocoder_type.rs | 2 +- .../lib/database_queries/src/complex_models/event_responses.rs | 2 +- crates/lib/database_queries/src/mediators/badge_granter.rs | 2 +- crates/lib/database_queries/src/mediators/firehose_publisher.rs | 2 +- .../database_queries/src/queries/api_tokens/create_api_token.rs | 2 +- .../database_queries/src/queries/api_tokens/delete_api_token.rs | 2 +- .../database_queries/src/queries/api_tokens/edit_api_token.rs | 2 +- .../queries/api_tokens/list_available_api_tokens_for_user.rs | 2 +- .../billing/stripe/get_stripe_webhook_event_log_by_id.rs | 2 +- .../queries/billing/stripe/insert_stripe_webhook_event_log.rs | 2 +- .../job/list_available_generic_download_jobs.rs | 2 +- .../generic_download/job/mark_generic_download_job_done.rs | 2 +- .../generic_download/job/mark_generic_download_job_failure.rs | 2 +- .../job/mark_generic_download_job_pending_and_grab_lock.rs | 2 +- .../generic_download/web/get_generic_download_job_status.rs | 2 +- .../queries/generic_download/web/insert_generic_download_job.rs | 2 +- .../job/list_available_generic_inference_jobs.rs | 2 +- .../job/mark_generic_inference_job_completely_failed.rs | 2 +- .../generic_inference/job/mark_generic_inference_job_failure.rs | 2 +- .../job/mark_generic_inference_job_pending_and_grab_lock.rs | 2 +- .../job/mark_generic_inference_job_successfully_done.rs | 2 +- .../generic_inference/web/get_generic_inference_job_status.rs | 2 +- .../src/queries/health_check/health_check_query.rs | 2 +- crates/lib/database_queries/src/queries/ip_bans/list_ip_bans.rs | 2 +- .../src/queries/media_uploads/insert_media_upload.rs | 2 +- .../src/queries/model_categories/create_category.rs | 2 +- .../src/queries/model_categories/get_category_by_token.rs | 2 +- .../queries/model_categories/list_categories_query_builder.rs | 2 +- .../src/queries/model_categories/update_model_category.rs | 2 +- .../src/queries/stats/get_on_prem_worker_stats.rs | 2 +- .../database_queries/src/queries/stats/get_voice_count_stats.rs | 2 +- .../trending_model_analytics/upsert_trending_model_analytics.rs | 2 +- .../src/queries/tts/stats/calculate_tts_model_leaderboard.rs | 2 +- .../fetch_and_build_tts_model_category_map.rs | 2 +- .../list_assigned_tts_categories_query_builder.rs | 2 +- .../queries/tts/tts_download_jobs/tts_download_job_queries.rs | 2 +- .../tts_inference_jobs/get_pending_tts_inference_job_count.rs | 2 +- .../queries/tts/tts_inference_jobs/insert_tts_inference_job.rs | 2 +- .../queries/tts/tts_inference_jobs/kill_tts_inference_jobs.rs | 2 +- .../tts/tts_inference_jobs/list_available_tts_inference_jobs.rs | 2 +- .../tts/tts_inference_jobs/mark_tts_inference_job_done.rs | 2 +- .../tts/tts_inference_jobs/mark_tts_inference_job_failure.rs | 2 +- .../mark_tts_inference_job_pending_and_grab_lock.rs | 2 +- .../mark_tts_inference_job_permanently_dead.rs | 2 +- .../queries/tts/tts_models/delete_tts_model_various_scopes.rs | 2 +- .../src/queries/tts/tts_models/get_tts_model.rs | 2 +- .../tts/tts_models/insert_tts_model_from_download_job.rs | 2 +- .../src/queries/tts/tts_models/list_tts_models.rs | 2 +- .../queries/tts/tts_results/delete_tts_result_various_scopes.rs | 2 +- .../src/queries/tts/tts_results/insert_tts_result.rs | 2 +- .../queries/tts/tts_results/list_tts_results_query_builder.rs | 2 +- .../src/queries/tts/tts_results/query_tts_result.rs | 2 +- .../twitch/twitch_event_rules/delete_twitch_event_rule.rs | 2 +- .../twitch/twitch_event_rules/get_twitch_event_rule_for_user.rs | 2 +- .../twitch_event_rules/insert_twitch_event_rule_builder.rs | 2 +- .../twitch_event_rules/list_twitch_event_rules_for_user.rs | 2 +- .../twitch/twitch_event_rules/reorder_twitch_event_rules.rs | 2 +- .../twitch_event_rules/update_twitch_event_rule_builder.rs | 2 +- .../database_queries/src/queries/twitch/twitch_oauth/find.rs | 2 +- .../database_queries/src/queries/twitch/twitch_oauth/insert.rs | 2 +- .../src/queries/twitch/twitch_pubsub/insert_bits.rs | 2 +- .../src/queries/twitch/twitch_pubsub/insert_channel_points.rs | 2 +- .../src/queries/users/user/list_users_query_builder.rs | 2 +- .../src/queries/users/user/lookup_user_for_login_by_email.rs | 2 +- .../src/queries/users/user/lookup_user_for_login_by_username.rs | 2 +- .../src/queries/users/user/set_user_ban_status.rs | 2 +- .../user/update_user_record_with_new_stripe_customer_id.rs | 2 +- .../src/queries/users/user_badges/list_user_badges.rs | 2 +- .../users/user_profiles/edit_user_profile_as_account_holder.rs | 2 +- .../src/queries/users/user_profiles/edit_user_profile_as_mod.rs | 2 +- .../queries/users/user_profiles/get_user_profile_by_username.rs | 2 +- .../src/queries/users/user_ratings/update_tts_model_ratings.rs | 2 +- .../src/queries/users/user_ratings/upsert_user_rating.rs | 2 +- .../src/queries/users/user_roles/list_user_roles.rs | 2 +- .../src/queries/users/user_sessions/create_user_session.rs | 2 +- .../src/queries/users/user_sessions/delete_user_session.rs | 2 +- .../queries/users/user_sessions/get_user_session_by_token.rs | 2 +- .../users/user_sessions/get_user_session_by_token_light.rs | 2 +- .../get_user_subscription_by_stripe_subscription_id.rs | 2 +- .../users/user_subscriptions/insert_unsubscribe_reason.rs | 2 +- .../users/user_subscriptions/list_active_user_subscriptions.rs | 2 +- .../user_subscriptions/upsert_user_subscription_by_stripe_id.rs | 2 +- .../database_queries/src/queries/vocoder/get_vocoder_model.rs | 2 +- .../src/queries/vocoder/insert_vocoder_model.rs | 2 +- .../database_queries/src/queries/vocoder/list_vocoder_models.rs | 2 +- .../src/queries/voice_clone_requests/get_voice_clone_request.rs | 2 +- .../voice_clone_requests/insert_voice_clone_requests_builder.rs | 2 +- .../models/insert_voice_conversion_model_from_download_job.rs | 2 +- .../src/queries/w2l/stats/calculate_w2l_template_leaderboard.rs | 2 +- .../queries/w2l/w2l_download_jobs/w2l_download_job_queries.rs | 2 +- .../queries/w2l/w2l_inference_jobs/insert_w2l_inference_job.rs | 2 +- .../queries/w2l/w2l_inference_jobs/w2l_inference_job_queries.rs | 2 +- .../queries/w2l/w2l_results/delete_w2l_result_various_scopes.rs | 2 +- .../w2l/w2l_results/list_w2l_inference_results_query_builder.rs | 2 +- .../src/queries/w2l/w2l_results/query_w2l_result.rs | 2 +- .../get_w2l_template_upload_job_status.rs | 2 +- .../w2l_template_upload_jobs/insert_w2l_template_upload_job.rs | 2 +- .../w2l/w2l_templates/delete_w2l_template_various_scopes.rs | 2 +- .../src/queries/w2l/w2l_templates/get_w2l_template.rs | 2 +- .../src/queries/w2l/w2l_templates/list_w2l_templates.rs | 2 +- crates/lib/database_queries/src/tokens.rs | 2 +- 104 files changed, 104 insertions(+), 104 deletions(-) diff --git a/crates/lib/database_queries/src/column_types/job_status.rs b/crates/lib/database_queries/src/column_types/job_status.rs index e3606e50ca..05c8db2de2 100644 --- a/crates/lib/database_queries/src/column_types/job_status.rs +++ b/crates/lib/database_queries/src/column_types/job_status.rs @@ -1,7 +1,7 @@ //! These are columns where users can control the visibility of their data. use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::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/lib/database_queries/src/column_types/tts_model_type.rs b/crates/lib/database_queries/src/column_types/tts_model_type.rs index 3492d744b3..b4788f247e 100644 --- a/crates/lib/database_queries/src/column_types/tts_model_type.rs +++ b/crates/lib/database_queries/src/column_types/tts_model_type.rs @@ -1,7 +1,7 @@ //! These denote the TTS synthesizer model types use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; #[derive(Clone, Copy, PartialEq, Eq, Debug, Serialize, Deserialize, sqlx::Type)] #[serde(rename_all = "lowercase")] diff --git a/crates/lib/database_queries/src/column_types/twitch_event_category.rs b/crates/lib/database_queries/src/column_types/twitch_event_category.rs index 269b5d9ccf..90fc8eb849 100644 --- a/crates/lib/database_queries/src/column_types/twitch_event_category.rs +++ b/crates/lib/database_queries/src/column_types/twitch_event_category.rs @@ -1,7 +1,7 @@ //! These are columns where users can control the visibility of their data. use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::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/lib/database_queries/src/column_types/vocoder_type.rs b/crates/lib/database_queries/src/column_types/vocoder_type.rs index ec63f25a61..e0abaf795d 100644 --- a/crates/lib/database_queries/src/column_types/vocoder_type.rs +++ b/crates/lib/database_queries/src/column_types/vocoder_type.rs @@ -1,7 +1,7 @@ //! These denote the pretrained vocoders use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; #[derive(Clone, Copy, PartialEq, Eq, Debug, Serialize, Deserialize, sqlx::Type)] #[serde(rename_all = "lowercase")] diff --git a/crates/lib/database_queries/src/complex_models/event_responses.rs b/crates/lib/database_queries/src/complex_models/event_responses.rs index 4c230e9545..f421732dd7 100644 --- a/crates/lib/database_queries/src/complex_models/event_responses.rs +++ b/crates/lib/database_queries/src/complex_models/event_responses.rs @@ -1,4 +1,4 @@ -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use std::collections::HashMap; /// How TTS commands should be prefixed: !voiceName, /voiceName, etc. diff --git a/crates/lib/database_queries/src/mediators/badge_granter.rs b/crates/lib/database_queries/src/mediators/badge_granter.rs index 9adb4a85d2..ed67cb9598 100644 --- a/crates/lib/database_queries/src/mediators/badge_granter.rs +++ b/crates/lib/database_queries/src/mediators/badge_granter.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::mediators::firehose_publisher::FirehosePublisher; use log::{warn,info}; use reusable_types::achievements::user_badge::UserBadge; diff --git a/crates/lib/database_queries/src/mediators/firehose_publisher.rs b/crates/lib/database_queries/src/mediators/firehose_publisher.rs index 74825ce83c..1749edcac7 100644 --- a/crates/lib/database_queries/src/mediators/firehose_publisher.rs +++ b/crates/lib/database_queries/src/mediators/firehose_publisher.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::tokens::Tokens; use log::{warn,info}; use sqlx::error::Error::Database; diff --git a/crates/lib/database_queries/src/queries/api_tokens/create_api_token.rs b/crates/lib/database_queries/src/queries/api_tokens/create_api_token.rs index 50ee9b4ad7..746a0c2aad 100644 --- a/crates/lib/database_queries/src/queries/api_tokens/create_api_token.rs +++ b/crates/lib/database_queries/src/queries/api_tokens/create_api_token.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::queries::api_tokens::list_available_api_tokens_for_user::list_available_api_tokens_for_user; use crate::tokens::Tokens; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/api_tokens/delete_api_token.rs b/crates/lib/database_queries/src/queries/api_tokens/delete_api_token.rs index 7f8f310ba0..56c3c57b7d 100644 --- a/crates/lib/database_queries/src/queries/api_tokens/delete_api_token.rs +++ b/crates/lib/database_queries/src/queries/api_tokens/delete_api_token.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use sqlx::MySqlPool; pub async fn delete_api_token( diff --git a/crates/lib/database_queries/src/queries/api_tokens/edit_api_token.rs b/crates/lib/database_queries/src/queries/api_tokens/edit_api_token.rs index 909075c105..a6241100ea 100644 --- a/crates/lib/database_queries/src/queries/api_tokens/edit_api_token.rs +++ b/crates/lib/database_queries/src/queries/api_tokens/edit_api_token.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use log::warn; use sqlx::MySqlPool; use std::collections::{HashSet, HashMap}; diff --git a/crates/lib/database_queries/src/queries/api_tokens/list_available_api_tokens_for_user.rs b/crates/lib/database_queries/src/queries/api_tokens/list_available_api_tokens_for_user.rs index 034d24d131..85c8220493 100644 --- a/crates/lib/database_queries/src/queries/api_tokens/list_available_api_tokens_for_user.rs +++ b/crates/lib/database_queries/src/queries/api_tokens/list_available_api_tokens_for_user.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::{Utc, DateTime}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use sqlx::MySqlPool; /// table: api_tokens diff --git a/crates/lib/database_queries/src/queries/billing/stripe/get_stripe_webhook_event_log_by_id.rs b/crates/lib/database_queries/src/queries/billing/stripe/get_stripe_webhook_event_log_by_id.rs index cd7af6e8ef..efdad00fb7 100644 --- a/crates/lib/database_queries/src/queries/billing/stripe/get_stripe_webhook_event_log_by_id.rs +++ b/crates/lib/database_queries/src/queries/billing/stripe/get_stripe_webhook_event_log_by_id.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::{DateTime, NaiveDateTime, Utc}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::helpers::boolean_converters::i8_to_bool; use log::warn; use reusable_types::stripe::stripe_subscription_status::StripeSubscriptionStatus; diff --git a/crates/lib/database_queries/src/queries/billing/stripe/insert_stripe_webhook_event_log.rs b/crates/lib/database_queries/src/queries/billing/stripe/insert_stripe_webhook_event_log.rs index dc09ff4db1..bdd626f639 100644 --- a/crates/lib/database_queries/src/queries/billing/stripe/insert_stripe_webhook_event_log.rs +++ b/crates/lib/database_queries/src/queries/billing/stripe/insert_stripe_webhook_event_log.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::NaiveDateTime; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use sqlx::MySqlPool; // TODO: Make a trait with default impls to handle common query concerns. diff --git a/crates/lib/database_queries/src/queries/generic_download/job/list_available_generic_download_jobs.rs b/crates/lib/database_queries/src/queries/generic_download/job/list_available_generic_download_jobs.rs index 998bbdacd7..12d31f18c5 100644 --- a/crates/lib/database_queries/src/queries/generic_download/job/list_available_generic_download_jobs.rs +++ b/crates/lib/database_queries/src/queries/generic_download/job/list_available_generic_download_jobs.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::Utc; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::column_types::job_status::JobStatus; use crate::queries::generic_download::job::_keys::GenericDownloadJobId; use crate::tokens::Tokens; diff --git a/crates/lib/database_queries/src/queries/generic_download/job/mark_generic_download_job_done.rs b/crates/lib/database_queries/src/queries/generic_download/job/mark_generic_download_job_done.rs index fdc6de7e67..006568d8dc 100644 --- a/crates/lib/database_queries/src/queries/generic_download/job/mark_generic_download_job_done.rs +++ b/crates/lib/database_queries/src/queries/generic_download/job/mark_generic_download_job_done.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/generic_download/job/mark_generic_download_job_failure.rs b/crates/lib/database_queries/src/queries/generic_download/job/mark_generic_download_job_failure.rs index b6de45c92c..c21c3d0fd1 100644 --- a/crates/lib/database_queries/src/queries/generic_download/job/mark_generic_download_job_failure.rs +++ b/crates/lib/database_queries/src/queries/generic_download/job/mark_generic_download_job_failure.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob; use sqlx::MySqlPool; use sqlx; diff --git a/crates/lib/database_queries/src/queries/generic_download/job/mark_generic_download_job_pending_and_grab_lock.rs b/crates/lib/database_queries/src/queries/generic_download/job/mark_generic_download_job_pending_and_grab_lock.rs index be5ab74789..7e7370d8e5 100644 --- a/crates/lib/database_queries/src/queries/generic_download/job/mark_generic_download_job_pending_and_grab_lock.rs +++ b/crates/lib/database_queries/src/queries/generic_download/job/mark_generic_download_job_pending_and_grab_lock.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use sqlx::MySqlPool; use sqlx; use crate::queries::generic_download::job::_keys::GenericDownloadJobId; diff --git a/crates/lib/database_queries/src/queries/generic_download/web/get_generic_download_job_status.rs b/crates/lib/database_queries/src/queries/generic_download/web/get_generic_download_job_status.rs index ef1d035dbe..a2466c359b 100644 --- a/crates/lib/database_queries/src/queries/generic_download/web/get_generic_download_job_status.rs +++ b/crates/lib/database_queries/src/queries/generic_download/web/get_generic_download_job_status.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use log::warn; use sqlx::MySqlPool; use tokens::jobs::download::DownloadJobToken; diff --git a/crates/lib/database_queries/src/queries/generic_download/web/insert_generic_download_job.rs b/crates/lib/database_queries/src/queries/generic_download/web/insert_generic_download_job.rs index 29546e0610..fe8da42451 100644 --- a/crates/lib/database_queries/src/queries/generic_download/web/insert_generic_download_job.rs +++ b/crates/lib/database_queries/src/queries/generic_download/web/insert_generic_download_job.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use enums::common::visibility::Visibility; use enums::workers::generic_download_type::GenericDownloadType; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/generic_inference/job/list_available_generic_inference_jobs.rs b/crates/lib/database_queries/src/queries/generic_inference/job/list_available_generic_inference_jobs.rs index 492c9a98bc..5c0487007f 100644 --- a/crates/lib/database_queries/src/queries/generic_inference/job/list_available_generic_inference_jobs.rs +++ b/crates/lib/database_queries/src/queries/generic_inference/job/list_available_generic_inference_jobs.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::Utc; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::column_types::job_status::JobStatus; use crate::helpers::boolean_converters::i8_to_bool; use crate::queries::generic_inference::job::_keys::GenericInferenceJobId; diff --git a/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_completely_failed.rs b/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_completely_failed.rs index 8ee46fd3de..6e58a8debc 100644 --- a/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_completely_failed.rs +++ b/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_completely_failed.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_failure.rs b/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_failure.rs index aa33c88462..b3647447af 100644 --- a/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_failure.rs +++ b/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_failure.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; use sqlx::MySqlPool; use sqlx; diff --git a/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_pending_and_grab_lock.rs b/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_pending_and_grab_lock.rs index ace9494698..f15833d1b7 100644 --- a/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_pending_and_grab_lock.rs +++ b/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_pending_and_grab_lock.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::queries::generic_inference::job::_keys::GenericInferenceJobId; use sqlx::MySqlPool; use sqlx; diff --git a/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_successfully_done.rs b/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_successfully_done.rs index 1fbeec22cf..e8dfb01e3a 100644 --- a/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_successfully_done.rs +++ b/crates/lib/database_queries/src/queries/generic_inference/job/mark_generic_inference_job_successfully_done.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/generic_inference/web/get_generic_inference_job_status.rs b/crates/lib/database_queries/src/queries/generic_inference/web/get_generic_inference_job_status.rs index f9cffd230c..536ec7f62d 100644 --- a/crates/lib/database_queries/src/queries/generic_inference/web/get_generic_inference_job_status.rs +++ b/crates/lib/database_queries/src/queries/generic_inference/web/get_generic_inference_job_status.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use log::warn; use sqlx::MySqlPool; use tokens::jobs::inference::InferenceJobToken; diff --git a/crates/lib/database_queries/src/queries/health_check/health_check_query.rs b/crates/lib/database_queries/src/queries/health_check/health_check_query.rs index 847f77e20d..e831cfbe46 100644 --- a/crates/lib/database_queries/src/queries/health_check/health_check_query.rs +++ b/crates/lib/database_queries/src/queries/health_check/health_check_query.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::{Utc, DateTime, NaiveDateTime}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use sqlx::MySqlPool; /// This just queries for current time. If it fails, we know the connection pool is dead. diff --git a/crates/lib/database_queries/src/queries/ip_bans/list_ip_bans.rs b/crates/lib/database_queries/src/queries/ip_bans/list_ip_bans.rs index 4bff642506..25b99fae0e 100644 --- a/crates/lib/database_queries/src/queries/ip_bans/list_ip_bans.rs +++ b/crates/lib/database_queries/src/queries/ip_bans/list_ip_bans.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use log::warn; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/media_uploads/insert_media_upload.rs b/crates/lib/database_queries/src/queries/media_uploads/insert_media_upload.rs index d731475ee9..fbacd81493 100644 --- a/crates/lib/database_queries/src/queries/media_uploads/insert_media_upload.rs +++ b/crates/lib/database_queries/src/queries/media_uploads/insert_media_upload.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use buckets::public::media_uploads::original_file::MediaUploadOriginalFilePath; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::payloads::media_upload_details::MediaUploadDetails; use enums::by_table::media_uploads::media_upload_type::MediaUploadType; use enums::common::visibility::Visibility; diff --git a/crates/lib/database_queries/src/queries/model_categories/create_category.rs b/crates/lib/database_queries/src/queries/model_categories/create_category.rs index 2112cfebc3..47b2ee093a 100644 --- a/crates/lib/database_queries/src/queries/model_categories/create_category.rs +++ b/crates/lib/database_queries/src/queries/model_categories/create_category.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use sqlx::MySqlPool; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; pub struct CreateCategoryArgs<'a> { pub category_token: &'a str, diff --git a/crates/lib/database_queries/src/queries/model_categories/get_category_by_token.rs b/crates/lib/database_queries/src/queries/model_categories/get_category_by_token.rs index 5d5b71b0d0..f08a1121df 100644 --- a/crates/lib/database_queries/src/queries/model_categories/get_category_by_token.rs +++ b/crates/lib/database_queries/src/queries/model_categories/get_category_by_token.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::helpers::boolean_converters::{nullable_i8_to_optional_bool, i8_to_bool}; use log::{info, warn, log}; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/model_categories/list_categories_query_builder.rs b/crates/lib/database_queries/src/queries/model_categories/list_categories_query_builder.rs index 5744d1058b..7bc6097129 100644 --- a/crates/lib/database_queries/src/queries/model_categories/list_categories_query_builder.rs +++ b/crates/lib/database_queries/src/queries/model_categories/list_categories_query_builder.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::helpers::boolean_converters::{i8_to_bool, nullable_i8_to_optional_bool}; use log::{warn, info}; use sqlx::{MySql, MySqlPool}; diff --git a/crates/lib/database_queries/src/queries/model_categories/update_model_category.rs b/crates/lib/database_queries/src/queries/model_categories/update_model_category.rs index d82a735a71..ee65b5b985 100644 --- a/crates/lib/database_queries/src/queries/model_categories/update_model_category.rs +++ b/crates/lib/database_queries/src/queries/model_categories/update_model_category.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use sqlx::MySqlPool; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; pub struct UpdateModelCategoryArgs<'a> { pub name: &'a str, diff --git a/crates/lib/database_queries/src/queries/stats/get_on_prem_worker_stats.rs b/crates/lib/database_queries/src/queries/stats/get_on_prem_worker_stats.rs index b3658bf5f1..275d405160 100644 --- a/crates/lib/database_queries/src/queries/stats/get_on_prem_worker_stats.rs +++ b/crates/lib/database_queries/src/queries/stats/get_on_prem_worker_stats.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use log::warn; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/stats/get_voice_count_stats.rs b/crates/lib/database_queries/src/queries/stats/get_voice_count_stats.rs index f8ad1bb5cb..9156da5448 100644 --- a/crates/lib/database_queries/src/queries/stats/get_voice_count_stats.rs +++ b/crates/lib/database_queries/src/queries/stats/get_voice_count_stats.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use log::warn; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/trending_model_analytics/upsert_trending_model_analytics.rs b/crates/lib/database_queries/src/queries/trending_model_analytics/upsert_trending_model_analytics.rs index 3775af39c0..8ba4e686d5 100644 --- a/crates/lib/database_queries/src/queries/trending_model_analytics/upsert_trending_model_analytics.rs +++ b/crates/lib/database_queries/src/queries/trending_model_analytics/upsert_trending_model_analytics.rs @@ -1,4 +1,4 @@ -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use enums::by_table::trending_model_analytics::model_type::ModelType; use enums::by_table::trending_model_analytics::window_name::WindowName; use sqlx::MySql; diff --git a/crates/lib/database_queries/src/queries/tts/stats/calculate_tts_model_leaderboard.rs b/crates/lib/database_queries/src/queries/tts/stats/calculate_tts_model_leaderboard.rs index e645f20913..a6927b436a 100644 --- a/crates/lib/database_queries/src/queries/tts/stats/calculate_tts_model_leaderboard.rs +++ b/crates/lib/database_queries/src/queries/tts/stats/calculate_tts_model_leaderboard.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use log::warn; use sqlx::{MySql, MySqlPool}; use sqlx::pool::PoolConnection; diff --git a/crates/lib/database_queries/src/queries/tts/tts_category_assignments/fetch_and_build_tts_model_category_map.rs b/crates/lib/database_queries/src/queries/tts/tts_category_assignments/fetch_and_build_tts_model_category_map.rs index 5eb5cb0bde..90bbc30d0e 100644 --- a/crates/lib/database_queries/src/queries/tts/tts_category_assignments/fetch_and_build_tts_model_category_map.rs +++ b/crates/lib/database_queries/src/queries/tts/tts_category_assignments/fetch_and_build_tts_model_category_map.rs @@ -4,7 +4,7 @@ #![forbid(unused_variables)] use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use log::warn; use sqlx::pool::PoolConnection; use sqlx::{MySql, MySqlPool}; diff --git a/crates/lib/database_queries/src/queries/tts/tts_category_assignments/list_assigned_tts_categories_query_builder.rs b/crates/lib/database_queries/src/queries/tts/tts_category_assignments/list_assigned_tts_categories_query_builder.rs index 38c753adf6..b2baae342b 100644 --- a/crates/lib/database_queries/src/queries/tts/tts_category_assignments/list_assigned_tts_categories_query_builder.rs +++ b/crates/lib/database_queries/src/queries/tts/tts_category_assignments/list_assigned_tts_categories_query_builder.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::helpers::boolean_converters::{i8_to_bool, nullable_i8_to_optional_bool}; use log::{warn, info}; use sqlx::{MySql, MySqlPool}; diff --git a/crates/lib/database_queries/src/queries/tts/tts_download_jobs/tts_download_job_queries.rs b/crates/lib/database_queries/src/queries/tts/tts_download_jobs/tts_download_job_queries.rs index 9b810882ec..8de86f9808 100644 --- a/crates/lib/database_queries/src/queries/tts/tts_download_jobs/tts_download_job_queries.rs +++ b/crates/lib/database_queries/src/queries/tts/tts_download_jobs/tts_download_job_queries.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::Utc; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::tokens::Tokens; use sqlx::MySqlPool; use std::path::Path; diff --git a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/get_pending_tts_inference_job_count.rs b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/get_pending_tts_inference_job_count.rs index 9f81d0adf1..5c33ab5098 100644 --- a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/get_pending_tts_inference_job_count.rs +++ b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/get_pending_tts_inference_job_count.rs @@ -1,5 +1,5 @@ use chrono::NaiveDateTime; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::helpers::numeric_converters::try_i64_to_u64_or_min; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/insert_tts_inference_job.rs b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/insert_tts_inference_job.rs index 34213a9f83..a1a78282ab 100644 --- a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/insert_tts_inference_job.rs +++ b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/insert_tts_inference_job.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use container_common::token::random_uuid::generate_random_uuid; use crate::builders::RequiredOption; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/kill_tts_inference_jobs.rs b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/kill_tts_inference_jobs.rs index 5e5f4e6747..56aa62ec2b 100644 --- a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/kill_tts_inference_jobs.rs +++ b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/kill_tts_inference_jobs.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use sqlx::mysql::MySqlArguments; use sqlx::query::Query; use sqlx::{MySqlPool, MySql}; diff --git a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/list_available_tts_inference_jobs.rs b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/list_available_tts_inference_jobs.rs index 5bc8379d6b..fee3421bcd 100644 --- a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/list_available_tts_inference_jobs.rs +++ b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/list_available_tts_inference_jobs.rs @@ -4,7 +4,7 @@ #![forbid(unused_variables)] use chrono::{Utc, DateTime}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::column_types::job_status::JobStatus; use crate::helpers::boolean_converters::i8_to_bool; use crate::queries::tts::tts_inference_jobs::_keys::TtsInferenceJobId; diff --git a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_done.rs b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_done.rs index 1816933470..f0e88685f7 100644 --- a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_done.rs +++ b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_done.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::queries::tts::tts_inference_jobs::_keys::TtsInferenceJobId; use sqlx::MySqlPool; use sqlx; diff --git a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_failure.rs b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_failure.rs index ea0c6fec6f..960aa5b030 100644 --- a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_failure.rs +++ b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_failure.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::queries::tts::tts_inference_jobs::list_available_tts_inference_jobs::AvailableTtsInferenceJob; use sqlx::MySqlPool; use sqlx; diff --git a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_pending_and_grab_lock.rs b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_pending_and_grab_lock.rs index 2c8ae40f9c..97a52479f8 100644 --- a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_pending_and_grab_lock.rs +++ b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_pending_and_grab_lock.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::queries::tts::tts_inference_jobs::_keys::TtsInferenceJobId; use sqlx::MySqlPool; use sqlx; diff --git a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_permanently_dead.rs b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_permanently_dead.rs index 19e2de037f..b30904656e 100644 --- a/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_permanently_dead.rs +++ b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_permanently_dead.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::queries::tts::tts_inference_jobs::_keys::TtsInferenceJobId; use sqlx::MySqlPool; use sqlx; diff --git a/crates/lib/database_queries/src/queries/tts/tts_models/delete_tts_model_various_scopes.rs b/crates/lib/database_queries/src/queries/tts/tts_models/delete_tts_model_various_scopes.rs index f01091e14b..7fce6a24de 100644 --- a/crates/lib/database_queries/src/queries/tts/tts_models/delete_tts_model_various_scopes.rs +++ b/crates/lib/database_queries/src/queries/tts/tts_models/delete_tts_model_various_scopes.rs @@ -1,4 +1,4 @@ -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use sqlx::MySqlPool; pub async fn delete_tts_model_as_user( diff --git a/crates/lib/database_queries/src/queries/tts/tts_models/get_tts_model.rs b/crates/lib/database_queries/src/queries/tts/tts_models/get_tts_model.rs index a5cd2bdcc3..33d42d40d5 100644 --- a/crates/lib/database_queries/src/queries/tts/tts_models/get_tts_model.rs +++ b/crates/lib/database_queries/src/queries/tts/tts_models/get_tts_model.rs @@ -5,7 +5,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::column_types::vocoder_type::VocoderType; use crate::helpers::boolean_converters::i8_to_bool; use enums::common::visibility::Visibility; diff --git a/crates/lib/database_queries/src/queries/tts/tts_models/insert_tts_model_from_download_job.rs b/crates/lib/database_queries/src/queries/tts/tts_models/insert_tts_model_from_download_job.rs index 04e2a6c159..e90efe7fea 100644 --- a/crates/lib/database_queries/src/queries/tts/tts_models/insert_tts_model_from_download_job.rs +++ b/crates/lib/database_queries/src/queries/tts/tts_models/insert_tts_model_from_download_job.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::Utc; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob; use crate::tokens::Tokens; use enums::common::visibility::Visibility; diff --git a/crates/lib/database_queries/src/queries/tts/tts_models/list_tts_models.rs b/crates/lib/database_queries/src/queries/tts/tts_models/list_tts_models.rs index b67377d247..42c3808fc5 100644 --- a/crates/lib/database_queries/src/queries/tts/tts_models/list_tts_models.rs +++ b/crates/lib/database_queries/src/queries/tts/tts_models/list_tts_models.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::helpers::boolean_converters::i8_to_bool; use log::{warn, info}; use sqlx::pool::PoolConnection; diff --git a/crates/lib/database_queries/src/queries/tts/tts_results/delete_tts_result_various_scopes.rs b/crates/lib/database_queries/src/queries/tts/tts_results/delete_tts_result_various_scopes.rs index c5ca6f2f3f..e2815ea50f 100644 --- a/crates/lib/database_queries/src/queries/tts/tts_results/delete_tts_result_various_scopes.rs +++ b/crates/lib/database_queries/src/queries/tts/tts_results/delete_tts_result_various_scopes.rs @@ -1,4 +1,4 @@ -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use sqlx::MySqlPool; pub async fn delete_tts_inference_result_as_user( diff --git a/crates/lib/database_queries/src/queries/tts/tts_results/insert_tts_result.rs b/crates/lib/database_queries/src/queries/tts/tts_results/insert_tts_result.rs index 8839e9bd6d..0471220cd3 100644 --- a/crates/lib/database_queries/src/queries/tts/tts_results/insert_tts_result.rs +++ b/crates/lib/database_queries/src/queries/tts/tts_results/insert_tts_result.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::column_types::vocoder_type::VocoderType; use crate::queries::tts::tts_inference_jobs::list_available_tts_inference_jobs::AvailableTtsInferenceJob; use crate::tokens::Tokens; diff --git a/crates/lib/database_queries/src/queries/tts/tts_results/list_tts_results_query_builder.rs b/crates/lib/database_queries/src/queries/tts/tts_results/list_tts_results_query_builder.rs index 406126c73a..aebde20c1f 100644 --- a/crates/lib/database_queries/src/queries/tts/tts_results/list_tts_results_query_builder.rs +++ b/crates/lib/database_queries/src/queries/tts/tts_results/list_tts_results_query_builder.rs @@ -5,7 +5,7 @@ use chrono::{DateTime, Utc}; use config::shared_constants::DEFAULT_MYSQL_QUERY_RESULT_PAGE_SIZE; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use enums::common::visibility::Visibility; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/tts/tts_results/query_tts_result.rs b/crates/lib/database_queries/src/queries/tts/tts_results/query_tts_result.rs index 402ccb8372..80a5dd7cca 100644 --- a/crates/lib/database_queries/src/queries/tts/tts_results/query_tts_result.rs +++ b/crates/lib/database_queries/src/queries/tts/tts_results/query_tts_result.rs @@ -5,7 +5,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::column_types::vocoder_type::VocoderType; use crate::helpers::boolean_converters::{nullable_i8_to_bool, i8_to_bool}; use enums::common::visibility::Visibility; diff --git a/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/delete_twitch_event_rule.rs b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/delete_twitch_event_rule.rs index 914856bb9d..fbf19aa6bd 100644 --- a/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/delete_twitch_event_rule.rs +++ b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/delete_twitch_event_rule.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use sqlx::MySqlPool; pub async fn delete_twitch_event_rule( diff --git a/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/get_twitch_event_rule_for_user.rs b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/get_twitch_event_rule_for_user.rs index fb370cd058..5a4ee4c595 100644 --- a/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/get_twitch_event_rule_for_user.rs +++ b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/get_twitch_event_rule_for_user.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::{Utc, DateTime}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::column_types::twitch_event_category::TwitchEventCategory; use crate::helpers::boolean_converters::i8_to_bool; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/insert_twitch_event_rule_builder.rs b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/insert_twitch_event_rule_builder.rs index d186c9a060..0bb6b51a2e 100644 --- a/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/insert_twitch_event_rule_builder.rs +++ b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/insert_twitch_event_rule_builder.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::column_types::twitch_event_category::TwitchEventCategory; use crate::tokens::Tokens; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/list_twitch_event_rules_for_user.rs b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/list_twitch_event_rules_for_user.rs index 6d7976dbde..283a7f1eaa 100644 --- a/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/list_twitch_event_rules_for_user.rs +++ b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/list_twitch_event_rules_for_user.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::{Utc, DateTime}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::column_types::twitch_event_category::TwitchEventCategory; use crate::helpers::boolean_converters::i8_to_bool; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/reorder_twitch_event_rules.rs b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/reorder_twitch_event_rules.rs index 76a3f874b2..65ac494f96 100644 --- a/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/reorder_twitch_event_rules.rs +++ b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/reorder_twitch_event_rules.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use log::error; use once_cell::sync::Lazy; use regex::Regex; diff --git a/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/update_twitch_event_rule_builder.rs b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/update_twitch_event_rule_builder.rs index 08b07b384f..81435522ec 100644 --- a/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/update_twitch_event_rule_builder.rs +++ b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/update_twitch_event_rule_builder.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::tokens::Tokens; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/twitch/twitch_oauth/find.rs b/crates/lib/database_queries/src/queries/twitch/twitch_oauth/find.rs index 09274990a9..c918229dca 100644 --- a/crates/lib/database_queries/src/queries/twitch/twitch_oauth/find.rs +++ b/crates/lib/database_queries/src/queries/twitch/twitch_oauth/find.rs @@ -2,7 +2,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::helpers::boolean_converters::i8_to_bool; use log::error; use log::warn; diff --git a/crates/lib/database_queries/src/queries/twitch/twitch_oauth/insert.rs b/crates/lib/database_queries/src/queries/twitch/twitch_oauth/insert.rs index 3786075c5d..f3ba5a5af6 100644 --- a/crates/lib/database_queries/src/queries/twitch/twitch_oauth/insert.rs +++ b/crates/lib/database_queries/src/queries/twitch/twitch_oauth/insert.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use log::info; use log::warn; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/twitch/twitch_pubsub/insert_bits.rs b/crates/lib/database_queries/src/queries/twitch/twitch_pubsub/insert_bits.rs index 889d25dd4e..7bd33d573b 100644 --- a/crates/lib/database_queries/src/queries/twitch/twitch_pubsub/insert_bits.rs +++ b/crates/lib/database_queries/src/queries/twitch/twitch_pubsub/insert_bits.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use log::info; use log::warn; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/twitch/twitch_pubsub/insert_channel_points.rs b/crates/lib/database_queries/src/queries/twitch/twitch_pubsub/insert_channel_points.rs index 001055e6ba..9104f8c5f8 100644 --- a/crates/lib/database_queries/src/queries/twitch/twitch_pubsub/insert_channel_points.rs +++ b/crates/lib/database_queries/src/queries/twitch/twitch_pubsub/insert_channel_points.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use log::info; use log::warn; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/users/user/list_users_query_builder.rs b/crates/lib/database_queries/src/queries/users/user/list_users_query_builder.rs index 6c40f62bc0..7b9d2dbe3a 100644 --- a/crates/lib/database_queries/src/queries/users/user/list_users_query_builder.rs +++ b/crates/lib/database_queries/src/queries/users/user/list_users_query_builder.rs @@ -1,5 +1,5 @@ use chrono::{DateTime, Utc}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::helpers::boolean_converters::i8_to_bool; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/users/user/lookup_user_for_login_by_email.rs b/crates/lib/database_queries/src/queries/users/user/lookup_user_for_login_by_email.rs index 0d9b7e82a5..7da34b89c4 100644 --- a/crates/lib/database_queries/src/queries/users/user/lookup_user_for_login_by_email.rs +++ b/crates/lib/database_queries/src/queries/users/user/lookup_user_for_login_by_email.rs @@ -1,4 +1,4 @@ -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::queries::users::user::lookup_user_for_login_result::UserRecordForLogin; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/users/user/lookup_user_for_login_by_username.rs b/crates/lib/database_queries/src/queries/users/user/lookup_user_for_login_by_username.rs index 199372214c..15cacbfff3 100644 --- a/crates/lib/database_queries/src/queries/users/user/lookup_user_for_login_by_username.rs +++ b/crates/lib/database_queries/src/queries/users/user/lookup_user_for_login_by_username.rs @@ -1,4 +1,4 @@ -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::queries::users::user::lookup_user_for_login_result::UserRecordForLogin; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/users/user/set_user_ban_status.rs b/crates/lib/database_queries/src/queries/users/user/set_user_ban_status.rs index f4c95848a3..9740ae8057 100644 --- a/crates/lib/database_queries/src/queries/users/user/set_user_ban_status.rs +++ b/crates/lib/database_queries/src/queries/users/user/set_user_ban_status.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use sqlx::MySqlPool; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use tokens::users::user::UserToken; pub struct SetUserBanStatsArgs<'a> { diff --git a/crates/lib/database_queries/src/queries/users/user/update_user_record_with_new_stripe_customer_id.rs b/crates/lib/database_queries/src/queries/users/user/update_user_record_with_new_stripe_customer_id.rs index fe55b07108..69bc00f34e 100644 --- a/crates/lib/database_queries/src/queries/users/user/update_user_record_with_new_stripe_customer_id.rs +++ b/crates/lib/database_queries/src/queries/users/user/update_user_record_with_new_stripe_customer_id.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use sqlx::MySqlPool; pub async fn update_user_record_with_new_stripe_customer_id( diff --git a/crates/lib/database_queries/src/queries/users/user_badges/list_user_badges.rs b/crates/lib/database_queries/src/queries/users/user_badges/list_user_badges.rs index 6b1250bc08..d17d4dff7e 100644 --- a/crates/lib/database_queries/src/queries/users/user_badges/list_user_badges.rs +++ b/crates/lib/database_queries/src/queries/users/user_badges/list_user_badges.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use log::{warn, info}; use sqlx::{MySql, MySqlPool}; use sqlx::pool::PoolConnection; diff --git a/crates/lib/database_queries/src/queries/users/user_profiles/edit_user_profile_as_account_holder.rs b/crates/lib/database_queries/src/queries/users/user_profiles/edit_user_profile_as_account_holder.rs index b801ae7fb6..d7f1963f62 100644 --- a/crates/lib/database_queries/src/queries/users/user_profiles/edit_user_profile_as_account_holder.rs +++ b/crates/lib/database_queries/src/queries/users/user_profiles/edit_user_profile_as_account_holder.rs @@ -4,7 +4,7 @@ #![forbid(unused_variables)] use sqlx::MySqlPool; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; pub struct Args<'a> { pub user_token: &'a str, diff --git a/crates/lib/database_queries/src/queries/users/user_profiles/edit_user_profile_as_mod.rs b/crates/lib/database_queries/src/queries/users/user_profiles/edit_user_profile_as_mod.rs index 9cba655690..ba03a252c2 100644 --- a/crates/lib/database_queries/src/queries/users/user_profiles/edit_user_profile_as_mod.rs +++ b/crates/lib/database_queries/src/queries/users/user_profiles/edit_user_profile_as_mod.rs @@ -4,7 +4,7 @@ #![forbid(unused_variables)] use sqlx::MySqlPool; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; pub struct Args<'a> { pub user_token: &'a str, diff --git a/crates/lib/database_queries/src/queries/users/user_profiles/get_user_profile_by_username.rs b/crates/lib/database_queries/src/queries/users/user_profiles/get_user_profile_by_username.rs index 5f6340a5de..d71cf3c336 100644 --- a/crates/lib/database_queries/src/queries/users/user_profiles/get_user_profile_by_username.rs +++ b/crates/lib/database_queries/src/queries/users/user_profiles/get_user_profile_by_username.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::helpers::boolean_converters::i8_to_bool; use enums::common::visibility::Visibility; use log::{info, warn, log}; diff --git a/crates/lib/database_queries/src/queries/users/user_ratings/update_tts_model_ratings.rs b/crates/lib/database_queries/src/queries/users/user_ratings/update_tts_model_ratings.rs index b50eae91f7..7768e1dbb7 100644 --- a/crates/lib/database_queries/src/queries/users/user_ratings/update_tts_model_ratings.rs +++ b/crates/lib/database_queries/src/queries/users/user_ratings/update_tts_model_ratings.rs @@ -1,4 +1,4 @@ -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use sqlx::MySql; use sqlx::pool::PoolConnection; use tokens::tokens::tts_models::TtsModelToken; diff --git a/crates/lib/database_queries/src/queries/users/user_ratings/upsert_user_rating.rs b/crates/lib/database_queries/src/queries/users/user_ratings/upsert_user_rating.rs index fb3c0f88bb..c590bbd459 100644 --- a/crates/lib/database_queries/src/queries/users/user_ratings/upsert_user_rating.rs +++ b/crates/lib/database_queries/src/queries/users/user_ratings/upsert_user_rating.rs @@ -1,4 +1,4 @@ -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::composite_keys::by_table::user_ratings::user_rating_entity::UserRatingEntity; use enums::by_table::user_ratings::entity_type::UserRatingEntityType; use enums::by_table::user_ratings::rating_value::UserRatingValue; diff --git a/crates/lib/database_queries/src/queries/users/user_roles/list_user_roles.rs b/crates/lib/database_queries/src/queries/users/user_roles/list_user_roles.rs index 652c5402dc..2be6d268bd 100644 --- a/crates/lib/database_queries/src/queries/users/user_roles/list_user_roles.rs +++ b/crates/lib/database_queries/src/queries/users/user_roles/list_user_roles.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::helpers::boolean_converters::i8_to_bool; use log::{warn, info}; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/users/user_sessions/create_user_session.rs b/crates/lib/database_queries/src/queries/users/user_sessions/create_user_session.rs index 4133d139bc..36207b86df 100644 --- a/crates/lib/database_queries/src/queries/users/user_sessions/create_user_session.rs +++ b/crates/lib/database_queries/src/queries/users/user_sessions/create_user_session.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::tokens::Tokens; use log::{info, warn}; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/users/user_sessions/delete_user_session.rs b/crates/lib/database_queries/src/queries/users/user_sessions/delete_user_session.rs index db7dd1e865..17bbabce39 100644 --- a/crates/lib/database_queries/src/queries/users/user_sessions/delete_user_session.rs +++ b/crates/lib/database_queries/src/queries/users/user_sessions/delete_user_session.rs @@ -1,4 +1,4 @@ -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use sqlx::MySqlPool; pub async fn delete_user_session(session_token: &str, mysql_pool: &MySqlPool) -> AnyhowResult<()> { diff --git a/crates/lib/database_queries/src/queries/users/user_sessions/get_user_session_by_token.rs b/crates/lib/database_queries/src/queries/users/user_sessions/get_user_session_by_token.rs index b40aab55ad..248f230ef3 100644 --- a/crates/lib/database_queries/src/queries/users/user_sessions/get_user_session_by_token.rs +++ b/crates/lib/database_queries/src/queries/users/user_sessions/get_user_session_by_token.rs @@ -3,7 +3,7 @@ #![forbid(unused_mut)] use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::helpers::boolean_converters::{nullable_i8_to_optional_bool, i8_to_bool, nullable_i8_to_bool_default_false}; use enums::common::visibility::Visibility; use log::warn; diff --git a/crates/lib/database_queries/src/queries/users/user_sessions/get_user_session_by_token_light.rs b/crates/lib/database_queries/src/queries/users/user_sessions/get_user_session_by_token_light.rs index 2cf18a532f..92ddde72c3 100644 --- a/crates/lib/database_queries/src/queries/users/user_sessions/get_user_session_by_token_light.rs +++ b/crates/lib/database_queries/src/queries/users/user_sessions/get_user_session_by_token_light.rs @@ -3,7 +3,7 @@ #![forbid(unused_mut)] use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use log::warn; use sqlx::MySql; use sqlx::pool::PoolConnection; diff --git a/crates/lib/database_queries/src/queries/users/user_subscriptions/get_user_subscription_by_stripe_subscription_id.rs b/crates/lib/database_queries/src/queries/users/user_subscriptions/get_user_subscription_by_stripe_subscription_id.rs index 7485ffdd4a..f33639d123 100644 --- a/crates/lib/database_queries/src/queries/users/user_subscriptions/get_user_subscription_by_stripe_subscription_id.rs +++ b/crates/lib/database_queries/src/queries/users/user_subscriptions/get_user_subscription_by_stripe_subscription_id.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::{DateTime, NaiveDateTime, Utc}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::helpers::boolean_converters::nullable_i8_to_optional_bool; use log::warn; use reusable_types::stripe::stripe_subscription_status::StripeSubscriptionStatus; diff --git a/crates/lib/database_queries/src/queries/users/user_subscriptions/insert_unsubscribe_reason.rs b/crates/lib/database_queries/src/queries/users/user_subscriptions/insert_unsubscribe_reason.rs index 559c1fb387..0592540237 100644 --- a/crates/lib/database_queries/src/queries/users/user_subscriptions/insert_unsubscribe_reason.rs +++ b/crates/lib/database_queries/src/queries/users/user_subscriptions/insert_unsubscribe_reason.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use log::info; use log::warn; use sqlx::MySql; diff --git a/crates/lib/database_queries/src/queries/users/user_subscriptions/list_active_user_subscriptions.rs b/crates/lib/database_queries/src/queries/users/user_subscriptions/list_active_user_subscriptions.rs index 801fd8806c..c8a2d1ce26 100644 --- a/crates/lib/database_queries/src/queries/users/user_subscriptions/list_active_user_subscriptions.rs +++ b/crates/lib/database_queries/src/queries/users/user_subscriptions/list_active_user_subscriptions.rs @@ -1,7 +1,7 @@ use chrono::{DateTime, Utc}; use sqlx::{MySql, MySqlPool}; use sqlx::pool::PoolConnection; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; pub struct ActiveUserSubscription { pub user_token: String, diff --git a/crates/lib/database_queries/src/queries/users/user_subscriptions/upsert_user_subscription_by_stripe_id.rs b/crates/lib/database_queries/src/queries/users/user_subscriptions/upsert_user_subscription_by_stripe_id.rs index 79a28c1d61..cdcd7cf282 100644 --- a/crates/lib/database_queries/src/queries/users/user_subscriptions/upsert_user_subscription_by_stripe_id.rs +++ b/crates/lib/database_queries/src/queries/users/user_subscriptions/upsert_user_subscription_by_stripe_id.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::NaiveDateTime; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::tokens::Tokens; use reusable_types::stripe::stripe_recurring_interval::StripeRecurringInterval; use reusable_types::stripe::stripe_subscription_status::StripeSubscriptionStatus; diff --git a/crates/lib/database_queries/src/queries/vocoder/get_vocoder_model.rs b/crates/lib/database_queries/src/queries/vocoder/get_vocoder_model.rs index a3cfabf2ea..16e1f501c3 100644 --- a/crates/lib/database_queries/src/queries/vocoder/get_vocoder_model.rs +++ b/crates/lib/database_queries/src/queries/vocoder/get_vocoder_model.rs @@ -5,7 +5,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::helpers::boolean_converters::i8_to_bool; use enums::common::visibility::Visibility; use enums::common::vocoder_type::VocoderType; diff --git a/crates/lib/database_queries/src/queries/vocoder/insert_vocoder_model.rs b/crates/lib/database_queries/src/queries/vocoder/insert_vocoder_model.rs index c176537150..0814da4667 100644 --- a/crates/lib/database_queries/src/queries/vocoder/insert_vocoder_model.rs +++ b/crates/lib/database_queries/src/queries/vocoder/insert_vocoder_model.rs @@ -4,7 +4,7 @@ #![forbid(unused_variables)] use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::tokens::Tokens; use enums::common::visibility::Visibility; use enums::common::vocoder_type::VocoderType; diff --git a/crates/lib/database_queries/src/queries/vocoder/list_vocoder_models.rs b/crates/lib/database_queries/src/queries/vocoder/list_vocoder_models.rs index cdd681d729..ddca22ab2b 100644 --- a/crates/lib/database_queries/src/queries/vocoder/list_vocoder_models.rs +++ b/crates/lib/database_queries/src/queries/vocoder/list_vocoder_models.rs @@ -5,7 +5,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::helpers::boolean_converters::i8_to_bool; use enums::common::vocoder_type::VocoderType; use log::{warn, info}; diff --git a/crates/lib/database_queries/src/queries/voice_clone_requests/get_voice_clone_request.rs b/crates/lib/database_queries/src/queries/voice_clone_requests/get_voice_clone_request.rs index 8da3ac7f51..0c2d803e64 100644 --- a/crates/lib/database_queries/src/queries/voice_clone_requests/get_voice_clone_request.rs +++ b/crates/lib/database_queries/src/queries/voice_clone_requests/get_voice_clone_request.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::{Utc, DateTime}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::column_types::twitch_event_category::TwitchEventCategory; use crate::helpers::boolean_converters::i8_to_bool; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/voice_clone_requests/insert_voice_clone_requests_builder.rs b/crates/lib/database_queries/src/queries/voice_clone_requests/insert_voice_clone_requests_builder.rs index 009d87c05a..ae8ac325a5 100644 --- a/crates/lib/database_queries/src/queries/voice_clone_requests/insert_voice_clone_requests_builder.rs +++ b/crates/lib/database_queries/src/queries/voice_clone_requests/insert_voice_clone_requests_builder.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::column_types::twitch_event_category::TwitchEventCategory; use crate::tokens::Tokens; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/voice_conversion/models/insert_voice_conversion_model_from_download_job.rs b/crates/lib/database_queries/src/queries/voice_conversion/models/insert_voice_conversion_model_from_download_job.rs index 4c86c5d7c6..121febc5dc 100644 --- a/crates/lib/database_queries/src/queries/voice_conversion/models/insert_voice_conversion_model_from_download_job.rs +++ b/crates/lib/database_queries/src/queries/voice_conversion/models/insert_voice_conversion_model_from_download_job.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::Utc; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use enums::common::visibility::Visibility; use sqlx::MySqlPool; use std::path::Path; diff --git a/crates/lib/database_queries/src/queries/w2l/stats/calculate_w2l_template_leaderboard.rs b/crates/lib/database_queries/src/queries/w2l/stats/calculate_w2l_template_leaderboard.rs index 9f648e958c..97aa84ada3 100644 --- a/crates/lib/database_queries/src/queries/w2l/stats/calculate_w2l_template_leaderboard.rs +++ b/crates/lib/database_queries/src/queries/w2l/stats/calculate_w2l_template_leaderboard.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use log::warn; use sqlx::{MySql, MySqlPool}; use sqlx::pool::PoolConnection; diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_download_jobs/w2l_download_job_queries.rs b/crates/lib/database_queries/src/queries/w2l/w2l_download_jobs/w2l_download_job_queries.rs index d0c23a8739..ca772f1585 100644 --- a/crates/lib/database_queries/src/queries/w2l/w2l_download_jobs/w2l_download_job_queries.rs +++ b/crates/lib/database_queries/src/queries/w2l/w2l_download_jobs/w2l_download_job_queries.rs @@ -4,7 +4,7 @@ use anyhow::anyhow; use chrono::Utc; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::tokens::Tokens; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_inference_jobs/insert_w2l_inference_job.rs b/crates/lib/database_queries/src/queries/w2l/w2l_inference_jobs/insert_w2l_inference_job.rs index 7c3915267b..d915fc9195 100644 --- a/crates/lib/database_queries/src/queries/w2l/w2l_inference_jobs/insert_w2l_inference_job.rs +++ b/crates/lib/database_queries/src/queries/w2l/w2l_inference_jobs/insert_w2l_inference_job.rs @@ -2,7 +2,7 @@ use anyhow::anyhow; use sqlx::error::Error::Database; use log::error; use sqlx::MySqlPool; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use enums::common::visibility::Visibility; // FIXME: NB: This is an old query that was somewhat modernized when moved. diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_inference_jobs/w2l_inference_job_queries.rs b/crates/lib/database_queries/src/queries/w2l/w2l_inference_jobs/w2l_inference_job_queries.rs index ccce971a53..de80857685 100644 --- a/crates/lib/database_queries/src/queries/w2l/w2l_inference_jobs/w2l_inference_job_queries.rs +++ b/crates/lib/database_queries/src/queries/w2l/w2l_inference_jobs/w2l_inference_job_queries.rs @@ -4,7 +4,7 @@ use anyhow::anyhow; use chrono::{Utc, DateTime}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::tokens::Tokens; use enums::common::visibility::Visibility; use log::{warn, info}; diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_results/delete_w2l_result_various_scopes.rs b/crates/lib/database_queries/src/queries/w2l/w2l_results/delete_w2l_result_various_scopes.rs index adaced9ac7..be4964b005 100644 --- a/crates/lib/database_queries/src/queries/w2l/w2l_results/delete_w2l_result_various_scopes.rs +++ b/crates/lib/database_queries/src/queries/w2l/w2l_results/delete_w2l_result_various_scopes.rs @@ -1,4 +1,4 @@ -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use sqlx::MySqlPool; pub async fn delete_w2l_inference_result_as_user( diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_results/list_w2l_inference_results_query_builder.rs b/crates/lib/database_queries/src/queries/w2l/w2l_results/list_w2l_inference_results_query_builder.rs index d85389702c..d526c6492d 100644 --- a/crates/lib/database_queries/src/queries/w2l/w2l_results/list_w2l_inference_results_query_builder.rs +++ b/crates/lib/database_queries/src/queries/w2l/w2l_results/list_w2l_inference_results_query_builder.rs @@ -5,7 +5,7 @@ use chrono::{DateTime, Utc}; use config::shared_constants::DEFAULT_MYSQL_QUERY_RESULT_PAGE_SIZE; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use enums::common::visibility::Visibility; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_results/query_w2l_result.rs b/crates/lib/database_queries/src/queries/w2l/w2l_results/query_w2l_result.rs index 26d47f55ff..5f383e4dda 100644 --- a/crates/lib/database_queries/src/queries/w2l/w2l_results/query_w2l_result.rs +++ b/crates/lib/database_queries/src/queries/w2l/w2l_results/query_w2l_result.rs @@ -5,7 +5,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::helpers::boolean_converters::nullable_i8_to_bool; use enums::common::visibility::Visibility; use log::warn; diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_template_upload_jobs/get_w2l_template_upload_job_status.rs b/crates/lib/database_queries/src/queries/w2l/w2l_template_upload_jobs/get_w2l_template_upload_job_status.rs index 975637e8cf..43186ac3dd 100644 --- a/crates/lib/database_queries/src/queries/w2l/w2l_template_upload_jobs/get_w2l_template_upload_job_status.rs +++ b/crates/lib/database_queries/src/queries/w2l/w2l_template_upload_jobs/get_w2l_template_upload_job_status.rs @@ -1,7 +1,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use sqlx::MySqlPool; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; pub struct W2lUploadTemplateJobStatusRecord { pub job_token: String, diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_template_upload_jobs/insert_w2l_template_upload_job.rs b/crates/lib/database_queries/src/queries/w2l/w2l_template_upload_jobs/insert_w2l_template_upload_job.rs index b14864d46b..a65aaaa972 100644 --- a/crates/lib/database_queries/src/queries/w2l/w2l_template_upload_jobs/insert_w2l_template_upload_job.rs +++ b/crates/lib/database_queries/src/queries/w2l/w2l_template_upload_jobs/insert_w2l_template_upload_job.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use sqlx::MySqlPool; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use sqlx::error::Error::Database; use crate::tokens::Tokens; diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_templates/delete_w2l_template_various_scopes.rs b/crates/lib/database_queries/src/queries/w2l/w2l_templates/delete_w2l_template_various_scopes.rs index 308684434d..712392f573 100644 --- a/crates/lib/database_queries/src/queries/w2l/w2l_templates/delete_w2l_template_various_scopes.rs +++ b/crates/lib/database_queries/src/queries/w2l/w2l_templates/delete_w2l_template_various_scopes.rs @@ -1,4 +1,4 @@ -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use sqlx::MySqlPool; pub async fn delete_w2l_template_as_user( diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_templates/get_w2l_template.rs b/crates/lib/database_queries/src/queries/w2l/w2l_templates/get_w2l_template.rs index db534a43ee..433a77f8ef 100644 --- a/crates/lib/database_queries/src/queries/w2l/w2l_templates/get_w2l_template.rs +++ b/crates/lib/database_queries/src/queries/w2l/w2l_templates/get_w2l_template.rs @@ -5,7 +5,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::helpers::boolean_converters::{nullable_i8_to_optional_bool, i8_to_bool}; use enums::common::visibility::Visibility; use log::warn; diff --git a/crates/lib/database_queries/src/queries/w2l/w2l_templates/list_w2l_templates.rs b/crates/lib/database_queries/src/queries/w2l/w2l_templates/list_w2l_templates.rs index f39e10c208..12df06c5d4 100644 --- a/crates/lib/database_queries/src/queries/w2l/w2l_templates/list_w2l_templates.rs +++ b/crates/lib/database_queries/src/queries/w2l/w2l_templates/list_w2l_templates.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use crate::helpers::boolean_converters::nullable_i8_to_optional_bool; use log::{warn, info}; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/tokens.rs b/crates/lib/database_queries/src/tokens.rs index c3e8381291..95d2a13eb1 100644 --- a/crates/lib/database_queries/src/tokens.rs +++ b/crates/lib/database_queries/src/tokens.rs @@ -1,4 +1,4 @@ -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use container_common::token::random_prefix_crockford_token::random_prefix_crockford_token; /// Central place to define all the token types.