Skip to content

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

refactor(desktop): update app state controller registration

Steven Enamakel85e8b30b0830
diff --git a/crates/openhuman-core/src/core/all.rs b/crates/openhuman-core/src/core/all.rs
index 4a93cc53db..ddd82ceca8 100644
--- a/crates/openhuman-core/src/core/all.rs
+++ b/crates/openhuman-core/src/core/all.rs
@@ -290,10 +290,10 @@ fn build_registered_controllers() -> Vec<GroupedController> {
crate::platform::about_app::all_about_app_registered_controllers(),
);
// Core application shell state
- push(
+ push_entries(
&mut controllers,
DomainGroup::Desktop,
- crate::desktop::app_state::all_app_state_registered_controllers(),
+ crate::desktop::app_state::all_app_state_controller_entries(),
);
// Composio integration controllers
push_entries(
diff --git a/crates/openhuman-core/src/desktop/app_state/schemas.rs b/crates/openhuman-core/src/desktop/app_state/schemas.rs
index 9ed485f067..97ec077d98 100644
--- a/crates/openhuman-core/src/desktop/app_state/schemas.rs
+++ b/crates/openhuman-core/src/desktop/app_state/schemas.rs
@@ -3,7 +3,9 @@ use serde::de::{self, DeserializeOwned};
use serde::Deserialize;
use serde_json::{Map, Value};
-use crate::core::all::{ControllerFuture, RegisteredController};
+use crate::core::all::{
+ BoundRegisteredController, ControllerEntry, ControllerFuture, RegisteredController,
+};
use crate::core::{ControllerSchema, FieldSchema, TypeSchema};
use super::ops::StoredAppStatePatch;
@@ -39,6 +41,13 @@ pub fn all_app_state_registered_controllers() -> Vec<RegisteredController> {
]
}
+pub(crate) fn all_app_state_controller_entries() -> Vec<ControllerEntry> {
+ vec![
+ ControllerEntry::bound(snapshot_controller()),
+ ControllerEntry::bound(update_local_state_controller()),
+ ]
+}
+
#[cfg(test)]
pub(crate) fn app_state_parameter_contracts() -> Vec<crate::core::all::ControllerParamContract> {
tests::parameter_contracts()
@@ -99,6 +108,44 @@ pub fn app_state_schemas(function: &str) -> ControllerSchema {
}
fn handle_snapshot(ctx: DispatchCtx, _params: Map<String, Value>) -> ControllerFuture {
+ snapshot_controller().invoke(ctx, _params)
+}
+
+fn handle_update_local_state(ctx: DispatchCtx, params: Map<String, Value>) -> ControllerFuture {
+ update_local_state_controller().invoke(ctx, params)
+}
+
+fn snapshot_controller() -> BoundRegisteredController {
+ BoundRegisteredController::typed(
+ app_state_schemas("snapshot"),
+ parse_snapshot,
+ run_snapshot,
+ )
+}
+
+fn update_local_state_controller() -> BoundRegisteredController {
+ BoundRegisteredController::typed(
+ app_state_schemas("update_local_state"),
+ parse_update_local_state,
+ run_update_local_state,
+ )
+}
+
+fn parse_snapshot(_params: Map<String, Value>) -> Result<(), String> {
+ Ok(())
+}
+
+fn parse_update_local_state(params: Map<String, Value>) -> Result<StoredAppStatePatch, String> {
+ let payload: UpdateLocalStateParams = serde_json::from_value(Value::Object(params))
+ .map_err(|e| format!("invalid params: {e}"))?;
+ Ok(StoredAppStatePatch {
+ encryption_key: payload.encryption_key,
+ onboarding_tasks: payload.onboarding_tasks,
+ keyring_consent: payload.keyring_consent,
+ })
+}
+
+fn run_snapshot(ctx: DispatchCtx, (): ()) -> ControllerFuture {
Box::pin(async move {
crate::desktop::app_state::snapshot(&ctx)
.await?
@@ -106,20 +153,11 @@ fn handle_snapshot(ctx: DispatchCtx, _params: Map<String, Value>) -> ControllerF
})
}
-fn handle_update_local_state(ctx: DispatchCtx, params: Map<String, Value>) -> ControllerFuture {
+fn run_update_local_state(ctx: DispatchCtx, patch: StoredAppStatePatch) -> ControllerFuture {
Box::pin(async move {
- let payload: UpdateLocalStateParams = serde_json::from_value(Value::Object(params))
- .map_err(|e| format!("invalid params: {e}"))?;
- crate::desktop::app_state::update_local_state(
- &ctx,
- StoredAppStatePatch {
- encryption_key: payload.encryption_key,
- onboarding_tasks: payload.onboarding_tasks,
- keyring_consent: payload.keyring_consent,
- },
- )
- .await?
- .into_cli_compatible_json()
+ crate::desktop::app_state::update_local_state(&ctx, patch)
+ .await?
+ .into_cli_compatible_json()
})
}