Skip to content

fix(server.py): only include latest review batch in comment trigger #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WhiteElephant-abc merged 5 commits into from
Jan 28, 2026
Merged

fix(server.py): only include latest review batch in comment trigger #62

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c8a6106
fix(server.py): include all reviews in PR context when triggered by r…
WhiteElephantIsNotARobot Jan 28, 2026
a7c5133
fix(server.py): include review comments when triggered by comment
WhiteElephantIsNotARobot Jan 28, 2026
04c1525
fix(server.py): ensure review batches are not truncated
WhiteElephantIsNotARobot Jan 28, 2026
9636d6c
fix(server.py): only include latest review batch in comment trigger
WhiteElephantIsNotARobot Jan 28, 2026
274592d
fix(server.py): only include latest review batch in comment trigger
WhiteElephantIsNotARobot Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 43 additions & 36 deletions server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ def build_rich_context(
# 分离评论历史（基于test_context.py修复review触发过滤逻辑）
if timeline_items:
logger.info(f"Applying smart truncation to {len(timeline_items)} timeline items (max: {CONTEXT_MAX_CHARS} chars)")
# 智能截断
# 智能截断（仅用于评论历史）
truncated_items, is_truncated = truncate_context_by_chars(timeline_items, CONTEXT_MAX_CHARS)
context.is_truncated = is_truncated
logger.info(f"Truncation result: {len(truncated_items)} items selected (truncated: {is_truncated})")
Expand All @@ -637,40 +637,36 @@ def build_rich_context(
reviews_history = []
review_comments_batch = []

for item in truncated_items:
# 根据触发类型决定包含哪些历史
trigger_type = trigger_node.type if trigger_node else None

# 如果是review或review_comment触发，采用test_context.py的更精确过滤逻辑
if trigger_type in ["review", "review_comment"]:
# 基于test_context.py修复：只保留与当前review相关的项目
trigger_review_id = trigger_node.review_id if trigger_node.review_id else trigger_node.id

if item.type == "review":
# 只包含当前触发的review（test_context.py的精确过滤）
if item.id == trigger_review_id:
reviews_history.append({
"id": item.id,
"user": item.user,
"body": item.body,
"state": item.state,
"submitted_at": item.created_at
})
logger.info(f"Including review {item.id} for review {trigger_review_id}")
elif item.type == "review_comment" and item.review_id:
# 只保留与当前review相关的评论
if item.review_id == trigger_review_id:
review_comments_batch.append({
"id": item.id,
"user": item.user,
"body": item.body,
"path": item.path,
"diff_hunk": item.diff_hunk
})
logger.info(f"Including review comment {item.id} for review {trigger_review_id}")
# 对于review触发，不保留普通comment（基于test_context.py逻辑）
else:
# 普通触发（comment）：只处理comment和review，不处理review_comment
# 获取触发类型
trigger_type = trigger_node.type if trigger_node else None

# review批次使用原始timeline_items确保完整保留（不截断）
if trigger_type in ["review", "review_comment"]:
# review/review_comment触发：精确过滤，只保留与当前review相关的项目
trigger_review_id = trigger_node.review_id if trigger_node.review_id else trigger_node.id

for item in timeline_items:
if item.type == "review" and item.id == trigger_review_id:
reviews_history.append({
"id": item.id,
"user": item.user,
"body": item.body,
"state": item.state,
"submitted_at": item.created_at
})
logger.info(f"Including review {item.id} for review {trigger_review_id}")
elif item.type == "review_comment" and item.review_id and item.review_id == trigger_review_id:
review_comments_batch.append({
"id": item.id,
"user": item.user,
"body": item.body,
"path": item.path,
"diff_hunk": item.diff_hunk
})
logger.info(f"Including review comment {item.id} for review {trigger_review_id}")
else:
# comment触发：使用truncated_items处理评论，使用原始timeline_items处理review批次
for item in truncated_items:
if item.type == "comment":
comments_history.append({
"id": item.id,
Expand All @@ -679,14 +675,25 @@ def build_rich_context(
"created_at": item.created_at,
"type": item.type
})
elif item.type == "review":

# review批次使用原始timeline_items确保完整保留（不截断）
for item in timeline_items:
if item.type == "review":
reviews_history.append({
"id": item.id,
"user": item.user,
"body": item.body,
"state": item.state,
"submitted_at": item.created_at
})
elif item.type == "review_comment" and item.review_id:
review_comments_batch.append({
"id": item.id,
"user": item.user,
"body": item.body,
"path": item.path,
"diff_hunk": item.diff_hunk
})
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Jan 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

这部分用于创建 reviews_history 和 review_comments_batch 的逻辑与 if 分支（行 649-666）中的逻辑存在重复。为了提高代码的可维护性并遵循 DRY (Don't Repeat Yourself) 原则，建议将创建字典的逻辑提取到单独的辅助函数中。

例如，您可以创建两个函数：

def _create_review_history_item(item: TimelineItem) -> Dict:
    return {
        "id": item.id,
        "user": item.user,
        "body": item.body,
        "state": item.state,
        "submitted_at": item.created_at
    }

def _create_review_comment_batch_item(item: TimelineItem) -> Dict:
    return {
        "id": item.id,
        "user": item.user,
        "body": item.body,
        "path": item.path,
        "diff_hunk": item.diff_hunk
    }

然后在这两个地方调用它们，例如：
reviews_history.append(_create_review_history_item(item))


if comments_history:
context.comments_history = comments_history
Expand Down