Spaces:
Sleeping
Sleeping
Update app.py
Browse files
app.py
CHANGED
|
@@ -45,24 +45,33 @@ def _check_rate_limit(key: str) -> bool:
|
|
| 45 |
# Check both root and passages/ subfolder so it works regardless of where files are uploaded
|
| 46 |
PASSAGE_DIR = "passages"
|
| 47 |
|
| 48 |
-
def
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 49 |
candidates = [
|
| 50 |
-
|
| 51 |
-
os.path.join(PASSAGE_DIR,
|
| 52 |
]
|
| 53 |
for path in candidates:
|
| 54 |
if os.path.exists(path):
|
| 55 |
with open(path, "r", encoding="utf-8") as f:
|
| 56 |
return f.read().strip()
|
| 57 |
-
log.info(f"Passage file not found in root or passages/:
|
| 58 |
return None
|
| 59 |
|
| 60 |
-
def passages_for_level(level: int) -> list[str]:
|
| 61 |
"""Count = level + 1, minimum 1."""
|
| 62 |
count = max(1, level + 1)
|
| 63 |
result = []
|
| 64 |
for i in range(1, count + 1):
|
| 65 |
-
p = load_passage(i)
|
| 66 |
if p:
|
| 67 |
result.append(p)
|
| 68 |
return result
|
|
@@ -791,11 +800,9 @@ def grade_passage_mode(student_name: str, student_class: str, student_text: str,
|
|
| 791 |
if not all([student_name.strip(), student_class.strip(), student_text.strip()]):
|
| 792 |
return "⚠️ Please fill in all fields.", level, ""
|
| 793 |
|
| 794 |
-
passages = passages_for_level(level)
|
| 795 |
if not passages:
|
| 796 |
-
return "⚠️ No passages found. Please upload
|
| 797 |
-
|
| 798 |
-
# Extract English-only portions for grading
|
| 799 |
english_only_passages = [extract_english_only(p) for p in passages]
|
| 800 |
combined_english = "\n\n".join(english_only_passages)
|
| 801 |
|
|
@@ -961,7 +968,7 @@ with gr.Blocks(title="Summary & Passage Grader", theme=gr.themes.Soft()) as demo
|
|
| 961 |
if not name.strip() or not klass.strip():
|
| 962 |
return "⚠️ Enter name and class first.", "", "", 2, 0, True
|
| 963 |
level = get_student_level(name, klass, "moderate")
|
| 964 |
-
passages = passages_for_level(level)
|
| 965 |
ptext = format_passages_display(passages)
|
| 966 |
max_s = compute_max_stars_moderate(level)
|
| 967 |
mins = level + 1
|
|
@@ -1010,7 +1017,7 @@ with gr.Blocks(title="Summary & Passage Grader", theme=gr.themes.Soft()) as demo
|
|
| 1010 |
|
| 1011 |
def mod_grade(name, klass, answer, level):
|
| 1012 |
report, new_level, status = grade_passage_mode(name, klass, answer, level, "moderate")
|
| 1013 |
-
passages = passages_for_level(new_level)
|
| 1014 |
ptext = format_passages_display(passages)
|
| 1015 |
max_s = compute_max_stars_moderate(new_level)
|
| 1016 |
mins = new_level + 1
|
|
@@ -1046,7 +1053,7 @@ with gr.Blocks(title="Summary & Passage Grader", theme=gr.themes.Soft()) as demo
|
|
| 1046 |
if not name.strip() or not klass.strip():
|
| 1047 |
return "⚠️ Enter name and class first.", "", 2
|
| 1048 |
level = get_student_level(name, klass, "easy")
|
| 1049 |
-
passages = passages_for_level(level)
|
| 1050 |
ptext = format_passages_display(passages)
|
| 1051 |
level_md = (f"### 🟢 Your Level: **{level}** "
|
| 1052 |
f"Passages: **{len(passages)}** Max stars: **5 ⭐**")
|
|
@@ -1066,7 +1073,7 @@ with gr.Blocks(title="Summary & Passage Grader", theme=gr.themes.Soft()) as demo
|
|
| 1066 |
|
| 1067 |
def easy_grade(name, klass, answer, level):
|
| 1068 |
report, new_level, status = grade_passage_mode(name, klass, answer, level, "easy")
|
| 1069 |
-
passages = passages_for_level(new_level)
|
| 1070 |
ptext = format_passages_display(passages)
|
| 1071 |
level_md = (f"### 🟢 Your Level: **{new_level}** "
|
| 1072 |
f"Passages: **{len(passages)}** Max stars: **5 ⭐**")
|
|
@@ -1083,4 +1090,4 @@ with gr.Blocks(title="Summary & Passage Grader", theme=gr.themes.Soft()) as demo
|
|
| 1083 |
|
| 1084 |
if __name__ == "__main__":
|
| 1085 |
os.makedirs(PASSAGE_DIR, exist_ok=True)
|
| 1086 |
-
demo.launch()
|
|
|
|
| 45 |
# Check both root and passages/ subfolder so it works regardless of where files are uploaded
|
| 46 |
PASSAGE_DIR = "passages"
|
| 47 |
|
| 48 |
+
def is_class5(klass: str) -> bool:
|
| 49 |
+
"""Return True if the student's class string indicates Class 5 (e.g. '5', '5A', '5B', '5a')."""
|
| 50 |
+
return str(klass).strip().startswith("5")
|
| 51 |
+
|
| 52 |
+
def load_passage(n: int, klass: str = "") -> str | None:
|
| 53 |
+
if is_class5(klass):
|
| 54 |
+
# Class 5 uses separate passage files: pssgs1class5.txt, pssgs2class5.txt, ...
|
| 55 |
+
fname = f"pssgs{n}class5.txt"
|
| 56 |
+
else:
|
| 57 |
+
fname = f"pssg{n}.txt"
|
| 58 |
candidates = [
|
| 59 |
+
fname, # root of repo
|
| 60 |
+
os.path.join(PASSAGE_DIR, fname), # passages/ subfolder
|
| 61 |
]
|
| 62 |
for path in candidates:
|
| 63 |
if os.path.exists(path):
|
| 64 |
with open(path, "r", encoding="utf-8") as f:
|
| 65 |
return f.read().strip()
|
| 66 |
+
log.info(f"Passage file not found in root or passages/: {fname}")
|
| 67 |
return None
|
| 68 |
|
| 69 |
+
def passages_for_level(level: int, klass: str = "") -> list[str]:
|
| 70 |
"""Count = level + 1, minimum 1."""
|
| 71 |
count = max(1, level + 1)
|
| 72 |
result = []
|
| 73 |
for i in range(1, count + 1):
|
| 74 |
+
p = load_passage(i, klass)
|
| 75 |
if p:
|
| 76 |
result.append(p)
|
| 77 |
return result
|
|
|
|
| 800 |
if not all([student_name.strip(), student_class.strip(), student_text.strip()]):
|
| 801 |
return "⚠️ Please fill in all fields.", level, ""
|
| 802 |
|
| 803 |
+
passages = passages_for_level(level, student_class)
|
| 804 |
if not passages:
|
| 805 |
+
return "⚠️ No passages found. Please upload passage files to the root of your HF repo (same folder as app.py).", level, ""
|
|
|
|
|
|
|
| 806 |
english_only_passages = [extract_english_only(p) for p in passages]
|
| 807 |
combined_english = "\n\n".join(english_only_passages)
|
| 808 |
|
|
|
|
| 968 |
if not name.strip() or not klass.strip():
|
| 969 |
return "⚠️ Enter name and class first.", "", "", 2, 0, True
|
| 970 |
level = get_student_level(name, klass, "moderate")
|
| 971 |
+
passages = passages_for_level(level, klass)
|
| 972 |
ptext = format_passages_display(passages)
|
| 973 |
max_s = compute_max_stars_moderate(level)
|
| 974 |
mins = level + 1
|
|
|
|
| 1017 |
|
| 1018 |
def mod_grade(name, klass, answer, level):
|
| 1019 |
report, new_level, status = grade_passage_mode(name, klass, answer, level, "moderate")
|
| 1020 |
+
passages = passages_for_level(new_level, klass)
|
| 1021 |
ptext = format_passages_display(passages)
|
| 1022 |
max_s = compute_max_stars_moderate(new_level)
|
| 1023 |
mins = new_level + 1
|
|
|
|
| 1053 |
if not name.strip() or not klass.strip():
|
| 1054 |
return "⚠️ Enter name and class first.", "", 2
|
| 1055 |
level = get_student_level(name, klass, "easy")
|
| 1056 |
+
passages = passages_for_level(level, klass)
|
| 1057 |
ptext = format_passages_display(passages)
|
| 1058 |
level_md = (f"### 🟢 Your Level: **{level}** "
|
| 1059 |
f"Passages: **{len(passages)}** Max stars: **5 ⭐**")
|
|
|
|
| 1073 |
|
| 1074 |
def easy_grade(name, klass, answer, level):
|
| 1075 |
report, new_level, status = grade_passage_mode(name, klass, answer, level, "easy")
|
| 1076 |
+
passages = passages_for_level(new_level, klass)
|
| 1077 |
ptext = format_passages_display(passages)
|
| 1078 |
level_md = (f"### 🟢 Your Level: **{new_level}** "
|
| 1079 |
f"Passages: **{len(passages)}** Max stars: **5 ⭐**")
|
|
|
|
| 1090 |
|
| 1091 |
if __name__ == "__main__":
|
| 1092 |
os.makedirs(PASSAGE_DIR, exist_ok=True)
|
| 1093 |
+
demo.launch()
|