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

1

Browse Source
This commit is contained in:
高物
2026-04-23 00:29:52 +08:00
parent cd207dc237
commit 1223f597d2
4 changed files with 130 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

176
server-rs/crates/api-server/src/custom_world.rs
View File

@@ -566,7 +566,7 @@ pub async fn submit_custom_world_agent_message(
|_| {},
)
.await;
state
let finalized_operation = state
.spacetime_client()
.finalize_custom_world_agent_message(build_finalize_record_input(
session_id,
@@ -584,7 +584,7 @@ pub async fn submit_custom_world_agent_message(
Ok(json_success_body(
Some(&request_context),
json!({
"operation": map_custom_world_agent_operation_response(operation),
"operation": map_custom_world_agent_operation_response(finalized_operation),
}),
))
}
@@ -651,57 +651,100 @@ pub async fn stream_custom_world_agent_message(
.map_err(|error| {
custom_world_error_response(&request_context, map_custom_world_client_error(error))
})?;
let mut reply_updates = Vec::<String>::new();
let turn_result = run_custom_world_agent_turn(
CustomWorldAgentTurnRequest {
llm_client: state.llm_client(),
session: &session,
quick_fill_requested: payload.quick_fill_requested.unwrap_or(false),
focus_card_id: payload.focus_card_id.clone(),
},
|text| {
reply_updates.push(text.to_string());
},
)
.await;
state
.spacetime_client()
.finalize_custom_world_agent_message(build_finalize_record_input(
session_id.clone(),
owner_user_id.clone(),
operation.operation_id.clone(),
format!("assistant-{}", operation.operation_id),
turn_result,
current_utc_micros(),
))
.await
.map_err(|error| {
custom_world_error_response(&request_context, map_custom_world_client_error(error))
})?;
let final_session = state
.spacetime_client()
.get_custom_world_agent_session(session_id, owner_user_id)
.await
.map_err(|error| {
custom_world_error_response(&request_context, map_custom_world_client_error(error))
})?;
let session_response = map_custom_world_agent_session_response(final_session);
let quick_fill_requested = payload.quick_fill_requested.unwrap_or(false);
let focus_card_id = payload.focus_card_id.clone();
let state = state.clone();
let session_id_for_stream = session_id.clone();
let owner_user_id_for_stream = owner_user_id.clone();
let operation_id = operation.operation_id.clone();
let stream = async_stream::stream! {
let (reply_tx, mut reply_rx) = tokio::sync::mpsc::unbounded_channel::<String>();
let turn_result = {
let run_turn = run_custom_world_agent_turn(
CustomWorldAgentTurnRequest {
llm_client: state.llm_client(),
session: &session,
quick_fill_requested,
focus_card_id,
},
move |text| {
let _ = reply_tx.send(text.to_string());
},
);
tokio::pin!(run_turn);
let mut events = reply_updates
.into_iter()
.map(|text| custom_world_sse_json_event("reply_delta", json!({ "text": text })))
.collect::<Result<Vec<_>, _>>()
.map_err(|error| custom_world_error_response(&request_context, error))?;
events.push(
custom_world_sse_json_event("session", json!({ "session": session_response }))
.map_err(|error| custom_world_error_response(&request_context, error))?,
);
events.push(
custom_world_sse_json_event("done", json!({ "ok": true }))
.map_err(|error| custom_world_error_response(&request_context, error))?,
);
loop {
tokio::select! {
result = &mut run_turn => break result,
maybe_text = reply_rx.recv() => {
if let Some(text) = maybe_text {
yield Ok::<Event, Infallible>(custom_world_sse_json_event_or_error(
"reply_delta",
json!({ "text": text }),
));
}
}
}
}
};
let stream = tokio_stream::iter(events.into_iter().map(|event| Ok::<Event, Infallible>(event)));
while let Some(text) = reply_rx.recv().await {
yield Ok::<Event, Infallible>(custom_world_sse_json_event_or_error(
"reply_delta",
json!({ "text": text }),
));
}
let finalize_result = state
.spacetime_client()
.finalize_custom_world_agent_message(build_finalize_record_input(
session_id_for_stream.clone(),
owner_user_id_for_stream.clone(),
operation_id.clone(),
format!("assistant-{operation_id}"),
turn_result,
current_utc_micros(),
))
.await;
let _finalized_operation = match finalize_result {
Ok(operation) => operation,
Err(error) => {
yield Ok::<Event, Infallible>(custom_world_sse_json_event_or_error(
"error",
json!({ "message": error.to_string() }),
));
return;
}
};
let final_session = match state
.spacetime_client()
.get_custom_world_agent_session(
session_id_for_stream,
owner_user_id_for_stream,
)
.await
{
Ok(session) => session,
Err(error) => {
yield Ok::<Event, Infallible>(custom_world_sse_json_event_or_error(
"error",
json!({ "message": error.to_string() }),
));
return;
}
};
let session_response = map_custom_world_agent_session_response(final_session);
yield Ok::<Event, Infallible>(custom_world_sse_json_event_or_error(
"session",
json!({ "session": session_response }),
));
yield Ok::<Event, Infallible>(custom_world_sse_json_event_or_error(
"done",
json!({ "ok": true }),
));
};
Ok(Sse::new(stream).into_response())
}
@@ -1053,21 +1096,6 @@ fn map_custom_world_result_preview_blocker_response(
}
}
fn resolve_stream_reply_text(session: &CustomWorldAgentSessionSnapshotResponse) -> String {
session
.last_assistant_reply
.clone()
.or_else(|| {
session
.messages
.iter()
.rev()
.find(|message| message.role == "assistant")
.map(|message| message.text.clone())
})
.unwrap_or_default()
}
fn map_custom_world_client_error(error: SpacetimeClientError) -> AppError {
let status = match &error {
SpacetimeClientError::Procedure(message)
@@ -1111,6 +1139,22 @@ fn custom_world_sse_json_event(event_name: &str, payload: Value) -> Result<Event
})
}
fn custom_world_sse_json_event_or_error(event_name: &str, payload: Value) -> Event {
match custom_world_sse_json_event(event_name, payload) {
Ok(event) => event,
Err(_) => custom_world_sse_error_event_message("SSE payload 序列化失败".to_string()),
}
}
fn custom_world_sse_error_event_message(message: String) -> Event {
let payload = format!(
"{{\"message\":{}}}",
serde_json::to_string(&message)
.unwrap_or_else(|_| "\"SSE 错误事件序列化失败\"".to_string())
);
Event::default().event("error").data(payload)
}
fn resolve_author_display_name(_authenticated: &AuthenticatedAccessToken) -> String {
"玩家".to_string()
}

5
server-rs/crates/api-server/src/custom_world_agent_turn.rs
View File

@@ -68,6 +68,7 @@ enum PromptConversationMode {
}
#[derive(Clone, Debug)]
#[allow(dead_code)]
struct PromptDynamicState {
current_turn: u32,
progress_percent: u32,
@@ -923,8 +924,8 @@ fn build_prompt_dynamic_state_inference_prompt(
}
fn build_eight_anchor_single_turn_prompt(
current_turn: u32,
progress_percent: u32,
_current_turn: u32,
_progress_percent: u32,
quick_fill_requested: bool,
current_anchor_content: &EightAnchorContent,
chat_history: &[JsonValue],