gam7 7.20.2__tar.gz → 7.20.3__tar.gz

{gam7-7.20.2 → gam7-7.20.3}/.github/workflows/build.yml

@@ -30,7 +30,7 @@ env:
   PYTHON_SOURCE_PATH: ${{ github.workspace }}/src/cpython
   CRYPTOGRAPHY_BUILD_OPENSSL_NO_LEGACY: 1
   CRYPTOGRAPHY_OPENSSL_NO_LEGACY: 1
-  WINDOWS_CODESIGN_CERT_HASH: 590dc5bb10dfb31dbff38c0e2f9c35ef0f6d0e9e
+  WINDOWS_CODESIGN_CERT_HASH: 3B11D9340A45CF078FF7FD984F1C3E30DA82FD05
 
 jobs:
   build:
@@ -655,7 +655,7 @@ jobs:
           write-Host "Signing ${env:gam}...."
           # Always explicitely use x64 version os signtool.exe, arm64 version apparently can't
           # see Certum certs since SimplySignDesktop is x64-only today.
-          Start-Process -Wait -NoNewWindow -ErrorAction Continue -FilePath 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64\signtool.exe'  -ArgumentList "sign", "/sha1", "590dc5bb10dfb31dbff38c0e2f9c35ef0f6d0e9e", "/tr", "http://time.certum.pl", "/td", "SHA256", "/fd", "SHA256", "/v", "$env:gam"
+          Start-Process -Wait -NoNewWindow -ErrorAction Continue -FilePath 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64\signtool.exe'  -ArgumentList "sign", "/sha1", "$env:WINDOWS_CODESIGN_CERT_HASH", "/tr", "http://time.certum.pl", "/td", "SHA256", "/fd", "SHA256", "/v", "$env:gam"
           write-Host "Verifying signature of ${env:gam}...."
           # verify signature. If we failed to sign we should fail to verify and die.
           & 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64\signtool.exe' verify /pa /v "$env:gam"
@@ -727,7 +727,7 @@ jobs:
           write-Host "Signing ${env:MSI_FILENAME}...."
           # Always explicitely use x64 version os signtool.exe, arm64 version apparently can't
           # see Certum certs since SimplySignDesktop is x64-only today.
-          Start-Process -Wait -NoNewWindow -ErrorAction Continue -FilePath 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64\signtool.exe'  -ArgumentList "sign", "/sha1", "590dc5bb10dfb31dbff38c0e2f9c35ef0f6d0e9e", "/tr", "http://time.certum.pl", "/td", "SHA256", "/fd", "SHA256", "/v", "$env:MSI_FILENAME"
+          Start-Process -Wait -NoNewWindow -ErrorAction Continue -FilePath 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64\signtool.exe'  -ArgumentList "sign", "/sha1", "$env:WINDOWS_CODESIGN_CERT_HASH", "/tr", "http://time.certum.pl", "/td", "SHA256", "/fd", "SHA256", "/v", "$env:MSI_FILENAME"
           write-Host "Verifying signature of ${env:MSI_FILENAME}...."
           # verify signature. If we failed to sign we should fail to verify and die.
           & 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64\signtool.exe' verify /pa /v "$env:MSI_FILENAME"

{gam7-7.20.2 → gam7-7.20.3}/PKG-INFO

@@ -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 → gam7-7.20.3}/src/GamCommands.txt

@@ -266,7 +266,7 @@ If an item contains spaces, it should be surrounded by ".
         appsheetstandard | appsheetenterprisestandard | 1010380002 | AppSheet Enterprise Standard |
         appsheetplus | appsheetenterpriseplus | 1010380003 | AppSheet Enterprise Plus |
         assuredcontrols | 1010390001 | Assured Controls |
-        assuredcontrolsplus | 1010390002 | Assured Controls Plus | 
+        assuredcontrolsplus | 1010390002 | Assured Controls Plus |
         bce | beyondcorp | beyondcorpenterprise | cep | chromeenterprisepremium | 1010400001 | Chrome Enterprise Premium |
         cdm | chrome | googlechromedevicemanagement | Google-Chrome-Device-Management |
         cloudidentity | identity | 1010010001 | Cloud Identity |
