gam7 7.20.0__py3-none-any.whl → 7.20.2__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.00'
+__version__ = '7.20.02'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -27004,31 +27004,33 @@ CHAT_SPACES_ADMIN_ORDERBY_CHOICE_MAP = {
 
 # gam [<UserTypeEntity>] show chatspaces
 #	[types <ChatSpaceTypeList>]
-#	[fields <ChatSpaceFieldNameList>]
+#	[fields <ChatSpaceFieldNameList>] [showaccesssettings]
 #	[formatjson]
 # gam [<UserTypeEntity>] print chatspaces [todrive <ToDriveAttribute>*]
 #	[types <ChatSpaceTypeList>]
-#	[fields <ChatSpaceFieldNameList>]
+#	[fields <ChatSpaceFieldNameList>] [showaccesssettings]
 #	[formatjson [quotechar <Character>]]
 # gam <UserItem> show chatspaces asadmin
 #	[query <String>] [querytime<String> <Time>]
 #	[orderby <ChatSpaceAdminOrderByFieldName> [ascending|descending]]
-#	[fields <ChatSpaceFieldNameList>]
+#	[fields <ChatSpaceFieldNameList>] [showaccesssettings]
 #	[formatjson]
 # gam <UserItem> print chatspaces asadmin [todrive <ToDriveAttribute>*]
 #	[query <String>] [querytime<String> <Time>]
 #	[orderby <ChatSpaceAdminOrderByFieldName> [ascending|descending]]
-#	[fields <ChatSpaceFieldNameList>]
+#	[fields <ChatSpaceFieldNameList>] [showaccesssettings]
 #	[formatjson [quotechar <Character>]]
 def printShowChatSpaces(users):
   csvPF = CSVPrintFile(['User', 'name'] if not isinstance(users, list) else ['name']) if Act.csvFormat() else None
   FJQC = FormatJSONQuoteChar(csvPF)
   OBY = OrderBy(CHAT_SPACES_ADMIN_ORDERBY_CHOICE_MAP)
   useAdminAccess, api, kwargsCS = _getChatAdminAccess(API.CHAT_SPACES_ADMIN, API.CHAT_SPACES)
+  kwargsSAS = {'useAdminAccess': useAdminAccess}
   fieldsList = []
   queries = []
   queryTimes = {}
   pfilter = ''
+  showAccessSettings = False
   if useAdminAccess:
     function = 'search'
     queries = ['customer = "customers/my_customer" AND spaceType = "SPACE"']
@@ -27044,8 +27046,12 @@ def printShowChatSpaces(users):
       pass
     elif useAdminAccess and _getChatSpaceSearchParms(myarg, queries, queryTimes, OBY):
       pass
+    elif myarg == 'showaccesssettings':
+      showAccessSettings = True
     else:
       FJQC.GetFormatJSONQuoteChar(myarg, True)
+  if showAccessSettings and fieldsList:
+    fieldsList.extend(['name', 'spaceType'])
   fields = getItemFieldsFromFieldsList('spaces', fieldsList)
   i, count, users = getEntityArgument(users)
   if useAdminAccess:
@@ -27070,6 +27076,17 @@ def printShowChatSpaces(users):
                                            GAPI.PERMISSION_DENIED, GAPI.FAILED_PRECONDITION],
                              retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS,
                              fields=fields, pageSize=CHAT_PAGE_SIZE, **kwargsCS)
+      if showAccessSettings:
+        for space in spaces:
+          if space['spaceType'] == 'SPACE':
+            try:
+              result = callGAPI(chat.spaces(), 'get',
+                                throwReasons=[GAPI.NOT_FOUND, GAPI.INVALID_ARGUMENT, GAPI.INTERNAL_ERROR,
+                                              GAPI.PERMISSION_DENIED, GAPI.FAILED_PRECONDITION],
+                                name=space['name'], fields='accessSettings', **kwargsSAS)
+              space.update(result)
+            except (GAPI.notFound, GAPI.invalidArgument, GAPI.internalError, GAPI.permissionDenied, GAPI.failedPrecondition):
+              pass
     except (GAPI.notFound, GAPI.invalidArgument, GAPI.internalError, GAPI.permissionDenied) as e:
       exitIfChatNotConfigured(chat, kvList, str(e), i, count)
       continue
@@ -51216,7 +51233,7 @@ def printShowClassroomProfile(users):
 
 # gam create course-studentgroups
 #	(course|class <CourseEntity>)*|([teacher <UserItem>] [student <UserItem>] [states <CourseStateList>])
