gam7 7.20.2__py3-none-any.whl → 7.20.4__py3-none-any.whl

gam/__init__.py

@@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki
 """
 
 __author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
-__version__ = '7.20.02'
+__version__ = '7.20.04'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -120,6 +120,10 @@ from google.auth.jwt import Credentials as JWTCredentials
 import google.oauth2.service_account
 import google_auth_oauthlib.flow
 import google_auth_httplib2
+import googleapiclient
+import googleapiclient.discovery
+import googleapiclient.errors
+import googleapiclient.http
 import httplib2
 
 httplib2.RETRIES = 5
@@ -139,6 +143,7 @@ from gamlib import glgapi as GAPI
 from gamlib import glgdata as GDATA
 from gamlib import glglobals as GM
 from gamlib import glindent
+from gamlib import gliso8601 as iso8601
 from gamlib import glmsgs as Msg
 from gamlib import glskus as SKU
 from gamlib import gluprop as UProp
@@ -149,12 +154,6 @@ import gdata.apps.audit
 import gdata.apps.audit.service
 import gdata.apps.contacts
 import gdata.apps.contacts.service
-# Import local library, does not include discovery documents
-import googleapiclient
-import googleapiclient.discovery
-import googleapiclient.errors
-import googleapiclient.http
-from iso8601 import iso8601
 
 IS08601_TIME_FORMAT = '%Y-%m-%dT%H:%M:%S%:z'
 RFC2822_TIME_FORMAT = '%a, %d %b %Y %H:%M:%S %z'
@@ -2013,11 +2012,11 @@ def getTimeOrDeltaFromNow(returnDateTime=False):
         except OverflowError:
           pass
       try:
-        fullDateTime, tz = iso8601.parse_date(argstr)
+        fullDateTime = iso8601.parse_date(argstr)
         Cmd.Advance()
         if not returnDateTime:
           return argstr.replace(' ', 'T')
-        return (fullDateTime, tz, argstr.replace(' ', 'T'))
+        return (fullDateTime, fullDateTime.tzinfo, argstr.replace(' ', 'T'))
       except (iso8601.ParseError, OverflowError):
         pass
       invalidArgumentExit(YYYYMMDDTHHMMSS_FORMAT_REQUIRED)
@@ -2335,7 +2334,7 @@ def formatLocalTime(dateTimeStr):
   if dateTimeStr in {NEVER_TIME, NEVER_TIME_NOMS}:
     return GC.Values[GC.NEVER_TIME]
   try:
-    timestamp, _ = iso8601.parse_date(dateTimeStr)
+    timestamp = iso8601.parse_date(dateTimeStr)
     if not GC.Values[GC.OUTPUT_TIMEFORMAT]:
       if GM.Globals[GM.CONVERT_TO_LOCAL_TIME]:
         return ISOformatTimeStamp(timestamp.astimezone(GC.Values[GC.TIMEZONE]))
@@ -3736,10 +3735,7 @@ def SetGlobalVariables():
     if value and not os.path.isabs(value):
       value = os.path.expanduser(os.path.join(_getCfgDirectory(sectionName, GC.CONFIG_DIR), value))
     elif not value and itemName == GC.CACERTS_PEM:
-      if hasattr(sys, '_MEIPASS'):
-        value = os.path.join(sys._MEIPASS, GC.FN_CACERTS_PEM) #pylint: disable=no-member
-      else:
-        value = os.path.join(GM.Globals[GM.GAM_PATH], GC.FN_CACERTS_PEM)
+      value = os.path.join(GM.Globals[GM.GAM_PATH], GC.FN_CACERTS_PEM)
     return value
 
   def _readGamCfgFile(config, fileName):
@@ -7436,7 +7432,7 @@ def RowFilterMatch(row, titlesList, rowFilter, rowFilterModeAll, rowDropFilter,
         return None
     else:
       try:
-        rowTime, _ = iso8601.parse_date(rowDate)
+        rowTime = iso8601.parse_date(rowDate)
       except (iso8601.ParseError, OverflowError):
         return None
     return ISOformatTimeStamp(datetime.datetime(rowTime.year, rowTime.month, rowTime.day, tzinfo=iso8601.UTC))
@@ -7501,7 +7497,7 @@ def RowFilterMatch(row, titlesList, rowFilter, rowFilterModeAll, rowDropFilter,
     if YYYYMMDD_PATTERN.match(rowDate):
       return None
     try:
-      rowTime, _ = iso8601.parse_date(rowDate)
+      rowTime = iso8601.parse_date(rowDate)
     except (iso8601.ParseError, OverflowError):
       return None
     return f'{rowTime.hour:02d}:{rowTime.minute:02d}'
@@ -12413,7 +12409,7 @@ def checkServiceAccount(users):
                      throwReasons=[GAPI.BAD_REQUEST, GAPI.INVALID, GAPI.NOT_FOUND,
                                    GAPI.PERMISSION_DENIED, GAPI.SERVICE_NOT_AVAILABLE],
                      name=name, fields='validAfterTime')
-      key_created, _ = iso8601.parse_date(key['validAfterTime'])
+      key_created = iso8601.parse_date(key['validAfterTime'])
       key_age = todaysTime()-key_created
       printPassFail(Msg.SERVICE_ACCOUNT_PRIVATE_KEY_AGE.format(key_age.days), testWarn if key_age.days > 30 else testPass)
     except GAPI.permissionDenied:
@@ -14368,7 +14364,7 @@ def doReport():
             eventTime = activity.get('id', {}).get('time', UNKNOWN)
             if eventTime != UNKNOWN:
               try:
-                eventTime, _ = iso8601.parse_date(eventTime)
+                eventTime = iso8601.parse_date(eventTime)
               except (iso8601.ParseError, OverflowError):
                 eventTime = UNKNOWN
             if eventTime != UNKNOWN:
@@ -23867,7 +23863,7 @@ def _filterDeviceFiles(cros, selected, listLimit, startTime, endTime):
   filteredItems = []
   i = 0
   for item in cros.get('deviceFiles', []):
-    timeValue, _ = iso8601.parse_date(item['createTime'])
+    timeValue = iso8601.parse_date(item['createTime'])
     if ((startTime is None) or (timeValue >= startTime)) and ((endTime is None) or (timeValue <= endTime)):
       item['createTime'] = formatLocalTime(item['createTime'])
       filteredItems.append(item)
@@ -23884,7 +23880,7 @@ def _filterCPUStatusReports(cros, selected, listLimit, startTime, endTime):
   filteredItems = []
   i = 0
   for item in cros.get('cpuStatusReports', []):
-    timeValue, _ = iso8601.parse_date(item['reportTime'])
+    timeValue = iso8601.parse_date(item['reportTime'])
     if ((startTime is None) or (timeValue >= startTime)) and ((endTime is None) or (timeValue <= endTime)):
       item['reportTime'] = formatLocalTime(item['reportTime'])
       for tempInfo in item.get('cpuTemperatureInfo', []):
@@ -23905,7 +23901,7 @@ def _filterSystemRamFreeReports(cros, selected, listLimit, startTime, endTime):
   filteredItems = []
   i = 0
   for item in cros.get('systemRamFreeReports', []):
-    timeValue, _ = iso8601.parse_date(item['reportTime'])
+    timeValue = iso8601.parse_date(item['reportTime'])
     if ((startTime is None) or (timeValue >= startTime)) and ((endTime is None) or (timeValue <= endTime)):
       item['reportTime'] = formatLocalTime(item['reportTime'])
       item['systemRamFreeInfo'] = ','.join([str(x) for x in item['systemRamFreeInfo']])
@@ -23938,7 +23934,7 @@ def _filterScreenshotFiles(cros, selected, listLimit, startTime, endTime):
   filteredItems = []
   i = 0
   for item in cros.get('screenshotFiles', []):
-    timeValue, _ = iso8601.parse_date(item['createTime'])
+    timeValue = iso8601.parse_date(item['createTime'])
     if ((startTime is None) or (timeValue >= startTime)) and ((endTime is None) or (timeValue <= endTime)):
       item['createTime'] = formatLocalTime(item['createTime'])
       filteredItems.append(item)
@@ -24386,7 +24382,7 @@ def getDeviceFilesEntity():
     else:
       for timeItem in myarg.split(','):
         try:
-          timestamp, _ = iso8601.parse_date(timeItem)
+          timestamp = iso8601.parse_date(timeItem)
           deviceFilesEntity['list'].append(ISOformatTimeStamp(timestamp.astimezone(GC.Values[GC.TIMEZONE])))
         except (iso8601.ParseError, OverflowError):
           Cmd.Backup()
@@ -24415,14 +24411,14 @@ def _selectDeviceFiles(deviceId, deviceFiles, deviceFilesEntity):
     count = 0
     if deviceFilesEntity['time'][0] == 'before':
       for deviceFile in deviceFiles:
-        createTime, _ = iso8601.parse_date(deviceFile['createTime'])
+        createTime = iso8601.parse_date(deviceFile['createTime'])
         if createTime >= dateTime:
           break
         count += 1
       return deviceFiles[:count]
 #   if deviceFilesEntity['time'][0] == 'after':
     for deviceFile in deviceFiles:
-      createTime, _ = iso8601.parse_date(deviceFile['createTime'])
+      createTime = iso8601.parse_date(deviceFile['createTime'])
       if createTime >= dateTime:
         break
       count += 1
@@ -24431,14 +24427,14 @@ def _selectDeviceFiles(deviceId, deviceFiles, deviceFilesEntity):
     dateTime = deviceFilesEntity['range'][1]
     spos = 0
     for deviceFile in deviceFiles:
-      createTime, _ = iso8601.parse_date(deviceFile['createTime'])
+      createTime = iso8601.parse_date(deviceFile['createTime'])
       if createTime >= dateTime:
         break
       spos += 1
     dateTime = deviceFilesEntity['range'][2]
     epos = spos
     for deviceFile in deviceFiles[spos:]:
-      createTime, _ = iso8601.parse_date(deviceFile['createTime'])
+      createTime = iso8601.parse_date(deviceFile['createTime'])
       if createTime >= dateTime:
         break
       epos += 1
@@ -25221,7 +25217,7 @@ def doInfoPrintShowCrOSTelemetry():
           i = 0
           for item in listItems:
             if 'reportTime' in item:
-              timeValue, _ = iso8601.parse_date(item['reportTime'])
+              timeValue = iso8601.parse_date(item['reportTime'])
             else:
               timeValue = None
             if (timeValue is None) or (((startTime is None) or (timeValue >= startTime)) and ((endTime is None) or (timeValue <= endTime))):
@@ -40068,7 +40064,7 @@ def _getEventDaysOfWeek(event):
           pass
       elif 'dateTime' in event[attr]:
         try:
-          dateTime, _ = iso8601.parse_date(event[attr]['dateTime'])
+          dateTime = iso8601.parse_date(event[attr]['dateTime'])
           event[attr]['dayOfWeek'] = calendarlib.day_abbr[dateTime.weekday()]
         except (iso8601.ParseError, OverflowError):
           pass
@@ -48699,7 +48695,7 @@ def _courseItemPassesFilter(item, courseItemFilter):
     return False
   startTime = courseItemFilter['startTime']
   endTime = courseItemFilter['endTime']
-  timeValue, _ = iso8601.parse_date(timeStr)
+  timeValue = iso8601.parse_date(timeStr)
   return ((startTime is None) or (timeValue >= startTime)) and ((endTime is None) or (timeValue <= endTime))
 
 def _gettingCoursesQuery(courseSelectionParameters):
@@ -51247,7 +51243,7 @@ def doCreateCourseStudentGroups():
   while Cmd.ArgumentsRemaining():
     myarg = getArgument()
     if myarg == 'title':
-      titles.append(getString(Cmd.OB_STRING))
+      titles.append(getString(Cmd.OB_STRING, maxLen=100))
     elif myarg == 'select':
       titles.extend(getEntityList(Cmd.OB_STRING_ENTITY, shlexSplit=True))
     elif _getCourseSelectionParameters(myarg, courseSelectionParameters):
@@ -51450,8 +51446,26 @@ def doClearCourseStudentGroups():
 #	(course|class <CourseEntity>)*|([teacher <UserItem>] [student <UserItem>] [states <CourseStateList>])
 #	[showitemcountonly] [formatjson [quotechar <Character>]]
 def doPrintCourseStudentGroups(showMembers=False):
+  def _getCourseStudents():
+    studentIdEmailMap = {}
+    try:
+      students = callGAPIpages(ocroom.courses().students(), 'list', 'students',
+                               throwReasons=[GAPI.NOT_FOUND, GAPI.SERVICE_NOT_AVAILABLE,
+                                             GAPI.FORBIDDEN, GAPI.PERMISSION_DENIED],
+                               retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS,
+                               courseId=courseId, fields='nextPageToken,students(profile(id,emailAddress))',
+                               pageSize=GC.Values[GC.CLASSROOM_MAX_RESULTS])
+      for student in students:
+        studentIdEmailMap[student['profile']['id']] = student['profile']['emailAddress']
+    except GAPI.notFound:
+      pass
+    except (GAPI.serviceNotAvailable, GAPI.notImplemented) as e:
+      entityActionFailedExit([Ent.COURSE, courseId], str(e))
+    except (GAPI.forbidden, GAPI.permissionDenied) as e:
+      ClientAPIAccessDeniedExit(str(e))
+    return studentIdEmailMap
+
   croom = buildGAPIObject(API.CLASSROOM)
-  cd = buildGAPIObject(API.DIRECTORY)
   csvPF = CSVPrintFile(['courseId', 'courseName', 'studentGroupId', 'studentGroupTitle'])
   FJQC = FormatJSONQuoteChar(csvPF)
   courseSelectionParameters = _initCourseSelectionParameters()
@@ -51503,6 +51517,8 @@ def doPrintCourseStudentGroups(showMembers=False):
     if not showMembers and showItemCountOnly:
       itemCount += len(studentGroups)
       continue
+    if showMembers:
+      studentIdEmailMap = _getCourseStudents()
     for studentGroup in studentGroups:
       studentGroupId = studentGroup['id']
       if not showMembers:
@@ -51515,7 +51531,7 @@ def doPrintCourseStudentGroups(showMembers=False):
             row['JSON'] = json.dumps(cleanJSON(studentGroup), ensure_ascii=False, sort_keys=False)
             csvPF.WriteRowTitles(row)
         continue
-      printGettingEntityItemForWhom(Ent.USER, formatKeyValueList('', [Ent.Singular(Ent.COURSE_STUDENTGROUP), studentGroupId],
+      printGettingEntityItemForWhom(Ent.STUDENT, formatKeyValueList('', [Ent.Singular(Ent.COURSE_STUDENTGROUP), studentGroupId],
                                                                  currentCount(i, count)))
       pageMessage = getPageMessage()
       try:
@@ -51530,7 +51546,7 @@ def doPrintCourseStudentGroups(showMembers=False):
           itemCount += len(students)
           continue
         for member in students:
-          member['userEmail'] = convertUIDtoEmailAddress(f"id:{member['userId']}", cd=cd, emailTypes=['user'])
+          member['userEmail'] = studentIdEmailMap.get(member['userId'], member['userId'])
       except GAPI.notFound as e:
         entityActionFailedWarning([Ent.COURSE, courseId, Ent.COURSE_STUDENTGROUP, studentGroupId], str(e))
         continue
@@ -51562,8 +51578,29 @@ def doPrintCourseStudentGroups(showMembers=False):
 # gam sync course-studentgroup-members <CourseID> <StudentGroupID> <UserTypeEntity>
 # gam clear course-studentgroup-members <CourseID> <StudentGroupID>
 def doProcessCourseStudentGroupMembers():
-  def _getCurrentStudents():
-    printGettingEntityItemForWhom(Ent.USER, Ent.Singular(Ent.COURSE_STUDENTGROUP), studentGroupId)
+  def _getCourseStudents():
+    studentIdEmailMap = {}
+    studentEmailIdMap = {}
+    try:
+      students = callGAPIpages(ocroom.courses().students(), 'list', 'students',
+                               throwReasons=[GAPI.NOT_FOUND, GAPI.SERVICE_NOT_AVAILABLE,
+                                             GAPI.FORBIDDEN, GAPI.PERMISSION_DENIED],
+                               retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS,
+                               courseId=courseId, fields='nextPageToken,students(profile(id,emailAddress))',
+                               pageSize=GC.Values[GC.CLASSROOM_MAX_RESULTS])
+      for student in students:
+        studentIdEmailMap[student['profile']['id']] = student['profile']['emailAddress'].lower()
+        studentEmailIdMap[student['profile']['emailAddress'].lower()] = student['profile']['id']
+      return (studentIdEmailMap, studentEmailIdMap)
+    except GAPI.notFound as e:
+      entityActionFailedExit([Ent.COURSE, courseId], str(e))
+    except (GAPI.serviceNotAvailable, GAPI.notImplemented) as e:
+      entityActionFailedExit([Ent.COURSE, courseId], str(e))
+    except (GAPI.forbidden, GAPI.permissionDenied) as e:
+      ClientAPIAccessDeniedExit(str(e))
+
+  def _getGroupCurrentStudents():
+    printGettingEntityItemForWhom(Ent.STUDENT, formatKeyValueList('', [Ent.Singular(Ent.COURSE_STUDENTGROUP), studentGroupId], ''))
     pageMessage = getPageMessage()
     try:
       return callGAPIpages(ocroom.courses().studentGroups().studentGroupMembers(), 'list', 'studentGroupMembers',
@@ -51581,18 +51618,24 @@ def doProcessCourseStudentGroupMembers():
     except (GAPI.forbidden, GAPI.permissionDenied) as e:
       ClientAPIAccessDeniedExit(str(e))
 
-  def _getStudentUserId(kvList, student, i, count):
-    normalizedEmailAddressOrUID = normalizeEmailAddressOrUID(student)
-    if normalizedEmailAddressOrUID.find('@') == -1:
-      return normalizedEmailAddressOrUID
-    try:
-      return callGAPI(cd.users(), 'get',
-                      throwReasons=GAPI.USER_GET_THROW_REASONS,
-                      userKey=normalizedEmailAddressOrUID, fields='id')['id']
-    except (GAPI.userNotFound, GAPI.domainNotFound, GAPI.domainCannotUseApis, GAPI.forbidden,
-            GAPI.badRequest, GAPI.backendError, GAPI.systemError) as e:
-      entityActionFailedWarning(kvList, str(e), i, count)
-    return None
+  def _validateClStudents(clStudents):
+    status = True
+    clStudentIds = []
+    count = len(clStudents)
+    i = 0
+    kvList = [Ent.COURSE, courseId, Ent.STUDENT, '']
+    for student in clStudents:
+      i += 1
+      student = normalizeEmailAddressOrUID(student)
+      if student in studentIdEmailMap:
+        clStudentIds.append(student)
+      elif student in studentEmailIdMap:
+        clStudentIds.append(studentEmailIdMap[student])
+      else:
+        kvList[-1] = student
+        entityActionFailedWarning(kvList, Msg.STUDENT_NOT_IN_COURSE, i, count)
+        status = False
+    return clStudentIds if status else None
 
   def _processStudent(function, kvList, kwargs, i, count):
     try:
@@ -51611,85 +51654,69 @@ def doProcessCourseStudentGroupMembers():
     except (GAPI.forbidden, GAPI.permissionDenied) as e:
       ClientAPIAccessDeniedExit(str(e))
 
-  def _addStudents(students, getUserIds):
+  def _addStudents(students):
     count = len(students)
     i = 0
-    entityPerformActionNumItems([Ent.COURSE, courseId, Ent.COURSE_STUDENTGROUP, studentGroupId], count, Ent.USER)
-    kvList = [Ent.COURSE, courseId, Ent.COURSE_STUDENTGROUP, studentGroupId, Ent.USER, '']
+    entityPerformActionNumItems([Ent.COURSE, courseId, Ent.COURSE_STUDENTGROUP, studentGroupId], count, Ent.STUDENT)
+    kvList = [Ent.COURSE, courseId, Ent.COURSE_STUDENTGROUP, studentGroupId, Ent.STUDENT, '']
     kwargs = {'courseId': courseId, 'studentGroupId': studentGroupId, 'body': {'userId': ''}}
+    Ind.Increment()
     for student in students:
       i += 1
-      if getUserIds:
-        userId = _getStudentUserId(kvList, student, i, count)
-        if userId is None:
-          continue
-        kvList[-1] = student
-      else:
-        userId = student
-        kvList[-1] = convertUIDtoEmailAddress(f"id:{userId}", cd=cd, emailTypes=['user'])
-      kwargs['body']['userId'] = userId
+      kvList[-1] = studentIdEmailMap[student]
+      kwargs['body']['userId'] = student
       _processStudent('create', kvList, kwargs, i, count)
+    Ind.Decrement()
 
-  def _removeStudents(students, getUserIds):
+  def _removeStudents(students):
     count = len(students)
     i = 0
-    entityPerformActionNumItems([Ent.COURSE, courseId, Ent.COURSE_STUDENTGROUP, studentGroupId], count, Ent.USER)
-    kvList = [Ent.COURSE, courseId, Ent.COURSE_STUDENTGROUP, studentGroupId, Ent.USER, '']
+    entityPerformActionNumItems([Ent.COURSE, courseId, Ent.COURSE_STUDENTGROUP, studentGroupId], count, Ent.STUDENT)
+    kvList = [Ent.COURSE, courseId, Ent.COURSE_STUDENTGROUP, studentGroupId, Ent.STUDENT, '']
     kwargs = {'courseId': courseId, 'studentGroupId': studentGroupId, 'userId': ''}
+    Ind.Increment()
     for student in students:
       i += 1
-      if getUserIds:
-        userId = _getStudentUserId(kvList, student, i, count)
-        if userId is None:
-          continue
-        kvList[-1] = student
-      else:
-        userId = student
-        kvList[-1] = convertUIDtoEmailAddress(f"id:{userId}", cd=cd, emailTypes=['user'])
-      kwargs['userId'] = userId
+      kvList[-1] = studentIdEmailMap[student]
+      kwargs['userId'] = student
       _processStudent('delete', kvList, kwargs, i, count)
+    Ind.Decrement()
 
   croom = buildGAPIObject(API.CLASSROOM)
-  cd = buildGAPIObject(API.DIRECTORY)
   action = Act.Get()
   courseId = getString(Cmd.OB_COURSE_ID)
   studentGroupId = getString(Cmd.OB_STUDENTGROUP_ID)
   if action != Act.CLEAR:
     _, clStudents = getEntityToModify(defaultEntityType=Cmd.ENTITY_USERS, groupMemberType=Ent.TYPE_USER)
-    clStudents = [normalizeEmailAddressOrUID(student) for student in clStudents]
+    clStudentIds = []
     checkForExtraneousArguments()
   _, count, coursesInfo = _getCoursesOwnerInfo(croom, [courseId], GC.Values[GC.USE_COURSE_OWNER_ACCESS])
   if count == 0:
     return
   ocroom = coursesInfo[courseId]['croom']
   courseId = coursesInfo[courseId]['id']
+  studentIdEmailMap, studentEmailIdMap = _getCourseStudents()
   if action in {Act.SYNC, Act.CLEAR}:
-    currentStudents = [student['userId'] for student in _getCurrentStudents()]
+    currentStudents = [student['userId'] for student in _getGroupCurrentStudents()]
+  if action != Act.CLEAR:
+    clStudentIds = _validateClStudents(clStudents)
+    if clStudentIds is None:
+      return
   if action == Act.CLEAR:
-    _removeStudents(currentStudents, False)
+    _removeStudents(currentStudents)
   elif action == Act.DELETE:
-    _removeStudents(clStudents, True)
+    _removeStudents(clStudentIds)
   elif action in {Act.ADD, Act.CREATE}:
-    _addStudents(clStudents, True)
+    _addStudents(clStudentIds)
   else: # elif action == Act.SYNC:
     currentMembersSet = set(currentStudents)
-    syncMembersSet = set()
-    count = len(clStudents)
-    i = 0
-    kvList = [Ent.COURSE, courseId, Ent.COURSE_STUDENTGROUP, studentGroupId, Ent.USER, '']
-    for student in clStudents:
-      i += 1
-      kvList[-1] = student
-      userId = _getStudentUserId(kvList, student, i, count)
-      if userId is None:
-        continue
-      syncMembersSet.add(userId)
+    syncMembersSet = set(clStudentIds)
     removeStudentsSet = currentMembersSet-syncMembersSet
     addStudentsSet = syncMembersSet-currentMembersSet
     Act.Set(Act.DELETE)
-    _removeStudents(removeStudentsSet, False)
+    _removeStudents(removeStudentsSet)
     Act.Set(Act.ADD)
-    _addStudents(addStudentsSet, False)
+    _addStudents(addStudentsSet)
 
 # gam print course-studentgroup-members [todrive <ToDriveAttribute>*]
 #	(course|class <CourseEntity>)*|([teacher <UserItem>] [student <UserItem>] [states <CourseStateList>])
@@ -56227,7 +56254,7 @@ def _selectRevisionIds(drive, fileId, origUser, user, i, count, j, jcount, revis
     count = 0
     if revisionsEntity['time'][0] == 'before':
       for revision in results:
-        modifiedDateTime, _ = iso8601.parse_date(revision['modifiedTime'])
+        modifiedDateTime = iso8601.parse_date(revision['modifiedTime'])
         if modifiedDateTime >= dateTime:
           break
         revisionIds.append(revision['id'])
@@ -56237,7 +56264,7 @@ def _selectRevisionIds(drive, fileId, origUser, user, i, count, j, jcount, revis
       return revisionIds
 # time: after
     for revision in results:
-      modifiedDateTime, _ = iso8601.parse_date(revision['modifiedTime'])
+      modifiedDateTime = iso8601.parse_date(revision['modifiedTime'])
       if modifiedDateTime >= dateTime:
         revisionIds.append(revision['id'])
         count += 1
@@ -56249,7 +56276,7 @@ def _selectRevisionIds(drive, fileId, origUser, user, i, count, j, jcount, revis
   endDateTime = revisionsEntity['range'][2]
   count = 0
   for revision in results:
-    modifiedDateTime, _ = iso8601.parse_date(revision['modifiedTime'])
+    modifiedDateTime = iso8601.parse_date(revision['modifiedTime'])
     if modifiedDateTime >= startDateTime:
       if modifiedDateTime >= endDateTime:
         break
@@ -56459,7 +56486,7 @@ def _selectRevisionResults(results, fileId, origUser, revisionsEntity, previewDe
     count = 0
     if revisionsEntity['time'][0] == 'before':
       for revision in results:
-        modifiedDateTime, _ = iso8601.parse_date(revision['modifiedTime'])
+        modifiedDateTime = iso8601.parse_date(revision['modifiedTime'])
         if modifiedDateTime >= dateTime:
           break
         count += 1
@@ -56470,7 +56497,7 @@ def _selectRevisionResults(results, fileId, origUser, revisionsEntity, previewDe
       return results[:count]
 # time: after
     for revision in results:
-      modifiedDateTime, _ = iso8601.parse_date(revision['modifiedTime'])
+      modifiedDateTime = iso8601.parse_date(revision['modifiedTime'])
       if modifiedDateTime >= dateTime:
         break
       count += 1
@@ -56487,7 +56514,7 @@ def _selectRevisionResults(results, fileId, origUser, revisionsEntity, previewDe
     count = 0
     selectedResults = []
     for revision in  results:
-      modifiedDateTime, _ = iso8601.parse_date(revision['modifiedTime'])
+      modifiedDateTime = iso8601.parse_date(revision['modifiedTime'])
       if modifiedDateTime >= startDateTime:
         if modifiedDateTime >= endDateTime:
           break
@@ -57025,7 +57052,7 @@ class PermissionMatch():
           break
       elif field in {'expirationstart', 'expirationend'}:
         if 'expirationTime' in permission:
-          expirationDateTime, _ = iso8601.parse_date(permission['expirationTime'])
+          expirationDateTime = iso8601.parse_date(permission['expirationTime'])
           if field == 'expirationstart':
             if expirationDateTime < value:
               break
@@ -65073,7 +65100,7 @@ def _checkFileIdEntityDomainAccess(fileIdEntity, useDomainAdminAccess):
 #	(mappermissionsdomain <DomainName> <DomainName>)*
 #	[moveToNewOwnersRoot [<Boolean>]]
 #	[updatesheetprotectedranges  [<Boolean>]]
-#	[sendemail] [emailmessage <String>]
+#	[sendemail|sendnotification] [emailmessage <String>]
 #	[showtitles] [nodetails|(csv [todrive <ToDriveAttribute>*] [formatjson [quotechar <Character>]])]
 def createDriveFileACL(users, useDomainAdminAccess=False):
   moveToNewOwnersRoot = False
@@ -65117,7 +65144,7 @@ def createDriveFileACL(users, useDomainAdminAccess=False):
     elif myarg in {'expiration', 'expires'}:
       expirationLocation = Cmd.Location()
       body['expirationTime'] = getTimeOrDeltaFromNow()
-    elif myarg == 'sendemail':
+    elif myarg in {'sendemail', 'sendnotification'}:
       sendNotificationEmail = True
     elif myarg == 'emailmessage':
       sendNotificationEmail = True
@@ -65373,7 +65400,7 @@ def doUpdateDriveFileACLs():
   updateDriveFileACLs([_getAdminEmail()], True)
 
 # gam [<UserTypeEntity>] create permissions <DriveFileEntity> <DriveFilePermissionsEntity> [asadmin]
-#	[expiration <Time>] [sendmail] [emailmessage <String>]
+#	[expiration <Time>] [sendemail|sendnotification] [emailmessage <String>]
 #	[moveToNewOwnersRoot [<Boolean>]]
 #	<PermissionMatch>* [<PermissionMatchAction>]
 def createDriveFilePermissions(users, useDomainAdminAccess=False):
@@ -65491,7 +65518,7 @@ def createDriveFilePermissions(users, useDomainAdminAccess=False):
       moveToNewOwnersRoot = getBoolean()
     elif myarg in {'expiration', 'expires'}:
       expiration = getTimeOrDeltaFromNow()
-    elif myarg == 'sendemail':
+    elif myarg in {'sendemail', 'sendnotification'}:
       sendNotificationEmail = True
     elif myarg == 'emailmessage':
       sendNotificationEmail = True

gam/{iso8601/iso8601.py → gamlib/gliso8601.py}

@@ -148,13 +148,12 @@ def parse_date(datestring):
   groups = m.groupdict()
   tz = parse_timezone(groups)
   try:
-    return (datetime(year=int(groups['year']),
-                     month=int(groups['month']),
-                     day=int(groups['day']),
-                     hour=int(groups['hour']),
-                     minute=int(groups['minute']),
-                     second=int(groups['second']),
-                     tzinfo=tz),
-            tz)
+    return datetime(year=int(groups['year']),
+                    month=int(groups['month']),
+                    day=int(groups['day']),
+                    hour=int(groups['hour']),
+                    minute=int(groups['minute']),
+                    second=int(groups['second']),
+                    tzinfo=tz)
   except Exception as e:
     raise ParseError(e)

gam/gamlib/glmsgs.py

@@ -499,6 +499,7 @@ STATISTICS_MOVE_FILE = 'Total: {0}, Moved: {1}, Shortcut created {2}, Shortcut e
 STATISTICS_MOVE_FOLDER = 'Total: {0}, Moved: {1}, Shortcut created {2}, Shortcut exists {3}, Duplicate: {4}, Merged: {5}, Move Failed: {6}, Not writable: {7}'
 STATISTICS_USER_NOT_ORGANIZER = 'User not organizer: {0}'
 STRING_LENGTH = 'string length'
+STUDENT_NOT_IN_COURSE = 'Student not in course'
 SUBKEY_FIELD_MISMATCH = 'subkeyfield {0} does not match saved subkeyfield {1}'
 SUBSCRIPTION_NOT_FOUND = 'Could not find subscription'
 SUFFIX_NOT_ALLOWED_WITH_CUSTOMLANGUAGE = 'Suffix {0} not allowed with customLanguage {1}'

gam/gamlib/glskus.py

@@ -100,7 +100,7 @@ _SKUS = {
   '1010470003': {
     'product': '101047', 'aliases': ['geminibiz'], 'displayName': 'Gemini Business'},
   '1010470004': {
-    'product': '101047', 'aliases': ['geminiedu'], 'displayName': 'Gemini Education'},
+    'product': '101047', 'aliases': ['gaiproedu', 'geminiedu'], 'displayName': 'Google AI Pro for Education'},
   '1010470005': {
     'product': '101047', 'aliases': ['geminiedupremium'], 'displayName': 'Gemini Education Premium'},
   '1010470006': {

{gam7-7.20.2.dist-info → gam7-7.20.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gam7
-Version: 7.20.2
+Version: 7.20.4
 Summary: CLI tool to manage Google Workspace
 Project-URL: Homepage, https://github.com/GAM-team/GAM
 Project-URL: Issues, https://github.com/GAM-team/GAM/issues