formatting minor changes, model updated

Author: vgrem

examples/auth/gcc_high.py

@@ -33,5 +33,5 @@ def construct_request(request):
 
 
 client = GraphClient(acquire_token)
-client.before_execute(construct_request)
+client.pending_request().beforeExecute += construct_request
 messages = client.users[test_user_principal_name].messages.get().execute_query()

examples/sharepoint/sites/get_status.py

@@ -1,9 +1,12 @@
 """
 Returns a SharePoint site status
 """
+
 from office365.sharepoint.client_context import ClientContext
-from tests import test_team_site_url, test_admin_site_url, test_admin_credentials
+from tests import test_admin_credentials, test_admin_site_url, test_team_site_url
 
-admin_client = ClientContext(test_admin_site_url).with_credentials(test_admin_credentials)
+admin_client = ClientContext(test_admin_site_url).with_credentials(
+    test_admin_credentials
+)
 result = admin_client.site_manager.get_status(test_team_site_url).execute_query()
 print(result.value)

generator/import_metadata.py

@@ -26,13 +26,13 @@ def export_to_file(path, content):
     "--endpoint",
     dest="endpoint",
     help="Import metadata endpoint",
-    default="sharepoint",
+    default="graph",
 )
 parser.add_argument(
     "-p",
     "--path",
     dest="path",
-    default="./metadata/SharePoint.xml",
+    default="./metadata/MicrosoftGraph.xml",
     help="Import metadata endpoint",
 )
 
@@ -43,7 +43,7 @@ def export_to_file(path, content):
     ctx = ClientContext(test_site_url).with_credentials(test_client_credentials)
     result = ctx.get_metadata().execute_query()
     export_to_file(args.path, result.value)
