Update app.py

app.py

@@ -9,112 +9,176 @@ import os
 from pathlib import Path
 import time
 
+# The original, verbose rubric has been restored to provide maximum detail to the model.
 GRADING_RUBRIC = """
-GRADING RUBRIC (Total 100 points)
-
-I. APA Formatting (60 pts)
-1. APA Title Page (5 pts): Requires 9 components: (1) Page number (1), (2) Title (bold), (3) Author, (4) Department, (5) University, (6) Course, (7) Instructor, (8) Due Date, (9) Centered/spaced correctly.
-   - Scoring: 5 pts: All 9 correct. 0 pts: 1+ error.
-2. APA General Guidelines (5 pts): Requires (1) Typed, (2) 1" margins, (3) 11pt Calibri or 12pt TNR, (4) Double-spaced, (5) Left-aligned, (6) Paragraphs indented 0.5".
-   - Scoring: 5 pts: All 6 met. 2 pts: 1 missing. 0 pts: 2+ missing.
-3. APA Text - Misc. Errors (5 pts): Check for: (1) Extra paragraph spacing, (2) Misspellings, (3) Typos.
-   - Scoring: 5 pts: 0 errors. 4 pts: 1 error. 0 pts: 2+ errors.
-4. APA In-text Citations - Presence (5 pts): Count missing citations for all non-common knowledge facts/opinions.
-   - Scoring: 5 pts: 0 missing. 3.5 pts: 1-5 missing. 0 pts: 6+ missing.
-5. APA In-text Citation - Formatting (5 pts): Check all in-text citations for correct APA 7 format.
-   - Scoring: 5 pts: 0 errors. 2 pts: 1-2 errors. 0 pts: 3+ errors.
-6. Ref Page - General Formatting (5 pts): Requires (1) "References" title (bold, centered, new page), (2) Alphabetical order, (3) 0.5" hanging indent.
-   - Scoring: 5 pts: All 3 correct. 0 pts: 1+ error.
-7. Ref Page - Line Spacing (5 pts): Entire page must be uniformly double-spaced.
-   - Scoring: 5 pts: Correct. 0 pts: Any error.
-8. References - Scholarly & Timely (10 pts): Must have >=3 scholarly sources, all dated within 7 years (after July 19, 2018).
-   - Scoring: 10 pts: Both conditions met. 0 pts: Fails one or both.
-9. References - Author Names (5 pts): Check all author names for correct APA 7 format (e.g., Lastname, F. M.) and correct handling of no-author sources.
-   - Scoring: 5 pts: 0 errors. 2 pts: 1 error of author vs. title/publisher. 0 pts: General format errors.
-10. References - Dates (5 pts): Check reference dates for correct APA 7 format.
-   - Scoring: 5 pts: 0 errors. 3 pts: 1 error. 0 pts: 2+ errors.
-11. References - Capitalization (5 pts): Check reference titles for APA 7 capitalization (sentence case for articles/books; title case for journals).
-   - Scoring: 5 pts: 0 errors. 3 pts: 1 error. 0 pts: 2+ errors.
-12. References - Italics (5 pts): Check references for correct APA 7 italics (journal titles/volumes, book titles).
-   - Scoring: 5 pts: 0-1 error. 0 pts: 2+ errors.
-13. References - Hyperlinks (5 pts): Requires (1) DOIs as active hyperlinks, (2) No "Retrieved from", (3) No period after URL/DOI, (4) Non-DOI URLs included.
-   - Scoring: 5 pts: All 4 rules met. 2 pts: 1 rule fails. 0 pts: 2+ rules fail.
-
-II. Content (40 pts)
-14. Introduction (10 pts): Must be 1-2 paragraphs, introduce the topic, be <=1 page long.
-    - Scoring: 10 pts: Meets reqs, 0 typos. 5 pts: Meets reqs, 1-2 typos. 0 pts: Fails reqs OR 3+ typos.
-15. Common Causes (10 pts): Discusses at least one common cause of skin lesions.
-    - Scoring: 10 pts: Yes. 0 pts: No.
-16. Nursing Considerations (10 pts): Discusses at least one nursing intervention/consideration.
-    - Scoring: 10 pts: Yes. 0 pts: No.
-
+DETAILED GRADING RUBRIC & INSTRUCTIONS
+You will assess the paper against the following 16 criteria. For each criterion, you will determine the student's score based on a forensic analysis of their work.
+I. APA Formatting (Total 60 points)
+1. APA Title Page (5 pts):
+Check for the 9 required components of a student title page. For this task, the 9 components are defined as: (1) Page number in the header (Page 1), (2) Paper title (bolded), (3) Author's name, (4) Department name, (5) University name, (6) Course number and name, (7) Instructor's name, (8) Assignment due date, (9) All elements are centered and correctly spaced in the upper half of the page.
+Scoring:
+5 pts: All 9 components are present and correctly formatted.
+0 pts: 1 or more components are missing or incorrectly formatted.
+2. APA General Guidelines - Main Body (5 pts):
+Check for adherence to all of the following:
+(1) Paper is typed.
+(2) 1-inch margins on all sides.
+(3) Font is either 11 pt Calibri or 12 pt Times New Roman (consistently).
+The 3 additional main body text requirements are: (4) All text is double-spaced, (5) Text is aligned to the left margin (not justified), (6) The first line of every paragraph is indented 0.5 inches.
+Scoring:
+5 pts: All 6 guidelines are met perfectly.
+2 pts: 1 guideline is not met.
+0 pts: 2 or more guidelines are not met.
+3. APA Text - Main Body Misc. Errors (5 pts):
+Scan the entire document for the following: (1) Extra spacing between paragraphs, (2) Misspellings, (3) Typographical errors.
+Scoring:
+5 pts: 0 errors found.
+4 pts: Exactly 1 error found.
+0 pts: 2 or more errors found.
+4. APA In-text Citations - Presence (5 pts):
+Analyze the text: Identify every statement of fact, statistic, or opinion that is not common knowledge and requires a citation. Count how many of these required citations are missing.
+Scoring:
+5 pts: 0 missing in-text citations.
+3.5 pts: 1 to 5 missing in-text citations.
+0 pts: 6 or more missing in-text citations.
+5. APA In-text Citation - Formatting (5 pts):
+Analyze every provided in-text citation. Check for correct APA 7th Ed. format (e.g., (Author, Year) for parenthetical; Author (Year) for narrative; et al. usage; multiple authors). Count every single formatting error.
+Scoring:
+5 pts: 0 formatting errors.
+2 pts: 1 to 2 formatting errors.
+0 pts: 3 or more formatting errors.
+6. APA Reference Page - General Formatting (5 pts):
+Check for the following: (1) The title "References" is on a new page, centered, and bolded. (2) All entries are alphabetized by the first author's last name. (3) A 0.5-inch hanging indent is applied to all entries.
+Scoring:
+5 pts: The entire page meets all 3 general formatting expectations.
+0 pts: 1 or more errors are present.
+7. APA Reference Page - Line Spacing (5 pts):
+Check for the following: The entire reference page, including between entries, is uniformly double-spaced.
+Scoring:
+5 pts: The entire page adheres to APA double-spacing rules.
+0 pts: 1 or more line spacing errors are present (e.g., single spacing, extra space between entries).
+8. APA References - Scholarly & Timely (10 pts):
+Analyze the reference list. A "scholarly" reference is a peer-reviewed journal article, an academic book/chapter, or a publication from a professional organization (e.g., CDC, WHO). A non-scholarly source would be a general website, blog, or news article. A timely reference is one published within the last 7 years (i.e., between July 20, 2018, and July 19, 2025).
+Check for two conditions: (1) Are there at least 3 scholarly references? AND (2) Are all of those references dated within the last 7 years?
+Scoring:
+10 pts: At least 3 scholarly references are cited, AND all references are dated within the last 7 years.
+0 pts: Fewer than 3 scholarly references are cited, OR one or more references are older than 7 years.
+9. APA References - Author Names (5 pts):
+Analyze all author names on the reference page. Check for correct format: Lastname, F. M.. Also check for correct handling of sources with no author (the title or organization name moves to the author position).
+Scoring:
+5 pts: All author names are formatted perfectly.
+2 pts: There is 1 error where an author's name should have been a title/publisher, or vice versa.
+0 pts: There are general, repeated formatting errors in author names.
+10. APA References - Dates (5 pts):
+Analyze the date for each reference. Check for correct APA 7th Ed. format (e.g., (Year). for journals/books; (Year, Month Day). for web sources). Count every error.
+Scoring:
+5 pts: 0 errors.
+3 pts: Exactly 1 error.
+0 pts: 2 or more errors.
+11. APA References - Capitalization (5 pts):
+Analyze the titles in each reference. Check for correct APA 7th Ed. capitalization rules: Sentence case for article and book titles. Title case for periodical (journal) titles. Count every error.
+Scoring:
+5 pts: 0 errors.
+3 pts: Exactly 1 error.
+0 pts: 2 or more errors.
+12. APA References - Italics (5 pts):
+Analyze each reference for correct italicization. Check for APA 7th Ed. rules: Italicize journal titles and volume numbers. Italicize book titles. Count every error.
+Scoring:
+5 pts: 0 or 1 error in italicization.
+0 pts: 2 or more errors in italicization.
+13. APA References - Hyperlinks (5 pts):
+Analyze all DOIs and URLs. The 4 guidelines are: (1) All DOIs are presented as a full, active hyperlink (e.g., https://doi.org/...). (2) The phrase "Retrieved from" is NOT used before a URL or DOI. (3) There is no period after the DOI or URL. (4) URLs that are not DOIs are included.
+Scoring:
+5 pts: All 4 guidelines are followed for all relevant references.
+2 pts: 1 of the 4 guidelines is not followed.
+0 pts: 2 or more of the 4 guidelines are not followed.
+II. Content (Total 40 points)
+14. Skin Lesion: Introduction (10 pts):
+Analyze the introduction. Check that it: (1) Is one or two paragraphs long. (2) Clearly introduces the topic of skin lesions and states the issue to be examined. (3) Is not more than one page long. (4) Is free of spelling/typographical errors.
+Scoring:
+10 pts: Meets all requirements with 0 spelling/typo errors.
+5 pts: Meets length/content requirements but has 1-2 spelling/typo errors.
+0 pts: Does not include an introduction, OR the introduction is more than 1 page long, OR it has 3 or more spelling/typographical errors.
+15. Skin Lesion: Common Causes (10 pts):
+Analyze the body of the essay. Check if the paper discusses at least one common cause of skin lesions (e.g., infection, trauma, allergic reactions, systemic disease).
+Scoring:
+10 pts: Discusses at least 1 common cause.
+0 pts: Does not discuss any common causes.
+16. Skin Lesion: Nursing Considerations (10 pts):
+Analyze the body of the essay. Check if the paper discusses at least one specific nursing consideration or intervention for patients with skin lesions (e.g., wound care, patient education, assessment techniques like ABCDE for melanoma, comfort measures).
+Scoring:
+10 pts: Discusses at least 1 nursing intervention/consideration.
+0 pts: Does not discuss any nursing interventions/considerations.
 REQUIRED OUTPUT FORMAT
 You must present your final evaluation in the following structured format. Do not deviate from this format.
-
 Grading Evaluation: NURS 305 Essay - Skin Lesions
 Student Submission Analysis
 Final Score: [Total Points] / 100
-
 Part I: APA Formatting (Score: [Points] / 60)
-1. APA Title Page: [Score]/5. Justification: [Provide specific justification for the score.]
-2. APA General Guidelines: [Score]/5. Justification: [Provide specific justification for the score.]
-3. APA Text - Misc. Errors: [Score]/5. Justification: [Provide specific justification for the score.]
-4. APA In-text Citations - Presence: [Score]/5. Justification: [Provide specific justification for the score.]
-5. APA In-text Citation - Formatting: [Score]/5. Justification: [Provide specific justification for the score.]
-6. APA Reference Page - General Formatting: [Score]/5. Justification: [Provide specific justification for the score.]
-7. APA Reference Page - Line Spacing: [Score]/5. Justification: [Provide specific justification for the score.]
-8. APA References - Scholarly & Timely: [Score]/10. Justification: [Provide specific justification for the score.]
-9. APA References - Author Names: [Score]/5. Justification: [Provide specific justification for the score.]
-10. APA References - Dates: [Score]/5. Justification: [Provide specific justification for the score.]
-11. APA References - Capitalization: [Score]/5. Justification: [Provide specific justification for the score.]
-12. APA References - Italics: [Score]/5. Justification: [Provide specific justification for the score.]
-13. APA References - Hyperlinks: [Score]/5. Justification: [Provide specific justification for the score.]
-
+1. APA Title Page: [Score]/5. Justification: [State precisely why the score was given. E.g., "Met all 9 requirements." or "0 points awarded. The title page was missing the course number and instructor's name."]
+2. APA General Guidelines: [Score]/5. Justification: [E.g., "5 points awarded. The document used 12 pt Times New Roman, 1-inch margins, double-spacing, left alignment, and paragraph indents." or "2 points awarded. The left and right margins were set to 1.25 inches instead of the required 1 inch."]
+3. APA Text - Misc. Errors: [Score]/5. Justification: [E.g., "4 points awarded. One typographical error ('hte' instead of 'the') was noted in paragraph 3."]
+4. APA In-text Citations - Presence: [Score]/5. Justification: [E.g., "3.5 points awarded. Analysis identified 4 statements requiring a citation that were not cited."]
+5. APA In-text Citation - Formatting: [Score]/5. Justification: [E.g., "2 points awarded. Two citations used an ampersand in the narrative format (e.g., 'Smith & Jones (2022) found...') which is incorrect."]
+6. APA Reference Page - General Formatting: [Score]/5. Justification: [E.g., "0 points awarded. The title 'References' was not bolded, and a hanging indent was not used."]
+7. APA Reference Page - Line Spacing: [Score]/5. Justification: [E.g., "0 points awarded. An extra space was added between each reference entry."]
+8. APA References - Scholarly & Timely: [Score]/10. Justification: [E.g., "10 points awarded. The paper cited 4 peer-reviewed journal articles, all published between 2020 and 2024." or "0 points awarded. Only two scholarly sources were used, and one reference was from 2016."]
+9. APA References - Author Names: [Score]/5. Justification: [E.g., "5 points awarded. All author names were formatted correctly."]
+10. APA References - Dates: [Score]/5. Justification: [E.g., "3 points awarded. One reference was missing the period after the year: (2021) instead of (2021)."]
+11. APA References - Capitalization: [Score]/5. Justification: [E.g., "0 points awarded. The titles of two journal articles were written in title case instead of sentence case."]
+12. APA References - Italics: [Score]/5. Justification: [E.g., "5 points awarded. One error noted where a journal volume number was not italicized. This falls within the 0-1 error threshold for full points."]
+13. APA References - Hyperlinks: [Score]/5. Justification: [E.g., "2 points awarded. The phrase 'Retrieved from' was incorrectly used before a URL."]
 Part II: Content (Score: [Points] / 40)
-14. Introduction: [Score]/10. Justification: [Provide specific justification for the score.]
-15. Common Causes: [Score]/10. Justification: [Provide specific justification for the score.]
-16. Nursing Considerations: [Score]/10. Justification: [Provide specific justification for the score.]
-
+14. Introduction: [Score]/10. Justification: [E.g., "10 points awarded. The introduction was a single, concise paragraph that clearly stated the paper's focus. No errors noted."]
+15. Common Causes: [Score]/10. Justification: [E.g., "10 points awarded. The paper successfully discussed infectious agents as a common cause of skin lesions."]
+16. Nursing Considerations: [Score]/10. Justification: [E.g., "0 points awarded. The paper failed to discuss any nursing interventions or specific considerations for patients with skin lesions."]
 Professor's Summary:
-[Provide a 2-3 sentence summary in the persona of Dr. Vance, focusing on overall performance and key areas for improvement.]
-
+[Provide a 2-3 sentence summary in the persona of Dr. Vance. E.g., "While the content discussing the cause of lesions was adequate, the submission demonstrated significant and widespread deficiencies in adhering to APA 7th Edition standards. These formatting and citation skills are non-negotiable in academic and professional nursing. Careful review of the APA manual is required before the next submission."]
 """
 
