fix: merge branch statistic_code_modify conflicts

Author: quanbisen

biz/entity/review_entity.py

@@ -1,6 +1,7 @@
 class MergeRequestReviewEntity:
     def __init__(self, project_name: str, author: str, source_branch: str, target_branch: str, updated_at: int,
-                 commits: list, score: float, url: str, review_result: str, url_slug: str, webhook_data: dict):
+                 commits: list, score: float, url: str, review_result: str, url_slug: str, webhook_data: dict,
+                 additions: int, deletions: int):
         self.project_name = project_name
         self.author = author
         self.source_branch = source_branch
@@ -12,6 +13,8 @@ def __init__(self, project_name: str, author: str, source_branch: str, target_br
         self.review_result = review_result
         self.url_slug = url_slug
         self.webhook_data = webhook_data
+        self.additions = additions
+        self.deletions = deletions
 
     @property
     def commit_messages(self):
@@ -21,7 +24,7 @@ def commit_messages(self):
 
 class PushReviewEntity:
     def __init__(self, project_name: str, author: str, branch: str, updated_at: int, commits: list, score: float,
-                 review_result: str, url_slug: str, webhook_data: dict):
+                 review_result: str, url_slug: str, webhook_data: dict, additions: int, deletions: int):
         self.project_name = project_name
         self.author = author
         self.branch = branch
