[Bugfix] Align Offline and Online Inference (#3506)
This commit is contained in:
3 files changed
+42
-7
No files matched your search
@@ -1535,6 +1535,12 @@ async def generate_images(request: ImageGenerationRequest, raw_request: Request)
|
||||
# Keep /images validation semantics: invalid LoRA should fail with 400.
|
||||
_parse_lora_request(request.lora)
|
||||
extra_body["lora"] = request.lora
|
||||
if request.bot_task is not None:
|
||||
extra_body["bot_task"] = request.bot_task
|
||||
if request.use_system_prompt is not None:
|
||||
extra_body["use_system_prompt"] = request.use_system_prompt
|
||||
if request.system_prompt is not None:
|
||||
extra_body["system_prompt"] = request.system_prompt
|
||||
|
||||
generation_result = await chat_handler.generate_diffusion_images(
|
||||
prompt=request.prompt,
|
||||
@@ -1546,8 +1552,9 @@ async def generate_images(request: ImageGenerationRequest, raw_request: Request)
|
||||
status_code=generation_result.error.code if generation_result.error else 400,
|
||||
content=generation_result.model_dump(),
|
||||
)
|
||||
flat_images, _, _ = generation_result
|
||||
flat_images, _, _, _ = generation_result
|
||||
image_data = [ImageData(b64_json=encode_image_base64(img), revised_prompt=None) for img in flat_images]
|
||||
|
||||
return ImageGenerationResponse(created=int(time.time()), data=image_data)
|
||||
|
||||
# Build params - pass through user values directly
|
||||
@@ -1560,6 +1567,8 @@ async def generate_images(request: ImageGenerationRequest, raw_request: Request)
|
||||
extra_args["use_system_prompt"] = request.use_system_prompt
|
||||
if request.system_prompt is not None:
|
||||
extra_args["system_prompt"] = request.system_prompt
|
||||
if request.bot_task is not None:
|
||||
extra_args["bot_task"] = request.bot_task
|
||||
if extra_args:
|
||||
gen_params.extra_args = extra_args
|
||||
# Parse per-request LoRA (compatible with chat's extra_body.lora shape).
|
||||
@@ -1727,6 +1736,7 @@ async def edit_images(
|
||||
)
|
||||
try:
|
||||
# 2. Build prompt & images params
|
||||
cot_output = None
|
||||
prompt: OmniTextPrompt = {"prompt": prompt}
|
||||
if negative_prompt is not None:
|
||||
prompt["negative_prompt"] = negative_prompt
|
||||
@@ -1937,7 +1947,7 @@ async def edit_images(
|
||||
status_code=generation_result.error.code if generation_result.error else 400,
|
||||
detail=generation_result.message,
|
||||
)
|
||||
images, _, _ = generation_result
|
||||
images, _, _, cot_output = generation_result
|
||||
else:
|
||||
# Single-stage diffusion: use the direct path.
|
||||
result = await _generate_with_async_omni(
|
||||
@@ -1967,6 +1977,7 @@ async def edit_images(
|
||||
data=image_data,
|
||||
output_format=output_format,
|
||||
size=size_str,
|
||||
cot_output=cot_output,
|
||||
)
|
||||
|
||||
except (EngineGenerateError, EngineDeadError) as exc:
|
||||
|
||||
Reference in new issue
Block a user