From 2f808fe61ef03c976835c41a36d76fcfa6f40859 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sun, 31 May 2026 23:42:50 -0400 Subject: [PATCH] artcraft_router cleanup from old migration (#1594) --- .../generate_image_request_builder.rs | 62 +++--- .../image_generation_draft.rs | 4 +- .../image_generation_draft_context.rs | 0 .../image_generation_draft_or_request.rs | 4 +- .../image_generation_request.rs | 120 +++++----- .../src/generate/generate_image/mod.rs | 5 + .../providers/artcraft/angle_validation.rs | 0 .../providers/artcraft/build_common.rs | 0 .../providers/artcraft/flux_1_dev/build.rs | 8 +- .../providers/artcraft/flux_1_dev/cost.rs | 2 +- .../providers/artcraft/flux_1_dev/mod.rs | 0 .../providers/artcraft/flux_1_dev/request.rs | 2 +- .../artcraft/flux_1_schnell/build.rs | 8 +- .../providers/artcraft/flux_1_schnell/cost.rs | 2 +- .../providers/artcraft/flux_1_schnell/mod.rs | 0 .../artcraft/flux_1_schnell/request.rs | 2 +- .../artcraft/flux_2_lora_angles/build.rs | 10 +- .../artcraft/flux_2_lora_angles/cost.rs | 2 +- .../artcraft/flux_2_lora_angles/mod.rs | 0 .../artcraft/flux_2_lora_angles/request.rs | 2 +- .../providers/artcraft/flux_pro_1p1/build.rs | 8 +- .../providers/artcraft/flux_pro_1p1/cost.rs | 2 +- .../providers/artcraft/flux_pro_1p1/mod.rs | 0 .../artcraft/flux_pro_1p1/request.rs | 2 +- .../artcraft/flux_pro_1p1_ultra/build.rs | 8 +- .../artcraft/flux_pro_1p1_ultra/cost.rs | 2 +- .../artcraft/flux_pro_1p1_ultra/mod.rs | 0 .../artcraft/flux_pro_1p1_ultra/request.rs | 2 +- .../providers/artcraft/gpt_image_1/build.rs | 8 +- .../providers/artcraft/gpt_image_1/cost.rs | 2 +- .../providers/artcraft/gpt_image_1/mod.rs | 0 .../providers/artcraft/gpt_image_1/request.rs | 2 +- .../providers/artcraft/gpt_image_1p5/build.rs | 8 +- .../providers/artcraft/gpt_image_1p5/cost.rs | 2 +- .../providers/artcraft/gpt_image_1p5/mod.rs | 0 .../artcraft/gpt_image_1p5/request.rs | 2 +- .../providers/artcraft/gpt_image_2/build.rs | 8 +- .../providers/artcraft/gpt_image_2/cost.rs | 2 +- .../providers/artcraft/gpt_image_2/mod.rs | 0 .../providers/artcraft/gpt_image_2/request.rs | 2 +- .../providers/artcraft/mod.rs | 0 .../providers/artcraft/nano_banana/build.rs | 8 +- .../providers/artcraft/nano_banana/cost.rs | 2 +- .../providers/artcraft/nano_banana/mod.rs | 0 .../providers/artcraft/nano_banana/request.rs | 2 +- .../providers/artcraft/nano_banana_2/build.rs | 8 +- .../providers/artcraft/nano_banana_2/cost.rs | 2 +- .../providers/artcraft/nano_banana_2/mod.rs | 0 .../artcraft/nano_banana_2/request.rs | 2 +- .../artcraft/nano_banana_pro/build.rs | 8 +- .../artcraft/nano_banana_pro/cost.rs | 2 +- .../providers/artcraft/nano_banana_pro/mod.rs | 0 .../artcraft/nano_banana_pro/request.rs | 2 +- .../artcraft/qwen_edit_2511_angles/build.rs | 10 +- .../artcraft/qwen_edit_2511_angles/cost.rs | 2 +- .../artcraft/qwen_edit_2511_angles/mod.rs | 0 .../artcraft/qwen_edit_2511_angles/request.rs | 2 +- .../providers/artcraft/request_common.rs | 0 .../providers/artcraft/seedream_4/build.rs | 8 +- .../providers/artcraft/seedream_4/cost.rs | 2 +- .../providers/artcraft/seedream_4/mod.rs | 0 .../providers/artcraft/seedream_4/request.rs | 2 +- .../providers/artcraft/seedream_4p5/build.rs | 8 +- .../providers/artcraft/seedream_4p5/cost.rs | 2 +- .../providers/artcraft/seedream_4p5/mod.rs | 0 .../artcraft/seedream_4p5/request.rs | 2 +- .../artcraft/seedream_5_lite/build.rs | 8 +- .../artcraft/seedream_5_lite/cost.rs | 2 +- .../providers/artcraft/seedream_5_lite/mod.rs | 0 .../artcraft/seedream_5_lite/request.rs | 2 +- .../providers/fal/flux_1_dev/build.rs | 6 +- .../providers/fal/flux_1_dev/cost.rs | 2 +- .../providers/fal/flux_1_dev/mod.rs | 0 .../providers/fal/flux_1_dev/request.rs | 0 .../providers/fal/flux_1_schnell/build.rs | 6 +- .../providers/fal/flux_1_schnell/cost.rs | 2 +- .../providers/fal/flux_1_schnell/mod.rs | 0 .../providers/fal/flux_1_schnell/request.rs | 0 .../providers/fal/flux_2_lora_angles/build.rs | 6 +- .../providers/fal/flux_2_lora_angles/cost.rs | 2 +- .../providers/fal/flux_2_lora_angles/mod.rs | 0 .../fal/flux_2_lora_angles/request.rs | 0 .../providers/fal/flux_pro_1p1/build.rs | 6 +- .../providers/fal/flux_pro_1p1/cost.rs | 2 +- .../providers/fal/flux_pro_1p1/mod.rs | 0 .../providers/fal/flux_pro_1p1/request.rs | 0 .../providers/fal/flux_pro_1p1_ultra/build.rs | 6 +- .../providers/fal/flux_pro_1p1_ultra/cost.rs | 2 +- .../providers/fal/flux_pro_1p1_ultra/mod.rs | 0 .../fal/flux_pro_1p1_ultra/request.rs | 0 .../providers/fal/gpt_image_1/build.rs | 6 +- .../providers/fal/gpt_image_1/cost.rs | 2 +- .../providers/fal/gpt_image_1/mod.rs | 0 .../providers/fal/gpt_image_1/request.rs | 0 .../providers/fal/gpt_image_1p5/build.rs | 6 +- .../providers/fal/gpt_image_1p5/cost.rs | 2 +- .../providers/fal/gpt_image_1p5/mod.rs | 0 .../providers/fal/gpt_image_1p5/request.rs | 0 .../providers/fal/gpt_image_2/build.rs | 6 +- .../providers/fal/gpt_image_2/cost.rs | 2 +- .../providers/fal/gpt_image_2/mod.rs | 0 .../providers/fal/gpt_image_2/request.rs | 0 .../providers/fal/mod.rs | 0 .../providers/fal/nano_banana/build.rs | 6 +- .../providers/fal/nano_banana/cost.rs | 2 +- .../providers/fal/nano_banana/mod.rs | 0 .../providers/fal/nano_banana/request.rs | 0 .../providers/fal/nano_banana_2/build.rs | 6 +- .../providers/fal/nano_banana_2/cost.rs | 2 +- .../providers/fal/nano_banana_2/mod.rs | 0 .../providers/fal/nano_banana_2/request.rs | 0 .../providers/fal/nano_banana_pro/build.rs | 6 +- .../providers/fal/nano_banana_pro/cost.rs | 2 +- .../providers/fal/nano_banana_pro/mod.rs | 0 .../providers/fal/nano_banana_pro/request.rs | 0 .../fal/qwen_edit_2511_angles/build.rs | 6 +- .../fal/qwen_edit_2511_angles/cost.rs | 2 +- .../fal/qwen_edit_2511_angles/mod.rs | 0 .../fal/qwen_edit_2511_angles/request.rs | 0 .../providers/fal/seedream_4/build.rs | 6 +- .../providers/fal/seedream_4/cost.rs | 2 +- .../providers/fal/seedream_4/mod.rs | 0 .../providers/fal/seedream_4/request.rs | 0 .../providers/fal/seedream_4p5/build.rs | 6 +- .../providers/fal/seedream_4p5/cost.rs | 2 +- .../providers/fal/seedream_4p5/mod.rs | 0 .../providers/fal/seedream_4p5/request.rs | 0 .../providers/fal/seedream_5_lite/build.rs | 6 +- .../providers/fal/seedream_5_lite/cost.rs | 2 +- .../providers/fal/seedream_5_lite/mod.rs | 0 .../providers/fal/seedream_5_lite/request.rs | 0 .../providers/mod.rs | 0 .../src/generate/generate_image_v2/mod.rs | 5 - .../CLAUDE.md | 4 +- .../generate_video_request_builder.rs | 106 ++++----- .../src/generate/generate_video/mod.rs | 5 + .../providers/artcraft/build_common.rs | 2 +- .../artcraft/grok_imagine_video/build.rs | 12 +- .../artcraft/grok_imagine_video/cost.rs | 2 +- .../artcraft/grok_imagine_video/mod.rs | 0 .../artcraft/grok_imagine_video/request.rs | 2 +- .../artcraft/grok_imagine_video_1p5/build.rs | 12 +- .../artcraft/grok_imagine_video_1p5/cost.rs | 6 +- .../artcraft/grok_imagine_video_1p5/mod.rs | 0 .../grok_imagine_video_1p5/request.rs | 2 +- .../artcraft/happy_horse_1p0/build.rs | 12 +- .../artcraft/happy_horse_1p0/cost.rs | 2 +- .../providers/artcraft/happy_horse_1p0/mod.rs | 0 .../artcraft/happy_horse_1p0/request.rs | 4 +- .../providers/artcraft/kling_1_6_pro/build.rs | 8 +- .../providers/artcraft/kling_1_6_pro/cost.rs | 2 +- .../providers/artcraft/kling_1_6_pro/mod.rs | 0 .../artcraft/kling_1_6_pro/request.rs | 2 +- .../artcraft/kling_2_1_master/build.rs | 8 +- .../artcraft/kling_2_1_master/cost.rs | 2 +- .../artcraft/kling_2_1_master/mod.rs | 0 .../artcraft/kling_2_1_master/request.rs | 2 +- .../providers/artcraft/kling_2_1_pro/build.rs | 8 +- .../providers/artcraft/kling_2_1_pro/cost.rs | 2 +- .../providers/artcraft/kling_2_1_pro/mod.rs | 0 .../artcraft/kling_2_1_pro/request.rs | 2 +- .../artcraft/kling_2_5_turbo_pro/build.rs | 8 +- .../artcraft/kling_2_5_turbo_pro/cost.rs | 2 +- .../artcraft/kling_2_5_turbo_pro/mod.rs | 0 .../artcraft/kling_2_5_turbo_pro/request.rs | 2 +- .../providers/artcraft/kling_2_6_pro/build.rs | 8 +- .../providers/artcraft/kling_2_6_pro/cost.rs | 2 +- .../providers/artcraft/kling_2_6_pro/mod.rs | 0 .../artcraft/kling_2_6_pro/request.rs | 2 +- .../providers/artcraft/kling_3p0_pro/build.rs | 8 +- .../providers/artcraft/kling_3p0_pro/cost.rs | 2 +- .../providers/artcraft/kling_3p0_pro/mod.rs | 0 .../artcraft/kling_3p0_pro/request.rs | 2 +- .../artcraft/kling_3p0_standard/build.rs | 10 +- .../artcraft/kling_3p0_standard/cost.rs | 2 +- .../artcraft/kling_3p0_standard/mod.rs | 0 .../artcraft/kling_3p0_standard/request.rs | 2 +- .../providers/artcraft/mod.rs | 0 .../providers/artcraft/parity_tests.rs | 0 .../providers/artcraft/preview_model/build.rs | 12 +- .../providers/artcraft/preview_model/cost.rs | 2 +- .../providers/artcraft/preview_model/mod.rs | 0 .../artcraft/preview_model/request.rs | 2 +- .../artcraft/preview_model_fast/build.rs | 12 +- .../artcraft/preview_model_fast/cost.rs | 2 +- .../artcraft/preview_model_fast/mod.rs | 0 .../artcraft/preview_model_fast/request.rs | 2 +- .../providers/artcraft/request_common.rs | 0 .../providers/artcraft/resolve.rs | 0 .../artcraft/seedance_1p0_lite/build.rs | 8 +- .../artcraft/seedance_1p0_lite/cost.rs | 2 +- .../artcraft/seedance_1p0_lite/mod.rs | 0 .../artcraft/seedance_1p0_lite/request.rs | 2 +- .../artcraft/seedance_1p5_pro/build.rs | 8 +- .../artcraft/seedance_1p5_pro/cost.rs | 2 +- .../artcraft/seedance_1p5_pro/mod.rs | 0 .../artcraft/seedance_1p5_pro/request.rs | 2 +- .../providers/artcraft/seedance_2p0/build.rs | 12 +- .../providers/artcraft/seedance_2p0/cost.rs | 2 +- .../providers/artcraft/seedance_2p0/mod.rs | 0 .../artcraft/seedance_2p0/request.rs | 4 +- .../artcraft/seedance_2p0_bp/build.rs | 12 +- .../artcraft/seedance_2p0_bp/cost.rs | 2 +- .../providers/artcraft/seedance_2p0_bp/mod.rs | 0 .../artcraft/seedance_2p0_bp/request.rs | 2 +- .../artcraft/seedance_2p0_bp_fast/build.rs | 12 +- .../artcraft/seedance_2p0_bp_fast/cost.rs | 2 +- .../artcraft/seedance_2p0_bp_fast/mod.rs | 0 .../artcraft/seedance_2p0_bp_fast/request.rs | 2 +- .../artcraft/seedance_2p0_bpu/build.rs | 12 +- .../artcraft/seedance_2p0_bpu/cost.rs | 2 +- .../artcraft/seedance_2p0_bpu/mod.rs | 0 .../artcraft/seedance_2p0_bpu/request.rs | 2 +- .../artcraft/seedance_2p0_bpu_fast/build.rs | 12 +- .../artcraft/seedance_2p0_bpu_fast/cost.rs | 2 +- .../artcraft/seedance_2p0_bpu_fast/mod.rs | 0 .../artcraft/seedance_2p0_bpu_fast/request.rs | 2 +- .../artcraft/seedance_2p0_fast/build.rs | 12 +- .../artcraft/seedance_2p0_fast/cost.rs | 2 +- .../artcraft/seedance_2p0_fast/mod.rs | 0 .../artcraft/seedance_2p0_fast/request.rs | 4 +- .../artcraft/seedance_2p0_u/build.rs | 12 +- .../providers/artcraft/seedance_2p0_u/cost.rs | 2 +- .../providers/artcraft/seedance_2p0_u/mod.rs | 0 .../artcraft/seedance_2p0_u/request.rs | 4 +- .../artcraft/seedance_2p0_u_fast/build.rs | 12 +- .../artcraft/seedance_2p0_u_fast/cost.rs | 2 +- .../artcraft/seedance_2p0_u_fast/mod.rs | 0 .../artcraft/seedance_2p0_u_fast/request.rs | 4 +- .../providers/artcraft/sora_2/build.rs | 8 +- .../providers/artcraft/sora_2/cost.rs | 2 +- .../providers/artcraft/sora_2/mod.rs | 0 .../providers/artcraft/sora_2/request.rs | 2 +- .../providers/artcraft/sora_2_pro/build.rs | 10 +- .../providers/artcraft/sora_2_pro/cost.rs | 2 +- .../providers/artcraft/sora_2_pro/mod.rs | 0 .../providers/artcraft/sora_2_pro/request.rs | 2 +- .../providers/artcraft/veo_2/build.rs | 8 +- .../providers/artcraft/veo_2/cost.rs | 2 +- .../providers/artcraft/veo_2/mod.rs | 0 .../providers/artcraft/veo_2/request.rs | 2 +- .../providers/artcraft/veo_3/build.rs | 8 +- .../providers/artcraft/veo_3/cost.rs | 2 +- .../providers/artcraft/veo_3/mod.rs | 0 .../providers/artcraft/veo_3/request.rs | 2 +- .../providers/artcraft/veo_3_fast/build.rs | 8 +- .../providers/artcraft/veo_3_fast/cost.rs | 2 +- .../providers/artcraft/veo_3_fast/mod.rs | 0 .../providers/artcraft/veo_3_fast/request.rs | 2 +- .../providers/artcraft/veo_3p1/build.rs | 8 +- .../providers/artcraft/veo_3p1/cost.rs | 2 +- .../providers/artcraft/veo_3p1/mod.rs | 0 .../providers/artcraft/veo_3p1/request.rs | 2 +- .../providers/artcraft/veo_3p1_fast/build.rs | 10 +- .../providers/artcraft/veo_3p1_fast/cost.rs | 2 +- .../providers/artcraft/veo_3p1_fast/mod.rs | 0 .../artcraft/veo_3p1_fast/request.rs | 2 +- .../providers/fal/kling_1_6_pro/build.rs | 6 +- .../providers/fal/kling_1_6_pro/cost.rs | 2 +- .../providers/fal/kling_1_6_pro/mod.rs | 0 .../providers/fal/kling_1_6_pro/request.rs | 0 .../providers/fal/kling_2_1_master/build.rs | 8 +- .../providers/fal/kling_2_1_master/cost.rs | 2 +- .../providers/fal/kling_2_1_master/mod.rs | 0 .../providers/fal/kling_2_1_master/request.rs | 0 .../providers/fal/kling_2_1_pro/build.rs | 8 +- .../providers/fal/kling_2_1_pro/cost.rs | 2 +- .../providers/fal/kling_2_1_pro/mod.rs | 0 .../providers/fal/kling_2_1_pro/request.rs | 0 .../fal/kling_2_5_turbo_pro/build.rs | 8 +- .../providers/fal/kling_2_5_turbo_pro/cost.rs | 2 +- .../providers/fal/kling_2_5_turbo_pro/mod.rs | 0 .../fal/kling_2_5_turbo_pro/request.rs | 0 .../providers/fal/kling_2_6_pro/build.rs | 8 +- .../providers/fal/kling_2_6_pro/cost.rs | 2 +- .../providers/fal/kling_2_6_pro/mod.rs | 0 .../providers/fal/kling_2_6_pro/request.rs | 0 .../providers/fal/kling_3p0_pro/build.rs | 10 +- .../providers/fal/kling_3p0_pro/cost.rs | 2 +- .../providers/fal/kling_3p0_pro/mod.rs | 0 .../providers/fal/kling_3p0_pro/request.rs | 0 .../providers/fal/kling_3p0_standard/build.rs | 10 +- .../providers/fal/kling_3p0_standard/cost.rs | 2 +- .../providers/fal/kling_3p0_standard/mod.rs | 0 .../fal/kling_3p0_standard/request.rs | 0 .../providers/fal/mod.rs | 0 .../providers/fal/seedance_1p0_lite/build.rs | 8 +- .../providers/fal/seedance_1p0_lite/cost.rs | 2 +- .../providers/fal/seedance_1p0_lite/mod.rs | 0 .../fal/seedance_1p0_lite/request.rs | 2 +- .../providers/fal/seedance_1p5_pro/build.rs | 12 +- .../providers/fal/seedance_1p5_pro/cost.rs | 2 +- .../providers/fal/seedance_1p5_pro/mod.rs | 0 .../providers/fal/seedance_1p5_pro/request.rs | 2 +- .../providers/fal/sora_2/build.rs | 8 +- .../providers/fal/sora_2/cost.rs | 2 +- .../providers/fal/sora_2/mod.rs | 0 .../providers/fal/sora_2/request.rs | 0 .../providers/fal/sora_2_pro/build.rs | 8 +- .../providers/fal/sora_2_pro/cost.rs | 2 +- .../providers/fal/sora_2_pro/mod.rs | 0 .../providers/fal/sora_2_pro/request.rs | 0 .../providers/fal/veo_2/build.rs | 8 +- .../providers/fal/veo_2/cost.rs | 2 +- .../providers/fal/veo_2/mod.rs | 0 .../providers/fal/veo_2/request.rs | 2 +- .../providers/fal/veo_3/build.rs | 10 +- .../providers/fal/veo_3/cost.rs | 2 +- .../providers/fal/veo_3/mod.rs | 0 .../providers/fal/veo_3/request.rs | 2 +- .../providers/fal/veo_3_fast/build.rs | 8 +- .../providers/fal/veo_3_fast/cost.rs | 2 +- .../providers/fal/veo_3_fast/mod.rs | 0 .../providers/fal/veo_3_fast/request.rs | 2 +- .../providers/fal/veo_3p1/build.rs | 8 +- .../providers/fal/veo_3p1/cost.rs | 2 +- .../providers/fal/veo_3p1/mod.rs | 0 .../providers/fal/veo_3p1/request.rs | 2 +- .../providers/fal/veo_3p1_fast/build.rs | 8 +- .../providers/fal/veo_3p1_fast/cost.rs | 2 +- .../providers/fal/veo_3p1_fast/mod.rs | 0 .../providers/fal/veo_3p1_fast/request.rs | 2 +- .../providers/gmicloud/mod.rs | 0 .../gmicloud/seedance_2p0_fast_g/build.rs | 10 +- .../gmicloud/seedance_2p0_fast_g/cost.rs | 2 +- .../gmicloud/seedance_2p0_fast_g/mod.rs | 0 .../gmicloud/seedance_2p0_fast_g/request.rs | 2 +- .../gmicloud/seedance_2p0_g/build.rs | 10 +- .../providers/gmicloud/seedance_2p0_g/cost.rs | 2 +- .../providers/gmicloud/seedance_2p0_g/mod.rs | 0 .../gmicloud/seedance_2p0_g/request.rs | 2 +- .../grok_api/grok_imagine_video/build.rs | 10 +- .../grok_api/grok_imagine_video/cost.rs | 2 +- .../grok_api/grok_imagine_video/mod.rs | 0 .../grok_api/grok_imagine_video/request.rs | 2 +- .../grok_api/grok_imagine_video_1p5/build.rs | 10 +- .../grok_api/grok_imagine_video_1p5/cost.rs | 6 +- .../grok_api/grok_imagine_video_1p5/mod.rs | 0 .../grok_imagine_video_1p5/request.rs | 4 +- .../providers/grok_api/mod.rs | 0 .../providers/kinovi/happy_horse_1p0/build.rs | 10 +- .../providers/kinovi/happy_horse_1p0/cost.rs | 8 +- .../providers/kinovi/happy_horse_1p0/draft.rs | 6 +- .../providers/kinovi/happy_horse_1p0/mod.rs | 0 .../kinovi/happy_horse_1p0/request.rs | 4 +- .../providers/kinovi/mod.rs | 0 .../providers/kinovi/resolve.rs | 4 +- .../providers/kinovi/seedance_2p0/build.rs | 10 +- .../providers/kinovi/seedance_2p0/cost.rs | 8 +- .../providers/kinovi/seedance_2p0/draft.rs | 6 +- .../providers/kinovi/seedance_2p0/mod.rs | 0 .../providers/kinovi/seedance_2p0/request.rs | 0 .../kinovi/seedance_2p0_fast/build.rs | 12 +- .../kinovi/seedance_2p0_fast/cost.rs | 8 +- .../kinovi/seedance_2p0_fast/draft.rs | 6 +- .../providers/kinovi/seedance_2p0_fast/mod.rs | 0 .../kinovi/seedance_2p0_fast/request.rs | 0 .../providers/kinovi/upload.rs | 0 .../providers/mod.rs | 0 .../video_generation_draft.rs | 16 +- .../video_generation_draft_context.rs | 0 .../video_generation_draft_or_request.rs | 4 +- .../video_generation_request.rs | 208 +++++++++--------- .../src/generate/generate_video_v2/mod.rs | 5 - .../artcraft_router/src/generate/mod.rs | 2 - .../handle_image_edit_artcraft_via_router.rs | 2 +- ...andle_text_to_image_artcraft_via_router.rs | 2 +- .../legacy/artcraft_flux_2_lora_angles.rs | 2 +- .../legacy/artcraft_qwen_edit_2511_angles.rs | 2 +- .../artcraft_router/handle_api_providers.rs | 2 +- .../handle_artcraft_video_via_router.rs | 2 +- .../image/pipeline_v2/run_pipeline_v2.rs | 6 +- .../video/pipeline_v2/run_pipeline_v2.rs | 4 +- 373 files changed, 811 insertions(+), 813 deletions(-) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/image_generation_draft.rs (82%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/image_generation_draft_context.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/image_generation_draft_or_request.rs (81%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/image_generation_request.rs (65%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/angle_validation.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/build_common.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/flux_1_dev/build.rs (60%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/flux_1_dev/cost.rs (95%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/flux_1_dev/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/flux_1_dev/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/flux_1_schnell/build.rs (60%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/flux_1_schnell/cost.rs (94%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/flux_1_schnell/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/flux_1_schnell/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/flux_2_lora_angles/build.rs (56%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/flux_2_lora_angles/cost.rs (95%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/flux_2_lora_angles/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/flux_2_lora_angles/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/flux_pro_1p1/build.rs (60%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/flux_pro_1p1/cost.rs (95%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/flux_pro_1p1/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/flux_pro_1p1/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/flux_pro_1p1_ultra/build.rs (60%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/flux_pro_1p1_ultra/cost.rs (94%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/flux_pro_1p1_ultra/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/flux_pro_1p1_ultra/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/gpt_image_1/build.rs (60%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/gpt_image_1/cost.rs (98%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/gpt_image_1/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/gpt_image_1/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/gpt_image_1p5/build.rs (60%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/gpt_image_1p5/cost.rs (98%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/gpt_image_1p5/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/gpt_image_1p5/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/gpt_image_2/build.rs (60%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/gpt_image_2/cost.rs (98%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/gpt_image_2/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/gpt_image_2/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/nano_banana/build.rs (60%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/nano_banana/cost.rs (95%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/nano_banana/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/nano_banana/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/nano_banana_2/build.rs (60%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/nano_banana_2/cost.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/nano_banana_2/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/nano_banana_2/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/nano_banana_pro/build.rs (60%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/nano_banana_pro/cost.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/nano_banana_pro/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/nano_banana_pro/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/qwen_edit_2511_angles/build.rs (56%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/qwen_edit_2511_angles/cost.rs (94%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/qwen_edit_2511_angles/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/qwen_edit_2511_angles/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/request_common.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/seedream_4/build.rs (60%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/seedream_4/cost.rs (95%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/seedream_4/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/seedream_4/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/seedream_4p5/build.rs (60%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/seedream_4p5/cost.rs (94%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/seedream_4p5/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/seedream_4p5/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/seedream_5_lite/build.rs (60%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/seedream_5_lite/cost.rs (94%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/seedream_5_lite/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/artcraft/seedream_5_lite/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/flux_1_dev/build.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/flux_1_dev/cost.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/flux_1_dev/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/flux_1_dev/request.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/flux_1_schnell/build.rs (98%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/flux_1_schnell/cost.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/flux_1_schnell/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/flux_1_schnell/request.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/flux_2_lora_angles/build.rs (95%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/flux_2_lora_angles/cost.rs (95%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/flux_2_lora_angles/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/flux_2_lora_angles/request.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/flux_pro_1p1/build.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/flux_pro_1p1/cost.rs (95%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/flux_pro_1p1/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/flux_pro_1p1/request.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/flux_pro_1p1_ultra/build.rs (96%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/flux_pro_1p1_ultra/cost.rs (95%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/flux_pro_1p1_ultra/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/flux_pro_1p1_ultra/request.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/gpt_image_1/build.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/gpt_image_1/cost.rs (99%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/gpt_image_1/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/gpt_image_1/request.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/gpt_image_1p5/build.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/gpt_image_1p5/cost.rs (98%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/gpt_image_1p5/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/gpt_image_1p5/request.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/gpt_image_2/build.rs (98%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/gpt_image_2/cost.rs (99%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/gpt_image_2/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/gpt_image_2/request.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/nano_banana/build.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/nano_banana/cost.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/nano_banana/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/nano_banana/request.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/nano_banana_2/build.rs (98%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/nano_banana_2/cost.rs (98%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/nano_banana_2/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/nano_banana_2/request.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/nano_banana_pro/build.rs (98%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/nano_banana_pro/cost.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/nano_banana_pro/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/nano_banana_pro/request.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/qwen_edit_2511_angles/build.rs (95%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/qwen_edit_2511_angles/cost.rs (95%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/qwen_edit_2511_angles/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/qwen_edit_2511_angles/request.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/seedream_4/build.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/seedream_4/cost.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/seedream_4/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/seedream_4/request.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/seedream_4p5/build.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/seedream_4p5/cost.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/seedream_4p5/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/seedream_4p5/request.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/seedream_5_lite/build.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/seedream_5_lite/cost.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/seedream_5_lite/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/fal/seedream_5_lite/request.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_image_v2 => generate_image}/providers/mod.rs (100%) delete mode 100644 crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/mod.rs rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/CLAUDE.md (99%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/build_common.rs (99%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/grok_imagine_video/build.rs (91%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/grok_imagine_video/cost.rs (99%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/grok_imagine_video/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/grok_imagine_video/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/grok_imagine_video_1p5/build.rs (92%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/grok_imagine_video_1p5/cost.rs (98%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/grok_imagine_video_1p5/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/grok_imagine_video_1p5/request.rs (92%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/happy_horse_1p0/build.rs (90%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/happy_horse_1p0/cost.rs (98%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/happy_horse_1p0/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/happy_horse_1p0/request.rs (96%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_1_6_pro/build.rs (67%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_1_6_pro/cost.rs (94%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_1_6_pro/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_1_6_pro/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_2_1_master/build.rs (67%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_2_1_master/cost.rs (93%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_2_1_master/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_2_1_master/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_2_1_pro/build.rs (67%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_2_1_pro/cost.rs (94%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_2_1_pro/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_2_1_pro/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_2_5_turbo_pro/build.rs (67%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_2_5_turbo_pro/cost.rs (93%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_2_5_turbo_pro/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_2_5_turbo_pro/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_2_6_pro/build.rs (74%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_2_6_pro/cost.rs (95%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_2_6_pro/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_2_6_pro/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_3p0_pro/build.rs (85%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_3p0_pro/cost.rs (95%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_3p0_pro/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_3p0_pro/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_3p0_standard/build.rs (71%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_3p0_standard/cost.rs (95%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_3p0_standard/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/kling_3p0_standard/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/parity_tests.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/preview_model/build.rs (90%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/preview_model/cost.rs (98%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/preview_model/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/preview_model/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/preview_model_fast/build.rs (91%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/preview_model_fast/cost.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/preview_model_fast/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/preview_model_fast/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/request_common.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/resolve.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_1p0_lite/build.rs (82%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_1p0_lite/cost.rs (96%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_1p0_lite/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_1p0_lite/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_1p5_pro/build.rs (83%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_1p5_pro/cost.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_1p5_pro/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_1p5_pro/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0/build.rs (90%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0/cost.rs (98%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0/request.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_bp/build.rs (90%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_bp/cost.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_bp/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_bp/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_bp_fast/build.rs (91%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_bp_fast/cost.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_bp_fast/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_bp_fast/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_bpu/build.rs (90%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_bpu/cost.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_bpu/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_bpu/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_bpu_fast/build.rs (91%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_bpu_fast/cost.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_bpu_fast/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_bpu_fast/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_fast/build.rs (93%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_fast/cost.rs (98%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_fast/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_fast/request.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_u/build.rs (90%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_u/cost.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_u/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_u/request.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_u_fast/build.rs (93%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_u_fast/cost.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_u_fast/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/seedance_2p0_u_fast/request.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/sora_2/build.rs (83%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/sora_2/cost.rs (94%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/sora_2/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/sora_2/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/sora_2_pro/build.rs (68%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/sora_2_pro/cost.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/sora_2_pro/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/sora_2_pro/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/veo_2/build.rs (84%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/veo_2/cost.rs (94%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/veo_2/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/veo_2/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/veo_3/build.rs (75%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/veo_3/cost.rs (96%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/veo_3/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/veo_3/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/veo_3_fast/build.rs (73%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/veo_3_fast/cost.rs (95%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/veo_3_fast/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/veo_3_fast/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/veo_3p1/build.rs (84%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/veo_3p1/cost.rs (95%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/veo_3p1/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/veo_3p1/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/veo_3p1_fast/build.rs (70%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/veo_3p1_fast/cost.rs (95%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/veo_3p1_fast/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/artcraft/veo_3p1_fast/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_1_6_pro/build.rs (94%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_1_6_pro/cost.rs (94%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_1_6_pro/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_1_6_pro/request.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_2_1_master/build.rs (91%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_2_1_master/cost.rs (94%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_2_1_master/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_2_1_master/request.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_2_1_pro/build.rs (88%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_2_1_pro/cost.rs (94%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_2_1_pro/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_2_1_pro/request.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_2_5_turbo_pro/build.rs (94%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_2_5_turbo_pro/cost.rs (96%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_2_5_turbo_pro/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_2_5_turbo_pro/request.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_2_6_pro/build.rs (94%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_2_6_pro/cost.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_2_6_pro/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_2_6_pro/request.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_3p0_pro/build.rs (94%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_3p0_pro/cost.rs (98%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_3p0_pro/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_3p0_pro/request.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_3p0_standard/build.rs (92%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_3p0_standard/cost.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_3p0_standard/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/kling_3p0_standard/request.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/seedance_1p0_lite/build.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/seedance_1p0_lite/cost.rs (98%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/seedance_1p0_lite/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/seedance_1p0_lite/request.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/seedance_1p5_pro/build.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/seedance_1p5_pro/cost.rs (99%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/seedance_1p5_pro/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/seedance_1p5_pro/request.rs (98%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/sora_2/build.rs (93%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/sora_2/cost.rs (96%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/sora_2/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/sora_2/request.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/sora_2_pro/build.rs (93%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/sora_2_pro/cost.rs (98%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/sora_2_pro/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/sora_2_pro/request.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/veo_2/build.rs (96%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/veo_2/cost.rs (96%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/veo_2/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/veo_2/request.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/veo_3/build.rs (96%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/veo_3/cost.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/veo_3/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/veo_3/request.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/veo_3_fast/build.rs (94%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/veo_3_fast/cost.rs (96%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/veo_3_fast/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/veo_3_fast/request.rs (96%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/veo_3p1/build.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/veo_3p1/cost.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/veo_3p1/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/veo_3p1/request.rs (98%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/veo_3p1_fast/build.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/veo_3p1_fast/cost.rs (98%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/veo_3p1_fast/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/fal/veo_3p1_fast/request.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/gmicloud/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/gmicloud/seedance_2p0_fast_g/build.rs (95%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/gmicloud/seedance_2p0_fast_g/cost.rs (96%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/gmicloud/seedance_2p0_fast_g/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/gmicloud/seedance_2p0_fast_g/request.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/gmicloud/seedance_2p0_g/build.rs (96%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/gmicloud/seedance_2p0_g/cost.rs (96%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/gmicloud/seedance_2p0_g/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/gmicloud/seedance_2p0_g/request.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/grok_api/grok_imagine_video/build.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/grok_api/grok_imagine_video/cost.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/grok_api/grok_imagine_video/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/grok_api/grok_imagine_video/request.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/grok_api/grok_imagine_video_1p5/build.rs (98%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/grok_api/grok_imagine_video_1p5/cost.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/grok_api/grok_imagine_video_1p5/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/grok_api/grok_imagine_video_1p5/request.rs (96%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/grok_api/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/kinovi/happy_horse_1p0/build.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/kinovi/happy_horse_1p0/cost.rs (96%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/kinovi/happy_horse_1p0/draft.rs (84%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/kinovi/happy_horse_1p0/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/kinovi/happy_horse_1p0/request.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/kinovi/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/kinovi/resolve.rs (95%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/kinovi/seedance_2p0/build.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/kinovi/seedance_2p0/cost.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/kinovi/seedance_2p0/draft.rs (92%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/kinovi/seedance_2p0/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/kinovi/seedance_2p0/request.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/kinovi/seedance_2p0_fast/build.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/kinovi/seedance_2p0_fast/cost.rs (97%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/kinovi/seedance_2p0_fast/draft.rs (92%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/kinovi/seedance_2p0_fast/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/kinovi/seedance_2p0_fast/request.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/kinovi/upload.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/providers/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/video_generation_draft.rs (72%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/video_generation_draft_context.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/video_generation_draft_or_request.rs (82%) rename crates/api_clients/artcraft/artcraft_router/src/generate/{generate_video_v2 => generate_video}/video_generation_request.rs (65%) delete mode 100644 crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/generate_image_request_builder.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/generate_image_request_builder.rs index fb907dc1aa..8a0784bfe5 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/generate_image_request_builder.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/generate_image_request_builder.rs @@ -7,37 +7,37 @@ use crate::api::router_provider::RouterProvider; use crate::client::generation_mode_mismatch_strategy::GenerationModeMismatchStrategy; use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy; use crate::errors::artcraft_router_error::ArtcraftRouterError; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::providers::artcraft::flux_1_dev::build::build_artcraft_flux_1_dev; -use crate::generate::generate_image_v2::providers::artcraft::flux_1_schnell::build::build_artcraft_flux_1_schnell; -use crate::generate::generate_image_v2::providers::artcraft::flux_2_lora_angles::build::build_artcraft_flux_2_lora_angles; -use crate::generate::generate_image_v2::providers::artcraft::flux_pro_1p1::build::build_artcraft_flux_pro_1p1; -use crate::generate::generate_image_v2::providers::artcraft::flux_pro_1p1_ultra::build::build_artcraft_flux_pro_1p1_ultra; -use crate::generate::generate_image_v2::providers::artcraft::gpt_image_1::build::build_artcraft_gpt_image_1; -use crate::generate::generate_image_v2::providers::artcraft::gpt_image_1p5::build::build_artcraft_gpt_image_1p5; -use crate::generate::generate_image_v2::providers::artcraft::gpt_image_2::build::build_artcraft_gpt_image_2; -use crate::generate::generate_image_v2::providers::artcraft::nano_banana::build::build_artcraft_nano_banana; -use crate::generate::generate_image_v2::providers::artcraft::nano_banana_2::build::build_artcraft_nano_banana_2; -use crate::generate::generate_image_v2::providers::artcraft::nano_banana_pro::build::build_artcraft_nano_banana_pro; -use crate::generate::generate_image_v2::providers::artcraft::qwen_edit_2511_angles::build::build_artcraft_qwen_edit_2511_angles; -use crate::generate::generate_image_v2::providers::artcraft::seedream_4::build::build_artcraft_seedream_4; -use crate::generate::generate_image_v2::providers::artcraft::seedream_4p5::build::build_artcraft_seedream_4p5; -use crate::generate::generate_image_v2::providers::artcraft::seedream_5_lite::build::build_artcraft_seedream_5_lite; -use crate::generate::generate_image_v2::providers::fal::flux_1_dev::build::build_fal_flux_1_dev; -use crate::generate::generate_image_v2::providers::fal::flux_1_schnell::build::build_fal_flux_1_schnell; -use crate::generate::generate_image_v2::providers::fal::flux_2_lora_angles::build::build_fal_flux_2_lora_angles; -use crate::generate::generate_image_v2::providers::fal::flux_pro_1p1::build::build_fal_flux_pro_1p1; -use crate::generate::generate_image_v2::providers::fal::flux_pro_1p1_ultra::build::build_fal_flux_pro_1p1_ultra; -use crate::generate::generate_image_v2::providers::fal::gpt_image_1::build::build_fal_gpt_image_1; -use crate::generate::generate_image_v2::providers::fal::gpt_image_1p5::build::build_fal_gpt_image_1p5; -use crate::generate::generate_image_v2::providers::fal::gpt_image_2::build::build_fal_gpt_image_2; -use crate::generate::generate_image_v2::providers::fal::nano_banana::build::build_fal_nano_banana; -use crate::generate::generate_image_v2::providers::fal::nano_banana_2::build::build_fal_nano_banana_2; -use crate::generate::generate_image_v2::providers::fal::nano_banana_pro::build::build_fal_nano_banana_pro; -use crate::generate::generate_image_v2::providers::fal::qwen_edit_2511_angles::build::build_fal_qwen_edit_2511_angles; -use crate::generate::generate_image_v2::providers::fal::seedream_4::build::build_fal_seedream_4; -use crate::generate::generate_image_v2::providers::fal::seedream_4p5::build::build_fal_seedream_4p5; -use crate::generate::generate_image_v2::providers::fal::seedream_5_lite::build::build_fal_seedream_5_lite; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::providers::artcraft::flux_1_dev::build::build_artcraft_flux_1_dev; +use crate::generate::generate_image::providers::artcraft::flux_1_schnell::build::build_artcraft_flux_1_schnell; +use crate::generate::generate_image::providers::artcraft::flux_2_lora_angles::build::build_artcraft_flux_2_lora_angles; +use crate::generate::generate_image::providers::artcraft::flux_pro_1p1::build::build_artcraft_flux_pro_1p1; +use crate::generate::generate_image::providers::artcraft::flux_pro_1p1_ultra::build::build_artcraft_flux_pro_1p1_ultra; +use crate::generate::generate_image::providers::artcraft::gpt_image_1::build::build_artcraft_gpt_image_1; +use crate::generate::generate_image::providers::artcraft::gpt_image_1p5::build::build_artcraft_gpt_image_1p5; +use crate::generate::generate_image::providers::artcraft::gpt_image_2::build::build_artcraft_gpt_image_2; +use crate::generate::generate_image::providers::artcraft::nano_banana::build::build_artcraft_nano_banana; +use crate::generate::generate_image::providers::artcraft::nano_banana_2::build::build_artcraft_nano_banana_2; +use crate::generate::generate_image::providers::artcraft::nano_banana_pro::build::build_artcraft_nano_banana_pro; +use crate::generate::generate_image::providers::artcraft::qwen_edit_2511_angles::build::build_artcraft_qwen_edit_2511_angles; +use crate::generate::generate_image::providers::artcraft::seedream_4::build::build_artcraft_seedream_4; +use crate::generate::generate_image::providers::artcraft::seedream_4p5::build::build_artcraft_seedream_4p5; +use crate::generate::generate_image::providers::artcraft::seedream_5_lite::build::build_artcraft_seedream_5_lite; +use crate::generate::generate_image::providers::fal::flux_1_dev::build::build_fal_flux_1_dev; +use crate::generate::generate_image::providers::fal::flux_1_schnell::build::build_fal_flux_1_schnell; +use crate::generate::generate_image::providers::fal::flux_2_lora_angles::build::build_fal_flux_2_lora_angles; +use crate::generate::generate_image::providers::fal::flux_pro_1p1::build::build_fal_flux_pro_1p1; +use crate::generate::generate_image::providers::fal::flux_pro_1p1_ultra::build::build_fal_flux_pro_1p1_ultra; +use crate::generate::generate_image::providers::fal::gpt_image_1::build::build_fal_gpt_image_1; +use crate::generate::generate_image::providers::fal::gpt_image_1p5::build::build_fal_gpt_image_1p5; +use crate::generate::generate_image::providers::fal::gpt_image_2::build::build_fal_gpt_image_2; +use crate::generate::generate_image::providers::fal::nano_banana::build::build_fal_nano_banana; +use crate::generate::generate_image::providers::fal::nano_banana_2::build::build_fal_nano_banana_2; +use crate::generate::generate_image::providers::fal::nano_banana_pro::build::build_fal_nano_banana_pro; +use crate::generate::generate_image::providers::fal::qwen_edit_2511_angles::build::build_fal_qwen_edit_2511_angles; +use crate::generate::generate_image::providers::fal::seedream_4::build::build_fal_seedream_4; +use crate::generate::generate_image::providers::fal::seedream_4p5::build::build_fal_seedream_4p5; +use crate::generate::generate_image::providers::fal::seedream_5_lite::build::build_fal_seedream_5_lite; #[derive(Clone, Debug)] pub struct GenerateImageRequestBuilder { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/image_generation_draft.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/image_generation_draft.rs similarity index 82% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/image_generation_draft.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/image_generation_draft.rs index f5b6ae0823..649fca38c1 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/image_generation_draft.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/image_generation_draft.rs @@ -1,8 +1,8 @@ use crate::api::router_provider::RouterProvider; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::image_generation_draft_context::ImageGenerationDraftContext; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::image_generation_draft_context::ImageGenerationDraftContext; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; /// Wrapper for all image generation draft requests. /// diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/image_generation_draft_context.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/image_generation_draft_context.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/image_generation_draft_context.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/image_generation_draft_context.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/image_generation_draft_or_request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/image_generation_draft_or_request.rs similarity index 81% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/image_generation_draft_or_request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/image_generation_draft_or_request.rs index eb5c8f3841..40c769673c 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/image_generation_draft_or_request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/image_generation_draft_or_request.rs @@ -1,8 +1,8 @@ use crate::api::router_provider::RouterProvider; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::image_generation_draft::ImageGenerationDraftRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::image_generation_draft::ImageGenerationDraftRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; #[derive(Debug, Clone)] pub enum ImageGenerationDraftOrRequest { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/image_generation_request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/image_generation_request.rs similarity index 65% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/image_generation_request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/image_generation_request.rs index 2cfcbe98d6..2e3018312c 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/image_generation_request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/image_generation_request.rs @@ -3,66 +3,66 @@ use crate::client::router_client::RouterClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_response::GenerateImageResponse; use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::artcraft::flux_1_dev::cost::ArtcraftFlux1DevCostState; -use crate::generate::generate_image_v2::providers::artcraft::flux_1_dev::request::ArtcraftFlux1DevRequestState; -use crate::generate::generate_image_v2::providers::artcraft::flux_1_schnell::cost::ArtcraftFlux1SchnellCostState; -use crate::generate::generate_image_v2::providers::artcraft::flux_1_schnell::request::ArtcraftFlux1SchnellRequestState; -use crate::generate::generate_image_v2::providers::artcraft::flux_2_lora_angles::cost::ArtcraftFlux2LoraAnglesCostState; -use crate::generate::generate_image_v2::providers::artcraft::flux_2_lora_angles::request::ArtcraftFlux2LoraAnglesRequestState; -use crate::generate::generate_image_v2::providers::artcraft::flux_pro_1p1::cost::ArtcraftFluxPro1p1CostState; -use crate::generate::generate_image_v2::providers::artcraft::flux_pro_1p1::request::ArtcraftFluxPro1p1RequestState; -use crate::generate::generate_image_v2::providers::artcraft::flux_pro_1p1_ultra::cost::ArtcraftFluxPro1p1UltraCostState; -use crate::generate::generate_image_v2::providers::artcraft::flux_pro_1p1_ultra::request::ArtcraftFluxPro1p1UltraRequestState; -use crate::generate::generate_image_v2::providers::artcraft::gpt_image_1::cost::ArtcraftGptImage1CostState; -use crate::generate::generate_image_v2::providers::artcraft::gpt_image_1::request::ArtcraftGptImage1RequestState; -use crate::generate::generate_image_v2::providers::artcraft::gpt_image_1p5::cost::ArtcraftGptImage1p5CostState; -use crate::generate::generate_image_v2::providers::artcraft::gpt_image_1p5::request::ArtcraftGptImage1p5RequestState; -use crate::generate::generate_image_v2::providers::artcraft::gpt_image_2::cost::ArtcraftGptImage2CostState; -use crate::generate::generate_image_v2::providers::artcraft::gpt_image_2::request::ArtcraftGptImage2RequestState; -use crate::generate::generate_image_v2::providers::artcraft::nano_banana::cost::ArtcraftNanoBananaCostState; -use crate::generate::generate_image_v2::providers::artcraft::nano_banana::request::ArtcraftNanoBananaRequestState; -use crate::generate::generate_image_v2::providers::artcraft::nano_banana_2::cost::ArtcraftNanoBanana2CostState; -use crate::generate::generate_image_v2::providers::artcraft::nano_banana_2::request::ArtcraftNanoBanana2RequestState; -use crate::generate::generate_image_v2::providers::artcraft::nano_banana_pro::cost::ArtcraftNanoBananaProCostState; -use crate::generate::generate_image_v2::providers::artcraft::nano_banana_pro::request::ArtcraftNanoBananaProRequestState; -use crate::generate::generate_image_v2::providers::artcraft::qwen_edit_2511_angles::cost::ArtcraftQwenEdit2511AnglesCostState; -use crate::generate::generate_image_v2::providers::artcraft::qwen_edit_2511_angles::request::ArtcraftQwenEdit2511AnglesRequestState; -use crate::generate::generate_image_v2::providers::artcraft::seedream_4::cost::ArtcraftSeedream4CostState; -use crate::generate::generate_image_v2::providers::artcraft::seedream_4::request::ArtcraftSeedream4RequestState; -use crate::generate::generate_image_v2::providers::artcraft::seedream_4p5::cost::ArtcraftSeedream4p5CostState; -use crate::generate::generate_image_v2::providers::artcraft::seedream_4p5::request::ArtcraftSeedream4p5RequestState; -use crate::generate::generate_image_v2::providers::artcraft::seedream_5_lite::cost::ArtcraftSeedream5LiteCostState; -use crate::generate::generate_image_v2::providers::artcraft::seedream_5_lite::request::ArtcraftSeedream5LiteRequestState; -use crate::generate::generate_image_v2::providers::fal::flux_1_dev::cost::FalFlux1DevCostState; -use crate::generate::generate_image_v2::providers::fal::flux_1_dev::request::FalFlux1DevRequestState; -use crate::generate::generate_image_v2::providers::fal::flux_1_schnell::cost::FalFlux1SchnellCostState; -use crate::generate::generate_image_v2::providers::fal::flux_1_schnell::request::FalFlux1SchnellRequestState; -use crate::generate::generate_image_v2::providers::fal::flux_2_lora_angles::cost::FalFlux2LoraAnglesCostState; -use crate::generate::generate_image_v2::providers::fal::flux_2_lora_angles::request::FalFlux2LoraAnglesRequestState; -use crate::generate::generate_image_v2::providers::fal::flux_pro_1p1::cost::FalFluxPro1p1CostState; -use crate::generate::generate_image_v2::providers::fal::flux_pro_1p1::request::FalFluxPro1p1RequestState; -use crate::generate::generate_image_v2::providers::fal::flux_pro_1p1_ultra::cost::FalFluxPro1p1UltraCostState; -use crate::generate::generate_image_v2::providers::fal::flux_pro_1p1_ultra::request::FalFluxPro1p1UltraRequestState; -use crate::generate::generate_image_v2::providers::fal::gpt_image_1::cost::FalGptImage1CostState; -use crate::generate::generate_image_v2::providers::fal::gpt_image_1::request::FalGptImage1RequestState; -use crate::generate::generate_image_v2::providers::fal::gpt_image_1p5::cost::FalGptImage1p5CostState; -use crate::generate::generate_image_v2::providers::fal::gpt_image_1p5::request::FalGptImage1p5RequestState; -use crate::generate::generate_image_v2::providers::fal::gpt_image_2::cost::FalGptImage2CostState; -use crate::generate::generate_image_v2::providers::fal::gpt_image_2::request::FalGptImage2RequestState; -use crate::generate::generate_image_v2::providers::fal::nano_banana::cost::FalNanoBananaCostState; -use crate::generate::generate_image_v2::providers::fal::nano_banana::request::FalNanoBananaRequestState; -use crate::generate::generate_image_v2::providers::fal::nano_banana_2::cost::FalNanoBanana2CostState; -use crate::generate::generate_image_v2::providers::fal::nano_banana_2::request::FalNanoBanana2RequestState; -use crate::generate::generate_image_v2::providers::fal::nano_banana_pro::cost::FalNanoBananaProCostState; -use crate::generate::generate_image_v2::providers::fal::nano_banana_pro::request::FalNanoBananaProRequestState; -use crate::generate::generate_image_v2::providers::fal::qwen_edit_2511_angles::cost::FalQwenEdit2511AnglesCostState; -use crate::generate::generate_image_v2::providers::fal::qwen_edit_2511_angles::request::FalQwenEdit2511AnglesRequestState; -use crate::generate::generate_image_v2::providers::fal::seedream_4::cost::FalSeedream4CostState; -use crate::generate::generate_image_v2::providers::fal::seedream_4::request::FalSeedream4RequestState; -use crate::generate::generate_image_v2::providers::fal::seedream_4p5::cost::FalSeedream4p5CostState; -use crate::generate::generate_image_v2::providers::fal::seedream_4p5::request::FalSeedream4p5RequestState; -use crate::generate::generate_image_v2::providers::fal::seedream_5_lite::cost::FalSeedream5LiteCostState; -use crate::generate::generate_image_v2::providers::fal::seedream_5_lite::request::FalSeedream5LiteRequestState; +use crate::generate::generate_image::providers::artcraft::flux_1_dev::cost::ArtcraftFlux1DevCostState; +use crate::generate::generate_image::providers::artcraft::flux_1_dev::request::ArtcraftFlux1DevRequestState; +use crate::generate::generate_image::providers::artcraft::flux_1_schnell::cost::ArtcraftFlux1SchnellCostState; +use crate::generate::generate_image::providers::artcraft::flux_1_schnell::request::ArtcraftFlux1SchnellRequestState; +use crate::generate::generate_image::providers::artcraft::flux_2_lora_angles::cost::ArtcraftFlux2LoraAnglesCostState; +use crate::generate::generate_image::providers::artcraft::flux_2_lora_angles::request::ArtcraftFlux2LoraAnglesRequestState; +use crate::generate::generate_image::providers::artcraft::flux_pro_1p1::cost::ArtcraftFluxPro1p1CostState; +use crate::generate::generate_image::providers::artcraft::flux_pro_1p1::request::ArtcraftFluxPro1p1RequestState; +use crate::generate::generate_image::providers::artcraft::flux_pro_1p1_ultra::cost::ArtcraftFluxPro1p1UltraCostState; +use crate::generate::generate_image::providers::artcraft::flux_pro_1p1_ultra::request::ArtcraftFluxPro1p1UltraRequestState; +use crate::generate::generate_image::providers::artcraft::gpt_image_1::cost::ArtcraftGptImage1CostState; +use crate::generate::generate_image::providers::artcraft::gpt_image_1::request::ArtcraftGptImage1RequestState; +use crate::generate::generate_image::providers::artcraft::gpt_image_1p5::cost::ArtcraftGptImage1p5CostState; +use crate::generate::generate_image::providers::artcraft::gpt_image_1p5::request::ArtcraftGptImage1p5RequestState; +use crate::generate::generate_image::providers::artcraft::gpt_image_2::cost::ArtcraftGptImage2CostState; +use crate::generate::generate_image::providers::artcraft::gpt_image_2::request::ArtcraftGptImage2RequestState; +use crate::generate::generate_image::providers::artcraft::nano_banana::cost::ArtcraftNanoBananaCostState; +use crate::generate::generate_image::providers::artcraft::nano_banana::request::ArtcraftNanoBananaRequestState; +use crate::generate::generate_image::providers::artcraft::nano_banana_2::cost::ArtcraftNanoBanana2CostState; +use crate::generate::generate_image::providers::artcraft::nano_banana_2::request::ArtcraftNanoBanana2RequestState; +use crate::generate::generate_image::providers::artcraft::nano_banana_pro::cost::ArtcraftNanoBananaProCostState; +use crate::generate::generate_image::providers::artcraft::nano_banana_pro::request::ArtcraftNanoBananaProRequestState; +use crate::generate::generate_image::providers::artcraft::qwen_edit_2511_angles::cost::ArtcraftQwenEdit2511AnglesCostState; +use crate::generate::generate_image::providers::artcraft::qwen_edit_2511_angles::request::ArtcraftQwenEdit2511AnglesRequestState; +use crate::generate::generate_image::providers::artcraft::seedream_4::cost::ArtcraftSeedream4CostState; +use crate::generate::generate_image::providers::artcraft::seedream_4::request::ArtcraftSeedream4RequestState; +use crate::generate::generate_image::providers::artcraft::seedream_4p5::cost::ArtcraftSeedream4p5CostState; +use crate::generate::generate_image::providers::artcraft::seedream_4p5::request::ArtcraftSeedream4p5RequestState; +use crate::generate::generate_image::providers::artcraft::seedream_5_lite::cost::ArtcraftSeedream5LiteCostState; +use crate::generate::generate_image::providers::artcraft::seedream_5_lite::request::ArtcraftSeedream5LiteRequestState; +use crate::generate::generate_image::providers::fal::flux_1_dev::cost::FalFlux1DevCostState; +use crate::generate::generate_image::providers::fal::flux_1_dev::request::FalFlux1DevRequestState; +use crate::generate::generate_image::providers::fal::flux_1_schnell::cost::FalFlux1SchnellCostState; +use crate::generate::generate_image::providers::fal::flux_1_schnell::request::FalFlux1SchnellRequestState; +use crate::generate::generate_image::providers::fal::flux_2_lora_angles::cost::FalFlux2LoraAnglesCostState; +use crate::generate::generate_image::providers::fal::flux_2_lora_angles::request::FalFlux2LoraAnglesRequestState; +use crate::generate::generate_image::providers::fal::flux_pro_1p1::cost::FalFluxPro1p1CostState; +use crate::generate::generate_image::providers::fal::flux_pro_1p1::request::FalFluxPro1p1RequestState; +use crate::generate::generate_image::providers::fal::flux_pro_1p1_ultra::cost::FalFluxPro1p1UltraCostState; +use crate::generate::generate_image::providers::fal::flux_pro_1p1_ultra::request::FalFluxPro1p1UltraRequestState; +use crate::generate::generate_image::providers::fal::gpt_image_1::cost::FalGptImage1CostState; +use crate::generate::generate_image::providers::fal::gpt_image_1::request::FalGptImage1RequestState; +use crate::generate::generate_image::providers::fal::gpt_image_1p5::cost::FalGptImage1p5CostState; +use crate::generate::generate_image::providers::fal::gpt_image_1p5::request::FalGptImage1p5RequestState; +use crate::generate::generate_image::providers::fal::gpt_image_2::cost::FalGptImage2CostState; +use crate::generate::generate_image::providers::fal::gpt_image_2::request::FalGptImage2RequestState; +use crate::generate::generate_image::providers::fal::nano_banana::cost::FalNanoBananaCostState; +use crate::generate::generate_image::providers::fal::nano_banana::request::FalNanoBananaRequestState; +use crate::generate::generate_image::providers::fal::nano_banana_2::cost::FalNanoBanana2CostState; +use crate::generate::generate_image::providers::fal::nano_banana_2::request::FalNanoBanana2RequestState; +use crate::generate::generate_image::providers::fal::nano_banana_pro::cost::FalNanoBananaProCostState; +use crate::generate::generate_image::providers::fal::nano_banana_pro::request::FalNanoBananaProRequestState; +use crate::generate::generate_image::providers::fal::qwen_edit_2511_angles::cost::FalQwenEdit2511AnglesCostState; +use crate::generate::generate_image::providers::fal::qwen_edit_2511_angles::request::FalQwenEdit2511AnglesRequestState; +use crate::generate::generate_image::providers::fal::seedream_4::cost::FalSeedream4CostState; +use crate::generate::generate_image::providers::fal::seedream_4::request::FalSeedream4RequestState; +use crate::generate::generate_image::providers::fal::seedream_4p5::cost::FalSeedream4p5CostState; +use crate::generate::generate_image::providers::fal::seedream_4p5::request::FalSeedream4p5RequestState; +use crate::generate::generate_image::providers::fal::seedream_5_lite::cost::FalSeedream5LiteCostState; +use crate::generate::generate_image::providers::fal::seedream_5_lite::request::FalSeedream5LiteRequestState; #[derive(Clone, Debug)] pub enum ImageGenerationRequest { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/mod.rs index c0fffaab3e..f2c7600591 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/mod.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/mod.rs @@ -1,3 +1,8 @@ pub mod generate_image_request_builder; pub mod generate_image_response; pub mod image_generation_cost_estimate; +pub mod image_generation_draft; +pub mod image_generation_draft_context; +pub mod image_generation_draft_or_request; +pub mod image_generation_request; +pub mod providers; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/angle_validation.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/angle_validation.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/angle_validation.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/angle_validation.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/build_common.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/build_common.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/build_common.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/build_common.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_1_dev/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_1_dev/build.rs similarity index 60% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_1_dev/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_1_dev/build.rs index 62f49bcd99..2de611c7d0 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_1_dev/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_1_dev/build.rs @@ -2,10 +2,10 @@ use enums::common::generation::common_image_model::CommonImageModel as CommonIma use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::artcraft::build_common::build_artcraft_omni_image_request; -use crate::generate::generate_image_v2::providers::artcraft::flux_1_dev::request::ArtcraftFlux1DevRequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::artcraft::build_common::build_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::flux_1_dev::request::ArtcraftFlux1DevRequestState; pub fn build_artcraft_flux_1_dev( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_1_dev/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_1_dev/cost.rs similarity index 95% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_1_dev/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_1_dev/cost.rs index f0d1e36325..6cb22e583f 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_1_dev/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_1_dev/cost.rs @@ -1,5 +1,5 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::artcraft::flux_1_dev::request::ArtcraftFlux1DevRequestState; +use crate::generate::generate_image::providers::artcraft::flux_1_dev::request::ArtcraftFlux1DevRequestState; /// Cost state for Artcraft Flux 1 Dev. Pricing mirrors v1 /// (`estimate_image_cost_artcraft_flux_1_dev`): flat 2¢ per output image. diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_1_dev/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_1_dev/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_1_dev/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_1_dev/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_1_dev/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_1_dev/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_1_dev/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_1_dev/request.rs index 6c08b960b3..f603cb74a2 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_1_dev/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_1_dev/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_image_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_response::GenerateImageResponse; -use crate::generate::generate_image_v2::providers::artcraft::request_common::send_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::request_common::send_artcraft_omni_image_request; #[derive(Clone, Debug)] pub struct ArtcraftFlux1DevRequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_1_schnell/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_1_schnell/build.rs similarity index 60% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_1_schnell/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_1_schnell/build.rs index c4e686fa2b..6596c68c7a 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_1_schnell/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_1_schnell/build.rs @@ -2,10 +2,10 @@ use enums::common::generation::common_image_model::CommonImageModel as CommonIma use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::artcraft::build_common::build_artcraft_omni_image_request; -use crate::generate::generate_image_v2::providers::artcraft::flux_1_schnell::request::ArtcraftFlux1SchnellRequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::artcraft::build_common::build_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::flux_1_schnell::request::ArtcraftFlux1SchnellRequestState; pub fn build_artcraft_flux_1_schnell( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_1_schnell/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_1_schnell/cost.rs similarity index 94% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_1_schnell/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_1_schnell/cost.rs index 57edac7cc7..15b6c2d2d5 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_1_schnell/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_1_schnell/cost.rs @@ -1,5 +1,5 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::artcraft::flux_1_schnell::request::ArtcraftFlux1SchnellRequestState; +use crate::generate::generate_image::providers::artcraft::flux_1_schnell::request::ArtcraftFlux1SchnellRequestState; /// Cost state for Artcraft Flux 1 Schnell. Pricing mirrors v1 /// (`estimate_image_cost_artcraft_flux_1_schnell`): free, no per-image cost, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_1_schnell/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_1_schnell/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_1_schnell/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_1_schnell/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_1_schnell/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_1_schnell/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_1_schnell/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_1_schnell/request.rs index c58a61ddb8..66b8d9d5f0 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_1_schnell/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_1_schnell/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_image_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_response::GenerateImageResponse; -use crate::generate::generate_image_v2::providers::artcraft::request_common::send_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::request_common::send_artcraft_omni_image_request; #[derive(Clone, Debug)] pub struct ArtcraftFlux1SchnellRequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_2_lora_angles/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_2_lora_angles/build.rs similarity index 56% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_2_lora_angles/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_2_lora_angles/build.rs index 966ba3b725..547afc0b04 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_2_lora_angles/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_2_lora_angles/build.rs @@ -2,11 +2,11 @@ use enums::common::generation::common_image_model::CommonImageModel as CommonIma use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::artcraft::angle_validation::require_at_least_one_image_input; -use crate::generate::generate_image_v2::providers::artcraft::build_common::build_artcraft_omni_image_request; -use crate::generate::generate_image_v2::providers::artcraft::flux_2_lora_angles::request::ArtcraftFlux2LoraAnglesRequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::artcraft::angle_validation::require_at_least_one_image_input; +use crate::generate::generate_image::providers::artcraft::build_common::build_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::flux_2_lora_angles::request::ArtcraftFlux2LoraAnglesRequestState; pub fn build_artcraft_flux_2_lora_angles( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_2_lora_angles/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_2_lora_angles/cost.rs similarity index 95% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_2_lora_angles/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_2_lora_angles/cost.rs index 3cd7760fe1..b1c27df58c 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_2_lora_angles/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_2_lora_angles/cost.rs @@ -1,5 +1,5 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::artcraft::flux_2_lora_angles::request::ArtcraftFlux2LoraAnglesRequestState; +use crate::generate::generate_image::providers::artcraft::flux_2_lora_angles::request::ArtcraftFlux2LoraAnglesRequestState; /// Cost state for Artcraft Flux 2 LoRA Angles. Pricing mirrors v1 /// (`estimate_image_cost_artcraft_flux_2_lora_angles`): 4¢ per output image diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_2_lora_angles/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_2_lora_angles/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_2_lora_angles/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_2_lora_angles/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_2_lora_angles/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_2_lora_angles/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_2_lora_angles/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_2_lora_angles/request.rs index f6eb078dfb..4cadcf5874 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_2_lora_angles/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_2_lora_angles/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_image_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_response::GenerateImageResponse; -use crate::generate::generate_image_v2::providers::artcraft::request_common::send_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::request_common::send_artcraft_omni_image_request; #[derive(Clone, Debug)] pub struct ArtcraftFlux2LoraAnglesRequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_pro_1p1/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_pro_1p1/build.rs similarity index 60% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_pro_1p1/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_pro_1p1/build.rs index a91e3ff0b6..cc8fa19caf 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_pro_1p1/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_pro_1p1/build.rs @@ -2,10 +2,10 @@ use enums::common::generation::common_image_model::CommonImageModel as CommonIma use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::artcraft::build_common::build_artcraft_omni_image_request; -use crate::generate::generate_image_v2::providers::artcraft::flux_pro_1p1::request::ArtcraftFluxPro1p1RequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::artcraft::build_common::build_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::flux_pro_1p1::request::ArtcraftFluxPro1p1RequestState; pub fn build_artcraft_flux_pro_1p1( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_pro_1p1/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_pro_1p1/cost.rs similarity index 95% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_pro_1p1/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_pro_1p1/cost.rs index 3e658035e5..3e40ac2888 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_pro_1p1/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_pro_1p1/cost.rs @@ -1,5 +1,5 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::artcraft::flux_pro_1p1::request::ArtcraftFluxPro1p1RequestState; +use crate::generate::generate_image::providers::artcraft::flux_pro_1p1::request::ArtcraftFluxPro1p1RequestState; /// Cost state for Artcraft Flux Pro 1.1. Pricing mirrors v1 /// (`estimate_image_cost_artcraft_flux_pro_1p1`): 4¢ per output image (Fal's diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_pro_1p1/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_pro_1p1/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_pro_1p1/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_pro_1p1/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_pro_1p1/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_pro_1p1/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_pro_1p1/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_pro_1p1/request.rs index d5e5cbe498..388bbbe990 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_pro_1p1/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_pro_1p1/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_image_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_response::GenerateImageResponse; -use crate::generate::generate_image_v2::providers::artcraft::request_common::send_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::request_common::send_artcraft_omni_image_request; #[derive(Clone, Debug)] pub struct ArtcraftFluxPro1p1RequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_pro_1p1_ultra/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_pro_1p1_ultra/build.rs similarity index 60% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_pro_1p1_ultra/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_pro_1p1_ultra/build.rs index 755cca881a..ff2db5e9d2 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_pro_1p1_ultra/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_pro_1p1_ultra/build.rs @@ -2,10 +2,10 @@ use enums::common::generation::common_image_model::CommonImageModel as CommonIma use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::artcraft::build_common::build_artcraft_omni_image_request; -use crate::generate::generate_image_v2::providers::artcraft::flux_pro_1p1_ultra::request::ArtcraftFluxPro1p1UltraRequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::artcraft::build_common::build_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::flux_pro_1p1_ultra::request::ArtcraftFluxPro1p1UltraRequestState; pub fn build_artcraft_flux_pro_1p1_ultra( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_pro_1p1_ultra/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_pro_1p1_ultra/cost.rs similarity index 94% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_pro_1p1_ultra/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_pro_1p1_ultra/cost.rs index bcab09d648..d1d922b366 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_pro_1p1_ultra/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_pro_1p1_ultra/cost.rs @@ -1,5 +1,5 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::artcraft::flux_pro_1p1_ultra::request::ArtcraftFluxPro1p1UltraRequestState; +use crate::generate::generate_image::providers::artcraft::flux_pro_1p1_ultra::request::ArtcraftFluxPro1p1UltraRequestState; /// Cost state for Artcraft Flux Pro 1.1 Ultra. Pricing mirrors v1 /// (`estimate_image_cost_artcraft_flux_pro_1p1_ultra`): 6¢ per output image. diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_pro_1p1_ultra/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_pro_1p1_ultra/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_pro_1p1_ultra/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_pro_1p1_ultra/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_pro_1p1_ultra/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_pro_1p1_ultra/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_pro_1p1_ultra/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_pro_1p1_ultra/request.rs index 5169ffcbe0..bb70eebefd 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/flux_pro_1p1_ultra/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/flux_pro_1p1_ultra/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_image_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_response::GenerateImageResponse; -use crate::generate::generate_image_v2::providers::artcraft::request_common::send_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::request_common::send_artcraft_omni_image_request; #[derive(Clone, Debug)] pub struct ArtcraftFluxPro1p1UltraRequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_1/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_1/build.rs similarity index 60% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_1/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_1/build.rs index 66f016c82a..1a32e8b1cc 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_1/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_1/build.rs @@ -2,10 +2,10 @@ use enums::common::generation::common_image_model::CommonImageModel as CommonIma use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::artcraft::build_common::build_artcraft_omni_image_request; -use crate::generate::generate_image_v2::providers::artcraft::gpt_image_1::request::ArtcraftGptImage1RequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::artcraft::build_common::build_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::gpt_image_1::request::ArtcraftGptImage1RequestState; pub fn build_artcraft_gpt_image_1( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_1/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_1/cost.rs similarity index 98% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_1/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_1/cost.rs index 8c852e2011..c67a06a987 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_1/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_1/cost.rs @@ -2,7 +2,7 @@ use enums::common::generation::common_aspect_ratio::CommonAspectRatio as CommonA use enums::common::generation::common_quality::CommonQuality as CommonQualityEnum; use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::artcraft::gpt_image_1::request::ArtcraftGptImage1RequestState; +use crate::generate::generate_image::providers::artcraft::gpt_image_1::request::ArtcraftGptImage1RequestState; /// Cost state for Artcraft GPT Image 1. Pricing mirrors v1 /// (`estimate_image_cost_artcraft_gpt_image_1`): diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_1/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_1/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_1/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_1/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_1/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_1/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_1/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_1/request.rs index 6e296997aa..808e472024 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_1/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_1/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_image_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_response::GenerateImageResponse; -use crate::generate::generate_image_v2::providers::artcraft::request_common::send_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::request_common::send_artcraft_omni_image_request; #[derive(Clone, Debug)] pub struct ArtcraftGptImage1RequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_1p5/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_1p5/build.rs similarity index 60% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_1p5/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_1p5/build.rs index 996730388f..cf8bcce6c3 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_1p5/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_1p5/build.rs @@ -2,10 +2,10 @@ use enums::common::generation::common_image_model::CommonImageModel as CommonIma use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::artcraft::build_common::build_artcraft_omni_image_request; -use crate::generate::generate_image_v2::providers::artcraft::gpt_image_1p5::request::ArtcraftGptImage1p5RequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::artcraft::build_common::build_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::gpt_image_1p5::request::ArtcraftGptImage1p5RequestState; pub fn build_artcraft_gpt_image_1p5( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_1p5/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_1p5/cost.rs similarity index 98% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_1p5/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_1p5/cost.rs index af2da6b3eb..624167c739 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_1p5/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_1p5/cost.rs @@ -2,7 +2,7 @@ use enums::common::generation::common_aspect_ratio::CommonAspectRatio as CommonA use enums::common::generation::common_quality::CommonQuality as CommonQualityEnum; use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::artcraft::gpt_image_1p5::request::ArtcraftGptImage1p5RequestState; +use crate::generate::generate_image::providers::artcraft::gpt_image_1p5::request::ArtcraftGptImage1p5RequestState; /// Cost state for Artcraft GPT Image 1.5. Pricing mirrors v1 /// (`estimate_image_cost_artcraft_gpt_image_1p5`): diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_1p5/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_1p5/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_1p5/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_1p5/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_1p5/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_1p5/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_1p5/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_1p5/request.rs index ff44b69975..08d2aba201 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_1p5/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_1p5/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_image_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_response::GenerateImageResponse; -use crate::generate::generate_image_v2::providers::artcraft::request_common::send_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::request_common::send_artcraft_omni_image_request; #[derive(Clone, Debug)] pub struct ArtcraftGptImage1p5RequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_2/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_2/build.rs similarity index 60% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_2/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_2/build.rs index 93fb3ce6d7..5e38e1f535 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_2/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_2/build.rs @@ -2,10 +2,10 @@ use enums::common::generation::common_image_model::CommonImageModel as CommonIma use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::artcraft::build_common::build_artcraft_omni_image_request; -use crate::generate::generate_image_v2::providers::artcraft::gpt_image_2::request::ArtcraftGptImage2RequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::artcraft::build_common::build_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::gpt_image_2::request::ArtcraftGptImage2RequestState; pub fn build_artcraft_gpt_image_2( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_2/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_2/cost.rs similarity index 98% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_2/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_2/cost.rs index 82d9525d62..6b8c502021 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_2/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_2/cost.rs @@ -2,7 +2,7 @@ use enums::common::generation::common_aspect_ratio::CommonAspectRatio as CommonA use enums::common::generation::common_quality::CommonQuality as CommonQualityEnum; use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::artcraft::gpt_image_2::request::ArtcraftGptImage2RequestState; +use crate::generate::generate_image::providers::artcraft::gpt_image_2::request::ArtcraftGptImage2RequestState; /// Cost state for Artcraft GPT Image 2. Pricing mirrors v1 /// (`estimate_image_cost_artcraft_gpt_image_2`): diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_2/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_2/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_2/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_2/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_2/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_2/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_2/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_2/request.rs index 179c113ec9..ada50f72f1 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/gpt_image_2/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/gpt_image_2/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_image_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_response::GenerateImageResponse; -use crate::generate::generate_image_v2::providers::artcraft::request_common::send_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::request_common::send_artcraft_omni_image_request; #[derive(Clone, Debug)] pub struct ArtcraftGptImage2RequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana/build.rs similarity index 60% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana/build.rs index 0d1db0e475..5e6395a14b 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana/build.rs @@ -2,10 +2,10 @@ use enums::common::generation::common_image_model::CommonImageModel as CommonIma use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::artcraft::build_common::build_artcraft_omni_image_request; -use crate::generate::generate_image_v2::providers::artcraft::nano_banana::request::ArtcraftNanoBananaRequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::artcraft::build_common::build_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::nano_banana::request::ArtcraftNanoBananaRequestState; pub fn build_artcraft_nano_banana( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana/cost.rs similarity index 95% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana/cost.rs index 13d76259d2..d2b2d12ee0 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana/cost.rs @@ -1,5 +1,5 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::artcraft::nano_banana::request::ArtcraftNanoBananaRequestState; +use crate::generate::generate_image::providers::artcraft::nano_banana::request::ArtcraftNanoBananaRequestState; /// Cost state for Artcraft Nano Banana (Gemini 2.5 Flash). Pricing mirrors v1 /// (`estimate_image_cost_artcraft_nano_banana`): 4¢ per output image. diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana/request.rs index 51d5cda174..2a1b2f2ea5 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_image_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_response::GenerateImageResponse; -use crate::generate::generate_image_v2::providers::artcraft::request_common::send_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::request_common::send_artcraft_omni_image_request; #[derive(Clone, Debug)] pub struct ArtcraftNanoBananaRequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana_2/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana_2/build.rs similarity index 60% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana_2/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana_2/build.rs index 15a6d23479..c74dab5efe 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana_2/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana_2/build.rs @@ -2,10 +2,10 @@ use enums::common::generation::common_image_model::CommonImageModel as CommonIma use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::artcraft::build_common::build_artcraft_omni_image_request; -use crate::generate::generate_image_v2::providers::artcraft::nano_banana_2::request::ArtcraftNanoBanana2RequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::artcraft::build_common::build_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::nano_banana_2::request::ArtcraftNanoBanana2RequestState; pub fn build_artcraft_nano_banana_2( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana_2/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana_2/cost.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana_2/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana_2/cost.rs index fe14cb0f1d..23abebe59c 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana_2/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana_2/cost.rs @@ -1,7 +1,7 @@ use enums::common::generation::common_resolution::CommonResolution as CommonResolutionEnum; use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::artcraft::nano_banana_2::request::ArtcraftNanoBanana2RequestState; +use crate::generate::generate_image::providers::artcraft::nano_banana_2::request::ArtcraftNanoBanana2RequestState; /// Cost state for Artcraft Nano Banana 2. Pricing mirrors v1 /// (`estimate_image_cost_artcraft_nano_banana_2`): diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana_2/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana_2/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana_2/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana_2/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana_2/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana_2/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana_2/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana_2/request.rs index bbee1b27c3..4bc7a1fe00 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana_2/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana_2/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_image_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_response::GenerateImageResponse; -use crate::generate::generate_image_v2::providers::artcraft::request_common::send_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::request_common::send_artcraft_omni_image_request; #[derive(Clone, Debug)] pub struct ArtcraftNanoBanana2RequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana_pro/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana_pro/build.rs similarity index 60% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana_pro/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana_pro/build.rs index 50c793e55b..ec7753e2af 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana_pro/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana_pro/build.rs @@ -2,10 +2,10 @@ use enums::common::generation::common_image_model::CommonImageModel as CommonIma use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::artcraft::build_common::build_artcraft_omni_image_request; -use crate::generate::generate_image_v2::providers::artcraft::nano_banana_pro::request::ArtcraftNanoBananaProRequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::artcraft::build_common::build_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::nano_banana_pro::request::ArtcraftNanoBananaProRequestState; pub fn build_artcraft_nano_banana_pro( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana_pro/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana_pro/cost.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana_pro/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana_pro/cost.rs index 59b96ca9ab..9d9a660306 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana_pro/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana_pro/cost.rs @@ -1,7 +1,7 @@ use enums::common::generation::common_resolution::CommonResolution as CommonResolutionEnum; use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::artcraft::nano_banana_pro::request::ArtcraftNanoBananaProRequestState; +use crate::generate::generate_image::providers::artcraft::nano_banana_pro::request::ArtcraftNanoBananaProRequestState; /// Cost state for Artcraft Nano Banana Pro. Pricing mirrors v1 /// (`estimate_image_cost_artcraft_nano_banana_pro`): diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana_pro/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana_pro/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana_pro/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana_pro/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana_pro/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana_pro/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana_pro/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana_pro/request.rs index 86bbdaaea6..4dfefcc821 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/nano_banana_pro/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/nano_banana_pro/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_image_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_response::GenerateImageResponse; -use crate::generate::generate_image_v2::providers::artcraft::request_common::send_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::request_common::send_artcraft_omni_image_request; #[derive(Clone, Debug)] pub struct ArtcraftNanoBananaProRequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/qwen_edit_2511_angles/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/qwen_edit_2511_angles/build.rs similarity index 56% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/qwen_edit_2511_angles/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/qwen_edit_2511_angles/build.rs index d89dfde967..f51268f0a8 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/qwen_edit_2511_angles/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/qwen_edit_2511_angles/build.rs @@ -2,11 +2,11 @@ use enums::common::generation::common_image_model::CommonImageModel as CommonIma use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::artcraft::angle_validation::require_at_least_one_image_input; -use crate::generate::generate_image_v2::providers::artcraft::build_common::build_artcraft_omni_image_request; -use crate::generate::generate_image_v2::providers::artcraft::qwen_edit_2511_angles::request::ArtcraftQwenEdit2511AnglesRequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::artcraft::angle_validation::require_at_least_one_image_input; +use crate::generate::generate_image::providers::artcraft::build_common::build_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::qwen_edit_2511_angles::request::ArtcraftQwenEdit2511AnglesRequestState; pub fn build_artcraft_qwen_edit_2511_angles( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/qwen_edit_2511_angles/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/qwen_edit_2511_angles/cost.rs similarity index 94% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/qwen_edit_2511_angles/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/qwen_edit_2511_angles/cost.rs index 15fcb5a4de..a2316105ed 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/qwen_edit_2511_angles/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/qwen_edit_2511_angles/cost.rs @@ -1,5 +1,5 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::artcraft::qwen_edit_2511_angles::request::ArtcraftQwenEdit2511AnglesRequestState; +use crate::generate::generate_image::providers::artcraft::qwen_edit_2511_angles::request::ArtcraftQwenEdit2511AnglesRequestState; /// Cost state for Artcraft Qwen Edit 2511 Angles. Pricing mirrors v1 /// (`estimate_image_cost_artcraft_qwen_edit_2511_angles`): 4¢ per output image. diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/qwen_edit_2511_angles/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/qwen_edit_2511_angles/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/qwen_edit_2511_angles/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/qwen_edit_2511_angles/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/qwen_edit_2511_angles/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/qwen_edit_2511_angles/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/qwen_edit_2511_angles/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/qwen_edit_2511_angles/request.rs index 43fbdeef83..de2fbcf77a 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/qwen_edit_2511_angles/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/qwen_edit_2511_angles/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_image_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_response::GenerateImageResponse; -use crate::generate::generate_image_v2::providers::artcraft::request_common::send_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::request_common::send_artcraft_omni_image_request; #[derive(Clone, Debug)] pub struct ArtcraftQwenEdit2511AnglesRequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/request_common.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/request_common.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/request_common.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/request_common.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_4/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_4/build.rs similarity index 60% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_4/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_4/build.rs index 9940c7775a..a6374d48b1 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_4/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_4/build.rs @@ -2,10 +2,10 @@ use enums::common::generation::common_image_model::CommonImageModel as CommonIma use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::artcraft::build_common::build_artcraft_omni_image_request; -use crate::generate::generate_image_v2::providers::artcraft::seedream_4::request::ArtcraftSeedream4RequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::artcraft::build_common::build_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::seedream_4::request::ArtcraftSeedream4RequestState; pub fn build_artcraft_seedream_4( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_4/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_4/cost.rs similarity index 95% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_4/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_4/cost.rs index 2bf027a283..7a05a74c5c 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_4/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_4/cost.rs @@ -1,5 +1,5 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::artcraft::seedream_4::request::ArtcraftSeedream4RequestState; +use crate::generate::generate_image::providers::artcraft::seedream_4::request::ArtcraftSeedream4RequestState; /// Cost state for Artcraft Seedream V4. Pricing mirrors v1 /// (`estimate_image_cost_artcraft_seedream_4`): 3¢ per output image. diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_4/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_4/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_4/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_4/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_4/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_4/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_4/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_4/request.rs index 971de9c739..9afda05095 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_4/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_4/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_image_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_response::GenerateImageResponse; -use crate::generate::generate_image_v2::providers::artcraft::request_common::send_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::request_common::send_artcraft_omni_image_request; #[derive(Clone, Debug)] pub struct ArtcraftSeedream4RequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_4p5/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_4p5/build.rs similarity index 60% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_4p5/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_4p5/build.rs index e9c63faac8..e02594f506 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_4p5/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_4p5/build.rs @@ -2,10 +2,10 @@ use enums::common::generation::common_image_model::CommonImageModel as CommonIma use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::artcraft::build_common::build_artcraft_omni_image_request; -use crate::generate::generate_image_v2::providers::artcraft::seedream_4p5::request::ArtcraftSeedream4p5RequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::artcraft::build_common::build_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::seedream_4p5::request::ArtcraftSeedream4p5RequestState; pub fn build_artcraft_seedream_4p5( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_4p5/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_4p5/cost.rs similarity index 94% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_4p5/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_4p5/cost.rs index 27adb43ad6..867ad1ade7 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_4p5/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_4p5/cost.rs @@ -1,5 +1,5 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::artcraft::seedream_4p5::request::ArtcraftSeedream4p5RequestState; +use crate::generate::generate_image::providers::artcraft::seedream_4p5::request::ArtcraftSeedream4p5RequestState; /// Cost state for Artcraft Seedream V4.5. Pricing mirrors v1 /// (`estimate_image_cost_artcraft_seedream_4p5`): 4¢ per output image. diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_4p5/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_4p5/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_4p5/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_4p5/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_4p5/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_4p5/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_4p5/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_4p5/request.rs index a616231783..53936140e6 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_4p5/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_4p5/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_image_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_response::GenerateImageResponse; -use crate::generate::generate_image_v2::providers::artcraft::request_common::send_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::request_common::send_artcraft_omni_image_request; #[derive(Clone, Debug)] pub struct ArtcraftSeedream4p5RequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_5_lite/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_5_lite/build.rs similarity index 60% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_5_lite/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_5_lite/build.rs index 7a2a903afb..e631523ddd 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_5_lite/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_5_lite/build.rs @@ -2,10 +2,10 @@ use enums::common::generation::common_image_model::CommonImageModel as CommonIma use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::artcraft::build_common::build_artcraft_omni_image_request; -use crate::generate::generate_image_v2::providers::artcraft::seedream_5_lite::request::ArtcraftSeedream5LiteRequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::artcraft::build_common::build_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::seedream_5_lite::request::ArtcraftSeedream5LiteRequestState; pub fn build_artcraft_seedream_5_lite( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_5_lite/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_5_lite/cost.rs similarity index 94% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_5_lite/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_5_lite/cost.rs index 9a05d52e60..92cafae7bb 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_5_lite/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_5_lite/cost.rs @@ -1,5 +1,5 @@ use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::artcraft::seedream_5_lite::request::ArtcraftSeedream5LiteRequestState; +use crate::generate::generate_image::providers::artcraft::seedream_5_lite::request::ArtcraftSeedream5LiteRequestState; /// Cost state for Artcraft Seedream 5 Lite. Pricing mirrors v1 /// (`estimate_image_cost_artcraft_seedream_5_lite`): 4¢ per output image. diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_5_lite/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_5_lite/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_5_lite/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_5_lite/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_5_lite/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_5_lite/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_5_lite/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_5_lite/request.rs index fe173fd3d5..95c69f1df1 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/artcraft/seedream_5_lite/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/seedream_5_lite/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_image_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_image::generate_image_response::GenerateImageResponse; -use crate::generate::generate_image_v2::providers::artcraft::request_common::send_artcraft_omni_image_request; +use crate::generate::generate_image::providers::artcraft::request_common::send_artcraft_omni_image_request; #[derive(Clone, Debug)] pub struct ArtcraftSeedream5LiteRequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_1_dev/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_1_dev/build.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_1_dev/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_1_dev/build.rs index cd796715a0..696c42ab72 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_1_dev/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_1_dev/build.rs @@ -11,9 +11,9 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::fal::flux_1_dev::request::FalFlux1DevRequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::fal::flux_1_dev::request::FalFlux1DevRequestState; pub fn build_fal_flux_1_dev( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_1_dev/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_1_dev/cost.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_1_dev/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_1_dev/cost.rs index 68cb64f1be..b28d331906 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_1_dev/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_1_dev/cost.rs @@ -1,7 +1,7 @@ use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::fal::flux_1_dev::request::FalFlux1DevRequestState; +use crate::generate::generate_image::providers::fal::flux_1_dev::request::FalFlux1DevRequestState; pub struct FalFlux1DevCostState { cost_in_usd_cents: u64, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_1_dev/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_1_dev/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_1_dev/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_1_dev/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_1_dev/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_1_dev/request.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_1_dev/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_1_dev/request.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_1_schnell/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_1_schnell/build.rs similarity index 98% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_1_schnell/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_1_schnell/build.rs index 8097f7660a..7a5d005b5c 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_1_schnell/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_1_schnell/build.rs @@ -12,9 +12,9 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::fal::flux_1_schnell::request::FalFlux1SchnellRequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::fal::flux_1_schnell::request::FalFlux1SchnellRequestState; pub fn build_fal_flux_1_schnell( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_1_schnell/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_1_schnell/cost.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_1_schnell/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_1_schnell/cost.rs index c92632595e..be5f83c33b 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_1_schnell/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_1_schnell/cost.rs @@ -1,7 +1,7 @@ use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::fal::flux_1_schnell::request::FalFlux1SchnellRequestState; +use crate::generate::generate_image::providers::fal::flux_1_schnell::request::FalFlux1SchnellRequestState; pub struct FalFlux1SchnellCostState { cost_in_usd_cents: u64, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_1_schnell/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_1_schnell/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_1_schnell/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_1_schnell/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_1_schnell/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_1_schnell/request.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_1_schnell/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_1_schnell/request.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_2_lora_angles/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_2_lora_angles/build.rs similarity index 95% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_2_lora_angles/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_2_lora_angles/build.rs index 6ee0173159..57d27ddfda 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_2_lora_angles/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_2_lora_angles/build.rs @@ -9,9 +9,9 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::fal::flux_2_lora_angles::request::FalFlux2LoraAnglesRequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::fal::flux_2_lora_angles::request::FalFlux2LoraAnglesRequestState; pub fn build_fal_flux_2_lora_angles( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_2_lora_angles/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_2_lora_angles/cost.rs similarity index 95% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_2_lora_angles/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_2_lora_angles/cost.rs index 1c8c0c0af4..603ad2530c 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_2_lora_angles/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_2_lora_angles/cost.rs @@ -1,7 +1,7 @@ use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::fal::flux_2_lora_angles::request::FalFlux2LoraAnglesRequestState; +use crate::generate::generate_image::providers::fal::flux_2_lora_angles::request::FalFlux2LoraAnglesRequestState; /// Cost state for Fal Flux 2 LoRA Angles. Delegates to the fal_client cost /// calculator (2¢ per output image — $0.021/MP at the default ~1MP). diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_2_lora_angles/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_2_lora_angles/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_2_lora_angles/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_2_lora_angles/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_2_lora_angles/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_2_lora_angles/request.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_2_lora_angles/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_2_lora_angles/request.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_pro_1p1/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_pro_1p1/build.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_pro_1p1/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_pro_1p1/build.rs index a92dacfae0..45800c1d05 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_pro_1p1/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_pro_1p1/build.rs @@ -7,9 +7,9 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::fal::flux_pro_1p1::request::FalFluxPro1p1RequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::fal::flux_pro_1p1::request::FalFluxPro1p1RequestState; pub fn build_fal_flux_pro_1p1( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_pro_1p1/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_pro_1p1/cost.rs similarity index 95% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_pro_1p1/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_pro_1p1/cost.rs index 69b4e7e1ea..a2b7624ea6 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_pro_1p1/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_pro_1p1/cost.rs @@ -1,7 +1,7 @@ use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::fal::flux_pro_1p1::request::FalFluxPro1p1RequestState; +use crate::generate::generate_image::providers::fal::flux_pro_1p1::request::FalFluxPro1p1RequestState; pub struct FalFluxPro1p1CostState { cost_in_usd_cents: u64, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_pro_1p1/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_pro_1p1/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_pro_1p1/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_pro_1p1/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_pro_1p1/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_pro_1p1/request.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_pro_1p1/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_pro_1p1/request.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_pro_1p1_ultra/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_pro_1p1_ultra/build.rs similarity index 96% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_pro_1p1_ultra/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_pro_1p1_ultra/build.rs index 9b4adbf9df..33bcbe5f8e 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_pro_1p1_ultra/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_pro_1p1_ultra/build.rs @@ -7,9 +7,9 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::fal::flux_pro_1p1_ultra::request::FalFluxPro1p1UltraRequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::fal::flux_pro_1p1_ultra::request::FalFluxPro1p1UltraRequestState; pub fn build_fal_flux_pro_1p1_ultra( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_pro_1p1_ultra/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_pro_1p1_ultra/cost.rs similarity index 95% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_pro_1p1_ultra/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_pro_1p1_ultra/cost.rs index 6b9c8a388d..4c5c03d674 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_pro_1p1_ultra/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_pro_1p1_ultra/cost.rs @@ -1,7 +1,7 @@ use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::fal::flux_pro_1p1_ultra::request::FalFluxPro1p1UltraRequestState; +use crate::generate::generate_image::providers::fal::flux_pro_1p1_ultra::request::FalFluxPro1p1UltraRequestState; pub struct FalFluxPro1p1UltraCostState { cost_in_usd_cents: u64, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_pro_1p1_ultra/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_pro_1p1_ultra/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_pro_1p1_ultra/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_pro_1p1_ultra/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_pro_1p1_ultra/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_pro_1p1_ultra/request.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/flux_pro_1p1_ultra/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/flux_pro_1p1_ultra/request.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_1/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_1/build.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_1/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_1/build.rs index 94de9e018c..34f68a759b 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_1/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_1/build.rs @@ -14,9 +14,9 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::fal::gpt_image_1::request::FalGptImage1RequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::fal::gpt_image_1::request::FalGptImage1RequestState; pub fn build_fal_gpt_image_1( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_1/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_1/cost.rs similarity index 99% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_1/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_1/cost.rs index 57b5027935..c18351a561 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_1/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_1/cost.rs @@ -6,7 +6,7 @@ use fal_client::requests::api::image::text::gpt_image_1_text_to_image::api::{ }; use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::fal::gpt_image_1::request::FalGptImage1RequestState; +use crate::generate::generate_image::providers::fal::gpt_image_1::request::FalGptImage1RequestState; /// Cost state for Fal GPT Image 1. Mirrors v1 /// (`estimate_image_cost_fal_gpt_image_1`): diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_1/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_1/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_1/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_1/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_1/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_1/request.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_1/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_1/request.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_1p5/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_1p5/build.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_1p5/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_1p5/build.rs index 24bd226bef..a6e9e31684 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_1p5/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_1p5/build.rs @@ -14,9 +14,9 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::fal::gpt_image_1p5::request::FalGptImage1p5RequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::fal::gpt_image_1p5::request::FalGptImage1p5RequestState; pub fn build_fal_gpt_image_1p5( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_1p5/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_1p5/cost.rs similarity index 98% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_1p5/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_1p5/cost.rs index 8d29823ffc..c1542d0d7f 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_1p5/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_1p5/cost.rs @@ -6,7 +6,7 @@ use fal_client::requests::api::image::text::gpt_image_1p5_text_to_image::api::{ }; use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::fal::gpt_image_1p5::request::FalGptImage1p5RequestState; +use crate::generate::generate_image::providers::fal::gpt_image_1p5::request::FalGptImage1p5RequestState; /// Cost state for Fal GPT Image 1.5. Mirrors v1 /// (`estimate_image_cost_fal_gpt_image_1p5`): diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_1p5/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_1p5/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_1p5/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_1p5/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_1p5/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_1p5/request.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_1p5/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_1p5/request.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_2/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_2/build.rs similarity index 98% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_2/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_2/build.rs index 086a35cd6a..53b916f9fa 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_2/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_2/build.rs @@ -16,9 +16,9 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::fal::gpt_image_2::request::FalGptImage2RequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::fal::gpt_image_2::request::FalGptImage2RequestState; pub fn build_fal_gpt_image_2( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_2/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_2/cost.rs similarity index 99% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_2/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_2/cost.rs index d60b3d84c2..4ea794394d 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_2/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_2/cost.rs @@ -6,7 +6,7 @@ use fal_client::requests::api::image::text::gpt_image_2_text_to_image::api::{ }; use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::fal::gpt_image_2::request::FalGptImage2RequestState; +use crate::generate::generate_image::providers::fal::gpt_image_2::request::FalGptImage2RequestState; /// Cost state for Fal GPT Image 2. Mirrors v1 /// (`estimate_image_cost_fal_gpt_image_2`): diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_2/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_2/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_2/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_2/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_2/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_2/request.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/gpt_image_2/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/gpt_image_2/request.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana/build.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana/build.rs index bb6ba0d48f..f95caae19c 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana/build.rs @@ -12,9 +12,9 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::fal::nano_banana::request::FalNanoBananaRequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::fal::nano_banana::request::FalNanoBananaRequestState; pub fn build_fal_nano_banana( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana/cost.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana/cost.rs index 10eef20a5c..7552c4a84a 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana/cost.rs @@ -2,7 +2,7 @@ use fal_client::requests::webhook::image::edit::enqueue_gemini_25_flash_edit_web use fal_client::requests::webhook::image::text::enqueue_gemini_25_flash_text_to_image_webhook::Gemini25FlashTextToImageNumImages; use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::fal::nano_banana::request::FalNanoBananaRequestState; +use crate::generate::generate_image::providers::fal::nano_banana::request::FalNanoBananaRequestState; pub struct FalNanoBananaCostState { num_images: u64, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana/request.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana/request.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana_2/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana_2/build.rs similarity index 98% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana_2/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana_2/build.rs index 15afc9ebe5..868c22815a 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana_2/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana_2/build.rs @@ -14,9 +14,9 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::fal::nano_banana_2::request::FalNanoBanana2RequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::fal::nano_banana_2::request::FalNanoBanana2RequestState; pub fn build_fal_nano_banana_2( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana_2/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana_2/cost.rs similarity index 98% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana_2/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana_2/cost.rs index 2bf011c781..47f7e1f8f8 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana_2/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana_2/cost.rs @@ -6,7 +6,7 @@ use fal_client::requests::api::image::text::nano_banana_2_text_to_image::api::{ }; use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::fal::nano_banana_2::request::FalNanoBanana2RequestState; +use crate::generate::generate_image::providers::fal::nano_banana_2::request::FalNanoBanana2RequestState; /// Cost state for Fal Nano Banana 2. Mirrors v1 /// (`estimate_image_cost_fal_nano_banana_2`): diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana_2/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana_2/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana_2/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana_2/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana_2/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana_2/request.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana_2/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana_2/request.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana_pro/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana_pro/build.rs similarity index 98% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana_pro/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana_pro/build.rs index 7508f82117..861524861f 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana_pro/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana_pro/build.rs @@ -14,9 +14,9 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::fal::nano_banana_pro::request::FalNanoBananaProRequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::fal::nano_banana_pro::request::FalNanoBananaProRequestState; pub fn build_fal_nano_banana_pro( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana_pro/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana_pro/cost.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana_pro/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana_pro/cost.rs index f1bf3afc7b..cf720e0e24 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana_pro/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana_pro/cost.rs @@ -1,7 +1,7 @@ use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::fal::nano_banana_pro::request::FalNanoBananaProRequestState; +use crate::generate::generate_image::providers::fal::nano_banana_pro::request::FalNanoBananaProRequestState; pub struct FalNanoBananaProCostState { cost_in_usd_cents: u64, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana_pro/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana_pro/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana_pro/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana_pro/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana_pro/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana_pro/request.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/nano_banana_pro/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/nano_banana_pro/request.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/qwen_edit_2511_angles/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/qwen_edit_2511_angles/build.rs similarity index 95% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/qwen_edit_2511_angles/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/qwen_edit_2511_angles/build.rs index f104a327c4..0ca15e79d7 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/qwen_edit_2511_angles/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/qwen_edit_2511_angles/build.rs @@ -9,9 +9,9 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::fal::qwen_edit_2511_angles::request::FalQwenEdit2511AnglesRequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::fal::qwen_edit_2511_angles::request::FalQwenEdit2511AnglesRequestState; pub fn build_fal_qwen_edit_2511_angles( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/qwen_edit_2511_angles/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/qwen_edit_2511_angles/cost.rs similarity index 95% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/qwen_edit_2511_angles/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/qwen_edit_2511_angles/cost.rs index fd19cd67dc..019c4e96ed 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/qwen_edit_2511_angles/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/qwen_edit_2511_angles/cost.rs @@ -1,7 +1,7 @@ use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::fal::qwen_edit_2511_angles::request::FalQwenEdit2511AnglesRequestState; +use crate::generate::generate_image::providers::fal::qwen_edit_2511_angles::request::FalQwenEdit2511AnglesRequestState; /// Cost state for Fal Qwen Edit 2511 Angles. Delegates to the fal_client /// cost calculator (4¢ per output image — $0.035/MP at the default ~1MP). diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/qwen_edit_2511_angles/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/qwen_edit_2511_angles/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/qwen_edit_2511_angles/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/qwen_edit_2511_angles/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/qwen_edit_2511_angles/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/qwen_edit_2511_angles/request.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/qwen_edit_2511_angles/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/qwen_edit_2511_angles/request.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_4/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_4/build.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_4/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_4/build.rs index 8d857a8b1d..4c354b5aa4 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_4/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_4/build.rs @@ -13,9 +13,9 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::fal::seedream_4::request::FalSeedream4RequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::fal::seedream_4::request::FalSeedream4RequestState; pub fn build_fal_seedream_4( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_4/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_4/cost.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_4/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_4/cost.rs index 78f7b23eda..cebedc4dc2 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_4/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_4/cost.rs @@ -2,7 +2,7 @@ use fal_client::requests::webhook::image::edit::enqueue_bytedance_seedream_v4_ed use fal_client::requests::webhook::image::text::enqueue_bytedance_seedream_v4_text_to_image_webhook::EnqueueBytedanceSeedreamV4TextToImageNumImages; use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::fal::seedream_4::request::FalSeedream4RequestState; +use crate::generate::generate_image::providers::fal::seedream_4::request::FalSeedream4RequestState; pub struct FalSeedream4CostState { num_images: u64, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_4/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_4/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_4/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_4/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_4/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_4/request.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_4/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_4/request.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_4p5/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_4p5/build.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_4p5/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_4p5/build.rs index dac12d5d59..bda9cfcfeb 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_4p5/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_4p5/build.rs @@ -13,9 +13,9 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::fal::seedream_4p5::request::FalSeedream4p5RequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::fal::seedream_4p5::request::FalSeedream4p5RequestState; pub fn build_fal_seedream_4p5( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_4p5/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_4p5/cost.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_4p5/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_4p5/cost.rs index 58cfc743e3..d1af155584 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_4p5/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_4p5/cost.rs @@ -2,7 +2,7 @@ use fal_client::requests::webhook::image::edit::enqueue_bytedance_seedream_v4p5_ use fal_client::requests::webhook::image::text::enqueue_bytedance_seedream_v4p5_text_to_image_webhook::EnqueueBytedanceSeedreamV4p5TextToImageNumImages; use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::fal::seedream_4p5::request::FalSeedream4p5RequestState; +use crate::generate::generate_image::providers::fal::seedream_4p5::request::FalSeedream4p5RequestState; pub struct FalSeedream4p5CostState { num_images: u64, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_4p5/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_4p5/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_4p5/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_4p5/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_4p5/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_4p5/request.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_4p5/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_4p5/request.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_5_lite/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_5_lite/build.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_5_lite/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_5_lite/build.rs index 59b5a84eb4..0d1a6b5f12 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_5_lite/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_5_lite/build.rs @@ -14,9 +14,9 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use crate::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use crate::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; -use crate::generate::generate_image_v2::providers::fal::seedream_5_lite::request::FalSeedream5LiteRequestState; +use crate::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use crate::generate::generate_image::image_generation_request::ImageGenerationRequest; +use crate::generate::generate_image::providers::fal::seedream_5_lite::request::FalSeedream5LiteRequestState; pub fn build_fal_seedream_5_lite( builder: GenerateImageRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_5_lite/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_5_lite/cost.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_5_lite/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_5_lite/cost.rs index 9505b1b7fb..914728438d 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_5_lite/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_5_lite/cost.rs @@ -2,7 +2,7 @@ use fal_client::requests::webhook::image::edit::enqueue_bytedance_seedream_v5_li use fal_client::requests::webhook::image::text::enqueue_bytedance_seedream_v5_lite_text_to_image_webhook::EnqueueBytedanceSeedreamV5LiteTextToImageNumImages; use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; -use crate::generate::generate_image_v2::providers::fal::seedream_5_lite::request::FalSeedream5LiteRequestState; +use crate::generate::generate_image::providers::fal::seedream_5_lite::request::FalSeedream5LiteRequestState; pub struct FalSeedream5LiteCostState { num_images: u64, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_5_lite/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_5_lite/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_5_lite/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_5_lite/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_5_lite/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_5_lite/request.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/fal/seedream_5_lite/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/fal/seedream_5_lite/request.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/providers/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/mod.rs deleted file mode 100644 index 655d1c1141..0000000000 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image_v2/mod.rs +++ /dev/null @@ -1,5 +0,0 @@ -pub mod image_generation_draft; -pub mod image_generation_draft_context; -pub mod image_generation_draft_or_request; -pub mod image_generation_request; -pub mod providers; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/CLAUDE.md b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/CLAUDE.md similarity index 99% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/CLAUDE.md rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/CLAUDE.md index e2bfa867d9..2abed64546 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/CLAUDE.md +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/CLAUDE.md @@ -1,4 +1,4 @@ -# generate_video_v2 +# generate_video This module implements the v2 video generation pipeline. It replaces the v1 system (in `generate_video/`) with a two-phase approach that separates request planning from @@ -63,7 +63,7 @@ Cost can be estimated at two stages: ## Module layout ``` -generate_video_v2/ +generate_video/ ├── mod.rs ├── video_generation_draft.rs ← VideoGenerationDraftRequest enum ├── video_generation_draft_context.rs ← context for finalize() diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/generate_video_request_builder.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/generate_video_request_builder.rs index 8bf9cc2234..b9b98d7afb 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/generate_video_request_builder.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/generate_video_request_builder.rs @@ -9,59 +9,59 @@ use crate::api::router_provider::RouterProvider; use crate::api::video_list_ref::VideoListRef; use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy; use crate::errors::artcraft_router_error::ArtcraftRouterError; -use crate::generate::generate_video_v2::providers::artcraft::grok_imagine_video::build::build_artcraft_grok_imagine_video; -use crate::generate::generate_video_v2::providers::artcraft::grok_imagine_video_1p5::build::build_artcraft_grok_imagine_video_1p5; -use crate::generate::generate_video_v2::providers::artcraft::happy_horse_1p0::build::build_artcraft_happy_horse_1p0; -use crate::generate::generate_video_v2::providers::artcraft::kling_1_6_pro::build::build_artcraft_kling_1_6_pro; -use crate::generate::generate_video_v2::providers::artcraft::kling_2_1_master::build::build_artcraft_kling_2_1_master; -use crate::generate::generate_video_v2::providers::artcraft::kling_2_1_pro::build::build_artcraft_kling_2_1_pro; -use crate::generate::generate_video_v2::providers::artcraft::kling_2_5_turbo_pro::build::build_artcraft_kling_2_5_turbo_pro; -use crate::generate::generate_video_v2::providers::artcraft::kling_2_6_pro::build::build_artcraft_kling_2_6_pro; -use crate::generate::generate_video_v2::providers::artcraft::kling_3p0_pro::build::build_artcraft_kling_3p0_pro; -use crate::generate::generate_video_v2::providers::artcraft::kling_3p0_standard::build::build_artcraft_kling_3p0_standard; -use crate::generate::generate_video_v2::providers::artcraft::preview_model::build::build_artcraft_preview_model; -use crate::generate::generate_video_v2::providers::artcraft::preview_model_fast::build::build_artcraft_preview_model_fast; -use crate::generate::generate_video_v2::providers::artcraft::seedance_1p0_lite::build::build_artcraft_seedance_1p0_lite; -use crate::generate::generate_video_v2::providers::artcraft::seedance_1p5_pro::build::build_artcraft_seedance_1p5_pro; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0::build::build_artcraft_seedance_2p0; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_fast::build::build_artcraft_seedance_2p0_fast; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_u::build::build_artcraft_seedance_2p0_u; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_u_fast::build::build_artcraft_seedance_2p0_u_fast; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bp::build::build_artcraft_seedance_2p0_bp; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bp_fast::build::build_artcraft_seedance_2p0_bp_fast; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bpu::build::build_artcraft_seedance_2p0_bpu; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bpu_fast::build::build_artcraft_seedance_2p0_bpu_fast; -use crate::generate::generate_video_v2::providers::artcraft::sora_2::build::build_artcraft_sora_2; -use crate::generate::generate_video_v2::providers::artcraft::sora_2_pro::build::build_artcraft_sora_2_pro; -use crate::generate::generate_video_v2::providers::artcraft::veo_2::build::build_artcraft_veo_2; -use crate::generate::generate_video_v2::providers::artcraft::veo_3::build::build_artcraft_veo_3; -use crate::generate::generate_video_v2::providers::artcraft::veo_3_fast::build::build_artcraft_veo_3_fast; -use crate::generate::generate_video_v2::providers::artcraft::veo_3p1::build::build_artcraft_veo_3p1; -use crate::generate::generate_video_v2::providers::artcraft::veo_3p1_fast::build::build_artcraft_veo_3p1_fast; -use crate::generate::generate_video_v2::providers::kinovi::happy_horse_1p0::build::build_kinovi_happy_horse_1p0; -use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0::build::build_kinovi_seedance_2p0; -use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_g::build::build_gmicloud_seedance_2p0_u; -use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_fast_g::build::build_gmicloud_seedance_2p0_u_fast; -use crate::generate::generate_video_v2::providers::grok_api::grok_imagine_video::build::build_grok_api_grok_imagine_video; -use crate::generate::generate_video_v2::providers::grok_api::grok_imagine_video_1p5::build::build_grok_api_grok_imagine_video_1p5; -use crate::generate::generate_video_v2::providers::fal::kling_1_6_pro::build::build_fal_kling_1_6_pro; -use crate::generate::generate_video_v2::providers::fal::kling_2_1_master::build::build_fal_kling_2_1_master; -use crate::generate::generate_video_v2::providers::fal::kling_2_1_pro::build::build_fal_kling_2_1_pro; -use crate::generate::generate_video_v2::providers::fal::kling_2_5_turbo_pro::build::build_fal_kling_2_5_turbo_pro; -use crate::generate::generate_video_v2::providers::fal::kling_2_6_pro::build::build_fal_kling_2_6_pro; -use crate::generate::generate_video_v2::providers::fal::kling_3p0_pro::build::build_fal_kling_3p0_pro; -use crate::generate::generate_video_v2::providers::fal::kling_3p0_standard::build::build_fal_kling_3p0_standard; -use crate::generate::generate_video_v2::providers::fal::seedance_1p0_lite::build::build_fal_seedance_1p0_lite; -use crate::generate::generate_video_v2::providers::fal::seedance_1p5_pro::build::build_fal_seedance_1p5_pro; -use crate::generate::generate_video_v2::providers::fal::sora_2::build::build_fal_sora_2; -use crate::generate::generate_video_v2::providers::fal::sora_2_pro::build::build_fal_sora_2_pro; -use crate::generate::generate_video_v2::providers::fal::veo_2::build::build_fal_veo_2; -use crate::generate::generate_video_v2::providers::fal::veo_3::build::build_fal_veo_3; -use crate::generate::generate_video_v2::providers::fal::veo_3_fast::build::build_fal_veo_3_fast; -use crate::generate::generate_video_v2::providers::fal::veo_3p1::build::build_fal_veo_3p1; -use crate::generate::generate_video_v2::providers::fal::veo_3p1_fast::build::build_fal_veo_3p1_fast; -use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0_fast::build::build_kinovi_seedance_2p0_fast; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::providers::artcraft::grok_imagine_video::build::build_artcraft_grok_imagine_video; +use crate::generate::generate_video::providers::artcraft::grok_imagine_video_1p5::build::build_artcraft_grok_imagine_video_1p5; +use crate::generate::generate_video::providers::artcraft::happy_horse_1p0::build::build_artcraft_happy_horse_1p0; +use crate::generate::generate_video::providers::artcraft::kling_1_6_pro::build::build_artcraft_kling_1_6_pro; +use crate::generate::generate_video::providers::artcraft::kling_2_1_master::build::build_artcraft_kling_2_1_master; +use crate::generate::generate_video::providers::artcraft::kling_2_1_pro::build::build_artcraft_kling_2_1_pro; +use crate::generate::generate_video::providers::artcraft::kling_2_5_turbo_pro::build::build_artcraft_kling_2_5_turbo_pro; +use crate::generate::generate_video::providers::artcraft::kling_2_6_pro::build::build_artcraft_kling_2_6_pro; +use crate::generate::generate_video::providers::artcraft::kling_3p0_pro::build::build_artcraft_kling_3p0_pro; +use crate::generate::generate_video::providers::artcraft::kling_3p0_standard::build::build_artcraft_kling_3p0_standard; +use crate::generate::generate_video::providers::artcraft::preview_model::build::build_artcraft_preview_model; +use crate::generate::generate_video::providers::artcraft::preview_model_fast::build::build_artcraft_preview_model_fast; +use crate::generate::generate_video::providers::artcraft::seedance_1p0_lite::build::build_artcraft_seedance_1p0_lite; +use crate::generate::generate_video::providers::artcraft::seedance_1p5_pro::build::build_artcraft_seedance_1p5_pro; +use crate::generate::generate_video::providers::artcraft::seedance_2p0::build::build_artcraft_seedance_2p0; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_fast::build::build_artcraft_seedance_2p0_fast; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_u::build::build_artcraft_seedance_2p0_u; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_u_fast::build::build_artcraft_seedance_2p0_u_fast; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_bp::build::build_artcraft_seedance_2p0_bp; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_bp_fast::build::build_artcraft_seedance_2p0_bp_fast; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_bpu::build::build_artcraft_seedance_2p0_bpu; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_bpu_fast::build::build_artcraft_seedance_2p0_bpu_fast; +use crate::generate::generate_video::providers::artcraft::sora_2::build::build_artcraft_sora_2; +use crate::generate::generate_video::providers::artcraft::sora_2_pro::build::build_artcraft_sora_2_pro; +use crate::generate::generate_video::providers::artcraft::veo_2::build::build_artcraft_veo_2; +use crate::generate::generate_video::providers::artcraft::veo_3::build::build_artcraft_veo_3; +use crate::generate::generate_video::providers::artcraft::veo_3_fast::build::build_artcraft_veo_3_fast; +use crate::generate::generate_video::providers::artcraft::veo_3p1::build::build_artcraft_veo_3p1; +use crate::generate::generate_video::providers::artcraft::veo_3p1_fast::build::build_artcraft_veo_3p1_fast; +use crate::generate::generate_video::providers::kinovi::happy_horse_1p0::build::build_kinovi_happy_horse_1p0; +use crate::generate::generate_video::providers::kinovi::seedance_2p0::build::build_kinovi_seedance_2p0; +use crate::generate::generate_video::providers::gmicloud::seedance_2p0_g::build::build_gmicloud_seedance_2p0_u; +use crate::generate::generate_video::providers::gmicloud::seedance_2p0_fast_g::build::build_gmicloud_seedance_2p0_u_fast; +use crate::generate::generate_video::providers::grok_api::grok_imagine_video::build::build_grok_api_grok_imagine_video; +use crate::generate::generate_video::providers::grok_api::grok_imagine_video_1p5::build::build_grok_api_grok_imagine_video_1p5; +use crate::generate::generate_video::providers::fal::kling_1_6_pro::build::build_fal_kling_1_6_pro; +use crate::generate::generate_video::providers::fal::kling_2_1_master::build::build_fal_kling_2_1_master; +use crate::generate::generate_video::providers::fal::kling_2_1_pro::build::build_fal_kling_2_1_pro; +use crate::generate::generate_video::providers::fal::kling_2_5_turbo_pro::build::build_fal_kling_2_5_turbo_pro; +use crate::generate::generate_video::providers::fal::kling_2_6_pro::build::build_fal_kling_2_6_pro; +use crate::generate::generate_video::providers::fal::kling_3p0_pro::build::build_fal_kling_3p0_pro; +use crate::generate::generate_video::providers::fal::kling_3p0_standard::build::build_fal_kling_3p0_standard; +use crate::generate::generate_video::providers::fal::seedance_1p0_lite::build::build_fal_seedance_1p0_lite; +use crate::generate::generate_video::providers::fal::seedance_1p5_pro::build::build_fal_seedance_1p5_pro; +use crate::generate::generate_video::providers::fal::sora_2::build::build_fal_sora_2; +use crate::generate::generate_video::providers::fal::sora_2_pro::build::build_fal_sora_2_pro; +use crate::generate::generate_video::providers::fal::veo_2::build::build_fal_veo_2; +use crate::generate::generate_video::providers::fal::veo_3::build::build_fal_veo_3; +use crate::generate::generate_video::providers::fal::veo_3_fast::build::build_fal_veo_3_fast; +use crate::generate::generate_video::providers::fal::veo_3p1::build::build_fal_veo_3p1; +use crate::generate::generate_video::providers::fal::veo_3p1_fast::build::build_fal_veo_3p1_fast; +use crate::generate::generate_video::providers::kinovi::seedance_2p0_fast::build::build_kinovi_seedance_2p0_fast; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; /// RouterProvider-agnostic video generation request. Distilled by `build2()` into a /// `VideoGenerationDraftOrRequest` for the selected (provider, model) pair. diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/mod.rs index ff33f334f6..a0b3ddca1d 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/mod.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/mod.rs @@ -1,3 +1,8 @@ pub mod generate_video_request_builder; pub mod generate_video_response; +pub mod providers; pub mod video_generation_cost_estimate; +pub mod video_generation_draft; +pub mod video_generation_draft_context; +pub mod video_generation_draft_or_request; +pub mod video_generation_request; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/build_common.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/build_common.rs similarity index 99% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/build_common.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/build_common.rs index dcb72bfa6a..35fb146521 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/build_common.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/build_common.rs @@ -9,7 +9,7 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::resolve::{ +use crate::generate::generate_video::providers::artcraft::resolve::{ resolve_audio_list_ref, resolve_character_list_ref, resolve_image_list_ref, resolve_image_ref, resolve_video_list_ref, }; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/grok_imagine_video/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video/build.rs similarity index 91% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/grok_imagine_video/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video/build.rs index ad4df58620..a2a9aee461 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/grok_imagine_video/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video/build.rs @@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::grok_imagine_video::request::ArtcraftGrokImagineVideoRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::grok_imagine_video::request::ArtcraftGrokImagineVideoRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; /// Build an ArtCraft-routed Grok Imagine Video request. /// @@ -43,8 +43,8 @@ mod tests { use crate::api::image_ref::ImageRef; use crate::api::router_provider::RouterProvider; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; - use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; use super::*; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/grok_imagine_video/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video/cost.rs similarity index 99% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/grok_imagine_video/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video/cost.rs index fbe937c4b1..722485b5fd 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/grok_imagine_video/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video/cost.rs @@ -1,7 +1,7 @@ use enums::common::generation::common_resolution::CommonResolution; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::grok_imagine_video::request::ArtcraftGrokImagineVideoRequestState; +use crate::generate::generate_video::providers::artcraft::grok_imagine_video::request::ArtcraftGrokImagineVideoRequestState; // -- Pricing constants -- // diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/grok_imagine_video/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/grok_imagine_video/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/grok_imagine_video/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/grok_imagine_video/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video/request.rs index ae847b0eb7..7fd9143c10 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/grok_imagine_video/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftGrokImagineVideoRequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/grok_imagine_video_1p5/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video_1p5/build.rs similarity index 92% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/grok_imagine_video_1p5/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video_1p5/build.rs index 677a4e1b9f..4ac1c9ff4b 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/grok_imagine_video_1p5/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video_1p5/build.rs @@ -3,12 +3,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::grok_imagine_video_1p5::request::ArtcraftGrokImagineVideo1p5RequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::grok_imagine_video_1p5::request::ArtcraftGrokImagineVideo1p5RequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; /// Build an ArtCraft-routed Grok Imagine Video 1.5 preview request. /// @@ -58,8 +58,8 @@ mod tests { use crate::api::image_ref::ImageRef; use crate::api::router_provider::RouterProvider; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; - use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; use super::*; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/grok_imagine_video_1p5/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video_1p5/cost.rs similarity index 98% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/grok_imagine_video_1p5/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video_1p5/cost.rs index 93c1f56786..f897408f07 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/grok_imagine_video_1p5/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video_1p5/cost.rs @@ -11,7 +11,7 @@ use grok_api_client::api::types::video_types::video_resolution::VideoResolution use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::grok_imagine_video_1p5::request::ArtcraftGrokImagineVideo1p5RequestState; +use crate::generate::generate_video::providers::artcraft::grok_imagine_video_1p5::request::ArtcraftGrokImagineVideo1p5RequestState; // ── Markup ── // @@ -477,8 +477,8 @@ mod tests { }; let result = builder.build2().expect("build2 should succeed"); match result { - crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest::Request( - crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest::ArtcraftGrokImagineVideo1p5(s) + crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest::Request( + crate::generate::generate_video::video_generation_request::VideoGenerationRequest::ArtcraftGrokImagineVideo1p5(s) ) => s, _ => panic!("expected ArtcraftGrokImagineVideo1p5 request"), } diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/grok_imagine_video_1p5/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video_1p5/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/grok_imagine_video_1p5/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video_1p5/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/grok_imagine_video_1p5/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video_1p5/request.rs similarity index 92% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/grok_imagine_video_1p5/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video_1p5/request.rs index 3ba94cafe0..09be5336f2 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/grok_imagine_video_1p5/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video_1p5/request.rs @@ -4,7 +4,7 @@ use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftGrokImagineVideo1p5RequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/happy_horse_1p0/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/happy_horse_1p0/build.rs similarity index 90% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/happy_horse_1p0/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/happy_horse_1p0/build.rs index 76fc4754a2..1f773abe0d 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/happy_horse_1p0/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/happy_horse_1p0/build.rs @@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::happy_horse_1p0::request::ArtcraftHappyHorse1p0RequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::happy_horse_1p0::request::ArtcraftHappyHorse1p0RequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_artcraft_happy_horse_1p0(builder: GenerateVideoRequestBuilder) -> Result { let request = build_artcraft_omni_video_request( @@ -33,8 +33,8 @@ mod tests { use crate::api::image_ref::ImageRef; use crate::api::router_provider::RouterProvider; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; - use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; use super::*; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/happy_horse_1p0/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/happy_horse_1p0/cost.rs similarity index 98% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/happy_horse_1p0/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/happy_horse_1p0/cost.rs index e9b82bb50d..e1982e5122 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/happy_horse_1p0/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/happy_horse_1p0/cost.rs @@ -1,7 +1,7 @@ use enums::common::generation::common_resolution::CommonResolution; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::happy_horse_1p0::request::ArtcraftHappyHorse1p0RequestState; +use crate::generate::generate_video::providers::artcraft::happy_horse_1p0::request::ArtcraftHappyHorse1p0RequestState; // ── Pricing ── // diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/happy_horse_1p0/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/happy_horse_1p0/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/happy_horse_1p0/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/happy_horse_1p0/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/happy_horse_1p0/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/happy_horse_1p0/request.rs similarity index 96% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/happy_horse_1p0/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/happy_horse_1p0/request.rs index 49896eeb5b..d3690c44af 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/happy_horse_1p0/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/happy_horse_1p0/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftHappyHorse1p0RequestState { @@ -29,7 +29,7 @@ mod tests { use crate::client::router_client::RouterClient; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet; use artcraft_client::utils::api_host::ApiHost; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_1_6_pro/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_1_6_pro/build.rs similarity index 67% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_1_6_pro/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_1_6_pro/build.rs index 8f98f417a4..9d1a483547 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_1_6_pro/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_1_6_pro/build.rs @@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::kling_1_6_pro::request::ArtcraftKling16ProRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::kling_1_6_pro::request::ArtcraftKling16ProRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_artcraft_kling_1_6_pro(builder: GenerateVideoRequestBuilder) -> Result { let request = build_artcraft_omni_video_request( diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_1_6_pro/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_1_6_pro/cost.rs similarity index 94% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_1_6_pro/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_1_6_pro/cost.rs index 6b434e4b21..f5c93a18b0 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_1_6_pro/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_1_6_pro/cost.rs @@ -1,5 +1,5 @@ use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::kling_1_6_pro::request::ArtcraftKling16ProRequestState; +use crate::generate::generate_video::providers::artcraft::kling_1_6_pro::request::ArtcraftKling16ProRequestState; #[derive(Clone, Debug)] pub struct ArtcraftKling16ProCostState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_1_6_pro/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_1_6_pro/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_1_6_pro/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_1_6_pro/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_1_6_pro/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_1_6_pro/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_1_6_pro/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_1_6_pro/request.rs index 4c5f3dbff4..0690ac57a2 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_1_6_pro/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_1_6_pro/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftKling16ProRequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_1_master/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_master/build.rs similarity index 67% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_1_master/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_master/build.rs index 2c10be955b..66daddbe8d 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_1_master/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_master/build.rs @@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::kling_2_1_master::request::ArtcraftKling21MasterRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::kling_2_1_master::request::ArtcraftKling21MasterRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_artcraft_kling_2_1_master(builder: GenerateVideoRequestBuilder) -> Result { let request = build_artcraft_omni_video_request( diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_1_master/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_master/cost.rs similarity index 93% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_1_master/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_master/cost.rs index 58a2f61330..da1f3fb3ff 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_1_master/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_master/cost.rs @@ -1,5 +1,5 @@ use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::kling_2_1_master::request::ArtcraftKling21MasterRequestState; +use crate::generate::generate_video::providers::artcraft::kling_2_1_master::request::ArtcraftKling21MasterRequestState; #[derive(Clone, Debug)] pub struct ArtcraftKling21MasterCostState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_1_master/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_master/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_1_master/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_master/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_1_master/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_master/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_1_master/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_master/request.rs index fe3c9e25e8..b4c6141e63 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_1_master/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_master/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftKling21MasterRequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_1_pro/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_pro/build.rs similarity index 67% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_1_pro/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_pro/build.rs index e48ab42310..a2b42be051 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_1_pro/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_pro/build.rs @@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::kling_2_1_pro::request::ArtcraftKling21ProRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::kling_2_1_pro::request::ArtcraftKling21ProRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_artcraft_kling_2_1_pro(builder: GenerateVideoRequestBuilder) -> Result { let request = build_artcraft_omni_video_request( diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_1_pro/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_pro/cost.rs similarity index 94% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_1_pro/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_pro/cost.rs index bdc7db61b5..e84dcdd900 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_1_pro/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_pro/cost.rs @@ -1,5 +1,5 @@ use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::kling_2_1_pro::request::ArtcraftKling21ProRequestState; +use crate::generate::generate_video::providers::artcraft::kling_2_1_pro::request::ArtcraftKling21ProRequestState; #[derive(Clone, Debug)] pub struct ArtcraftKling21ProCostState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_1_pro/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_pro/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_1_pro/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_pro/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_1_pro/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_pro/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_1_pro/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_pro/request.rs index 55df27f90e..97b91a948d 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_1_pro/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_pro/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftKling21ProRequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_5_turbo_pro/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_5_turbo_pro/build.rs similarity index 67% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_5_turbo_pro/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_5_turbo_pro/build.rs index cdd0d47ecb..081b2259be 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_5_turbo_pro/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_5_turbo_pro/build.rs @@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::kling_2_5_turbo_pro::request::ArtcraftKling2p5TurboProRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::kling_2_5_turbo_pro::request::ArtcraftKling2p5TurboProRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_artcraft_kling_2_5_turbo_pro(builder: GenerateVideoRequestBuilder) -> Result { let request = build_artcraft_omni_video_request( diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_5_turbo_pro/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_5_turbo_pro/cost.rs similarity index 93% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_5_turbo_pro/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_5_turbo_pro/cost.rs index 8b7cba9772..8e2290a8e0 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_5_turbo_pro/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_5_turbo_pro/cost.rs @@ -1,5 +1,5 @@ use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::kling_2_5_turbo_pro::request::ArtcraftKling2p5TurboProRequestState; +use crate::generate::generate_video::providers::artcraft::kling_2_5_turbo_pro::request::ArtcraftKling2p5TurboProRequestState; #[derive(Clone, Debug)] pub struct ArtcraftKling2p5TurboProCostState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_5_turbo_pro/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_5_turbo_pro/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_5_turbo_pro/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_5_turbo_pro/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_5_turbo_pro/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_5_turbo_pro/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_5_turbo_pro/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_5_turbo_pro/request.rs index 0ce0c8d748..c2793c6267 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_5_turbo_pro/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_5_turbo_pro/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftKling2p5TurboProRequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_6_pro/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_6_pro/build.rs similarity index 74% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_6_pro/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_6_pro/build.rs index c929e88ccd..f31bbb793d 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_6_pro/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_6_pro/build.rs @@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::kling_2_6_pro::request::ArtcraftKling2p6ProRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::kling_2_6_pro::request::ArtcraftKling2p6ProRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_artcraft_kling_2_6_pro(builder: GenerateVideoRequestBuilder) -> Result { // Kling 2.6 Pro supports `generate_audio` — preserve it so cost can read it back. diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_6_pro/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_6_pro/cost.rs similarity index 95% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_6_pro/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_6_pro/cost.rs index fe803cb3e8..5018020d28 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_6_pro/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_6_pro/cost.rs @@ -1,5 +1,5 @@ use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::kling_2_6_pro::request::ArtcraftKling2p6ProRequestState; +use crate::generate::generate_video::providers::artcraft::kling_2_6_pro::request::ArtcraftKling2p6ProRequestState; #[derive(Clone, Debug)] pub struct ArtcraftKling2p6ProCostState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_6_pro/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_6_pro/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_6_pro/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_6_pro/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_6_pro/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_6_pro/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_6_pro/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_6_pro/request.rs index 94e65406b3..dee980e188 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_2_6_pro/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_6_pro/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftKling2p6ProRequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_3p0_pro/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_pro/build.rs similarity index 85% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_3p0_pro/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_pro/build.rs index bb8c13e0fd..549f444d33 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_3p0_pro/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_pro/build.rs @@ -4,12 +4,12 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::kling_3p0_pro::request::ArtcraftKling3p0ProRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::kling_3p0_pro::request::ArtcraftKling3p0ProRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_artcraft_kling_3p0_pro(mut builder: GenerateVideoRequestBuilder) -> Result { // Kling 3.0 Pro supports `generate_audio` — preserve it (build_artcraft_omni_request diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_3p0_pro/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_pro/cost.rs similarity index 95% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_3p0_pro/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_pro/cost.rs index bc5465aa86..27d0c98a5e 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_3p0_pro/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_pro/cost.rs @@ -1,5 +1,5 @@ use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::kling_3p0_pro::request::ArtcraftKling3p0ProRequestState; +use crate::generate::generate_video::providers::artcraft::kling_3p0_pro::request::ArtcraftKling3p0ProRequestState; #[derive(Clone, Debug)] pub struct ArtcraftKling3p0ProCostState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_3p0_pro/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_pro/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_3p0_pro/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_pro/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_3p0_pro/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_pro/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_3p0_pro/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_pro/request.rs index 30bb939f16..f82fcca032 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_3p0_pro/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_pro/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftKling3p0ProRequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_3p0_standard/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_standard/build.rs similarity index 71% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_3p0_standard/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_standard/build.rs index c2be433a9c..1cc3de2e7c 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_3p0_standard/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_standard/build.rs @@ -2,13 +2,13 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::kling_3p0_pro::build::plan_kling_3p0_duration; -use crate::generate::generate_video_v2::providers::artcraft::kling_3p0_standard::request::ArtcraftKling3p0StandardRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::kling_3p0_pro::build::plan_kling_3p0_duration; +use crate::generate::generate_video::providers::artcraft::kling_3p0_standard::request::ArtcraftKling3p0StandardRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_artcraft_kling_3p0_standard(mut builder: GenerateVideoRequestBuilder) -> Result { // Kling 3.0 Standard: same duration range as 3.0 Pro (3-15s); see kling_3p0_pro::build. diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_3p0_standard/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_standard/cost.rs similarity index 95% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_3p0_standard/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_standard/cost.rs index a70762f303..1143a039db 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_3p0_standard/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_standard/cost.rs @@ -1,5 +1,5 @@ use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::kling_3p0_standard::request::ArtcraftKling3p0StandardRequestState; +use crate::generate::generate_video::providers::artcraft::kling_3p0_standard::request::ArtcraftKling3p0StandardRequestState; #[derive(Clone, Debug)] pub struct ArtcraftKling3p0StandardCostState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_3p0_standard/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_standard/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_3p0_standard/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_standard/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_3p0_standard/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_standard/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_3p0_standard/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_standard/request.rs index 698c099ba9..8db8cb5725 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/kling_3p0_standard/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_standard/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftKling3p0StandardRequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/parity_tests.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/parity_tests.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/parity_tests.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/parity_tests.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/preview_model/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model/build.rs similarity index 90% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/preview_model/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model/build.rs index 461d3735a3..3b41e3dace 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/preview_model/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model/build.rs @@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::preview_model::request::ArtcraftPreviewModelRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::preview_model::request::ArtcraftPreviewModelRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_artcraft_preview_model(builder: GenerateVideoRequestBuilder) -> Result { let request = build_artcraft_omni_video_request( @@ -33,8 +33,8 @@ mod tests { use crate::api::image_ref::ImageRef; use crate::api::router_provider::RouterProvider; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; - use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; use super::*; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/preview_model/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model/cost.rs similarity index 98% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/preview_model/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model/cost.rs index 4148d4f26b..57d07c6ea4 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/preview_model/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model/cost.rs @@ -1,7 +1,7 @@ use enums::common::generation::common_resolution::CommonResolution; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::preview_model::request::ArtcraftPreviewModelRequestState; +use crate::generate::generate_video::providers::artcraft::preview_model::request::ArtcraftPreviewModelRequestState; // ── Pricing constants ── // diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/preview_model/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/preview_model/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/preview_model/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/preview_model/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model/request.rs index 4fbf0b8788..afccda28d4 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/preview_model/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftPreviewModelRequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/preview_model_fast/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model_fast/build.rs similarity index 91% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/preview_model_fast/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model_fast/build.rs index c52a42ab4f..096ede4941 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/preview_model_fast/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model_fast/build.rs @@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::preview_model_fast::request::ArtcraftPreviewModelFastRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::preview_model_fast::request::ArtcraftPreviewModelFastRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_artcraft_preview_model_fast(builder: GenerateVideoRequestBuilder) -> Result { let request = build_artcraft_omni_video_request( @@ -35,8 +35,8 @@ mod tests { use crate::api::router_provider::RouterProvider; use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; - use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; use super::*; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/preview_model_fast/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model_fast/cost.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/preview_model_fast/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model_fast/cost.rs index 3b6c3e19d9..ace9401dbb 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/preview_model_fast/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model_fast/cost.rs @@ -1,7 +1,7 @@ use enums::common::generation::common_resolution::CommonResolution; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::preview_model_fast::request::ArtcraftPreviewModelFastRequestState; +use crate::generate::generate_video::providers::artcraft::preview_model_fast::request::ArtcraftPreviewModelFastRequestState; // ── Pricing constants ── // diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/preview_model_fast/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model_fast/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/preview_model_fast/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model_fast/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/preview_model_fast/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model_fast/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/preview_model_fast/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model_fast/request.rs index 6941cafc54..9661f095c0 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/preview_model_fast/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model_fast/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftPreviewModelFastRequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/request_common.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/request_common.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/request_common.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/request_common.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/resolve.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/resolve.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/resolve.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/resolve.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_1p0_lite/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p0_lite/build.rs similarity index 82% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_1p0_lite/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p0_lite/build.rs index 85f7fc9ccc..1e91e10a76 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_1p0_lite/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p0_lite/build.rs @@ -4,12 +4,12 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::seedance_1p0_lite::request::ArtcraftSeedance10LiteRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::seedance_1p0_lite::request::ArtcraftSeedance10LiteRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_artcraft_seedance_1p0_lite(mut builder: GenerateVideoRequestBuilder) -> Result { // Seedance 1.0 Lite accepts only {5, 10} seconds; pre-plan so cost parity holds. diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_1p0_lite/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p0_lite/cost.rs similarity index 96% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_1p0_lite/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p0_lite/cost.rs index 0297040000..22c61e8dae 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_1p0_lite/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p0_lite/cost.rs @@ -5,7 +5,7 @@ use fal_client::requests::webhook::video::image::enqueue_seedance_1_lite_image_t }; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::seedance_1p0_lite::request::ArtcraftSeedance10LiteRequestState; +use crate::generate::generate_video::providers::artcraft::seedance_1p0_lite::request::ArtcraftSeedance10LiteRequestState; #[derive(Clone, Debug)] pub struct ArtcraftSeedance10LiteCostState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_1p0_lite/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p0_lite/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_1p0_lite/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p0_lite/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_1p0_lite/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p0_lite/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_1p0_lite/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p0_lite/request.rs index 23c968156f..67145ba644 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_1p0_lite/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p0_lite/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftSeedance10LiteRequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_1p5_pro/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p5_pro/build.rs similarity index 83% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_1p5_pro/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p5_pro/build.rs index 7f51073c7c..e251bb3fdd 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_1p5_pro/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p5_pro/build.rs @@ -4,12 +4,12 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::seedance_1p5_pro::request::ArtcraftSeedance1p5ProRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::seedance_1p5_pro::request::ArtcraftSeedance1p5ProRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_artcraft_seedance_1p5_pro(mut builder: GenerateVideoRequestBuilder) -> Result { // Seedance 1.5 Pro supports 4-12 seconds; omni-gen helper accepts up to 15, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_1p5_pro/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p5_pro/cost.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_1p5_pro/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p5_pro/cost.rs index 98aee4bb65..efa9494f19 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_1p5_pro/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p5_pro/cost.rs @@ -6,7 +6,7 @@ use fal_client::requests::webhook::video::text::enqueue_seedance_1p5_pro_text_to }; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::seedance_1p5_pro::request::ArtcraftSeedance1p5ProRequestState; +use crate::generate::generate_video::providers::artcraft::seedance_1p5_pro::request::ArtcraftSeedance1p5ProRequestState; #[derive(Clone, Debug)] pub struct ArtcraftSeedance1p5ProCostState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_1p5_pro/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p5_pro/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_1p5_pro/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p5_pro/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_1p5_pro/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p5_pro/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_1p5_pro/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p5_pro/request.rs index 0e78853fcc..b2597ef83b 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_1p5_pro/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p5_pro/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftSeedance1p5ProRequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0/build.rs similarity index 90% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0/build.rs index 6562f4fce6..24d87239d6 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0/build.rs @@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0::request::ArtcraftSeedance2p0RequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::seedance_2p0::request::ArtcraftSeedance2p0RequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_artcraft_seedance_2p0(builder: GenerateVideoRequestBuilder) -> Result { let request = build_artcraft_omni_video_request( @@ -33,8 +33,8 @@ mod tests { use crate::api::image_ref::ImageRef; use crate::api::router_provider::RouterProvider; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; - use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; use super::*; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0/cost.rs similarity index 98% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0/cost.rs index 87b534dfe3..c4d4bed8ef 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0/cost.rs @@ -1,7 +1,7 @@ use enums::common::generation::common_resolution::CommonResolution; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0::request::ArtcraftSeedance2p0RequestState; +use crate::generate::generate_video::providers::artcraft::seedance_2p0::request::ArtcraftSeedance2p0RequestState; // ── Pricing constants ── // diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0/request.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0/request.rs index 4984a473a7..2f98bc578f 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftSeedance2p0RequestState { @@ -31,7 +31,7 @@ mod tests { use crate::client::router_client::RouterClient; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet; use artcraft_client::utils::api_host::ApiHost; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp/build.rs similarity index 90% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp/build.rs index 53c002acd0..6979d85b76 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp/build.rs @@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bp::request::ArtcraftSeedance2p0BytePlusRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_bp::request::ArtcraftSeedance2p0BytePlusRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_artcraft_seedance_2p0_bp(builder: GenerateVideoRequestBuilder) -> Result { let request = build_artcraft_omni_video_request( @@ -33,8 +33,8 @@ mod tests { use crate::api::image_ref::ImageRef; use crate::api::router_provider::RouterProvider; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; - use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; use super::*; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp/cost.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp/cost.rs index b1d9b24158..b10f8358af 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp/cost.rs @@ -1,7 +1,7 @@ use enums::common::generation::common_resolution::CommonResolution; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bp::request::ArtcraftSeedance2p0BytePlusRequestState; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_bp::request::ArtcraftSeedance2p0BytePlusRequestState; /// USD cents per second by resolution: /// 480p: $0.10/s = 10.0 ¢/s diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp/request.rs index 691f16c851..874fcdba37 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftSeedance2p0BytePlusRequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp_fast/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp_fast/build.rs similarity index 91% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp_fast/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp_fast/build.rs index a9971d3cf0..b998762ef0 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp_fast/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp_fast/build.rs @@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bp_fast::request::ArtcraftSeedance2p0BytePlusFastRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_bp_fast::request::ArtcraftSeedance2p0BytePlusFastRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_artcraft_seedance_2p0_bp_fast(builder: GenerateVideoRequestBuilder) -> Result { let request = build_artcraft_omni_video_request( @@ -35,8 +35,8 @@ mod tests { use crate::api::router_provider::RouterProvider; use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; - use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; use super::*; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp_fast/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp_fast/cost.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp_fast/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp_fast/cost.rs index cf503957ee..53f12c6bf4 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp_fast/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp_fast/cost.rs @@ -1,7 +1,7 @@ use enums::common::generation::common_resolution::CommonResolution; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bp_fast::request::ArtcraftSeedance2p0BytePlusFastRequestState; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_bp_fast::request::ArtcraftSeedance2p0BytePlusFastRequestState; /// USD cents per second by resolution: /// 480p: $0.09/s = 9.0 ¢/s diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp_fast/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp_fast/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp_fast/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp_fast/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp_fast/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp_fast/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp_fast/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp_fast/request.rs index 39a4180b4b..64a98dfd77 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp_fast/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp_fast/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftSeedance2p0BytePlusFastRequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bpu/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu/build.rs similarity index 90% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bpu/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu/build.rs index 6ca50e8618..7e21211117 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bpu/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu/build.rs @@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bpu::request::ArtcraftSeedance2p0BytePlusUltraRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_bpu::request::ArtcraftSeedance2p0BytePlusUltraRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_artcraft_seedance_2p0_bpu(builder: GenerateVideoRequestBuilder) -> Result { let request = build_artcraft_omni_video_request( @@ -33,8 +33,8 @@ mod tests { use crate::api::image_ref::ImageRef; use crate::api::router_provider::RouterProvider; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; - use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; use super::*; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bpu/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu/cost.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bpu/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu/cost.rs index 658071e64c..6965815b17 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bpu/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu/cost.rs @@ -1,7 +1,7 @@ use enums::common::generation::common_resolution::CommonResolution; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bpu::request::ArtcraftSeedance2p0BytePlusUltraRequestState; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_bpu::request::ArtcraftSeedance2p0BytePlusUltraRequestState; /// USD cents per second by resolution: /// 480p: $0.10/s = 10.0 ¢/s diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bpu/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bpu/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bpu/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bpu/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu/request.rs index 8d5fd9e3ce..51645861de 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bpu/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftSeedance2p0BytePlusUltraRequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bpu_fast/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu_fast/build.rs similarity index 91% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bpu_fast/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu_fast/build.rs index 7d2f661285..3519128bb2 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bpu_fast/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu_fast/build.rs @@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bpu_fast::request::ArtcraftSeedance2p0BytePlusUltraFastRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_bpu_fast::request::ArtcraftSeedance2p0BytePlusUltraFastRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_artcraft_seedance_2p0_bpu_fast(builder: GenerateVideoRequestBuilder) -> Result { let request = build_artcraft_omni_video_request( @@ -35,8 +35,8 @@ mod tests { use crate::api::router_provider::RouterProvider; use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; - use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; use super::*; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bpu_fast/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu_fast/cost.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bpu_fast/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu_fast/cost.rs index ce35786349..6242e50ca2 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bpu_fast/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu_fast/cost.rs @@ -1,7 +1,7 @@ use enums::common::generation::common_resolution::CommonResolution; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bpu_fast::request::ArtcraftSeedance2p0BytePlusUltraFastRequestState; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_bpu_fast::request::ArtcraftSeedance2p0BytePlusUltraFastRequestState; /// USD cents per second by resolution: /// 480p: $0.09/s = 9.0 ¢/s diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bpu_fast/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu_fast/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bpu_fast/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu_fast/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bpu_fast/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu_fast/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bpu_fast/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu_fast/request.rs index 304ad24453..96d8aae4dc 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bpu_fast/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu_fast/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftSeedance2p0BytePlusUltraFastRequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_fast/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_fast/build.rs similarity index 93% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_fast/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_fast/build.rs index 541bff7064..fff7972e38 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_fast/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_fast/build.rs @@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_fast::request::ArtcraftSeedance2p0FastRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_fast::request::ArtcraftSeedance2p0FastRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_artcraft_seedance_2p0_fast(builder: GenerateVideoRequestBuilder) -> Result { let request = build_artcraft_omni_video_request( @@ -38,8 +38,8 @@ mod tests { use crate::api::video_list_ref::VideoListRef; use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; - use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; use super::*; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_fast/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_fast/cost.rs similarity index 98% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_fast/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_fast/cost.rs index 41551a05cf..bb37e1ccbb 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_fast/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_fast/cost.rs @@ -1,7 +1,7 @@ use enums::common::generation::common_resolution::CommonResolution; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_fast::request::ArtcraftSeedance2p0FastRequestState; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_fast::request::ArtcraftSeedance2p0FastRequestState; // -- Pricing constants -- // diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_fast/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_fast/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_fast/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_fast/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_fast/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_fast/request.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_fast/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_fast/request.rs index 55a1e92c3b..117c626692 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_fast/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_fast/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftSeedance2p0FastRequestState { @@ -32,7 +32,7 @@ mod tests { use crate::client::router_client::RouterClient; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet; use artcraft_client::utils::api_host::ApiHost; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u/build.rs similarity index 90% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u/build.rs index 94dfaa91ba..83e87126a1 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u/build.rs @@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_u::request::ArtcraftSeedance2p0UltraRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_u::request::ArtcraftSeedance2p0UltraRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_artcraft_seedance_2p0_u(builder: GenerateVideoRequestBuilder) -> Result { let request = build_artcraft_omni_video_request( @@ -33,8 +33,8 @@ mod tests { use crate::api::image_ref::ImageRef; use crate::api::router_provider::RouterProvider; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; - use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; use super::*; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u/cost.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u/cost.rs index 4b7182d0d1..d216150245 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u/cost.rs @@ -1,7 +1,7 @@ use enums::common::generation::common_resolution::CommonResolution; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_u::request::ArtcraftSeedance2p0UltraRequestState; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_u::request::ArtcraftSeedance2p0UltraRequestState; // ── Pricing constants ── diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u/request.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u/request.rs index f053cce3eb..c6a7106d06 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftSeedance2p0UltraRequestState { @@ -31,7 +31,7 @@ mod tests { use crate::client::router_client::RouterClient; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet; use artcraft_client::utils::api_host::ApiHost; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u_fast/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u_fast/build.rs similarity index 93% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u_fast/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u_fast/build.rs index ac8fdb6e24..00f665a691 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u_fast/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u_fast/build.rs @@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_u_fast::request::ArtcraftSeedance2p0UltraFastRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_u_fast::request::ArtcraftSeedance2p0UltraFastRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_artcraft_seedance_2p0_u_fast(builder: GenerateVideoRequestBuilder) -> Result { let request = build_artcraft_omni_video_request( @@ -38,8 +38,8 @@ mod tests { use crate::api::video_list_ref::VideoListRef; use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; - use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; use super::*; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u_fast/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u_fast/cost.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u_fast/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u_fast/cost.rs index d2b199b6d5..ffd65d6aae 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u_fast/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u_fast/cost.rs @@ -1,7 +1,7 @@ use enums::common::generation::common_resolution::CommonResolution; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_u_fast::request::ArtcraftSeedance2p0UltraFastRequestState; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_u_fast::request::ArtcraftSeedance2p0UltraFastRequestState; // ── Pricing constants ── diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u_fast/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u_fast/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u_fast/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u_fast/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u_fast/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u_fast/request.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u_fast/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u_fast/request.rs index 4b5e713696..f34c8a1b6a 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u_fast/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u_fast/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftSeedance2p0UltraFastRequestState { @@ -32,7 +32,7 @@ mod tests { use crate::client::router_client::RouterClient; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet; use artcraft_client::utils::api_host::ApiHost; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/sora_2/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/sora_2/build.rs similarity index 83% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/sora_2/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/sora_2/build.rs index 3096e27542..f14aaa1ac1 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/sora_2/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/sora_2/build.rs @@ -4,12 +4,12 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::sora_2::request::ArtcraftSora2RequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::sora_2::request::ArtcraftSora2RequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_artcraft_sora_2(mut builder: GenerateVideoRequestBuilder) -> Result { // Sora 2 accepts only {4,8,12} seconds; pre-plan so cost parity holds for diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/sora_2/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/sora_2/cost.rs similarity index 94% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/sora_2/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/sora_2/cost.rs index ffe3ccef2c..0ed26e27b8 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/sora_2/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/sora_2/cost.rs @@ -1,5 +1,5 @@ use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::sora_2::request::ArtcraftSora2RequestState; +use crate::generate::generate_video::providers::artcraft::sora_2::request::ArtcraftSora2RequestState; #[derive(Clone, Debug)] pub struct ArtcraftSora2CostState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/sora_2/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/sora_2/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/sora_2/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/sora_2/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/sora_2/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/sora_2/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/sora_2/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/sora_2/request.rs index e58fd06d79..74000acbc2 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/sora_2/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/sora_2/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftSora2RequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/sora_2_pro/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/sora_2_pro/build.rs similarity index 68% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/sora_2_pro/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/sora_2_pro/build.rs index aa619dc9d7..ad59b43139 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/sora_2_pro/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/sora_2_pro/build.rs @@ -2,13 +2,13 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::sora_2::build::plan_sora_2_duration; -use crate::generate::generate_video_v2::providers::artcraft::sora_2_pro::request::ArtcraftSora2ProRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::sora_2::build::plan_sora_2_duration; +use crate::generate::generate_video::providers::artcraft::sora_2_pro::request::ArtcraftSora2ProRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_artcraft_sora_2_pro(mut builder: GenerateVideoRequestBuilder) -> Result { // Sora 2 Pro: same duration constraints as Sora 2 ({4,8,12}); reuse helper. diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/sora_2_pro/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/sora_2_pro/cost.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/sora_2_pro/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/sora_2_pro/cost.rs index 9dd040ad26..cc11c3e5b5 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/sora_2_pro/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/sora_2_pro/cost.rs @@ -1,7 +1,7 @@ use enums::common::generation::common_resolution::CommonResolution as CommonResolutionEnum; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::sora_2_pro::request::ArtcraftSora2ProRequestState; +use crate::generate::generate_video::providers::artcraft::sora_2_pro::request::ArtcraftSora2ProRequestState; #[derive(Clone, Debug)] pub struct ArtcraftSora2ProCostState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/sora_2_pro/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/sora_2_pro/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/sora_2_pro/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/sora_2_pro/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/sora_2_pro/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/sora_2_pro/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/sora_2_pro/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/sora_2_pro/request.rs index 351adce25a..628f7b4e20 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/sora_2_pro/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/sora_2_pro/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftSora2ProRequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_2/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_2/build.rs similarity index 84% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_2/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_2/build.rs index 02cb6c0b2f..869696c63d 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_2/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_2/build.rs @@ -4,12 +4,12 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::veo_2::request::ArtcraftVeo2RequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::veo_2::request::ArtcraftVeo2RequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_artcraft_veo_2(mut builder: GenerateVideoRequestBuilder) -> Result { // Veo 2 accepts only {5,6,7,8} seconds; omni-gen helper allows the whole diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_2/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_2/cost.rs similarity index 94% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_2/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_2/cost.rs index 068b437795..878883bb7d 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_2/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_2/cost.rs @@ -1,5 +1,5 @@ use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::veo_2::request::ArtcraftVeo2RequestState; +use crate::generate::generate_video::providers::artcraft::veo_2::request::ArtcraftVeo2RequestState; #[derive(Clone, Debug)] pub struct ArtcraftVeo2CostState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_2/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_2/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_2/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_2/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_2/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_2/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_2/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_2/request.rs index 5077291052..0a76e14750 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_2/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_2/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftVeo2RequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3/build.rs similarity index 75% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3/build.rs index 8de5dced68..49ffaec9b3 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3/build.rs @@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::veo_3::request::ArtcraftVeo3RequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::veo_3::request::ArtcraftVeo3RequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_artcraft_veo_3(builder: GenerateVideoRequestBuilder) -> Result { // Veo 3 cost depends on raw user-requested duration (v1's `duration_seconds_raw`) diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3/cost.rs similarity index 96% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3/cost.rs index a001b60234..361631d430 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3/cost.rs @@ -1,5 +1,5 @@ use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::veo_3::request::ArtcraftVeo3RequestState; +use crate::generate::generate_video::providers::artcraft::veo_3::request::ArtcraftVeo3RequestState; #[derive(Clone, Debug)] pub struct ArtcraftVeo3CostState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3/request.rs index deed12497d..7916a8d38f 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftVeo3RequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3_fast/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3_fast/build.rs similarity index 73% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3_fast/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3_fast/build.rs index 8bf5bdaf99..0e763ac952 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3_fast/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3_fast/build.rs @@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::veo_3_fast::request::ArtcraftVeo3FastRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::veo_3_fast::request::ArtcraftVeo3FastRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_artcraft_veo_3_fast(builder: GenerateVideoRequestBuilder) -> Result { // Veo 3 Fast always bills 8s (v1 maps everything to EightSeconds). We preserve diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3_fast/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3_fast/cost.rs similarity index 95% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3_fast/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3_fast/cost.rs index 9617350ee5..9f40cd0998 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3_fast/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3_fast/cost.rs @@ -1,5 +1,5 @@ use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::veo_3_fast::request::ArtcraftVeo3FastRequestState; +use crate::generate::generate_video::providers::artcraft::veo_3_fast::request::ArtcraftVeo3FastRequestState; #[derive(Clone, Debug)] pub struct ArtcraftVeo3FastCostState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3_fast/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3_fast/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3_fast/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3_fast/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3_fast/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3_fast/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3_fast/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3_fast/request.rs index 1f4103c8c7..16a622bdb1 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3_fast/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3_fast/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftVeo3FastRequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3p1/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3p1/build.rs similarity index 84% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3p1/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3p1/build.rs index d5d4c1227b..dbc7e0cd5f 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3p1/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3p1/build.rs @@ -4,12 +4,12 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::veo_3p1::request::ArtcraftVeo3p1RequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::veo_3p1::request::ArtcraftVeo3p1RequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_artcraft_veo_3p1(mut builder: GenerateVideoRequestBuilder) -> Result { // Veo 3.1 accepts only {4,6,8} seconds; pre-plan so cost parity holds for diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3p1/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3p1/cost.rs similarity index 95% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3p1/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3p1/cost.rs index 7a8c3ef6b4..c73f212cad 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3p1/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3p1/cost.rs @@ -1,5 +1,5 @@ use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::veo_3p1::request::ArtcraftVeo3p1RequestState; +use crate::generate::generate_video::providers::artcraft::veo_3p1::request::ArtcraftVeo3p1RequestState; #[derive(Clone, Debug)] pub struct ArtcraftVeo3p1CostState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3p1/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3p1/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3p1/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3p1/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3p1/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3p1/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3p1/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3p1/request.rs index cf0ddd987f..682b90ed4e 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3p1/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3p1/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftVeo3p1RequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3p1_fast/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3p1_fast/build.rs similarity index 70% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3p1_fast/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3p1_fast/build.rs index c156835193..cff7902ccd 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3p1_fast/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3p1_fast/build.rs @@ -2,13 +2,13 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::artcraft::build_common::{ +use crate::generate::generate_video::providers::artcraft::build_common::{ build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::veo_3p1::build::plan_veo_3p1_duration; -use crate::generate::generate_video_v2::providers::artcraft::veo_3p1_fast::request::ArtcraftVeo3p1FastRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::artcraft::veo_3p1::build::plan_veo_3p1_duration; +use crate::generate::generate_video::providers::artcraft::veo_3p1_fast::request::ArtcraftVeo3p1FastRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_artcraft_veo_3p1_fast(mut builder: GenerateVideoRequestBuilder) -> Result { // Same duration constraints as Veo 3.1 (4/6/8). See veo_3p1::build for rationale. diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3p1_fast/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3p1_fast/cost.rs similarity index 95% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3p1_fast/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3p1_fast/cost.rs index 91e2ae3e6a..ad171587ec 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3p1_fast/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3p1_fast/cost.rs @@ -1,5 +1,5 @@ use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::veo_3p1_fast::request::ArtcraftVeo3p1FastRequestState; +use crate::generate::generate_video::providers::artcraft::veo_3p1_fast::request::ArtcraftVeo3p1FastRequestState; #[derive(Clone, Debug)] pub struct ArtcraftVeo3p1FastCostState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3p1_fast/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3p1_fast/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3p1_fast/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3p1_fast/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3p1_fast/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3p1_fast/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3p1_fast/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3p1_fast/request.rs index 4d78272115..a4f2c9d2a3 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/veo_3p1_fast/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3p1_fast/request.rs @@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost use crate::client::router_artcraft_client::RouterArtcraftClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; -use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request; +use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request; #[derive(Clone, Debug)] pub struct ArtcraftVeo3p1FastRequestState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_1_6_pro/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_1_6_pro/build.rs similarity index 94% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_1_6_pro/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_1_6_pro/build.rs index 9ceba11012..ae1c3c31e8 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_1_6_pro/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_1_6_pro/build.rs @@ -8,9 +8,9 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::fal::kling_1_6_pro::request::FalKling16ProRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::fal::kling_1_6_pro::request::FalKling16ProRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_fal_kling_1_6_pro( builder: GenerateVideoRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_1_6_pro/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_1_6_pro/cost.rs similarity index 94% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_1_6_pro/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_1_6_pro/cost.rs index f666fae1f5..7ef413f4cd 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_1_6_pro/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_1_6_pro/cost.rs @@ -1,7 +1,7 @@ use fal_client::requests::webhook::video::image::enqueue_kling_v1p6_pro_image_to_video_webhook::Kling1p6ProDuration; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::fal::kling_1_6_pro::request::FalKling16ProRequestState; +use crate::generate::generate_video::providers::fal::kling_1_6_pro::request::FalKling16ProRequestState; #[derive(Clone, Debug)] pub struct FalKling16ProCostState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_1_6_pro/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_1_6_pro/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_1_6_pro/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_1_6_pro/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_1_6_pro/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_1_6_pro/request.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_1_6_pro/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_1_6_pro/request.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_1_master/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_1_master/build.rs similarity index 91% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_1_master/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_1_master/build.rs index 8724af8499..49ba9e4897 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_1_master/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_1_master/build.rs @@ -7,10 +7,10 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::fal::kling_1_6_pro::build::require_url; -use crate::generate::generate_video_v2::providers::fal::kling_2_1_master::request::FalKling21MasterRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::fal::kling_1_6_pro::build::require_url; +use crate::generate::generate_video::providers::fal::kling_2_1_master::request::FalKling21MasterRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_fal_kling_2_1_master( builder: GenerateVideoRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_1_master/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_1_master/cost.rs similarity index 94% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_1_master/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_1_master/cost.rs index a13d4420bc..c19e2bcbe9 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_1_master/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_1_master/cost.rs @@ -1,7 +1,7 @@ use fal_client::requests::webhook::video::image::enqueue_kling_v2p1_master_image_to_video_webhook::Kling2p1MasterDuration; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::fal::kling_2_1_master::request::FalKling21MasterRequestState; +use crate::generate::generate_video::providers::fal::kling_2_1_master::request::FalKling21MasterRequestState; #[derive(Clone, Debug)] pub struct FalKling21MasterCostState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_1_master/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_1_master/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_1_master/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_1_master/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_1_master/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_1_master/request.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_1_master/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_1_master/request.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_1_pro/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_1_pro/build.rs similarity index 88% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_1_pro/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_1_pro/build.rs index ee1490190d..58311b74a2 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_1_pro/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_1_pro/build.rs @@ -7,10 +7,10 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::fal::kling_1_6_pro::build::{optional_url, require_url}; -use crate::generate::generate_video_v2::providers::fal::kling_2_1_pro::request::FalKling21ProRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::fal::kling_1_6_pro::build::{optional_url, require_url}; +use crate::generate::generate_video::providers::fal::kling_2_1_pro::request::FalKling21ProRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_fal_kling_2_1_pro( builder: GenerateVideoRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_1_pro/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_1_pro/cost.rs similarity index 94% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_1_pro/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_1_pro/cost.rs index 2edaedf756..4204458bfa 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_1_pro/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_1_pro/cost.rs @@ -1,7 +1,7 @@ use fal_client::requests::webhook::video::image::enqueue_kling_v2p1_pro_image_to_video_webhook::Kling2p1ProDuration; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::fal::kling_2_1_pro::request::FalKling21ProRequestState; +use crate::generate::generate_video::providers::fal::kling_2_1_pro::request::FalKling21ProRequestState; #[derive(Clone, Debug)] pub struct FalKling21ProCostState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_1_pro/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_1_pro/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_1_pro/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_1_pro/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_1_pro/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_1_pro/request.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_1_pro/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_1_pro/request.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_5_turbo_pro/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_5_turbo_pro/build.rs similarity index 94% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_5_turbo_pro/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_5_turbo_pro/build.rs index 148f08b72e..069e4e854f 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_5_turbo_pro/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_5_turbo_pro/build.rs @@ -11,12 +11,12 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::fal::kling_1_6_pro::build::optional_url; -use crate::generate::generate_video_v2::providers::fal::kling_2_5_turbo_pro::request::{ +use crate::generate::generate_video::providers::fal::kling_1_6_pro::build::optional_url; +use crate::generate::generate_video::providers::fal::kling_2_5_turbo_pro::request::{ FalKling2p5TurboProMode, FalKling2p5TurboProRequestState, }; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; #[derive(Debug, Clone, Copy)] pub(crate) enum PlanAspectRatio { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_5_turbo_pro/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_5_turbo_pro/cost.rs similarity index 96% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_5_turbo_pro/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_5_turbo_pro/cost.rs index 7c1aaf1d96..33589f0706 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_5_turbo_pro/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_5_turbo_pro/cost.rs @@ -2,7 +2,7 @@ use fal_client::requests::webhook::video::image::enqueue_kling_v2p5_turbo_pro_im use fal_client::requests::webhook::video::text::enqueue_kling_v2p5_turbo_pro_text_to_video_webhook::EnqueueKlingV2p5TurboProTextToVideoDurationSeconds; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::fal::kling_2_5_turbo_pro::request::{ +use crate::generate::generate_video::providers::fal::kling_2_5_turbo_pro::request::{ FalKling2p5TurboProMode, FalKling2p5TurboProRequestState, }; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_5_turbo_pro/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_5_turbo_pro/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_5_turbo_pro/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_5_turbo_pro/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_5_turbo_pro/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_5_turbo_pro/request.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_5_turbo_pro/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_5_turbo_pro/request.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_6_pro/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_6_pro/build.rs similarity index 94% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_6_pro/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_6_pro/build.rs index e9b43d624f..468dada857 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_6_pro/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_6_pro/build.rs @@ -11,12 +11,12 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::fal::kling_1_6_pro::build::optional_url; -use crate::generate::generate_video_v2::providers::fal::kling_2_6_pro::request::{ +use crate::generate::generate_video::providers::fal::kling_1_6_pro::build::optional_url; +use crate::generate::generate_video::providers::fal::kling_2_6_pro::request::{ FalKling2p6ProMode, FalKling2p6ProRequestState, }; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; #[derive(Debug, Clone, Copy)] pub(crate) enum PlanAspectRatio { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_6_pro/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_6_pro/cost.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_6_pro/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_6_pro/cost.rs index f5a9d45592..e948664cda 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_6_pro/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_6_pro/cost.rs @@ -2,7 +2,7 @@ use fal_client::requests::webhook::video::image::enqueue_kling_v2p6_pro_image_to use fal_client::requests::webhook::video::text::enqueue_kling_v2p6_pro_text_to_video_webhook::EnqueueKlingV2p6ProTextToVideoDurationSeconds; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::fal::kling_2_6_pro::request::{ +use crate::generate::generate_video::providers::fal::kling_2_6_pro::request::{ FalKling2p6ProMode, FalKling2p6ProRequestState, }; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_6_pro/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_6_pro/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_6_pro/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_6_pro/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_6_pro/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_6_pro/request.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_2_6_pro/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_2_6_pro/request.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_3p0_pro/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_3p0_pro/build.rs similarity index 94% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_3p0_pro/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_3p0_pro/build.rs index 3ecc1cb71c..03a21763be 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_3p0_pro/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_3p0_pro/build.rs @@ -12,12 +12,12 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::fal::kling_1_6_pro::build::optional_url; -use crate::generate::generate_video_v2::providers::fal::kling_3p0_pro::request::{ +use crate::generate::generate_video::providers::fal::kling_1_6_pro::build::optional_url; +use crate::generate::generate_video::providers::fal::kling_3p0_pro::request::{ FalKling3p0ProMode, FalKling3p0ProRequestState, }; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; #[derive(Debug, Clone, Copy)] pub(crate) enum PlanAspectRatio { @@ -249,5 +249,5 @@ mod tests { assert!(build_fal_kling_3p0_pro(b).is_ok()); } - use crate::generate::generate_video_v2::providers::fal::kling_3p0_pro::request::FalKling3p0ProMode; + use crate::generate::generate_video::providers::fal::kling_3p0_pro::request::FalKling3p0ProMode; } diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_3p0_pro/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_3p0_pro/cost.rs similarity index 98% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_3p0_pro/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_3p0_pro/cost.rs index 96b79ebaa6..8e3725658f 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_3p0_pro/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_3p0_pro/cost.rs @@ -2,7 +2,7 @@ use fal_client::requests::webhook::video::image::enqueue_kling_3p0_pro_image_to_ use fal_client::requests::webhook::video::text::enqueue_kling_3p0_pro_text_to_video_webhook::EnqueueKling3p0ProTextToVideoDuration; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::fal::kling_3p0_pro::request::{ +use crate::generate::generate_video::providers::fal::kling_3p0_pro::request::{ FalKling3p0ProMode, FalKling3p0ProRequestState, }; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_3p0_pro/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_3p0_pro/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_3p0_pro/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_3p0_pro/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_3p0_pro/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_3p0_pro/request.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_3p0_pro/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_3p0_pro/request.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_3p0_standard/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_3p0_standard/build.rs similarity index 92% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_3p0_standard/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_3p0_standard/build.rs index 13434f2ffe..ee6e5691ec 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_3p0_standard/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_3p0_standard/build.rs @@ -10,15 +10,15 @@ use fal_client::requests::webhook::video::text::enqueue_kling_3p0_standard_text_ use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::fal::kling_1_6_pro::build::optional_url; -use crate::generate::generate_video_v2::providers::fal::kling_3p0_pro::build::{ +use crate::generate::generate_video::providers::fal::kling_1_6_pro::build::optional_url; +use crate::generate::generate_video::providers::fal::kling_3p0_pro::build::{ plan_aspect_ratio, plan_duration, PlanAspectRatio, PlanDuration, }; -use crate::generate::generate_video_v2::providers::fal::kling_3p0_standard::request::{ +use crate::generate::generate_video::providers::fal::kling_3p0_standard::request::{ FalKling3p0StandardMode, FalKling3p0StandardRequestState, }; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_fal_kling_3p0_standard( builder: GenerateVideoRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_3p0_standard/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_3p0_standard/cost.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_3p0_standard/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_3p0_standard/cost.rs index 6f8a23f628..198d6d32df 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_3p0_standard/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_3p0_standard/cost.rs @@ -2,7 +2,7 @@ use fal_client::requests::webhook::video::image::enqueue_kling_3p0_standard_imag use fal_client::requests::webhook::video::text::enqueue_kling_3p0_standard_text_to_video_webhook::EnqueueKling3p0StandardTextToVideoDuration; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::fal::kling_3p0_standard::request::{ +use crate::generate::generate_video::providers::fal::kling_3p0_standard::request::{ FalKling3p0StandardMode, FalKling3p0StandardRequestState, }; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_3p0_standard/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_3p0_standard/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_3p0_standard/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_3p0_standard/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_3p0_standard/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_3p0_standard/request.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/kling_3p0_standard/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/kling_3p0_standard/request.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/seedance_1p0_lite/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/seedance_1p0_lite/build.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/seedance_1p0_lite/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/seedance_1p0_lite/build.rs index fd610c53ed..31a03c2e9f 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/seedance_1p0_lite/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/seedance_1p0_lite/build.rs @@ -9,9 +9,9 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::fal::seedance_1p0_lite::request::FalSeedance10LiteRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::fal::seedance_1p0_lite::request::FalSeedance10LiteRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_fal_seedance_1p0_lite( mut builder: GenerateVideoRequestBuilder, @@ -160,7 +160,7 @@ mod tests { use crate::api::router_video_model::RouterVideoModel; use crate::api::router_provider::RouterProvider; - use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; + use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; use super::*; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/seedance_1p0_lite/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/seedance_1p0_lite/cost.rs similarity index 98% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/seedance_1p0_lite/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/seedance_1p0_lite/cost.rs index 7fbde09074..7461254305 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/seedance_1p0_lite/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/seedance_1p0_lite/cost.rs @@ -1,7 +1,7 @@ use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::fal::seedance_1p0_lite::request::FalSeedance10LiteRequestState; +use crate::generate::generate_video::providers::fal::seedance_1p0_lite::request::FalSeedance10LiteRequestState; pub struct FalSeedance10LiteCostState { request: FalSeedance10LiteRequestState, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/seedance_1p0_lite/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/seedance_1p0_lite/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/seedance_1p0_lite/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/seedance_1p0_lite/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/seedance_1p0_lite/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/seedance_1p0_lite/request.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/seedance_1p0_lite/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/seedance_1p0_lite/request.rs index 19f8791ffd..ec24f77206 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/seedance_1p0_lite/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/seedance_1p0_lite/request.rs @@ -53,7 +53,7 @@ mod tests { use crate::api::router_provider::RouterProvider; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; use crate::test_helpers::get_fal_client; // ── Live integration tests (require Fal credentials, incur costs) ── diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/seedance_1p5_pro/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/seedance_1p5_pro/build.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/seedance_1p5_pro/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/seedance_1p5_pro/build.rs index de59475387..1f86ee6a7f 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/seedance_1p5_pro/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/seedance_1p5_pro/build.rs @@ -14,11 +14,11 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::fal::seedance_1p5_pro::request::{ +use crate::generate::generate_video::providers::fal::seedance_1p5_pro::request::{ FalSeedance1p5ProMode, FalSeedance1p5ProRequestState, }; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; // Resolution / duration / aspect-ratio variants used for planning. Mirrors the // v1 plan types, but lives entirely inside this module so the v2 dir is self-contained. @@ -291,7 +291,7 @@ mod tests { use crate::api::router_video_model::RouterVideoModel; use crate::api::router_provider::RouterProvider; - use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; + use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; use super::*; @@ -330,7 +330,7 @@ mod tests { } fn unwrap_t2v(result: Result) -> EnqueueSeedance1p5ProTextToVideoRequest { - use crate::generate::generate_video_v2::providers::fal::seedance_1p5_pro::request::FalSeedance1p5ProMode; + use crate::generate::generate_video::providers::fal::seedance_1p5_pro::request::FalSeedance1p5ProMode; match result.expect("build should succeed") { VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::FalSeedance1p5Pro(state)) => match state.mode { FalSeedance1p5ProMode::TextToVideo(req) => req, @@ -341,7 +341,7 @@ mod tests { } fn unwrap_i2v(result: Result) -> EnqueueSeedance1p5ProImageToVideoRequest { - use crate::generate::generate_video_v2::providers::fal::seedance_1p5_pro::request::FalSeedance1p5ProMode; + use crate::generate::generate_video::providers::fal::seedance_1p5_pro::request::FalSeedance1p5ProMode; match result.expect("build should succeed") { VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::FalSeedance1p5Pro(state)) => match state.mode { FalSeedance1p5ProMode::ImageToVideo(req) => req, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/seedance_1p5_pro/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/seedance_1p5_pro/cost.rs similarity index 99% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/seedance_1p5_pro/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/seedance_1p5_pro/cost.rs index 64809be2a4..21fe7f7424 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/seedance_1p5_pro/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/seedance_1p5_pro/cost.rs @@ -8,7 +8,7 @@ use fal_client::requests::webhook::video::image::enqueue_seedance_1p5_pro_image_ }; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::fal::seedance_1p5_pro::request::{ +use crate::generate::generate_video::providers::fal::seedance_1p5_pro::request::{ FalSeedance1p5ProMode, FalSeedance1p5ProRequestState, }; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/seedance_1p5_pro/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/seedance_1p5_pro/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/seedance_1p5_pro/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/seedance_1p5_pro/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/seedance_1p5_pro/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/seedance_1p5_pro/request.rs similarity index 98% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/seedance_1p5_pro/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/seedance_1p5_pro/request.rs index 4716d9e99c..b4d08467f2 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/seedance_1p5_pro/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/seedance_1p5_pro/request.rs @@ -76,7 +76,7 @@ mod tests { use crate::api::router_provider::RouterProvider; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; use crate::test_helpers::get_fal_client; // ── Live integration tests (require Fal credentials, incur costs) ── diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/sora_2/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/sora_2/build.rs similarity index 93% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/sora_2/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/sora_2/build.rs index 8c8c42ce57..2a2f0a15d3 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/sora_2/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/sora_2/build.rs @@ -4,12 +4,12 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::fal::kling_1_6_pro::build::optional_url; -use crate::generate::generate_video_v2::providers::fal::sora_2::request::{ +use crate::generate::generate_video::providers::fal::kling_1_6_pro::build::optional_url; +use crate::generate::generate_video::providers::fal::sora_2::request::{ FalSora2AspectRatio, FalSora2Duration, FalSora2Mode, FalSora2RequestState, FalSora2Resolution, }; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_fal_sora_2( builder: GenerateVideoRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/sora_2/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/sora_2/cost.rs similarity index 96% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/sora_2/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/sora_2/cost.rs index 3b704d40f3..4a30ee82ee 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/sora_2/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/sora_2/cost.rs @@ -1,5 +1,5 @@ use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::fal::sora_2::request::{ +use crate::generate::generate_video::providers::fal::sora_2::request::{ FalSora2Duration, FalSora2RequestState, }; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/sora_2/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/sora_2/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/sora_2/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/sora_2/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/sora_2/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/sora_2/request.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/sora_2/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/sora_2/request.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/sora_2_pro/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/sora_2_pro/build.rs similarity index 93% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/sora_2_pro/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/sora_2_pro/build.rs index a1f03bf942..50fe89ec4e 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/sora_2_pro/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/sora_2_pro/build.rs @@ -4,13 +4,13 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::fal::kling_1_6_pro::build::optional_url; -use crate::generate::generate_video_v2::providers::fal::sora_2_pro::request::{ +use crate::generate::generate_video::providers::fal::kling_1_6_pro::build::optional_url; +use crate::generate::generate_video::providers::fal::sora_2_pro::request::{ FalSora2ProAspectRatio, FalSora2ProDuration, FalSora2ProMode, FalSora2ProRequestState, FalSora2ProResolution, }; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_fal_sora_2_pro( builder: GenerateVideoRequestBuilder, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/sora_2_pro/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/sora_2_pro/cost.rs similarity index 98% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/sora_2_pro/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/sora_2_pro/cost.rs index 4eb2a8fb28..293050895a 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/sora_2_pro/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/sora_2_pro/cost.rs @@ -1,5 +1,5 @@ use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::fal::sora_2_pro::request::{ +use crate::generate::generate_video::providers::fal::sora_2_pro::request::{ FalSora2ProDuration, FalSora2ProMode, FalSora2ProRequestState, FalSora2ProResolution, }; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/sora_2_pro/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/sora_2_pro/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/sora_2_pro/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/sora_2_pro/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/sora_2_pro/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/sora_2_pro/request.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/sora_2_pro/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/sora_2_pro/request.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_2/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_2/build.rs similarity index 96% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_2/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_2/build.rs index 8030e0cba6..388b97d015 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_2/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_2/build.rs @@ -9,9 +9,9 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::fal::veo_2::request::{FalVeo2Mode, FalVeo2RequestState}; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::fal::veo_2::request::{FalVeo2Mode, FalVeo2RequestState}; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_fal_veo_2( builder: GenerateVideoRequestBuilder, @@ -108,7 +108,7 @@ mod tests { use crate::api::router_video_model::RouterVideoModel; use crate::api::router_provider::RouterProvider; - use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; + use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; use super::*; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_2/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_2/cost.rs similarity index 96% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_2/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_2/cost.rs index 40afd35574..27320589a1 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_2/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_2/cost.rs @@ -1,7 +1,7 @@ use fal_client::requests::webhook::video::image::enqueue_veo_2_image_to_video_webhook::Veo2Duration; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::fal::veo_2::request::{FalVeo2Mode, FalVeo2RequestState}; +use crate::generate::generate_video::providers::fal::veo_2::request::{FalVeo2Mode, FalVeo2RequestState}; #[derive(Clone, Debug)] pub struct FalVeo2CostState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_2/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_2/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_2/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_2/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_2/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_2/request.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_2/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_2/request.rs index cac39d8c6d..753eda16cf 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_2/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_2/request.rs @@ -73,7 +73,7 @@ mod tests { use crate::api::router_provider::RouterProvider; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; use crate::test_helpers::get_fal_client; #[tokio::test] diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3/build.rs similarity index 96% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3/build.rs index 873a28e681..81b7c04769 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3/build.rs @@ -12,9 +12,9 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::fal::veo_3::request::{FalVeo3Mode, FalVeo3RequestState}; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::fal::veo_3::request::{FalVeo3Mode, FalVeo3RequestState}; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; /// Router-level resolution shared between both modes — kept here so the cost /// calculator can reconstruct it from either mode's request. @@ -207,7 +207,7 @@ fn to_i2v_resolution(r: PlanResolution) -> Veo3I2vResolution { mod tests { use crate::api::router_video_model::RouterVideoModel; use crate::api::router_provider::RouterProvider; - use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; + use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; use super::*; @@ -247,7 +247,7 @@ mod tests { } } - use crate::generate::generate_video_v2::providers::fal::veo_3::request::{FalVeo3Mode, FalVeo3RequestState}; + use crate::generate::generate_video::providers::fal::veo_3::request::{FalVeo3Mode, FalVeo3RequestState}; mod mode_selection { use super::*; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3/cost.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3/cost.rs index c7a30e8201..98bdf1a138 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3/cost.rs @@ -2,7 +2,7 @@ use fal_client::requests::webhook::video::image::enqueue_veo_3_image_to_video_we use fal_client::requests::webhook::video::text::enqueue_veo_3_text_to_video_webhook::Veo3T2vDuration; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::fal::veo_3::request::{FalVeo3Mode, FalVeo3RequestState}; +use crate::generate::generate_video::providers::fal::veo_3::request::{FalVeo3Mode, FalVeo3RequestState}; #[derive(Clone, Debug)] pub struct FalVeo3CostState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3/request.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3/request.rs index d6ac287f11..bf510bde50 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3/request.rs @@ -73,7 +73,7 @@ mod tests { use crate::api::router_provider::RouterProvider; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; use crate::test_helpers::get_fal_client; #[tokio::test] diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3_fast/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3_fast/build.rs similarity index 94% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3_fast/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3_fast/build.rs index 5bc02b1868..396597e55a 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3_fast/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3_fast/build.rs @@ -9,9 +9,9 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::fal::veo_3_fast::request::FalVeo3FastRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::fal::veo_3_fast::request::FalVeo3FastRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_fal_veo_3_fast( builder: GenerateVideoRequestBuilder, @@ -125,7 +125,7 @@ fn unsupported(field: &'static str, value: &str) -> ArtcraftRouterError { mod tests { use crate::api::router_video_model::RouterVideoModel; use crate::api::router_provider::RouterProvider; - use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; + use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; use super::*; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3_fast/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3_fast/cost.rs similarity index 96% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3_fast/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3_fast/cost.rs index a764450311..947a0fd6f8 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3_fast/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3_fast/cost.rs @@ -1,7 +1,7 @@ use fal_client::requests::webhook::video::image::enqueue_veo_3_fast_image_to_video_webhook::Veo3FastDuration; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::fal::veo_3_fast::request::FalVeo3FastRequestState; +use crate::generate::generate_video::providers::fal::veo_3_fast::request::FalVeo3FastRequestState; #[derive(Clone, Debug)] pub struct FalVeo3FastCostState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3_fast/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3_fast/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3_fast/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3_fast/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3_fast/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3_fast/request.rs similarity index 96% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3_fast/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3_fast/request.rs index 4e7d4a7785..92ffa40bd4 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3_fast/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3_fast/request.rs @@ -52,7 +52,7 @@ mod tests { use crate::api::router_provider::RouterProvider; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; use crate::test_helpers::get_fal_client; #[tokio::test] diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3p1/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3p1/build.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3p1/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3p1/build.rs index 5d9d7a6260..3903c687b2 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3p1/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3p1/build.rs @@ -18,9 +18,9 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::fal::veo_3p1::request::{FalVeo3p1Mode, FalVeo3p1RequestState}; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::fal::veo_3p1::request::{FalVeo3p1Mode, FalVeo3p1RequestState}; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; #[derive(Debug, Clone, Copy)] pub(crate) enum PlanAspectRatio { @@ -262,7 +262,7 @@ fn to_flf_resolution(r: PlanResolution) -> EnqueueVeo3p1FirstLastFrameImageToVid mod tests { use crate::api::router_video_model::RouterVideoModel; use crate::api::router_provider::RouterProvider; - use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; + use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; use super::*; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3p1/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3p1/cost.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3p1/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3p1/cost.rs index ec4305ea20..511a9f1f14 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3p1/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3p1/cost.rs @@ -3,7 +3,7 @@ use fal_client::requests::webhook::video::image::enqueue_veo_3p1_image_to_video_ use fal_client::requests::webhook::video::text::enqueue_veo_3p1_text_to_video_webhook::EnqueueVeo3p1TextToVideoDurationSeconds; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::fal::veo_3p1::request::{FalVeo3p1Mode, FalVeo3p1RequestState}; +use crate::generate::generate_video::providers::fal::veo_3p1::request::{FalVeo3p1Mode, FalVeo3p1RequestState}; #[derive(Clone, Debug)] pub struct FalVeo3p1CostState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3p1/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3p1/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3p1/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3p1/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3p1/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3p1/request.rs similarity index 98% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3p1/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3p1/request.rs index e9f2d63a02..14844732be 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3p1/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3p1/request.rs @@ -87,7 +87,7 @@ mod tests { use crate::api::router_provider::RouterProvider; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; use crate::test_helpers::get_fal_client; #[tokio::test] diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3p1_fast/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3p1_fast/build.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3p1_fast/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3p1_fast/build.rs index 56739c0f99..ec673f9d6c 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3p1_fast/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3p1_fast/build.rs @@ -18,11 +18,11 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::fal::veo_3p1_fast::request::{ +use crate::generate::generate_video::providers::fal::veo_3p1_fast::request::{ FalVeo3p1FastMode, FalVeo3p1FastRequestState, }; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; #[derive(Debug, Clone, Copy)] pub(crate) enum PlanAspectRatio { @@ -255,7 +255,7 @@ fn to_flf_resolution(r: PlanResolution) -> EnqueueVeo3p1FastFirstLastFrameImageT mod tests { use crate::api::router_video_model::RouterVideoModel; use crate::api::router_provider::RouterProvider; - use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; + use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; use super::*; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3p1_fast/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3p1_fast/cost.rs similarity index 98% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3p1_fast/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3p1_fast/cost.rs index eab8218518..4e9ed4f9be 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3p1_fast/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3p1_fast/cost.rs @@ -3,7 +3,7 @@ use fal_client::requests::webhook::video::image::enqueue_veo_3p1_fast_image_to_v use fal_client::requests::webhook::video::text::enqueue_veo_3p1_fast_text_to_video_webhook::EnqueueVeo3p1FastTextToVideoDurationSeconds; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::fal::veo_3p1_fast::request::{ +use crate::generate::generate_video::providers::fal::veo_3p1_fast::request::{ FalVeo3p1FastMode, FalVeo3p1FastRequestState, }; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3p1_fast/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3p1_fast/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3p1_fast/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3p1_fast/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3p1_fast/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3p1_fast/request.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3p1_fast/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3p1_fast/request.rs index 3b7aa6edaa..daaa235adc 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/fal/veo_3p1_fast/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/veo_3p1_fast/request.rs @@ -89,7 +89,7 @@ mod tests { use crate::api::router_provider::RouterProvider; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; use crate::test_helpers::get_fal_client; #[tokio::test] diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/gmicloud/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/gmicloud/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_fast_g/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/gmicloud/seedance_2p0_fast_g/build.rs similarity index 95% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_fast_g/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/gmicloud/seedance_2p0_fast_g/build.rs index a91742145f..8afff771ba 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_fast_g/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/gmicloud/seedance_2p0_fast_g/build.rs @@ -12,9 +12,9 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_fast_g::request::GmiCloudSeedance2p0UltraFastRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::gmicloud::seedance_2p0_fast_g::request::GmiCloudSeedance2p0UltraFastRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_gmicloud_seedance_2p0_u_fast( mut builder: GenerateVideoRequestBuilder, @@ -151,8 +151,8 @@ mod tests { use crate::api::video_list_ref::VideoListRef; use crate::api::audio_list_ref::AudioListRef; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; - use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; use super::*; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_fast_g/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/gmicloud/seedance_2p0_fast_g/cost.rs similarity index 96% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_fast_g/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/gmicloud/seedance_2p0_fast_g/cost.rs index 79eb63cf6d..9562d37c44 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_fast_g/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/gmicloud/seedance_2p0_fast_g/cost.rs @@ -1,7 +1,7 @@ use gmicloud_client::traits::gmicloud_request_cost_calculator_trait::GmiCloudRequestCostCalculator; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_fast_g::request::GmiCloudSeedance2p0UltraFastRequestState; +use crate::generate::generate_video::providers::gmicloud::seedance_2p0_fast_g::request::GmiCloudSeedance2p0UltraFastRequestState; pub struct GmiCloudSeedance2p0UltraFastCostState { request: GmiCloudSeedance2p0UltraFastRequestState, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_fast_g/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/gmicloud/seedance_2p0_fast_g/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_fast_g/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/gmicloud/seedance_2p0_fast_g/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_fast_g/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/gmicloud/seedance_2p0_fast_g/request.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_fast_g/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/gmicloud/seedance_2p0_fast_g/request.rs index 2bdf55543b..557e95776f 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_fast_g/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/gmicloud/seedance_2p0_fast_g/request.rs @@ -35,7 +35,7 @@ mod tests { use crate::client::router_gmicloud_client::RouterGmiCloudClient; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; use gmicloud_client::creds::gmicloud_api_key::GmiCloudApiKey; use test_data::web::image_urls::JUNO_AT_LAKE_IMAGE_URL; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_g/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/gmicloud/seedance_2p0_g/build.rs similarity index 96% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_g/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/gmicloud/seedance_2p0_g/build.rs index 95f6e508cc..063e913e30 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_g/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/gmicloud/seedance_2p0_g/build.rs @@ -12,9 +12,9 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_g::request::GmiCloudSeedance2p0UltraRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::gmicloud::seedance_2p0_g::request::GmiCloudSeedance2p0UltraRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; pub fn build_gmicloud_seedance_2p0_u( mut builder: GenerateVideoRequestBuilder, @@ -150,8 +150,8 @@ mod tests { use crate::api::video_list_ref::VideoListRef; use crate::api::audio_list_ref::AudioListRef; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; - use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; use super::*; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_g/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/gmicloud/seedance_2p0_g/cost.rs similarity index 96% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_g/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/gmicloud/seedance_2p0_g/cost.rs index 768dfd51ca..d31e1c329f 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_g/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/gmicloud/seedance_2p0_g/cost.rs @@ -1,7 +1,7 @@ use gmicloud_client::traits::gmicloud_request_cost_calculator_trait::GmiCloudRequestCostCalculator; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_g::request::GmiCloudSeedance2p0UltraRequestState; +use crate::generate::generate_video::providers::gmicloud::seedance_2p0_g::request::GmiCloudSeedance2p0UltraRequestState; pub struct GmiCloudSeedance2p0UltraCostState { request: GmiCloudSeedance2p0UltraRequestState, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_g/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/gmicloud/seedance_2p0_g/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_g/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/gmicloud/seedance_2p0_g/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_g/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/gmicloud/seedance_2p0_g/request.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_g/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/gmicloud/seedance_2p0_g/request.rs index cce5a41dbc..f7224d7cb9 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_g/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/gmicloud/seedance_2p0_g/request.rs @@ -35,7 +35,7 @@ mod tests { use crate::client::router_gmicloud_client::RouterGmiCloudClient; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; use gmicloud_client::creds::gmicloud_api_key::GmiCloudApiKey; use test_data::web::image_urls::JUNO_AT_LAKE_IMAGE_URL; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/grok_api/grok_imagine_video/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/grok_api/grok_imagine_video/build.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/grok_api/grok_imagine_video/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/grok_api/grok_imagine_video/build.rs index af36b91080..c4d517c01f 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/grok_api/grok_imagine_video/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/grok_api/grok_imagine_video/build.rs @@ -16,9 +16,9 @@ use crate::api::video_list_ref::VideoListRef; use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::grok_api::grok_imagine_video::request::GrokApiGrokImagineVideoRequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::grok_api::grok_imagine_video::request::GrokApiGrokImagineVideoRequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; /// Builds a Grok Imagine Video request from the generic GenerateVideoRequestBuilder. /// @@ -234,8 +234,8 @@ mod tests { use crate::api::video_list_ref::VideoListRef; use crate::api::audio_list_ref::AudioListRef; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; - use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; // ── Field passthrough ── diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/grok_api/grok_imagine_video/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/grok_api/grok_imagine_video/cost.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/grok_api/grok_imagine_video/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/grok_api/grok_imagine_video/cost.rs index 2089acbf5f..79c9381988 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/grok_api/grok_imagine_video/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/grok_api/grok_imagine_video/cost.rs @@ -1,7 +1,7 @@ use grok_api_client::api::traits::grok_request_cost_calculator_trait::GrokRequestCostCalculator; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::grok_api::grok_imagine_video::request::GrokApiGrokImagineVideoRequestState; +use crate::generate::generate_video::providers::grok_api::grok_imagine_video::request::GrokApiGrokImagineVideoRequestState; pub struct GrokApiGrokImagineVideoCostState { request: GrokApiGrokImagineVideoRequestState, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/grok_api/grok_imagine_video/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/grok_api/grok_imagine_video/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/grok_api/grok_imagine_video/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/grok_api/grok_imagine_video/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/grok_api/grok_imagine_video/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/grok_api/grok_imagine_video/request.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/grok_api/grok_imagine_video/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/grok_api/grok_imagine_video/request.rs index 44ab7b8c85..7ed4d6c629 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/grok_api/grok_imagine_video/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/grok_api/grok_imagine_video/request.rs @@ -50,7 +50,7 @@ mod tests { use crate::client::router_grok_api_client::RouterGrokApiClient; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; #[tokio::test] #[ignore] // requires real API key, incurs costs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/grok_api/grok_imagine_video_1p5/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/grok_api/grok_imagine_video_1p5/build.rs similarity index 98% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/grok_api/grok_imagine_video_1p5/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/grok_api/grok_imagine_video_1p5/build.rs index ecce73b718..c0c3fffd8e 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/grok_api/grok_imagine_video_1p5/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/grok_api/grok_imagine_video_1p5/build.rs @@ -18,9 +18,9 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::grok_api::grok_imagine_video_1p5::request::GrokApiGrokImagineVideo1p5RequestState; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::grok_api::grok_imagine_video_1p5::request::GrokApiGrokImagineVideo1p5RequestState; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; /// Builds a Grok Imagine Video 1.5 preview request from the generic /// GenerateVideoRequestBuilder. Mirrors the v1 builder's capabilities and @@ -266,8 +266,8 @@ mod tests { use crate::api::video_list_ref::VideoListRef; use crate::api::audio_list_ref::AudioListRef; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; - use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; // ── Wire-shape: the built request always carries the 1.5 preview model id ── diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/grok_api/grok_imagine_video_1p5/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/grok_api/grok_imagine_video_1p5/cost.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/grok_api/grok_imagine_video_1p5/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/grok_api/grok_imagine_video_1p5/cost.rs index 009e171d1f..374e713a6f 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/grok_api/grok_imagine_video_1p5/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/grok_api/grok_imagine_video_1p5/cost.rs @@ -3,7 +3,7 @@ use grok_api_client::api::traits::grok_request_cost_calculator_trait::GrokReques use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::grok_api::grok_imagine_video_1p5::request::GrokApiGrokImagineVideo1p5RequestState; +use crate::generate::generate_video::providers::grok_api::grok_imagine_video_1p5::request::GrokApiGrokImagineVideo1p5RequestState; pub struct GrokApiGrokImagineVideo1p5CostState { request: GrokApiGrokImagineVideo1p5RequestState, @@ -293,8 +293,8 @@ mod tests { use super::*; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; - use crate::generate::generate_video_v2::providers::grok_api::grok_imagine_video_1p5::cost::GrokApiGrokImagineVideo1p5CostState; - use crate::generate::generate_video_v2::providers::grok_api::grok_imagine_video_1p5::request::GrokApiGrokImagineVideo1p5RequestState; + use crate::generate::generate_video::providers::grok_api::grok_imagine_video_1p5::cost::GrokApiGrokImagineVideo1p5CostState; + use crate::generate::generate_video::providers::grok_api::grok_imagine_video_1p5::request::GrokApiGrokImagineVideo1p5RequestState; use grok_api_client::api::requests::videos::video_generation::video_generation::VideoGenerationRequest as GrokVideoGenerationRequest; use grok_api_client::api::types::video_types::video_model::VideoModel as GrokVideoModel; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/grok_api/grok_imagine_video_1p5/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/grok_api/grok_imagine_video_1p5/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/grok_api/grok_imagine_video_1p5/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/grok_api/grok_imagine_video_1p5/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/grok_api/grok_imagine_video_1p5/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/grok_api/grok_imagine_video_1p5/request.rs similarity index 96% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/grok_api/grok_imagine_video_1p5/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/grok_api/grok_imagine_video_1p5/request.rs index d0a2e3fd2e..cdd822da17 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/grok_api/grok_imagine_video_1p5/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/grok_api/grok_imagine_video_1p5/request.rs @@ -63,7 +63,7 @@ mod tests { use crate::client::router_grok_api_client::RouterGrokApiClient; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; // ── Wire-shape sanity: the built request always carries the 1.5 model id ── @@ -141,7 +141,7 @@ mod tests { let result = builder.build2().expect("build2 should succeed"); match result { VideoGenerationDraftOrRequest::Request( - crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest::GrokApiGrokImagineVideo1p5(s) + crate::generate::generate_video::video_generation_request::VideoGenerationRequest::GrokApiGrokImagineVideo1p5(s) ) => s, _ => panic!("expected GrokApiGrokImagineVideo1p5 request"), } diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/grok_api/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/grok_api/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/grok_api/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/grok_api/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/happy_horse_1p0/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/happy_horse_1p0/build.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/happy_horse_1p0/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/happy_horse_1p0/build.rs index 11cee8ab02..75d1b0cb31 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/happy_horse_1p0/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/happy_horse_1p0/build.rs @@ -9,11 +9,11 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::kinovi::happy_horse_1p0::draft::{ +use crate::generate::generate_video::providers::kinovi::happy_horse_1p0::draft::{ KinoviHappyHorse1p0DraftState, KinoviHappyHorse1p0RemainingItems, }; -use crate::generate::generate_video_v2::video_generation_draft::VideoGenerationDraftRequest; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::video_generation_draft::VideoGenerationDraftRequest; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; pub fn build_kinovi_happy_horse_1p0(builder: GenerateVideoRequestBuilder) -> Result { let draft = do_build(builder)?; @@ -167,8 +167,8 @@ mod tests { use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; - use crate::generate::generate_video_v2::video_generation_draft::VideoGenerationDraftRequest; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_draft::VideoGenerationDraftRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; use super::*; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/happy_horse_1p0/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/happy_horse_1p0/cost.rs similarity index 96% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/happy_horse_1p0/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/happy_horse_1p0/cost.rs index 5ee3c7f2fb..e423c552b1 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/happy_horse_1p0/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/happy_horse_1p0/cost.rs @@ -4,8 +4,8 @@ use seedance2pro_client::generate::video::generate_happy_horse_1p0::{ }; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::kinovi::happy_horse_1p0::draft::KinoviHappyHorse1p0DraftState; -use crate::generate::generate_video_v2::providers::kinovi::happy_horse_1p0::request::KinoviHappyHorse1p0RequestState; +use crate::generate::generate_video::providers::kinovi::happy_horse_1p0::draft::KinoviHappyHorse1p0DraftState; +use crate::generate::generate_video::providers::kinovi::happy_horse_1p0::request::KinoviHappyHorse1p0RequestState; pub struct KinoviHappyHorse1p0CostState { pub resolution: Option, @@ -63,8 +63,8 @@ mod tests { use crate::api::router_resolution::RouterResolution; use crate::api::router_provider::RouterProvider; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; - use crate::generate::generate_video_v2::video_generation_draft::VideoGenerationDraftRequest; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_draft::VideoGenerationDraftRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; // ── 720p pricing (33 credits/sec) ── diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/happy_horse_1p0/draft.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/happy_horse_1p0/draft.rs similarity index 84% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/happy_horse_1p0/draft.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/happy_horse_1p0/draft.rs index aa5c6cd4df..db057d6881 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/happy_horse_1p0/draft.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/happy_horse_1p0/draft.rs @@ -5,9 +5,9 @@ use seedance2pro_client::generate::video::generate_happy_horse_1p0::{ use crate::api::image_ref::ImageRef; use crate::errors::artcraft_router_error::ArtcraftRouterError; -use crate::generate::generate_video_v2::providers::kinovi::resolve::resolve_and_upload_single; -use crate::generate::generate_video_v2::providers::kinovi::happy_horse_1p0::request::KinoviHappyHorse1p0RequestState; -use crate::generate::generate_video_v2::video_generation_draft_context::VideoGenerationDraftContext; +use crate::generate::generate_video::providers::kinovi::resolve::resolve_and_upload_single; +use crate::generate::generate_video::providers::kinovi::happy_horse_1p0::request::KinoviHappyHorse1p0RequestState; +use crate::generate::generate_video::video_generation_draft_context::VideoGenerationDraftContext; #[derive(Debug, Clone)] pub struct KinoviHappyHorse1p0DraftState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/happy_horse_1p0/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/happy_horse_1p0/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/happy_horse_1p0/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/happy_horse_1p0/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/happy_horse_1p0/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/happy_horse_1p0/request.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/happy_horse_1p0/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/happy_horse_1p0/request.rs index 186d5a25fe..4f5cfe4c5d 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/happy_horse_1p0/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/happy_horse_1p0/request.rs @@ -50,8 +50,8 @@ mod tests { use crate::client::router_seedance2pro_client::RouterSeedance2ProClient; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; - use crate::generate::generate_video_v2::video_generation_draft_context::VideoGenerationDraftContext; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_draft_context::VideoGenerationDraftContext; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; use seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession; use test_data::web::image_urls::JUNO_AT_LAKE_IMAGE_URL; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/resolve.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/resolve.rs similarity index 95% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/resolve.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/resolve.rs index 84aea6eb1f..43787d6bf6 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/resolve.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/resolve.rs @@ -10,8 +10,8 @@ use crate::api::image_ref::ImageRef; use crate::api::video_list_ref::VideoListRef; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; -use crate::generate::generate_video_v2::providers::kinovi::upload::upload_to_seedance2pro; -use crate::generate::generate_video_v2::video_generation_draft_context::VideoGenerationDraftContext; +use crate::generate::generate_video::providers::kinovi::upload::upload_to_seedance2pro; +use crate::generate::generate_video::video_generation_draft_context::VideoGenerationDraftContext; /// Either resolved URLs or unresolved media file tokens. pub(crate) enum UrlsOrTokens { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0/build.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0/build.rs index ebbe7556b8..07e1fa3882 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0/build.rs @@ -10,9 +10,9 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0::draft::{KinoviSeedance2p0DraftState, KinoviSeedance2p0RemainingItems}; -use crate::generate::generate_video_v2::video_generation_draft::VideoGenerationDraftRequest; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::providers::kinovi::seedance_2p0::draft::{KinoviSeedance2p0DraftState, KinoviSeedance2p0RemainingItems}; +use crate::generate::generate_video::video_generation_draft::VideoGenerationDraftRequest; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; pub fn build_kinovi_seedance_2p0(builder: GenerateVideoRequestBuilder) -> Result { let draft = do_build_kinovi_seedance_2p0(builder)?; @@ -215,8 +215,8 @@ mod tests { use crate::api::video_list_ref::VideoListRef; use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; - use crate::generate::generate_video_v2::video_generation_draft::VideoGenerationDraftRequest; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_draft::VideoGenerationDraftRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; use super::*; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0/cost.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0/cost.rs index 99647b045d..0b0c4f5781 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0/cost.rs @@ -4,8 +4,8 @@ use seedance2pro_client::generate::video::generate_seedance_2p0::{ }; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0::draft::KinoviSeedance2p0DraftState; -use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0::request::KinoviSeedance2p0RequestState; +use crate::generate::generate_video::providers::kinovi::seedance_2p0::draft::KinoviSeedance2p0DraftState; +use crate::generate::generate_video::providers::kinovi::seedance_2p0::request::KinoviSeedance2p0RequestState; pub struct KinoviSeedance2p0CostState { pub resolution: Option, @@ -85,8 +85,8 @@ mod tests { use crate::api::router_provider::RouterProvider; use crate::api::video_list_ref::VideoListRef; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; - use crate::generate::generate_video_v2::video_generation_draft::VideoGenerationDraftRequest; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_draft::VideoGenerationDraftRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; // ── 720p pricing ── diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0/draft.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0/draft.rs similarity index 92% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0/draft.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0/draft.rs index 8b4e62d544..987dcc7a8c 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0/draft.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0/draft.rs @@ -9,13 +9,13 @@ use crate::api::image_list_ref::ImageListRef; use crate::api::image_ref::ImageRef; use crate::api::video_list_ref::VideoListRef; use crate::errors::artcraft_router_error::ArtcraftRouterError; -use crate::generate::generate_video_v2::providers::kinovi::resolve::{ +use crate::generate::generate_video::providers::kinovi::resolve::{ audio_list_ref_into_urls_or_tokens, image_list_ref_into_urls_or_tokens, resolve_and_upload_list, resolve_and_upload_single, resolve_character_tokens, video_list_ref_into_urls_or_tokens, }; -use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0::request::KinoviSeedance2p0RequestState; -use crate::generate::generate_video_v2::video_generation_draft_context::VideoGenerationDraftContext; +use crate::generate::generate_video::providers::kinovi::seedance_2p0::request::KinoviSeedance2p0RequestState; +use crate::generate::generate_video::video_generation_draft_context::VideoGenerationDraftContext; #[derive(Debug, Clone)] pub struct KinoviSeedance2p0DraftState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0/request.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0/request.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0_fast/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0_fast/build.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0_fast/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0_fast/build.rs index 21876eb27d..cc23e6c4af 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0_fast/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0_fast/build.rs @@ -10,9 +10,9 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0_fast::draft::{KinoviSeedance2p0FastDraftState, KinoviSeedance2p0FastRemainingItems}; -use crate::generate::generate_video_v2::video_generation_draft::VideoGenerationDraftRequest; -use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use crate::generate::generate_video::providers::kinovi::seedance_2p0_fast::draft::{KinoviSeedance2p0FastDraftState, KinoviSeedance2p0FastRemainingItems}; +use crate::generate::generate_video::video_generation_draft::VideoGenerationDraftRequest; +use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; pub fn build_kinovi_seedance_2p0_fast(builder: GenerateVideoRequestBuilder) -> Result { let draft = do_build_kinovi_seedance_2p0_fast(builder)?; @@ -231,9 +231,9 @@ mod tests { use crate::api::video_list_ref::VideoListRef; use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; - use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0_fast::draft::KinoviSeedance2p0FastDraftState; - use crate::generate::generate_video_v2::video_generation_draft::VideoGenerationDraftRequest; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::providers::kinovi::seedance_2p0_fast::draft::KinoviSeedance2p0FastDraftState; + use crate::generate::generate_video::video_generation_draft::VideoGenerationDraftRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; use super::*; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0_fast/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0_fast/cost.rs similarity index 97% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0_fast/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0_fast/cost.rs index eca02bdf32..4d353e924a 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0_fast/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0_fast/cost.rs @@ -4,8 +4,8 @@ use seedance2pro_client::generate::video::generate_seedance_2p0_fast::{ }; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0_fast::draft::KinoviSeedance2p0FastDraftState; -use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0_fast::request::KinoviSeedance2p0FastRequestState; +use crate::generate::generate_video::providers::kinovi::seedance_2p0_fast::draft::KinoviSeedance2p0FastDraftState; +use crate::generate::generate_video::providers::kinovi::seedance_2p0_fast::request::KinoviSeedance2p0FastRequestState; pub struct KinoviSeedance2p0FastCostState { pub resolution: Option, @@ -86,8 +86,8 @@ mod tests { use crate::api::router_provider::RouterProvider; use crate::api::video_list_ref::VideoListRef; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; - use crate::generate::generate_video_v2::video_generation_draft::VideoGenerationDraftRequest; - use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; + use crate::generate::generate_video::video_generation_draft::VideoGenerationDraftRequest; + use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; // ── Direct estimate_cost() tests ── // These must match the reference implementation values exactly. diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0_fast/draft.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0_fast/draft.rs similarity index 92% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0_fast/draft.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0_fast/draft.rs index 878649eb38..00520b8e8d 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0_fast/draft.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0_fast/draft.rs @@ -9,13 +9,13 @@ use crate::api::image_list_ref::ImageListRef; use crate::api::image_ref::ImageRef; use crate::api::video_list_ref::VideoListRef; use crate::errors::artcraft_router_error::ArtcraftRouterError; -use crate::generate::generate_video_v2::providers::kinovi::resolve::{ +use crate::generate::generate_video::providers::kinovi::resolve::{ audio_list_ref_into_urls_or_tokens, image_list_ref_into_urls_or_tokens, resolve_and_upload_list, resolve_and_upload_single, resolve_character_tokens, video_list_ref_into_urls_or_tokens, }; -use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0_fast::request::KinoviSeedance2p0FastRequestState; -use crate::generate::generate_video_v2::video_generation_draft_context::VideoGenerationDraftContext; +use crate::generate::generate_video::providers::kinovi::seedance_2p0_fast::request::KinoviSeedance2p0FastRequestState; +use crate::generate::generate_video::video_generation_draft_context::VideoGenerationDraftContext; #[derive(Debug, Clone)] pub struct KinoviSeedance2p0FastDraftState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0_fast/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0_fast/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0_fast/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0_fast/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0_fast/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0_fast/request.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0_fast/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0_fast/request.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/upload.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/upload.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/upload.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/upload.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/video_generation_draft.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/video_generation_draft.rs similarity index 72% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/video_generation_draft.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/video_generation_draft.rs index e5787bd2c3..a557dfd4d2 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/video_generation_draft.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/video_generation_draft.rs @@ -1,14 +1,14 @@ use crate::api::router_provider::RouterProvider; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::kinovi::happy_horse_1p0::cost::KinoviHappyHorse1p0CostState; -use crate::generate::generate_video_v2::providers::kinovi::happy_horse_1p0::draft::KinoviHappyHorse1p0DraftState; -use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0::cost::KinoviSeedance2p0CostState; -use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0::draft::KinoviSeedance2p0DraftState; -use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0_fast::cost::KinoviSeedance2p0FastCostState; -use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0_fast::draft::KinoviSeedance2p0FastDraftState; -use crate::generate::generate_video_v2::video_generation_draft_context::VideoGenerationDraftContext; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::providers::kinovi::happy_horse_1p0::cost::KinoviHappyHorse1p0CostState; +use crate::generate::generate_video::providers::kinovi::happy_horse_1p0::draft::KinoviHappyHorse1p0DraftState; +use crate::generate::generate_video::providers::kinovi::seedance_2p0::cost::KinoviSeedance2p0CostState; +use crate::generate::generate_video::providers::kinovi::seedance_2p0::draft::KinoviSeedance2p0DraftState; +use crate::generate::generate_video::providers::kinovi::seedance_2p0_fast::cost::KinoviSeedance2p0FastCostState; +use crate::generate::generate_video::providers::kinovi::seedance_2p0_fast::draft::KinoviSeedance2p0FastDraftState; +use crate::generate::generate_video::video_generation_draft_context::VideoGenerationDraftContext; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; /** * Wrapper for all video generation draft requests. diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/video_generation_draft_context.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/video_generation_draft_context.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/video_generation_draft_context.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/video_generation_draft_context.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/video_generation_draft_or_request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/video_generation_draft_or_request.rs similarity index 82% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/video_generation_draft_or_request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/video_generation_draft_or_request.rs index 2b77f5b0d3..5906f5ccf3 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/video_generation_draft_or_request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/video_generation_draft_or_request.rs @@ -1,8 +1,8 @@ use crate::api::router_provider::RouterProvider; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::video_generation_draft::VideoGenerationDraftRequest; -use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; +use crate::generate::generate_video::video_generation_draft::VideoGenerationDraftRequest; +use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; #[derive(Debug, Clone)] pub enum VideoGenerationDraftOrRequest { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/video_generation_request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/video_generation_request.rs similarity index 65% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/video_generation_request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/video_generation_request.rs index e145ff73e7..fe0f18df67 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/video_generation_request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/video_generation_request.rs @@ -3,110 +3,110 @@ use crate::client::router_client::RouterClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_response::GenerateVideoResponse; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::grok_imagine_video::cost::ArtcraftGrokImagineVideoCostState; -use crate::generate::generate_video_v2::providers::artcraft::grok_imagine_video::request::ArtcraftGrokImagineVideoRequestState; -use crate::generate::generate_video_v2::providers::artcraft::grok_imagine_video_1p5::cost::ArtcraftGrokImagineVideo1p5CostState; -use crate::generate::generate_video_v2::providers::artcraft::grok_imagine_video_1p5::request::ArtcraftGrokImagineVideo1p5RequestState; -use crate::generate::generate_video_v2::providers::artcraft::happy_horse_1p0::cost::ArtcraftHappyHorse1p0CostState; -use crate::generate::generate_video_v2::providers::artcraft::happy_horse_1p0::request::ArtcraftHappyHorse1p0RequestState; -use crate::generate::generate_video_v2::providers::artcraft::kling_1_6_pro::cost::ArtcraftKling16ProCostState; -use crate::generate::generate_video_v2::providers::artcraft::kling_1_6_pro::request::ArtcraftKling16ProRequestState; -use crate::generate::generate_video_v2::providers::artcraft::kling_2_1_master::cost::ArtcraftKling21MasterCostState; -use crate::generate::generate_video_v2::providers::artcraft::kling_2_1_master::request::ArtcraftKling21MasterRequestState; -use crate::generate::generate_video_v2::providers::artcraft::kling_2_1_pro::cost::ArtcraftKling21ProCostState; -use crate::generate::generate_video_v2::providers::artcraft::kling_2_1_pro::request::ArtcraftKling21ProRequestState; -use crate::generate::generate_video_v2::providers::artcraft::kling_2_5_turbo_pro::cost::ArtcraftKling2p5TurboProCostState; -use crate::generate::generate_video_v2::providers::artcraft::kling_2_5_turbo_pro::request::ArtcraftKling2p5TurboProRequestState; -use crate::generate::generate_video_v2::providers::artcraft::kling_2_6_pro::cost::ArtcraftKling2p6ProCostState; -use crate::generate::generate_video_v2::providers::artcraft::kling_2_6_pro::request::ArtcraftKling2p6ProRequestState; -use crate::generate::generate_video_v2::providers::artcraft::kling_3p0_pro::cost::ArtcraftKling3p0ProCostState; -use crate::generate::generate_video_v2::providers::artcraft::kling_3p0_pro::request::ArtcraftKling3p0ProRequestState; -use crate::generate::generate_video_v2::providers::artcraft::kling_3p0_standard::cost::ArtcraftKling3p0StandardCostState; -use crate::generate::generate_video_v2::providers::artcraft::kling_3p0_standard::request::ArtcraftKling3p0StandardRequestState; -use crate::generate::generate_video_v2::providers::artcraft::preview_model::cost::ArtcraftPreviewModelCostState; -use crate::generate::generate_video_v2::providers::artcraft::preview_model::request::ArtcraftPreviewModelRequestState; -use crate::generate::generate_video_v2::providers::artcraft::preview_model_fast::cost::ArtcraftPreviewModelFastCostState; -use crate::generate::generate_video_v2::providers::artcraft::preview_model_fast::request::ArtcraftPreviewModelFastRequestState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_1p0_lite::cost::ArtcraftSeedance10LiteCostState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_1p0_lite::request::ArtcraftSeedance10LiteRequestState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_1p5_pro::cost::ArtcraftSeedance1p5ProCostState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_1p5_pro::request::ArtcraftSeedance1p5ProRequestState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0::cost::ArtcraftSeedance2p0CostState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0::request::ArtcraftSeedance2p0RequestState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_fast::cost::ArtcraftSeedance2p0FastCostState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_fast::request::ArtcraftSeedance2p0FastRequestState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_u::cost::ArtcraftSeedance2p0UltraCostState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_u::request::ArtcraftSeedance2p0UltraRequestState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_u_fast::cost::ArtcraftSeedance2p0UltraFastCostState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_u_fast::request::ArtcraftSeedance2p0UltraFastRequestState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bp::cost::ArtcraftSeedance2p0BytePlusCostState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bp::request::ArtcraftSeedance2p0BytePlusRequestState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bp_fast::cost::ArtcraftSeedance2p0BytePlusFastCostState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bp_fast::request::ArtcraftSeedance2p0BytePlusFastRequestState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bpu::cost::ArtcraftSeedance2p0BytePlusUltraCostState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bpu::request::ArtcraftSeedance2p0BytePlusUltraRequestState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bpu_fast::cost::ArtcraftSeedance2p0BytePlusUltraFastCostState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bpu_fast::request::ArtcraftSeedance2p0BytePlusUltraFastRequestState; -use crate::generate::generate_video_v2::providers::artcraft::sora_2::cost::ArtcraftSora2CostState; -use crate::generate::generate_video_v2::providers::artcraft::sora_2::request::ArtcraftSora2RequestState; -use crate::generate::generate_video_v2::providers::artcraft::sora_2_pro::cost::ArtcraftSora2ProCostState; -use crate::generate::generate_video_v2::providers::artcraft::sora_2_pro::request::ArtcraftSora2ProRequestState; -use crate::generate::generate_video_v2::providers::artcraft::veo_2::cost::ArtcraftVeo2CostState; -use crate::generate::generate_video_v2::providers::artcraft::veo_2::request::ArtcraftVeo2RequestState; -use crate::generate::generate_video_v2::providers::artcraft::veo_3::cost::ArtcraftVeo3CostState; -use crate::generate::generate_video_v2::providers::artcraft::veo_3::request::ArtcraftVeo3RequestState; -use crate::generate::generate_video_v2::providers::artcraft::veo_3_fast::cost::ArtcraftVeo3FastCostState; -use crate::generate::generate_video_v2::providers::artcraft::veo_3_fast::request::ArtcraftVeo3FastRequestState; -use crate::generate::generate_video_v2::providers::artcraft::veo_3p1::cost::ArtcraftVeo3p1CostState; -use crate::generate::generate_video_v2::providers::artcraft::veo_3p1::request::ArtcraftVeo3p1RequestState; -use crate::generate::generate_video_v2::providers::artcraft::veo_3p1_fast::cost::ArtcraftVeo3p1FastCostState; -use crate::generate::generate_video_v2::providers::artcraft::veo_3p1_fast::request::ArtcraftVeo3p1FastRequestState; -use crate::generate::generate_video_v2::providers::fal::kling_1_6_pro::cost::FalKling16ProCostState; -use crate::generate::generate_video_v2::providers::fal::kling_1_6_pro::request::FalKling16ProRequestState; -use crate::generate::generate_video_v2::providers::fal::kling_2_1_master::cost::FalKling21MasterCostState; -use crate::generate::generate_video_v2::providers::fal::kling_2_1_master::request::FalKling21MasterRequestState; -use crate::generate::generate_video_v2::providers::fal::kling_2_1_pro::cost::FalKling21ProCostState; -use crate::generate::generate_video_v2::providers::fal::kling_2_1_pro::request::FalKling21ProRequestState; -use crate::generate::generate_video_v2::providers::fal::kling_2_5_turbo_pro::cost::FalKling2p5TurboProCostState; -use crate::generate::generate_video_v2::providers::fal::kling_2_5_turbo_pro::request::FalKling2p5TurboProRequestState; -use crate::generate::generate_video_v2::providers::fal::kling_2_6_pro::cost::FalKling2p6ProCostState; -use crate::generate::generate_video_v2::providers::fal::kling_2_6_pro::request::FalKling2p6ProRequestState; -use crate::generate::generate_video_v2::providers::fal::kling_3p0_pro::cost::FalKling3p0ProCostState; -use crate::generate::generate_video_v2::providers::fal::kling_3p0_pro::request::FalKling3p0ProRequestState; -use crate::generate::generate_video_v2::providers::fal::kling_3p0_standard::cost::FalKling3p0StandardCostState; -use crate::generate::generate_video_v2::providers::fal::kling_3p0_standard::request::FalKling3p0StandardRequestState; -use crate::generate::generate_video_v2::providers::fal::seedance_1p0_lite::cost::FalSeedance10LiteCostState; -use crate::generate::generate_video_v2::providers::fal::seedance_1p0_lite::request::FalSeedance10LiteRequestState; -use crate::generate::generate_video_v2::providers::fal::sora_2::cost::FalSora2CostState; -use crate::generate::generate_video_v2::providers::fal::sora_2::request::FalSora2RequestState; -use crate::generate::generate_video_v2::providers::fal::sora_2_pro::cost::FalSora2ProCostState; -use crate::generate::generate_video_v2::providers::fal::sora_2_pro::request::FalSora2ProRequestState; -use crate::generate::generate_video_v2::providers::fal::seedance_1p5_pro::cost::FalSeedance1p5ProCostState; -use crate::generate::generate_video_v2::providers::fal::seedance_1p5_pro::request::FalSeedance1p5ProRequestState; -use crate::generate::generate_video_v2::providers::fal::veo_2::cost::FalVeo2CostState; -use crate::generate::generate_video_v2::providers::fal::veo_2::request::FalVeo2RequestState; -use crate::generate::generate_video_v2::providers::fal::veo_3::cost::FalVeo3CostState; -use crate::generate::generate_video_v2::providers::fal::veo_3::request::FalVeo3RequestState; -use crate::generate::generate_video_v2::providers::fal::veo_3_fast::cost::FalVeo3FastCostState; -use crate::generate::generate_video_v2::providers::fal::veo_3_fast::request::FalVeo3FastRequestState; -use crate::generate::generate_video_v2::providers::fal::veo_3p1::cost::FalVeo3p1CostState; -use crate::generate::generate_video_v2::providers::fal::veo_3p1::request::FalVeo3p1RequestState; -use crate::generate::generate_video_v2::providers::fal::veo_3p1_fast::cost::FalVeo3p1FastCostState; -use crate::generate::generate_video_v2::providers::fal::veo_3p1_fast::request::FalVeo3p1FastRequestState; -use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_g::cost::GmiCloudSeedance2p0UltraCostState; -use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_g::request::GmiCloudSeedance2p0UltraRequestState; -use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_fast_g::cost::GmiCloudSeedance2p0UltraFastCostState; -use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_fast_g::request::GmiCloudSeedance2p0UltraFastRequestState; -use crate::generate::generate_video_v2::providers::grok_api::grok_imagine_video::cost::GrokApiGrokImagineVideoCostState; -use crate::generate::generate_video_v2::providers::grok_api::grok_imagine_video::request::GrokApiGrokImagineVideoRequestState; -use crate::generate::generate_video_v2::providers::grok_api::grok_imagine_video_1p5::cost::GrokApiGrokImagineVideo1p5CostState; -use crate::generate::generate_video_v2::providers::grok_api::grok_imagine_video_1p5::request::GrokApiGrokImagineVideo1p5RequestState; -use crate::generate::generate_video_v2::providers::kinovi::happy_horse_1p0::cost::KinoviHappyHorse1p0CostState; -use crate::generate::generate_video_v2::providers::kinovi::happy_horse_1p0::request::KinoviHappyHorse1p0RequestState; -use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0::cost::KinoviSeedance2p0CostState; -use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0::request::KinoviSeedance2p0RequestState; -use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0_fast::cost::KinoviSeedance2p0FastCostState; -use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0_fast::request::KinoviSeedance2p0FastRequestState; +use crate::generate::generate_video::providers::artcraft::grok_imagine_video::cost::ArtcraftGrokImagineVideoCostState; +use crate::generate::generate_video::providers::artcraft::grok_imagine_video::request::ArtcraftGrokImagineVideoRequestState; +use crate::generate::generate_video::providers::artcraft::grok_imagine_video_1p5::cost::ArtcraftGrokImagineVideo1p5CostState; +use crate::generate::generate_video::providers::artcraft::grok_imagine_video_1p5::request::ArtcraftGrokImagineVideo1p5RequestState; +use crate::generate::generate_video::providers::artcraft::happy_horse_1p0::cost::ArtcraftHappyHorse1p0CostState; +use crate::generate::generate_video::providers::artcraft::happy_horse_1p0::request::ArtcraftHappyHorse1p0RequestState; +use crate::generate::generate_video::providers::artcraft::kling_1_6_pro::cost::ArtcraftKling16ProCostState; +use crate::generate::generate_video::providers::artcraft::kling_1_6_pro::request::ArtcraftKling16ProRequestState; +use crate::generate::generate_video::providers::artcraft::kling_2_1_master::cost::ArtcraftKling21MasterCostState; +use crate::generate::generate_video::providers::artcraft::kling_2_1_master::request::ArtcraftKling21MasterRequestState; +use crate::generate::generate_video::providers::artcraft::kling_2_1_pro::cost::ArtcraftKling21ProCostState; +use crate::generate::generate_video::providers::artcraft::kling_2_1_pro::request::ArtcraftKling21ProRequestState; +use crate::generate::generate_video::providers::artcraft::kling_2_5_turbo_pro::cost::ArtcraftKling2p5TurboProCostState; +use crate::generate::generate_video::providers::artcraft::kling_2_5_turbo_pro::request::ArtcraftKling2p5TurboProRequestState; +use crate::generate::generate_video::providers::artcraft::kling_2_6_pro::cost::ArtcraftKling2p6ProCostState; +use crate::generate::generate_video::providers::artcraft::kling_2_6_pro::request::ArtcraftKling2p6ProRequestState; +use crate::generate::generate_video::providers::artcraft::kling_3p0_pro::cost::ArtcraftKling3p0ProCostState; +use crate::generate::generate_video::providers::artcraft::kling_3p0_pro::request::ArtcraftKling3p0ProRequestState; +use crate::generate::generate_video::providers::artcraft::kling_3p0_standard::cost::ArtcraftKling3p0StandardCostState; +use crate::generate::generate_video::providers::artcraft::kling_3p0_standard::request::ArtcraftKling3p0StandardRequestState; +use crate::generate::generate_video::providers::artcraft::preview_model::cost::ArtcraftPreviewModelCostState; +use crate::generate::generate_video::providers::artcraft::preview_model::request::ArtcraftPreviewModelRequestState; +use crate::generate::generate_video::providers::artcraft::preview_model_fast::cost::ArtcraftPreviewModelFastCostState; +use crate::generate::generate_video::providers::artcraft::preview_model_fast::request::ArtcraftPreviewModelFastRequestState; +use crate::generate::generate_video::providers::artcraft::seedance_1p0_lite::cost::ArtcraftSeedance10LiteCostState; +use crate::generate::generate_video::providers::artcraft::seedance_1p0_lite::request::ArtcraftSeedance10LiteRequestState; +use crate::generate::generate_video::providers::artcraft::seedance_1p5_pro::cost::ArtcraftSeedance1p5ProCostState; +use crate::generate::generate_video::providers::artcraft::seedance_1p5_pro::request::ArtcraftSeedance1p5ProRequestState; +use crate::generate::generate_video::providers::artcraft::seedance_2p0::cost::ArtcraftSeedance2p0CostState; +use crate::generate::generate_video::providers::artcraft::seedance_2p0::request::ArtcraftSeedance2p0RequestState; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_fast::cost::ArtcraftSeedance2p0FastCostState; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_fast::request::ArtcraftSeedance2p0FastRequestState; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_u::cost::ArtcraftSeedance2p0UltraCostState; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_u::request::ArtcraftSeedance2p0UltraRequestState; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_u_fast::cost::ArtcraftSeedance2p0UltraFastCostState; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_u_fast::request::ArtcraftSeedance2p0UltraFastRequestState; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_bp::cost::ArtcraftSeedance2p0BytePlusCostState; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_bp::request::ArtcraftSeedance2p0BytePlusRequestState; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_bp_fast::cost::ArtcraftSeedance2p0BytePlusFastCostState; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_bp_fast::request::ArtcraftSeedance2p0BytePlusFastRequestState; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_bpu::cost::ArtcraftSeedance2p0BytePlusUltraCostState; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_bpu::request::ArtcraftSeedance2p0BytePlusUltraRequestState; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_bpu_fast::cost::ArtcraftSeedance2p0BytePlusUltraFastCostState; +use crate::generate::generate_video::providers::artcraft::seedance_2p0_bpu_fast::request::ArtcraftSeedance2p0BytePlusUltraFastRequestState; +use crate::generate::generate_video::providers::artcraft::sora_2::cost::ArtcraftSora2CostState; +use crate::generate::generate_video::providers::artcraft::sora_2::request::ArtcraftSora2RequestState; +use crate::generate::generate_video::providers::artcraft::sora_2_pro::cost::ArtcraftSora2ProCostState; +use crate::generate::generate_video::providers::artcraft::sora_2_pro::request::ArtcraftSora2ProRequestState; +use crate::generate::generate_video::providers::artcraft::veo_2::cost::ArtcraftVeo2CostState; +use crate::generate::generate_video::providers::artcraft::veo_2::request::ArtcraftVeo2RequestState; +use crate::generate::generate_video::providers::artcraft::veo_3::cost::ArtcraftVeo3CostState; +use crate::generate::generate_video::providers::artcraft::veo_3::request::ArtcraftVeo3RequestState; +use crate::generate::generate_video::providers::artcraft::veo_3_fast::cost::ArtcraftVeo3FastCostState; +use crate::generate::generate_video::providers::artcraft::veo_3_fast::request::ArtcraftVeo3FastRequestState; +use crate::generate::generate_video::providers::artcraft::veo_3p1::cost::ArtcraftVeo3p1CostState; +use crate::generate::generate_video::providers::artcraft::veo_3p1::request::ArtcraftVeo3p1RequestState; +use crate::generate::generate_video::providers::artcraft::veo_3p1_fast::cost::ArtcraftVeo3p1FastCostState; +use crate::generate::generate_video::providers::artcraft::veo_3p1_fast::request::ArtcraftVeo3p1FastRequestState; +use crate::generate::generate_video::providers::fal::kling_1_6_pro::cost::FalKling16ProCostState; +use crate::generate::generate_video::providers::fal::kling_1_6_pro::request::FalKling16ProRequestState; +use crate::generate::generate_video::providers::fal::kling_2_1_master::cost::FalKling21MasterCostState; +use crate::generate::generate_video::providers::fal::kling_2_1_master::request::FalKling21MasterRequestState; +use crate::generate::generate_video::providers::fal::kling_2_1_pro::cost::FalKling21ProCostState; +use crate::generate::generate_video::providers::fal::kling_2_1_pro::request::FalKling21ProRequestState; +use crate::generate::generate_video::providers::fal::kling_2_5_turbo_pro::cost::FalKling2p5TurboProCostState; +use crate::generate::generate_video::providers::fal::kling_2_5_turbo_pro::request::FalKling2p5TurboProRequestState; +use crate::generate::generate_video::providers::fal::kling_2_6_pro::cost::FalKling2p6ProCostState; +use crate::generate::generate_video::providers::fal::kling_2_6_pro::request::FalKling2p6ProRequestState; +use crate::generate::generate_video::providers::fal::kling_3p0_pro::cost::FalKling3p0ProCostState; +use crate::generate::generate_video::providers::fal::kling_3p0_pro::request::FalKling3p0ProRequestState; +use crate::generate::generate_video::providers::fal::kling_3p0_standard::cost::FalKling3p0StandardCostState; +use crate::generate::generate_video::providers::fal::kling_3p0_standard::request::FalKling3p0StandardRequestState; +use crate::generate::generate_video::providers::fal::seedance_1p0_lite::cost::FalSeedance10LiteCostState; +use crate::generate::generate_video::providers::fal::seedance_1p0_lite::request::FalSeedance10LiteRequestState; +use crate::generate::generate_video::providers::fal::sora_2::cost::FalSora2CostState; +use crate::generate::generate_video::providers::fal::sora_2::request::FalSora2RequestState; +use crate::generate::generate_video::providers::fal::sora_2_pro::cost::FalSora2ProCostState; +use crate::generate::generate_video::providers::fal::sora_2_pro::request::FalSora2ProRequestState; +use crate::generate::generate_video::providers::fal::seedance_1p5_pro::cost::FalSeedance1p5ProCostState; +use crate::generate::generate_video::providers::fal::seedance_1p5_pro::request::FalSeedance1p5ProRequestState; +use crate::generate::generate_video::providers::fal::veo_2::cost::FalVeo2CostState; +use crate::generate::generate_video::providers::fal::veo_2::request::FalVeo2RequestState; +use crate::generate::generate_video::providers::fal::veo_3::cost::FalVeo3CostState; +use crate::generate::generate_video::providers::fal::veo_3::request::FalVeo3RequestState; +use crate::generate::generate_video::providers::fal::veo_3_fast::cost::FalVeo3FastCostState; +use crate::generate::generate_video::providers::fal::veo_3_fast::request::FalVeo3FastRequestState; +use crate::generate::generate_video::providers::fal::veo_3p1::cost::FalVeo3p1CostState; +use crate::generate::generate_video::providers::fal::veo_3p1::request::FalVeo3p1RequestState; +use crate::generate::generate_video::providers::fal::veo_3p1_fast::cost::FalVeo3p1FastCostState; +use crate::generate::generate_video::providers::fal::veo_3p1_fast::request::FalVeo3p1FastRequestState; +use crate::generate::generate_video::providers::gmicloud::seedance_2p0_g::cost::GmiCloudSeedance2p0UltraCostState; +use crate::generate::generate_video::providers::gmicloud::seedance_2p0_g::request::GmiCloudSeedance2p0UltraRequestState; +use crate::generate::generate_video::providers::gmicloud::seedance_2p0_fast_g::cost::GmiCloudSeedance2p0UltraFastCostState; +use crate::generate::generate_video::providers::gmicloud::seedance_2p0_fast_g::request::GmiCloudSeedance2p0UltraFastRequestState; +use crate::generate::generate_video::providers::grok_api::grok_imagine_video::cost::GrokApiGrokImagineVideoCostState; +use crate::generate::generate_video::providers::grok_api::grok_imagine_video::request::GrokApiGrokImagineVideoRequestState; +use crate::generate::generate_video::providers::grok_api::grok_imagine_video_1p5::cost::GrokApiGrokImagineVideo1p5CostState; +use crate::generate::generate_video::providers::grok_api::grok_imagine_video_1p5::request::GrokApiGrokImagineVideo1p5RequestState; +use crate::generate::generate_video::providers::kinovi::happy_horse_1p0::cost::KinoviHappyHorse1p0CostState; +use crate::generate::generate_video::providers::kinovi::happy_horse_1p0::request::KinoviHappyHorse1p0RequestState; +use crate::generate::generate_video::providers::kinovi::seedance_2p0::cost::KinoviSeedance2p0CostState; +use crate::generate::generate_video::providers::kinovi::seedance_2p0::request::KinoviSeedance2p0RequestState; +use crate::generate::generate_video::providers::kinovi::seedance_2p0_fast::cost::KinoviSeedance2p0FastCostState; +use crate::generate::generate_video::providers::kinovi::seedance_2p0_fast::request::KinoviSeedance2p0FastRequestState; #[derive(Clone, Debug)] pub enum VideoGenerationRequest { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/mod.rs deleted file mode 100644 index d862928fbe..0000000000 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/mod.rs +++ /dev/null @@ -1,5 +0,0 @@ -pub mod providers; -pub mod video_generation_request; -pub mod video_generation_draft; -pub mod video_generation_draft_or_request; -pub mod video_generation_draft_context; \ No newline at end of file diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/mod.rs index 8f33db576e..b2fbf76e49 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/mod.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/mod.rs @@ -1,5 +1,3 @@ pub mod generate_image; -pub mod generate_image_v2; pub mod generate_splat; pub mod generate_video; -pub mod generate_video_v2; diff --git a/crates/desktop/artcraft/src/core/commands/deprecated/image_edit/artcraft/handle_image_edit_artcraft_via_router.rs b/crates/desktop/artcraft/src/core/commands/deprecated/image_edit/artcraft/handle_image_edit_artcraft_via_router.rs index 1d925ba900..ceb4869ad8 100644 --- a/crates/desktop/artcraft/src/core/commands/deprecated/image_edit/artcraft/handle_image_edit_artcraft_via_router.rs +++ b/crates/desktop/artcraft/src/core/commands/deprecated/image_edit/artcraft/handle_image_edit_artcraft_via_router.rs @@ -16,7 +16,7 @@ use artcraft_router::client::request_mismatch_mitigation_strategy::RequestMismat use artcraft_router::client::router_artcraft_client::RouterArtcraftClient; use artcraft_router::client::router_client::RouterClient; use artcraft_router::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use artcraft_router::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use artcraft_router::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; use enums::common::generation_provider::GenerationProvider; use enums::tauri::tasks::task_type::TaskType; use log::{error, info}; diff --git a/crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/artcraft/handle_text_to_image_artcraft_via_router.rs b/crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/artcraft/handle_text_to_image_artcraft_via_router.rs index 3680b8a210..f5e2764441 100644 --- a/crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/artcraft/handle_text_to_image_artcraft_via_router.rs +++ b/crates/desktop/artcraft/src/core/commands/deprecated/text_to_image/artcraft/handle_text_to_image_artcraft_via_router.rs @@ -18,7 +18,7 @@ use artcraft_router::client::request_mismatch_mitigation_strategy::RequestMismat use artcraft_router::client::router_artcraft_client::RouterArtcraftClient; use artcraft_router::client::router_client::RouterClient; use artcraft_router::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use artcraft_router::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use artcraft_router::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; use enums::common::generation_provider::GenerationProvider; use enums::tauri::tasks::task_type::TaskType; use log::{error, info}; diff --git a/crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/artcraft/legacy/artcraft_flux_2_lora_angles.rs b/crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/artcraft/legacy/artcraft_flux_2_lora_angles.rs index 2bd967eabc..128266ae03 100644 --- a/crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/artcraft/legacy/artcraft_flux_2_lora_angles.rs +++ b/crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/artcraft/legacy/artcraft_flux_2_lora_angles.rs @@ -8,7 +8,7 @@ use artcraft_router::client::request_mismatch_mitigation_strategy::RequestMismat use artcraft_router::client::router_artcraft_client::RouterArtcraftClient; use artcraft_router::client::router_client::RouterClient; use artcraft_router::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use artcraft_router::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use artcraft_router::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; use enums::common::generation_provider::GenerationProvider; use enums::tauri::tasks::task_type::TaskType; diff --git a/crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/artcraft/legacy/artcraft_qwen_edit_2511_angles.rs b/crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/artcraft/legacy/artcraft_qwen_edit_2511_angles.rs index 7512d3a219..741ea71714 100644 --- a/crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/artcraft/legacy/artcraft_qwen_edit_2511_angles.rs +++ b/crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/artcraft/legacy/artcraft_qwen_edit_2511_angles.rs @@ -8,7 +8,7 @@ use artcraft_router::client::request_mismatch_mitigation_strategy::RequestMismat use artcraft_router::client::router_artcraft_client::RouterArtcraftClient; use artcraft_router::client::router_client::RouterClient; use artcraft_router::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; -use artcraft_router::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use artcraft_router::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; use enums::common::generation_provider::GenerationProvider; use enums::tauri::tasks::task_type::TaskType; diff --git a/crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/artcraft_router/handle_api_providers.rs b/crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/artcraft_router/handle_api_providers.rs index e151a0fed2..ce7c59854e 100644 --- a/crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/artcraft_router/handle_api_providers.rs +++ b/crates/desktop/artcraft/src/core/commands/generate/generate_image/providers/artcraft_router/handle_api_providers.rs @@ -8,7 +8,7 @@ use artcraft_router::client::router_client::RouterClient; use artcraft_router::client::router_fal_client::RouterFalClient; use artcraft_router::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; use artcraft_router::generate::generate_image::generate_image_response::GenerateImageResponse; -use artcraft_router::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use artcraft_router::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; use enums::common::generation_provider::GenerationProvider; use enums::tauri::tasks::task_type::TaskType; use log::{error, info, warn}; diff --git a/crates/desktop/artcraft/src/core/commands/generate/generate_video/artcraft/handle_artcraft_video_via_router.rs b/crates/desktop/artcraft/src/core/commands/generate/generate_video/artcraft/handle_artcraft_video_via_router.rs index 5b0bdd2d59..7f25442375 100644 --- a/crates/desktop/artcraft/src/core/commands/generate/generate_video/artcraft/handle_artcraft_video_via_router.rs +++ b/crates/desktop/artcraft/src/core/commands/generate/generate_video/artcraft/handle_artcraft_video_via_router.rs @@ -16,7 +16,7 @@ use artcraft_router::client::router_artcraft_client::RouterArtcraftClient; use artcraft_router::client::router_client::RouterClient; use artcraft_router::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; use artcraft_router::generate::generate_video::generate_video_response::GenerateVideoResponse; -use artcraft_router::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use artcraft_router::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; use enums::common::generation_provider::GenerationProvider; use enums::tauri::tasks::task_type::TaskType; use log::{error, info}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/image/pipeline_v2/run_pipeline_v2.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/image/pipeline_v2/run_pipeline_v2.rs index acb1b7c079..9e4eaf82d7 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/image/pipeline_v2/run_pipeline_v2.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/image/pipeline_v2/run_pipeline_v2.rs @@ -6,9 +6,9 @@ use artcraft_router::client::router_client::RouterClient; use artcraft_router::client::router_fal_client::RouterFalClient; use artcraft_router::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder; use artcraft_router::generate::generate_image::generate_image_response::GenerateImageResponse; -use artcraft_router::generate::generate_image_v2::image_generation_draft_context::ImageGenerationDraftContext; -use artcraft_router::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest; -use artcraft_router::generate::generate_image_v2::image_generation_request::ImageGenerationRequest; +use artcraft_router::generate::generate_image::image_generation_draft_context::ImageGenerationDraftContext; +use artcraft_router::generate::generate_image::image_generation_draft_or_request::ImageGenerationDraftOrRequest; +use artcraft_router::generate::generate_image::image_generation_request::ImageGenerationRequest; use tokens::tokens::generic_inference_jobs::InferenceJobToken; use tokens::tokens::users::UserToken; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v2/run_pipeline_v2.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v2/run_pipeline_v2.rs index c5919ff8be..987270ca93 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v2/run_pipeline_v2.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v2/run_pipeline_v2.rs @@ -6,8 +6,8 @@ use artcraft_router::api::router_video_model::RouterVideoModel; use artcraft_router::api::router_provider::RouterProvider; use artcraft_router::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; use artcraft_router::generate::generate_video::generate_video_response::GenerateVideoResponse; -use artcraft_router::generate::generate_video_v2::video_generation_draft_context::VideoGenerationDraftContext; -use artcraft_router::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; +use artcraft_router::generate::generate_video::video_generation_draft_context::VideoGenerationDraftContext; +use artcraft_router::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; use tokens::tokens::characters::CharacterToken; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::users::UserToken;