@@ -31,6 +34,8 @@ def __init__(self, project_name: str, author: str, branch: str, updated_at: int,
         self.review_result = review_result
         self.url_slug = url_slug
         self.webhook_data = webhook_data
+        self.additions = additions
+        self.deletions = deletions
 
     @property
     def commit_messages(self):

biz/github/webhook_handler.py

@@ -44,7 +44,9 @@ def filter_changes(changes: list):
     filtered_changes = [
         {
             'diff': item.get('diff', ''),
-            'new_path': item['new_path']
+            'new_path': item['new_path'],
+            'additions': item.get('additions', 0),
+            'deletions': item.get('deletions', 0),
         }
         for item in not_deleted_changes
         if any(item.get('new_path', '').endswith(ext) for ext in supported_extensions)
@@ -105,7 +107,9 @@ def get_pull_request_changes(self) -> list:
                         change = {
                             'old_path': file.get('filename'),
                             'new_path': file.get('filename'),
-                            'diff': file.get('patch', '')
+                            'diff': file.get('patch', ''),
+                            'additions': file.get('additions', 0),
+                            'deletions': file.get('deletions', 0)
                         }
                         changes.append(change)
                     return changes
@@ -311,7 +315,9 @@ def repository_compare(self, base: str, head: str):
                     'old_path': file.get('filename'),
                     'new_path': file.get('filename'),
                     'diff': file.get('patch', ''),
-                    'status': file.get('status', '')
+                    'status': file.get('status', ''),
+                    'additions': file.get('additions', 0),
+                    'deletions': file.get('deletions', 0),
                 }
                 diffs.append(diff)
             return diffs

biz/gitlab/webhook_handler.py

@@ -21,7 +21,9 @@ def filter_changes(changes: list):
     filtered_changes = [
         {
             'diff': item.get('diff', ''),
-            'new_path': item['new_path']
+            'new_path': item['new_path'],
+            'additions': len(re.findall(r'^\+(?!\+\+)', item.get('diff', ''), re.MULTILINE)),
+            'deletions': len(re.findall(r'^-(?!--)', item.get('diff', ''), re.MULTILINE))
         }
         for item in filter_deleted_files_changes
         if any(item.get('new_path', '').endswith(ext) for ext in supported_extensions)

biz/queue/worker.py

@@ -24,6 +24,8 @@ def handle_push_event(webhook_data: dict, gitlab_token: str, gitlab_url: str, gi
 
         review_result = None
         score = 0
+        additions = 0
+        deletions = 0
         if push_review_enabled:
             # 获取PUSH的changes
             changes = handler.get_push_changes()
@@ -37,6 +39,9 @@ def handle_push_event(webhook_data: dict, gitlab_token: str, gitlab_url: str, gi
                 commits_text = ';'.join(commit.get('message', '').strip() for commit in commits)
                 review_result = CodeReviewer().review_and_strip_code(str(changes), commits_text)
                 score = CodeReviewer.parse_review_score(review_text=review_result)
+                for item in changes:
+                    additions += item['additions']
+                    deletions += item['deletions']
             # 将review结果提交到Gitlab的 notes
             handler.add_push_notes(f'Auto Review Result: \n{review_result}')
 
@@ -50,6 +55,8 @@ def handle_push_event(webhook_data: dict, gitlab_token: str, gitlab_url: str, gi
             review_result=review_result,
             url_slug=gitlab_url_slug,
             webhook_data=webhook_data,
+            additions=additions,
+            deletions=deletions,
         ))
 
     except Exception as e:
@@ -89,6 +96,12 @@ def handle_merge_request_event(webhook_data: dict, gitlab_token: str, gitlab_url
         if not changes:
             logger.info('未检测到有关代码的修改,修改文件可能不满足SUPPORTED_EXTENSIONS。')
             return
+        # 统计本次新增、删除的代码总数
+        additions = 0
+        deletions = 0
+        for item in changes:
+            additions += item.get('additions', 0)
+            deletions += item.get('deletions', 0)
 
         # 获取Merge Request的commits
         commits = handler.get_merge_request_commits()
@@ -117,6 +130,8 @@ def handle_merge_request_event(webhook_data: dict, gitlab_token: str, gitlab_url
                 review_result=review_result,
                 url_slug=gitlab_url_slug,
                 webhook_data=webhook_data,
+                additions=additions,
+                deletions=deletions,
             )
         )
 
@@ -137,6 +152,8 @@ def handle_github_push_event(webhook_data: dict, github_token: str, github_url:
 
         review_result = None
         score = 0
+        additions = 0
+        deletions = 0
         if push_review_enabled:
             # 获取PUSH的changes
             changes = handler.get_push_changes()
@@ -150,6 +167,9 @@ def handle_github_push_event(webhook_data: dict, github_token: str, github_url:
                 commits_text = ';'.join(commit.get('message', '').strip() for commit in commits)
                 review_result = CodeReviewer().review_and_strip_code(str(changes), commits_text)
                 score = CodeReviewer.parse_review_score(review_text=review_result)
+                for item in changes:
+                    additions += item.get('additions', 0)
+                    deletions += item.get('deletions', 0)
             # 将review结果提交到GitHub的 notes
             handler.add_push_notes(f'Auto Review Result: \n{review_result}')
 
@@ -163,6 +183,8 @@ def handle_github_push_event(webhook_data: dict, github_token: str, github_url:
             review_result=review_result,
             url_slug=github_url_slug,
             webhook_data=webhook_data,
+            additions=additions,
+            deletions=deletions,
         ))
 
     except Exception as e:
@@ -202,6 +224,12 @@ def handle_github_pull_request_event(webhook_data: dict, github_token: str, gith
         if not changes:
             logger.info('未检测到有关代码的修改,修改文件可能不满足SUPPORTED_EXTENSIONS。')
             return
+        # 统计本次新增、删除的代码总数
+        additions = 0
+        deletions = 0
+        for item in changes:
+            additions += item.get('additions', 0)
+            deletions += item.get('deletions', 0)
 
         # 获取Pull Request的commits
         commits = handler.get_pull_request_commits()
@@ -230,6 +258,8 @@ def handle_github_pull_request_event(webhook_data: dict, github_token: str, gith
                 review_result=review_result,
                 url_slug=github_url_slug,
                 webhook_data=webhook_data,
+                additions=additions,
+                deletions=deletions,
             ))
 
     except Exception as e:

biz/service/review_service.py

@@ -25,7 +25,9 @@ def init_db():
                             commit_messages TEXT,
                             score INTEGER,
                             url TEXT,
-                            review_result TEXT
+                            review_result TEXT,
+                            additions INTEGER DEFAULT 0,
+                            deletions INTEGER DEFAULT 0
                         )
                     ''')
                 cursor.execute('''
@@ -37,9 +39,20 @@ def init_db():
                             updated_at INTEGER,
                             commit_messages TEXT,
                             score INTEGER,
-                            review_result TEXT
+                            review_result TEXT,
+                            additions INTEGER DEFAULT 0,
+                            deletions INTEGER DEFAULT 0
                         )
                     ''')
+                # 确保旧版本的mr_review_log、push_review_log表添加additions、deletions列
+                tables = ["mr_review_log", "push_review_log"]
+                columns = ["additions", "deletions"]
+                for table in tables:
+                    cursor.execute(f"PRAGMA table_info({table})")
+                    current_columns = [col[1] for col in cursor.fetchall()]
+                    for column in columns:
+                        if column not in current_columns:
+                            cursor.execute(f"ALTER TABLE {table} ADD COLUMN {column} INTEGER DEFAULT 0")
                 conn.commit()
         except sqlite3.DatabaseError as e:
             print(f"Database initialization failed: {e}")
@@ -51,13 +64,13 @@ def insert_mr_review_log(entity: MergeRequestReviewEntity):
             with sqlite3.connect(ReviewService.DB_FILE) as conn:
                 cursor = conn.cursor()
                 cursor.execute('''
-                                INSERT INTO mr_review_log (project_name,author, source_branch, target_branch, updated_at, commit_messages, score, url,review_result)
-                                VALUES (?,?, ?, ?, ?, ?, ?, ?, ?)
+                                INSERT INTO mr_review_log (project_name,author, source_branch, target_branch, updated_at, commit_messages, score, url,review_result, additions, deletions)
+                                VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
                             ''',
                                (entity.project_name, entity.author, entity.source_branch,
                                 entity.target_branch,
                                 entity.updated_at, entity.commit_messages, entity.score,
-                                entity.url, entity.review_result))
+                                entity.url, entity.review_result, entity.additions, entity.deletions))
                 conn.commit()
         except sqlite3.DatabaseError as e:
             print(f"Error inserting review log: {e}")
@@ -69,7 +82,7 @@ def get_mr_review_logs(authors: list = None, project_names: list = None, updated
         try:
             with sqlite3.connect(ReviewService.DB_FILE) as conn:
                 query = """
-                            SELECT project_name, author, source_branch, target_branch, updated_at, commit_messages, score, url, review_result
+                            SELECT project_name, author, source_branch, target_branch, updated_at, commit_messages, score, url, review_result, additions, deletions
                             FROM mr_review_log
                             WHERE 1=1
                             """
@@ -106,12 +119,12 @@ def insert_push_review_log(entity: PushReviewEntity):
             with sqlite3.connect(ReviewService.DB_FILE) as conn:
                 cursor = conn.cursor()
                 cursor.execute('''
-                                INSERT INTO push_review_log (project_name,author, branch, updated_at, commit_messages, score,review_result)
-                                 VALUES (?, ?, ?, ?, ?, ?, ?)
+                                INSERT INTO push_review_log (project_name,author, branch, updated_at, commit_messages, score,review_result, additions, deletions)
+                                 VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
                             ''',
                                (entity.project_name, entity.author, entity.branch,
                                 entity.updated_at, entity.commit_messages, entity.score,
-                                entity.review_result))
+                                entity.review_result, entity.additions, entity.deletions))
                 conn.commit()
         except sqlite3.DatabaseError as e:
             print(f"Error inserting review log: {e}")
@@ -124,7 +137,7 @@ def get_push_review_logs(authors: list = None, project_names: list = None, updat
             with sqlite3.connect(ReviewService.DB_FILE) as conn:
                 # 基础查询
                 query = """
-                    SELECT project_name, author, branch, updated_at, commit_messages, score, review_result
+                    SELECT project_name, author, branch, updated_at, commit_messages, score, review_result, additions, deletions
                     FROM push_review_log
                     WHERE 1=1
                 """

ui.py

@@ -1,4 +1,5 @@
 import datetime
+import math
 import os
 
 import pandas as pd
@@ -36,6 +37,16 @@ def get_data(service_func, authors=None, project_names=None, updated_at_gte=None
             if isinstance(ts, (int, float)) else ts
         )
 
+    def format_delta(row):
+        if (row['additions'] and not math.isnan(row['additions'])
+                and row['deletions'] and not math.isnan(row['deletions'])):
+            return f"+{int(row['additions'])}  -{int(row['deletions'])}"
+        else:
+            return ""
+    if "additions" in df.columns and "deletions" in df.columns:
+        df["delta"] = df.apply(format_delta, axis=1)
+    else:
+        df["delta"] = ""
     data = df[columns]
     return data
 
@@ -171,6 +182,34 @@ def generate_author_score_chart(df):
     st.pyplot(fig2)
 
 
+def generate_author_code_line_chart(df):
+    if df.empty:
+        st.info("没有数据可供展示")
+        return
+    
+    # 检查必要的列是否存在
+    if 'additions' not in df.columns or 'deletions' not in df.columns:
+        st.warning("无法生成代码行数图表：缺少必要的数据列")
+        return
+        
+    # 计算每个人员的代码行数（additions + deletions）
+    df['total_lines'] = df['additions'] + df['deletions']
+    author_code_lines = df.groupby('author')['total_lines'].sum().reset_index()
+    author_code_lines.columns = ['author', 'code_lines']
+
+    # 显示代码行数柱状图
+    fig3, ax3 = plt.subplots(figsize=(10, 6))
+    colors = plt.colormaps['Set3'].resampled(len(author_code_lines))
+    ax3.bar(
+        author_code_lines['author'],
+        author_code_lines['code_lines'],
+        color=[colors(i) for i in range(len(author_code_lines))]
+    )
+    plt.xticks(rotation=45, ha='right', fontsize=26)
+    plt.tight_layout()
+    st.pyplot(fig3)
+
+
 # 主要内容
 def main_page():
     st.markdown("#### 审查日志")
@@ -223,6 +262,7 @@ def display_data(tab, service_func, columns, column_config):
             average_score = df["score"].mean() if not df.empty else 0
             st.markdown(f"**总记录数:** {total_records}，**平均分:** {average_score:.2f}")
 
+
             # 创建2x2网格布局展示四个图表
             row1, row2, row3, row4 = st.columns(4)
             with row1:
@@ -238,9 +278,18 @@ def display_data(tab, service_func, columns, column_config):
                 st.markdown("<div style='text-align: center;'><b>人员平均分数</b></div>", unsafe_allow_html=True)
                 generate_author_score_chart(df)
 
+            row5, row6, row7, row8 = st.columns(4)
+            with row5:
+                st.markdown("<div style='text-align: center;'><b>人员代码变更总行数(增加+删除)</b></div>", unsafe_allow_html=True)
+                # 只有当 additions 和 deletions 列都存在时才显示代码行数图表
+                if 'additions' in df.columns and 'deletions' in df.columns:
+                    generate_author_code_line_chart(df)
+                else:
+                    st.info("无法显示代码行数图表：缺少必要的数据列")
+
     # Merge Request 数据展示
-    mr_columns = ["project_name", "author", "source_branch", "target_branch", "updated_at", "commit_messages", "score",
-                  "url"]
+    mr_columns = ["project_name", "author", "source_branch", "target_branch", "updated_at", "commit_messages", "delta",
+                  "score", "url", "additions", "deletions"]
 
     mr_column_config = {
         "score": st.column_config.ProgressColumn(
@@ -252,20 +301,24 @@ def display_data(tab, service_func, columns, column_config):
             max_chars=100,
             display_text=r"查看"
         ),
+        "additions": None,
+        "deletions": None,
     }
 
     display_data(mr_tab, ReviewService().get_mr_review_logs, mr_columns, mr_column_config)
 
     # Push 数据展示
     if show_push_tab:
-        push_columns = ["project_name", "author", "branch", "updated_at", "commit_messages", "score"]
+        push_columns = ["project_name", "author", "branch", "updated_at", "commit_messages", "delta", "score", "additions", "deletions"]
 
         push_column_config = {
             "score": st.column_config.ProgressColumn(
                 format="%f",
                 min_value=0,
                 max_value=100,
             ),
+            "additions": None,
+            "deletions": None,
         }
 
         display_data(push_tab, ReviewService().get_push_review_logs, push_columns, push_column_config)