Update app.py

app.py

@@ -8,35 +8,44 @@ from collections import defaultdict
 
 # ========== TRANSCRIPT PARSING FUNCTIONS ==========
 def extract_courses_with_grade_levels(text):
+    # First extract the current grade level
     grade_level_pattern = r"(Grade|Year)\s*[:]?\s*(\d+|Freshman|Sophomore|Junior|Senior)"
     grade_match = re.search(grade_level_pattern, text, re.IGNORECASE)
     current_grade_level = grade_match.group(2) if grade_match else "Unknown"
 
+    # Improved course pattern to better match course codes and names
     course_pattern = r"""
         (?:^|\n)
-        (?: (Grade|Year)\s*[:]?\s*(\d+|Freshman|Sophomore|Junior|Senior)\s*[\n-]* )?
+        (?: (Grade|Year)\s*[:]?\s*(\d+|Freshman|Sophomore|Junior|Senior)\s*[\n-]* )?  # Optional grade level context
         (
-            (?:[A-Z]{2,}\s?\d{3})
+            (?:[A-Z]{2,}\s?\d{3}[A-Z]?\b)  # Course codes like MATH101 or CS 201A
             |
-            [A-Z][a-z]+(?:\s[A-Z][a-z]+)*
+            (?:[A-Z][a-z]+(?:\s+[A-Z][a-z]+)+)  # Course names like "Calculus I" or "World History"
         )
         \s*
-        (?: [:\-]?\s* ([A-F][+-]?|\d{2,3}%)? )?
+        (?: [:\-]?\s* ([A-F][+-]?|\d{2,3}%)? )?  # Optional grade
+        \s*
+        (?: [:\-]?\s* (\d\.\d{1,2})? )?  # Optional credit hours
     """
 
     courses_by_grade = defaultdict(list)
     current_grade = current_grade_level
 
     for match in re.finditer(course_pattern, text, re.VERBOSE | re.MULTILINE):
-        grade_context, grade_level, course, grade = match.groups()
+        grade_context, grade_level, course, grade, credits = match.groups()
 
         if grade_context:
             current_grade = grade_level
 
         if course:
-            course_info = {"course": course.strip()}
+            course_info = {
+                "course": course.strip(),
+                "grade_level": current_grade
+            }
             if grade:
                 course_info["grade"] = grade.strip()
+            if credits:
+                course_info["credits"] = credits.strip()
             courses_by_grade[current_grade].append(course_info)
 
     return dict(courses_by_grade)
@@ -94,8 +103,6 @@ def parse_transcript(file):
         else:
             output_text += "No GPA information found\n"
 
-        output_text += "\n(Courses not shown here)"
-
         return output_text, {
             "gpa": gpa_data,
             "grade_level": grade_level,
@@ -123,15 +130,37 @@ def parse_transcript(file):
             courses = df[col].tolist()
             break
 
-    output_text = f"Grade Level: {grade_level}\nGPA: {gpa}\n\nCourses:\n"
-    output_text += "\n".join(f"- {course}" for course in courses)
-
-    return output_text, {
+    return f"Grade Level: {grade_level}\nGPA: {gpa}", {
         "gpa": {"unweighted": gpa, "weighted": "N/A"},
         "grade_level": grade_level,
         "courses": courses
     }
 
+# ... [keep all other functions the same until transcript_display] ...
+
+def transcript_display(transcript_dict):
+    if not transcript_dict:
+        return "No transcript uploaded."
+    
+    if isinstance(transcript_dict, dict) and "courses" in transcript_dict:
+        if isinstance(transcript_dict["courses"], dict):
+            display = "### Course History\n\n"
+            for grade_level, courses in transcript_dict["courses"].items():
+                display += f"**Grade {grade_level}**\n"
+                for course in courses:
+                    display += f"- {course.get('course', 'N/A')}"
+                    if 'grade' in course:
+                        display += f" (Grade: {course['grade']})"
+                    if 'credits' in course:
+                        display += f" | Credits: {course['credits']}"
+                    display += "\n"
+                display += "\n"
+            return display
+        elif isinstance(transcript_dict["courses"], list):
+            return "### Courses\n" + "\n".join([f"- {course}" for course in transcript_dict["courses"]])
+    
+    return "No course information available in the expected format."
+
 # ========== LEARNING STYLE QUIZ ==========
 learning_style_questions = [
     "When you study for a test, you prefer to:",