This commit is contained in:
Slavi Pantaleev
2025-02-27 07:46:16 +02:00
parent c051da2f4a
commit 406141cd7d
72 changed files with 259 additions and 209 deletions

View File

@@ -247,7 +247,6 @@ impl PersistenceConfig {
}
}
#[derive(Debug, Serialize, Deserialize)]
pub struct ConfigRoom {
#[serde(default = "super::defaults::room_post_join_self_introduction_enabled")]
@@ -263,7 +262,8 @@ impl ConfigRoom {
impl Default for ConfigRoom {
fn default() -> Self {
Self {
post_join_self_introduction_enabled: super::defaults::room_post_join_self_introduction_enabled(),
post_join_self_introduction_enabled:
super::defaults::room_post_join_self_introduction_enabled(),
}
}
}

View File

@@ -1,11 +1,11 @@
use mxlink::matrix_sdk::ruma::{OwnedEventId, OwnedUserId, RoomId};
use mxlink::matrix_sdk::Room;
use mxlink::matrix_sdk::ruma::{OwnedEventId, OwnedUserId, RoomId};
use mxlink::ThreadInfo;
use super::{
globalconfig::GlobalConfig, roomconfig::RoomConfig, MessagePayload, RoomConfigContext,
TriggerEventInfo,
MessagePayload, RoomConfigContext, TriggerEventInfo, globalconfig::GlobalConfig,
roomconfig::RoomConfig,
};
#[derive(Debug)]

View File

@@ -4,10 +4,9 @@ use super::globalconfig::GlobalConfig;
use super::roomconfig::RoomConfig;
use crate::entity::roomconfig::{
defaults as roomconfig_defaults, SpeechToTextFlowType,
SpeechToTextMessageTypeForNonThreadedOnlyTranscribedMessages, TextGenerationAutoUsage,
TextGenerationPrefixRequirementType, TextToSpeechBotMessagesFlowType,
TextToSpeechUserMessagesFlowType,
SpeechToTextFlowType, SpeechToTextMessageTypeForNonThreadedOnlyTranscribedMessages,
TextGenerationAutoUsage, TextGenerationPrefixRequirementType, TextToSpeechBotMessagesFlowType,
TextToSpeechUserMessagesFlowType, defaults as roomconfig_defaults,
};
#[derive(Debug)]

View File

@@ -46,7 +46,9 @@ impl RoomConfigTrait for RoomConfig {}
impl RoomConfig {
pub async fn with_room(mut self, room: Room) -> Self {
tracing::trace!("Determining room members count to decide on a suitable text-generation/prefix-requirement-type default");
tracing::trace!(
"Determining room members count to decide on a suitable text-generation/prefix-requirement-type default"
);
let members = room.members(RoomMemberships::ACTIVE).await;
@@ -60,12 +62,19 @@ impl RoomConfig {
text_generation::TextGenerationPrefixRequirementType::No
};
tracing::info!(?members_count, ?prefix_requirement_type, "Determined text-generation/prefix-requirement-type based on room members count");
tracing::info!(
?members_count,
?prefix_requirement_type,
"Determined text-generation/prefix-requirement-type based on room members count"
);
prefix_requirement_type
}
Err(err) => {
tracing::error!(?err, "Failed to get members of room - will default text-generation/prefix-requirement-type to No");
tracing::error!(
?err,
"Failed to get members of room - will default text-generation/prefix-requirement-type to No"
);
text_generation::TextGenerationPrefixRequirementType::No
}
};