Merge branch 'dependencies' into deps

jasonjoh · jasonjoh · commit 39a50c632208 · 2023-06-28T10:18:54.000-04:00
diff --git a/app-auth/graphapponlytutorial/main.py b/app-auth/graphapponlytutorial/main.py
@@ -4,6 +4,7 @@
 # <ProgramSnippet>
 import asyncio
 import configparser
+from msgraph.generated.models.o_data_errors.o_data_error import ODataError
 from graph import Graph
 
 async def main():
@@ -30,16 +31,21 @@ async def main():
         except ValueError:
             choice = -1
 
-        if choice == 0:
-            print('Goodbye...')
-        elif choice == 1:
-            await display_access_token(graph)
-        elif choice == 2:
-            await list_users(graph)
-        elif choice == 3:
-            await make_graph_call(graph)
-        else:
-            print('Invalid choice!\n')
+        try:
+            if choice == 0:
+                print('Goodbye...')
+            elif choice == 1:
+                await display_access_token(graph)
+            elif choice == 2:
+                await list_users(graph)
+            elif choice == 3:
+                await make_graph_call(graph)
+            else:
+                print('Invalid choice!\n')
+        except ODataError as odata_error:
+            print('Error:')
+            if odata_error.error:
+                print(odata_error.error.code, odata_error.error.message)
 # </ProgramSnippet>
 
 # <DisplayAccessTokenSnippet>
@@ -53,7 +59,7 @@ async def list_users(graph: Graph):
     users_page = await graph.get_users()
 
     # Output each users's details
-    if users_page is not None and users_page.value is not None:
+    if users_page and users_page.value:
         for user in users_page.value:
             print('User:', user.display_name)
             print('  ID:', user.id)
diff --git a/app-auth/graphapponlytutorial/pylintrc b/app-auth/graphapponlytutorial/pylintrc
@@ -576,5 +576,5 @@ preferred-modules=
 
 # Exceptions that will emit a warning when being caught. Defaults to
 # "BaseException, Exception".
-overgeneral-exceptions=BaseException,
-                       Exception
+overgeneral-exceptions=builtins.BaseException,
+                       builtins.Exception
diff --git a/app-auth/graphapponlytutorial/requirements.txt b/app-auth/graphapponlytutorial/requirements.txt
@@ -1,43 +1,45 @@
 #
-# This file is autogenerated by pip-compile with python 3.10
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.10
+# by the following command:
 #
 #    pip-compile --output-file=requirements.txt --resolver=backtracking
 #
-aiohttp==3.8.3
+aiohttp==3.8.4
     # via microsoft-kiota-authentication-azure
 aiosignal==1.3.1
     # via aiohttp
-anyio==3.6.2
+anyio==3.7.0
     # via httpcore
 async-timeout==4.0.2
     # via aiohttp
-attrs==22.2.0
+attrs==23.1.0
     # via aiohttp
-azure-core==1.26.2
+azure-core==1.27.1
     # via
     #   azure-identity
     #   microsoft-kiota-authentication-azure
-azure-identity==1.12.0
+azure-identity==1.13.0
     # via
     #   -r requirements.in
     #   msgraph-sdk
-certifi==2022.12.7
+certifi==2023.5.7
     # via
     #   httpcore
     #   httpx
     #   requests
 cffi==1.15.1
     # via cryptography
-charset-normalizer==2.1.1
+charset-normalizer==3.1.0
     # via
     #   aiohttp
     #   requests
-cryptography==39.0.1
+cryptography==41.0.1
     # via
     #   azure-identity
     #   msal
     #   pyjwt
+exceptiongroup==1.1.1
+    # via anyio
 frozenlist==1.3.3
     # via
     #   aiohttp
@@ -48,9 +50,9 @@ h2==4.1.0
     # via httpx
 hpack==4.0.0
     # via h2
-httpcore==0.16.3
+httpcore==0.17.2
     # via httpx
-httpx[http2]==0.23.3
+httpx[http2]==0.24.1
     # via
     #   microsoft-kiota-http
     #   msgraph-core
@@ -59,10 +61,10 @@ hyperframe==6.0.1
 idna==3.4
     # via
     #   anyio
+    #   httpx
     #   requests
-    #   rfc3986
     #   yarl
-microsoft-kiota-abstractions==0.5.0
+microsoft-kiota-abstractions==0.5.5
     # via
     #   microsoft-kiota-authentication-azure
     #   microsoft-kiota-http
@@ -72,19 +74,19 @@ microsoft-kiota-abstractions==0.5.0
     #   msgraph-sdk
 microsoft-kiota-authentication-azure==0.2.0
     # via msgraph-sdk
-microsoft-kiota-http==0.3.1
+microsoft-kiota-http==0.4.4
     # via msgraph-core
-microsoft-kiota-serialization-json==0.3.1
+microsoft-kiota-serialization-json==0.3.6
     # via msgraph-sdk
-microsoft-kiota-serialization-text==0.2.0
+microsoft-kiota-serialization-text==0.2.1
     # via msgraph-sdk
-msal==1.20.0
+msal==1.22.0
     # via
     #   azure-identity
     #   msal-extensions
 msal-extensions==1.0.0
     # via azure-identity
