GenarrativeAI/Genarrative
5
0
Fork 0
Code Issues Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Resolve spacetime client binding merge conflicts

Browse Source
This commit is contained in:
高物
2026-04-24 14:44:46 +08:00
parent 4f369617c7
commit f65177b147
26 changed files with 2172 additions and 1020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
server-rs/crates/spacetime-client/src/lib.rs
View File

@@ -187,6 +187,7 @@ use crate::module_bindings::{
CustomWorldAgentMessageSubmitInput as BindingCustomWorldAgentMessageSubmitInput,
CustomWorldAgentOperationGetInput as BindingCustomWorldAgentOperationGetInput,
CustomWorldAgentOperationProcedureResult as BindingCustomWorldAgentOperationProcedureResult,
CustomWorldAgentOperationProgressInput as BindingCustomWorldAgentOperationProgressInput,
CustomWorldAgentOperationSnapshot as BindingCustomWorldAgentOperationSnapshot,
CustomWorldAgentSessionCreateInput as BindingCustomWorldAgentSessionCreateInput,
CustomWorldAgentSessionGetInput as BindingCustomWorldAgentSessionGetInput,
@@ -373,6 +374,7 @@ use crate::module_bindings::{
swap_puzzle_pieces_procedure::swap_puzzle_pieces as _,
unpublish_custom_world_profile_and_return_procedure::unpublish_custom_world_profile_and_return as _,
update_puzzle_work_procedure::update_puzzle_work as _,
upsert_custom_world_agent_operation_progress_procedure::upsert_custom_world_agent_operation_progress as _,
upsert_custom_world_profile_and_return_procedure::upsert_custom_world_profile_and_return as _,
upsert_platform_browse_history_and_return_procedure::upsert_platform_browse_history_and_return as _,
upsert_runtime_setting_and_return_procedure::upsert_runtime_setting_and_return as _,
@@ -1886,6 +1888,36 @@ impl SpacetimeClient {
.await
}
pub async fn upsert_custom_world_agent_operation_progress(
&self,
input: CustomWorldAgentOperationProgressRecordInput,
) -> Result<CustomWorldAgentOperationRecord, SpacetimeClientError> {
let procedure_input = BindingCustomWorldAgentOperationProgressInput {
session_id: input.session_id,
owner_user_id: input.owner_user_id,
operation_id: input.operation_id,
operation_type: map_custom_world_agent_operation_type(input.operation_type.as_str()),
operation_status: map_custom_world_agent_operation_status(input.operation_status.as_str()),
phase_label: input.phase_label,
phase_detail: input.phase_detail,
operation_progress: input.operation_progress,
error_message: input.error_message,
updated_at_micros: input.updated_at_micros,
};
self.call_after_connect(move |connection, sender| {
connection
.procedures()
.upsert_custom_world_agent_operation_progress_then(procedure_input, move |_, result| {
let mapped = result
.map_err(|error| SpacetimeClientError::Procedure(error.to_string()))
.and_then(map_custom_world_agent_operation_procedure_result);
send_once(&sender, mapped);
});
})
.await
}
pub async fn list_platform_browse_history(
&self,
user_id: String,
@@ -5274,6 +5306,24 @@ fn format_rpg_agent_operation_type(
}
}
fn map_custom_world_agent_operation_type(value: &str) -> crate::module_bindings::RpgAgentOperationType {
match value.trim() {
"draft_foundation" => crate::module_bindings::RpgAgentOperationType::DraftFoundation,
"update_draft_card" => crate::module_bindings::RpgAgentOperationType::UpdateDraftCard,
"sync_result_profile" => crate::module_bindings::RpgAgentOperationType::SyncResultProfile,
"generate_characters" => crate::module_bindings::RpgAgentOperationType::GenerateCharacters,
"generate_landmarks" => crate::module_bindings::RpgAgentOperationType::GenerateLandmarks,
"generate_role_assets" => crate::module_bindings::RpgAgentOperationType::GenerateRoleAssets,
"sync_role_assets" => crate::module_bindings::RpgAgentOperationType::SyncRoleAssets,
"generate_scene_assets" => crate::module_bindings::RpgAgentOperationType::GenerateSceneAssets,
"sync_scene_assets" => crate::module_bindings::RpgAgentOperationType::SyncSceneAssets,
"expand_long_tail" => crate::module_bindings::RpgAgentOperationType::ExpandLongTail,
"publish_world" => crate::module_bindings::RpgAgentOperationType::PublishWorld,
"revert_checkpoint" => crate::module_bindings::RpgAgentOperationType::RevertCheckpoint,
_ => crate::module_bindings::RpgAgentOperationType::ProcessMessage,
}
}
fn format_rpg_agent_operation_status(
value: crate::module_bindings::RpgAgentOperationStatus,
) -> &'static str {
@@ -5285,6 +5335,15 @@ fn format_rpg_agent_operation_status(
}
}
fn map_custom_world_agent_operation_status(value: &str) -> crate::module_bindings::RpgAgentOperationStatus {
match value.trim() {
"queued" => crate::module_bindings::RpgAgentOperationStatus::Queued,
"completed" => crate::module_bindings::RpgAgentOperationStatus::Completed,
"failed" => crate::module_bindings::RpgAgentOperationStatus::Failed,
_ => crate::module_bindings::RpgAgentOperationStatus::Running,
}
}
fn parse_rpg_agent_operation_status_record(
value: &str,
) -> Result<crate::module_bindings::RpgAgentOperationStatus, SpacetimeClientError> {
@@ -5970,6 +6029,20 @@ pub struct CustomWorldAgentOperationRecord {
pub error_message: Option<String>,
}
#[derive(Clone, Debug, PartialEq, Eq)]
pub struct CustomWorldAgentOperationProgressRecordInput {
pub session_id: String,
pub owner_user_id: String,
pub operation_id: String,
pub operation_type: String,
pub operation_status: String,
pub phase_label: String,
pub phase_detail: String,
pub operation_progress: u32,
pub error_message: Option<String>,
pub updated_at_micros: i64,
}
#[derive(Clone, Debug, PartialEq)]
pub struct CustomWorldDraftCardRecord {
pub card_id: String,

32
server-rs/crates/spacetime-client/src/module_bindings/custom_world_agent_operation_progress_input_type.rs Normal file
View File

@@ -0,0 +1,32 @@
// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
#![allow(unused, clippy::all)]
use spacetimedb_sdk::__codegen::{
self as __sdk,
__lib,
__sats,
__ws,
};
use super::rpg_agent_operation_status_type::RpgAgentOperationStatus;
use super::rpg_agent_operation_type_type::RpgAgentOperationType;
#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)]
#[sats(crate = __lib)]
pub struct CustomWorldAgentOperationProgressInput {
pub session_id: String,
pub owner_user_id: String,
pub operation_id: String,
pub operation_type: RpgAgentOperationType,
pub operation_status: RpgAgentOperationStatus,
pub phase_label: String,
pub phase_detail: String,
pub operation_progress: u32,
pub error_message: Option::<String>,
pub updated_at_micros: i64,
}
impl __sdk::InModule for CustomWorldAgentOperationProgressInput {
type Module = super::RemoteModule;
}

43
server-rs/crates/spacetime-client/src/module_bindings/mod.rs
View File

@@ -44,13 +44,10 @@ pub mod asset_object_access_policy_type;
pub mod asset_object_procedure_result_type;
pub mod asset_object_upsert_input_type;
pub mod asset_object_upsert_snapshot_type;
<<<<<<< HEAD
=======
pub mod auth_store_snapshot_type;
pub mod auth_store_snapshot_procedure_result_type;
pub mod auth_store_snapshot_record_type;
pub mod auth_store_snapshot_upsert_input_type;
>>>>>>> 4f272a50 (迁移后端认证与拆分 Spacetime 客户端)
pub mod battle_mode_type;
pub mod battle_state_type;
pub mod battle_state_input_type;
@@ -115,6 +112,7 @@ pub mod custom_world_agent_message_submit_input_type;
pub mod custom_world_agent_operation_type;
pub mod custom_world_agent_operation_get_input_type;
pub mod custom_world_agent_operation_procedure_result_type;
pub mod custom_world_agent_operation_progress_input_type;
pub mod custom_world_agent_operation_snapshot_type;
pub mod custom_world_agent_session_type;
pub mod custom_world_agent_session_create_input_type;
@@ -346,10 +344,7 @@ pub mod ai_task_stage_table;
pub mod ai_text_chunk_table;
pub mod asset_entity_binding_table;
pub mod asset_object_table;
<<<<<<< HEAD
=======
pub mod auth_store_snapshot_table;
>>>>>>> 4f272a50 (迁移后端认证与拆分 Spacetime 客户端)
pub mod battle_state_table;
pub mod big_fish_agent_message_table;
pub mod big_fish_asset_slot_table;
@@ -407,17 +402,11 @@ pub mod delete_runtime_snapshot_and_return_procedure;
pub mod drag_puzzle_piece_or_group_procedure;
pub mod execute_custom_world_agent_action_procedure;
pub mod fail_ai_task_and_return_procedure;
<<<<<<< HEAD
pub mod finalize_big_fish_agent_message_turn_procedure;
pub mod finalize_custom_world_agent_message_turn_procedure;
pub mod finalize_puzzle_agent_message_turn_procedure;
pub mod generate_big_fish_asset_procedure;
=======
pub mod finalize_custom_world_agent_message_turn_procedure;
pub mod finalize_puzzle_agent_message_turn_procedure;
pub mod generate_big_fish_asset_procedure;
pub mod get_auth_store_snapshot_procedure;
>>>>>>> 4f272a50 (迁移后端认证与拆分 Spacetime 客户端)
pub mod get_battle_state_procedure;
pub mod get_big_fish_run_procedure;
pub mod get_big_fish_session_procedure;
@@ -471,6 +460,7 @@ pub mod swap_puzzle_pieces_procedure;
pub mod unpublish_custom_world_profile_and_return_procedure;
pub mod update_puzzle_work_procedure;
pub mod upsert_auth_store_snapshot_procedure;
pub mod upsert_custom_world_agent_operation_progress_procedure;
pub mod upsert_chapter_progression_and_return_procedure;
pub mod upsert_custom_world_profile_and_return_procedure;
pub mod upsert_npc_state_and_return_procedure;
@@ -511,13 +501,10 @@ pub use asset_object_access_policy_type::AssetObjectAccessPolicy;
pub use asset_object_procedure_result_type::AssetObjectProcedureResult;
pub use asset_object_upsert_input_type::AssetObjectUpsertInput;
pub use asset_object_upsert_snapshot_type::AssetObjectUpsertSnapshot;
<<<<<<< HEAD
=======
pub use auth_store_snapshot_type::AuthStoreSnapshot;
pub use auth_store_snapshot_procedure_result_type::AuthStoreSnapshotProcedureResult;
pub use auth_store_snapshot_record_type::AuthStoreSnapshotRecord;
pub use auth_store_snapshot_upsert_input_type::AuthStoreSnapshotUpsertInput;
>>>>>>> 4f272a50 (迁移后端认证与拆分 Spacetime 客户端)
pub use battle_mode_type::BattleMode;
pub use battle_state_type::BattleState;
pub use battle_state_input_type::BattleStateInput;
@@ -582,6 +569,7 @@ pub use custom_world_agent_message_submit_input_type::CustomWorldAgentMessageSub
pub use custom_world_agent_operation_type::CustomWorldAgentOperation;
pub use custom_world_agent_operation_get_input_type::CustomWorldAgentOperationGetInput;
pub use custom_world_agent_operation_procedure_result_type::CustomWorldAgentOperationProcedureResult;
pub use custom_world_agent_operation_progress_input_type::CustomWorldAgentOperationProgressInput;
pub use custom_world_agent_operation_snapshot_type::CustomWorldAgentOperationSnapshot;
pub use custom_world_agent_session_type::CustomWorldAgentSession;
pub use custom_world_agent_session_create_input_type::CustomWorldAgentSessionCreateInput;
@@ -789,10 +777,7 @@ pub use ai_task_stage_table::*;
pub use ai_text_chunk_table::*;
pub use asset_entity_binding_table::*;
pub use asset_object_table::*;
<<<<<<< HEAD
=======
pub use auth_store_snapshot_table::*;
>>>>>>> 4f272a50 (迁移后端认证与拆分 Spacetime 客户端)
pub use battle_state_table::*;
pub use big_fish_agent_message_table::*;
pub use big_fish_asset_slot_table::*;
@@ -874,17 +859,11 @@ pub use delete_runtime_snapshot_and_return_procedure::delete_runtime_snapshot_an
pub use drag_puzzle_piece_or_group_procedure::drag_puzzle_piece_or_group;
pub use execute_custom_world_agent_action_procedure::execute_custom_world_agent_action;
pub use fail_ai_task_and_return_procedure::fail_ai_task_and_return;
<<<<<<< HEAD
pub use finalize_big_fish_agent_message_turn_procedure::finalize_big_fish_agent_message_turn;
pub use finalize_custom_world_agent_message_turn_procedure::finalize_custom_world_agent_message_turn;
pub use finalize_puzzle_agent_message_turn_procedure::finalize_puzzle_agent_message_turn;
pub use generate_big_fish_asset_procedure::generate_big_fish_asset;
=======
pub use finalize_custom_world_agent_message_turn_procedure::finalize_custom_world_agent_message_turn;
pub use finalize_puzzle_agent_message_turn_procedure::finalize_puzzle_agent_message_turn;
pub use generate_big_fish_asset_procedure::generate_big_fish_asset;
pub use get_auth_store_snapshot_procedure::get_auth_store_snapshot;
>>>>>>> 4f272a50 (迁移后端认证与拆分 Spacetime 客户端)
pub use get_battle_state_procedure::get_battle_state;
pub use get_big_fish_run_procedure::get_big_fish_run;
pub use get_big_fish_session_procedure::get_big_fish_session;
@@ -938,6 +917,7 @@ pub use swap_puzzle_pieces_procedure::swap_puzzle_pieces;
pub use unpublish_custom_world_profile_and_return_procedure::unpublish_custom_world_profile_and_return;
pub use update_puzzle_work_procedure::update_puzzle_work;
pub use upsert_auth_store_snapshot_procedure::upsert_auth_store_snapshot;
pub use upsert_custom_world_agent_operation_progress_procedure::upsert_custom_world_agent_operation_progress;
pub use upsert_chapter_progression_and_return_procedure::upsert_chapter_progression_and_return;
pub use upsert_custom_world_profile_and_return_procedure::upsert_custom_world_profile_and_return;
pub use upsert_npc_state_and_return_procedure::upsert_npc_state_and_return;
@@ -1249,10 +1229,7 @@ impl TryFrom<__ws::v2::TransactionUpdate> for DbUpdate {
"ai_text_chunk" => db_update.ai_text_chunk.append(ai_text_chunk_table::parse_table_update(table_update)?),
"asset_entity_binding" => db_update.asset_entity_binding.append(asset_entity_binding_table::parse_table_update(table_update)?),
"asset_object" => db_update.asset_object.append(asset_object_table::parse_table_update(table_update)?),
<<<<<<< HEAD
=======
"auth_store_snapshot" => db_update.auth_store_snapshot.append(auth_store_snapshot_table::parse_table_update(table_update)?),
>>>>>>> 4f272a50 (迁移后端认证与拆分 Spacetime 客户端)
"battle_state" => db_update.battle_state.append(battle_state_table::parse_table_update(table_update)?),
"big_fish_agent_message" => db_update.big_fish_agent_message.append(big_fish_agent_message_table::parse_table_update(table_update)?),
"big_fish_asset_slot" => db_update.big_fish_asset_slot.append(big_fish_asset_slot_table::parse_table_update(table_update)?),
@@ -1313,10 +1290,7 @@ impl __sdk::DbUpdate for DbUpdate {
diff.ai_text_chunk = cache.apply_diff_to_table::<AiTextChunk>("ai_text_chunk", &self.ai_text_chunk).with_updates_by_pk(|row| &row.text_chunk_row_id);
diff.asset_entity_binding = cache.apply_diff_to_table::<AssetEntityBinding>("asset_entity_binding", &self.asset_entity_binding).with_updates_by_pk(|row| &row.binding_id);
diff.asset_object = cache.apply_diff_to_table::<AssetObject>("asset_object", &self.asset_object).with_updates_by_pk(|row| &row.asset_object_id);
<<<<<<< HEAD
=======
diff.auth_store_snapshot = cache.apply_diff_to_table::<AuthStoreSnapshot>("auth_store_snapshot", &self.auth_store_snapshot).with_updates_by_pk(|row| &row.snapshot_id);
>>>>>>> 4f272a50 (迁移后端认证与拆分 Spacetime 客户端)
diff.battle_state = cache.apply_diff_to_table::<BattleState>("battle_state", &self.battle_state).with_updates_by_pk(|row| &row.battle_state_id);
diff.big_fish_agent_message = cache.apply_diff_to_table::<BigFishAgentMessage>("big_fish_agent_message", &self.big_fish_agent_message).with_updates_by_pk(|row| &row.message_id);
diff.big_fish_asset_slot = cache.apply_diff_to_table::<BigFishAssetSlot>("big_fish_asset_slot", &self.big_fish_asset_slot).with_updates_by_pk(|row| &row.slot_id);
@@ -1362,10 +1336,7 @@ for table_rows in raw.tables {
"ai_text_chunk" => db_update.ai_text_chunk.append(__sdk::parse_row_list_as_inserts(table_rows.rows)?),
"asset_entity_binding" => db_update.asset_entity_binding.append(__sdk::parse_row_list_as_inserts(table_rows.rows)?),
"asset_object" => db_update.asset_object.append(__sdk::parse_row_list_as_inserts(table_rows.rows)?),
<<<<<<< HEAD
=======
"auth_store_snapshot" => db_update.auth_store_snapshot.append(__sdk::parse_row_list_as_inserts(table_rows.rows)?),
>>>>>>> 4f272a50 (迁移后端认证与拆分 Spacetime 客户端)
"battle_state" => db_update.battle_state.append(__sdk::parse_row_list_as_inserts(table_rows.rows)?),
"big_fish_agent_message" => db_update.big_fish_agent_message.append(__sdk::parse_row_list_as_inserts(table_rows.rows)?),
"big_fish_asset_slot" => db_update.big_fish_asset_slot.append(__sdk::parse_row_list_as_inserts(table_rows.rows)?),
@@ -1411,10 +1382,7 @@ for table_rows in raw.tables {
"ai_text_chunk" => db_update.ai_text_chunk.append(__sdk::parse_row_list_as_deletes(table_rows.rows)?),
"asset_entity_binding" => db_update.asset_entity_binding.append(__sdk::parse_row_list_as_deletes(table_rows.rows)?),
"asset_object" => db_update.asset_object.append(__sdk::parse_row_list_as_deletes(table_rows.rows)?),
<<<<<<< HEAD
=======
"auth_store_snapshot" => db_update.auth_store_snapshot.append(__sdk::parse_row_list_as_deletes(table_rows.rows)?),
>>>>>>> 4f272a50 (迁移后端认证与拆分 Spacetime 客户端)
"battle_state" => db_update.battle_state.append(__sdk::parse_row_list_as_deletes(table_rows.rows)?),
"big_fish_agent_message" => db_update.big_fish_agent_message.append(__sdk::parse_row_list_as_deletes(table_rows.rows)?),
"big_fish_asset_slot" => db_update.big_fish_asset_slot.append(__sdk::parse_row_list_as_deletes(table_rows.rows)?),
@@ -1511,10 +1479,7 @@ impl<'r> __sdk::AppliedDiff<'r> for AppliedDiff<'r> {
callbacks.invoke_table_row_callbacks::<AiTextChunk>("ai_text_chunk", &self.ai_text_chunk, event);
callbacks.invoke_table_row_callbacks::<AssetEntityBinding>("asset_entity_binding", &self.asset_entity_binding, event);
callbacks.invoke_table_row_callbacks::<AssetObject>("asset_object", &self.asset_object, event);
<<<<<<< HEAD
=======
callbacks.invoke_table_row_callbacks::<AuthStoreSnapshot>("auth_store_snapshot", &self.auth_store_snapshot, event);
>>>>>>> 4f272a50 (迁移后端认证与拆分 Spacetime 客户端)
callbacks.invoke_table_row_callbacks::<BattleState>("battle_state", &self.battle_state, event);
callbacks.invoke_table_row_callbacks::<BigFishAgentMessage>("big_fish_agent_message", &self.big_fish_agent_message, event);
callbacks.invoke_table_row_callbacks::<BigFishAssetSlot>("big_fish_asset_slot", &self.big_fish_asset_slot, event);

64
server-rs/crates/spacetime-client/src/module_bindings/upsert_custom_world_agent_operation_progress_procedure.rs Normal file
View File

@@ -0,0 +1,64 @@
// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
#![allow(unused, clippy::all)]
use spacetimedb_sdk::__codegen::{
self as __sdk,
__lib,
__sats,
__ws,
};
use super::custom_world_agent_operation_procedure_result_type::CustomWorldAgentOperationProcedureResult;
use super::custom_world_agent_operation_progress_input_type::CustomWorldAgentOperationProgressInput;
#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)]
#[sats(crate = __lib)]
struct UpsertCustomWorldAgentOperationProgressArgs {
pub input: CustomWorldAgentOperationProgressInput,
}
impl __sdk::InModule for UpsertCustomWorldAgentOperationProgressArgs {
type Module = super::RemoteModule;
}
#[allow(non_camel_case_types)]
/// Extension trait for access to the procedure `upsert_custom_world_agent_operation_progress`.
///
/// Implemented for [`super::RemoteProcedures`].
pub trait upsert_custom_world_agent_operation_progress {
fn upsert_custom_world_agent_operation_progress(
&self,
input: CustomWorldAgentOperationProgressInput,
) {
self.upsert_custom_world_agent_operation_progress_then(input, |_, _| {});
}
fn upsert_custom_world_agent_operation_progress_then(
&self,
input: CustomWorldAgentOperationProgressInput,
__callback: impl FnOnce(
&super::ProcedureEventContext,
Result<CustomWorldAgentOperationProcedureResult, __sdk::InternalError>,
) + Send
+ 'static,
);
}
impl upsert_custom_world_agent_operation_progress for super::RemoteProcedures {
fn upsert_custom_world_agent_operation_progress_then(
&self,
input: CustomWorldAgentOperationProgressInput,
__callback: impl FnOnce(
&super::ProcedureEventContext,
Result<CustomWorldAgentOperationProcedureResult, __sdk::InternalError>,
) + Send
+ 'static,
) {
self.imp.invoke_procedure_with_callback::<_, CustomWorldAgentOperationProcedureResult>(
"upsert_custom_world_agent_operation_progress",
UpsertCustomWorldAgentOperationProgressArgs { input },
__callback,
);
}
}