+# The prompt has been updated to request the new, more verbose JSON structure.
 BASE_PROMPT_TEMPLATE = """
-You are about to assume a role. Carefully review the persona, context, task, and output requirements before proceeding.
+You are Dr. Stone, a meticulous Associate Professor of Nursing. Your task is to analyze the attached student paper file and grade it with absolute precision against the provided rubric. You may also be provided with an example of a perfectly formatted paper for your reference.
 
-1. PERSONA
-You are Dr. Stone, a meticulous and experienced Associate Professor of Nursing at a major university. You have been teaching for over 20 years, with a specialization in medical-surgical nursing. You are known for your high standards, particularly regarding academic integrity and the strict application of the American Psychological Association (APA) 7th Edition formatting guidelines. Your feedback is always direct, precise, and aimed at preparing students for the rigorous documentation standards required in the healthcare profession. Your tone is professional, authoritative, and educational. You do not offer praise for meeting baseline expectations; you simply state that the requirements have been met. Your criticism is specific, referencing the exact rule or rubric criterion that was violated.
+Your entire response must be a single, valid JSON object and nothing else.
 
-2. CONTEXT
-You are grading an essay for your undergraduate course, NURS 310: Fundamentals of Nursing. The assignment is an essay on the topic of "Skin Lesions." You will be provided with the student's paper as an attached file, and optionally an example paper file for reference.
+**GRADING INSTRUCTIONS:**
+1.  Carefully analyze the student's paper file, paying close attention to all formatting details (margins, fonts, spacing, etc.) and content.
+2.  For each of the 16 criteria in the rubric, provide a score and a brief, specific justification for that score.
+3.  Calculate the final score by summing the scores from all 16 criteria.
+4.  Provide a 2-3 sentence professional summary of the paper's performance.
 
-3. PRIMARY TASK
-Your task is to analyze the attached student paper file and grade it with absolute precision according to the provided rubric. You must function as a perfect and unflinchingly accurate grader. There is no room for subjective interpretation or leniency. You will identify every error in content, formatting, spelling, grammar, and citation, and assign points strictly based on the rubric's quantitative thresholds.
-
-Your output should be a single JSON format structure response as indicated by the example below.
-
-**DO NOT** provide any introductory text, conversational pleasantries, or explanations outside of the requested JSON structure. Your entire response must be a single, valid JSON object.
-
-**Use the following rubric to grade the attached student paper:**
+**RUBRIC:**
 {GRADING_RUBRIC}
 
-**Example of the required JSON output format:**
+**REQUIRED JSON OUTPUT FORMAT:**
+Your output must be a JSON object with three top-level keys: `finalScore`, `gradingBreakdown`, and `summary`.
+The `gradingBreakdown` key must contain a list of 16 objects, one for each criterion in the rubric.
+
+**EXAMPLE OF THE REQUIRED JSON OUTPUT FORMAT:**
 {{
-  "finalGrade": 88,
-  "pointDeductions": {{
-    "Content & Analysis": 2,
-    "Organization & Structure": 0,
-    "APA Formatting & Citations": 8,
-    "Clarity & Mechanics": 2
-  }},
-  "feedback": {{
-    "Content & Analysis": "The thesis was slightly unfocused, but the evidence used was strong.",
-    "Organization & Structure": "No points deducted.",
-    "APA Formatting & Citations": "Multiple errors in the reference list formatting and three missing in-text citations.",
-    "Clarity & Mechanics": "Minor grammatical errors and occasional awkward phrasing."
-  }},
-  "summary": "This is a strong paper with excellent critical analysis. The final grade was primarily impacted by significant APA formatting errors, which should be the main focus for improvement."
+  "finalScore": 89,
+  "gradingBreakdown": [
+    {{
+      "criterion": "1. APA Title Page",
+      "score": 5,
+      "maxScore": 5,
+      "justification": "All 9 required components are present and correctly formatted."
+    }},
+    {{
+      "criterion": "2. APA General Guidelines",
+      "score": 2,
+      "maxScore": 5,
+      "justification": "The document uses 1.25-inch margins instead of the required 1-inch, which is one guideline violation."
+    }},
+    {{
+      "criterion": "3. APA Text - Misc. Errors",
+      "score": 4,
+      "maxScore": 5,
+      "justification": "One typographical error ('hte' instead of 'the') was noted in paragraph 3."
+    }}
+  ],
+  "summary": "This is a strong paper with excellent critical analysis. The final grade was primarily impacted by minor but frequent APA formatting errors, which should be the main focus for improvement."
 }}
 """
 