@@ -275,8 +275,8 @@ If an item contains spaces, it should be surrounded by ".
         colabpro | 1010500001 | Colab Pro |
         colabpro+ | colabproplus | 1010500002 | Colab Pro+ |
         eeu | 1010490001 | SKU Endpoint Education Upgrade |
+        gaiproedu | geminiedu | 1010470004 | Google AI Pro for Education |
         geminibiz | 1010470003 | Gemini Business |
-        geminiedu | 1010470004 | Gemini Education |
         geminiedupremium| 1010470005 | Gemini Education Premium |
         geminient| duetai | 1010470001 | Gemini Enterprise |
         geminiultra | 1010470008 | Google AI Ultra for Business |
@@ -316,12 +316,12 @@ If an item contains spaces, it should be surrounded by ".
         wsbizstarter | workspacebusinessstarter | wsbizstart | 1010020027 | Google Workspace Business Starter |
         wsbizstarterarchived | workspacebusinessstarterarchived | 1010340005 | Google Workspace Business Starter - Archived User |
         wsentess | workspaceenterpriseessentials | 1010060003 | Google Workspace Enterprise Essentials |
-        wsentplus | workspaceenterpriseplus | gae | gse | enterprise | gsuiteenterprise | 1010020020 | Google Workspace Enterprise Plus |
+        wsentplus | workspaceenterpriseplus | gae | gse | enterprise | gsuiteenterprise | 1010020020 | Google Workspace Enterprise Plus (formerly G Suite Enterprise) |
         wsentstan | workspaceenterprisestandard | 1010020026 | Google Workspace Enterprise Standard |
         wsentstanarchived | workspaceenterprisestandardarchived | 1010340004 | Google Workspace Enterprise Standard - Archived User |
         wsentstarter | workspaceenterprisestarter | wes | 1010020029 | Workspace Enterprise Starter |
-        wsess | workspaceesentials | gsuiteessentials | essentials | d4e | driveenterprise | drive4enterprise | 1010060001 | Google Workspace Essentials |
-        wsessplus | workspaceessentialsplus | 1010060005 | Google Workspace Essentials Plus |
+        wsess | workspaceesentials | gsuiteessentials | essentials | d4e | driveenterprise | drive4enterprise | 1010060001 | Google Workspace Essentials (formerly G Suite Essentials) |
+        wsessplus | workspaceessentialsplus | 1010060005 | Google Workspace Enterprise Essentials Plus |
         wsflw | workspacefrontline | workspacefrontlineworker | 1010020030 | Google Workspace Frontline Starter |
         wsflwstan | workspacefrontlinestan | workspacefrontlineworkerstan | 1010020031 | Google Workspace Frontline Standard |
         wsflwplus | workspacefrontlineplus | workspacefrontlineworkerplus | 1010020034 | Google Workspace Frontline Plus
@@ -5096,7 +5096,7 @@ gam create|add drivefileacl <SharedDriveEntityAdmin>
         anyone|(user <UserItem>)|(group <GroupItem>)|(domain <DomainName>)
         (role <DriveFileACLRole>) [withlink|(allowfilediscovery|discoverable [<Boolean>])]
         (mappermissionsdomain <DomainName> <DomainName>)*
-        [expiration <Time>] [sendemail] [emailmessage <String>]
+        [expiration <Time>] [sendemail|sendnotification] [emailmessage <String>]
         [showtitles] [nodetails|(csv [todrive <ToDriveAttribute>*] [formatjson [quotechar <Character>]])]
 gam update drivefileacl <SharedDriveEntityAdmin> <DriveFilePermissionIDorEmail>
         (role <DriveFileACLRole>) [expires|expiration <Time>] [removeexpiration [<Boolean>]]
@@ -5123,7 +5123,7 @@ gam print drivefileacls <SharedDriveEntityAdmin> [todrive <ToDriveAttribute>*]
         (orderby <DriveFileOrderByFieldName> [ascending|descending])*
         [formatjson [quotechar <Character>]]
 gam create|add permissions <SharedDriveEntityAdmin> <DriveFilePermissionEntity>
