Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b920b6e556 | ||
|
|
7136d34843 | ||
|
|
e0b4a40dd8 | ||
|
|
691aeeb1c7 | ||
|
|
257ffae9e7 | ||
|
|
f7bf3d7b60 | ||
|
|
3a88b0d656 | ||
|
|
08c689a889 | ||
|
|
ae8e878817 | ||
|
|
edbd72ece6 | ||
|
|
22906aa2d3 | ||
|
|
99bde53ef6 | ||
|
|
b3fd8e548f | ||
|
|
062fbbb8ef | ||
|
|
2801c78ad9 |
27
CHANGELOG.md
27
CHANGELOG.md
@@ -1,3 +1,30 @@
|
|||||||
|
# (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
|
# (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).
|
- (**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).
|
||||||
|
|||||||
542
Cargo.lock
generated
542
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -7,7 +7,7 @@ license = "AGPL-3.0-or-later"
|
|||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
keywords = ["matrix", "chat", "bot", "AI", "LLM"]
|
keywords = ["matrix", "chat", "bot", "AI", "LLM"]
|
||||||
include = ["/etc/assets/baibot-torso-768.png", "/src", "/README.md", "/CHANGELOG.md", "/LICENSE"]
|
include = ["/etc/assets/baibot-torso-768.png", "/src", "/README.md", "/CHANGELOG.md", "/LICENSE"]
|
||||||
version = "1.10.0"
|
version = "1.13.0"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
@@ -17,12 +17,13 @@ path = "src/lib.rs"
|
|||||||
[dependencies]
|
[dependencies]
|
||||||
anthropic = { git = "https://github.com/etkecc/anthropic-rs.git", branch = "fix-content-block-image" }
|
anthropic = { git = "https://github.com/etkecc/anthropic-rs.git", branch = "fix-content-block-image" }
|
||||||
anyhow = "1.0.*"
|
anyhow = "1.0.*"
|
||||||
async-openai = { version = "0.31.1", features = ["audio", "chat-completion", "image"] }
|
async-openai = { version = "0.32.3", features = ["audio", "chat-completion", "image"] }
|
||||||
base64 = "0.22.*"
|
base64 = "0.22.*"
|
||||||
chrono = { version = "0.4.*", default-features = false, features = ["std", "now"] }
|
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'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
|
# 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.16.0", default-features = false, features = ["native-tls"] }
|
||||||
|
mime_guess = "2.0.*"
|
||||||
mxidwc = "1.0.*"
|
mxidwc = "1.0.*"
|
||||||
mxlink = ">=1.11.0"
|
mxlink = ">=1.11.0"
|
||||||
etke_openai_api_rust = "0.1.*"
|
etke_openai_api_rust = "0.1.*"
|
||||||
@@ -31,9 +32,9 @@ regex = "1.12.*"
|
|||||||
serde = { version = "1.0.*", features = ["derive"], default-features = false }
|
serde = { version = "1.0.*", features = ["derive"], default-features = false }
|
||||||
serde_json = "1.0.*"
|
serde_json = "1.0.*"
|
||||||
serde_yaml = "0.9.*"
|
serde_yaml = "0.9.*"
|
||||||
tempfile = "3.23.*"
|
tempfile = "3.24.*"
|
||||||
tiktoken-rs = { version = "0.9.*", default-features = false }
|
tiktoken-rs = { version = "0.9.*", default-features = false }
|
||||||
tokio = { version = "1.48.*", features = ["rt", "rt-multi-thread", "macros"] }
|
tokio = { version = "1.49.*", features = ["rt", "rt-multi-thread", "macros"] }
|
||||||
tracing = "0.1.*"
|
tracing = "0.1.*"
|
||||||
tracing-subscriber = { version = "0.3.*", features = ["env-filter"] }
|
tracing-subscriber = { version = "0.3.*", features = ["env-filter"] }
|
||||||
url = "2.5.*"
|
url = "2.5.*"
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
# #
|
# #
|
||||||
#######################################
|
#######################################
|
||||||
|
|
||||||
FROM docker.io/rust:1.91.1-slim-trixie AS build
|
FROM docker.io/rust:1.93.0-slim-trixie AS build
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y build-essential pkg-config libssl-dev libsqlite3-dev
|
RUN apt-get update && apt-get install -y build-essential pkg-config libssl-dev libsqlite3-dev
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
# #
|
# #
|
||||||
#######################################
|
#######################################
|
||||||
|
|
||||||
FROM docker.io/rust:1.91.1-slim-trixie AS build
|
FROM docker.io/rust:1.93.0-slim-trixie AS build
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y build-essential pkg-config libssl-dev libsqlite3-dev
|
RUN apt-get update && apt-get install -y build-essential pkg-config libssl-dev libsqlite3-dev
|
||||||
|
|
||||||
|
|||||||
@@ -43,7 +43,8 @@ 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.
|
Room-local agent managers are users privileged to **create their own [agents](./agents.md)** (see `!bai agent`) in rooms.
|
||||||
|
|
||||||
**⚠️ WARNING**: Letting regular users create agents which contact arbitrary network services **may be a security issue**.
|
> [!WARNING]
|
||||||
|
> Letting regular users create agents which contact arbitrary network services **may be a security issue**.
|
||||||
|
|
||||||
The following commands are available:
|
The following commands are available:
|
||||||
- **Show** the currently allowed users: `!bai access room-local-agent-managers`
|
- **Show** the currently allowed users: `!bai access room-local-agent-managers`
|
||||||
|
|||||||
@@ -12,12 +12,15 @@ 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.
|
Certain keys can be left unset, in which case [📝 hardcoded defaults](../../src/entity/cfg/defaults.rs) would be used.
|
||||||
|
|
||||||
Each configuration key found in the YAML configuration can be overridden by setting an environment variable (dots should be replaced with `_`). Example:
|
Some configuration keys 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 `command_prefix`, set an environment variable `BAIBOT_COMMAND_PREFIX`
|
||||||
- to override `homeserver.server_name`, set an environment variable `BAIBOT_HOMESERVER_SERVER_NAME`
|
- to override `homeserver.server_name`, set an environment variable `BAIBOT_HOMESERVER_SERVER_NAME`
|
||||||
|
|
||||||
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.
|
You can see the list of supported environment variables in the [🦀 src/entity/cfg/env.rs](../../src/entity/cfg/env.rs) file.
|
||||||
|
|
||||||
|
> [!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
|
### Dynamic configuration
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
base_url: https://api.openai.com/v1
|
base_url: https://api.openai.com/v1
|
||||||
api_key: YOUR_API_KEY_HERE
|
api_key: YOUR_API_KEY_HERE
|
||||||
text_generation:
|
text_generation:
|
||||||
model_id: gpt-5.1
|
model_id: gpt-5.2
|
||||||
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 }}."
|
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
|
temperature: 1.0
|
||||||
# Reasoning models need to use `max_completion_tokens` instead of `max_response_tokens`.
|
# Reasoning models need to use `max_completion_tokens` instead of `max_response_tokens`.
|
||||||
@@ -17,7 +17,7 @@ text_to_speech:
|
|||||||
speed: 1.0
|
speed: 1.0
|
||||||
response_format: opus
|
response_format: opus
|
||||||
image_generation:
|
image_generation:
|
||||||
model_id: gpt-image-1
|
model_id: gpt-image-1.5
|
||||||
style: null
|
style: null
|
||||||
size: null
|
size: null
|
||||||
quality: null
|
quality: null
|
||||||
|
|||||||
@@ -11,6 +11,12 @@ user:
|
|||||||
# Leave empty to use the default (baibot).
|
# Leave empty to use the default (baibot).
|
||||||
name: 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:
|
encryption:
|
||||||
# An optional passphrase to use for backing up and recovering the bot's encryption keys.
|
# An optional passphrase to use for backing up and recovering the bot's encryption keys.
|
||||||
# You can use any string here.
|
# You can use any string here.
|
||||||
@@ -76,7 +82,7 @@ agents:
|
|||||||
# base_url: https://api.openai.com/v1
|
# base_url: https://api.openai.com/v1
|
||||||
# api_key: ""
|
# api_key: ""
|
||||||
# text_generation:
|
# text_generation:
|
||||||
# model_id: gpt-5.1
|
# model_id: gpt-5.2
|
||||||
# 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 }}."
|
# 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
|
# temperature: 1.0
|
||||||
# # Reasoning models need to use `max_completion_tokens` instead of `max_response_tokens`.
|
# # Reasoning models need to use `max_completion_tokens` instead of `max_response_tokens`.
|
||||||
@@ -92,7 +98,7 @@ agents:
|
|||||||
# speed: 1.0
|
# speed: 1.0
|
||||||
# response_format: opus
|
# response_format: opus
|
||||||
# image_generation:
|
# image_generation:
|
||||||
# model_id: gpt-image-1
|
# model_id: gpt-image-1.5
|
||||||
# style: null
|
# style: null
|
||||||
# size: null
|
# size: null
|
||||||
# quality: null
|
# quality: null
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ services:
|
|||||||
- /etc/passwd:/etc/passwd:ro
|
- /etc/passwd:/etc/passwd:ro
|
||||||
|
|
||||||
synapse:
|
synapse:
|
||||||
image: ghcr.io/element-hq/synapse:v1.143.0
|
image: ghcr.io/element-hq/synapse:v1.144.0
|
||||||
user: "${UID}:${GID}"
|
user: "${UID}:${GID}"
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
entrypoint: python
|
entrypoint: python
|
||||||
@@ -27,7 +27,7 @@ services:
|
|||||||
- ./synapse/media-store:/media-store
|
- ./synapse/media-store:/media-store
|
||||||
|
|
||||||
element-web:
|
element-web:
|
||||||
image: ghcr.io/element-hq/element-web:v1.12.4
|
image: ghcr.io/element-hq/element-web:v1.12.7
|
||||||
user: "${UID}:${GID}"
|
user: "${UID}:${GID}"
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
services:
|
services:
|
||||||
ollama:
|
ollama:
|
||||||
image: docker.io/ollama/ollama:0.13.0
|
image: docker.io/ollama/ollama:0.13.5
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
- "${SERVICE_OLLAMA_BIND_PORT_HTTP}:11434"
|
- "${SERVICE_OLLAMA_BIND_PORT_HTTP}:11434"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
use super::OPENAI_IMAGE_MODEL_GPT_IMAGE_1;
|
use super::OPENAI_IMAGE_MODEL_GPT_IMAGE_1_DOT_5;
|
||||||
use crate::agent::{default_prompt, provider::ConfigTrait};
|
use crate::agent::{default_prompt, provider::ConfigTrait};
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
@@ -80,7 +80,7 @@ impl Default for TextGenerationConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn default_text_model_id() -> String {
|
fn default_text_model_id() -> String {
|
||||||
"gpt-5.1".to_owned()
|
"gpt-5.2".to_owned()
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
@@ -162,7 +162,7 @@ pub struct ImageGenerationConfig {
|
|||||||
impl Default for ImageGenerationConfig {
|
impl Default for ImageGenerationConfig {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
Self {
|
Self {
|
||||||
model_id: OPENAI_IMAGE_MODEL_GPT_IMAGE_1.to_owned(),
|
model_id: OPENAI_IMAGE_MODEL_GPT_IMAGE_1_DOT_5.to_owned(),
|
||||||
style: default_image_style(),
|
style: default_image_style(),
|
||||||
size: default_image_size(),
|
size: default_image_size(),
|
||||||
quality: default_image_quality(),
|
quality: default_image_quality(),
|
||||||
@@ -178,8 +178,11 @@ impl ImageGenerationConfig {
|
|||||||
"dall-e-2" => Ok(async_openai::types::images::ImageModel::DallE2),
|
"dall-e-2" => Ok(async_openai::types::images::ImageModel::DallE2),
|
||||||
"dall-e-3" => Ok(async_openai::types::images::ImageModel::DallE3),
|
"dall-e-3" => Ok(async_openai::types::images::ImageModel::DallE3),
|
||||||
"gpt-image-1" => Ok(async_openai::types::images::ImageModel::GptImage1),
|
"gpt-image-1" => Ok(async_openai::types::images::ImageModel::GptImage1),
|
||||||
|
"gpt-image-1.5" => Ok(async_openai::types::images::ImageModel::GptImage1dot5),
|
||||||
"gpt-image-1-mini" => Ok(async_openai::types::images::ImageModel::GptImage1Mini),
|
"gpt-image-1-mini" => Ok(async_openai::types::images::ImageModel::GptImage1Mini),
|
||||||
other => Ok(async_openai::types::images::ImageModel::Other(other.to_owned())),
|
other => Ok(async_openai::types::images::ImageModel::Other(
|
||||||
|
other.to_owned(),
|
||||||
|
)),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -254,10 +254,12 @@ impl ControllerTrait for Controller {
|
|||||||
match original_model {
|
match original_model {
|
||||||
ImageModel::DallE2 => ImageModel::DallE2,
|
ImageModel::DallE2 => ImageModel::DallE2,
|
||||||
ImageModel::DallE3 => ImageModel::DallE2,
|
ImageModel::DallE3 => ImageModel::DallE2,
|
||||||
|
ImageModel::GptImage1 => ImageModel::GptImage1Mini,
|
||||||
|
ImageModel::GptImage1dot5 => ImageModel::GptImage1Mini,
|
||||||
|
ImageModel::GptImage1Mini => ImageModel::GptImage1Mini,
|
||||||
ImageModel::Other(_) => {
|
ImageModel::Other(_) => {
|
||||||
ImageModel::DallE2
|
ImageModel::DallE2
|
||||||
}
|
}
|
||||||
_ => original_model.clone(),
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
original_model
|
original_model
|
||||||
@@ -305,6 +307,7 @@ impl ControllerTrait for Controller {
|
|||||||
// In fact, specifying the response format results in an error.
|
// In fact, specifying the response format results in an error.
|
||||||
ImageModel::GptImage1 => None,
|
ImageModel::GptImage1 => None,
|
||||||
ImageModel::GptImage1Mini => None,
|
ImageModel::GptImage1Mini => None,
|
||||||
|
ImageModel::GptImage1dot5 => None,
|
||||||
ImageModel::Other(_) => Some(ImageResponseFormat::B64Json),
|
ImageModel::Other(_) => Some(ImageResponseFormat::B64Json),
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -411,6 +414,7 @@ impl ControllerTrait for Controller {
|
|||||||
// In fact, specifying the response format results in an error.
|
// In fact, specifying the response format results in an error.
|
||||||
ImageModel::GptImage1 => None,
|
ImageModel::GptImage1 => None,
|
||||||
ImageModel::GptImage1Mini => None,
|
ImageModel::GptImage1Mini => None,
|
||||||
|
ImageModel::GptImage1dot5 => None,
|
||||||
ImageModel::Other(_) => Some(ImageResponseFormat::B64Json),
|
ImageModel::Other(_) => Some(ImageResponseFormat::B64Json),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ use super::super::AgentInstantiationResult;
|
|||||||
use super::ConfigTrait;
|
use super::ConfigTrait;
|
||||||
use super::controller::ControllerType;
|
use super::controller::ControllerType;
|
||||||
|
|
||||||
pub const OPENAI_IMAGE_MODEL_GPT_IMAGE_1: &str = "gpt-image-1";
|
pub const OPENAI_IMAGE_MODEL_GPT_IMAGE_1_DOT_5: &str = "gpt-image-1.5";
|
||||||
|
|
||||||
pub fn create_controller_from_yaml_value_config(
|
pub fn create_controller_from_yaml_value_config(
|
||||||
agent_id: &str,
|
agent_id: &str,
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
use std::fs;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use std::{future::Future, pin::Pin};
|
use std::{future::Future, pin::Pin};
|
||||||
|
|
||||||
@@ -18,12 +19,13 @@ use mxlink::helpers::account_data_config::{
|
|||||||
RoomConfigManager as AccountDataRoomConfigManager,
|
RoomConfigManager as AccountDataRoomConfigManager,
|
||||||
};
|
};
|
||||||
use mxlink::helpers::encryption::Manager as EncryptionManager;
|
use mxlink::helpers::encryption::Manager as EncryptionManager;
|
||||||
|
use mxlink::mime::Mime;
|
||||||
|
|
||||||
use crate::agent::Manager as AgentManager;
|
use crate::agent::Manager as AgentManager;
|
||||||
use crate::entity::catch_up_marker::{
|
use crate::entity::catch_up_marker::{
|
||||||
CatchUpMarker, CatchUpMarkerManager, DelayedCatchUpMarkerManager,
|
CatchUpMarker, CatchUpMarkerManager, DelayedCatchUpMarkerManager,
|
||||||
};
|
};
|
||||||
use crate::entity::cfg::Config;
|
use crate::entity::cfg::{Avatar, Config};
|
||||||
use crate::entity::globalconfig::{GlobalConfig, GlobalConfigurationManager};
|
use crate::entity::globalconfig::{GlobalConfig, GlobalConfigurationManager};
|
||||||
use crate::entity::roomconfig::{RoomConfig, RoomConfigurationManager};
|
use crate::entity::roomconfig::{RoomConfig, RoomConfigurationManager};
|
||||||
|
|
||||||
@@ -316,8 +318,35 @@ 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 ¤t_avatar_url {
|
let should_update_avatar = match ¤t_avatar_url {
|
||||||
Some(avatar_url) => {
|
Some(avatar_url) => {
|
||||||
|
tracing::debug!(?avatar_url, "Fetching current avatar to compare");
|
||||||
let request = MediaRequestParameters {
|
let request = MediaRequestParameters {
|
||||||
source: MediaSource::Plain(avatar_url.to_owned()),
|
source: MediaSource::Plain(avatar_url.to_owned()),
|
||||||
format: MediaFormat::File,
|
format: MediaFormat::File,
|
||||||
@@ -328,22 +357,33 @@ impl Bot {
|
|||||||
.await
|
.await
|
||||||
.map_err(|e| anyhow::anyhow!("Failed fetching existing avatar: {:?}", e))?;
|
.map_err(|e| anyhow::anyhow!("Failed fetching existing avatar: {:?}", e))?;
|
||||||
|
|
||||||
content.as_slice() != LOGO_BYTES
|
let needs_update = content.as_slice() != desired_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 {
|
if should_update_avatar {
|
||||||
tracing::info!("Updating avatar..");
|
tracing::info!("Updating avatar..");
|
||||||
|
|
||||||
let mime_type = LOGO_MIME_TYPE
|
|
||||||
.parse()
|
|
||||||
.expect("Failed parsing mime type for logo");
|
|
||||||
|
|
||||||
account
|
account
|
||||||
.upload_avatar(&mime_type, LOGO_BYTES.to_vec())
|
.upload_avatar(&mime_type, desired_bytes)
|
||||||
.await
|
.await
|
||||||
.map_err(|e| anyhow::anyhow!("Failed uploading avatar: {:?}", e))?;
|
.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(())
|
Ok(())
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ use anyhow::anyhow;
|
|||||||
|
|
||||||
use crate::agent::AgentPurpose;
|
use crate::agent::AgentPurpose;
|
||||||
|
|
||||||
pub use crate::entity::cfg::{Config, defaults as cfg_defaults, env as cfg_env};
|
pub use crate::entity::cfg::{Avatar, Config, defaults as cfg_defaults, env as cfg_env};
|
||||||
|
|
||||||
pub fn load() -> anyhow::Result<Config> {
|
pub fn load() -> anyhow::Result<Config> {
|
||||||
let config_file_path = env::var(cfg_env::BAIBOT_CONFIG_FILE_PATH)
|
let config_file_path = env::var(cfg_env::BAIBOT_CONFIG_FILE_PATH)
|
||||||
@@ -37,6 +37,9 @@ pub fn load() -> anyhow::Result<Config> {
|
|||||||
config.user.encryption.recovery_reset_allowed = value.parse::<bool>()?;
|
config.user.encryption.recovery_reset_allowed = value.parse::<bool>()?;
|
||||||
}
|
}
|
||||||
cfg_env::BAIBOT_USER_NAME => config.user.name = value,
|
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_COMMAND_PREFIX => config.command_prefix = value,
|
||||||
cfg_env::BAIBOT_ROOM_POST_JOIN_SELF_INTRODUCTION_ENABLED => {
|
cfg_env::BAIBOT_ROOM_POST_JOIN_SELF_INTRODUCTION_ENABLED => {
|
||||||
config.room.post_join_self_introduction_enabled = value.parse::<bool>()?;
|
config.room.post_join_self_introduction_enabled = value.parse::<bool>()?;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
|
|
||||||
use mxlink::helpers::encryption::EncryptionKey;
|
use mxlink::helpers::encryption::EncryptionKey;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Deserializer, Serialize};
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
agent::{AgentDefinition, AgentPurpose, PublicIdentifier},
|
agent::{AgentDefinition, AgentPurpose, PublicIdentifier},
|
||||||
@@ -83,6 +83,52 @@ 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)]
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
pub struct ConfigUser {
|
pub struct ConfigUser {
|
||||||
pub mxid_localpart: String,
|
pub mxid_localpart: String,
|
||||||
@@ -93,6 +139,9 @@ pub struct ConfigUser {
|
|||||||
|
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub encryption: ConfigUserEncryption,
|
pub encryption: ConfigUserEncryption,
|
||||||
|
|
||||||
|
#[serde(default)]
|
||||||
|
pub avatar: Avatar,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ConfigUser {
|
impl ConfigUser {
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ pub const BAIBOT_HOMESERVER_URL: &str = "BAIBOT_HOMESERVER_URL";
|
|||||||
pub const BAIBOT_USER_MXID_LOCALPART: &str = "BAIBOT_USER_MXID_LOCALPART";
|
pub const BAIBOT_USER_MXID_LOCALPART: &str = "BAIBOT_USER_MXID_LOCALPART";
|
||||||
pub const BAIBOT_USER_PASSWORD: &str = "BAIBOT_USER_PASSWORD";
|
pub const BAIBOT_USER_PASSWORD: &str = "BAIBOT_USER_PASSWORD";
|
||||||
pub const BAIBOT_USER_NAME: &str = "BAIBOT_USER_NAME";
|
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 =
|
pub const BAIBOT_USER_ENCRYPTION_RECOVERY_PASSPHRASE: &str =
|
||||||
"BAIBOT_USER_ENCRYPTION_RECOVERY_PASSPHRASE";
|
"BAIBOT_USER_ENCRYPTION_RECOVERY_PASSPHRASE";
|
||||||
pub const BAIBOT_USER_ENCRYPTION_RECOVERY_RESET_ALLOWED: &str =
|
pub const BAIBOT_USER_ENCRYPTION_RECOVERY_RESET_ALLOWED: &str =
|
||||||
|
|||||||
@@ -2,4 +2,4 @@ mod config;
|
|||||||
pub mod defaults;
|
pub mod defaults;
|
||||||
pub mod env;
|
pub mod env;
|
||||||
|
|
||||||
pub use config::Config;
|
pub use config::{Avatar, Config};
|
||||||
|
|||||||
Reference in New Issue
Block a user