cornellGrading 2.16.1__tar.gz → 2.17.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cornellGrading
-Version: 2.16.1
+Version: 2.17.0
 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.17.0}/cornellGrading/__init__.py

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

{cornellGrading-2.16.1 → cornellgrading-2.17.0}/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.17.0}/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
@@ -643,6 +659,34 @@ class cornellQualtrics:
 
         return response.json()["result"]["elements"]
 
+    def getDistribution(self, surveyId, distributionId):
+        """Get a distribution
+
+        Args:
+            surveyId (str):
+                Unique id string of survey.  Get either from web interface or via
+                getSurveyId
+            distributionId (str):
+                Unique id string of distribution.
+
+        Returns:
+            dict:
+                Dictionary encoding distribution definition and stats
+
+        Notes:
+            https://api.qualtrics.com/f5b1d8775d803-get-distribution
+
+        """
+
+        baseUrl = "https://{0}{1}distributions/{2}?surveyId={3}".format(
+            self.dataCenter, self.qualtricsapi, distributionId, surveyId
+        )
+
+        response = requests.get(baseUrl, headers=self.headers_tokenOnly)
+        assert response.status_code == 200
+
+        return response.json()["result"]
+
     def exportSurvey(self, surveyId, fileFormat="csv", useLabels="true", saveDir=None):
         """Download and extract survey results
 
@@ -800,31 +844,31 @@ class cornellQualtrics:
             "userId": sharewith,
             "permissions": {
                 "surveyDefinitionManipulation": {
-                    "copySurveyQuestions": True,
-                    "editSurveyFlow": True,
-                    "useBlocks": True,
-                    "useSkipLogic": True,
-                    "useConjoint": True,
-                    "useTriggers": True,
-                    "useQuotas": True,
-                    "setSurveyOptions": True,
-                    "editQuestions": True,
-                    "deleteSurveyQuestions": True,
-                    "useTableOfContents": True,
-                    "useAdvancedQuotas": True,
+                    "copySurveyQuestions": False,
+                    "editSurveyFlow": False,
+                    "useBlocks": False,
+                    "useSkipLogic": False,
+                    "useConjoint": False,
+                    "useTriggers": False,
+                    "useQuotas": False,
+                    "setSurveyOptions": False,
+                    "editQuestions": False,
+                    "deleteSurveyQuestions": False,
+                    "useTableOfContents": False,
+                    "useAdvancedQuotas": False,
                 },
                 "surveyManagement": {
-                    "editSurveys": True,
-                    "activateSurveys": True,
-                    "deactivateSurveys": True,
-                    "copySurveys": True,
-                    "distributeSurveys": True,
-                    "deleteSurveys": True,
-                    "translateSurveys": True,
+                    "editSurveys": False,
+                    "activateSurveys": False,
+                    "deactivateSurveys": False,
+                    "copySurveys": False,
+                    "distributeSurveys": False,
+                    "deleteSurveys": False,
+                    "translateSurveys": False,
                 },
                 "response": {
-                    "editSurveyResponses": True,
-                    "createResponseSets": True,
+                    "editSurveyResponses": False,
+                    "createResponseSets": False,
                     "viewResponseId": True,
                     "useCrossTabs": True,
                     "useScreenouts": True,
@@ -975,7 +1019,7 @@ class cornellQualtrics:
         return response.json()["result"]
 
     def updateSurveyOptions(self, surveyId, data):
-        """Return survey options
+        """Update survey options
 
         Args:
             surveyId (str):
@@ -1183,8 +1227,8 @@ class cornellQualtrics:
                 Message ID string
 
         Returns:
-            list:
-                message dictionaries
+            dict:
+                message contents
 
         """
         baseUrl = "https://{0}{2}libraries/{1}/messages/{3}".format(
@@ -1194,7 +1238,7 @@ class cornellQualtrics:
         response = requests.get(baseUrl, headers=self.headers_tokenOnly)
         assert response.status_code == 200, "Couldn't get messages"
 
-        return response.json()["result"]["elements"]
+        return response.json()["result"]
 
     def createLibraryMessage(self, libraryId, subject, msg, category="thankYou"):
         """Create message in a library

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

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