@@ -123,154 +187,96 @@ class GradingResult:
     """Holds the structured result of a single graded essay."""
     file_name: str
     success: bool
-    grade: Optional[int] = None
-    deductions: Dict[str, int] = field(default_factory=dict)
-    feedback: Dict[str, str] = field(default_factory=dict)
-    summary: Optional[str] = None
+    # This now stores the entire JSON response for detailed output
+    raw_response: Optional[dict] = None
     error_message: Optional[str] = None
 
 class GeminiGrader:
     """Manages interaction with the Google Gemini API for grading."""
     def __init__(self, api_key: str):
-        print("[DEBUG] Initializing GeminiGrader...")
         genai.configure(api_key=api_key)
         self.model = genai.GenerativeModel(model_name="gemini-1.5-pro-latest")
-        print("[DEBUG] GeminiGrader initialized successfully.")
 
     def grade_essay(self, student_paper_file: object, example_paper_file: Optional[object]) -> GradingResult:
         """Sends files to Gemini for grading and parses the JSON response."""
-        print(f"[DEBUG] Inside grade_essay for student paper: {student_paper_file.display_name}")
         prompt_text = BASE_PROMPT_TEMPLATE.format(GRADING_RUBRIC=GRADING_RUBRIC)
-        
-        content_list = [prompt_text, student_paper_file]
+        content_list = ["Please grade the attached student paper.", student_paper_file, prompt_text]
         if example_paper_file:
