修复绩点字段为空导致崩溃并统一成绩返回类型

2026-01-19 19:13:25 +08:00
parent 0b36d814f1
commit 439f87b431
2 changed files with 53 additions and 29 deletions
@@ -9,6 +9,13 @@ def get_grade(student_client, output_type="none"):
        # 初始化grade为空列表
        grade = []

+        # 定义安全的float转换函数，避免None/空字符串导致异常
+        def safe_float(value, default=0.0):
+            try:
+                return float(value)
+            except (TypeError, ValueError):
+                return default
+
        # 使用while循环最多重试5次获取成绩信息
        while attempts > 0:

@@ -28,10 +35,13 @@ def get_grade(student_client, output_type="none"):
        # 成绩不为空时
        if grade:
            # 过滤出成绩大于等于60分的课程
-            filtered_grade = list(filter(lambda x: float(x["percentage_grades"]) >= 60, grade))
+            filtered_grade = list(
+                filter(lambda x: safe_float(x.get("percentage_grades")) >= 60, grade)
+            )

            # 遍历 grade 中的每个字典，将 title 中的中文括号替换为英文括号
            for course_data_grade in grade:
+                if course_data_grade.get("title"):
                    course_data_grade["title"] = (
                        course_data_grade["title"].replace("（", "(").replace("）", ")")
                    )
@@ -41,7 +51,9 @@ def get_grade(student_client, output_type="none"):
            sorted_grade = sorted(
                grade,
                key=lambda x: (
-                    x["submission_time"] if x["submission_time"] else "1970-01-01 00:00:00"
+                    x.get("submission_time")
+                    if x.get("submission_time")
+                    else "1970-01-01 00:00:00"
                ),
                reverse=True,
            )
@@ -49,24 +61,28 @@ def get_grade(student_client, output_type="none"):
            # 大于等于60分的课程不为空时
            if filtered_grade:
                # 学分总和
-                total_credit = sum(float(course["credit"]) for course in filtered_grade)
+                total_credit = sum(safe_float(course.get("credit")) for course in filtered_grade)

                # 学分绩点总和
-                total_xfjd = sum(float(course["xfjd"]) for course in filtered_grade)
+                total_xfjd = sum(safe_float(course.get("xfjd")) for course in filtered_grade)

                # (百分制成绩*学分)的总和
                sum_of_percentage_grades_multiplied_by_credits = sum(
-                    float(course["percentage_grades"]) * float(course["credit"])
+                    safe_float(course.get("percentage_grades")) * safe_float(course.get("credit"))
                    for course in filtered_grade
                )

                # GPA计算 (学分*绩点)的总和/学分总和
+                if total_credit > 0:
                    gpa = "{:.2f}".format(total_xfjd / total_credit)

                    # 百分制GPA计算 (百分制成绩*学分)的总和/学分总和
                    percentage_gpa = "{:.2f}".format(
                        sum_of_percentage_grades_multiplied_by_credits / total_credit
                    )
+                else:
+                    total_credit = total_xfjd = sum_of_percentage_grades_multiplied_by_credits = 0
+                    gpa = percentage_gpa = 0
            else:
                total_credit = total_xfjd = sum_of_percentage_grades_multiplied_by_credits = gpa = (
                    percentage_gpa
@@ -80,24 +96,24 @@ def get_grade(student_client, output_type="none"):

                # 如果成绩非数字，如及格、良好、中等、优秀等，则显示百分制成绩
                try:
-                    float(course["grade"])  # 检查成绩是否为数字
-                    score_grades = course["grade"]
-                except ValueError:
-                    score_grades = f"{course['grade']} ({course['percentage_grades']})"
+                    float(course.get("grade"))  # 检查成绩是否为数字
+                    score_grades = course.get("grade")
+                except (TypeError, ValueError):
+                    score_grades = f"{course.get('grade')} ({course.get('percentage_grades')})"

                # 整合成绩信息
                integrated_grade_info += (
                    f"\n"
-                    f"教学班ID：{course['class_id']}\n"
-                    f"课程名称：{course['title']}\n"
-                    f"任课教师：{course['teacher']}\n"
+                    f"教学班ID：{course.get('class_id')}\n"
+                    f"课程名称：{course.get('title')}\n"
+                    f"任课教师：{course.get('teacher')}\n"
                    f"成绩：{score_grades}\n"
-                    f"提交时间：{course['submission_time']}\n"
-                    f"提交人姓名：{course['name_of_submitter']}\n"
+                    f"提交时间：{course.get('submission_time')}\n"
+                    f"提交人姓名：{course.get('name_of_submitter')}\n"
                    f"------"
                )

-            last_submission_time = sorted_grade[0]["submission_time"]
+            last_submission_time = sorted_grade[0].get("submission_time") if sorted_grade else ""

            if output_type == "grade":
                return grade
@@ -114,4 +130,6 @@ def get_grade(student_client, output_type="none"):

    except Exception:
        print(traceback.format_exc())
+        if output_type == "grade":
+            return []
        return "获取成绩时出错"
@@ -8,6 +8,10 @@ def get_selected_courses(student_client):
        # 获取成绩信息
        grade = get_grade(student_client, output_type="grade")

+        # 成绩信息异常时，保证grade为列表，避免后续索引报错
+        if not isinstance(grade, list):
+            grade = []
+
        # 定义重试次数上限为5次
        attempts = 5
        # 初始化selected_courses为空列表
@@ -35,8 +39,8 @@ def get_selected_courses(student_client):
            selected_courses = sorted(
                selected_courses,
                key=lambda x: (
-                    (x["course_year"] if x["course_year"] else "1970-1971"),
-                    (x["course_semester"] if x["course_semester"] else "1"),
+                    (x.get("course_year") if x.get("course_year") else "1970-1971"),
+                    (x.get("course_semester") if x.get("course_semester") else "1"),
                ),
                reverse=True,
            )
@@ -45,7 +49,7 @@ def get_selected_courses(student_client):
            ungraded_courses_by_semester = {}

            # 获取成绩列表中的class_id集合
-            grade_class_ids = {course["class_id"] for course in grade} if grade else ""
+            grade_class_ids = {course.get("class_id") for course in grade} if grade else set()

            # 初始化输出内容
            selected_courses_filtering = ""
@@ -56,15 +60,17 @@ def get_selected_courses(student_client):
                try:
                    year, semester, seq = course["course_year"].split("-") + [course["course_semester"]]
                except Exception:
-                    pass
+                    year, semester, seq = "1970", "1971", "1"

                # 构建年学期名称,例如 "a至b学年第c学期"
                yearsemester_name = f"{year}至{semester}学年第{seq}学期"

                # 判断课程是否未公布成绩
-                if course["class_id"] not in grade_class_ids:
+                if course.get("class_id") not in grade_class_ids:
                    # 未公布成绩
-                    ungraded_courses_by_semester.setdefault(yearsemester_name, []).append(f"{course['title'].replace('（', '(').replace('）', ')')} - {course['teacher']}")
+                    ungraded_courses_by_semester.setdefault(yearsemester_name, []).append(
+                        f"{course.get('title', '').replace('（', '(').replace('）', ')')} - {course.get('teacher')}"
+                    )

            # 构建输出内容
            if ungraded_courses_by_semester: