make AWS more resilient towards missing ScoreTypes and Languages

Author: prandla

cms/server/admin/handlers/submission.py

@@ -31,7 +31,7 @@
 import difflib
 
 from cms.db import Dataset, File, Submission
-from cms.grading.languagemanager import get_language
+from cms.server.jinja2_toolbox import safe_get_lang_filename
 from cmscommon.datetime import make_datetime
 from .base import BaseHandler, FileHandler, require_permission
 
@@ -80,10 +80,7 @@ def get(self, file_id):
         sub_file = self.safe_get_item(File, file_id)
         submission = sub_file.submission
 
-        real_filename = sub_file.filename
-        if submission.language is not None:
-            real_filename = real_filename.replace(
-                ".%l", get_language(submission.language).source_extension)
+        real_filename = safe_get_lang_filename(submission, sub_file.filename)
         digest = sub_file.digest
 
         self.sql_session.close()
@@ -130,10 +127,9 @@ def get(self, old_id, new_id):
         for fname in files_to_compare:
             if ".%l" in fname:
                 if sub_old.language == sub_new.language and sub_old.language is not None:
-                    ext = get_language(sub_old.language).source_extension
+                    real_fname = safe_get_lang_filename(sub_old, fname)
                 else:
-                    ext = ".txt"
-                real_fname = fname.replace(".%l", ext)
+                    real_fname = fname.replace(".%l", ".txt")
             else:
                 real_fname = fname
 

cms/server/admin/handlers/usertest.py

@@ -21,7 +21,7 @@
 """
 
 from cms.db import Dataset, UserTestFile, UserTest
-from cms.grading.languagemanager import get_language
+from cms.server.jinja2_toolbox import safe_get_lang_filename
 
 from .base import BaseHandler, FileHandler, require_permission
 
@@ -60,10 +60,7 @@ def get(self, file_id):
         user_test_file = self.safe_get_item(UserTestFile, file_id)
         user_test = user_test_file.user_test
 
-        real_filename = user_test_file.filename
-        if user_test.language is not None:
-            real_filename = real_filename.replace(
-                ".%l", get_language(user_test.language).source_extension)
+        real_filename = safe_get_lang_filename(user_test, user_test_file.filename)
         digest = user_test_file.digest
 
         self.sql_session.close()

cms/server/admin/templates/fragments/user_test_row.html

@@ -52,7 +52,7 @@ <h3>Compilation output</h3>{# TODO: trim long outputs and add facility to see ra
   </td>
   <td>
     {% for filename, sub_file in ut.files|dictsort(by="key") %}
-      {% set real_filename = filename if ut.language is none else filename|replace(".%l", (ut.language|to_language).source_extension) %}
+      {% set real_filename = get_lang_filename(ut, filename) %}
     <a href="javascript:void(0);" onclick="utils.show_file('{{ real_filename }}','{{ url("user_test_file", sub_file.id) }}')">{{ real_filename }}</a><br/>
     {% endfor %}
   </td>

cms/server/admin/templates/macro/submission.html

@@ -165,7 +165,7 @@ <h3>Compilation output</h3>{# TODO: trim long outputs and add facility to see ra
   </td>
   <td>
     {% for filename, sub_file in s.files|dictsort(by="key") %}
-      {% set real_filename = filename if s.language is none else filename|replace(".%l", (s.language|to_language).source_extension) %}
+      {% set real_filename = get_lang_filename(s, filename) %}
     <a href="javascript:void(0);" onclick="utils.show_file('{{ real_filename }}','{{ url("submission_file", sub_file.id) }}')">{{ real_filename }}</a><br/>
     {% endfor %}
   </td>

cms/server/admin/templates/submission.html

@@ -48,7 +48,7 @@ <h2 id="title_details" class="toggling_on">Submission details</h2>
         <td>
           {% for filename in s.task.submission_format %}
             {% if filename in s.files %}
-              {% set real_filename = filename if s.language is none else filename|replace(".%l", (s.language|to_language).source_extension) %}
+              {% set real_filename = get_lang_filename(s, filename) %}
           <a href="javascript:void(0);" onclick="utils.show_file('{{ real_filename }}','{{ url("submission_file", s.files[filename].id) }}')">
             {{ real_filename }}
           </a>
@@ -234,10 +234,14 @@ <h2 id="title_evaluation_user" class="toggling_on">Evaluation (as seen by the us
 <div id="evaluation_user">
 
   <div class="score_details" id="evaluation_{{ s.id }}">
-    {% if s.tokened() %}
-      {{ st.get_html_details(sr.score_details, s.task.feedback_level)|safe }}
+    {% if st is defined %}
+      {% if s.tokened() %}
+        {{ st.get_html_details(sr.score_details, s.task.feedback_level)|safe }}
+      {% else %}
+        {{ st.get_html_details(sr.public_score_details, s.task.feedback_level)|safe }}
+      {% endif %}
     {% else %}
-      {{ st.get_html_details(sr.public_score_details, s.task.feedback_level)|safe }}
+      [Cannot get score type - see logs]
     {% endif %}
   </div>
 </div>

cms/server/admin/templates/user_test.html

@@ -41,7 +41,7 @@ <h2 id="title_details" class="toggling_on">User test details</h2>
         <td>
           {% for filename in ut.task.submission_format %}
             {% if filename in ut.files %}
-              {% set real_filename = filename if ut.language is none else filename|replace(".%l", (ut.language|to_language).source_extension) %}
+              {% set real_filename = get_lang_filename(ut, filename) %}
           <a href="javascript:void(0);" onclick="utils.show_file('{{ real_filename }}','{{ url("user_test_file", ut.files[filename].id) }}')">
             {{ real_filename }}
           </a>

cms/server/jinja2_toolbox.py

@@ -35,7 +35,9 @@
     TOKEN_MODE_MIXED, FEEDBACK_LEVEL_FULL, FEEDBACK_LEVEL_RESTRICTED, \
     FEEDBACK_LEVEL_OI_RESTRICTED
 from cms.db import SubmissionResult, UserTestResult
+from cms.db.submission import Submission
 from cms.db.task import Dataset
+from cms.db.usertest import UserTest
 from cms.grading import format_status_text
 from cms.grading.languagemanager import get_language
 from cms.locale import Translation, DEFAULT_TRANSLATION
@@ -204,10 +206,20 @@ def safe_get_score_type(env: Environment, *, dataset: Dataset):
     except Exception as err:
         return env.undefined("ScoreType not found: %s" % err)
 
+def safe_get_lang_filename(submission: Submission | UserTest, filename: str) -> str:
+    if submission.language is None:
+        return filename
+    try:
+        lang = get_language(submission.language)
+        source_ext = lang.source_extension
+    except KeyError:
+        source_ext = ".txt"
+    return filename.replace(".%l", source_ext)
 
 def instrument_cms_toolbox(env: Environment):
     env.globals["get_task_type"] = safe_get_task_type
     env.globals["get_score_type"] = safe_get_score_type
+    env.globals["get_lang_filename"] = safe_get_lang_filename
 
     env.globals["get_mimetype_for_file_name"] = get_type_for_file_name
     env.globals["get_icon_for_mimetype"] = get_icon_for_type