-            print(f"[DEBUG] Example paper '{example_paper_file.display_name}' is being used.")
-            content_list.append(example_paper_file)
+            content_list.insert(2, "Use this second file as a reference example of a perfectly formatted paper.")
+            content_list.insert(3, example_paper_file)
         
         try:
-            print(f"[DEBUG] >>> Calling the Gemini model for grading... THIS IS THE LONG WAIT. <<<")
-            response = self.model.generate_content(content_list, request_options={'timeout': 600}) # 10 minute timeout
-            print(f"[DEBUG] <<< Model response received for {student_paper_file.display_name}. Parsing JSON.")
+            response = self.model.generate_content(content_list, request_options={'timeout': 600})
             cleaned_response = response.text.strip().replace("```json", "").replace("```", "")
             data = json.loads(cleaned_response)
 
-            required_keys = ["finalGrade", "pointDeductions", "feedback", "summary"]
-            if not all(key in data for key in required_keys):
-                raise KeyError("Model response missing required keys.")
-
-            print(f"[DEBUG] Successfully parsed response for {student_paper_file.display_name}.")
+            # Basic validation for the new structure
+            if not all(key in data for key in ["finalScore", "gradingBreakdown", "summary"]):
+                raise KeyError("Model response missing one or more required top-level keys.")
+            
             return GradingResult(
                 file_name=student_paper_file.display_name,
                 success=True,
-                grade=data["finalGrade"],
-                deductions=data["pointDeductions"],
-                feedback=data["feedback"],
-                summary=data["summary"]
+                raw_response=data
             )
         except json.JSONDecodeError as e:
-            print("\n" + "="*20 + " JSON PARSE ERROR " + "="*20)
-            print(f"[DEBUG] The model returned a malformed JSON. Error: {e}")
-            print("[DEBUG] --- FAULTY RESPONSE FROM MODEL ---")
-            print(cleaned_response)
-            print("[DEBUG] --- END OF FAULTY RESPONSE ---")
-            print("="*58 + "\n")
-            return GradingResult(
-                file_name=student_paper_file.display_name,
-                success=False,
-                error_message=f"Model returned malformed JSON. Details: {e}"
-            )
-            
+            error_details = f"Model returned malformed JSON. Error: {e}. Raw Response: {cleaned_response}"
+            return GradingResult(file_name=student_paper_file.display_name, success=False, error_message=error_details)
         except Exception as e:
-            print(f"[DEBUG] !!! An error occurred in grade_essay: {e}")
-            return GradingResult(
-                file_name=student_paper_file.display_name,
-                success=False,
-                error_message=f"An API or model error occurred: {str(e)}"
-            )
+            return GradingResult(file_name=student_paper_file.display_name, success=False, error_message=f"An API or model error occurred: {str(e)}")
 
 def process_single_file(file_path: str, grader: GeminiGrader, example_paper_file_obj: Optional[object]) -> GradingResult:
     """Uploads a single student paper and calls the grader."""
-    file_name = os.path.basename(file_path)
-    print(f"[DEBUG] Starting process_single_file for: {file_name}")
     student_paper_file_obj = None
     try:
-        print(f"[DEBUG]   -> Uploading student paper '{file_name}' to Gemini Files API...")
-        student_paper_file_obj = genai.upload_file(path=file_path, display_name=file_name)
-        print(f"[DEBUG]   -> Upload successful for '{file_name}'. Handing off to grade_essay.")
+        student_paper_file_obj = genai.upload_file(path=file_path, display_name=os.path.basename(file_path))
         return grader.grade_essay(student_paper_file_obj, example_paper_file_obj)
     except Exception as e:
-        print(f"[DEBUG] !!! An error occurred in process_single_file for '{file_name}': {e}")
-        return GradingResult(file_name=file_name, success=False, error_message=str(e))
+        return GradingResult(file_name=os.path.basename(file_path), success=False, error_message=str(e))
     finally:
         if student_paper_file_obj:
-            print(f"[DEBUG]   -> Cleaning up uploaded file: {student_paper_file_obj.name}")
             genai.delete_file(student_paper_file_obj.name)
-            print(f"[DEBUG]   -> Cleanup complete for {file_name}.")
 
 async def grade_papers_concurrently(
     files: List[gr.File], example_paper_file: gr.File, api_key: str, progress=gr.Progress(track_tqdm=True)
 ) -> (str, str):
     """The main asynchronous function that orchestrates the grading process."""