-        [expires|expiration <Time>] [sendemail] [emailmessage <String>]
+        [expires|expiration <Time>] [sendemail|sendnotification] [emailmessage <String>]
         <PermissionMatch>* [<PermissionMatchAction>]
 gam delete permissions <SharedDriveEntityAdmin> <DriveFilePermissionIDEntity>
         <PermissionMatch>* [<PermissionMatchAction>]
@@ -5136,7 +5136,7 @@ gam <UserTypeEntity> create|add drivefileacl <SharedDriveEntityAdmin>
         (role <DriveFileACLRole>) [withlink|(allowfilediscovery|discoverable [<Boolean>])]
         (mappermissionsdomain <DomainName> <DomainName>)*
         [movetonewownersroot [<Boolean>]]
-        [expiration <Time>] [sendemail] [emailmessage <String>]
+        [expiration <Time>] [sendemail|sendnotification] [emailmessage <String>]
         [showtitles] [nodetails|(csv [todrive <ToDriveAttribute>*] [formatjson [quotechar <Character>]])]
         adminaccess
 gam <UserTypeEntity> update drivefileacl <SharedDriveEntityAdmin> <DriveFilePermissionIDorEmail>
@@ -5167,7 +5167,7 @@ gam <UserTypeEntity> print drivefileacls <SharedDriveEntityAdmin> [todrive <ToDr
         (orderby <DriveFileOrderByFieldName> [ascending|descending])*
         [formatjson [quotechar <Character>]]
 gam <UserTypeEntity> create|add permissions <SharedDriveEntityAdmin> <DriveFilePermissionEntity>
-        [expires|expiration <Time>] [sendemail] [emailmessage <String>] adminaccess
+        [expires|expiration <Time>] [sendemail|sendnotification] [emailmessage <String>] adminaccess
         <PermissionMatch>* [<PermissionMatchAction>]
 gam <UserTypeEntity> delete permissions <SharedDriveEntityAdmin> <DriveFilePermissionIDEntity> adminaccess
         <PermissionMatch>* [<PermissionMatchAction>]
@@ -6896,7 +6896,7 @@ gam <UserTypeEntity> create|add drivefileacl <DriveFileEntity> [adminaccess|asad
         anyone|(user <UserItem>)|(group <GroupItem>)|(domain <DomainName>) (role <DriveFileACLRole>)
         [withlink|(allowfilediscovery|discoverable [<Boolean>])] [expiration <Time>]
         [moveToNewOwnersRoot [<Boolean>]]
-        [sendemail] [emailmessage <String>]
+        [sendemail|sendnotification] [emailmessage <String>]
         [updatesheetprotectedranges [<Boolean>]]
         [showtitles] [nodetails|(csv [todrive <ToDriveAttribute>*] [formatjson [quotechar <Character>]])]
 gam <UserTypeEntity> update drivefileacl <DriveFileEntity> <DriveFilePermissionIDorEmail>
@@ -6922,7 +6922,7 @@ gam <UserTypeEntity> print drivefileacls <DriveFileEntity> [todrive <ToDriveAttr
         (orderby <DriveFileOrderByFieldName> [ascending|descending])*
         [formatjson [quotechar <Character>]]
 gam <UserTypeEntity> create|add permissions <DriveFileEntity> <DriveFilePermissionEntity>
-        [expires|expiration <Time>] [sendemail] [emailmessage <String>]
+        [expires|expiration <Time>] [sendemail|sendnotification] [emailmessage <String>]
         [movetonewownersroot [<Boolean>]]
         <PermissionMatch>* [<PermissionMatchAction>]
 gam <UserTypeEntity> delete permissions <DriveFileEntity> <DriveFilePermissionIDEntity>

{gam7-7.20.2 → gam7-7.20.3}/src/GamUpdate.txt

@@ -1,3 +1,9 @@
+7.20.03
+
+Rebranded license SKU `1010470004` from `Gemini Education` to `Google AI Pro for Education`.
+
+Additional updates to student groups in Google Classroom.
+
 7.20.02
 
 Upgraded `gam create course-studentgroups` to allow specification of multiple student group titles;

{gam7-7.20.2 → gam7-7.20.3}/src/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

{gam7-7.20.2 → gam7-7.20.3}/src/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}'

{gam7-7.20.2 → gam7-7.20.3}/src/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 → gam7-7.20.3}/wiki/Classroom-StudentGroups.md

@@ -160,6 +160,7 @@ Middle Students
 Beginner Students
 
 $ gam redirect csv ./StudentGroups.csv add coursestudentgroups course <CourseID> select csvfile titles.csv:title csv
+Course: <CourseID>, Add 3 Course Student Groups
 
 $ more StudentGroups.csv 
 courseId,courseName,studentGroupId,studentGroupTitle

{gam7-7.20.2 → gam7-7.20.3}/wiki/Collections-of-Items.md

@@ -351,6 +351,8 @@ Data fields identified in a `csvkmd` argument.
         <SiteACLScopeList> | <FileSelector> | <CSVFileSelector> | <CSVkmdSelector> | <CSVDataSelector>
 <SiteEntity> ::=
         <SiteList> | <FileSelector> | <CSVFileSelector> | <CSVkmdSelector> | <CSVDataSelector>
+<StringEntity> ::=
+        <StringList> | <FileSelector> | <CSVFileSelector>
 <StudentGroupEntity> ::=
         <StudentGroupIDList> | <FileSelector> | <CSVFileSelector> | <CSVkmdSelector>
 <TagManagerAccountPathEntity> ::=

{gam7-7.20.2 → gam7-7.20.3}/wiki/GamUpdates.md

@@ -10,6 +10,18 @@ Add the `-s` option to the end of the above commands to suppress creating the `g
 
 See [Downloads-Installs-GAM7](https://github.com/GAM-team/GAM/wiki/Downloads-Installs) for Windows or other options, including manual installation
 
+### 7.20.03
+
+Rebranded license SKU `1010470004` from `Gemini Education` to `Google AI Pro for Education`.
+
+Additional updates to student groups in Google Classroom.
+
+### 7.20.02
+
+Upgraded `gam create course-studentgroups` to allow specification of multiple student group titles;
+multiple student groups can be created in a single command.
+* `((title <String>)|(select <StringEntity))+`
+
 ### 7.20.01
 
 Added option `showaccesssettings` to `gam [<UserTypeEntity>] print|show chatspaces`. When listing

{gam7-7.20.2 → gam7-7.20.3}/wiki/How-to-Upgrade-Legacy-GAM-to-GAM7.md

@@ -252,7 +252,7 @@ writes the credentials into the file oauth2.txt.
 admin@server:/Users/admin$ rm -f /Users/admin/GAMConfig/oauth2.txt
 admin@server:/Users/admin$ gam version
 WARNING: Config File: /Users/admin/GAMConfig/gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: /Users/admin/GAMConfig/oauth2.txt, Not Found
-GAM 7.20.01 - https://github.com/GAM-team/GAM - pyinstaller
+GAM 7.20.03 - https://github.com/GAM-team/GAM - pyinstaller
 GAM Team <google-apps-manager@googlegroups.com>
 Python 3.13.7 64-bit final
 MacOS Sequoia 15.6.1 x86_64
@@ -990,7 +990,7 @@ writes the credentials into the file oauth2.txt.
 C:\>del C:\GAMConfig\oauth2.txt
 C:\>gam version
 WARNING: Config File: C:\GAMConfig\gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: C:\GAMConfig\oauth2.txt, Not Found
-GAM 7.20.01 - https://github.com/GAM-team/GAM - pythonsource
+GAM 7.20.03 - https://github.com/GAM-team/GAM - pythonsource
 GAM Team <google-apps-manager@googlegroups.com>
 Python 3.13.7 64-bit final
 Windows-10-10.0.17134 AMD64

{gam7-7.20.2 → gam7-7.20.3}/wiki/Licenses.md

@@ -60,10 +60,10 @@
 | G Suite Legacy | Google-Apps | standard |
 | G Suite Lite | Google-Apps-Lite | gsuitelite |
 | Gemini Business | 1010470003 | geminibiz
-| Gemini Education | 1010470004 | geminiedu |
 | Gemini Education Premium | 1010470005 | geminiedupremium |
 | Gemini Enterprise | 1010470001 | geminient | duetai |
-| Google AI Ultra for Business | 1010470008 | geminiultra |
+| Google AI Pro for Education | 1010470004 | gaiproedu |
+| Google AI Ultra for Business | 1010470008 | geminiultra }
 | Google Apps Message Security | Google-Apps-For-Postini | postini |
 | Google Chrome Device Management | Google-Chrome-Device-Management | cdm |
 | Google Drive Storage 16TB | Google-Drive-storage-16TB | 16tb |
@@ -161,18 +161,17 @@
         assuredcontrolsplus | 1010390002 | Assured Controls Plus |
         bce | beyondcorp | beyondcorpenterprise | cep | chromeenterprisepremium | 1010400001 | Chrome Enterprise Premium |
         cdm | chrome | googlechromedevicemanagement | Google-Chrome-Device-Management |
-        bce | beyondcorp | beyondcorpenterprise | cep | chromeenterprisepremium | 1010400001 | Chrome Enterprise Premium |
-        cdm | chrome | googlechromedevicemanagement | Google-Chrome-Device-Management |
         cloudidentity | identity | 1010010001 | Cloud Identity |
         cloudidentitypremium | identitypremium | 1010050001 | Cloud Identity Premium |
         cloudsearch | 1010350001 | Cloud Search |
         colabpro | 1010500001 | Colab Pro |
         colabpro+ | colabproplus | 1010500002 | Colab Pro+ |
         eeu | 1010490001 | SKU Endpoint Education Upgrade |
+        gaiproedu | geminiedu | 1010470004 | Google AI Pro for Education |
         geminibiz | 1010470003 | Gemini Business |
-        geminiedu | 1010470004 | Gemini Education |
         geminiedupremium| 1010470005 | Gemini Education Premium |
         geminient| duetai | 1010470001 | Gemini Enterprise |
+        geminiultra | 1010470008 | Google AI Ultra for Business |
         gsuitebasic | gafb | gafw | basic | Google-Apps-For-Business |
         gsuitebusiness | gau | gsb | unlimited | Google-Apps-Unlimited |
         gsuitebusinessarchived | gsbau | businessarchived | 1010340002 | Google Workspace Business - Archived User |
@@ -216,7 +215,8 @@
         wsess | workspaceesentials | gsuiteessentials | essentials | d4e | driveenterprise | drive4enterprise | 1010060001 | Google Workspace Essentials (formerly G Suite Essentials) |
         wsessplus | workspaceessentialsplus | 1010060005 | Google Workspace Enterprise Essentials Plus |
         wsflw | workspacefrontline | workspacefrontlineworker | 1010020030 | Google Workspace Frontline Starter |
-        wsflwstan | workspacefrontlinestan | workspacefrontlineworkerstan | 1010020031 | Google Workspace Frontline Standard
+        wsflwstan | workspacefrontlinestan | workspacefrontlineworkerstan | 1010020031 | Google Workspace Frontline Standard |
+        wsflwplus | workspacefrontlineplus | workspacefrontlineworkerplus | 1010020034 | Google Workspace Frontline Plus
 <SKUIDList> ::= "<SKUID>(,<SKUID>)*"
 ```
 ## Notes

{gam7-7.20.2 → gam7-7.20.3}/wiki/Shared-Drives.md

@@ -3,7 +3,8 @@
 - [Query documentation](#query-documentation)
 - [Definitions](#definitions)
 - [Introduction](#introduction)
-- [GUI API permission name mapping](#gui-api-permission-name-mapping)
+- [API GUI permission name mapping](#api-gui-permission-name-mapping)
+- [API GUI restriction name mapping](#api-gui-restriction-name-mapping)
 - [Display Shared Drive themes](#display-shared-drive-themes)
 - [Manage Shared Drives](#manage-shared-drives)
   - [Create a Shared Drive](#create-a-shared-drive)
@@ -207,15 +208,8 @@
         downloadrestrictedforwriters|downloadrestrictions.restrictedforwriters|
         drivemembersonly|teammembersonly|
         sharingfoldersrequiresorganizerpermission
-
-Each pair of restrictions below are equivalent:
-
-allowcontentmanagerstosharefolders true
-sharingfoldersrequiresorganizerpermission false
-
-allowcontentmanagerstosharefolders false
-sharingfoldersrequiresorganizerpermission true
 ```
+
 ## Introduction
 A domain administrator with the Drive and Docs administrator privilege can search for Shared Drives or update permissions for Shared Drives
 owned by their organization, regardless of the admin's membership in any given Shared Drive.
@@ -225,15 +219,47 @@ Three forms of the commands are available:
 * `gam <UserTypeEntity> action ... adminaccess` - The user named in `<UserTypeEntty>` is used, adminaccess indicates that the user is a domain administrator
 * `gam <UserTypeEntity> action ...` - The user named in `<UserTypeEntty>` is used, access is limited to drives for which they are an organizer
 
-## GUI API permission name mapping
-
-| GUI setting | API setting |
-|------------|------------|
-| Manager | organizer |
-| Content manager | fileOrganizer |
-| Contributor | writer |
-| Commenter | commenter |
-| Viewer | reader |
+## API GUI permission name mapping
+
+| API setting | GUI setting |
+|-------------|-------------|
+| organizer | Manager |
+| fileOrganizer | Content manager |
+| writer | Contributor |
+| commenter | Commenter |
+| reader | Viewer |
+
+## API GUI restriction name mapping
+| API Setting | Description |
+|-------------|-------------|
+| adminManagedRestrictions | Whether administrative privileges on this shared drive are required to modify restrictions. |
+| domainUsersOnly | Whether access to this shared drive and items inside this shared drive is restricted to users of the domain to which this shared drive belongs. |
+| driveMembersOnly | Whether access to items inside this shared drive is restricted to its members. |
+| allowContentManagersToShareFolders (GAM defined) | If true, users with either the organizer role or the file organizer role can share folders. If false, only users with the organizer role can share folders.  |
+| sharingFoldersRequiresOrganizerPermission | If true, only users with the organizer role can share folders. If false, users with either the organizer role or the file organizer role can share folders. |
+| copyRequiresWriterPermission | Whether the options to copy, print, or download files inside this shared drive, should be disabled for readers and commenters. |
+| downloadRestrictions.restrictedForWriters | Whether download and copy is restricted for writers. If true, download is also restricted for readers. |
+| downloadRestrictions.restrictedForReaders | Whether download and copy is restricted for readers. |
+
+| API Setting | False | True | GUI Setting | Checked | Unchecked |
+|-------------|-------|------|-------------|---------|-----------|
+| adminManagedRestrictions | X | | Shared drive settings can be modified | | |
+| adminManagedRestrictions |  | X | Shared drive settings can **not** be modified | | |
+| | | | **Access** |
+| domainUsersOnly | X | | Allow people outside of Domain name to access files | X | |
+| domainUsersOnly | | X | Allow people outside of Domain name to access files | | X |
+| driveMembersOnly | X | | Allow people who aren't shared drive members to access files | X | |
+| driveMembersOnly | | X |  Allow people who aren't shared drive members to access files | | X |
+| | | | **Role permissions** |
+| allowContentManagersToShareFolders | X | | Allow content managers to share folders | | X |
+| allowContentManagersToShareFolders | | X | Allow content managers to share folders | X | |
+| sharingFoldersRequiresOrganizerPermission | X | | Allow content managers to share folders | X | |
+| sharingFoldersRequiresOrganizerPermission | | X | Allow content managers to share folders | | X |
+| | | | **People who can download, copy, and print** |
+| downloadRestrictions.restrictedForWriters | X | | Contributors and content managers | X | |
+| downloadRestrictions.restrictedForWriters | | X | Contributors and content managers | | X |
+| downloadRestrictions.restrictedForReaders | X | | Commenters and viewers | X | |
+| downloadRestrictions.restrictedForReaders | | X | Commenters and viewers | | X |
 
 ## Display Shared Drive themes
 ```