Fix conflicts with base branch

Author: samwelkanda

.github/workflows/ci.yml

@@ -4,10 +4,8 @@
 name: msgraph-sdk-python-core
 
 on:
-  push:
-    branches: [master]
   pull_request:
-    branches: [dev]
+    branches: [master, dev]
 
 jobs:
   build:

.pypirc

@@ -5,8 +5,8 @@ index-servers =
 
 [pypi]
 repository = https://upload.pypi.org/legacy/
-username = msgraphsdkteam  # Replace with your PyPI username
+username = msgraphsdkteam
 
 [testpypi]
 repository = https://test.pypi.org/legacy/
-username = msgraphsdkteam  # Replace with your TestPyPI username
+username = msgraphsdkteam-test

README.md

@@ -1,9 +1,11 @@
 [![CI Actions Status](https://github.com/microsoftgraph/msgraph-sdk-python-core/workflows/msgraph-sdk-python-core/badge.svg)](https://github.com/microsoftgraph/msgraph-sdk-python-core/actions)
 
-## Microsoft Graph Core Python Client Library
+## Microsoft Graph Core Python Client Library (preview).
 
 The Microsoft Graph Core Python client library is a lightweight wrapper around the Microsoft Graph API. It provides functionality to create clients with desired configuration and middleware.
 
+**Disclaimer**: Please, be aware that preview versions of `msgraph-core` package are for testing purpose only. Do not use them in a production environment.
+
 ## Prerequisites
 
     Python 3.5+ (this library doesn't support older versions of Python)
@@ -15,13 +17,17 @@ The Microsoft Graph Core Python client library is a lightweight wrapper around t
 To call Microsoft Graph, your app must acquire an access token from the Microsoft identity platform. Learn more about this -
 
 -   [Authentication and authorization basics for Microsoft Graph](https://docs.microsoft.com/en-us/graph/auth/auth-concepts)
--   [Register your app with the Microsoft identity platform](https://docs.microsoft.com/en-us/graph/auth/auth-concepts)
+-   [Register your app with the Microsoft identity platform](https://docs.microsoft.com/en-us/graph/auth-register-app-v2)
 
 
 ### 2. Install the required packages
 
-    `pip install msgraph-core`
-    `pip install azure-identity`
+msgraph-core is available on PyPI.
+
+```cmd
+python -m pip install msgraph-core
+python -m pip install azure-identity
+```
 
 ### 3. Import modules
 
@@ -53,7 +59,7 @@ result = client.get('/me')
 print(result.json())
 ```
 
-For more information on how to use the package, refer to the [samples](https://github.com/microsoftgraph/msgraph-sdk-python-core/tree/dev/samples)
+For more information on how to use the package, refer to the [samples](https://github.com/microsoftgraph/msgraph-sdk-python-core/tree/dev/samples).
 
 
 ## Telemetry Metadata
@@ -66,7 +72,7 @@ View or log issues on the [Issues](https://github.com/microsoftgraph/msgraph-sdk
 
 ## Contributing
 
-Please see the [contributing guidelines](CONTRIBUTING.rst)
+Please see the [contributing guidelines](CONTRIBUTING.rst).
 
 ## Copyright and license
 

msgraph/__init__.py

@@ -2,3 +2,12 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 # -----------------------------------
+
+# pylint: disable=line-too-long
+# This is to allow complete package description on PyPI
+"""
+Core component of the Microsoft Graph Python SDK consisting of HTTP/Graph Client and a configurable middleware pipeline (Preview).
+"""
+from .core import SDK_VERSION
+
+__version__ = SDK_VERSION

msgraph/core/_constants.py

@@ -8,4 +8,4 @@
 """
 DEFAULT_REQUEST_TIMEOUT = 100
 DEFAULT_CONNECTION_TIMEOUT = 30
-SDK_VERSION = '0.1.0'
+SDK_VERSION = '0.1.2'

msgraph/core/_graph_client.py

@@ -7,6 +7,8 @@
 from ._client_factory import HTTPClientFactory
 from .middleware.request_context import RequestContext
 
+# These are middleware options that can be configured per request.
+# Supports options for default middleware as well as custom middleware.
 supported_options = [
     # Auth Options
     'scopes',
@@ -24,6 +26,7 @@
 
 
 def attach_context(func):
+    """Attaches a request context object to every graph request"""
     def wrapper(*args, **kwargs):
         middleware_control = dict()
 

msgraph/core/middleware/request_context.py

@@ -8,7 +8,22 @@
 
 
 class RequestContext:
+    """A request context contains data that is persisted throughout the request and
+    includes a ClientRequestId property, MiddlewareControl property to control behavior
+    of middleware as well as a FeatureUsage  property to keep track of middleware used
+    in making the request.
+    """
     def __init__(self, middleware_control, headers):
+        """Constructor for request context instances
+
+        Args:
+            middleware_control (dict): A dictionary of optional middleware options
+            that can be accessed by middleware components to override the options provided
+            during middleware initialization,
+
+            headers (dict): A dictionary containing the request headers. Used to check for a
+            user provided client request id.
+        """
         self.middleware_control = middleware_control
         self.client_request_id = headers.get('client-request-id', str(uuid.uuid4()))
         self._feature_usage = FeatureUsageFlag.NONE

msgraph/core/middleware/retry.py

@@ -112,31 +112,28 @@ def send(self, request, **kwargs):
         retry_valid = True
 
         while retry_valid:
-            try:
-                start_time = time.time()
+            start_time = time.time()
+            if retry_count > 0:
                 request.headers.update({'retry-attempt': '{}'.format(retry_count)})
-                request.context.set_feature_usage = FeatureUsageFlag.RETRY_HANDLER_ENABLED
-                response = super().send(request, **kwargs)
-                # Check if the request needs to be retried based on the response method
-                # and status code
-                if self.should_retry(retry_options, response):
-                    # check that max retries has not been hit
-                    retry_valid = self.check_retry_valid(retry_options, retry_count)
-
-                    # Get the delay time between retries
-                    delay = self.get_delay_time(retry_options, retry_count, response)
-
-                    if retry_valid and delay < absolute_time_limit:
-                        time.sleep(delay)
-                        end_time = time.time()
-                        absolute_time_limit -= (end_time - start_time)
-                        # increment the count for retries
-                        retry_count += 1
-
-                        continue
-                break
-            except Exception as error:
-                raise error
+            response = super().send(request, **kwargs)
+            # Check if the request needs to be retried based on the response method
+            # and status code
+            if self.should_retry(retry_options, response):
+                # check that max retries has not been hit
+                retry_valid = self.check_retry_valid(retry_options, retry_count)
+
+                # Get the delay time between retries
+                delay = self.get_delay_time(retry_options, retry_count, response)
+
+                if retry_valid and delay < absolute_time_limit:
+                    time.sleep(delay)
+                    end_time = time.time()
+                    absolute_time_limit -= (end_time - start_time)
+                    # increment the count for retries
+                    retry_count += 1
+
+                    continue
+            break
         return response
 
     def should_retry(self, retry_options, response):

pyproject.toml

@@ -6,12 +6,9 @@ build-backend = "flit_core.buildapi"
 module = "msgraph"
 author = "Microsoft"
 author-email = "[email protected]"
-home-page="https://github.com/microsoftgraph/msgraph-sdk-python-core"
+home-page = "https://github.com/microsoftgraph/msgraph-sdk-python-core"
 dist-name="msgraph-core"
-requires=[
-    "requests >= 2.23.0",
-]
 requires-python=">=3.5"
-classifiers = ["License :: OSI Approved :: MIT License"]
+classifiers = [ "License :: OSI Approved :: MIT License",]
 description-file = "README.md"
 

samples/retry_handler_samples.py

@@ -19,7 +19,7 @@
 
 def sample_http_client_with_custom_retry_defaults():
     """
-    Initializing a sample client with default middleware using the HTTPClientand passing
+    Initializing a sample client with default middleware using the HTTPClient and passing
     default configs to the retryhandler. These defaults will be used for every subsequent
     request using the client."""