info: append grade details from grades_summary.json

src/hoa_majors/cli/info.py

@@ -1,34 +1,192 @@
 import argparse
+import json
 import sys
 from pathlib import Path
 
 from hoa_majors.config import DEFAULT_DATA_DIR, logger
 from hoa_majors.core.utils import iter_toml_files
 
 
-def get_course_info(plan_id: str, course_code: str, data_dir: Path):
+def _load_grades_summary(data_dir: Path) -> dict:
+    """Load grades_summary.json if present; otherwise return empty dict."""
+
+    path = data_dir / "grades_summary.json"
+    if not path.exists():
+        return {}
+
+    try:
+        return json.loads(path.read_text(encoding="utf-8"))
+    except Exception as e:
+        logger.warning(f"无法读取 {path.name}: {e}")
+        return {}
+
+
+def _select_grade_details(
+    *,
+    grades_summary: dict,
+    course_code: str,
+    year: str | None,
+    major_code: str | None,
+    major_name: str | None,
+) -> tuple[list[dict] | None, str | None]:
+    """Select grade details for a course.
+
+    Returns:
+      (grade_items, matched_key)
+
+    Match order:
+      1) year_major
+      2) year_default
+      3) default
+    """
+
+    entry = grades_summary.get(course_code)
+    if not isinstance(entry, dict):
+        return None, None
+
+    year = (year or "").strip()
+    major_code = (major_code or "").strip()
+    major_name = (major_name or "").strip()
+
+    # Note: upstream grades_summary.json uses year+major *name* (e.g. 2021_自动化).
+    # The feature request mentions major code, so we try both code and name.
+    year_major_keys: list[str] = []
+    if year and major_code:
+        year_major_keys.append(f"{year}_{major_code}")
+    if year and major_name:
+        year_major_keys.append(f"{year}_{major_name}")
+
+    year_default_key = f"{year}_default" if year else ""
+
+    for k in year_major_keys:
+        if k in entry and isinstance(entry.get(k), list) and entry.get(k):
+            return entry.get(k), k
+
+    if year_default_key and year_default_key in entry and isinstance(entry.get(year_default_key), list) and entry.get(year_default_key):
+        return entry.get(year_default_key), year_default_key
+
+    if "default" in entry and isinstance(entry.get("default"), list) and entry.get("default"):
+        return entry.get("default"), "default"
+
+    return None, None
+
+
+def _print_grade_details(
+    *,
+    grades_summary: dict,
+    course_code: str,
+    year: str | None,
+    major_code: str | None,
+    major_name: str | None,
+):
+    grade_items, _ = _select_grade_details(
+        grades_summary=grades_summary,
+        course_code=course_code,
+        year=year,
+        major_code=major_code,
+        major_name=major_name,
+    )
+
+    if not grade_items:
+        return
+
+    print("-" * 60)
+    print("成绩构成")
+    for item in grade_items:
+        if not isinstance(item, dict):
+            continue
+        name = str(item.get("name", "")).strip()
+        percent = item.get("percent")
+        percent_str = str(percent).strip() if percent is not None else ""
+        if percent_str:
+            print(f"{name}: {percent_str}")
+        else:
+            print(f"{name}")
+
+
+def get_course_info(plan_id: str, course_code: str, data_dir: Path, as_json: bool = False):
     found_plan = False
     found_course = False
 
+    grades_summary = _load_grades_summary(data_dir)
+
     for _, data in iter_toml_files(data_dir):
-        if data.get("info", {}).get("plan_ID") == plan_id:
+        info = data.get("info", {})
+        if info.get("plan_ID") == plan_id:
             found_plan = True
             for course in data.get("courses", []):
                 if course.get("course_code") == course_code:
                     found_course = True
-                    print(f"\n培养方案 {plan_id} 中的课程 {course_code} 详细信息:")
-                    print("=" * 60)
-                    # 打印核心字段
-                    for key, value in course.items():
-                        if key != "hours":
-                            print(f"{key.replace('_', ' ').title():<25}: {value}")
 
