Release 1.9.0

Switches `async-openai` from our own etkecc fork (0.28.1-patched) to the
official crates.io version 0.31.1.

We adapt to async-openai's types reorganization and making use of crate
features to only enable what we need.

CHANGELOG.md

@@ -1,3 +1,19 @@
+# (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.8.1"
+version = "1.9.0"
 edition = "2024"
 
 [lib]
@@ -17,7 +17,7 @@ path = "src/lib.rs"
 [dependencies]
 anthropic = { git = "https://github.com/etkecc/anthropic-rs.git", branch = "fix-content-block-image" }
 anyhow = "1.0.*"
-async-openai = { git = "https://github.com/64bit/async-openai", branch = "main" }
+async-openai = { version = "0.31.1", features = ["audio", "chat-completion", "image"] }
 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.
@@ -27,13 +27,13 @@ mxidwc = "1.0.*"
 mxlink = ">=1.10.0"
 etke_openai_api_rust = "0.1.*"
 quick_cache = "0.6.*"
-regex = "1.11.*"
+regex = "1.12.*"
 serde = { version = "1.0.*", features = ["derive"], default-features = false }
 serde_json = "1.0.*"
 serde_yaml = "0.9.*"
-tempfile = "3.21.*"
+tempfile = "3.23.*"
-tiktoken-rs = { version = "0.7.*", default-features = false }
+tiktoken-rs = { version = "0.9.*", default-features = false }
-tokio = { version = "1.47.*", features = ["rt", "rt-multi-thread", "macros"] }
+tokio = { version = "1.48.*", 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.90.0-slim-trixie AS build
+FROM docker.io/rust:1.91.1-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.90.0-slim-trixie AS build
+FROM docker.io/rust:1.91.1-slim-trixie AS build
 
 RUN apt-get update && apt-get install -y build-essential pkg-config libssl-dev libsqlite3-dev
 

docs/providers.md

@@ -125,10 +125,7 @@ For services which are not fully compatible with the OpenAI API, consider using
   - 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:
+💡 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).
-
-- 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

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

@@ -1,24 +0,0 @@
-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,11 +1,14 @@
 base_url: https://api.openai.com/v1
 api_key: YOUR_API_KEY_HERE
 text_generation:
-  model_id: gpt-5
+  model_id: gpt-5.1
   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: 16384
+  # Reasoning models need to use `max_completion_tokens` instead of `max_response_tokens`.
-  max_context_tokens: 128000
+  # 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
 speech_to_text:
   model_id: whisper-1
 text_to_speech:

etc/app/config.yml.dist

@@ -76,11 +76,12 @@ agents:
     #     base_url: https://api.openai.com/v1
     #     api_key: ""
     #     text_generation:
-    #       model_id: gpt-5
+    #       model_id: gpt-5.1
     #       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
     #     speech_to_text:

etc/services/core/compose.yml

@@ -1,6 +1,6 @@
 services:
   postgres:
-    image: docker.io/postgres:18.0-alpine
+    image: docker.io/postgres:18.1-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.140.0
+    image: ghcr.io/element-hq/synapse:v1.143.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.2
+    image: ghcr.io/element-hq/element-web:v1.12.4
     user: "${UID}:${GID}"
     restart: unless-stopped
     environment:

etc/services/ollama/compose.yml

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

src/agent/provider/entity/image.rs

@@ -56,8 +56,8 @@ impl ImageSource {
     }
 }
 
