Switch back to upstream async-openai

Once async-openai v0.31.0 gets released as a final version,
we'll be able top pull it from crates.io.

This does not quite compile yet, because of https://github.com/64bit/async-openai/issues/465

CHANGELOG.md

@@ -1,59 +1,3 @@
-# (2026-02-04) Version 1.14.0
-
-- (**Feature**) The `openai` provider now uses OpenAI's [Responses API](https://platform.openai.com/docs/api-reference/responses) (instead of the older Chat Completions API), adding support for [🛠️ built-in tools](./docs/features.md#️-built-in-tools-openai-only) (`web_search` and `code_interpreter`). These tools are **disabled by default** and can be enabled via the `text_generation.tools` configuration (see the [sample configuration](https://github.com/etkecc/baibot/blob/c70387b0c38d8d0f30bba2179a2a21a3710dbeaf/docs/sample-provider-configs/openai.yml#L12-L15)). To enable tools on an existing agent, you need to [update the agent](./docs/agents.md#updating-agents) to re-create it with the `text_generation.tools` section added and enable the tools you need. Thanks to [Layla Manley](https://github.com/yeslayla) for the contribution in [#62](https://github.com/etkecc/baibot/pull/62)!
-
-- (**Bugfix**) Fix sticker generation for newer GPT image models (`gpt-image-1`, `gpt-image-1-mini`, `gpt-image-1.5`) which don't support the previously hardcoded `256x256` size (minimum is `1024x1024`)
-
-- (**Internal Improvement**) Dependency updates
-
-
-# (2026-01-23) Version 1.13.0
-
-- (**Improvement**) Extend auto-switching to support cheaper models (`gpt-image-1-mini`) for `gpt-image-1` and `gpt-image-1.5` when generating stickers ([e0b4a40](https://github.com/etkecc/baibot/commit/e0b4a40))
-
-- (**Internal Improvement**) Upgrade Rust compiler (1.92.0 -> 1.93.0) ([691aeeb](https://github.com/etkecc/baibot/commit/691aeeb))
-
-- (**Internal Improvement**) Dependency updates
-
-
-# (2025-12-21) Version 1.12.0
-
-- (**Improvement**) Upgrade [async-openai](https://crates.io/crates/async-openai) (0.31.1 -> 0.32.2) and add support for OpenAI's `gpt-image-1.5` model ([08c689a](https://github.com/etkecc/baibot/commit/08c689a), [f7bf3d7](https://github.com/etkecc/baibot/commit/f7bf3d7))
-
-- (**Internal Improvement**) Dependency updates
-
-
-# (2025-12-15) Version 1.11.0
-
-- (**Feature**) Add support for custom avatars via file path and for keeping the already-set avatar (for those who wish to manage it by themselves via other means). See the [sample config](./etc/app/config.yml.dist) for details. ([062fbbb](https://github.com/etkecc/baibot/commit/062fbbb8ef9ad600db483a431c5c782402191023))
-
-- (**Internal Improvement**) Dependency updates ([99bde53](https://github.com/etkecc/baibot/commit/99bde53ef648a5a9086a96778fde4a9dbc1ede58))
-
-- (**Internal Improvement**) Documentation updates ([b3fd8e5](https://github.com/etkecc/baibot/commit/b3fd8e548f83fe46398ced4760d7e2bb7588c24d))
-
-- (**Internal Improvement**) Upgrade Rust compiler (1.91.1 -> 1.92.0) ([22906aa](https://github.com/etkecc/baibot/commit/22906aa2d3cae51815fad2560a545eaa69c247b6))
-
-
-# (2025-12-06) Version 1.10.0
-
-- (**Internal Improvement**) Dependency updates. This version is based on [mxlink](https://crates.io/crates/mxlink)@1.11.0 (which is based on the newly released [matrix-sdk](https://crates.io/crates/matrix-sdk)@[0.16.0](https://github.com/matrix-org/matrix-rust-sdk/releases/tag/matrix-sdk-0.16.0).
-
-# (2025-11-30) Version 1.9.0
-
-- (**Internal Improvement**) Upgrade [async-openai](https://crates.io/crates/async-openai) from our own etkecc fork (0.28.1-patched) to the official upstream version 0.31.1. This upgrade required some code adaptations to the new module structure, etc. While tested, regressions are possible.
-
-# (2025-11-28) Version 1.8.3
-
-- (**Improvement**) Add support for the `BAIBOT_PERSISTENCE_SESSION_ENCRYPTION_KEY` environment variable for configuring `persistence.session_encryption_key`
-
-- (**Improvement**) Add support for the `BAIBOT_USER_ENCRYPTION_RECOVERY_RESET_ALLOWED` environment variable for configuring `user.encryption.recovery_reset_allowed`
-
-- (**Internal Improvement**) Dependency updates.
-
-# (2025-11-20) Version 1.8.2
-
-- (**Internal Improvement**) Dependency and compiler updates (Rust 1.89.0 -> 1.91.1).
-
 # (2025-09-12) Version 1.8.1
 
 - (**Internal Improvement**) Dependency updates.

Cargo.toml

@@ -7,7 +7,7 @@ license = "AGPL-3.0-or-later"
 readme = "README.md"
 keywords = ["matrix", "chat", "bot", "AI", "LLM"]
 include = ["/etc/assets/baibot-torso-768.png", "/src", "/README.md", "/CHANGELOG.md", "/LICENSE"]
-version = "1.14.0"
+version = "1.8.1"
 edition = "2024"
 
 [lib]
@@ -17,24 +17,23 @@ path = "src/lib.rs"
 [dependencies]
 anthropic = { git = "https://github.com/etkecc/anthropic-rs.git", branch = "fix-content-block-image" }
 anyhow = "1.0.*"
-async-openai = { version = "0.32.3", features = ["audio", "chat-completion", "image", "responses"] }
+async-openai = { git = "https://github.com/64bit/async-openai", branch = "main" }
 base64 = "0.22.*"
 chrono = { version = "0.4.*", default-features = false, features = ["std", "now"] }
 # We'd rather not depend on this, but we cannot use the ruma-events EventContent macro without it.
 # We add the `native-tls` feature, because of https://github.com/etkecc/rust-mxlink/issues/1
-matrix-sdk = { version = "0.16.0", default-features = false, features = ["native-tls"] }
+matrix-sdk = { version = "0.14.0", default-features = false, features = ["native-tls"] }
-mime_guess = "2.0.*"
 mxidwc = "1.0.*"
-mxlink = ">=1.11.0"
+mxlink = ">=1.10.0"
 etke_openai_api_rust = "0.1.*"
 quick_cache = "0.6.*"
-regex = "1.12.*"
+regex = "1.11.*"
 serde = { version = "1.0.*", features = ["derive"], default-features = false }
 serde_json = "1.0.*"
 serde_yaml = "0.9.*"
-tempfile = "3.24.*"
+tempfile = "3.21.*"
-tiktoken-rs = { version = "0.9.*", default-features = false }
+tiktoken-rs = { version = "0.7.*", default-features = false }
-tokio = { version = "1.49.*", features = ["rt", "rt-multi-thread", "macros"] }
+tokio = { version = "1.47.*", features = ["rt", "rt-multi-thread", "macros"] }
 tracing = "0.1.*"
 tracing-subscriber = { version = "0.3.*", features = ["env-filter"] }
 url = "2.5.*"

Dockerfile

@@ -4,7 +4,7 @@
 #                                     #
 #######################################
 
-FROM docker.io/rust:1.93.0-slim-trixie AS build
+FROM docker.io/rust:1.90.0-slim-trixie AS build
 
 RUN apt-get update && apt-get install -y build-essential pkg-config libssl-dev libsqlite3-dev
 

Dockerfile.ci

@@ -4,7 +4,7 @@
 #                                     #
 #######################################
 
-FROM docker.io/rust:1.93.0-slim-trixie AS build
+FROM docker.io/rust:1.90.0-slim-trixie AS build
 
 RUN apt-get update && apt-get install -y build-essential pkg-config libssl-dev libsqlite3-dev
 

README.md

@@ -17,7 +17,7 @@ It's influenced by [chaz](https://github.com/arcuru/chaz), but does **not** use
 
 - Supports **different use purposes** (depending on the [☁️ provider](./docs/providers.md) & model):
 
-  - [💬 text-generation](./docs/features.md#-text-generation): communicating with you via text (though certain models may "see" images as well). The [OpenAI provider](./docs/providers.md#openai) also supports [🛠️ built-in tools](./docs/features.md#️-built-in-tools-openai-only) (web search, code interpreter)
+  - [💬 text-generation](./docs/features.md#-text-generation): communicating with you via text (though certain models may "see" images as well)
   - [🦻 speech-to-text](./docs/features.md#-speech-to-text): turning your voice messages into text
   - [🗣️ text-to-speech](./docs/features.md#%EF%B8%8F-text-to-speech): turning bot or users text messages into voice messages
   - [🖌️ image-generation](./docs/features.md#image-generation): creating and editing images based on instructions

docs/access.md

@@ -43,8 +43,7 @@ Administrators cannot be changed without adjusting the bot's configuration on th
 
 Room-local agent managers are users privileged to **create their own [agents](./agents.md)** (see `!bai agent`) in rooms.
 
-> [!WARNING]
+**⚠️ WARNING**: Letting regular users create agents which contact arbitrary network services **may be a security issue**.
-> Letting regular users create agents which contact arbitrary network services **may be a security issue**.
 
 The following commands are available:
 - **Show** the currently allowed users: `!bai access room-local-agent-managers`

docs/configuration/README.md

@@ -12,15 +12,12 @@ This file is created from the template found in [etc/app/config.yml.dist](../../
 
 Certain keys can be left unset, in which case [📝 hardcoded defaults](../../src/entity/cfg/defaults.rs) would be used.
 
-Some configuration keys found in the YAML configuration can be overridden by setting an environment variable (dots should be replaced with `_`). Example:
+Each configuration key found in the YAML configuration can be overridden by setting an environment variable (dots should be replaced with `_`). Example:
 
 - to override `command_prefix`, set an environment variable `BAIBOT_COMMAND_PREFIX`
 - to override `homeserver.server_name`, set an environment variable `BAIBOT_HOMESERVER_SERVER_NAME`
 
-You can see the list of supported environment variables in the [🦀 src/entity/cfg/env.rs](../../src/entity/cfg/env.rs) file.
+The static configuration contains an `initial_global_config` key, which is used to populate the bot's global configuration (stored as [dynamic configuration](#dynamic-configuration)) the first time the bot starts. Modifying this subsequently will not have any effect. After initial global configuration creation, it's expected to be managed dynamically via chat commands.
-
-> [!WARNING]
-> The static configuration contains an `initial_global_config` key, which is used to populate the bot's global configuration (stored as [dynamic configuration](#dynamic-configuration)) the first time the bot starts. Modifying this subsequently will not have any effect. After initial global configuration creation, it's expected to be managed dynamically via chat commands.
 
 
 ### Dynamic configuration

docs/features.md

@@ -40,23 +40,6 @@ You may also wish to see:
 - [📖 Usage / 💬 Text Generation](./usage.md#-text-generation) section for more details on how to use the bot for Text Generation in a room
 
 
-#### 🛠️ Built-in Tools (OpenAI only)
-
-
-
-The [OpenAI provider](./providers.md#openai) supports built-in tools that extend the model's capabilities:
-
-- [🔍 Web Search](https://platform.openai.com/docs/guides/tools-web-search) (`web_search`): allows the model to search the web for up-to-date information. [🖼️ Screenshot](./screenshots/text-generation-tools-web-search.webp)
-
-- [💻 Code Interpreter](https://platform.openai.com/docs/guides/tools-code-interpreter) (`code_interpreter`): allows the model to write and execute Python code in a sandbox
-
-These tools are **disabled by default** and need to be explicitly enabled in the agent's `text_generation.tools` configuration. See the [OpenAI sample configuration](https://github.com/etkecc/baibot/blob/c70387b0c38d8d0f30bba2179a2a21a3710dbeaf/docs/sample-provider-configs/openai.yml#L12-L15) for reference.
-
-To enable tools on an existing dynamically-created agent, you need to [update the agent](./agents.md#updating-agents) to re-create it with the `text_generation.tools` section added and enable the tools you need
-
-💡 **Note**: These tools run on OpenAI's infrastructure and may incur additional costs. Web search results include citations that are incorporated into the response.
-
-
 #### On-demand involvement
 
 In the following 2 cases, it's useful to involve the bot in conversations on-demand:

docs/providers.md

@@ -23,7 +23,7 @@ The list of supported providers is below.
 
 ### How to choose a provider
 
-If you're not sure which provider to start with, **we recommend [OpenAI](#openai)** as it's the most popular and has the **widest range of capabilities**: [💬 text-generation](./features.md#-text-generation) (incl. vision, incl. [🛠️ tools](./features.md#️-built-in-tools-openai-only)), [🖌️ image-generation](./features.md#️image-generation), [🦻 speech-to-text](./features.md#-speech-to-text), [🗣️ text-to-speech](./features.md#️-text-to-speech).
+If you're not sure which provider to start with, **we recommend [OpenAI](#openai)** as it's the most popular and has the **widest range of capabilities**: [💬 text-generation](./features.md#-text-generation) (no vision), [🖌️ image-generation](./features.md#️image-generation), [🦻 speech-to-text](./features.md#-speech-to-text), [🗣️ text-to-speech](./features.md#️-text-to-speech).
 
 You don't need to choose just one though. The bot supports [mixing & matching models](./features.md#-mixing--matching-models), so you can use multiple providers at the same time.
 
@@ -47,7 +47,7 @@ You don't need to choose just one though. The bot supports [mixing & matching mo
 
 - 🆔 Identifier: `anthropic`
 - 🔗 Links: [🏠 Home page](https://www.anthropic.com/), [🌐 Wiki](https://en.wikipedia.org/wiki/Anthropic), [👤 Sign up](https://console.anthropic.com/), [📋 Models list](https://docs.anthropic.com/en/docs/about-claude/models)
-- 🌟 Capabilities: [💬 text-generation](./features.md#-text-generation) (incl. vision, no tools)
+- 🌟 Capabilities: [💬 text-generation](./features.md#-text-generation) (incl. vision)
 - 🗲 Quick start:
   - create a room-local agent: `!bai agent create-room-local anthropic my-anthropic-agent`
   - create a global agent: `!bai agent create-global anthropic my-anthropic-agent`
@@ -61,7 +61,7 @@ You don't need to choose just one though. The bot supports [mixing & matching mo
 
 - 🆔 Identifier: `groq`
 - 🔗 Links: [🏠 Home page](https://groq.com/), [🌐 Wiki](https://en.wikipedia.org/wiki/Groq), [👤 Sign up](https://console.groq.com/login), [📋 Models list](https://console.groq.com/docs/models)
-- 🌟 Capabilities: [💬 text-generation](./features.md#-text-generation) (no vision, no tools), [🦻 speech-to-text](./features.md#-speech-to-text)
+- 🌟 Capabilities: [💬 text-generation](./features.md#-text-generation) (no vision), [🦻 speech-to-text](./features.md#-speech-to-text)
 - 🗲 Quick start:
   - create a room-local agent: `!bai agent create-room-local groq my-groq-agent`
   - create a global agent: `!bai agent create-global groq my-groq-agent`
@@ -75,7 +75,7 @@ You don't need to choose just one though. The bot supports [mixing & matching mo
 
 - 🆔 Identifier: `localai`
 - 🔗 Links: [🏠 Home page](https://localai.io/), [📋 Models list](https://localai.io/gallery.html)
-- 🌟 Capabilities: [💬 text-generation](./features.md#-text-generation) (no vision, no tools), [🗣️ text-to-speech](./features.md#️-text-to-speech), [🦻 speech-to-text](./features.md#-speech-to-text)
+- 🌟 Capabilities: [💬 text-generation](./features.md#-text-generation) (no vision), [🗣️ text-to-speech](./features.md#️-text-to-speech), [🦻 speech-to-text](./features.md#-speech-to-text)
 - 🗲 Quick start:
   - create a room-local agent: `!bai agent create-room-local localai my-localai-agent`
   - create a global agent: `!bai agent create-global localai my-localai-agent`
@@ -89,7 +89,7 @@ You don't need to choose just one though. The bot supports [mixing & matching mo
 
 - 🆔 Identifier: `mistral`
 - 🔗 Links: [🏠 Home page](https://mistral.ai/), [🌐 Wiki](https://en.wikipedia.org/wiki/Mistral_AI), [👤 Sign up](https://auth.mistral.ai/ui/registration), [📋 Models list](https://docs.mistral.ai/getting-started/models/)
-- 🌟 Capabilities: [💬 text-generation](./features.md#-text-generation) (no vision, no tools)
+- 🌟 Capabilities: [💬 text-generation](./features.md#-text-generation) (no vision)
 - 🗲 Quick start:
   - create a room-local agent: `!bai agent create-room-local mistral my-mistral-agent`
   - create a global agent: `!bai agent create-global mistral my-mistral-agent`
@@ -103,7 +103,7 @@ You don't need to choose just one though. The bot supports [mixing & matching mo
 
 - 🆔 Identifier: `ollama`
 - 🔗 Links: [🏠 Home page](https://ollama.com/), [📋 Models list](https://ollama.com/library)
-- 🌟 Capabilities: [💬 text-generation](./features.md#-text-generation) (no vision, no tools)
+- 🌟 Capabilities: [💬 text-generation](./features.md#-text-generation) (no vision)
 - 🗲 Quick start:
   - create a room-local agent: `!bai agent create-room-local ollama my-ollama-agent`
   - create a global agent: `!bai agent create-global ollama my-ollama-agent`
@@ -120,12 +120,15 @@ For services which are not fully compatible with the OpenAI API, consider using
 
 - 🆔 Identifier: `openai`
 - 🔗 Links: [🏠 Home page](https://openai.com/), [🌐 Wiki](https://en.wikipedia.org/wiki/OpenAI), [👤 Sign up](https://platform.openai.com/signup), [📋 Models list](https://platform.openai.com/docs/models)
-- 🌟 Capabilities: [🖌️ image-generation](./features.md#️-image-creation), [💬 text-generation](./features.md#-text-generation) (incl. vision, incl. [🛠️ tools](./features.md#️-built-in-tools-openai-only)), [🗣️ text-to-speech](./features.md#️-text-to-speech), [🦻 speech-to-text](./features.md#-speech-to-text)
+- 🌟 Capabilities: [🖌️ image-generation](./features.md#️-image-creation), [💬 text-generation](./features.md#-text-generation) (incl. vision), [🗣️ text-to-speech](./features.md#️-text-to-speech), [🦻 speech-to-text](./features.md#-speech-to-text)
 - 🗲 Quick start:
   - create a room-local agent: `!bai agent create-room-local openai my-openai-agent`
   - create a global agent: `!bai agent create-global openai my-openai-agent`
 
-💡 When creating an agent, the bot will show you an up-to-date sample configuration for this provider which looks [like this](./sample-provider-configs/openai.yml).
+💡 When creating an agent, the bot will show you an up-to-date sample configuration for this provider which:
+
+- in the general case looks [like this](./sample-provider-configs/openai.yml)
+- for the [o1](https://platform.openai.com/docs/models/o1) models needs to look [like this](./sample-provider-configs/openai-o1.yml)
 
 
 ### OpenAI Compatible
@@ -137,7 +140,7 @@ Some of these popular services already have **shortcut** providers (leading to t
 This provider is just as featureful as the [OpenAI](#openai) provider, but is more compatible with services which do not fully adhere to the [OpenAI API spec](https://github.com/openai/openai-openapi/).
 
 - 🆔 Identifier: `openai-compatible`
-- 🌟 Capabilities: [🖌️ image-generation](./features.md#️-image-creation), [💬 text-generation](./features.md#-text-generation) (no vision, no tools), [🗣️ text-to-speech](./features.md#️-text-to-speech), [🦻 speech-to-text](./features.md#-speech-to-text)
+- 🌟 Capabilities: [🖌️ image-generation](./features.md#️-image-creation), [💬 text-generation](./features.md#-text-generation) (no vision), [🗣️ text-to-speech](./features.md#️-text-to-speech), [🦻 speech-to-text](./features.md#-speech-to-text)
 - 🗲 Quick start:
   - create a room-local agent: `!bai agent create-room-local openai-compatible my-openai-compatible-agent`
   - create a global agent: `!bai agent create-global openai-compatible my-openai-compatible-agent`
@@ -151,7 +154,7 @@ This provider is just as featureful as the [OpenAI](#openai) provider, but is mo
 
 - 🆔 Identifier: `openrouter`
 - 🔗 Links: [🏠 Home page](https://openrouter.ai/), [👤 Sign up](https://openrouter.ai/), [📋 Models list](https://openrouter.ai/models)
-- 🌟 Capabilities: [💬 text-generation](./features.md#-text-generation) (no vision, no tools)
+- 🌟 Capabilities: [💬 text-generation](./features.md#-text-generation) (no vision)
 - 🗲 Quick start:
   - create a room-local agent: `!bai agent create-room-local openrouter my-openrouter-agent`
   - create a global agent: `!bai agent create-global openrouter my-openrouter-agent`
@@ -165,7 +168,7 @@ This provider is just as featureful as the [OpenAI](#openai) provider, but is mo
 
 - 🆔 Identifier: `together-ai`
 - 🔗 Links: [🏠 Home page](https://www.together.ai/), [👤 Sign up](https://api.together.ai/signup), [📋 Models list](https://api.together.xyz/models)
-- 🌟 Capabilities: [💬 text-generation](./features.md#-text-generation) (no vision, no tools)
+- 🌟 Capabilities: [💬 text-generation](./features.md#-text-generation) (no vision)
 - 🗲 Quick start:
   - create a room-local agent: `!bai agent create-room-local together-ai my-together-ai-agent`
   - create a global agent: `!bai agent create-global together-ai my-together-ai-agent`

docs/sample-provider-configs/openai-o1.yml

@@ -0,0 +1,24 @@
+base_url: https://api.openai.com/v1
+api_key: YOUR_API_KEY_HERE
+text_generation:
+  model_id: o1-mini
+  # o1 models do not support a system prompt
+  prompt: null
+  temperature: 1.0
+  # o1 models do not support max_response_tokens.
+  # They use `max_completion_tokens` as an alternative
+  max_response_tokens: null
+  max_completion_tokens: 16384
+  max_context_tokens: 128000
+speech_to_text:
+  model_id: whisper-1
+text_to_speech:
+  model_id: tts-1-hd
+  voice: onyx
+  speed: 1.0
+  response_format: opus
+image_generation:
+  model_id: gpt-image-1
+  style: null
+  size: null
+  quality: null

docs/sample-provider-configs/openai.yml

@@ -1,18 +1,11 @@
 base_url: https://api.openai.com/v1
 api_key: YOUR_API_KEY_HERE
 text_generation:
-  model_id: gpt-5.2
+  model_id: gpt-5
   prompt: "You are a brief, but helpful bot called {{ baibot_name }} powered by the {{ baibot_model_id }} model. The date/time of this conversation's start is: {{ baibot_conversation_start_time_utc }}."
   temperature: 1.0
-  # Reasoning models need to use `max_completion_tokens` instead of `max_response_tokens`.
+  max_response_tokens: 16384
-  # If you're dealing with a non-reasoning model, specify `max_response_tokens` and unset `max_completion_tokens`.
+  max_context_tokens: 128000
-  max_response_tokens: null
-  max_completion_tokens: 128000
-  max_context_tokens: 400000
-  # Built-in tools
-  tools:
-    web_search: false
-    code_interpreter: false
 speech_to_text:
   model_id: whisper-1
 text_to_speech:
@@ -21,7 +14,7 @@ text_to_speech:
   speed: 1.0
   response_format: opus
 image_generation:
-  model_id: gpt-image-1.5
+  model_id: gpt-image-1
   style: null
   size: null
   quality: null

etc/app/config.yml.dist

@@ -11,12 +11,6 @@ user:
   # Leave empty to use the default (baibot).
   name: baibot
 
-  # An optional path to an image file to be used as a custom avatar image.
-  # - null or empty string: use the default avatar
-  # - "keep": don't touch the avatar, keep whatever is already set
-  # - any other value: path to a custom avatar image file
-  avatar: null
-
   encryption:
     # An optional passphrase to use for backing up and recovering the bot's encryption keys.
     # You can use any string here.
@@ -82,18 +76,13 @@ agents:
     #     base_url: https://api.openai.com/v1
     #     api_key: ""
     #     text_generation:
-    #       model_id: gpt-5.2
+    #       model_id: gpt-5
     #       prompt: "You are a brief, but helpful bot called {{ baibot_name }} powered by the {{ baibot_model_id }} model. The date/time of this conversation's start is: {{ baibot_conversation_start_time_utc }}."
     #       temperature: 1.0
+    #       max_response_tokens: ~
     #       # Reasoning models need to use `max_completion_tokens` instead of `max_response_tokens`.
-    #       # If you're dealing with a non-reasoning model, specify `max_response_tokens` and unset `max_completion_tokens`.
-    #       max_response_tokens: null
     #       max_completion_tokens: 128000
     #       max_context_tokens: 400000
-    #       # Built-in tools
-    #       tools:
-    #         web_search: false
-    #         code_interpreter: false
     #     speech_to_text:
     #       model_id: whisper-1
     #     text_to_speech:
@@ -102,7 +91,7 @@ agents:
     #       speed: 1.0
     #       response_format: opus
     #     image_generation:
-    #       model_id: gpt-image-1.5
+    #       model_id: gpt-image-1
     #       style: null
     #       size: null
     #       quality: null

etc/services/core/compose.yml

@@ -1,6 +1,6 @@
 services:
   postgres:
-    image: docker.io/postgres:18.1-alpine
+    image: docker.io/postgres:18.0-alpine
     user: ${UID}:${GID}
     restart: unless-stopped
     environment:
@@ -14,7 +14,7 @@ services:
     - /etc/passwd:/etc/passwd:ro
 
   synapse:
-    image: ghcr.io/element-hq/synapse:v1.146.0
+    image: ghcr.io/element-hq/synapse:v1.140.0
     user: "${UID}:${GID}"
     restart: unless-stopped
     entrypoint: python
@@ -27,7 +27,7 @@ services:
     - ./synapse/media-store:/media-store
 
   element-web:
-    image: ghcr.io/element-hq/element-web:v1.12.9
+    image: ghcr.io/element-hq/element-web:v1.12.2
     user: "${UID}:${GID}"
     restart: unless-stopped
     environment:

etc/services/ollama/compose.yml

@@ -1,6 +1,6 @@
 services:
   ollama:
-    image: docker.io/ollama/ollama:0.15.4
+    image: docker.io/ollama/ollama:0.12.6
     restart: unless-stopped
     ports:
       - "${SERVICE_OLLAMA_BIND_PORT_HTTP}:11434"

src/agent/provider/entity/agent_provider.rs

@@ -69,7 +69,6 @@ impl AgentProvider {
                 models_list_url: Some("https://docs.anthropic.com/en/docs/about-claude/models"),
                 supported_purposes: vec![AgentPurpose::TextGeneration],
                 text_generation_supports_vision: true,
-                text_generation_supports_tools: false,
             },
             Self::Groq => AgentProviderInfo {
                 id: Self::Groq.to_static_str(),
@@ -81,12 +80,11 @@ impl AgentProvider {
                 models_list_url: Some("https://console.groq.com/docs/models"),
                 supported_purposes: vec![AgentPurpose::TextGeneration, AgentPurpose::SpeechToText],
                 text_generation_supports_vision: false,
-                text_generation_supports_tools: false,
             },
             Self::LocalAI => AgentProviderInfo {
                 id: Self::LocalAI.to_static_str(),
                 name: "LocalAI",
-                description: "LocalAI is the free, Open Source OpenAI alternative. LocalAI act as a drop-in replacement REST API that's compatible with OpenAI API specifications for local inferencing. It allows you to run LLMs, generate images, audio (and not only) locally or on-prem with consumer grade hardware, supporting multiple model families and architectures.",
+                description: "LocalAI is the free, Open Source OpenAI alternative. LocalAI act as a drop-in replacement REST API that’s compatible with OpenAI API specifications for local inferencing. It allows you to run LLMs, generate images, audio (and not only) locally or on-prem with consumer grade hardware, supporting multiple model families and architectures.",
                 homepage_url: Some("https://localai.io/"),
                 wiki_url: None,
                 sign_up_url: None,
@@ -97,7 +95,6 @@ impl AgentProvider {
                     AgentPurpose::SpeechToText,
                 ],
                 text_generation_supports_vision: false,
-                text_generation_supports_tools: false,
             },
             Self::Mistral => AgentProviderInfo {
                 id: Self::Mistral.to_static_str(),
@@ -109,7 +106,6 @@ impl AgentProvider {
                 models_list_url: Some("https://docs.mistral.ai/getting-started/models/"),
                 supported_purposes: vec![AgentPurpose::TextGeneration],
                 text_generation_supports_vision: false,
-                text_generation_supports_tools: false,
             },
             Self::Ollama => AgentProviderInfo {
                 id: Self::Ollama.to_static_str(),
@@ -121,7 +117,6 @@ impl AgentProvider {
                 models_list_url: Some("https://ollama.com/library"),
                 supported_purposes: vec![AgentPurpose::TextGeneration],
                 text_generation_supports_vision: false,
-                text_generation_supports_tools: false,
             },
             Self::OpenAI => AgentProviderInfo {
                 id: Self::OpenAI.to_static_str(),
@@ -138,7 +133,6 @@ impl AgentProvider {
                     AgentPurpose::SpeechToText,
                 ],
                 text_generation_supports_vision: true,
-                text_generation_supports_tools: true,
             },
             Self::OpenAICompat => AgentProviderInfo {
                 id: Self::OpenAICompat.to_static_str(),
@@ -155,7 +149,6 @@ impl AgentProvider {
                     AgentPurpose::SpeechToText,
                 ],
                 text_generation_supports_vision: false,
-                text_generation_supports_tools: false,
             },
             Self::OpenRouter => AgentProviderInfo {
                 id: Self::OpenRouter.to_static_str(),
@@ -167,7 +160,6 @@ impl AgentProvider {
                 models_list_url: Some("https://openrouter.ai/models"),
                 supported_purposes: vec![AgentPurpose::TextGeneration],
                 text_generation_supports_vision: false,
-                text_generation_supports_tools: false,
             },
             Self::TogetherAI => AgentProviderInfo {
                 id: Self::TogetherAI.to_static_str(),
@@ -179,7 +171,6 @@ impl AgentProvider {
                 models_list_url: Some("https://api.together.xyz/models"),
                 supported_purposes: vec![AgentPurpose::TextGeneration],
                 text_generation_supports_vision: false,
-                text_generation_supports_tools: false,
             },
         }
     }
@@ -201,5 +192,4 @@ pub struct AgentProviderInfo {
     pub models_list_url: Option<&'static str>,
     pub supported_purposes: Vec<AgentPurpose>,
     pub text_generation_supports_vision: bool,
-    pub text_generation_supports_tools: bool,
 }

src/agent/provider/entity/image.rs

@@ -2,7 +2,7 @@ use mxlink::mime;
 
 #[derive(Default)]
 pub struct ImageGenerationParams {
-    pub smallest_size_possible: bool,
+    pub size_override: Option<String>,
 
     pub cheaper_model_switching_allowed: bool,
 
@@ -10,8 +10,8 @@ pub struct ImageGenerationParams {
 }
 
 impl ImageGenerationParams {
-    pub fn with_smallest_size_possible(mut self, value: bool) -> Self {
+    pub fn with_size_override(mut self, value: Option<String>) -> Self {
-        self.smallest_size_possible = value;
+        self.size_override = value;
         self
     }
 
@@ -56,8 +56,8 @@ impl ImageSource {
     }
 }
 
-impl From<ImageSource> for async_openai::types::images::ImageInput {
+impl From<ImageSource> for async_openai::types::ImageInput {
     fn from(value: ImageSource) -> Self {
-        async_openai::types::images::ImageInput::from_vec_u8(value.filename, value.bytes)
+        async_openai::types::ImageInput::from_vec_u8(value.filename, value.bytes)
     }
 }

src/agent/provider/openai/config.rs

@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use super::OPENAI_IMAGE_MODEL_GPT_IMAGE_1_DOT_5;
+use super::OPENAI_IMAGE_MODEL_GPT_IMAGE_1;
 use crate::agent::{default_prompt, provider::ConfigTrait};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -64,9 +64,6 @@ pub struct TextGenerationConfig {
 
     #[serde(default)]
     pub max_context_tokens: u32,
-
-    #[serde(default)]
-    pub tools: ToolsConfig,
 }
 
 impl Default for TextGenerationConfig {
@@ -78,22 +75,12 @@ impl Default for TextGenerationConfig {
             max_response_tokens: None,
             max_completion_tokens: Some(128_000),
             max_context_tokens: 400_000,
-            tools: ToolsConfig::default(),
         }
     }
 }
 
 fn default_text_model_id() -> String {
-    "gpt-5.2".to_owned()
+    "gpt-5".to_owned()
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, Default)]
-pub struct ToolsConfig {
-    #[serde(default)]
-    pub web_search: bool,
-
-    #[serde(default)]
-    pub code_interpreter: bool,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -163,19 +150,19 @@ pub struct ImageGenerationConfig {
     pub model_id: String,
 
     #[serde(default = "default_image_style")]
-    pub style: Option<async_openai::types::images::ImageStyle>,
+    pub style: Option<async_openai::types::ImageStyle>,
 
     #[serde(default = "default_image_size")]
-    pub size: Option<async_openai::types::images::ImageSize>,
+    pub size: Option<async_openai::types::ImageSize>,
 
     #[serde(default = "default_image_quality")]
-    pub quality: Option<async_openai::types::images::ImageQuality>,
+    pub quality: Option<async_openai::types::ImageQuality>,
 }
 
 impl Default for ImageGenerationConfig {
     fn default() -> Self {
         Self {
-            model_id: OPENAI_IMAGE_MODEL_GPT_IMAGE_1_DOT_5.to_owned(),
+            model_id: OPENAI_IMAGE_MODEL_GPT_IMAGE_1.to_owned(),
             style: default_image_style(),
             size: default_image_size(),
             quality: default_image_quality(),
@@ -186,28 +173,23 @@ impl Default for ImageGenerationConfig {
 impl ImageGenerationConfig {
     pub fn model_id_as_openai_image_model(
         &self,
-    ) -> Result<async_openai::types::images::ImageModel, String> {
+    ) -> Result<async_openai::types::ImageModel, String> {
         match self.model_id.as_str() {
-            "dall-e-2" => Ok(async_openai::types::images::ImageModel::DallE2),
+            "dall-e-2" => Ok(async_openai::types::ImageModel::DallE2),
-            "dall-e-3" => Ok(async_openai::types::images::ImageModel::DallE3),
+            "dall-e-3" => Ok(async_openai::types::ImageModel::DallE3),
-            "gpt-image-1" => Ok(async_openai::types::images::ImageModel::GptImage1),
+            other => Ok(async_openai::types::ImageModel::Other(other.to_owned())),
-            "gpt-image-1.5" => Ok(async_openai::types::images::ImageModel::GptImage1dot5),
-            "gpt-image-1-mini" => Ok(async_openai::types::images::ImageModel::GptImage1Mini),
-            other => Ok(async_openai::types::images::ImageModel::Other(
-                other.to_owned(),
-            )),
         }
     }
 }
 
-fn default_image_style() -> Option<async_openai::types::images::ImageStyle> {
+fn default_image_style() -> Option<async_openai::types::ImageStyle> {
     None
 }
 
-fn default_image_size() -> Option<async_openai::types::images::ImageSize> {
+fn default_image_size() -> Option<async_openai::types::ImageSize> {
     None
 }
 
-fn default_image_quality() -> Option<async_openai::types::images::ImageQuality> {
+fn default_image_quality() -> Option<async_openai::types::ImageQuality> {
     None
 }

src/agent/provider/openai/controller.rs

@@ -4,15 +4,10 @@ use async_openai::{
     Client as OpenAIClient,
     config::OpenAIConfig,
     types::{
+        ChatCompletionRequestMessage, CreateChatCompletionRequestArgs, CreateImageEditRequestArgs,
+        CreateImageRequestArgs,
+        DallE2ImageSize, Image, ImageModel, ImageResponseFormat,
         audio::{AudioInput, CreateSpeechRequestArgs, CreateTranscriptionRequestArgs},
-        responses::{
-            CodeInterpreterContainerAuto, CodeInterpreterTool, CodeInterpreterToolContainer,
-            CreateResponseArgs, OutputItem, OutputMessageContent, Tool, WebSearchTool,
-        },
-        images::{
-            CreateImageEditRequestArgs, CreateImageRequestArgs,
-            Image, ImageInput, ImageModel, ImageResponseFormat,
-        },
     },
 };
 
@@ -31,16 +26,21 @@ use crate::{
 use crate::{
     agent::{
         AgentPurpose,
-        provider::entity::{
+        provider::{
+            entity::{
                 ImageEditResult, ImageGenerationResult, ImageSource, PingResult,
                 TextToSpeechParams, TextToSpeechResult,
             },
+            openai::utils::convert_string_to_enum,
+        },
     },
     strings,
 };
 
 use super::config::Config;
 
+use super::OPENAI_IMAGE_MODEL_GPT_IMAGE_1;
+
 #[derive(Debug, Clone)]
 pub struct Controller {
     config: Config,
@@ -129,44 +129,28 @@ impl ControllerTrait for Controller {
             conversation_messages.insert(0, prompt_message);
         }
 
-        let input = super::utils::convert_llm_messages_to_openai_response_input(conversation_messages);
+        let openai_conversation_messages: Vec<ChatCompletionRequestMessage> =
+            super::utils::convert_llm_messages_to_openai_messages(conversation_messages);
 
-        let messages_count = match &input {
+        let messages_count = openai_conversation_messages.len();
-            async_openai::types::responses::InputParam::Items(items) => items.len(),
-            _ => 1,
-        };
 
         let temperature = params
             .temperature_override
             .unwrap_or(text_generation_config.temperature);
 
-        let mut request_builder = CreateResponseArgs::default();
+        let mut request_builder = CreateChatCompletionRequestArgs::default();
 
         request_builder
             .model(&text_generation_config.model_id)
             .temperature(temperature)
-            .input(input);
+            .messages(openai_conversation_messages);
-
-        let mut tools = Vec::new();
-        if text_generation_config.tools.web_search {
-            tools.push(Tool::WebSearch(WebSearchTool::default()));
-        }
-        if text_generation_config.tools.code_interpreter {
-            tools.push(Tool::CodeInterpreter(CodeInterpreterTool {
-                container: CodeInterpreterToolContainer::Auto(
-                    CodeInterpreterContainerAuto::default(),
-                ),
-            }));
-        }
-
-        if !tools.is_empty() {
-            request_builder.tools(tools);
-        }
 
         if let Some(max_response_tokens) = text_generation_config.max_response_tokens {
-            request_builder.max_output_tokens(max_response_tokens);
+            request_builder.max_tokens(max_response_tokens);
-        } else if let Some(max_completion_tokens) = text_generation_config.max_completion_tokens {
+        }
-            request_builder.max_output_tokens(max_completion_tokens);
+
+        if let Some(max_completion_tokens) = text_generation_config.max_completion_tokens {
+            request_builder.max_completion_tokens(max_completion_tokens);
         }
 
         let request = request_builder.build()?;
@@ -176,31 +160,33 @@ impl ControllerTrait for Controller {
                 model = format!("{:?}", request.model),
                 ?messages_count,
                 request = request_as_json,
-                "Sending OpenAI response API request"
+                "Sending OpenAI chat completion API request"
             );
         }
 
-        let response = self.client.responses().create(request).await?;
+        let response = self.client.chat().create(request).await?;
 
         tracing::trace!(
             ?response,
-            "Got response from the OpenAI response API"
+            "Got response from the OpenAI chat completion API"
         );
 
-        for item in response.output {
+        // We only request 1 result, so there should only be 1 choice.
-            if let OutputItem::Message(message) = item {
+        if let Some(choice) = response.choices.into_iter().next() {
-                for content in message.content {
+            match choice.message.content {
-                    if let OutputMessageContent::OutputText(text_content) = content {
+                Some(text) => {
-                        return Ok(TextGenerationResult {
+                    return Ok(TextGenerationResult { text });
-                            text: text_content.text,
-                        });
                 }
+                None => {
+                    return Err(anyhow::anyhow!(
+                        "No content was found in the response choice from the OpenAI chat completion API"
+                    ));
                 }
             }
         }
 
         Err(anyhow::anyhow!(
-            "No response messages choices were returned from the OpenAI response API"
+            "No response messages choices were returned from the OpenAI chat completion API"
         ))
     }
 
@@ -266,13 +252,10 @@ impl ControllerTrait for Controller {
         let model = if params.cheaper_model_switching_allowed {
             // Switch to a cheaper model
             match original_model {
-                ImageModel::DallE2 => ImageModel::DallE2,
+                async_openai::types::ImageModel::DallE2 => async_openai::types::ImageModel::DallE2,
-                ImageModel::DallE3 => ImageModel::DallE2,
+                async_openai::types::ImageModel::DallE3 => async_openai::types::ImageModel::DallE2,
-                ImageModel::GptImage1 => ImageModel::GptImage1Mini,
+                async_openai::types::ImageModel::Other(_) => {
-                ImageModel::GptImage1dot5 => ImageModel::GptImage1Mini,
+                    async_openai::types::ImageModel::DallE2
-                ImageModel::GptImage1Mini => ImageModel::GptImage1Mini,
-                ImageModel::Other(_) => {
-                    ImageModel::DallE2
                 }
             }
         } else {
@@ -283,24 +266,24 @@ impl ControllerTrait for Controller {
             // Switch to a cheaper quality
             match &image_generation_config.quality {
                 Some(quality) => match quality {
-                    async_openai::types::images::ImageQuality::Standard => {
+                    async_openai::types::ImageQuality::Standard => {
-                        Some(async_openai::types::images::ImageQuality::Standard)
+                        Some(async_openai::types::ImageQuality::Standard)
                     }
-                    async_openai::types::images::ImageQuality::HD => {
+                    async_openai::types::ImageQuality::HD => {
-                        Some(async_openai::types::images::ImageQuality::Standard)
+                        Some(async_openai::types::ImageQuality::Standard)
                     }
                     // New quality levels - keep as-is or downgrade to Standard
-                    async_openai::types::images::ImageQuality::High => {
+                    async_openai::types::ImageQuality::High => {
-                        Some(async_openai::types::images::ImageQuality::Standard)
+                        Some(async_openai::types::ImageQuality::Standard)
                     }
-                    async_openai::types::images::ImageQuality::Medium => {
+                    async_openai::types::ImageQuality::Medium => {
-                        Some(async_openai::types::images::ImageQuality::Medium)
+                        Some(async_openai::types::ImageQuality::Medium)
                     }
-                    async_openai::types::images::ImageQuality::Low => {
+                    async_openai::types::ImageQuality::Low => {
-                        Some(async_openai::types::images::ImageQuality::Low)
+                        Some(async_openai::types::ImageQuality::Low)
                     }
-                    async_openai::types::images::ImageQuality::Auto => {
+                    async_openai::types::ImageQuality::Auto => {
-                        Some(async_openai::types::images::ImageQuality::Auto)
+                        Some(async_openai::types::ImageQuality::Auto)
                     }
                 },
                 None => None,
@@ -309,21 +292,20 @@ impl ControllerTrait for Controller {
             image_generation_config.quality.clone()
         };
 
-        let size = if params.smallest_size_possible {
+        let size = params
-            Some(get_sticker_size(&model))
+            .size_override
-        } else {
+            .map(|s| convert_string_to_enum::<async_openai::types::ImageSize>(&s).unwrap())
-            image_generation_config.size
+            .or(image_generation_config.size);
-        };
 
         let response_format = match model.clone() {
             ImageModel::DallE2 => Some(ImageResponseFormat::B64Json),
             ImageModel::DallE3 => Some(ImageResponseFormat::B64Json),
+            ImageModel::Other(model_str) => match model_str.as_str() {
                 // gpt-image-1 only outputs base64 and we don't need to specify the response format.
                 // In fact, specifying the response format results in an error.
-            ImageModel::GptImage1 => None,
+                OPENAI_IMAGE_MODEL_GPT_IMAGE_1 => None,
-            ImageModel::GptImage1Mini => None,
+                _ => Some(ImageResponseFormat::B64Json),
-            ImageModel::GptImage1dot5 => None,
+            },
-            ImageModel::Other(_) => Some(ImageResponseFormat::B64Json),
         };
 
         let mut request_builder = CreateImageRequestArgs::default();
@@ -357,15 +339,15 @@ impl ControllerTrait for Controller {
             "Sending OpenAI image generation API request"
         );
 
-        let response = self.client.images().generate(request).await?;
+        let response = self.client.images().create(request).await?;
 
         if let Some(image) = response.data.into_iter().next() {
             match image.deref() {
-                Image::B64Json {
+                async_openai::types::Image::B64Json {
                     b64_json,
                     revised_prompt,
                 } => {
-                    let bytes = base64_decode(b64_json.as_ref())?;
+                    let bytes = base64_decode(b64_json)?;
 
                     return Ok(ImageGenerationResult {
                         bytes,
@@ -402,15 +384,15 @@ impl ControllerTrait for Controller {
             return Err(anyhow::anyhow!("No image sources provided"));
         }
 
-        let mut image_inputs: Vec<ImageInput> = Vec::new();
+        let mut image_inputs = Vec::new();
         for image in images {
             image_inputs.push(image.into());
         }
 
         let dalle2_size = match image_generation_config.size {
-            Some(async_openai::types::images::ImageSize::S256x256) => Some(async_openai::types::images::ImageSize::S256x256),
+            Some(async_openai::types::ImageSize::S256x256) => Some(DallE2ImageSize::S256x256),
-            Some(async_openai::types::images::ImageSize::S512x512) => Some(async_openai::types::images::ImageSize::S512x512),
+            Some(async_openai::types::ImageSize::S512x512) => Some(DallE2ImageSize::S512x512),
-            Some(async_openai::types::images::ImageSize::S1024x1024) => Some(async_openai::types::images::ImageSize::S1024x1024),
+            Some(async_openai::types::ImageSize::S1024x1024) => Some(DallE2ImageSize::S1024x1024),
             _ => None,
         };
 
@@ -419,18 +401,16 @@ impl ControllerTrait for Controller {
             .map_err(|err| anyhow::anyhow!(err))?;
 
         let response_format = match model.clone() {
-            ImageModel::DallE2 => {
+            async_openai::types::ImageModel::DallE2 => {
-                Some(ImageResponseFormat::B64Json)
+                Some(async_openai::types::ImageResponseFormat::B64Json)
             }
-            ImageModel::DallE3 => {
+            async_openai::types::ImageModel::DallE3 => {
-                Some(ImageResponseFormat::B64Json)
+                Some(async_openai::types::ImageResponseFormat::B64Json)
             }
-            // gpt-image-1 only outputs base64 and we don't need to specify the response format.
+            async_openai::types::ImageModel::Other(model_str) => match model_str.as_str() {
-            // In fact, specifying the response format results in an error.
+                OPENAI_IMAGE_MODEL_GPT_IMAGE_1 => None,
-            ImageModel::GptImage1 => None,
+                _ => Some(async_openai::types::ImageResponseFormat::B64Json),
-            ImageModel::GptImage1Mini => None,
+            },
-            ImageModel::GptImage1dot5 => None,
-            ImageModel::Other(_) => Some(ImageResponseFormat::B64Json),
         };
 
         let mut request_builder = CreateImageEditRequestArgs::default();
@@ -459,12 +439,12 @@ impl ControllerTrait for Controller {
             "Sending OpenAI image edit API request"
         );
 
-        let response = self.client.images().edit(request).await?;
+        let response = self.client.images().create_edit(request).await?;
 
         if let Some(image_data) = response.data.into_iter().next() {
             match image_data.deref() {
                 Image::B64Json { b64_json, .. } => {
-                    let bytes = base64_decode(b64_json.as_ref())?;
+                    let bytes = base64_decode(b64_json)?;
                     return Ok(ImageEditResult {
                         bytes,
                         mime_type: mxlink::mime::IMAGE_PNG,
@@ -636,17 +616,3 @@ fn audio_mime_type_to_file_name(mime_type: &mxlink::mime::Mime) -> Option<String
 
     Some(format!("audio.{}", file_extension))
 }
-
-/// Returns the smallest supported size for stickers based on what the image model supports.
-fn get_sticker_size(model: &ImageModel) -> async_openai::types::images::ImageSize {
-    use async_openai::types::images::ImageSize;
-
-    match model {
-        ImageModel::DallE2 => ImageSize::S256x256,
-        ImageModel::DallE3 => ImageSize::S1024x1024,
-        ImageModel::GptImage1 => ImageSize::S1024x1024,
-        ImageModel::GptImage1Mini => ImageSize::S1024x1024,
-        ImageModel::GptImage1dot5 => ImageSize::S1024x1024,
-        ImageModel::Other(_) => ImageSize::S1024x1024,
-    }
-}

src/agent/provider/openai/mod.rs

@@ -16,7 +16,7 @@ use super::super::AgentInstantiationResult;
 use super::ConfigTrait;
 use super::controller::ControllerType;
 
-pub const OPENAI_IMAGE_MODEL_GPT_IMAGE_1_DOT_5: &str = "gpt-image-1.5";
+pub const OPENAI_IMAGE_MODEL_GPT_IMAGE_1: &str = "gpt-image-1";
 
 pub fn create_controller_from_yaml_value_config(
     agent_id: &str,

src/agent/provider/openai/utils.rs

@@ -1,6 +1,8 @@
-use async_openai::types::responses::{
+use async_openai::types::{
-    EasyInputContent, EasyInputMessage, ImageDetail, InputContent, InputImageContent, InputItem,
+    ChatCompletionRequestAssistantMessageArgs, ChatCompletionRequestMessage,
-    InputParam, MessageType, Role,
+    ChatCompletionRequestMessageContentPartImage, ChatCompletionRequestSystemMessageArgs,
+    ChatCompletionRequestUserMessageArgs, ChatCompletionRequestUserMessageContent,
+    ChatCompletionRequestUserMessageContentPart, ImageUrlArgs,
 };
 
 use crate::conversation::llm::{
@@ -8,20 +10,43 @@ use crate::conversation::llm::{
 };
 use crate::utils::base64::base64_encode;
 
-pub fn convert_llm_messages_to_openai_response_input(
+pub fn convert_llm_messages_to_openai_messages(
     conversation_messages: Vec<LLMMessage>,
-) -> InputParam {
+) -> Vec<ChatCompletionRequestMessage> {
-    let mut items = Vec::with_capacity(conversation_messages.len());
+    let mut openai_conversation_messages: Vec<ChatCompletionRequestMessage> =
+        Vec::with_capacity(conversation_messages.len());
 
     for message in conversation_messages {
-        let role = match message.author {
+        let openai_message = convert_llm_message_to_openai_message(message);
-            LLMAuthor::Prompt => Role::System,
+        if let Some(openai_message) = openai_message {
-            LLMAuthor::Assistant => Role::Assistant,
+            openai_conversation_messages.push(openai_message);
-            LLMAuthor::User => Role::User,
+        }
-        };
+    }
 
-        let content = match message.content {
+    openai_conversation_messages
-            LLMMessageContent::Text(text) => EasyInputContent::Text(text),
+}
+
+fn convert_llm_message_to_openai_message(
+    llm_message: LLMMessage,
+) -> Option<ChatCompletionRequestMessage> {
+    match &llm_message.content {
+        LLMMessageContent::Text(text) => Some(match llm_message.author {
+            LLMAuthor::Prompt => ChatCompletionRequestSystemMessageArgs::default()
+                .content(text.clone())
+                .build()
+                .expect("Failed building OpenAI system message")
+                .into(),
+            LLMAuthor::Assistant => ChatCompletionRequestAssistantMessageArgs::default()
+                .content(text.clone())
+                .build()
+                .expect("Failed building OpenAI assistant message")
+                .into(),
+            LLMAuthor::User => ChatCompletionRequestUserMessageArgs::default()
+                .content(text.clone())
+                .build()
+                .expect("Failed building OpenAI user message")
+                .into(),
+        }),
         LLMMessageContent::Image(image_details) => {
             let image_url = format!(
                 "data:{};base64,{}",
@@ -29,20 +54,49 @@ pub fn convert_llm_messages_to_openai_response_input(
                 base64_encode(&image_details.data)
             );
 
-                EasyInputContent::ContentList(vec![InputContent::InputImage(InputImageContent {
+            let part = ChatCompletionRequestUserMessageContentPart::ImageUrl(
-                    image_url: Some(image_url),
+                ChatCompletionRequestMessageContentPartImage {
-                    detail: ImageDetail::Auto,
+                    image_url: ImageUrlArgs::default()
-                    file_id: None,
+                        .url(image_url)
-                })])
+                        .build()
-            }
+                        .expect("Failed building OpenAI image url"),
-        };
+                },
+            );
 
-        items.push(InputItem::EasyMessage(EasyInputMessage {
+            let message_content = ChatCompletionRequestUserMessageContent::Array(vec![part]);
-            r#type: MessageType::Message,
-            role,
-            content,
-        }));
-    }
 
-    InputParam::Items(items)
+            match llm_message.author {
+                LLMAuthor::User => Some(
+                    ChatCompletionRequestUserMessageArgs::default()
+                        .content(message_content)
+                        .build()
+                        .expect("Failed building OpenAI user message")
+                        .into(),
+                ),
+                _ => {
+                    tracing::warn!(
+                        "OpenAI API does not support image content for messages authored by {:?}. This message part will be skipped.",
+                        llm_message.author
+                    );
+                    None
+                }
+            }
+        }
+    }
+}
+
+pub(super) fn convert_string_to_enum<T>(value: &str) -> Result<T, String>
+where
+    T: serde::de::DeserializeOwned,
+{
+    // This is a hacky way to construct an enum from the string we have.
+    let enum_result: serde_json::Result<T> = serde_json::from_str(&format!("\"{}\"", value));
+    match enum_result {
+        Ok(enum_result) => Ok(enum_result),
+        Err(err) => {
+            tracing::debug!(?err, "Failed to parse into enum");
+
+            Err(format!("The value ({}) is not supported.", value))
+        }
+    }
 }

src/agent/provider/openai_compat/config.rs

@@ -95,7 +95,6 @@ impl TryInto<OpenAITextGenerationConfig> for TextGenerationConfig {
             max_response_tokens: self.max_response_tokens,
             max_completion_tokens: None,
             max_context_tokens: self.max_context_tokens,
-            tools: Default::default(),
         })
     }
 }
@@ -225,7 +224,7 @@ impl TryInto<OpenAIImageGenerationConfig> for ImageGenerationConfig {
 
     fn try_into(self) -> Result<OpenAIImageGenerationConfig, Self::Error> {
         let size = if let Some(size) = &self.size {
-            Some(convert_string_to_enum::<async_openai::types::images::ImageSize>(
+            Some(convert_string_to_enum::<async_openai::types::ImageSize>(
                 size,
             )?)
         } else {
@@ -233,7 +232,7 @@ impl TryInto<OpenAIImageGenerationConfig> for ImageGenerationConfig {
         };
 
         let style = if let Some(style) = &self.style {
-            Some(convert_string_to_enum::<async_openai::types::images::ImageStyle>(
+            Some(convert_string_to_enum::<async_openai::types::ImageStyle>(
                 style,
             )?)
         } else {
@@ -241,7 +240,7 @@ impl TryInto<OpenAIImageGenerationConfig> for ImageGenerationConfig {
         };
 
         let quality = if let Some(quality) = &self.quality {
-            Some(convert_string_to_enum::<async_openai::types::images::ImageQuality>(
+            Some(convert_string_to_enum::<async_openai::types::ImageQuality>(
                 quality,
             )?)
         } else {

src/agent/provider/openai_compat/controller.rs

@@ -3,8 +3,6 @@ use etke_openai_api_rust::chat::{ChatApi, ChatBody};
 use etke_openai_api_rust::images::{ImagesApi, ImagesBody};
 use etke_openai_api_rust::{Auth, Message, OpenAI};
 
-const SMALLEST_IMAGE_SIZE: &str = "256x256";
-
 use super::super::ControllerTrait;
 use crate::utils::base64::base64_decode;
 use crate::{
@@ -305,11 +303,9 @@ impl ControllerTrait for Controller {
         // when they span multiple lines.
         let prompt = prompt.replace("\n", " ");
 
-        let size: Option<String> = if params.smallest_size_possible {
+        let size: Option<String> = params
-            Some(SMALLEST_IMAGE_SIZE.to_owned())
+            .size_override
-        } else {
+            .or_else(|| image_generation_config.size.clone());
-            image_generation_config.size.clone()
-        };
 
         let request = ImagesBody {
             model: Some(image_generation_config.model_id.to_owned()),

src/bot/implementation.rs

@@ -1,4 +1,3 @@
-use std::fs;
 use std::sync::Arc;
 use std::{future::Future, pin::Pin};
 
@@ -19,13 +18,12 @@ use mxlink::helpers::account_data_config::{
     RoomConfigManager as AccountDataRoomConfigManager,
 };
 use mxlink::helpers::encryption::Manager as EncryptionManager;
-use mxlink::mime::Mime;
 
 use crate::agent::Manager as AgentManager;
 use crate::entity::catch_up_marker::{
     CatchUpMarker, CatchUpMarkerManager, DelayedCatchUpMarkerManager,
 };
-use crate::entity::cfg::{Avatar, Config};
+use crate::entity::cfg::Config;
 use crate::entity::globalconfig::{GlobalConfig, GlobalConfigurationManager};
 use crate::entity::roomconfig::{RoomConfig, RoomConfigurationManager};
 
@@ -318,35 +316,8 @@ impl Bot {
             }
         }
 
-        let desired_avatar: Option<(Vec<u8>, Mime)> = match &self.inner.config.user.avatar {
-            Avatar::Keep => {
-                tracing::info!("Avatar configured to keep current, skipping avatar management");
-                None
-            }
-            Avatar::Default => {
-                tracing::info!("Avatar configured to use default");
-                Some((
-                    LOGO_BYTES.to_vec(),
-                    LOGO_MIME_TYPE
-                        .parse()
-                        .expect("Failed parsing mime type for logo"),
-                ))
-            }
-            Avatar::Custom(avatar_path) => {
-                tracing::info!(?avatar_path, "Avatar configured to use custom path");
-                let bytes = fs::read(avatar_path).map_err(|e| {
-                    anyhow::anyhow!("Failed reading avatar from {:?}: {:?}", avatar_path, e)
-                })?;
-                let mime = mime_guess::from_path(avatar_path).first_or_octet_stream();
-                tracing::debug!(?mime, bytes_len = bytes.len(), "Loaded custom avatar");
-                Some((bytes, mime))
-            }
-        };
-
-        if let Some((desired_bytes, mime_type)) = desired_avatar {
         let should_update_avatar = match &current_avatar_url {
             Some(avatar_url) => {
-                    tracing::debug!(?avatar_url, "Fetching current avatar to compare");
                 let request = MediaRequestParameters {
                     source: MediaSource::Plain(avatar_url.to_owned()),
                     format: MediaFormat::File,
@@ -357,33 +328,22 @@ impl Bot {
                     .await
                     .map_err(|e| anyhow::anyhow!("Failed fetching existing avatar: {:?}", e))?;
 
-                    let needs_update = content.as_slice() != desired_bytes;
+                content.as_slice() != LOGO_BYTES
-
-                    tracing::debug!(
-                        current_bytes_len = content.len(),
-                        desired_bytes_len = desired_bytes.len(),
-                        ?needs_update,
-                        "Compared current and desired avatar"
-                    );
-
-                    needs_update
-                }
-                None => {
-                    tracing::debug!("No current avatar set, will upload");
-                    true
             }
+            None => true,
         };
 
         if should_update_avatar {
             tracing::info!("Updating avatar..");
+
+            let mime_type = LOGO_MIME_TYPE
+                .parse()
+                .expect("Failed parsing mime type for logo");
+
             account
-                    .upload_avatar(&mime_type, desired_bytes)
+                .upload_avatar(&mime_type, LOGO_BYTES.to_vec())
                 .await
                 .map_err(|e| anyhow::anyhow!("Failed uploading avatar: {:?}", e))?;
-                tracing::info!("Avatar updated successfully");
-            } else {
-                tracing::debug!("Avatar already up to date, skipping upload");
-            }
         }
 
         Ok(())

src/bot/load_config.rs

@@ -5,7 +5,7 @@ use anyhow::anyhow;
 
 use crate::agent::AgentPurpose;
 
-pub use crate::entity::cfg::{Avatar, Config, defaults as cfg_defaults, env as cfg_env};
+pub use crate::entity::cfg::{Config, defaults as cfg_defaults, env as cfg_env};
 
 pub fn load() -> anyhow::Result<Config> {
     let config_file_path = env::var(cfg_env::BAIBOT_CONFIG_FILE_PATH)
@@ -33,13 +33,7 @@ pub fn load() -> anyhow::Result<Config> {
             cfg_env::BAIBOT_USER_ENCRYPTION_RECOVERY_PASSPHRASE => {
                 config.user.encryption.recovery_passphrase = Some(value);
             }
-            cfg_env::BAIBOT_USER_ENCRYPTION_RECOVERY_RESET_ALLOWED => {
-                config.user.encryption.recovery_reset_allowed = value.parse::<bool>()?;
-            }
             cfg_env::BAIBOT_USER_NAME => config.user.name = value,
-            cfg_env::BAIBOT_USER_AVATAR => {
-                config.user.avatar = Avatar::from_string(value);
-            }
             cfg_env::BAIBOT_COMMAND_PREFIX => config.command_prefix = value,
             cfg_env::BAIBOT_ROOM_POST_JOIN_SELF_INTRODUCTION_ENABLED => {
                 config.room.post_join_self_introduction_enabled = value.parse::<bool>()?;
@@ -57,9 +51,6 @@ pub fn load() -> anyhow::Result<Config> {
             cfg_env::BAIBOT_PERSISTENCE_DATA_DIR_PATH => {
                 config.persistence.data_dir_path = Some(value);
             }
-            cfg_env::BAIBOT_PERSISTENCE_SESSION_ENCRYPTION_KEY => {
-                config.persistence.session_encryption_key = Some(value);
-            }
             cfg_env::BAIBOT_PERSISTENCE_CONFIG_ENCRYPTION_KEY => {
                 config.persistence.config_encryption_key = Some(value);
             }

src/controller/image/generation.rs

@@ -12,6 +12,9 @@ use crate::strings;
 use crate::utils::mime::get_file_extension;
 use crate::{Bot, entity::MessageContext};
 
+// We may make this configurable (per room, etc.) in the future, but for now it's hardcoded.
+const STICKER_SIZE: &str = "256x256";
+
 pub async fn handle_image(
     bot: &Bot,
     matrix_link: MatrixLink,
@@ -174,7 +177,7 @@ pub async fn handle_sticker(
     );
 
     let params = ImageGenerationParams::default()
-        .with_smallest_size_possible(true)
+        .with_size_override(Some(STICKER_SIZE.to_owned()))
         .with_cheaper_model_switching_allowed(true)
         .with_cheaper_quality_switching_allowed(true);
 

src/entity/cfg/config.rs

@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 
 use mxlink::helpers::encryption::EncryptionKey;
-use serde::{Deserialize, Deserializer, Serialize};
+use serde::{Deserialize, Serialize};
 
 use crate::{
     agent::{AgentDefinition, AgentPurpose, PublicIdentifier},
@@ -83,52 +83,6 @@ impl ConfigHomeserver {
     }
 }
 
-/// Configuration for the bot's avatar.
-///
-/// - `Default`: Use the built-in default avatar (null, empty string, or missing in config)
-/// - `Keep`: Don't touch the avatar, keep whatever is already set ("keep" in config)
-/// - `Custom(String)`: Use a custom avatar from the specified file path
-#[derive(Debug, Clone, PartialEq, Serialize)]
-pub enum Avatar {
-    /// Use the built-in default avatar
-    Default,
-    /// Keep the current avatar, don't change it
-    Keep,
-    /// Use a custom avatar from the specified file path
-    Custom(String),
-}
-
-impl Default for Avatar {
-    fn default() -> Self {
-        Avatar::Default
-    }
-}
-
-impl<'de> Deserialize<'de> for Avatar {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        let value: Option<String> = Option::deserialize(deserializer)?;
-        Ok(match value {
-            None => Avatar::Default,
-            Some(s) => Avatar::from_string(s),
-        })
-    }
-}
-
-impl Avatar {
-    pub fn from_string(value: String) -> Self {
-        if value.is_empty() {
-            Avatar::Default
-        } else if value.eq_ignore_ascii_case("keep") {
-            Avatar::Keep
-        } else {
-            Avatar::Custom(value)
-        }
-    }
-}
-
 #[derive(Debug, Serialize, Deserialize)]
 pub struct ConfigUser {
     pub mxid_localpart: String,
@@ -139,9 +93,6 @@ pub struct ConfigUser {
 
     #[serde(default)]
     pub encryption: ConfigUserEncryption,
-
-    #[serde(default)]
-    pub avatar: Avatar,
 }
 
 impl ConfigUser {

src/entity/cfg/env.rs

@@ -6,11 +6,8 @@ pub const BAIBOT_HOMESERVER_URL: &str = "BAIBOT_HOMESERVER_URL";
 pub const BAIBOT_USER_MXID_LOCALPART: &str = "BAIBOT_USER_MXID_LOCALPART";
 pub const BAIBOT_USER_PASSWORD: &str = "BAIBOT_USER_PASSWORD";
 pub const BAIBOT_USER_NAME: &str = "BAIBOT_USER_NAME";
-pub const BAIBOT_USER_AVATAR: &str = "BAIBOT_USER_AVATAR";
 pub const BAIBOT_USER_ENCRYPTION_RECOVERY_PASSPHRASE: &str =
     "BAIBOT_USER_ENCRYPTION_RECOVERY_PASSPHRASE";
-pub const BAIBOT_USER_ENCRYPTION_RECOVERY_RESET_ALLOWED: &str =
-    "BAIBOT_USER_ENCRYPTION_RECOVERY_RESET_ALLOWED";
 
 pub const BAIBOT_COMMAND_PREFIX: &str = "BAIBOT_COMMAND_PREFIX";
 

src/entity/cfg/mod.rs

@@ -2,4 +2,4 @@ mod config;
 pub mod defaults;
 pub mod env;
 
-pub use config::{Avatar, Config};
+pub use config::Config;

src/strings/provider.rs

@@ -109,21 +109,11 @@ pub fn help_provider_details(id: &str, info: &AgentProviderInfo) -> String {
         let mut purpose_line = format!("{} {}", purpose.emoji(), purpose.as_str());
 
         if let AgentPurpose::TextGeneration = purpose {
-            let mut extras = vec![];
-
             if info.text_generation_supports_vision {
-                extras.push("incl. vision");
+                purpose_line = format!("{} ({})", purpose_line, "incl. vision");
             } else {
-                extras.push("no vision");
+                purpose_line = format!("{} ({})", purpose_line, "no vision");
             }
-
-            if info.text_generation_supports_tools {
-                extras.push("incl. tools");
-            } else {
-                extras.push("no tools");
-            }
-
-            purpose_line = format!("{} ({})", purpose_line, extras.join(", "));
         }
 
         capabilities.push(purpose_line);

src/strings/usage.rs

@@ -64,7 +64,7 @@ To create a sticker, send a command like `%command_prefix% sticker A huge bowl o
 
 The difference from **creating images** is that the bot will:
 
-- create a smaller-resolution image (as small as the model allows) - smaller/quicker, but still good enough for a sticker
+- create a smaller-resolution image (`256x256`) - smaller/quicker, but still good enough for a sticker
 - potentially switch to a different (cheaper or otherwise more suitable) model, if available
 - post the image directly to the room (as a reply to your message), without starting a threaded conversation
 "#;