-                    # 打印学时子表
+                    grade_items, matched_grade_key = _select_grade_details(
+                        grades_summary=grades_summary,
+                        course_code=course_code,
+                        year=info.get("year"),
+                        major_code=info.get("major_code"),
+                        major_name=info.get("major_name"),
+                    )
+
+                    if as_json:
+                        out = {
+                            "plan_id": plan_id,
+                            "course_code": course_code,
+                            "course": {
+                                k: v
+                                for k, v in course.items()
+                                if k != "hours"  # keep hours in a separate object for cleanliness
+                            },
+                            "hours": course.get("hours"),
+                            "grade_details": grade_items,
+                            "grade_details_key": matched_grade_key,
+                        }
+                        print(json.dumps(out, ensure_ascii=False, indent=2))
+                        return
+
+                    # 基本信息
+                    print("\n基本信息")
+                    field_order = [
+                        ("course_code", "Course Code"),
+                        ("credit", "Credit"),
+                        ("assessment_method", "Assessment Method"),
+                        ("course_name", "Course Name"),
+                        ("recommended_year_semester", "Recommended Year Semester"),
+                        ("course_nature", "Course Nature"),
+                        ("course_category", "Course Category"),
+                        ("offering_college", "Offering College"),
+                        ("total_hours", "Total Hours"),
+                    ]
+                    label_width = 26
+                    for k, label in field_order:
+                        if k in course:
+                            print(f"{label:<{label_width}} : {course.get(k)}")
+
+                    # 学时分配
                     if "hours" in course:
                         print("-" * 60)
-                        print("学时分配:")
-                        for h_key, h_val in course["hours"].items():
-                            print(f"  {h_key.title():<23}: {h_val}")
+                        print("学时分配")
+                        hour_order = [
+                            ("theory", "Theory"),
+                            ("lab", "Lab"),
+                            ("practice", "Practice"),
+                            ("exercise", "Exercise"),
+                            ("computer", "Computer"),
+                            ("tutoring", "Tutoring"),
+                        ]
+                        for h_key, h_label in hour_order:
+                            if h_key in course["hours"]:
+                                print(
+                                    f"{h_label:<{label_width}} : {course['hours'].get(h_key)}"
+                                )
+
+                    # Append grade details if we can find a matching summary entry.
+                    _print_grade_details(
+                        grades_summary=grades_summary,
+                        course_code=course_code,
+                        year=info.get("year"),
+                        major_code=info.get("major_code"),
+                        major_name=info.get("major_name"),
+                    )
+
                     print("=" * 60)
                     break
             if found_course:
@@ -46,10 +204,15 @@ def main():
     parser = argparse.ArgumentParser(description="获取培养方案中特定课程的详细信息")
     parser.add_argument("plan_id", help="培养方案 ID (fah)")
     parser.add_argument("course_code", help="课程代码")
+    parser.add_argument(
+        "--json",
+        action="store_true",
+        help="以纯 JSON 输出（仅输出课程与成绩构成等信息，不含格式化文本）",
+    )
     parser.add_argument("--data-dir", type=Path, default=DEFAULT_DATA_DIR, help="数据存储目录")
     args = parser.parse_args()
 
-    get_course_info(args.plan_id, args.course_code, args.data_dir)
+    get_course_info(args.plan_id, args.course_code, args.data_dir, as_json=args.json)
 
 
 if __name__ == "__main__":

src/hoa_majors/cli/main.py

@@ -59,7 +59,14 @@ def main():
     info_parser = subparsers.add_parser("info", help="获取培养方案中特定课程的详细信息")
     info_parser.add_argument("plan_id", help="培养方案 ID (fah)")
     info_parser.add_argument("course_code", help="课程代码")
-    info_parser.add_argument("--data-dir", type=Path, default=DEFAULT_DATA_DIR, help="数据存储目录")
+    info_parser.add_argument(
+        "--json",
+        action="store_true",
+        help="以纯 JSON 输出（仅输出课程与成绩构成等信息，不含格式化文本）",
+    )
+    info_parser.add_argument(
+        "--data-dir", type=Path, default=DEFAULT_DATA_DIR, help="数据存储目录"
+    )
 
     # repo
     repo_parser = subparsers.add_parser("repo", help="获取课程对应的 OpenAuto 仓库 ID")
@@ -105,7 +112,7 @@ def main():
     elif args.command == "courses":
         courses.list_courses(args.plan_id, args.data_dir)
     elif args.command == "info":
-        info.get_course_info(args.plan_id, args.course_code, args.data_dir)
+        info.get_course_info(args.plan_id, args.course_code, args.data_dir, as_json=args.json)
     elif args.command == "repo":
         repo.run(args)
     else: