mirror of
https://github.com/storytold/artcraft.git
synced 2026-11-17 07:04:36 +00:00
cleanup queries
This commit is contained in:
1 parent
05a84194ac
commit
42096cb2e9
9 files changed
+34
-53
No files matched your search
+2
-4
@@ -67,7 +67,7 @@ pub async fn insert_generic_inference_job_for_beeble_queue_with_apriori_job_toke
|
||||
) -> Result<InferenceJobToken, DatabaseQueryError>
|
||||
where E: 'e + Executor<'c, Database = MySql>
|
||||
{
|
||||
let inner_args = InsertGenericInferenceJobForProviderArgs {
|
||||
let record_id = insert_generic_inference_job_for_provider(InsertGenericInferenceJobForProviderArgs {
|
||||
apriori_job_token: args.apriori_job_token,
|
||||
uuid_idempotency_token: args.uuid_idempotency_token,
|
||||
job_type: InferenceJobType::BeebleQueue,
|
||||
@@ -89,9 +89,7 @@ pub async fn insert_generic_inference_job_for_beeble_queue_with_apriori_job_toke
|
||||
status: args.starting_job_status_override.unwrap_or(JobStatusPlus::Pending),
|
||||
mysql_executor: args.mysql_executor,
|
||||
phantom: args.phantom,
|
||||
};
|
||||
|
||||
let record_id = insert_generic_inference_job_for_provider(inner_args).await?;
|
||||
}).await?;
|
||||
|
||||
info!("Insert generic inference job for Beeble queue: {} with record ID {}", args.apriori_job_token, record_id);
|
||||
|
||||
|
||||
+15
-16
@@ -88,7 +88,7 @@ pub(crate) async fn insert_generic_inference_job_for_provider<'e, 'c: 'e, E>(
|
||||
) -> Result<u64, DatabaseQueryError>
|
||||
where E: 'e + Executor<'c, Database = MySql>
|
||||
{
|
||||
let inner_args = InsertFullGenericInferenceJobRecordArgs {
|
||||
insert_full_generic_inference_job_record(InsertFullGenericInferenceJobRecordArgs {
|
||||
token: args.apriori_job_token,
|
||||
uuid_idempotency_token: args.uuid_idempotency_token,
|
||||
|
||||
@@ -104,19 +104,6 @@ pub(crate) async fn insert_generic_inference_job_for_provider<'e, 'c: 'e, E>(
|
||||
// InferenceModelType so the database column gets the right value.
|
||||
maybe_model_type: args.maybe_model_type.map(InferenceModelType::from_common_model_type),
|
||||
|
||||
// Web-only fields — providers never set these.
|
||||
maybe_model_token: None,
|
||||
maybe_input_source_token: None,
|
||||
maybe_input_source_token_type: None,
|
||||
maybe_download_url: None,
|
||||
maybe_cover_image_media_file_token: None,
|
||||
maybe_raw_inference_text: None,
|
||||
maybe_routing_tag: None,
|
||||
priority_level: 0,
|
||||
requires_keepalive: false,
|
||||
max_duration_seconds: 0,
|
||||
is_debug_request: false,
|
||||
|
||||
maybe_prompt_token: args.maybe_prompt_token,
|
||||
maybe_wallet_ledger_entry_token: args.maybe_wallet_ledger_entry_token,
|
||||
|
||||
@@ -136,7 +123,19 @@ pub(crate) async fn insert_generic_inference_job_for_provider<'e, 'c: 'e, E>(
|
||||
|
||||
mysql_executor: args.mysql_executor,
|
||||
phantom: args.phantom,
|
||||
};
|
||||
|
||||
insert_full_generic_inference_job_record(inner_args).await
|
||||
// Web-only fields — providers never set these.
|
||||
maybe_model_token: None,
|
||||
maybe_input_source_token: None,
|
||||
maybe_input_source_token_type: None,
|
||||
maybe_download_url: None,
|
||||
maybe_cover_image_media_file_token: None,
|
||||
maybe_raw_inference_text: None,
|
||||
maybe_routing_tag: None,
|
||||
priority_level: 0,
|
||||
requires_keepalive: false,
|
||||
max_duration_seconds: 0,
|
||||
is_debug_request: false,
|
||||
|
||||
}).await
|
||||
}
|
||||
+3
-5
@@ -54,7 +54,7 @@ pub async fn insert_generic_inference_job_for_fal_queue<'e, 'c : 'e, E>(args: In
|
||||
{
|
||||
let job_token = InferenceJobToken::generate();
|
||||
|
||||
let args = InsertGenericInferenceForFalWithAprioriJobTokenArgs {
|
||||
insert_generic_inference_job_for_fal_queue_with_apriori_job_token(InsertGenericInferenceForFalWithAprioriJobTokenArgs {
|
||||
uuid_idempotency_token: args.uuid_idempotency_token,
|
||||
apriori_job_token: &job_token,
|
||||
maybe_external_third_party_id: args.maybe_external_third_party_id,
|
||||
@@ -69,10 +69,8 @@ pub async fn insert_generic_inference_job_for_fal_queue<'e, 'c : 'e, E>(args: In
|
||||
starting_job_status_override: None,
|
||||
maybe_frontend_failure_category: None,
|
||||
maybe_failure_reason: None,
|
||||
maybe_debug_log_event_token: None,
|
||||
maybe_debug_log_event_token: None,
|
||||
mysql_executor: args.mysql_executor,
|
||||
phantom: args.phantom,
|
||||
};
|
||||
|
||||
insert_generic_inference_job_for_fal_queue_with_apriori_job_token(args).await
|
||||
}).await
|
||||
}
|
||||
+3
-5
@@ -57,7 +57,7 @@ pub async fn insert_generic_inference_job_for_fal_queue_mock_failure<'e, 'c: 'e,
|
||||
let job_token = InferenceJobToken::generate();
|
||||
let synthetic_external_id = format!("synthetic_{}", generate_random_uuid());
|
||||
|
||||
let inner_args = InsertGenericInferenceForFalWithAprioriJobTokenArgs {
|
||||
insert_generic_inference_job_for_fal_queue_with_apriori_job_token(InsertGenericInferenceForFalWithAprioriJobTokenArgs {
|
||||
uuid_idempotency_token: args.uuid_idempotency_token,
|
||||
apriori_job_token: &job_token,
|
||||
maybe_external_third_party_id: &synthetic_external_id,
|
||||
@@ -72,10 +72,8 @@ pub async fn insert_generic_inference_job_for_fal_queue_mock_failure<'e, 'c: 'e,
|
||||
starting_job_status_override: Some(JobStatusPlus::CompleteFailure),
|
||||
maybe_frontend_failure_category: args.maybe_frontend_failure_category,
|
||||
maybe_failure_reason: args.maybe_failure_reason,
|
||||
maybe_debug_log_event_token: None,
|
||||
maybe_debug_log_event_token: None,
|
||||
mysql_executor: args.mysql_executor,
|
||||
phantom: args.phantom,
|
||||
};
|
||||
|
||||
insert_generic_inference_job_for_fal_queue_with_apriori_job_token(inner_args).await
|
||||
}).await
|
||||
}
|
||||
+2
-4
@@ -89,7 +89,7 @@ pub async fn insert_generic_inference_job_for_fal_queue_with_apriori_job_token<'
|
||||
),
|
||||
};
|
||||
|
||||
let inner_args = InsertGenericInferenceJobForProviderArgs {
|
||||
let record_id = insert_generic_inference_job_for_provider(InsertGenericInferenceJobForProviderArgs {
|
||||
apriori_job_token: args.apriori_job_token,
|
||||
uuid_idempotency_token: args.uuid_idempotency_token,
|
||||
job_type: InferenceJobType::FalQueue,
|
||||
@@ -111,9 +111,7 @@ pub async fn insert_generic_inference_job_for_fal_queue_with_apriori_job_token<'
|
||||
status: args.starting_job_status_override.unwrap_or(JobStatusPlus::Pending),
|
||||
mysql_executor: args.mysql_executor,
|
||||
phantom: args.phantom,
|
||||
};
|
||||
|
||||
let record_id = insert_generic_inference_job_for_provider(inner_args).await?;
|
||||
}).await?;
|
||||
|
||||
info!("Insert generic inference job for FAL queue: {} with record ID {}", args.apriori_job_token, record_id);
|
||||
|
||||
|
||||
+2
-5
@@ -44,7 +44,7 @@ pub async fn insert_generic_inference_job_for_gmicloud<'e, 'c: 'e, E>(
|
||||
where
|
||||
E: 'e + Executor<'c, Database = MySql>,
|
||||
{
|
||||
let inner_args = InsertGenericInferenceJobForProviderArgs {
|
||||
let record_id = insert_generic_inference_job_for_provider(InsertGenericInferenceJobForProviderArgs {
|
||||
apriori_job_token: args.apriori_job_token,
|
||||
uuid_idempotency_token: args.uuid_idempotency_token,
|
||||
job_type: InferenceJobType::GmiCloudQueue,
|
||||
@@ -55,7 +55,6 @@ where
|
||||
maybe_model_type: args.maybe_model_type,
|
||||
maybe_prompt_token: args.maybe_prompt_token,
|
||||
maybe_wallet_ledger_entry_token: None,
|
||||
// GmiCloud doesn't take inference args.
|
||||
maybe_inference_args: None,
|
||||
maybe_creator_user_token: args.maybe_creator_user_token,
|
||||
maybe_avt_token: args.maybe_avt_token,
|
||||
@@ -67,9 +66,7 @@ where
|
||||
status: JobStatusPlus::Pending,
|
||||
mysql_executor: args.mysql_executor,
|
||||
phantom: args.phantom,
|
||||
};
|
||||
|
||||
let record_id = insert_generic_inference_job_for_provider(inner_args).await?;
|
||||
}).await?;
|
||||
|
||||
info!(
|
||||
"Insert generic inference job for GmiCloud: {} with record ID {}",
|
||||
|
||||
+3
-5
@@ -46,7 +46,8 @@ pub async fn insert_generic_inference_job_for_seedance2pro_character_with_aprior
|
||||
) -> Result<InferenceJobToken, DatabaseQueryError>
|
||||
where E: 'e + Executor<'c, Database = MySql>
|
||||
{
|
||||
let inner_args = InsertGenericInferenceJobForProviderArgs {
|
||||
|
||||
let record_id = insert_generic_inference_job_for_provider(InsertGenericInferenceJobForProviderArgs {
|
||||
apriori_job_token: args.apriori_job_token,
|
||||
uuid_idempotency_token: args.uuid_idempotency_token,
|
||||
job_type: InferenceJobType::Seedance2ProCharacter,
|
||||
@@ -57,7 +58,6 @@ pub async fn insert_generic_inference_job_for_seedance2pro_character_with_aprior
|
||||
maybe_model_type: args.maybe_model_type,
|
||||
maybe_prompt_token: None,
|
||||
maybe_wallet_ledger_entry_token: None,
|
||||
// Character variant doesn't take inference args.
|
||||
maybe_inference_args: None,
|
||||
maybe_creator_user_token: args.maybe_creator_user_token,
|
||||
maybe_avt_token: args.maybe_avt_token,
|
||||
@@ -69,9 +69,7 @@ pub async fn insert_generic_inference_job_for_seedance2pro_character_with_aprior
|
||||
status: JobStatusPlus::Pending,
|
||||
mysql_executor: args.mysql_executor,
|
||||
phantom: args.phantom,
|
||||
};
|
||||
|
||||
let record_id = insert_generic_inference_job_for_provider(inner_args).await?;
|
||||
}).await?;
|
||||
|
||||
info!("Insert generic inference job for Seedance2Pro character: {} with record ID {}", args.apriori_job_token, record_id);
|
||||
|
||||
|
||||
+2
-4
@@ -76,7 +76,7 @@ pub async fn insert_generic_inference_job_for_seedance2pro_queue_with_apriori_jo
|
||||
)
|
||||
};
|
||||
|
||||
let inner_args = InsertGenericInferenceJobForProviderArgs {
|
||||
let record_id = insert_generic_inference_job_for_provider(InsertGenericInferenceJobForProviderArgs {
|
||||
apriori_job_token: args.apriori_job_token,
|
||||
uuid_idempotency_token: args.uuid_idempotency_token,
|
||||
job_type,
|
||||
@@ -98,9 +98,7 @@ pub async fn insert_generic_inference_job_for_seedance2pro_queue_with_apriori_jo
|
||||
status: JobStatusPlus::Pending,
|
||||
mysql_executor: args.mysql_executor,
|
||||
phantom: args.phantom,
|
||||
};
|
||||
|
||||
let record_id = insert_generic_inference_job_for_provider(inner_args).await?;
|
||||
}).await?;
|
||||
|
||||
info!("Insert generic inference job for Seedance 2 Pro queue: {} with record ID {}", args.apriori_job_token, record_id);
|
||||
|
||||
|
||||
+2
-5
@@ -55,7 +55,7 @@ pub async fn insert_generic_inference_job_for_worldlabs_queue_with_apriori_job_t
|
||||
) -> Result<InferenceJobToken, DatabaseQueryError>
|
||||
where E: 'e + Executor<'c, Database = MySql>
|
||||
{
|
||||
let inner_args = InsertGenericInferenceJobForProviderArgs {
|
||||
let record_id = insert_generic_inference_job_for_provider(InsertGenericInferenceJobForProviderArgs {
|
||||
apriori_job_token: args.apriori_job_token,
|
||||
uuid_idempotency_token: args.uuid_idempotency_token,
|
||||
job_type: InferenceJobType::WorldlabsQueue,
|
||||
@@ -71,16 +71,13 @@ pub async fn insert_generic_inference_job_for_worldlabs_queue_with_apriori_job_t
|
||||
maybe_avt_token: args.maybe_avt_token,
|
||||
creator_ip_address: args.creator_ip_address,
|
||||
creator_set_visibility: args.creator_set_visibility,
|
||||
// The original Worldlabs query never set this column — preserved (default NULL).
|
||||
maybe_debug_log_event_token: None,
|
||||
maybe_frontend_failure_category: None,
|
||||
maybe_failure_reason: None,
|
||||
status: JobStatusPlus::Pending,
|
||||
mysql_executor: args.mysql_executor,
|
||||
phantom: args.phantom,
|
||||
};
|
||||
|
||||
let record_id = insert_generic_inference_job_for_provider(inner_args).await?;
|
||||
}).await?;
|
||||
|
||||
info!("Insert generic inference job for World Labs queue: {} with record ID {}", args.apriori_job_token, record_id);
|
||||
|
||||
|
||||
Reference in new issue
Block a user