Merge remote-tracking branch 'origin/master' into codex/ddd
# Conflicts: # docs/technical/README.md # docs/technical/RUST_API_SERVER_ROUTE_INDEX_2026-04-22.md # docs/technical/SPACETIMEDB_TABLE_CATALOG.md # scripts/generate-spacetime-bindings.mjs # server-rs/crates/api-server/src/app.rs # server-rs/crates/api-server/src/assets.rs # server-rs/crates/api-server/src/big_fish.rs # server-rs/crates/api-server/src/custom_world_ai.rs # server-rs/crates/api-server/src/llm.rs # server-rs/crates/api-server/src/main.rs # server-rs/crates/api-server/src/puzzle.rs # server-rs/crates/api-server/src/runtime_profile.rs # server-rs/crates/api-server/src/runtime_story/compat/ai.rs # server-rs/crates/api-server/src/runtime_story/compat/npc_actions.rs # server-rs/crates/api-server/src/runtime_story/compat/presentation.rs # server-rs/crates/api-server/src/runtime_story/compat/tests.rs # server-rs/crates/api-server/src/state.rs # server-rs/crates/module-auth/src/lib.rs # server-rs/crates/module-big-fish/src/lib.rs # server-rs/crates/module-custom-world/src/lib.rs # server-rs/crates/module-puzzle/src/lib.rs # server-rs/crates/module-runtime/src/lib.rs # server-rs/crates/spacetime-client/src/big_fish.rs # server-rs/crates/spacetime-client/src/lib.rs # server-rs/crates/spacetime-client/src/mapper.rs # server-rs/crates/spacetime-client/src/module_bindings/admin_disable_profile_redeem_code_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/admin_upsert_profile_redeem_code_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/advance_puzzle_next_level_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/append_ai_text_chunk_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/apply_chapter_progression_ledger_entry_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/attach_ai_result_reference_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/authorize_database_migration_operator_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/begin_story_session_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/big_fish_runtime_run_type.rs # server-rs/crates/spacetime-client/src/module_bindings/bind_asset_object_to_entity_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/cancel_ai_task_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/clear_platform_browse_history_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/compile_big_fish_draft_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/compile_custom_world_published_profile_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/compile_puzzle_agent_draft_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/complete_ai_stage_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/complete_ai_task_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/confirm_asset_object_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/consume_profile_wallet_points_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/continue_story_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/create_ai_task_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/create_battle_state_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/create_big_fish_session_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/create_custom_world_agent_session_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/create_profile_recharge_order_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/create_puzzle_agent_session_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/delete_big_fish_work_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/delete_custom_world_agent_session_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/delete_custom_world_profile_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/delete_puzzle_work_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/delete_runtime_snapshot_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/drag_puzzle_piece_or_group_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/execute_custom_world_agent_action_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/export_auth_store_snapshot_from_tables_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/export_database_migration_to_file_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/fail_ai_task_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/finalize_big_fish_agent_message_turn_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/finalize_custom_world_agent_message_turn_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/finalize_puzzle_agent_message_turn_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/generate_big_fish_asset_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/get_auth_store_snapshot_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/get_battle_state_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/get_big_fish_session_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/get_chapter_progression_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/get_custom_world_agent_card_detail_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/get_custom_world_agent_operation_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/get_custom_world_agent_session_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/get_custom_world_gallery_detail_by_code_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/get_custom_world_gallery_detail_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/get_custom_world_library_detail_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/get_player_progression_or_default_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/get_profile_dashboard_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/get_profile_play_stats_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/get_profile_recharge_center_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/get_profile_referral_invite_center_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/get_puzzle_agent_session_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/get_puzzle_gallery_detail_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/get_puzzle_run_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/get_puzzle_work_detail_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/get_runtime_inventory_state_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/get_runtime_setting_or_default_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/get_runtime_snapshot_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/get_story_session_state_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/grant_player_progression_experience_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/import_auth_store_snapshot_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/import_database_migration_from_file_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/import_database_migration_incremental_from_file_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/list_asset_history_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/list_big_fish_works_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/list_custom_world_gallery_entries_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/list_custom_world_profiles_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/list_custom_world_works_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/list_platform_browse_history_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/list_profile_save_archives_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/list_profile_wallet_ledger_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/list_puzzle_gallery_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/list_puzzle_works_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/mod.rs # server-rs/crates/spacetime-client/src/module_bindings/publish_big_fish_game_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/publish_custom_world_profile_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/publish_custom_world_world_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/publish_puzzle_work_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/record_big_fish_play_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/redeem_profile_referral_invite_code_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/redeem_profile_reward_code_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/refund_profile_wallet_points_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/resolve_combat_action_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/resolve_npc_battle_interaction_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/resolve_npc_interaction_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/resolve_npc_social_action_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/resolve_treasure_interaction_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/resume_profile_save_archive_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/revoke_database_migration_operator_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/save_puzzle_generated_images_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/select_puzzle_cover_image_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/start_puzzle_run_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/submit_big_fish_message_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/submit_custom_world_agent_message_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/submit_puzzle_agent_message_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/submit_puzzle_leaderboard_entry_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/swap_puzzle_pieces_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/unpublish_custom_world_profile_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/update_puzzle_work_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/upsert_auth_store_snapshot_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/upsert_chapter_progression_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/upsert_custom_world_agent_operation_progress_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/upsert_custom_world_profile_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/upsert_npc_state_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/upsert_platform_browse_history_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/upsert_runtime_setting_and_return_procedure.rs # server-rs/crates/spacetime-client/src/module_bindings/upsert_runtime_snapshot_and_return_procedure.rs # server-rs/crates/spacetime-module/src/auth/procedures.rs # server-rs/crates/spacetime-module/src/custom_world/mod.rs # server-rs/crates/spacetime-module/src/lib.rs # server-rs/crates/spacetime-module/src/migration.rs # server-rs/crates/spacetime-module/src/puzzle.rs # server-rs/crates/spacetime-module/src/runtime/profile.rs # src/components/platform-entry/PlatformEntryFlowShellImpl.tsx # src/components/rpg-entry/RpgEntryFlowShell.agent.interaction.test.tsx # src/services/aiService.ts # src/services/puzzle-runtime/puzzleRuntimeClient.ts
This commit is contained in:
@@ -18,6 +18,7 @@ pub const DEFAULT_REQUEST_TIMEOUT_MS: u64 = 30_000;
|
||||
pub const DEFAULT_MAX_RETRIES: u32 = 1;
|
||||
pub const DEFAULT_RETRY_BACKOFF_MS: u64 = 500;
|
||||
pub const CHAT_COMPLETIONS_PATH: &str = "/chat/completions";
|
||||
pub const RESPONSES_PATH: &str = "/responses";
|
||||
const DEFAULT_LLM_RAW_LOG_DIR: &str = "logs/llm-raw";
|
||||
|
||||
static LLM_RAW_LOG_SEQUENCE: AtomicU64 = AtomicU64::new(1);
|
||||
@@ -66,6 +67,14 @@ pub struct LlmTextRequest {
|
||||
pub messages: Vec<LlmMessage>,
|
||||
pub max_tokens: Option<u32>,
|
||||
pub enable_web_search: bool,
|
||||
pub protocol: LlmTextProtocol,
|
||||
}
|
||||
|
||||
// 文本协议必须由业务请求显式选择,避免全局默认模型把不同场景混到同一上游形态。
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||
pub enum LlmTextProtocol {
|
||||
ChatCompletions,
|
||||
Responses,
|
||||
}
|
||||
|
||||
// 上层在流式消费时拿到的是“累计文本 + 当前增量”,避免每层重新自己拼接。
|
||||
@@ -131,9 +140,16 @@ pub struct LlmClient {
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
struct ChatCompletionsRequestBody<'a> {
|
||||
model: &'a str,
|
||||
messages: &'a [LlmMessage],
|
||||
#[serde(untagged)]
|
||||
enum LlmRequestBody {
|
||||
ChatCompletions(ChatCompletionsRequestBody),
|
||||
Responses(ResponsesRequestBody),
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
struct ChatCompletionsRequestBody {
|
||||
model: String,
|
||||
messages: Vec<LlmMessage>,
|
||||
stream: bool,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
max_tokens: Option<u32>,
|
||||
@@ -144,10 +160,42 @@ struct ChatCompletionsRequestBody<'a> {
|
||||
#[derive(Serialize)]
|
||||
struct ChatCompletionsWebSearchOptions {}
|
||||
|
||||
#[derive(Serialize)]
|
||||
struct ResponsesRequestBody {
|
||||
model: String,
|
||||
stream: bool,
|
||||
input: Vec<ResponsesInputMessage>,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
max_output_tokens: Option<u32>,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
tools: Option<Vec<ResponsesWebSearchTool>>,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
struct ResponsesInputMessage {
|
||||
role: &'static str,
|
||||
content: Vec<ResponsesInputContentPart>,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
struct ResponsesInputContentPart {
|
||||
#[serde(rename = "type")]
|
||||
part_type: &'static str,
|
||||
text: String,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
struct ResponsesWebSearchTool {
|
||||
#[serde(rename = "type")]
|
||||
tool_type: &'static str,
|
||||
max_keyword: u8,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
struct LlmRawFailureInputLog<'a> {
|
||||
provider: &'static str,
|
||||
protocol: &'static str,
|
||||
model: &'a str,
|
||||
stream: bool,
|
||||
attempt: u32,
|
||||
@@ -195,10 +243,48 @@ struct ChatCompletionsContentPart {
|
||||
text: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
#[derive(Deserialize)]
|
||||
struct ResponsesResponseEnvelope {
|
||||
id: Option<String>,
|
||||
model: Option<String>,
|
||||
#[serde(default)]
|
||||
output_text: Option<String>,
|
||||
#[serde(default)]
|
||||
output: Vec<ResponsesOutputItem>,
|
||||
#[serde(default)]
|
||||
status: Option<String>,
|
||||
usage: Option<ResponsesUsage>,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
struct ResponsesOutputItem {
|
||||
#[serde(default)]
|
||||
content: Vec<ResponsesOutputContentPart>,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
struct ResponsesOutputContentPart {
|
||||
#[serde(rename = "type")]
|
||||
#[allow(dead_code)]
|
||||
part_type: Option<String>,
|
||||
#[serde(default)]
|
||||
text: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
struct ResponsesUsage {
|
||||
#[serde(default)]
|
||||
input_tokens: u64,
|
||||
#[serde(default)]
|
||||
output_tokens: u64,
|
||||
#[serde(default)]
|
||||
total_tokens: u64,
|
||||
}
|
||||
|
||||
struct OpenAiCompatibleSseParser {
|
||||
buffer: String,
|
||||
raw_text: String,
|
||||
protocol: LlmTextProtocol,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
@@ -296,6 +382,14 @@ impl LlmConfig {
|
||||
CHAT_COMPLETIONS_PATH.trim_start_matches('/')
|
||||
)
|
||||
}
|
||||
|
||||
pub fn responses_url(&self) -> String {
|
||||
format!(
|
||||
"{}/{}",
|
||||
self.base_url.trim_end_matches('/'),
|
||||
RESPONSES_PATH.trim_start_matches('/')
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
impl LlmMessage {
|
||||
@@ -326,6 +420,7 @@ impl LlmTextRequest {
|
||||
messages,
|
||||
max_tokens: None,
|
||||
enable_web_search: false,
|
||||
protocol: LlmTextProtocol::ChatCompletions,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -351,6 +446,11 @@ impl LlmTextRequest {
|
||||
self
|
||||
}
|
||||
|
||||
pub fn with_responses_api(mut self) -> Self {
|
||||
self.protocol = LlmTextProtocol::Responses;
|
||||
self
|
||||
}
|
||||
|
||||
fn validate(&self) -> Result<(), LlmError> {
|
||||
if self.messages.is_empty() {
|
||||
return Err(LlmError::InvalidRequest(
|
||||
@@ -386,6 +486,15 @@ impl LlmTextRequest {
|
||||
}
|
||||
}
|
||||
|
||||
impl LlmTextProtocol {
|
||||
fn as_str(self) -> &'static str {
|
||||
match self {
|
||||
Self::ChatCompletions => "chat_completions",
|
||||
Self::Responses => "responses",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl fmt::Display for LlmError {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
match self {
|
||||
@@ -460,18 +569,23 @@ impl LlmClient {
|
||||
llm_error
|
||||
})?;
|
||||
|
||||
parse_chat_completions_response(self.config.provider(), &resolved_model, raw_text.as_str())
|
||||
.map_err(|error| {
|
||||
log_llm_raw_failure(
|
||||
&self.config,
|
||||
&request,
|
||||
false,
|
||||
1,
|
||||
"parse_response_failed",
|
||||
raw_text.as_str(),
|
||||
);
|
||||
error
|
||||
})
|
||||
parse_text_response(
|
||||
request.protocol,
|
||||
self.config.provider(),
|
||||
&resolved_model,
|
||||
raw_text.as_str(),
|
||||
)
|
||||
.map_err(|error| {
|
||||
log_llm_raw_failure(
|
||||
&self.config,
|
||||
&request,
|
||||
false,
|
||||
1,
|
||||
"parse_response_failed",
|
||||
raw_text.as_str(),
|
||||
);
|
||||
error
|
||||
})
|
||||
}
|
||||
|
||||
pub async fn request_single_message_text(
|
||||
@@ -500,7 +614,7 @@ impl LlmClient {
|
||||
.and_then(|value| value.to_str().ok())
|
||||
.map(str::to_string);
|
||||
|
||||
let mut parser = OpenAiCompatibleSseParser::default();
|
||||
let mut parser = OpenAiCompatibleSseParser::new(request.protocol);
|
||||
let mut accumulated_text = String::new();
|
||||
let mut finish_reason = None;
|
||||
let mut undecoded_chunk_bytes = Vec::new();
|
||||
@@ -688,29 +802,27 @@ impl LlmClient {
|
||||
request: &LlmTextRequest,
|
||||
stream: bool,
|
||||
) -> Result<reqwest::Response, LlmError> {
|
||||
let request_body = ChatCompletionsRequestBody {
|
||||
model: request.resolved_model(self.config.model()),
|
||||
messages: request.messages.as_slice(),
|
||||
stream,
|
||||
max_tokens: request.max_tokens,
|
||||
web_search_options: request
|
||||
.enable_web_search
|
||||
.then_some(ChatCompletionsWebSearchOptions {}),
|
||||
let request_body = build_request_body(request, self.config.model(), stream);
|
||||
let model = request.resolved_model(self.config.model());
|
||||
let url = match request.protocol {
|
||||
LlmTextProtocol::ChatCompletions => self.config.chat_completions_url(),
|
||||
LlmTextProtocol::Responses => self.config.responses_url(),
|
||||
};
|
||||
let max_attempts = self.config.max_retries().saturating_add(1);
|
||||
|
||||
for attempt in 1..=max_attempts {
|
||||
debug!(
|
||||
"platform-llm request started: provider={}, stream={}, attempt={}, model={}",
|
||||
"platform-llm request started: provider={}, protocol={}, stream={}, attempt={}, model={}",
|
||||
self.config.provider().as_str(),
|
||||
request.protocol.as_str(),
|
||||
stream,
|
||||
attempt,
|
||||
request_body.model
|
||||
model
|
||||
);
|
||||
|
||||
let send_result = self
|
||||
.http_client
|
||||
.post(self.config.chat_completions_url())
|
||||
.post(url.as_str())
|
||||
.bearer_auth(self.config.api_key())
|
||||
.json(&request_body)
|
||||
.timeout(Duration::from_millis(self.config.request_timeout_ms()))
|
||||
@@ -720,8 +832,9 @@ impl LlmClient {
|
||||
match send_result {
|
||||
Ok(response) if response.status().is_success() => {
|
||||
debug!(
|
||||
"platform-llm request succeeded: provider={}, stream={}, attempt={}, status={}",
|
||||
"platform-llm request succeeded: provider={}, protocol={}, stream={}, attempt={}, status={}",
|
||||
self.config.provider().as_str(),
|
||||
request.protocol.as_str(),
|
||||
stream,
|
||||
attempt,
|
||||
response.status().as_u16()
|
||||
@@ -735,8 +848,9 @@ impl LlmClient {
|
||||
|
||||
if should_retry_status(status) && attempt < max_attempts {
|
||||
warn!(
|
||||
"platform-llm request retrying after upstream status: provider={}, attempt={}, status={}, message={}",
|
||||
"platform-llm request retrying after upstream status: provider={}, protocol={}, attempt={}, status={}, message={}",
|
||||
self.config.provider().as_str(),
|
||||
request.protocol.as_str(),
|
||||
attempt,
|
||||
status.as_u16(),
|
||||
message
|
||||
@@ -761,8 +875,9 @@ impl LlmClient {
|
||||
Err(error) if error.is_timeout() => {
|
||||
if attempt < max_attempts {
|
||||
warn!(
|
||||
"platform-llm request retrying after timeout: provider={}, attempt={}",
|
||||
"platform-llm request retrying after timeout: provider={}, protocol={}, attempt={}",
|
||||
self.config.provider().as_str(),
|
||||
request.protocol.as_str(),
|
||||
attempt
|
||||
);
|
||||
self.sleep_before_retry(attempt).await;
|
||||
@@ -784,8 +899,9 @@ impl LlmClient {
|
||||
let message = error.to_string();
|
||||
if attempt < max_attempts {
|
||||
warn!(
|
||||
"platform-llm request retrying after connectivity failure: provider={}, attempt={}, error={}",
|
||||
"platform-llm request retrying after connectivity failure: provider={}, protocol={}, attempt={}, error={}",
|
||||
self.config.provider().as_str(),
|
||||
request.protocol.as_str(),
|
||||
attempt,
|
||||
message
|
||||
);
|
||||
@@ -840,6 +956,14 @@ impl LlmClient {
|
||||
}
|
||||
|
||||
impl OpenAiCompatibleSseParser {
|
||||
fn new(protocol: LlmTextProtocol) -> Self {
|
||||
Self {
|
||||
buffer: String::new(),
|
||||
raw_text: String::new(),
|
||||
protocol,
|
||||
}
|
||||
}
|
||||
|
||||
fn push_chunk(&mut self, chunk: &str) -> Result<Vec<ParsedStreamEvent>, LlmError> {
|
||||
self.raw_text.push_str(chunk);
|
||||
self.buffer.push_str(chunk);
|
||||
@@ -867,7 +991,7 @@ impl OpenAiCompatibleSseParser {
|
||||
let block = self.buffer[..boundary].to_string();
|
||||
self.buffer = self.buffer[(boundary + 2)..].to_string();
|
||||
|
||||
if let Some(event) = parse_sse_event_block(block.as_str())? {
|
||||
if let Some(event) = parse_sse_event_block(self.protocol, block.as_str())? {
|
||||
events.push(event);
|
||||
}
|
||||
}
|
||||
@@ -885,6 +1009,55 @@ fn normalize_non_empty(value: String, error_message: &str) -> Result<String, Llm
|
||||
Ok(trimmed)
|
||||
}
|
||||
|
||||
fn build_request_body(
|
||||
request: &LlmTextRequest,
|
||||
fallback_model: &str,
|
||||
stream: bool,
|
||||
) -> LlmRequestBody {
|
||||
match request.protocol {
|
||||
LlmTextProtocol::ChatCompletions => {
|
||||
LlmRequestBody::ChatCompletions(ChatCompletionsRequestBody {
|
||||
model: request.resolved_model(fallback_model).to_string(),
|
||||
messages: request.messages.clone(),
|
||||
stream,
|
||||
max_tokens: request.max_tokens,
|
||||
web_search_options: request
|
||||
.enable_web_search
|
||||
.then_some(ChatCompletionsWebSearchOptions {}),
|
||||
})
|
||||
}
|
||||
LlmTextProtocol::Responses => LlmRequestBody::Responses(ResponsesRequestBody {
|
||||
model: request.resolved_model(fallback_model).to_string(),
|
||||
stream,
|
||||
input: map_responses_input_messages(request.messages.as_slice()),
|
||||
max_output_tokens: request.max_tokens,
|
||||
tools: request.enable_web_search.then(|| {
|
||||
vec![ResponsesWebSearchTool {
|
||||
tool_type: "web_search",
|
||||
max_keyword: 3,
|
||||
}]
|
||||
}),
|
||||
}),
|
||||
}
|
||||
}
|
||||
|
||||
fn map_responses_input_messages(messages: &[LlmMessage]) -> Vec<ResponsesInputMessage> {
|
||||
messages
|
||||
.iter()
|
||||
.map(|message| ResponsesInputMessage {
|
||||
role: match message.role {
|
||||
LlmMessageRole::System => "system",
|
||||
LlmMessageRole::User => "user",
|
||||
LlmMessageRole::Assistant => "assistant",
|
||||
},
|
||||
content: vec![ResponsesInputContentPart {
|
||||
part_type: "input_text",
|
||||
text: message.content.clone(),
|
||||
}],
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
fn log_llm_raw_failure(
|
||||
config: &LlmConfig,
|
||||
request: &LlmTextRequest,
|
||||
@@ -920,6 +1093,7 @@ fn write_llm_raw_failure(
|
||||
let model = request.resolved_model(config.model());
|
||||
let input_log = LlmRawFailureInputLog {
|
||||
provider: config.provider().as_str(),
|
||||
protocol: request.protocol.as_str(),
|
||||
model,
|
||||
stream,
|
||||
attempt,
|
||||
@@ -966,6 +1140,20 @@ fn sanitize_log_file_segment(value: &str) -> String {
|
||||
}
|
||||
}
|
||||
|
||||
fn parse_text_response(
|
||||
protocol: LlmTextProtocol,
|
||||
provider: LlmProvider,
|
||||
fallback_model: &str,
|
||||
raw_text: &str,
|
||||
) -> Result<LlmTextResponse, LlmError> {
|
||||
match protocol {
|
||||
LlmTextProtocol::ChatCompletions => {
|
||||
parse_chat_completions_response(provider, fallback_model, raw_text)
|
||||
}
|
||||
LlmTextProtocol::Responses => parse_responses_response(provider, fallback_model, raw_text),
|
||||
}
|
||||
}
|
||||
|
||||
fn parse_chat_completions_response(
|
||||
provider: LlmProvider,
|
||||
fallback_model: &str,
|
||||
@@ -997,6 +1185,56 @@ fn parse_chat_completions_response(
|
||||
})
|
||||
}
|
||||
|
||||
fn parse_responses_response(
|
||||
provider: LlmProvider,
|
||||
fallback_model: &str,
|
||||
raw_text: &str,
|
||||
) -> Result<LlmTextResponse, LlmError> {
|
||||
let parsed: ResponsesResponseEnvelope = serde_json::from_str(raw_text).map_err(|error| {
|
||||
LlmError::Deserialize(format!("解析 LLM Responses JSON 响应失败:{error}"))
|
||||
})?;
|
||||
let content = extract_responses_text(&parsed)
|
||||
.ok_or(LlmError::EmptyResponse)?
|
||||
.trim()
|
||||
.to_string();
|
||||
|
||||
if content.is_empty() {
|
||||
return Err(LlmError::EmptyResponse);
|
||||
}
|
||||
|
||||
Ok(LlmTextResponse {
|
||||
provider,
|
||||
model: parsed.model.unwrap_or_else(|| fallback_model.to_string()),
|
||||
content,
|
||||
finish_reason: parsed.status,
|
||||
response_id: parsed.id,
|
||||
usage: parsed.usage.map(|usage| LlmTokenUsage {
|
||||
prompt_tokens: usage.input_tokens,
|
||||
completion_tokens: usage.output_tokens,
|
||||
total_tokens: usage.total_tokens,
|
||||
}),
|
||||
})
|
||||
}
|
||||
|
||||
fn extract_responses_text(parsed: &ResponsesResponseEnvelope) -> Option<String> {
|
||||
parsed
|
||||
.output_text
|
||||
.as_deref()
|
||||
.map(str::to_string)
|
||||
.filter(|text| !text.is_empty())
|
||||
.or_else(|| {
|
||||
let text = parsed
|
||||
.output
|
||||
.iter()
|
||||
.flat_map(|item| item.content.iter())
|
||||
.filter_map(|part| part.text.as_deref())
|
||||
.collect::<Vec<_>>()
|
||||
.join("");
|
||||
|
||||
if text.is_empty() { None } else { Some(text) }
|
||||
})
|
||||
}
|
||||
|
||||
fn extract_message_text(choice: &ChatCompletionsChoice) -> Option<String> {
|
||||
choice
|
||||
.message
|
||||
@@ -1046,7 +1284,10 @@ fn decode_utf8_stream_chunk(bytes: &[u8]) -> Result<(String, Vec<u8>), LlmError>
|
||||
}
|
||||
}
|
||||
|
||||
fn parse_sse_event_block(block: &str) -> Result<Option<ParsedStreamEvent>, LlmError> {
|
||||
fn parse_sse_event_block(
|
||||
protocol: LlmTextProtocol,
|
||||
block: &str,
|
||||
) -> Result<Option<ParsedStreamEvent>, LlmError> {
|
||||
let data_lines = block
|
||||
.lines()
|
||||
.filter_map(|line| line.trim().strip_prefix("data:"))
|
||||
@@ -1062,6 +1303,10 @@ fn parse_sse_event_block(block: &str) -> Result<Option<ParsedStreamEvent>, LlmEr
|
||||
return Ok(None);
|
||||
}
|
||||
|
||||
if protocol == LlmTextProtocol::Responses {
|
||||
return parse_responses_sse_event(data.as_str());
|
||||
}
|
||||
|
||||
let parsed: ChatCompletionsResponseEnvelope = serde_json::from_str(data.as_str())
|
||||
.map_err(|error| LlmError::Deserialize(format!("解析 LLM SSE 事件失败:{error}")))?;
|
||||
let first_choice = parsed
|
||||
@@ -1075,6 +1320,44 @@ fn parse_sse_event_block(block: &str) -> Result<Option<ParsedStreamEvent>, LlmEr
|
||||
}))
|
||||
}
|
||||
|
||||
fn parse_responses_sse_event(data: &str) -> Result<Option<ParsedStreamEvent>, LlmError> {
|
||||
let parsed: serde_json::Value = serde_json::from_str(data).map_err(|error| {
|
||||
LlmError::Deserialize(format!("解析 LLM Responses SSE 事件失败:{error}"))
|
||||
})?;
|
||||
let event_type = parsed
|
||||
.get("type")
|
||||
.and_then(serde_json::Value::as_str)
|
||||
.unwrap_or_default();
|
||||
|
||||
match event_type {
|
||||
"response.output_text.delta" => Ok(Some(ParsedStreamEvent {
|
||||
delta_text: parsed
|
||||
.get("delta")
|
||||
.and_then(serde_json::Value::as_str)
|
||||
.map(str::to_string),
|
||||
finish_reason: None,
|
||||
})),
|
||||
"response.completed" => Ok(Some(ParsedStreamEvent {
|
||||
delta_text: None,
|
||||
finish_reason: Some("completed".to_string()),
|
||||
})),
|
||||
"response.failed" | "error" => {
|
||||
let message = parsed
|
||||
.get("error")
|
||||
.and_then(|error| error.get("message"))
|
||||
.and_then(serde_json::Value::as_str)
|
||||
.or_else(|| parsed.get("message").and_then(serde_json::Value::as_str))
|
||||
.unwrap_or("LLM Responses SSE 返回失败事件")
|
||||
.to_string();
|
||||
Err(LlmError::Upstream {
|
||||
status_code: 502,
|
||||
message,
|
||||
})
|
||||
}
|
||||
_ => Ok(None),
|
||||
}
|
||||
}
|
||||
|
||||
fn should_retry_status(status: StatusCode) -> bool {
|
||||
status == StatusCode::REQUEST_TIMEOUT
|
||||
|| status == StatusCode::TOO_MANY_REQUESTS
|
||||
@@ -1198,11 +1481,12 @@ mod tests {
|
||||
config.chat_completions_url(),
|
||||
"https://example.com/base/chat/completions"
|
||||
);
|
||||
assert_eq!(config.responses_url(), "https://example.com/base/responses");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn sse_parser_handles_split_chunks_and_done_marker() {
|
||||
let mut parser = OpenAiCompatibleSseParser::default();
|
||||
let mut parser = OpenAiCompatibleSseParser::new(LlmTextProtocol::ChatCompletions);
|
||||
let events_a = parser
|
||||
.push_chunk("data: {\"choices\":[{\"delta\":{\"content\":\"你\"}}]}\r\n\r\n")
|
||||
.expect("first chunk should parse");
|
||||
@@ -1217,6 +1501,24 @@ mod tests {
|
||||
assert_eq!(events_b[0].finish_reason.as_deref(), Some("stop"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn responses_sse_parser_only_emits_output_text_delta() {
|
||||
let mut parser = OpenAiCompatibleSseParser::new(LlmTextProtocol::Responses);
|
||||
let events = parser
|
||||
.push_chunk(concat!(
|
||||
"data: {\"type\":\"response.created\"}\n\n",
|
||||
"data: {\"type\":\"response.output_text.delta\",\"delta\":\"你\"}\n\n",
|
||||
"data: {\"type\":\"response.output_text.delta\",\"delta\":\"好\"}\n\n",
|
||||
"data: {\"type\":\"response.completed\"}\n\n",
|
||||
))
|
||||
.expect("responses stream should parse");
|
||||
|
||||
assert_eq!(events.len(), 3);
|
||||
assert_eq!(events[0].delta_text.as_deref(), Some("你"));
|
||||
assert_eq!(events[1].delta_text.as_deref(), Some("好"));
|
||||
assert_eq!(events[2].finish_reason.as_deref(), Some("completed"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn decode_utf8_stream_chunk_preserves_incomplete_multibyte_suffix() {
|
||||
let full_bytes = "你好".as_bytes();
|
||||
@@ -1331,6 +1633,72 @@ mod tests {
|
||||
assert_eq!(request_json["web_search_options"], serde_json::json!({}));
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn request_text_sends_responses_body_with_web_search_tool() {
|
||||
let listener = TcpListener::bind("127.0.0.1:0").expect("listener should bind");
|
||||
let address = listener.local_addr().expect("listener should have addr");
|
||||
let server_handle = thread::spawn(move || {
|
||||
let (mut stream, _) = listener.accept().expect("request should connect");
|
||||
let request_text = read_request(&mut stream);
|
||||
write_response(
|
||||
&mut stream,
|
||||
MockResponse {
|
||||
status_line: "200 OK",
|
||||
content_type: "application/json; charset=utf-8",
|
||||
body: r#"{"id":"resp_responses","model":"deepseek-v3-2-251201","output_text":"Responses 成功","status":"completed","usage":{"input_tokens":9,"output_tokens":4,"total_tokens":13}}"#.to_string(),
|
||||
extra_headers: Vec::new(),
|
||||
},
|
||||
);
|
||||
request_text
|
||||
});
|
||||
|
||||
let client = build_test_client(format!("http://{address}"), 0);
|
||||
let response = client
|
||||
.request_text(
|
||||
LlmTextRequest::single_turn("系统", "用户")
|
||||
.with_model("deepseek-v3-2-251201")
|
||||
.with_responses_api()
|
||||
.with_web_search(true)
|
||||
.with_max_tokens(128),
|
||||
)
|
||||
.await
|
||||
.expect("responses request_text should succeed");
|
||||
|
||||
let request_text = server_handle.join().expect("server thread should join");
|
||||
let request_line = request_text.lines().next().unwrap_or_default();
|
||||
let request_body = request_text
|
||||
.split("\r\n\r\n")
|
||||
.nth(1)
|
||||
.expect("request body should exist");
|
||||
let request_json: serde_json::Value =
|
||||
serde_json::from_str(request_body).expect("request body should be json");
|
||||
|
||||
assert!(request_line.contains("POST /responses HTTP/1.1"));
|
||||
assert_eq!(response.content, "Responses 成功");
|
||||
assert_eq!(response.model, "deepseek-v3-2-251201");
|
||||
assert_eq!(
|
||||
response.usage,
|
||||
Some(LlmTokenUsage {
|
||||
prompt_tokens: 9,
|
||||
completion_tokens: 4,
|
||||
total_tokens: 13,
|
||||
})
|
||||
);
|
||||
assert_eq!(
|
||||
request_json["model"],
|
||||
serde_json::json!("deepseek-v3-2-251201")
|
||||
);
|
||||
assert_eq!(request_json["stream"], serde_json::json!(false));
|
||||
assert_eq!(
|
||||
request_json["tools"],
|
||||
serde_json::json!([{ "type": "web_search", "max_keyword": 3 }])
|
||||
);
|
||||
assert_eq!(
|
||||
request_json["input"][0]["content"][0],
|
||||
serde_json::json!({ "type": "input_text", "text": "系统" })
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn stream_text_accumulates_sse_response() {
|
||||
let server_url = spawn_mock_server(vec![MockResponse {
|
||||
@@ -1361,6 +1729,41 @@ mod tests {
|
||||
assert_eq!(response.response_id.as_deref(), Some("req_stream_01"));
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn stream_text_accumulates_responses_sse_response() {
|
||||
let server_url = spawn_mock_server(vec![MockResponse {
|
||||
status_line: "200 OK",
|
||||
content_type: "text/event-stream; charset=utf-8",
|
||||
body: concat!(
|
||||
"data: {\"type\":\"response.output_text.delta\",\"delta\":\"你\"}\n\n",
|
||||
"data: {\"type\":\"response.output_text.delta\",\"delta\":\"好\"}\n\n",
|
||||
"data: {\"type\":\"response.completed\"}\n\n"
|
||||
)
|
||||
.to_string(),
|
||||
extra_headers: vec![("x-request-id", "req_responses_stream_01")],
|
||||
}]);
|
||||
|
||||
let client = build_test_client(server_url, 0);
|
||||
let mut updates = Vec::new();
|
||||
let response = client
|
||||
.stream_text(
|
||||
LlmTextRequest::single_turn("系统", "用户").with_responses_api(),
|
||||
|delta| {
|
||||
updates.push(delta.accumulated_text.clone());
|
||||
},
|
||||
)
|
||||
.await
|
||||
.expect("responses stream_text should succeed");
|
||||
|
||||
assert_eq!(updates, vec!["你".to_string(), "你好".to_string()]);
|
||||
assert_eq!(response.content, "你好");
|
||||
assert_eq!(response.finish_reason.as_deref(), Some("completed"));
|
||||
assert_eq!(
|
||||
response.response_id.as_deref(),
|
||||
Some("req_responses_stream_01")
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn request_text_writes_raw_failure_logs_after_parse_error() {
|
||||
let log_dir = std::env::temp_dir().join(format!(
|
||||
|
||||
Reference in New Issue
Block a user