otter-service-stdalone 1.1.18__py3-none-any.whl → 1.1.20__py3-none-any.whl

otter_service_stdalone/__init__.py

@@ -1 +1 @@
-__version__ = "1.1.18"
+__version__ = "1.1.20"

otter_service_stdalone/app.py

@@ -261,7 +261,9 @@ class Upload(BaseHandler):
                 notebooks_name = f"{results_path}/{notebooks_fname}"
                 os.mkdir(f"{__UPLOADS__}/{results_path}")
             autograder_fname = autograder['filename']
-            autograder_extn = os.path.splitext(autograder_fname)[1]
+            arr_autograder_fname = os.path.splitext(autograder_fname)
+            autograder_orig_name = arr_autograder_fname[0]
+            autograder_extn = arr_autograder_fname[1]
             autograder_name = str(uuid.uuid4()) + autograder_extn
             if not os.path.exists(__UPLOADS__):
                 os.mkdir(__UPLOADS__)
@@ -293,7 +295,7 @@ class Upload(BaseHandler):
                 try:
                     session_queues[user_id][results_path] = Queue()
                     session_messages[user_id][results_path] = []
-                    await g.grade(auto_p, notebooks_path, results_path, session_queues[user_id].get(results_path))
+                    await g.grade(auto_p, notebooks_path, autograder_orig_name, results_path, session_queues[user_id].get(results_path))
                 except Exception as e:
                     log.write_logs(results_path, "Grading Problem", str(e), "error", log_error)
         else:

otter_service_stdalone/grade_notebooks.py

@@ -25,13 +25,14 @@ class GradeNotebooks():
                 count += 1
         return count
 
-    async def grade(self, p, notebooks_path, results_id, user_queue):
+    async def grade(self, p, notebooks_path, image_name, results_id, user_queue):
         """Calls otter grade asynchronously and writes the various log files
         and results of grading generating by otter-grader
 
         Args:
             p (str): the path to autograder.zip -- the solutions
-            notebooks_path (str): the path to the folder of notebooks to be graded
+            notebooks_path (str): the path to the folder of notebooks to be graded\
+            image_name (str): the auotgrader.zip file name used as the name for the otter grade docker image
             results_id (str): used for identifying logs
 
         Raises:
@@ -54,7 +55,7 @@ class GradeNotebooks():
             loggers.set_level(logging.INFO)
             p = Process(target=grade,
                         kwargs = {
-                            "name": "grader",
+                            "name": image_name,
                             "autograder": p,
                             "paths": (notebook_folder,),
                             "containers": 10,

{otter_service_stdalone-1.1.18.dist-info → otter_service_stdalone-1.1.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: otter_service_stdalone
-Version: 1.1.18
+Version: 1.1.20
 Summary: Grading Service for Instructors using Otter Grader
 Home-page: https://github.com/sean-morris/otter-service-stdalone
 Author: Sean Morris

{otter_service_stdalone-1.1.18.dist-info → otter_service_stdalone-1.1.20.dist-info}/RECORD

@@ -1,8 +1,8 @@
-otter_service_stdalone/__init__.py,sha256=c0Mn_T8CBPv6nWOJABXp-LL3wBoK1Sh0fuJbInOhON0,23
+otter_service_stdalone/__init__.py,sha256=liqEm3unFngsYTfq7J7l6NC06-CGD6qNiQl_jcWB6WY,23
 otter_service_stdalone/access_sops_keys.py,sha256=nboU5aZ84Elrm5vO0dMgpIF5LLcnecpNAwpxKvj6DvU,2129
-otter_service_stdalone/app.py,sha256=uEuCKRa5_MFe591KcbWghyIn2YHeroi-9zGRyjSFY9I,15590
+otter_service_stdalone/app.py,sha256=dhMEwi3PoFb-fHbha0LedqO8gSe9D9afGjI1wyNaETo,15727
 otter_service_stdalone/fs_logging.py,sha256=IKFZkc5TmpI6G3vTYFAU9jDjQ-GT5aRxk8kdZ0h0kJE,2390
-otter_service_stdalone/grade_notebooks.py,sha256=GvtjY7Fn3mYcJU5oF1KO-TygmI822XDoXe3UVOfSvF0,3693
+otter_service_stdalone/grade_notebooks.py,sha256=x19MK_ResW-xM3mdwEUALsdsCiX4I1OHmODUHodcIow,3817
 otter_service_stdalone/index.html,sha256=eEbFGxbV-plE5bAggGYHTv1q7yqoTN4kJbzL729uMmk,7276
 otter_service_stdalone/upload_handle.py,sha256=PbpQEyUIPKercJ9hegKwvxHBvSc9uylhIfwjvHybjs0,5061
 otter_service_stdalone/user_auth.py,sha256=L9Kfj1BsQttAteHhRn71IUY8WX9nvBy3MXVGq1yjTtE,4253
@@ -15,8 +15,8 @@ otter_service_stdalone/secrets/gh_key.staging.yaml,sha256=cKVqj4dcwuz2LhXwMNQy_1
 otter_service_stdalone/static_files/README_DO_NOT_DISTRIBUTE.txt,sha256=eMqBa1du1u0c07fuG3Eu9DDHuixRTFEbiQwrlvAnL1Y,353
 otter_service_stdalone/static_templates/403.html,sha256=7eO3XQsEkl4nF8PEeFkLwCzGBfdZ3kkkeu_Kgpgbh0k,1440
 otter_service_stdalone/static_templates/500.html,sha256=t6DeEMp8piSWyBToHb_JpTrw3GStAHFrozlmeuXyamg,1421
-otter_service_stdalone-1.1.18.dist-info/METADATA,sha256=L-9G4m68sjW8r_X7im3zGTOoN0LCcBnN72rSy4yUbkI,1468
-otter_service_stdalone-1.1.18.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-otter_service_stdalone-1.1.18.dist-info/entry_points.txt,sha256=cx447chuIEl8ly9jEoF5-2xNhaKsWcIMDdhUMH_00qQ,75
-otter_service_stdalone-1.1.18.dist-info/top_level.txt,sha256=6UP22fD4OhbLt23E01v8Kvjn44vPRbyTIg_GqMYL-Ng,23
-otter_service_stdalone-1.1.18.dist-info/RECORD,,
+otter_service_stdalone-1.1.20.dist-info/METADATA,sha256=6i_mfi5ehETypMDT0TfJpS9fVQ3nUOsHwMs4T-7cMfA,1468
+otter_service_stdalone-1.1.20.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+otter_service_stdalone-1.1.20.dist-info/entry_points.txt,sha256=cx447chuIEl8ly9jEoF5-2xNhaKsWcIMDdhUMH_00qQ,75
+otter_service_stdalone-1.1.20.dist-info/top_level.txt,sha256=6UP22fD4OhbLt23E01v8Kvjn44vPRbyTIg_GqMYL-Ng,23
+otter_service_stdalone-1.1.20.dist-info/RECORD,,

{otter_service_stdalone-1.1.18.dist-info → otter_service_stdalone-1.1.20.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
+Generator: setuptools (75.5.0)
 Root-Is-Purelib: true
 Tag: py3-none-any