otter-service-stdalone 1.1.18__tar.gz → 1.1.20__tar.gz

{otter_service_stdalone-1.1.18 → otter_service_stdalone-1.1.20}/PKG-INFO

@@ -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.20/src/otter_service_stdalone/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.1.20"

{otter_service_stdalone-1.1.18 → otter_service_stdalone-1.1.20}/src/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-1.1.18 → otter_service_stdalone-1.1.20}/src/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 → otter_service_stdalone-1.1.20}/src/otter_service_stdalone.egg-info/PKG-INFO

@@ -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/src/otter_service_stdalone/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.1.18"