Merge branch 'main' of 192.168.110.201:/Users/accusys/momentry_core_0.1/

This commit is contained in:
Warren
2026-05-08 09:31:01 +08:00
+21 -22
View File
@@ -316,7 +316,7 @@ Rules:
{"role": "user", "content": prompt} {"role": "user", "content": prompt}
], ],
"temperature": 0.1, "temperature": 0.1,
"max_tokens": 2048, "max_tokens": 4096,
"stream": false "stream": false
}); });
@@ -443,14 +443,13 @@ async fn analyze_5w1h(
let result = summarize_one_scene(&db, &req.file_uuid, cut, &sentences, &context).await let result = summarize_one_scene(&db, &req.file_uuid, cut, &sentences, &context).await
.map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?; .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?;
if let Err(e) = store_parent_summary(&db, &cut.chunk_id, &req.file_uuid, &result.parent_summary, &result.five_w1h, &sentences).await {
tracing::error!("[5W1H] parent: {}", e);
}
if let Err(e) = store_child_summaries(&db, &req.file_uuid, &result.child_summaries).await {
tracing::error!("[5W1H] child: {}", e);
}
if !result.parent_summary.is_empty() { if !result.parent_summary.is_empty() {
if let Err(e) = store_parent_summary(&db, &cut.chunk_id, &req.file_uuid, &result.parent_summary, &result.five_w1h, &sentences).await {
tracing::error!("[5W1H] parent: {}", e);
}
if let Err(e) = store_child_summaries(&db, &req.file_uuid, &result.child_summaries).await {
tracing::error!("[5W1H] child: {}", e);
}
prev_context.push(format!("Scene {} (t={:.0}s): {}", cut.chunk_index, cut.start_time, result.parent_summary)); prev_context.push(format!("Scene {} (t={:.0}s): {}", cut.chunk_index, cut.start_time, result.parent_summary));
} }
processed += 1; processed += 1;
@@ -480,9 +479,9 @@ async fn batch_analyze_5w1h(
if sentences.is_empty() { continue; } if sentences.is_empty() { continue; }
let context = prev_context.join("\n"); let context = prev_context.join("\n");
if let Ok(result) = summarize_one_scene(&db, uuid, cut, &sentences, &context).await { if let Ok(result) = summarize_one_scene(&db, uuid, cut, &sentences, &context).await {
let _ = store_parent_summary(&db, &cut.chunk_id, uuid, &result.parent_summary, &result.five_w1h, &sentences).await;
let _ = store_child_summaries(&db, uuid, &result.child_summaries).await;
if !result.parent_summary.is_empty() { if !result.parent_summary.is_empty() {
let _ = store_parent_summary(&db, &cut.chunk_id, uuid, &result.parent_summary, &result.five_w1h, &sentences).await;
let _ = store_child_summaries(&db, uuid, &result.child_summaries).await;
prev_context.push(format!("Scene {} (t={:.0}s): {}", cut.chunk_index, cut.start_time, result.parent_summary)); prev_context.push(format!("Scene {} (t={:.0}s): {}", cut.chunk_index, cut.start_time, result.parent_summary));
} }
} }
@@ -504,7 +503,7 @@ async fn get_5w1h_status(
) -> Result<Json<serde_json::Value>, (StatusCode, String)> { ) -> Result<Json<serde_json::Value>, (StatusCode, String)> {
let table = schema::table_name("videos"); let table = schema::table_name("videos");
let rows = sqlx::query(&format!( let rows = sqlx::query(&format!(
r#"SELECT uuid, processing_status->'agents'->'five_w1h' as s r#"SELECT file_uuid, processing_status->'agents'->'five_w1h' as s
FROM {} WHERE processing_status->'agents'->'five_w1h' IS NOT NULL FROM {} WHERE processing_status->'agents'->'five_w1h' IS NOT NULL
ORDER BY updated_at DESC LIMIT 50"#, table ORDER BY updated_at DESC LIMIT 50"#, table
)) ))
@@ -513,7 +512,7 @@ async fn get_5w1h_status(
let videos: Vec<serde_json::Value> = rows.iter().map(|r| { let videos: Vec<serde_json::Value> = rows.iter().map(|r| {
serde_json::json!({ serde_json::json!({
"uuid": r.try_get::<String,_>("uuid").unwrap_or_default(), "uuid": r.try_get::<String,_>("file_uuid").unwrap_or_default(),
"five_w1h_status": r.try_get::<Option<serde_json::Value>,_>("s").ok().flatten(), "five_w1h_status": r.try_get::<Option<serde_json::Value>,_>("s").ok().flatten(),
}) })
}).collect(); }).collect();
@@ -532,18 +531,18 @@ pub async fn run_5w1h_agent(db: &PostgresDb, file_uuid: &str) -> anyhow::Result<
let sentences = fetch_sentences_in_scene(db, file_uuid, cut).await?; let sentences = fetch_sentences_in_scene(db, file_uuid, cut).await?;
if sentences.is_empty() { continue; } if sentences.is_empty() { continue; }
let context = prev_context.join("\n"); let context = prev_context.join("\n");
match summarize_one_scene(db, file_uuid, cut, &sentences, &context).await { match summarize_one_scene(db, file_uuid, cut, &sentences, &context).await {
Ok(result) => { Ok(result) => {
let _ = store_parent_summary(db, &cut.chunk_id, file_uuid, &result.parent_summary, &result.five_w1h, &sentences).await; if !result.parent_summary.is_empty() {
let _ = store_child_summaries(db, file_uuid, &result.child_summaries).await; let _ = store_parent_summary(db, &cut.chunk_id, file_uuid, &result.parent_summary, &result.five_w1h, &sentences).await;
if !result.parent_summary.is_empty() { let _ = store_child_summaries(db, file_uuid, &result.child_summaries).await;
prev_context.push(format!("Scene {} (t={:.0}s): {}", cut.chunk_index, cut.start_time, result.parent_summary)); prev_context.push(format!("Scene {} (t={:.0}s): {}", cut.chunk_index, cut.start_time, result.parent_summary));
}
processed += 1;
} }
processed += 1; Err(e) => tracing::error!("[5W1H] Scene {} failed: {}", cut.chunk_id, e),
} }
Err(e) => tracing::error!("[5W1H] Scene {} failed: {}", cut.chunk_id, e),
}
} }
tracing::info!("[5W1H] Done for {}: {}/{} scenes", file_uuid, processed, total); tracing::info!("[5W1H] Done for {}: {}/{} scenes", file_uuid, processed, total);