-#	title <String>
+#	((title <String>)|(select <StringEntity))+
 #	[csv [todrive <ToDriveAttribute>*] [formatjson [quotechar <Character>]]]
 def doCreateCourseStudentGroups():
   croom = buildGAPIObject(API.CLASSROOM)
@@ -51226,10 +51243,13 @@ def doCreateCourseStudentGroups():
   courseShowProperties = _initCourseShowProperties(['name'])
   useOwnerAccess = GC.Values[GC.USE_COURSE_OWNER_ACCESS]
   kwargs  = {'courseId': None, 'body': {}}
+  titles = []
   while Cmd.ArgumentsRemaining():
     myarg = getArgument()
     if myarg == 'title':
-      kwargs['body']['title'] = getString(Cmd.OB_STRING)
+      titles.append(getString(Cmd.OB_STRING))
+    elif myarg == 'select':
+      titles.extend(getEntityList(Cmd.OB_STRING_ENTITY, shlexSplit=True))
     elif _getCourseSelectionParameters(myarg, courseSelectionParameters):
       pass
     elif myarg == 'csv':
@@ -51239,8 +51259,9 @@ def doCreateCourseStudentGroups():
       csvPF.GetTodriveParameters()
     else:
       FJQC.GetFormatJSONQuoteChar(myarg, True)
-  if 'title' not in kwargs['body']:
+  if not titles:
     missingArgumentExit('title')
+  jcount = len(titles)
   if csvPF and FJQC.formatJSON:
     csvPF.SetJSONTitles(['courseId', 'courseName', 'JSON'])
   coursesInfo = _getCoursesInfo(croom, courseSelectionParameters, courseShowProperties, useOwnerAccess)
@@ -51255,29 +51276,36 @@ def doCreateCourseStudentGroups():
     if not ocroom:
       continue
     kwargs['courseId'] = courseId
-    kvList = [Ent.COURSE, courseId, Ent.COURSE_STUDENTGROUP, None]
-    try:
-      studentGroup = callGAPI(ocroom.courses().studentGroups(), 'create',
-                              throwReasons=[GAPI.NOT_FOUND, GAPI.SERVICE_NOT_AVAILABLE, GAPI.NOT_IMPLEMENTED,
-                                            GAPI.FORBIDDEN, GAPI.PERMISSION_DENIED],
-                              retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS,
-                              previewVersion='V1_20250630_PREVIEW',
-                              **kwargs)
-      kvList[-1] = f"{studentGroup['title']}({studentGroup['id']})"
-      if not csvPF:
-        entityActionPerformed(kvList, i, count)
-      elif not  FJQC.formatJSON:
-        csvPF.WriteRow({'courseId': courseId, 'courseName': course['name'],
-                        'studentGroupId': studentGroup['id'], 'studentGroupTitle': studentGroup['title']})
-      else:
-        csvPF.WriteRowNoFilter({'courseId': courseId, 'courseName': course['name'],
-                                'JSON': json.dumps(cleanJSON(studentGroup), ensure_ascii=False, sort_keys=True)})
-    except GAPI.notFound as e:
-      entityActionFailedWarning(kvList, str(e), i, count)
-    except (GAPI.serviceNotAvailable, GAPI.notImplemented) as e:
-      entityActionFailedExit([Ent.COURSE, courseId], str(e), i, count)
-    except (GAPI.forbidden, GAPI.permissionDenied) as e:
-      ClientAPIAccessDeniedExit(str(e))
+    entityPerformActionNumItems([Ent.COURSE, courseId], jcount, Ent.COURSE_STUDENTGROUP, i, count)
+    Ind.Increment()
+    j = 0
+    for title in titles:
+      j += 1
+      kwargs['body']['title'] = title
+      kvList = [Ent.COURSE, courseId, Ent.COURSE_STUDENTGROUP, None]
+      try:
+        studentGroup = callGAPI(ocroom.courses().studentGroups(), 'create',
+                                throwReasons=[GAPI.NOT_FOUND, GAPI.SERVICE_NOT_AVAILABLE, GAPI.NOT_IMPLEMENTED,
+                                              GAPI.FORBIDDEN, GAPI.PERMISSION_DENIED],
+                                retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS,
+                                previewVersion='V1_20250630_PREVIEW',
+                                **kwargs)
+        kvList[-1] = f"{studentGroup['title']}({studentGroup['id']})"
+        if not csvPF:
+          entityActionPerformed(kvList, j, jcount)
+        elif not  FJQC.formatJSON:
+          csvPF.WriteRow({'courseId': courseId, 'courseName': course['name'],
+                          'studentGroupId': studentGroup['id'], 'studentGroupTitle': studentGroup['title']})
+        else:
+          csvPF.WriteRowNoFilter({'courseId': courseId, 'courseName': course['name'],
+                                  'JSON': json.dumps(cleanJSON(studentGroup), ensure_ascii=False, sort_keys=True)})
+      except GAPI.notFound as e:
+        entityActionFailedWarning(kvList, str(e), j, jcount)
+      except (GAPI.serviceNotAvailable, GAPI.notImplemented) as e:
+        entityActionFailedExit([Ent.COURSE, courseId], str(e), j, jcount)
+      except (GAPI.forbidden, GAPI.permissionDenied) as e:
+        ClientAPIAccessDeniedExit(str(e))
+    Ind.Decrement()
   if csvPF:
     csvPF.writeCSVfile('Course Student Groups')
 

