cornellGrading 2.16.1__tar.gz → 2.16.2__tar.gz

{cornellGrading-2.16.1/cornellGrading.egg-info → cornellGrading-2.16.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cornellGrading
-Version: 2.16.1
+Version: 2.16.2
 Summary: Routines for interacting with Cornell installations of Canvas and Qualtrics
 Home-page: https://github.com/dsavransky/grading
 Author: Dmitry Savransky

{cornellGrading-2.16.1 → cornellGrading-2.16.2}/cornellGrading/__init__.py

@@ -1,4 +1,4 @@
 name = "cornellGrading"
-__version__ = "2.16.1"
+__version__ = "2.16.2"
 from .cornellGrading import cornellGrading
 from .cornellQualtrics import cornellQualtrics

{cornellGrading-2.16.1 → cornellGrading-2.16.2}/cornellGrading/cornellGrading.py

@@ -795,7 +795,7 @@ class cornellGrading:
 
         listids = []
         listemails = []
-        for el in tmp.json()["result"]["elements"]:
+        for el in tmp:
             listids.append(el["id"])
             listemails.append(el["email"])
 
@@ -1157,7 +1157,7 @@ class cornellGrading:
         # won't work if we don't have pandoc
         assert shutil.which("pandoc"), (
             "Cannot locate pandoc. Please visit https://pandoc.org/installing.html"
-            "for intallation instructions."
+            "for installation instructions."
         )
 
         # going to assume that the pdf file is located in the working dir with the tex
@@ -1308,7 +1308,8 @@ class cornellGrading:
                 imtag = re.search(
                     # r'<p>(<img class="equation_image"(.*?)(?={})([\s\S]*?)(?=/></p>)/>)</p>'.format(
                     # r'(<img class="equation_image"(.*?)(?={})([\s\S]*?)(?=/>)/>)'.format(
-                    r'(<img class="equation_image" src="https://canvas.cornell.edu/equation_images/([\w%]*?)(?={})([\s\S]*?)(?=/>)/>)'.format(
+                    # r'(<img class="equation_image" src="https://canvas.cornell.edu/equation_images/([\w%]*?)(?={})([\s\S]*?)(?=/>)/>)'.format(
+                    r'(<img class="equation_image" src="https://canvas.cornell.edu/equation_images/([\w%.-]*?)(?={})([\s\S]*?)(?=/>)/>)'.format(
                         enclabel
                     ),
                     out,
@@ -1497,7 +1498,7 @@ class cornellGrading:
         """
 
         # create survey and distribution
-        surveyname = "%s HW%d Self-Grade" % (self.coursename, assignmentNum)
+        surveyname = "%s HW%d Self-Assessment" % (self.coursename, assignmentNum)
         surveyId = self.genPrivateHWSurvey(
             surveyname, nprobs, ecprobs=ecprobs, scoreOptions=scoreOptions
         )
@@ -1511,7 +1512,7 @@ class cornellGrading:
         distnetids = np.array([d["email"].split("@")[0] for d in dist])
 
         # grab the original assignment and all the submissions
-        hwname = "HW%d" % assignmentNum
+        hwname = "Written HW%d" % assignmentNum
         hw = self.getAssignment(hwname)
         subs = hw.get_submissions()
 

{cornellGrading-2.16.1 → cornellGrading-2.16.2}/cornellGrading/cornellQualtrics.py

@@ -290,8 +290,8 @@ class cornellQualtrics:
                 getMailingListId
 
         Returns:
-            requests.models.Response:
-                response object with all mailing list contacts
+            list:
+                list of dicts encoding all mailing list contacts
 
         Notes:
 
@@ -310,7 +310,15 @@ class cornellQualtrics:
             response.status_code == 200
         ), "Could not get contacts for list {}.".format(mailingListId)
 
-        return response
+        out = response.json()["result"]["elements"]
+
+        while response.json()["result"]["nextPage"] is not None:
+            response = requests.get(
+                response.json()["result"]["nextPage"], headers=self.headers_tokenOnly
+            )
+            out += response.json()["result"]["elements"]
+
+        return out
 
     def dumpContacts(self, mailingListId):
         """Repackage all contacts in a mailing list into a pandas DataFrame
@@ -329,7 +337,7 @@ class cornellQualtrics:
 
         """
 
-        contacts = self.getListContacts(mailingListId).json()["result"]["elements"]
+        contacts = self.getListContacts(mailingListId)
 
         fn = []
         ln = []
@@ -461,7 +469,15 @@ class cornellQualtrics:
         )
         response2 = requests.get(baseUrl2, headers=self.headers_tokenOnly)
 
-        return response2.json()["result"]["elements"]
+        out = response2.json()["result"]["elements"]
+
+        while response2.json()["result"]["nextPage"] is not None:
+            response2 = requests.get(
+                response2.json()["result"]["nextPage"], headers=self.headers_tokenOnly
+            )
+            out += response2.json()["result"]["elements"]
+
+        return out
 
     def getDistributionLinks(self, distributionId, surveyId):
         """Retrieve distribution info

{cornellGrading-2.16.1 → cornellGrading-2.16.2/cornellGrading.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cornellGrading
-Version: 2.16.1
+Version: 2.16.2
 Summary: Routines for interacting with Cornell installations of Canvas and Qualtrics
 Home-page: https://github.com/dsavransky/grading
 Author: Dmitry Savransky