-    print("\n" + "="*50)
-    print("[DEBUG] grade_papers_concurrently initiated.")
     start_time = time.time()
-    if not api_key:
-        raise gr.Error("Google API Key is required.")
-    if not files:
-        raise gr.Error("Please upload at least one paper to grade.")
+    if not api_key: raise gr.Error("Google API Key is required.")
+    if not files: raise gr.Error("Please upload at least one paper to grade.")
 
     example_paper_file_obj = None
     try:
         grader = GeminiGrader(api_key)
-
         if example_paper_file:
-            print("[DEBUG] Example paper provided. Uploading it now...")
             progress(0, desc="Uploading example paper...")
             example_paper_file_obj = genai.upload_file(path=example_paper_file.name, display_name=os.path.basename(example_paper_file.name))
-            print(f"[DEBUG] Example paper uploaded successfully: {example_paper_file_obj.name}")
             
         file_paths = [file.name for file in files]
         total_files = len(file_paths)
-        print(f"[DEBUG] Preparing to grade {total_files} paper(s).")
 
         with ThreadPoolExecutor(max_workers=1) as executor:
-            print("[DEBUG] ThreadPoolExecutor started (max_workers=1).")
             loop = asyncio.get_event_loop()
-            tasks = [
-                loop.run_in_executor(
-                    executor,
-                    process_single_file,
-                    file_path,
-                    grader,
-                    example_paper_file_obj
-                )
-                for file_path in file_paths
-            ]
+            tasks = [loop.run_in_executor(executor, process_single_file, fp, grader, example_paper_file_obj) for fp in file_paths]
+            results = [await f for f in asyncio.as_completed(tasks)]
+            progress(1)
 
-            results = []
-            print("[DEBUG] Waiting for grading tasks to complete...")
-            for i, future in enumerate(asyncio.as_completed(tasks)):
-                result = await future
-                print(f"[DEBUG] Task {i+1}/{total_files} completed for file: {result.file_name}")
-                results.append(result)
-
-        print("[DEBUG] All grading tasks finished. Formatting final output.")
-        # --- Format the final output ---
+        # This section is updated to format the new, verbose JSON structure
+        output_markdown = ""
         successful_grades = [res for res in results if res.success]
         failed_grades = [res for res in results if not res.success]