-msgraph-core==1.0.0a3
+msgraph-core==1.0.0a4
     # via msgraph-sdk
 msgraph-sdk==1.0.0a12
     # via -r requirements.in
@@ -96,18 +98,16 @@ portalocker==2.7.0
     # via msal-extensions
 pycparser==2.21
     # via cffi
-pyjwt[crypto]==2.6.0
+pyjwt[crypto]==2.7.0
     # via msal
 python-dateutil==2.8.2
     # via
     #   microsoft-kiota-serialization-json
     #   microsoft-kiota-serialization-text
-requests==2.28.2
+requests==2.31.0
     # via
     #   azure-core
     #   msal
-rfc3986[idna2008]==1.5.0
-    # via httpx
 six==1.16.0
     # via
     #   azure-core
@@ -118,11 +118,11 @@ sniffio==1.3.0
     #   anyio
     #   httpcore
     #   httpx
-typing-extensions==4.4.0
+typing-extensions==4.6.3
     # via azure-core
 uritemplate==4.1.1
     # via microsoft-kiota-abstractions
-urllib3==1.26.14
+urllib3==2.0.3
     # via requests
-yarl==1.8.2
+yarl==1.9.2
     # via aiohttp
diff --git a/user-auth/graphtutorial/graph.py b/user-auth/graphtutorial/graph.py
@@ -72,7 +72,7 @@ async def get_inbox(self):
             query_parameters= query_params
         )
 
-        messages = await self.user_client.me.mail_folders_by_id('inbox').messages.get(
+        messages = await self.user_client.me.mail_folders.by_mail_folder_id('inbox').messages.get(
                 request_configuration=request_config)
         return messages
     # </GetInboxSnippet>
diff --git a/user-auth/graphtutorial/main.py b/user-auth/graphtutorial/main.py
@@ -4,6 +4,7 @@
 # <ProgramSnippet>
 import asyncio
 import configparser
+from msgraph.generated.models.o_data_errors.o_data_error import ODataError
 from graph import Graph
 
 async def main():
@@ -33,24 +34,29 @@ async def main():
         except ValueError:
             choice = -1
 
-        if choice == 0:
-            print('Goodbye...')
-        elif choice == 1:
-            await display_access_token(graph)
-        elif choice == 2:
-            await list_inbox(graph)
-        elif choice == 3:
-            await send_mail(graph)
-        elif choice == 4:
-            await make_graph_call(graph)
-        else:
-            print('Invalid choice!\n')
+        try:
+            if choice == 0:
+                print('Goodbye...')
+            elif choice == 1:
+                await display_access_token(graph)
+            elif choice == 2:
+                await list_inbox(graph)
+            elif choice == 3:
+                await send_mail(graph)
+            elif choice == 4:
+                await make_graph_call(graph)
+            else:
+                print('Invalid choice!\n')
+        except ODataError as odata_error:
+            print('Error:')
+            if odata_error.error:
+                print(odata_error.error.code, odata_error.error.message)
 # </ProgramSnippet>
 
 # <GreetUserSnippet>
 async def greet_user(graph: Graph):
     user = await graph.get_user()
-    if user is not None:
+    if user:
         print('Hello,', user.display_name)
         # For Work/school accounts, email is in mail property
         # Personal accounts, email is in userPrincipalName
@@ -66,13 +72,13 @@ async def display_access_token(graph: Graph):
 # <ListInboxSnippet>
 async def list_inbox(graph: Graph):
     message_page = await graph.get_inbox()
-    if message_page is not None and message_page.value is not None:
+    if message_page and message_page.value:
         # Output each message's details
         for message in message_page.value:
             print('Message:', message.subject)
             if (
-                message.from_ is not None and
-                message.from_.email_address is not None
+                message.from_ and
+                message.from_.email_address
             ):
                 print('  From:', message.from_.email_address.name or 'NONE')
             else:
@@ -90,7 +96,7 @@ async def send_mail(graph: Graph):
     # Send mail to the signed-in user
     # Get the user for their email address
     user = await graph.get_user()
-    if user is not None:
+    if user:
         user_email = user.mail or user.user_principal_name
 
         await graph.send_mail('Testing Microsoft Graph', 'Hello world!', user_email or '')
diff --git a/user-auth/graphtutorial/pylintrc b/user-auth/graphtutorial/pylintrc
@@ -576,5 +576,5 @@ preferred-modules=
 
 # Exceptions that will emit a warning when being caught. Defaults to
 # "BaseException, Exception".
-overgeneral-exceptions=BaseException,
-                       Exception
+overgeneral-exceptions=builtins.BaseException,
+                       builtins.Exception
diff --git a/user-auth/graphtutorial/requirements.txt b/user-auth/graphtutorial/requirements.txt

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ async def get_inbox(self):`
`72`	`72`	`query_parameters= query_params`
`73`	`73`	`)`
`74`	`74`
`75`		`- messages = await self.user_client.me.mail_folders_by_id('inbox').messages.get(`
	`75`	`+ messages = await self.user_client.me.mail_folders.by_mail_folder_id('inbox').messages.get(`
`76`	`76`	`request_configuration=request_config)`
`77`	`77`	`return messages`
`78`	`78`	`# </GetInboxSnippet>`