unfunny/baibot-withmcp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow image_generation.size to be null for OpenAI and default it to that

Browse Source 
The API spec for image creation and image editing says "string or null",
so we're allowing `null` now to trigger automatic selection.
This commit is contained in:
Slavi Pantaleev
2025-05-11 23:18:19 +03:00
parent 62f0f4fa0d
commit 264f683d6a
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/sample-provider-configs/openai-o1.yml
View File

@@ -20,5 +20,5 @@ text_to_speech:
image_generation: image_generation:
model_id: gpt-image-1 model_id: gpt-image-1
style: null style: null
size: 1024x1024 size: null
quality: null quality: null

2
docs/sample-provider-configs/openai.yml
View File

@@ -16,5 +16,5 @@ text_to_speech:
image_generation: image_generation:
model_id: gpt-image-1 model_id: gpt-image-1
style: null style: null
size: 1024x1024 size: null
quality: null quality: null

2
etc/app/config.yml.dist
View File

@@ -93,7 +93,7 @@ agents:
# image_generation: # image_generation:
# model_id: gpt-image-1 # model_id: gpt-image-1
# style: null # style: null
# size: 1024x1024 # size: null
# quality: null # quality: null
# #
# - id: localai # - id: localai

6
src/agent/provider/openai/config.rs
View File

@@ -153,7 +153,7 @@ pub struct ImageGenerationConfig {
pub style: Option<async_openai::types::ImageStyle>, pub style: Option<async_openai::types::ImageStyle>,
#[serde(default = "default_image_size")] #[serde(default = "default_image_size")]
pub size: async_openai::types::ImageSize, pub size: Option<async_openai::types::ImageSize>,
#[serde(default = "default_image_quality")] #[serde(default = "default_image_quality")]
pub quality: Option<async_openai::types::ImageQuality>, pub quality: Option<async_openai::types::ImageQuality>,
@@ -186,8 +186,8 @@ fn default_image_style() -> Option<async_openai::types::ImageStyle> {
None None
} }
fn default_image_size() -> async_openai::types::ImageSize { fn default_image_size() -> Option<async_openai::types::ImageSize> {
async_openai::types::ImageSize::S1024x1024 None
} }
fn default_image_quality() -> Option<async_openai::types::ImageQuality> { fn default_image_quality() -> Option<async_openai::types::ImageQuality> {

22
src/agent/provider/openai/controller.rs
View File

@@ -284,11 +284,8 @@ impl ControllerTrait for Controller {
let size = params let size = params
.size_override .size_override
.map(|s| { .map(|s| convert_string_to_enum::<async_openai::types::ImageSize>(&s).unwrap())
convert_string_to_enum::<async_openai::types::ImageSize>(&s) .or(image_generation_config.size);
.unwrap_or(image_generation_config.size)
})
.unwrap_or(image_generation_config.size);
let response_format = match model.clone() { let response_format = match model.clone() {
ImageModel::DallE2 => Some(ImageResponseFormat::B64Json), ImageModel::DallE2 => Some(ImageResponseFormat::B64Json),
@@ -303,10 +300,7 @@ impl ControllerTrait for Controller {
let mut request_builder = CreateImageRequestArgs::default(); let mut request_builder = CreateImageRequestArgs::default();
request_builder request_builder.model(model).prompt(prompt.to_owned());
.model(model)
.prompt(prompt.to_owned())
.size(size);
if let Some(response_format) = response_format { if let Some(response_format) = response_format {
request_builder.response_format(response_format); request_builder.response_format(response_format);
@@ -320,6 +314,10 @@ impl ControllerTrait for Controller {
request_builder.quality(quality.clone()); request_builder.quality(quality.clone());
} }
if let Some(size) = size {
request_builder.size(size);
}
let request = request_builder.build()?; let request = request_builder.build()?;
tracing::trace!( tracing::trace!(
@@ -382,9 +380,9 @@ impl ControllerTrait for Controller {
} }
let dalle2_size = match image_generation_config.size { let dalle2_size = match image_generation_config.size {
async_openai::types::ImageSize::S256x256 => Some(DallE2ImageSize::S256x256), Some(async_openai::types::ImageSize::S256x256) => Some(DallE2ImageSize::S256x256),
async_openai::types::ImageSize::S512x512 => Some(DallE2ImageSize::S512x512), Some(async_openai::types::ImageSize::S512x512) => Some(DallE2ImageSize::S512x512),
async_openai::types::ImageSize::S1024x1024 => Some(DallE2ImageSize::S1024x1024), Some(async_openai::types::ImageSize::S1024x1024) => Some(DallE2ImageSize::S1024x1024),
_ => None, _ => None,
}; };

6
src/agent/provider/openai_compat/config.rs
View File

@@ -224,9 +224,11 @@ impl TryInto<OpenAIImageGenerationConfig> for ImageGenerationConfig {
fn try_into(self) -> Result<OpenAIImageGenerationConfig, Self::Error> { fn try_into(self) -> Result<OpenAIImageGenerationConfig, Self::Error> {
let size = if let Some(size) = &self.size { let size = if let Some(size) = &self.size {
convert_string_to_enum::<async_openai::types::ImageSize>(size)? Some(convert_string_to_enum::<async_openai::types::ImageSize>(
size,
)?)
} else { } else {
async_openai::types::ImageSize::S1024x1024 None
}; };
let style = if let Some(style) = &self.style { let style = if let Some(style) = &self.style {