refactor: split feedback eval input helpers

Separate input format loading from comment conversion so feedback eval changes stay easier to isolate and verify.

Made-with: Cursor

Author: haasonsaas

src/commands/feedback_eval/input.rs

@@ -1,153 +1,19 @@
-use anyhow::Result;
-use std::collections::HashMap;
-use std::path::Path;
+#[path = "input/conversion.rs"]
+mod conversion;
+#[path = "input/loading.rs"]
+mod loading;
 
-use crate::core;
-use crate::review;
-use crate::server::state::ReviewSession;
+pub(super) use loading::load_feedback_eval_input;
 
-use super::{FeedbackEvalComment, LoadedFeedbackEvalInput};
-
-pub(super) async fn load_feedback_eval_input(path: &Path) -> Result<LoadedFeedbackEvalInput> {
-    let content = tokio::fs::read_to_string(path).await?;
-    load_feedback_eval_input_from_str(&content)
-}
-
-pub(super) fn load_feedback_eval_input_from_str(content: &str) -> Result<LoadedFeedbackEvalInput> {
-    if let Ok(review_map) = serde_json::from_str::<HashMap<String, ReviewSession>>(content) {
-        let mut loaded = LoadedFeedbackEvalInput::default();
-        for (review_id, session) in review_map {
-            extend_from_review_session(&mut loaded, Some(review_id), session);
-        }
-        return Ok(loaded);
-    }
-
-    if let Ok(review_list) = serde_json::from_str::<Vec<ReviewSession>>(content) {
-        let mut loaded = LoadedFeedbackEvalInput::default();
-        for session in review_list {
-            let review_id = session.id.clone();
-            extend_from_review_session(&mut loaded, Some(review_id), session);
-        }
-        return Ok(loaded);
-    }
-
-    if let Ok(store) = serde_json::from_str::<core::SemanticFeedbackStore>(content) {
-        let total_comments_seen = store.examples.len();
-        let comments = store
-            .examples
-            .into_iter()
-            .map(|example| FeedbackEvalComment {
-                source_kind: "semantic-feedback".to_string(),
-                review_id: None,
-                repo: None,
-                pr_number: None,
-                title: None,
-                file_path: None,
-                line_number: None,
-                file_patterns: example.file_patterns,
-                content: example.content,
-                category: example.category,
-                severity: None,
-                confidence: None,
-                accepted: example.accepted,
-            })
-            .collect();
-        return Ok(LoadedFeedbackEvalInput {
-            total_comments_seen,
-            total_reviews_seen: 0,
-            comments,
-        });
-    }
-
-    if let Ok(comments) = serde_json::from_str::<Vec<core::Comment>>(content) {
-        let total_comments_seen = comments.len();
-        let comments = comments
-            .into_iter()
-            .filter_map(|comment| {
-                feedback_comment_from_comment("comments-json", None, None, None, None, comment)
-            })
-            .collect();
-        return Ok(LoadedFeedbackEvalInput {
-            total_comments_seen,
-            total_reviews_seen: 0,
-            comments,
-        });
-    }
-
-    anyhow::bail!(
-        "Unsupported feedback eval input format: expected reviews.json, a comments array, or semantic feedback store JSON"
-    )
-}
-
-fn extend_from_review_session(
-    loaded: &mut LoadedFeedbackEvalInput,
-    review_id: Option<String>,
-    session: ReviewSession,
-) {
-    let repo = session
-        .event
-        .as_ref()
-        .and_then(|event| event.github_repo.clone());
-    let pr_number = session.event.as_ref().and_then(|event| event.github_pr);
-    let title = session.event.as_ref().and_then(|event| event.title.clone());
-
-    loaded.total_reviews_seen += 1;
-    loaded.total_comments_seen += session.comments.len();
-    loaded
-        .comments
-        .extend(session.comments.into_iter().filter_map(|comment| {
-            feedback_comment_from_comment(
-                "review-session",
-                review_id.clone(),
-                repo.clone(),
-                pr_number,
-                title.clone(),
-                comment,
-            )
-        }));
-}
-
-fn feedback_comment_from_comment(
-    source_kind: &str,
-    review_id: Option<String>,
-    repo: Option<String>,
-    pr_number: Option<u32>,
-    title: Option<String>,
-    comment: core::Comment,
-) -> Option<FeedbackEvalComment> {
-    let accepted = normalize_feedback_label(comment.feedback.as_deref()?)?;
-    let file_patterns = review::derive_file_patterns(&comment.file_path);
-
-    Some(FeedbackEvalComment {
-        source_kind: source_kind.to_string(),
-        review_id,
-        repo,
-        pr_number,
-        title,
-        file_path: Some(comment.file_path),
-        line_number: Some(comment.line_number),
-        file_patterns,
-        content: comment.content,
-        category: comment.category.to_string(),
-        severity: Some(comment.severity.to_string()),
-        confidence: Some(comment.confidence),
-        accepted,
-    })
-}
-
-fn normalize_feedback_label(label: &str) -> Option<bool> {
-    match label.trim().to_ascii_lowercase().as_str() {
-        "accept" | "accepted" => Some(true),
-        "reject" | "rejected" => Some(false),
-        _ => None,
-    }
-}
+#[cfg(test)]
+use loading::load_feedback_eval_input_from_str;
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use super::load_feedback_eval_input_from_str;
+    use crate::core;
     use crate::core::comment::{Category, FixEffort, ReviewSummary, Severity};
