Skip to content

The fastest, cheapest, most efficient open-source agent harness. Run more than 500 agents on a $10 VPS.

refactor(channels): use shared request types for controller params

Steven Enamakel7a54ce1d4477
diff --git a/crates/openhuman-core/src/channels/controllers/schemas.rs b/crates/openhuman-core/src/channels/controllers/schemas.rs
index b5f02e8a21..d0eb4bd35a 100644
--- a/crates/openhuman-core/src/channels/controllers/schemas.rs
+++ b/crates/openhuman-core/src/channels/controllers/schemas.rs
@@ -13,8 +13,18 @@ use crate::core::Outcome;
use super::backend::OpenHumanChannelBackend;
use crate::channels::contract_schema::from_channel_controller_schema;
use crate::security::credentials::channel_credential_provider;
-use tinychannels_bus::controllers::ChannelAuthMode;
-use tinychannels_bus::controllers::{all_channel_controller_schemas, channel_controller_schema};
+use tinychannels_bus::controllers::{
+ all_channel_controller_schemas, channel_controller_schema, ChannelAuthMode,
+ ChannelConnectRequest as ConnectParams, ChannelCreateThreadRequest as CreateThreadParams,
+ ChannelDisconnectRequest as DisconnectParams,
+ ChannelListThreadsRequest as ListThreadsParams,
+ ChannelSendMessageRequest as SendMessageParams,
+ ChannelSendReactionRequest as SendReactionParams,
+ ChannelStatusRequest as StatusParams, ChannelTestRequest as TestParams,
+ ChannelUpdateThreadRequest as UpdateThreadParams,
+ DiscordCheckPermissionsRequest as DiscordCheckPermissionsParams,
+ DiscordListChannelsRequest as DiscordListChannelsParams,
+};
// ---------------------------------------------------------------------------
// Param structs
@@ -26,95 +36,12 @@ struct DescribeParams {
channel: String,
}
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct ConnectParams {
- channel: String,
- auth_mode: String,
- #[serde(default)]
- credentials: Option<serde_json::Value>,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct DisconnectParams {
- channel: String,
- auth_mode: String,
- #[serde(default)]
- clear_memory: bool,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct StatusParams {
- #[serde(default)]
- channel: Option<String>,
-}
-
#[derive(Debug, Deserialize)]
#[serde(rename_all = "camelCase")]
struct SetDefaultParams {
channel: String,
}
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct TestParams {
- channel: String,
- auth_mode: String,
- credentials: serde_json::Value,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct DiscordListChannelsParams {
- guild_id: String,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct DiscordCheckPermissionsParams {
- guild_id: String,
- channel_id: String,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct SendMessageParams {
- channel: String,
- message: serde_json::Value,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct SendReactionParams {
- channel: String,
- reaction: serde_json::Value,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct CreateThreadParams {
- channel: String,
- title: String,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct UpdateThreadParams {
- channel: String,
- thread_id: String,
- action: String,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct ListThreadsParams {
- channel: String,
- #[serde(default)]
- active: Option<bool>,
-}
-
// ---------------------------------------------------------------------------
// Public registry exports
// ---------------------------------------------------------------------------
@@ -248,10 +175,7 @@ fn handle_connect(ctx: DispatchCtx, params: Map<String, Value>) -> ControllerFut
async fn connect_with_config(config: &Config, p: ConnectParams) -> Result<Value, String> {
let channel = p.channel.trim();
- let mode: ChannelAuthMode = p
- .auth_mode
- .parse()
- .map_err(|error: String| format!("invalid authMode: {error}"))?;
+ let mode: ChannelAuthMode = p.auth_mode;
let creds = p.credentials.unwrap_or(Value::Object(Map::new()));
let outcome = super::ops::connect_channel(config, channel, mode, creds).await?;
let logs = connect_logs(channel, mode, outcome.value.auth_action.is_some());
@@ -263,10 +187,7 @@ fn handle_disconnect(ctx: DispatchCtx, params: Map<String, Value>) -> Controller
let config = ctx.load_config().await?;
let p = deserialize_params::<DisconnectParams>(params)?;
let channel = p.channel.trim();
- let mode: ChannelAuthMode = p
- .auth_mode
- .parse()
- .map_err(|e: String| format!("invalid authMode: {e}"))?;
+ let mode: ChannelAuthMode = p.auth_mode;
let backend = OpenHumanChannelBackend::new(config.clone());
let result = backend
.disconnect_channel(&config.channels_config, channel, mode, p.clear_memory)
@@ -328,10 +249,7 @@ fn handle_test(ctx: DispatchCtx, params: Map<String, Value>) -> ControllerFuture
}
async fn test_with_config(config: &Config, params: TestParams) -> Result<Value, String> {
- let mode: ChannelAuthMode = params
- .auth_mode
- .parse()
- .map_err(|e: String| format!("invalid authMode: {e}"))?;
+ let mode: ChannelAuthMode = params.auth_mode;
to_json(
super::ops::test_channel(config, params.channel.trim(), mode, params.credentials).await?,
)
diff --git a/crates/openhuman-core/src/channels/controllers/schemas_tests.rs b/crates/openhuman-core/src/channels/controllers/schemas_tests.rs
index 7ec532488f..d3ab7ee4ec 100644
--- a/crates/openhuman-core/src/channels/controllers/schemas_tests.rs
+++ b/crates/openhuman-core/src/channels/controllers/schemas_tests.rs
@@ -10,7 +10,7 @@ async fn channel_test_handler_requires_module_before_provider_field_validation()
&config,
TestParams {
channel: " telegram ".into(),
- auth_mode: "bot_token".into(),
+ auth_mode: ChannelAuthMode::BotToken,
credentials: Value::Null,
},
)
@@ -61,7 +61,7 @@ fn deserialize_connect_params() {
}))
.unwrap();
assert_eq!(params.channel, "telegram");
- assert_eq!(params.auth_mode, "bot_token");
+ assert_eq!(params.auth_mode, ChannelAuthMode::BotToken);
assert!(params.credentials.is_none());
}
@@ -182,7 +182,7 @@ async fn channel_connect_handler_requires_module_before_provider_field_validatio
&config,
ConnectParams {
channel: " telegram ".into(),
- auth_mode: "bot_token".into(),
+ auth_mode: ChannelAuthMode::BotToken,
credentials: Some(Value::Null),
},
)