gam/gamlib/glclargs.py

@@ -1057,6 +1057,7 @@ class GamCLArgs():
   OB_SPREADSHEET_RANGE_LIST = 'SpreadsheetRangeList'
   OB_STATE_NAME_LIST = "StateNameList"
   OB_STRING = 'String'
+  OB_STRING_ENTITY = 'StringEntity'
   OB_STRING_LIST = 'StringList'
   OB_STUDENTGROUP_ID = 'StudentGroupID'
   OB_STUDENTGROUP_ID_ENTITY = 'StudentGroupIDEntity'

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gam7
-Version: 7.20.0
+Version: 7.20.2
 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.0.dist-info → gam7-7.20.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-gam/__init__.py,sha256=A7MFQZo7V4ATMe6INRM3Lkc_ci1la6zTZc8xL6GSbtk,3607451
+gam/__init__.py,sha256=Og3IJDcd2aooFJB-qfDqe39cEcQc6-CPGbdHFsv0LqY,3608827
 gam/__main__.py,sha256=amz0-959ph6zkZKqjaar4n60yho-T37w6qWI36qx0CA,1049
 gam/cacerts.pem,sha256=DUsVo2XlFYwfkhe3gnxa-Km4Z4noz74hSApXwTT-nQE,44344
 gam/cbcm-v1.1beta1.json,sha256=xO5XloCQQULmPbFBx5bckdqmbLFQ7sJ2TImhE1ysDIY,19439
@@ -25,7 +25,7 @@ gam/gamlib/__init__.py,sha256=z5mF-y0j8pm-YNFBaiuxB4M_GAUPG-cXWwrhYwrVReM,679
 gam/gamlib/glaction.py,sha256=1Il_HrChVnPkzZwiZs5au4mFQVtq4K1Z42uIuR6qdnI,9419
 gam/gamlib/glapi.py,sha256=u97M7Y2BeP3tYEEGYEz-9kY4fdV0fYkeqC3YN-sRwNc,36028
 gam/gamlib/glcfg.py,sha256=7Ut-7sDTw-WVHZfvDWn_dlVNfuWd6VsPDBpQ3qnyzJE,28100
-gam/gamlib/glclargs.py,sha256=9Oze97BT_GS2WXf4LYg4JlSCmZ_8fG2a33Ft1_pX43k,44134
+gam/gamlib/glclargs.py,sha256=vDHe3heii7s-VN0xren0CCS5S6c1e5dCLigWTZlyeY8,44170
 gam/gamlib/glentity.py,sha256=8F98YR1ronheiQShD6WHlY-YnBKfMDrc33iRuRoLIvo,35097
 gam/gamlib/glgapi.py,sha256=pdBbwNtnCwFWxJGaP-_3hdTjSNoOCJF2yo76WdQOi1k,40426
 gam/gamlib/glgdata.py,sha256=weRppttWm6uRyqtBoGPKoHiNZ2h28nhfUV4J_mbCszY,2707
@@ -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.0.dist-info/METADATA,sha256=muNbkdkJZBuXH9QFD5Q_BGC8FQETAtB2kH6QwP5RPDc,2940
-gam7-7.20.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-gam7-7.20.0.dist-info/entry_points.txt,sha256=HVUM5J7dA8YwvJfG30jiLefR19ExMs387TWugWd9sf4,42
-gam7-7.20.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-gam7-7.20.0.dist-info/RECORD,,
+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,,