-    use crate::server::state::ReviewStatus;
+    use crate::server::state::{ReviewSession, ReviewStatus};
     use std::collections::HashMap;
     use std::path::PathBuf;
 

src/commands/feedback_eval/input/conversion.rs

@@ -0,0 +1,69 @@
+use crate::core;
+use crate::review;
+use crate::server::state::ReviewSession;
+
+use super::super::{FeedbackEvalComment, LoadedFeedbackEvalInput};
+
+pub(super) fn extend_from_review_session(
+    loaded: &mut LoadedFeedbackEvalInput,
+    review_id: Option<String>,
+    session: ReviewSession,
+) {
+    let repo = session
+        .event
+        .as_ref()
+        .and_then(|event| event.github_repo.clone());
+    let pr_number = session.event.as_ref().and_then(|event| event.github_pr);
+    let title = session.event.as_ref().and_then(|event| event.title.clone());
+
+    loaded.total_reviews_seen += 1;
+    loaded.total_comments_seen += session.comments.len();
+    loaded
+        .comments
+        .extend(session.comments.into_iter().filter_map(|comment| {
+            feedback_comment_from_comment(
+                "review-session",
+                review_id.clone(),
+                repo.clone(),
+                pr_number,
+                title.clone(),
+                comment,
+            )
+        }));
+}
+
+pub(super) fn feedback_comment_from_comment(
+    source_kind: &str,
+    review_id: Option<String>,
+    repo: Option<String>,
+    pr_number: Option<u32>,
+    title: Option<String>,
+    comment: core::Comment,
+) -> Option<FeedbackEvalComment> {
+    let accepted = normalize_feedback_label(comment.feedback.as_deref()?)?;
+    let file_patterns = review::derive_file_patterns(&comment.file_path);
+
+    Some(FeedbackEvalComment {
+        source_kind: source_kind.to_string(),
+        review_id,
+        repo,
+        pr_number,
+        title,
+        file_path: Some(comment.file_path),
+        line_number: Some(comment.line_number),
+        file_patterns,
+        content: comment.content,
+        category: comment.category.to_string(),
+        severity: Some(comment.severity.to_string()),
+        confidence: Some(comment.confidence),
+        accepted,
+    })
+}
+
+fn normalize_feedback_label(label: &str) -> Option<bool> {
+    match label.trim().to_ascii_lowercase().as_str() {
+        "accept" | "accepted" => Some(true),
+        "reject" | "rejected" => Some(false),
+        _ => None,
+    }
+}

src/commands/feedback_eval/input/loading.rs

@@ -0,0 +1,84 @@
+use anyhow::Result;
+use std::collections::HashMap;
+use std::path::Path;
+
+use crate::core;
+use crate::server::state::ReviewSession;
+
+use super::super::{FeedbackEvalComment, LoadedFeedbackEvalInput};
+use super::conversion::{extend_from_review_session, feedback_comment_from_comment};
+
+pub(in super::super) async fn load_feedback_eval_input(
+    path: &Path,
+) -> Result<LoadedFeedbackEvalInput> {
+    let content = tokio::fs::read_to_string(path).await?;
+    load_feedback_eval_input_from_str(&content)
+}
+
+pub(in super::super) fn load_feedback_eval_input_from_str(
+    content: &str,
+) -> Result<LoadedFeedbackEvalInput> {
+    if let Ok(review_map) = serde_json::from_str::<HashMap<String, ReviewSession>>(content) {
+        let mut loaded = LoadedFeedbackEvalInput::default();
+        for (review_id, session) in review_map {
+            extend_from_review_session(&mut loaded, Some(review_id), session);
+        }
+        return Ok(loaded);
+    }
+
+    if let Ok(review_list) = serde_json::from_str::<Vec<ReviewSession>>(content) {
+        let mut loaded = LoadedFeedbackEvalInput::default();
+        for session in review_list {
+            let review_id = session.id.clone();
+            extend_from_review_session(&mut loaded, Some(review_id), session);
+        }
+        return Ok(loaded);
+    }
+
+    if let Ok(store) = serde_json::from_str::<core::SemanticFeedbackStore>(content) {
+        let total_comments_seen = store.examples.len();
+        let comments = store
+            .examples
+            .into_iter()
+            .map(|example| FeedbackEvalComment {
+                source_kind: "semantic-feedback".to_string(),
+                review_id: None,
+                repo: None,
+                pr_number: None,
+                title: None,
+                file_path: None,
+                line_number: None,
+                file_patterns: example.file_patterns,
+                content: example.content,
+                category: example.category,
+                severity: None,
+                confidence: None,
+                accepted: example.accepted,
+            })
+            .collect();
+        return Ok(LoadedFeedbackEvalInput {
+            total_comments_seen,
+            total_reviews_seen: 0,
+            comments,
+        });
+    }
+
+    if let Ok(comments) = serde_json::from_str::<Vec<core::Comment>>(content) {
+        let total_comments_seen = comments.len();
+        let comments = comments
+            .into_iter()
+            .filter_map(|comment| {
+                feedback_comment_from_comment("comments-json", None, None, None, None, comment)
+            })
+            .collect();
+        return Ok(LoadedFeedbackEvalInput {
+            total_comments_seen,
+            total_reviews_seen: 0,
+            comments,
+        });
+    }
+
+    anyhow::bail!(
+        "Unsupported feedback eval input format: expected reviews.json, a comments array, or semantic feedback store JSON"
+    )
+}