Decrease number of keywords in Cargo.toml to the maximum allowed (5)

[skip ci]

Cargo.lock

@@ -297,16 +297,16 @@ dependencies = [
 
 [[package]]
 name = "baibot"
-version = "1.0.0"
+version = "1.0.2"
 dependencies = [
  "anthropic-rs",
  "anyhow",
  "async-openai 0.24.0",
  "base64 0.22.1",
+ "etke_openai_api_rust",
  "matrix-sdk",
  "mxidwc",
  "mxlink",
- "openai_api_rust",
  "quick_cache",
  "regex",
  "serde",
@@ -919,6 +919,20 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "etke_openai_api_rust"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1499ac61bf9b9a5973a5830894cbf2016a96a4dab9eb2dab4a526c720632c93"
+dependencies = [
+ "log",
+ "mime",
+ "rand",
+ "serde",
+ "serde_json",
+ "ureq",
+]
+
 [[package]]
 name = "event-listener"
 version = "4.0.3"
@@ -2204,19 +2218,6 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
-[[package]]
-name = "openai_api_rust"
-version = "0.1.9"
-source = "git+https://github.com/etkecc/openai_api_rust.git?branch=next#a9183fc2e699c3d33c635c2aed3f9174f9d9cd74"
-dependencies = [
- "log",
- "mime",
- "rand",
- "serde",
- "serde_json",
- "ureq",
-]
-
 [[package]]
 name = "openssl"
 version = "0.10.66"

Cargo.toml

@@ -5,9 +5,9 @@ authors = ["Slavi Pantaleev <slavi@devture.com>"]
 repository = "https://github.com/etkecc/baibot"
 license = "AGPL-3.0-or-later"
 readme = "README.md"
-keywords = ["matrix", "chat", "LLM", "openai", "anthropic", "localai"]
+keywords = ["matrix", "chat", "bot", "AI", "LLM"]
-exclude = [".editorconfig", "justfile", "docs/", "etc/", "Dockerfile", ".dockerignore", ".gitignore"]
+include = ["/etc/assets/baibot-torso-768.png", "/src", "/README.md", "/CHANGELOG.md", "/LICENSE"]
-version = "1.0.0"
+version = "1.0.2"
 edition = "2021"
 
 [lib]
@@ -23,7 +23,7 @@ base64 = "0.22.*"
 matrix-sdk = { version = "0.7.1", default-features = false }
 mxidwc = "1.0.*"
 mxlink = "1.0.*"
-openai_api_rust = { git = "https://github.com/etkecc/openai_api_rust.git", branch = "next" }
+etke_openai_api_rust = "0.1.*"
 quick_cache = "0.6.*"
 regex = "1.10.*"
 serde = { version = "1.0.*", features = ["derive"], default-features = false }

README.md

@@ -5,7 +5,7 @@
 
 🤖 baibot is an [AI](https://en.wikipedia.org/wiki/Artificial_intelligence) ([Large Language Model](https://en.wikipedia.org/wiki/Large_language_model)) bot for [Matrix](https://matrix.org/) built by [etke.cc](https://etke.cc/) (managed Matrix servers).
 
-The name is pronounced 'bye' and is a play on [AI](https://en.wikipedia.org/wiki/Artificial_intelligence), referencing the fictional character [🇧🇬 Bai Ganyo](https://en.wikipedia.org/wiki/Bay_Ganyo).
+The name is pronounced 'bye'-bot and is a play on [AI](https://en.wikipedia.org/wiki/Artificial_intelligence), referencing the fictional character [🇧🇬 Bai Ganyo](https://en.wikipedia.org/wiki/Bay_Ganyo).
 
 It's designed as a more private and [featureful](#-features) alternative to [matrix-chatgpt-bot](https://github.com/matrixgpt/matrix-chatgpt-bot).
 It's influenced by [chaz](https://github.com/arcuru/chaz), but does **not** use the [AIChat](https://github.com/sigoden/aichat) CLI tool and instead does everything in-process, without forking.
@@ -19,8 +19,8 @@ It's influenced by [chaz](https://github.com/arcuru/chaz), but does **not** use
 
   - [💬 text-generation](./docs/features.md#-text-generation): communicating with you via text
   - [🦻 speech-to-text](./docs/features.md#-speech-to-text): turning your voice messages into text
-  - [🗣️ text-to-speech](./docs/features.md#️-text-to-speech): turning bot or users text messages into voice messages
+  - [🗣️ 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): generating images based on instructions
+  - [🖌️ image-generation](./docs/features.md#%EF%B8%8F-image-generation): generating images based on instructions
 
 - 🪄 Supports [seamless voice interaction](./docs/features.md#seamless-voice-interaction) (turning user voice messages into text, answering in text, then turning that text back into voice)
 

docs/README.md

@@ -1,9 +1,11 @@
 # Table of Contents
 
 - [🔒 Access](./access.md)
-- [🤖 Agents](./agents.md) and [☁️ Providers](./providers.md)
+- [🤖 Agents](./agents.md)
 - [🛠️ Configuration](./configuration/README.md)
 - [🌟 Features](./features.md)
+- [🤝 Handlers](./configuration/handlers.md)
+- [☁️ Providers](./providers.md)
 - [📖 Usage](./usage.md)
 - [🚀 Installation](./installation.md)
 - [💻 Development](./development.md)

docs/configuration/text-generation.md

@@ -23,7 +23,7 @@ To support such use-cases, the bot has a `text-generation prefix-requirement-typ
 
 - `command_prefix`: indicates that the bot would require that messages be prefixed with the command prefix (e.g. `!bai`) and would ignore all messages that are not prefixed
 
-By default, the bot is **auto-configured (upon joining a new room)** to use the `no` setting in rooms that only include 2 users (you and the bot), and `command_prefix` in rooms with more than 2 users. To prevent surprises, the bot will **not** adjust this setting subsequently. You can manually adjust it via `!bai config room set-prefix-requirement-type VALUE`.
+By default, the bot is **auto-configured (upon joining a new room)** to use the `no` setting in rooms that only include 2 users (you and the bot), and `command_prefix` in rooms with more than 2 users. To prevent surprises, the bot will **not** adjust this setting subsequently. You can manually adjust it via `!bai config room text-generation set-prefix-requirement-type VALUE`.
 
 Example: `!bai config room text-generation set-prefix-requirement-type command_prefix` (this can also be set globally, see [🛠️ Room Settings](./README.md#room-settings))
 
@@ -51,7 +51,7 @@ The bot also supports ♻️ **context management**, which automatically adjusts
 
 This feature relies on [tokenization](https://en.wikipedia.org/wiki/Large_language_model#Tokenization) performed by the [tiktoken-rs](https://github.com/zurawiki/tiktoken-rs) library which is [poorly well-maintained](https://github.com/zurawiki/tiktoken-rs/issues/50) and only works well for [OpenAI](../providers.md#openai) models.
 
-This setting is **disabled by default**, but can be enabled via `!bai config room context-management-enabled true` (this can also be set globally, see [🛠️ Room Settings](./README.md#room-settings)).
+This setting is **disabled by default**, but can be enabled via `!bai config room text-generation set-context-management-enabled true` (this can also be set globally, see [🛠️ Room Settings](./README.md#room-settings)).
 
 
 ### ⌨️ Prompt Override

docs/features.md

@@ -10,8 +10,8 @@ The bot supports the following use-purposes:
 
 - [💬 text-generation](#-text-generation): communicating with you via text
 - [🦻 speech-to-text](#-speech-to-text): turning your voice messages into text
-- [🗣️ text-to-speech](#️-text-to-speech): turning bot or users text messages into voice messages
+- [🗣️ text-to-speech](#%EF%B8%8F-text-to-speech): turning bot or users text messages into voice messages
-- [🖌️ image-generation](#-image-generation): generating images based on instructions
+- [🖌️ image-generation](#%EF%B8%8F-image-generation): generating images based on instructions
 
 In a given room, each different purpose can be served by a different [☁️ provider](./providers.md) and model. This combination of provider and model configuration is called an [🤖 agent](./agents.md). Each purpose can be served by a different **handler** agent.
 
@@ -32,7 +32,7 @@ A few other features (like [🗣️ Text-to-Speech](#️-text-to-speech) and [
 
 You may also wish to see:
 
-- [🛠️ Configuration / 💬 Text Generation](./configuration/README.md#-text-generation) for configuration options related to Text Generation
+- [🛠️ Configuration / 💬 Text Generation](./configuration/text-generation.md) for configuration options related to Text Generation
 - [📖 Usage / 💬 Text Generation](./usage.md#-text-generation) section for more details on how to use the bot for Text Generation in a room
 
 
@@ -48,7 +48,9 @@ By default, the bot **doesn't** perform text-to-speech. It can be configured for
 
 Another use-case is to have the bot operate in [Text-to-Speech-only mode](#text-to-speech-only-mode).
 
-- [🛠️ Configuration / 🗣️ Text-to-Speech](./configuration/README.md#-text-to-speech) for configuration options related to Text-to-Speech
+You may also wish to see:
+
+- [🛠️ Configuration / 🗣️ Text-to-Speech](./configuration/text-to-speech.md) for configuration options related to Text-to-Speech
 - [📖 Usage / 🗣️ Text-to-Speech](./usage.md#-text-to-speech) section for more details on how to use the bot for Text-to-Speech in a room
 
 
@@ -77,6 +79,10 @@ The default flow is shown in the screenshot above: your voice messages are trans
 
 You may also configure the bot for [Seamless voice interaction](#seamless-voice-interaction) or [Transcribe-only mode](#transcribe-only-mode), etc.
 
+You may also wish to see:
+
+- [🛠️ Configuration / 🦻 Speech-to-Text](./configuration/speech-to-text.md) for configuration options related to Speech-to-Text
+- [📖 Usage / 🦻 Speech-to-Text](./usage.md#-speech-to-text) section for more details on how to use the bot for Speech-to-Text in a room
 
 #### Seamless voice interaction
 
@@ -121,7 +127,7 @@ See a [🖼️ Screenshot of the Image Generation feature](./screenshots/image-g
 
 You may also wish to see:
 
-- [🛠️ Configuration / 🖌️ Image Generation](./configuration/README.md#-image-generation) for configuration options related to Image Generation
+- [🛠️ Configuration / 🖌️ Image Generation](./configuration/image-generation.md) for configuration options related to Image Generation
 - [📖 Usage / 🖌️ Image Generation](./usage.md#-image-generation) section for more details on how to use the bot for Image Generation in a room
 - [🫵 Sticker Generation](#-sticker-generation) - a special case of Image Generation
 

src/agent/provider/openai_compat/controller.rs

@@ -1,7 +1,7 @@
-use openai_api_rust::audio::{AudioApi, AudioBody};
+use etke_openai_api_rust::audio::{AudioApi, AudioBody};
-use openai_api_rust::chat::{ChatApi, ChatBody};
+use etke_openai_api_rust::chat::{ChatApi, ChatBody};
-use openai_api_rust::images::{ImagesApi, ImagesBody};
+use etke_openai_api_rust::images::{ImagesApi, ImagesBody};
-use openai_api_rust::{Auth, Message, OpenAI};
+use etke_openai_api_rust::{Auth, Message, OpenAI};
 
 use super::super::ControllerTrait;
 use crate::agent::utils::base64_decode;

src/agent/provider/openai_compat/utils.rs

@@ -1,4 +1,4 @@
-use openai_api_rust::{Message, Role};
+use etke_openai_api_rust::{Message, Role};
 
 use crate::agent::provider::openai::Config as OpenAIConfig;