diff --git a/crates/cli/production/db-cleanup/src/operations/delete_user_files/delete_user_files.rs b/crates/cli/production/db-cleanup/src/operations/delete_user_files/delete_user_files.rs index 76e62bd5e1..428ca22396 100644 --- a/crates/cli/production/db-cleanup/src/operations/delete_user_files/delete_user_files.rs +++ b/crates/cli/production/db-cleanup/src/operations/delete_user_files/delete_user_files.rs @@ -8,7 +8,6 @@ use errors::{anyhow, AnyhowResult}; use mysql_queries::queries::media_files::delete_media_file::delete_media_file_as_mod; use mysql_queries::queries::media_files::list::list_media_files_for_user::{list_media_files_for_user, ListMediaFileForUserArgs}; use mysql_queries::queries::users::user_profiles::get_user_profile_by_username::get_user_profile_by_username; -use tokens::tokens::users::UserToken; use crate::cli_args::Args; diff --git a/crates/service/job/inference_job/src/job/job_loop/process_single_job.rs b/crates/service/job/inference_job/src/job/job_loop/process_single_job.rs index 373cdf92e0..5dd055aba9 100644 --- a/crates/service/job/inference_job/src/job/job_loop/process_single_job.rs +++ b/crates/service/job/inference_job/src/job/job_loop/process_single_job.rs @@ -2,6 +2,7 @@ use std::time::Instant; use anyhow::anyhow; use log::{error, info, warn}; +use opentelemetry::KeyValue as OtelAttribute; use r2d2_redis::redis::Commands; use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; @@ -23,7 +24,6 @@ use crate::job::job_types::vc::process_single_vc_job::process_single_vc_job; use crate::job::job_types::videofilter::process_single_vf_job::process_single_vf_job; use crate::job::job_types::workflow::process_single_wf_job::process_single_wf_job; use crate::job_dependencies::JobDependencies; -use opentelemetry::{global as otel, KeyValue as OtelAttribute, metrics::Unit}; pub async fn process_single_job( job_dependencies: &JobDependencies, diff --git a/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/process_job.rs b/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/process_job.rs index 459a82be19..0bf3e7ba27 100644 --- a/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/process_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/process_job.rs @@ -338,7 +338,7 @@ pub async fn process_job(args: SadTalkerProcessJobArgs<'_>) -> Result { debug!("Thumbnail task created: {:?}", thumbnail_task); }, diff --git a/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/process_job.rs b/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/process_job.rs index 75ddeb30de..f088cd63bc 100644 --- a/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/process_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/process_job.rs @@ -135,7 +135,7 @@ pub async fn process_job(args: ComfyProcessJobArgs<'_>) -> Result deps, None => return Err(ProcessSingleJobError::from(anyhow!("no comfy deps"))), }; diff --git a/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/upload_prompt.rs b/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/upload_prompt.rs index b0cb8a7169..21ad4e990a 100644 --- a/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/upload_prompt.rs +++ b/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/upload_prompt.rs @@ -1,29 +1,25 @@ +use std::time::Duration; -use std::time::{Duration}; -use cloud_storage::remote_file_manager::weights_descriptor::{WeightsSD15Descriptor, WeightsWorkflowDescriptor}; +use anyhow::{anyhow, Result}; +use log::info; + +use cloud_storage::remote_file_manager::remote_cloud_file_manager::RemoteCloudFileClient; +use cloud_storage::remote_file_manager::weights_descriptor::WeightsWorkflowDescriptor; +use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; use enums::by_table::model_weights::weights_category::WeightsCategory; use enums::by_table::model_weights::weights_types::WeightsType; use enums::common::visibility::Visibility; use filesys::file_exists::file_exists; -use anyhow::{anyhow, Result}; use google_drive_common::google_drive_download_command::GoogleDriveDownloadCommand; -use log::{debug, error, info, warn}; -use mysql_queries::queries::model_weights::create::create_model_weight_from_voice_conversion_download_job::CreateModelWeightArgs; use mysql_queries::queries::model_weights::create::create_weight; +use mysql_queries::queries::model_weights::create::create_weight::CreateModelWeightsArgs; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::users::UserToken; -use cloud_storage::remote_file_manager::remote_cloud_file_manager::RemoteCloudFileClient; -use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; -use mysql_queries::queries::media_files::create::insert_media_file_from_comfy_ui::{insert_media_file_from_comfy_ui, InsertArgs}; -use mysql_queries::queries::model_weights::create::create_weight::CreateModelWeightsArgs; - - use crate::job::job_loop::job_success_result::{JobSuccessResult, ResultEntity}; use crate::job::job_loop::process_single_job_error::ProcessSingleJobError; -use crate::job::job_types::workflow::process_single_wf_job::get_workflow_args_from_job; -use crate::job_dependencies::JobDependencies; use crate::job::job_types::workflow::comfy_ui::process_job::ComfyProcessJobArgs; +use crate::job::job_types::workflow::process_single_wf_job::get_workflow_args_from_job; pub async fn upload_prompt(args: ComfyProcessJobArgs<'_>) -> Result{ let job = args.job; @@ -60,8 +56,9 @@ pub async fn upload_prompt(args: ComfyProcessJobArgs<'_>) -> Result) -> Result ) -> Result { @@ -50,7 +49,7 @@ pub async fn process_single_wf_job(job_dependencies: &JobDependencies, // pass link in and download match workflow_args.maybe_google_drive_link { - Some(link) => { + Some(_link) => { let job_success_result = comfy_ui::upload_prompt::upload_prompt( args ).await?; diff --git a/crates/service/job/inference_job/src/util/instrumentation.rs b/crates/service/job/inference_job/src/util/instrumentation.rs index 8dcf92abe2..a3c806ce06 100644 --- a/crates/service/job/inference_job/src/util/instrumentation.rs +++ b/crates/service/job/inference_job/src/util/instrumentation.rs @@ -41,7 +41,7 @@ pub fn init_otel_metrics_pipeline( match opentelemetry::global::set_error_handler(|error| { warn!("OpenTelemetry error: {}", error); }) { - (err) => { + err => { warn!("Failed to set OpenTelemetry error handler: {:?}", err); } };