gam7 7.20.2__py3-none-any.whl → 7.20.3__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.03'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -51247,7 +51247,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 +51450,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 +51521,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 +51535,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 +51550,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 +51582,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 +51622,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 +51658,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>])
@@ -65073,7 +65104,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 +65148,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 +65404,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 +65522,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/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.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gam7
-Version: 7.20.2
+Version: 7.20.3
 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

{gam7-7.20.2.dist-info → gam7-7.20.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-gam/__init__.py,sha256=Og3IJDcd2aooFJB-qfDqe39cEcQc6-CPGbdHFsv0LqY,3608827
+gam/__init__.py,sha256=Dg18uAagGM_Ri_DQ16DbZHZY_PnpNgXH3VH4_nv1KHs,3610487
 gam/__main__.py,sha256=amz0-959ph6zkZKqjaar4n60yho-T37w6qWI36qx0CA,1049
 gam/cacerts.pem,sha256=DUsVo2XlFYwfkhe3gnxa-Km4Z4noz74hSApXwTT-nQE,44344
 gam/cbcm-v1.1beta1.json,sha256=xO5XloCQQULmPbFBx5bckdqmbLFQ7sJ2TImhE1ysDIY,19439
@@ -31,8 +31,8 @@ gam/gamlib/glgapi.py,sha256=pdBbwNtnCwFWxJGaP-_3hdTjSNoOCJF2yo76WdQOi1k,40426
 gam/gamlib/glgdata.py,sha256=weRppttWm6uRyqtBoGPKoHiNZ2h28nhfUV4J_mbCszY,2707
 gam/gamlib/glglobals.py,sha256=oJfaLUQj46XqwrOzRfWhGqO0f1P26xjJZefaILJUFGE,9695
 gam/gamlib/glindent.py,sha256=RfBa2LDfLIqPLL5vMfC689TCVmqn8xf-qulSzkiatrc,1228
-gam/gamlib/glmsgs.py,sha256=uluaFxw5YCG1so9uvOYU6HvAwGJNqJcB1curD8hH-G0,34001
-gam/gamlib/glskus.py,sha256=e1u3zw1MGQjBgAFXqjrGWQl2d7eYpVlMYGpIKNwjskQ,15360
+gam/gamlib/glmsgs.py,sha256=ODq-KS3jhXH5DB5DEo6eCX1DHhy4OGv_jeQjiLVPOHM,34049
+gam/gamlib/glskus.py,sha256=29vlBLBJCL4u9GawCt3eNeZq9HQG3hGFZk9-EainNng,15384
 gam/gamlib/gluprop.py,sha256=IyPLCyvn7-NHTUenM71YPQPXRZXx6CB5q-GtJ-FYd1c,11461
 gam/gamlib/glverlibs.py,sha256=xoQXiwcE_-HVYKv-VYA8O0mazRsc9mN-_ysj1dAlMyc,992
 gam/gamlib/yubikey.py,sha256=-UC-3oue9qarYK3LT7YL6Gmqs7TMK8oz9_AoxdaG2FA,7925
@@ -65,8 +65,8 @@ gam/googleapiclient/discovery_cache/base.py,sha256=yCDPtxnbNN-p5_9fzBacC6P3wcUPl
 gam/googleapiclient/discovery_cache/file_cache.py,sha256=sim3Mg4HgRYo3vX75jvcKy_aV568EvIrtBfvfbw-044,4774
 gam/iso8601/__init__.py,sha256=Z2PsYbXgAH5a5xzUvgczCboPzqWpm65kRcIngCnhViU,1218
 gam/iso8601/iso8601.py,sha256=Li2FHZ4sBTWuthuQhyCvmvj0j6At8JbGzkSv2fc2RHU,4384
-gam7-7.20.2.dist-info/METADATA,sha256=c9_lWA1fLzDtqEw6pI_v7ReKM3Sy18VnJpq6gU7xnHQ,2940
-gam7-7.20.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-gam7-7.20.2.dist-info/entry_points.txt,sha256=HVUM5J7dA8YwvJfG30jiLefR19ExMs387TWugWd9sf4,42
-gam7-7.20.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-gam7-7.20.2.dist-info/RECORD,,
+gam7-7.20.3.dist-info/METADATA,sha256=3rEbZ76pZrP2xa_v6tNKqFzRPGFDpZXuVXcgnkTUqgc,2940
+gam7-7.20.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+gam7-7.20.3.dist-info/entry_points.txt,sha256=HVUM5J7dA8YwvJfG30jiLefR19ExMs387TWugWd9sf4,42
+gam7-7.20.3.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+gam7-7.20.3.dist-info/RECORD,,