-elif args.endpoint == "microsoftgraph":
+elif args.endpoint == "graph":
     print("Importing Microsoft Graph model metadata...")
     client = GraphClient.with_client_secret(
         test_tenant, test_client_id, test_client_secret

generator/metadata/MicrosoftGraph.xml

@@ -21928,6 +21928,7 @@
             <Member Name="required" Value="0"/>
             <Member Name="recommended" Value="1"/>
             <Member Name="unknownFutureValue" Value="2"/>
+            <Member Name="peerRecommended" Value="3"/>
          </EnumType>
          <EnumType Name="courseStatus">
             <Member Name="notStarted" Value="0"/>
@@ -22367,7 +22368,7 @@
             <NavigationProperty Name="managedAppRegistrations" Type="Collection(graph.managedAppRegistration)"/>
             <NavigationProperty Name="deviceManagementTroubleshootingEvents" Type="Collection(graph.deviceManagementTroubleshootingEvent)" ContainsTarget="true"/>
             <NavigationProperty Name="planner" Type="graph.plannerUser" ContainsTarget="true"/>
-            <NavigationProperty Name="insights" Type="graph.officeGraphInsights" ContainsTarget="true"/>
+            <NavigationProperty Name="insights" Type="graph.itemInsights" ContainsTarget="true"/>
             <NavigationProperty Name="settings" Type="graph.userSettings" ContainsTarget="true"/>
             <NavigationProperty Name="onenote" Type="graph.onenote" ContainsTarget="true"/>
             <NavigationProperty Name="cloudClipboard" Type="graph.cloudClipboardRoot" ContainsTarget="true"/>
@@ -22850,11 +22851,13 @@
             <NavigationProperty Name="trending" Type="Collection(graph.trending)" ContainsTarget="true"/>
             <NavigationProperty Name="used" Type="Collection(graph.usedInsight)" ContainsTarget="true"/>
          </EntityType>
+         <EntityType Name="itemInsights" BaseType="graph.officeGraphInsights"/>
          <EntityType Name="userSettings" BaseType="graph.entity">
             <Property Name="contributionToContentDiscoveryAsOrganizationDisabled" Type="Edm.Boolean" Nullable="false"/>
             <Property Name="contributionToContentDiscoveryDisabled" Type="Edm.Boolean" Nullable="false"/>
             <NavigationProperty Name="windows" Type="Collection(graph.windowsSetting)" ContainsTarget="true"/>
             <NavigationProperty Name="shiftPreferences" Type="graph.shiftPreferences" ContainsTarget="true"/>
+            <NavigationProperty Name="storage" Type="graph.userStorage" ContainsTarget="true"/>
          </EntityType>
          <EntityType Name="onenote" BaseType="graph.entity">
             <NavigationProperty Name="notebooks" Type="Collection(graph.notebook)" ContainsTarget="true"/>
@@ -26388,6 +26391,7 @@
          <EntityType Name="peopleAdminSettings" BaseType="graph.entity">
             <NavigationProperty Name="profileCardProperties" Type="Collection(graph.profileCardProperty)" ContainsTarget="true"/>
             <NavigationProperty Name="pronouns" Type="graph.pronounsSettings" ContainsTarget="true"/>
+            <NavigationProperty Name="itemInsights" Type="graph.insightsSettings" ContainsTarget="true"/>
          </EntityType>
          <EntityType Name="browserSharedCookie" BaseType="graph.entity">
             <Property Name="comment" Type="Edm.String" Nullable="false"/>
@@ -27756,6 +27760,10 @@
          </EntityType>
          <EntityType Name="storage">
             <NavigationProperty Name="fileStorage" Type="graph.fileStorage" ContainsTarget="true"/>
+            <NavigationProperty Name="settings" Type="graph.storageSettings" ContainsTarget="true"/>
+         </EntityType>
+         <EntityType Name="storageSettings" BaseType="graph.entity">
+            <NavigationProperty Name="quota" Type="graph.unifiedStorageQuota" ContainsTarget="true"/>
          </EntityType>
          <ComplexType Name="accessAction" OpenType="true"/>
          <ComplexType Name="album">
@@ -32020,6 +32028,9 @@
          <EntityType Name="shiftPreferences" BaseType="graph.changeTrackedEntity">
             <Property Name="availability" Type="Collection(graph.shiftAvailability)"/>
          </EntityType>
+         <EntityType Name="userStorage" BaseType="graph.entity">
+            <NavigationProperty Name="quota" Type="graph.unifiedStorageQuota" ContainsTarget="true"/>
+         </EntityType>
          <ComplexType Name="CopyNotebookModel">
             <Property Name="createdBy" Type="Edm.String"/>
             <Property Name="createdByIdentity" Type="graph.identitySet"/>
@@ -32218,6 +32229,10 @@
          <EntityType Name="pronounsSettings" BaseType="graph.entity">
             <Property Name="isEnabledInOrganization" Type="Edm.Boolean" Nullable="false"/>
          </EntityType>
+         <EntityType Name="insightsSettings" BaseType="graph.entity">
+            <Property Name="disabledForGroup" Type="Edm.String"/>
+            <Property Name="isEnabledInOrganization" Type="Edm.Boolean"/>
+         </EntityType>
          <ComplexType Name="approvalSettings">
             <Property Name="approvalMode" Type="Edm.String"/>
             <Property Name="approvalStages" Type="Collection(graph.unifiedApprovalStage)"/>
@@ -34001,6 +34016,21 @@
             <NavigationProperty Name="extensions" Type="Collection(graph.extension)" ContainsTarget="true"/>
             <NavigationProperty Name="linkedResources" Type="Collection(graph.linkedResource)" ContainsTarget="true"/>
          </EntityType>
+         <EntityType Name="storageQuotaBreakdown" BaseType="graph.entity">
+            <Property Name="displayName" Type="Edm.String"/>
+            <Property Name="manageWebUrl" Type="Edm.String"/>
+            <Property Name="used" Type="Edm.Int64"/>
+         </EntityType>
+         <EntityType Name="serviceStorageQuotaBreakdown" BaseType="graph.storageQuotaBreakdown"/>
+         <EntityType Name="unifiedStorageQuota" BaseType="graph.entity">
+            <Property Name="deleted" Type="Edm.Int64"/>
+            <Property Name="manageWebUrl" Type="Edm.String"/>
+            <Property Name="remaining" Type="Edm.Int64"/>
+            <Property Name="state" Type="Edm.String"/>
+            <Property Name="total" Type="Edm.Int64"/>
+            <Property Name="used" Type="Edm.Int64"/>
+            <NavigationProperty Name="services" Type="Collection(graph.serviceStorageQuotaBreakdown)" ContainsTarget="true"/>
+         </EntityType>
          <EntityType Name="employeeExperience">
             <NavigationProperty Name="learningCourseActivities" Type="Collection(graph.learningCourseActivity)" ContainsTarget="true"/>
             <NavigationProperty Name="learningProviders" Type="Collection(graph.learningProvider)" ContainsTarget="true"/>
@@ -38192,6 +38222,12 @@
             <Parameter Name="TimeZoneStandard" Type="graph.timeZoneStandard" Nullable="false"/>
             <ReturnType Type="Collection(graph.timeZoneInformation)" Nullable="false"/>
          </Function>
+         <Action Name="permanentDelete" IsBound="true">
+            <Parameter Name="bindingParameter" Type="graph.fileStorageContainer"/>
+         </Action>
+         <Action Name="permanentDelete" IsBound="true">
+            <Parameter Name="bindingParameter" Type="graph.driveItem"/>
+         </Action>
          <Action Name="remove" IsBound="true">
             <Parameter Name="bindingParameter" Type="Collection(graph.site)"/>
             <Parameter Name="value" Type="Collection(graph.site)"/>
@@ -38283,9 +38319,6 @@
             <Parameter Name="clientContext" Type="Edm.String" Unicode="false"/>
             <ReturnType Type="graph.inviteParticipantsOperation"/>
          </Action>
-         <Action Name="permanentDelete" IsBound="true">
-            <Parameter Name="bindingParameter" Type="graph.driveItem"/>
-         </Action>
          <Action Name="preview" IsBound="true">
             <Parameter Name="bindingParameter" Type="graph.driveItem"/>
             <Parameter Name="page" Type="Edm.String" Unicode="false"/>

office365/onedrive/driveitems/driveItem.py

@@ -502,9 +502,9 @@ def _process_response(resp):
 
             payload = {"name": name, "parentReference": parent_reference}
             qry = ServiceOperationQuery(self, "copy", None, payload, None, return_type)
-            self.context.add_query(qry).before_query_execute(_create_request).after_execute(
-                _process_response
-            )
+            self.context.add_query(qry).before_query_execute(
+                _create_request
+            ).after_execute(_process_response)
 
         if isinstance(parent, DriveItem):