-impl From<ImageSource> for async_openai::types::ImageInput {
+impl From<ImageSource> for async_openai::types::images::ImageInput {
     fn from(value: ImageSource) -> Self {
-        async_openai::types::ImageInput::from_vec_u8(value.filename, value.bytes)
+        async_openai::types::images::ImageInput::from_vec_u8(value.filename, value.bytes)
     }
 }

src/agent/provider/openai/config.rs

@@ -80,7 +80,7 @@ impl Default for TextGenerationConfig {
 }
 
 fn default_text_model_id() -> String {
-    "gpt-5".to_owned()
+    "gpt-5.1".to_owned()
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -150,13 +150,13 @@ pub struct ImageGenerationConfig {
     pub model_id: String,
 
     #[serde(default = "default_image_style")]
-    pub style: Option<async_openai::types::ImageStyle>,
+    pub style: Option<async_openai::types::images::ImageStyle>,
 
     #[serde(default = "default_image_size")]
-    pub size: Option<async_openai::types::ImageSize>,
+    pub size: Option<async_openai::types::images::ImageSize>,
 
     #[serde(default = "default_image_quality")]
-    pub quality: Option<async_openai::types::ImageQuality>,
+    pub quality: Option<async_openai::types::images::ImageQuality>,
 }
 
 impl Default for ImageGenerationConfig {
@@ -173,23 +173,25 @@ impl Default for ImageGenerationConfig {
 impl ImageGenerationConfig {
     pub fn model_id_as_openai_image_model(
         &self,
-    ) -> Result<async_openai::types::ImageModel, String> {
+    ) -> Result<async_openai::types::images::ImageModel, String> {
         match self.model_id.as_str() {
-            "dall-e-2" => Ok(async_openai::types::ImageModel::DallE2),
+            "dall-e-2" => Ok(async_openai::types::images::ImageModel::DallE2),
-            "dall-e-3" => Ok(async_openai::types::ImageModel::DallE3),
+            "dall-e-3" => Ok(async_openai::types::images::ImageModel::DallE3),
-            other => Ok(async_openai::types::ImageModel::Other(other.to_owned())),
+            "gpt-image-1" => Ok(async_openai::types::images::ImageModel::GptImage1),
+            "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::ImageStyle> {
+fn default_image_style() -> Option<async_openai::types::images::ImageStyle> {
     None
 }
 
-fn default_image_size() -> Option<async_openai::types::ImageSize> {
+fn default_image_size() -> Option<async_openai::types::images::ImageSize> {
     None
 }
 
-fn default_image_quality() -> Option<async_openai::types::ImageQuality> {
+fn default_image_quality() -> Option<async_openai::types::images::ImageQuality> {
     None
 }

src/agent/provider/openai/controller.rs

@@ -4,10 +4,12 @@ use async_openai::{
     Client as OpenAIClient,
     config::OpenAIConfig,
     types::{
-        ChatCompletionRequestMessage, CreateChatCompletionRequestArgs, CreateImageEditRequestArgs,
-        CreateImageRequestArgs,
-        DallE2ImageSize, Image, ImageModel, ImageResponseFormat,
         audio::{AudioInput, CreateSpeechRequestArgs, CreateTranscriptionRequestArgs},
+        chat::{ChatCompletionRequestMessage, CreateChatCompletionRequestArgs},
+        images::{
+            CreateImageEditRequestArgs, CreateImageRequestArgs,
+            Image, ImageInput, ImageModel, ImageResponseFormat,
+        },
     },
 };
 
@@ -39,8 +41,6 @@ use crate::{
 
 use super::config::Config;
 
-use super::OPENAI_IMAGE_MODEL_GPT_IMAGE_1;
-
 #[derive(Debug, Clone)]
 pub struct Controller {
     config: Config,
@@ -252,11 +252,12 @@ impl ControllerTrait for Controller {
         let model = if params.cheaper_model_switching_allowed {
             // Switch to a cheaper model
             match original_model {
-                async_openai::types::ImageModel::DallE2 => async_openai::types::ImageModel::DallE2,
+                ImageModel::DallE2 => ImageModel::DallE2,
-                async_openai::types::ImageModel::DallE3 => async_openai::types::ImageModel::DallE2,
+                ImageModel::DallE3 => ImageModel::DallE2,
-                async_openai::types::ImageModel::Other(_) => {
+                ImageModel::Other(_) => {
-                    async_openai::types::ImageModel::DallE2
+                    ImageModel::DallE2
                 }
+                _ => original_model.clone(),
             }
         } else {
             original_model
@@ -266,24 +267,24 @@ impl ControllerTrait for Controller {
             // Switch to a cheaper quality
             match &image_generation_config.quality {
                 Some(quality) => match quality {
-                    async_openai::types::ImageQuality::Standard => {
+                    async_openai::types::images::ImageQuality::Standard => {
-                        Some(async_openai::types::ImageQuality::Standard)
+                        Some(async_openai::types::images::ImageQuality::Standard)
                     }
-                    async_openai::types::ImageQuality::HD => {
+                    async_openai::types::images::ImageQuality::HD => {
-                        Some(async_openai::types::ImageQuality::Standard)
+                        Some(async_openai::types::images::ImageQuality::Standard)
                     }
                     // New quality levels - keep as-is or downgrade to Standard
-                    async_openai::types::ImageQuality::High => {
+                    async_openai::types::images::ImageQuality::High => {
-                        Some(async_openai::types::ImageQuality::Standard)
+                        Some(async_openai::types::images::ImageQuality::Standard)
                     }
-                    async_openai::types::ImageQuality::Medium => {
+                    async_openai::types::images::ImageQuality::Medium => {
-                        Some(async_openai::types::ImageQuality::Medium)
+                        Some(async_openai::types::images::ImageQuality::Medium)
                     }
-                    async_openai::types::ImageQuality::Low => {
+                    async_openai::types::images::ImageQuality::Low => {
-                        Some(async_openai::types::ImageQuality::Low)
+                        Some(async_openai::types::images::ImageQuality::Low)
                     }
-                    async_openai::types::ImageQuality::Auto => {
+                    async_openai::types::images::ImageQuality::Auto => {
-                        Some(async_openai::types::ImageQuality::Auto)
+                        Some(async_openai::types::images::ImageQuality::Auto)
                     }
                 },
                 None => None,
@@ -294,18 +295,17 @@ impl ControllerTrait for Controller {
 
         let size = params
             .size_override
-            .map(|s| convert_string_to_enum::<async_openai::types::ImageSize>(&s).unwrap())
+            .map(|s| convert_string_to_enum::<async_openai::types::images::ImageSize>(&s).unwrap())
             .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.
-                // 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.
-                // 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::Other(_) => Some(ImageResponseFormat::B64Json),
-            },
         };
 
         let mut request_builder = CreateImageRequestArgs::default();
@@ -339,15 +339,15 @@ impl ControllerTrait for Controller {
             "Sending OpenAI image generation API request"
         );
 
-        let response = self.client.images().create(request).await?;
+        let response = self.client.images().generate(request).await?;
 
         if let Some(image) = response.data.into_iter().next() {
             match image.deref() {
-                async_openai::types::Image::B64Json {
+                Image::B64Json {
                     b64_json,
                     revised_prompt,
                 } => {
-                    let bytes = base64_decode(b64_json)?;
+                    let bytes = base64_decode(b64_json.as_ref())?;
 
                     return Ok(ImageGenerationResult {
                         bytes,
@@ -384,15 +384,15 @@ impl ControllerTrait for Controller {
             return Err(anyhow::anyhow!("No image sources provided"));
         }
 
-        let mut image_inputs = Vec::new();
+        let mut image_inputs: Vec<ImageInput> = Vec::new();
         for image in images {
             image_inputs.push(image.into());
         }
 
         let dalle2_size = match image_generation_config.size {
-            Some(async_openai::types::ImageSize::S256x256) => Some(DallE2ImageSize::S256x256),
+            Some(async_openai::types::images::ImageSize::S256x256) => Some(async_openai::types::images::ImageSize::S256x256),
-            Some(async_openai::types::ImageSize::S512x512) => Some(DallE2ImageSize::S512x512),
+            Some(async_openai::types::images::ImageSize::S512x512) => Some(async_openai::types::images::ImageSize::S512x512),
-            Some(async_openai::types::ImageSize::S1024x1024) => Some(DallE2ImageSize::S1024x1024),
+            Some(async_openai::types::images::ImageSize::S1024x1024) => Some(async_openai::types::images::ImageSize::S1024x1024),
             _ => None,
         };
 
@@ -401,16 +401,17 @@ impl ControllerTrait for Controller {
             .map_err(|err| anyhow::anyhow!(err))?;
 
         let response_format = match model.clone() {
-            async_openai::types::ImageModel::DallE2 => {
+            ImageModel::DallE2 => {
-                Some(async_openai::types::ImageResponseFormat::B64Json)
+                Some(ImageResponseFormat::B64Json)
             }
-            async_openai::types::ImageModel::DallE3 => {
+            ImageModel::DallE3 => {
-                Some(async_openai::types::ImageResponseFormat::B64Json)
+                Some(ImageResponseFormat::B64Json)
             }
-            async_openai::types::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.
-                OPENAI_IMAGE_MODEL_GPT_IMAGE_1 => None,
+            // In fact, specifying the response format results in an error.
-                _ => Some(async_openai::types::ImageResponseFormat::B64Json),
+            ImageModel::GptImage1 => None,
-            },
+            ImageModel::GptImage1Mini => None,
+            ImageModel::Other(_) => Some(ImageResponseFormat::B64Json),
         };
 
         let mut request_builder = CreateImageEditRequestArgs::default();
@@ -439,12 +440,12 @@ impl ControllerTrait for Controller {
             "Sending OpenAI image edit API request"
         );
 
-        let response = self.client.images().create_edit(request).await?;
+        let response = self.client.images().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)?;
+                    let bytes = base64_decode(b64_json.as_ref())?;
                     return Ok(ImageEditResult {
                         bytes,
                         mime_type: mxlink::mime::IMAGE_PNG,

src/agent/provider/openai/utils.rs

@@ -1,8 +1,12 @@
 use async_openai::types::{
-    ChatCompletionRequestAssistantMessageArgs, ChatCompletionRequestMessage,
+    chat::{
-    ChatCompletionRequestMessageContentPartImage, ChatCompletionRequestSystemMessageArgs,
+        ChatCompletionRequestAssistantMessageArgs, ChatCompletionRequestMessage,
-    ChatCompletionRequestUserMessageArgs, ChatCompletionRequestUserMessageContent,
+        ChatCompletionRequestMessageContentPartImage,
-    ChatCompletionRequestUserMessageContentPart, ImageUrlArgs,
+        ChatCompletionRequestSystemMessageArgs,
+        ChatCompletionRequestUserMessageArgs, ChatCompletionRequestUserMessageContent,
+        ChatCompletionRequestUserMessageContentPart,
+        ImageUrlArgs,
+    },
 };
 
 use crate::conversation::llm::{

src/agent/provider/openai_compat/config.rs

@@ -224,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::ImageSize>(
+            Some(convert_string_to_enum::<async_openai::types::images::ImageSize>(
                 size,
             )?)
         } else {
@@ -232,7 +232,7 @@ impl TryInto<OpenAIImageGenerationConfig> for ImageGenerationConfig {
         };
 
         let style = if let Some(style) = &self.style {
-            Some(convert_string_to_enum::<async_openai::types::ImageStyle>(
+            Some(convert_string_to_enum::<async_openai::types::images::ImageStyle>(
                 style,
             )?)
         } else {
@@ -240,7 +240,7 @@ impl TryInto<OpenAIImageGenerationConfig> for ImageGenerationConfig {
         };
 
         let quality = if let Some(quality) = &self.quality {
-            Some(convert_string_to_enum::<async_openai::types::ImageQuality>(
+            Some(convert_string_to_enum::<async_openai::types::images::ImageQuality>(
                 quality,
             )?)
         } else {

src/bot/load_config.rs

@@ -33,6 +33,9 @@ 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_COMMAND_PREFIX => config.command_prefix = value,
             cfg_env::BAIBOT_ROOM_POST_JOIN_SELF_INTRODUCTION_ENABLED => {
@@ -51,6 +54,9 @@ 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/entity/cfg/env.rs

@@ -8,6 +8,8 @@ pub const BAIBOT_USER_PASSWORD: &str = "BAIBOT_USER_PASSWORD";
 pub const BAIBOT_USER_NAME: &str = "BAIBOT_USER_NAME";
 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";