Use keyword arguments to pass config to the graph client and client factory

Author: samwelkanda

msgraphcore/client_factory.py

@@ -15,20 +15,17 @@ class HTTPClientFactory:
     Constructs HTTP Client(session) instances configured with either custom or default
     pipeline of middleware.
     """
-    def __init__(self, session: Optional[Session], **kwargs):
+    def __init__(self, **kwargs):
         """Class constructor that accepts a user provided session object and kwargs
         to configure the request handling behaviour of the client"""
-        self.api_version = kwargs.get("api_version", APIVersion.v1)
+        self.api_version = kwargs.get('api_version', APIVersion.v1)
         self.endpoint = kwargs.get('cloud', NationalClouds.Global)
         self.timeout = kwargs.get('timeout', (CONNECTION_TIMEOUT, REQUEST_TIMEOUT))
-        self.base_url = self._get_base_url()
-        if session:
-            self.session = session
-        else:
-            self.session = Session()
-            self._set_default_timeout()
+        self.session = kwargs.get('session', Session())
+
+        self._get_base_url()
+        self._set_default_timeout()
 
-    # should this be a class method
     def create_with_default_middleware(self, credential: TokenCredential, **kwargs) -> Session:
         """Applies the default middleware chain to the HTTP Client"""
         middleware = [
@@ -46,7 +43,8 @@ def create_with_custom_middleware(self, middleware: [BaseMiddleware]) -> Session
 
     def _get_base_url(self):
         """Helper method to get the base url"""
-        return self.endpoint + '/' + self.api_version
+        base_url = self.endpoint + '/' + self.api_version
+        self.session.base_url = base_url
 
     def _set_default_timeout(self):
         """Helper method to set a default timeout for the session

msgraphcore/graph_client.py

@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import List, Optional
 
 from requests import Session
 
@@ -10,15 +10,12 @@
 
 class GraphClient:
     """Constructs a custom HTTPClient to be used for requests against Microsoft Graph"""
-    def __init__(
-        self, credential: Optional[TokenCredential], session: Optional[Session],
-        middleware: Optional[[BaseMiddleware]], **kwargs
-    ):
+    def __init__(self, **kwargs):
         """
         Class constructor that accepts a session object and kwargs to
         be passed to the HTTPClientFactory
         """
-        self.graph_session = get_graph_session(credential, session, middleware, **kwargs)
+        self.graph_session = get_graph_session(**kwargs)
 
     @middleware_control.get_middleware_options
     def get(self, url: str, **kwargs):
@@ -83,22 +80,21 @@ def _graph_url(self, url: str) -> str:
 _INSTANCE = None
 
 
-def get_graph_session(
-    credential: Optional[TokenCredential], session: Optional[Session],
-    middleware: Optional[[BaseMiddleware]], **kwargs
-):
+def get_graph_session(**kwargs):
     """Method to always return a single instance of a HTTP Client"""
+
     global _INSTANCE
 
+    credential = kwargs.get('credential')
+    middleware = kwargs.get('middleware')
+
     if credential and middleware:
         raise Exception("Invalid parameters! Both TokenCredential and middleware cannot be passed")
     if not credential and not middleware:
         raise ValueError("Invalid parameters!. Missing TokenCredential or middleware")
     if _INSTANCE is None:
         if credential:
-            _INSTANCE = HTTPClientFactory(session,
-                                          **kwargs).create_with_default_middleware(credential)
+            _INSTANCE = HTTPClientFactory(**kwargs).create_with_default_middleware(credential)
         elif middleware:
-            _INSTANCE = HTTPClientFactory(session,
-                                          **kwargs).create_with_custom_middleware(middleware)
+            _INSTANCE = HTTPClientFactory(**kwargs).create_with_custom_middleware(middleware)
     return _INSTANCE