fix lints

This commit is contained in:
Brandon Thomas committed 2024-02-21 17:48:14 -05:00
1 parent 7dbae4c166
commit b8270b0235
7 files changed
+21 -28

No files matched your search

@@ -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;
@@ -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,
@@ -338,7 +338,7 @@ pub async fn process_job(args: SadTalkerProcessJobArgs<'_>) -> Result<JobSuccess
.send()
.await;
match (thumbnail_task_result) {
match thumbnail_task_result {
Ok(thumbnail_task) => {
debug!("Thumbnail task created: {:?}", thumbnail_task);
},
@@ -135,7 +135,7 @@ pub async fn process_job(args: ComfyProcessJobArgs<'_>) -> Result<JobSuccessResu
Ok(())
}
let comfy_deps = match args.job_dependencies.job.job_specific_dependencies.maybe_comfy_ui_dependencies {
let _comfy_deps = match args.job_dependencies.job.job_specific_dependencies.maybe_comfy_ui_dependencies {
Some(ref deps) => deps,
None => return Err(ProcessSingleJobError::from(anyhow!("no comfy deps"))),
};
@@ -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<JobSuccessResult, ProcessSingleJobError>{
let job = args.job;
@@ -60,8 +56,9 @@ pub async fn upload_prompt(args: ComfyProcessJobArgs<'_>) -> Result<JobSuccessRe
return Err(ProcessSingleJobError::InvalidJob(anyhow!("Download URL Too Short")));
}
let google_drive_downloader = GoogleDriveDownloadCommand::new(&download_script,
None, None, None);
let google_drive_downloader = GoogleDriveDownloadCommand::new(
&download_script, None, None, None);
info!("Downloading {}", download_url);
let work_temp_dir = format!("workflow_upload_{}", job.id.0);
@@ -86,10 +83,8 @@ pub async fn upload_prompt(args: ComfyProcessJobArgs<'_>) -> Result<JobSuccessRe
}
info!("File Retrieved at {}", download_file_path.display());
let google_drive_downloader = GoogleDriveDownloadCommand::new(&download_script,
None, None, None);
let remote_cloud_file_client = RemoteCloudFileClient::get_remote_cloud_file_client().await?;
let remote_cloud_file_client = RemoteCloudFileClient::get_remote_cloud_file_client().await?;
let weights_sd_descriptor = Box::new(WeightsWorkflowDescriptor{});
let metadata = remote_cloud_file_client.upload_file(weights_sd_descriptor,download_file_path.to_str().unwrap_or_default()).await?;
@@ -1,14 +1,13 @@
use errors::anyhow;
use mysql_queries::{payloads::generic_inference_args::{generic_inference_args::PolymorphicInferenceArgs, workflow_payload::WorkflowArgs}, queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob};
use mysql_queries::payloads::generic_inference_args::generic_inference_args::GenericInferenceArgs;
use crate::job::job_loop::job_success_result::JobSuccessResult;
use crate::job::job_loop::process_single_job_error::ProcessSingleJobError;
use crate::job::job_types::workflow::comfy_ui;
use crate::job::job_types::workflow::comfy_ui::process_job::ComfyProcessJobArgs;
use crate::job_dependencies::JobDependencies;
use mysql_queries::payloads::generic_inference_args::generic_inference_args::PolymorphicInferenceArgs::Cu;
use errors::{anyhow};
use mysql_queries::payloads::generic_inference_args::generic_inference_args::GenericInferenceArgs;
pub async fn get_workflow_args_from_job(
args: &ComfyProcessJobArgs<'_>
) -> Result<WorkflowArgs, ProcessSingleJobError> {
@@ -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?;
@@ -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);
}
};