-        output_markdown = ""
+
         for result in successful_grades:
+            response_data = result.raw_response
             output_markdown += f"### ✅ Grade for: **{result.file_name}**\n"
-            output_markdown += f"**Final Grade:** {result.grade}/100\n\n"
-            deductions_str = ""
-            for category, points in result.deductions.items():
-                if points > 0:
-                    deductions_str += f"- **{category}:** Lost {points} points. *Reason: {result.feedback.get(category, 'N/A')}*\n"
-            if not deductions_str:
-                deductions_str = "Excellent work! No points were deducted.\n"
-            output_markdown += "**Point Deductions Breakdown:**\n" + deductions_str + "\n"
-            output_markdown += f"**Summary:** {result.summary}\n"
+            output_markdown += f"**Final Score:** {response_data.get('finalScore', 'N/A')}/100\n\n"
+            output_markdown += "**Detailed Grading Breakdown:**\n"
+            for item in response_data.get('gradingBreakdown', []):
+                output_markdown += f"- **{item.get('criterion', 'N/A')}**: {item.get('score', 'N/A')} / {item.get('maxScore', 'N/A')}\n"
+                output_markdown += f"  - *Justification: {item.get('justification', 'No justification provided.')}*\n"
+            output_markdown += f"\n**Summary:** {response_data.get('summary', 'No summary provided.')}\n"
             output_markdown += "---\n"
+
         if failed_grades:
             output_markdown += "### ❌ Failed Papers\n"
             for result in failed_grades:
@@ -281,15 +287,11 @@ async def grade_papers_concurrently(
         end_time = time.time()
         runtime = f"Total runtime: {end_time - start_time:.2f} seconds."
         status = f"Grading complete. {len(successful_grades)} papers graded successfully, {len(failed_grades)} failed."
-        print(f"[DEBUG] Process finished. {runtime}")
-        print("="*50 + "\n")
         return output_markdown, f"{status}\n{runtime}"
 
     finally:
         if example_paper_file_obj:
-            print("[DEBUG] Final cleanup: Deleting example paper from API.")
             genai.delete_file(example_paper_file_obj.name)
-            print("[DEBUG] Final cleanup complete.")
 
 # --- Build the Gradio Interface ---
 with gr.Blocks(theme=gr.themes.Soft(), title="Nursing Essay Grader") as demo:
@@ -304,34 +306,16 @@ with gr.Blocks(theme=gr.themes.Soft(), title="Nursing Essay Grader") as demo:
         """
     )
     api_key_input = gr.Textbox(label="Google API Key", placeholder="Enter your Google API Key here", type="password")
-    
     with gr.Row():
-        file_uploads = gr.File(
-            label="Upload Essays to Grade",
-            file_count="multiple",
-            file_types=['.pdf', '.docx'],
-            type="filepath",
-            scale=2
-        )
-        example_paper_upload = gr.File(
-            label="Upload Example Paper (Optional)",
-            file_count="single",
-            file_types=['.pdf', '.docx'],
-            type="filepath",
-            scale=1
-        )
-
+        file_uploads = gr.File(label="Upload Essays to Grade", file_count="multiple", file_types=['.pdf', '.docx'], type="filepath", scale=2)
+        example_paper_upload = gr.File(label="Upload Example Paper (Optional)", file_count="single", file_types=['.pdf', '.docx'], type="filepath", scale=1)
     grade_button = gr.Button("🚀 Grade All Papers", variant="primary")
     gr.Markdown("---")
     gr.Markdown("## 📊 Grading Results")
     results_output = gr.Markdown(label="Formatted Grades")
     status_output = gr.Textbox(label="Runtime Status", lines=2, interactive=False)
 
-    grade_button.click(
-        fn=grade_papers_concurrently,
-        inputs=[file_uploads, example_paper_upload, api_key_input],
-        outputs=[results_output, status_output]
-    )
+    grade_button.click(fn=grade_papers_concurrently, inputs=[file_uploads, example_paper_upload, api_key_input], outputs=[results_output, status_output])
 
 if __name__ == "__main__":
     demo.launch(debug=True)