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

Merge remote-tracking branch 'origin/master' into editor-agent-refactored

Browse Source
This commit is contained in:
王德宇
2026-07-17 16:26:57 +08:00
parent 9b42c64300 93b27a2307
commit 0d22ee5d71
23 changed files with 106 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server-rs/Cargo.lock
Generated
+28 -28
View File
@@ -5888,9 +5888,9 @@ dependencies = [
[[package]]
name = "spacetimedb"
version = "2.6.0"
version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8037ee5a6fa7348bf0392c728e4de4a0ba6f89c967eff80b666ac3e1e8f2b612"
checksum = "b6eff5017248ff2e35e03564df947fdf3e963f7198be6ae1d9e894c2efb2ea15"
dependencies = [
"anyhow",
"bytemuck",
@@ -5911,9 +5911,9 @@ dependencies = [
[[package]]
name = "spacetimedb-bindings-macro"
version = "2.6.0"
version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "202fb591c7d18fbbd4aec24a34ad6f03e3accc41580aee0fd2f9ad0514681917"
checksum = "fce86c7657dcb42a33ce55f0100f98964dc15b64e79f06803a478676b74d6c82"
dependencies = [
"heck 0.4.1",
"humantime",
@@ -5925,18 +5925,18 @@ dependencies = [
[[package]]
name = "spacetimedb-bindings-sys"
version = "2.6.0"
version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60869317019bbc8fa571e5c8ff21fe72abf9e5bcb579531efdded4e93a76e827"
checksum = "dbe5f9d71d59bdb93d81a7a61eee75ac2f1f88f91e139a7e263261f9dbf316de"
dependencies = [
"spacetimedb-primitives",
]
[[package]]
name = "spacetimedb-client-api-messages"
version = "2.6.0"
version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad481e05f959aa646e36e3e2e8b7581da58ca8f8a1b5e643122fc2bd4a4ff0df"
checksum = "1642404553853b56e521a12aa9849807d8e003433934c73eeebbc8671f1254f8"
dependencies = [
"bytes",
"bytestring",
@@ -5956,9 +5956,9 @@ dependencies = [
[[package]]
name = "spacetimedb-data-structures"
version = "2.6.0"
version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ec3aa387bfa45691c11b57e9072522dde3bbb554f7e017b57025b591556dbfb"
checksum = "3407c90a3da48b1c421bbad6a2ee6de3855a77d73fae98773bcc058426f1318f"
dependencies = [
"ahash",
"crossbeam-queue",
@@ -5971,9 +5971,9 @@ dependencies = [
[[package]]
name = "spacetimedb-lib"
version = "2.6.0"
version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d05a4bef4619afe949f7eac9c3a31f06f21c5139c89920a8f4c7dd7b09c24a8"
checksum = "bceaf72bdbf1a624d55d17ebaa38f8cf78a4972e43641c6cbf94f82318b5581d"
dependencies = [
"anyhow",
"bitflags 2.13.0",
@@ -5996,9 +5996,9 @@ dependencies = [
[[package]]
name = "spacetimedb-memory-usage"
version = "2.6.0"
version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "064ae4130ddc47e1b87b59252d041cf929ffbdc53686af80dff290f819e523ef"
checksum = "6cc1e19f664b47f4b3b82fb69b2fc096c3d82dc659ea705d62bbbec2fa9c2e83"
dependencies = [
"decorum",
"ethnum",
@@ -6006,9 +6006,9 @@ dependencies = [
[[package]]
name = "spacetimedb-metrics"
version = "2.6.0"
version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "65b36210b2cdde2784e22e7182717bf1ab06a431f54bf9662e38bd1bcb8681c5"
checksum = "0c794455ed96245d52d837c8bbc3493d1c17d9f6382e6c5fee1c88926c9aa04a"
dependencies = [
"arrayvec",
"itertools 0.12.1",
@@ -6018,9 +6018,9 @@ dependencies = [
[[package]]
name = "spacetimedb-primitives"
version = "2.6.0"
version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c1e4745d32aacb71d29050f1ff6fa24fa149d939b8787f90ec28d2cac3c107b"
checksum = "b7525fda46b21fffdc62805099dee853a79000e0673ff6df4b8355cb0b8dabe8"
dependencies = [
"bitflags 2.13.0",
"either",
@@ -6032,18 +6032,18 @@ dependencies = [
[[package]]
name = "spacetimedb-query-builder"
version = "2.6.0"
version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79849bd28750b3351d54f3df4b37c5454cae3c62d0184bc9855650048a80c032"
checksum = "1f283c4797961d9a94f623ee4c66e6a94d30861b6380a49a27ac2d9568e17125"
dependencies = [
"spacetimedb-lib",
]
[[package]]
name = "spacetimedb-sats"
version = "2.6.0"
version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ca3327e8cd735f347ef5ff08a61b9806418acdcc0394ddd35a212c0849e4295"
checksum = "6cefb87b7d5e760d43cb65855591e25af772bdcca19562e5796ae797240d1998"
dependencies = [
"anyhow",
"arrayvec",
@@ -6074,9 +6074,9 @@ dependencies = [
[[package]]
name = "spacetimedb-schema"
version = "2.6.0"
version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb81b65cfa1da17f5f032f9566086670fb68a27f14f194a4dad76a21cc79f490"
checksum = "775cfdeb406e5628bf78b2221b0e0fd2fcba583f691bb89ba1c9338790ecaf7d"
dependencies = [
"anyhow",
"convert_case 0.6.0",
@@ -6105,9 +6105,9 @@ dependencies = [
[[package]]
name = "spacetimedb-sdk"
version = "2.6.0"
version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ceb50bcefcb70ae517c672a7ac21cbaf7affd44f0d9991968869eff566d83ba5"
checksum = "074a6d8828638176eb8e9bba7a3e6fb75dc659b260717306eb966c7e10575cd7"
dependencies = [
"anymap3",
"base64 0.21.7",
@@ -6137,9 +6137,9 @@ dependencies = [
[[package]]
name = "spacetimedb-sql-parser"
version = "2.6.0"
version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86cbda18ee77e497b698b22377750228b1e88ead4dcb79fc3fddb78cccab0a77"
checksum = "3b978b6d76cfbe5782a7f0dae7e25f6be4e7e13cfad26c9211d4eb4cdf8c22da"
dependencies = [
"derive_more",
"spacetimedb-lib",
server-rs/Cargo.toml
+3 -3
View File
@@ -135,9 +135,9 @@ serde_urlencoded = "0.7"
sha1 = "0.10"
sha2 = "0.10"
socket2 = "0.6"
spacetimedb = "=2.6.0"
spacetimedb-sdk = "=2.6.0"
spacetimedb-lib = { version = "=2.6.0", default-features = false }
spacetimedb = "=2.6.1"
spacetimedb-sdk = "=2.6.1"
spacetimedb-lib = { version = "=2.6.1", default-features = false }
time = "0.3"
tokio = "1"
tokio-stream = "0.1"
server-rs/crates/module-editor-agent/src/events.rs
+1
View File
@@ -0,0 +1 @@
//! 编辑器 Agent 领域事件预留落位，当前不导出独立事件类型。
server-rs/crates/module-editor-agent/src/lib.rs
+1
View File
@@ -2,6 +2,7 @@ mod application;
mod commands;
mod domain;
mod errors;
mod events;
pub use application::*;
pub use commands::*;
server-rs/crates/spacetime-client/src/module_bindings.rs
+1 -1
View File
@@ -1,7 +1,7 @@
// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
// This was generated using spacetimedb cli version 2.6.0 (commit 31fd1c8c3346dfec38dfcc2e89c2ecf457cf26ff).
// This was generated using spacetimedb cli version 2.6.1 (commit 052c83fe984a4c4eb7bb4f9afa5c6b1903891d87).
#![allow(unused, clippy::all)]
use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws};
server-rs/crates/spacetime-client/src/module_bindings/update_external_generation_job_phase_and_return_procedure.rs
+8 -8
View File
@@ -34,10 +34,10 @@ pub trait update_external_generation_job_phase_and_return {
input: ExternalGenerationJobPhaseUpdateInput,
__callback: impl FnOnce(
&super::ProcedureEventContext,
Result<ExternalGenerationJobPhaseUpdateProcedureResult, __sdk::InternalError>,
) + Send
+ 'static,
&super::ProcedureEventContext,
Result<ExternalGenerationJobPhaseUpdateProcedureResult, __sdk::InternalError>,
) + Send
+ 'static,
);
}
@@ -47,10 +47,10 @@ impl update_external_generation_job_phase_and_return for super::RemoteProcedures
input: ExternalGenerationJobPhaseUpdateInput,
__callback: impl FnOnce(
&super::ProcedureEventContext,
Result<ExternalGenerationJobPhaseUpdateProcedureResult, __sdk::InternalError>,
) + Send
+ 'static,
&super::ProcedureEventContext,
Result<ExternalGenerationJobPhaseUpdateProcedureResult, __sdk::InternalError>,
) + Send
+ 'static,
) {
self.imp
.invoke_procedure_with_callback::<_, ExternalGenerationJobPhaseUpdateProcedureResult>(
server-rs/crates/spacetime-module/src/editor_project_storage.rs
+12 -6
View File
@@ -1095,7 +1095,8 @@ pub fn find_editor_asset_group_source_and_return(
ctx: &mut ProcedureContext,
input: EditorAssetGroupSourceLookupInput,
) -> EditorAssetProcedureResult {
match ctx.try_with_tx(|tx| find_editor_asset_group_source(tx, input.clone())) {
let caller = ctx.sender();
match ctx.try_with_tx(|tx| find_editor_asset_group_source(tx, caller, input.clone())) {
Ok(asset) => editor_asset_ok(asset),
Err(message) => editor_asset_error(message),
}
@@ -1139,7 +1140,8 @@ pub fn create_editor_asset_and_return(
ctx: &mut ProcedureContext,
input: EditorAssetCreateInput,
) -> EditorAssetProcedureResult {
match ctx.try_with_tx(|tx| create_editor_asset(tx, input.clone())) {
let caller = ctx.sender();
match ctx.try_with_tx(|tx| create_editor_asset(tx, caller, input.clone())) {
Ok(asset) => editor_asset_ok(Some(asset)),
Err(message) => editor_asset_error(message),
}
@@ -1150,7 +1152,8 @@ pub fn complete_editor_asset_group_cohort_and_return(
ctx: &mut ProcedureContext,
input: EditorAssetGroupCohortCompleteInput,
) -> EditorAssetProcedureResult {
match ctx.try_with_tx(|tx| complete_editor_asset_group_cohort(tx, input.clone())) {
let caller = ctx.sender();
match ctx.try_with_tx(|tx| complete_editor_asset_group_cohort(tx, caller, input.clone())) {
Ok(asset) => editor_asset_ok(Some(asset)),
Err(message) => editor_asset_error(message),
}
@@ -1855,9 +1858,10 @@ fn admin_list_editor_assets(
fn find_editor_asset_group_source(
ctx: &ReducerContext,
caller: Identity,
input: EditorAssetGroupSourceLookupInput,
) -> Result<Option<EditorAssetSnapshot>, String> {
require_editor_generation_runtime_service_identity(ctx, ctx.sender())?;
require_editor_generation_runtime_service_identity(ctx, caller)?;
let owner_user_id = normalize_required(&input.owner_user_id, "owner_user_id")?;
let source_resource_ids = input
.source_resource_ids
@@ -1924,9 +1928,10 @@ fn find_editor_asset_group_source(
fn complete_editor_asset_group_cohort(
ctx: &ReducerContext,
caller: Identity,
input: EditorAssetGroupCohortCompleteInput,
) -> Result<EditorAssetSnapshot, String> {
require_editor_generation_runtime_service_identity(ctx, ctx.sender())?;
require_editor_generation_runtime_service_identity(ctx, caller)?;
let owner_user_id = normalize_required(&input.owner_user_id, "owner_user_id")?;
let task_id = normalize_required(&input.task_id, "task_id")?;
let group_task_id = normalize_required(&input.group_task_id, "group_task_id")?;
@@ -2101,6 +2106,7 @@ fn delete_editor_asset_folder(
fn create_editor_asset(
ctx: &ReducerContext,
caller: Identity,
input: EditorAssetCreateInput,
) -> Result<EditorAssetSnapshot, String> {
let asset_id = normalize_required(&input.asset_id, "editor_asset.asset_id")?;
@@ -2131,7 +2137,7 @@ fn create_editor_asset(
return Err("素材任务预期产物数量必须与归组 Task ID 一起提供".to_string());
}
if group_task_id.is_some() {
require_editor_generation_runtime_service_identity(ctx, ctx.sender())?;
require_editor_generation_runtime_service_identity(ctx, caller)?;
}
ctx.db.editor_asset().insert(EditorAsset {
asset_id: asset_id.clone(),
server-rs/crates/spacetime-module/src/migration.rs
+2
View File
@@ -254,6 +254,8 @@ macro_rules! migration_tables {
editor_project_resource,
editor_asset_folder,
editor_asset,
editor_asset_group_source_provenance,
editor_asset_group_cohort,
editor_showcase_asset,
editor_showcase_asset_like,
editor_showcase_campaign_config,