Merge remote-tracking branch 'origin/task/refactor-graph-session' into task/refactor-graph-session

Author: jobala

msgraphcore/graph_session.py

@@ -21,7 +21,7 @@ def __init__(self,
                  middleware: list = []
                  ):
         super().__init__()
-        self.headers.update({'sdkVersion': 'graph-python-' + SDK_VERSION})
+        self._append_sdk_version()
         self._base_url = BASE_URL
 
         auth_handler = AuthorizationHandler(credential, scopes)
@@ -107,3 +107,12 @@ def _register(self, middleware: [BaseMiddleware]) -> None:
                 middleware_pipeline.add_middleware(ware)
 
             self.mount('https://', middleware_pipeline)
+
+    def _append_sdk_version(self) -> None:
+        """Updates sdkVersion in headers with comma-separated new values
+        """
+        if 'sdkVersion' in self.headers:
+            self.headers.update({'sdkVersion': 'graph-python-' + SDK_VERSION + ', '
+                                               + self.headers.get('sdkVersion')})
+        else:
+            self.headers.update({'sdkVersion': 'graph-python-' + SDK_VERSION})

tests/unit/test_graph_session.py

@@ -23,7 +23,11 @@ def test_has_graph_url_as_base_url(self):
         self.assertEqual(self.requests._base_url, BASE_URL)
 
     def test_has_sdk_version_header(self):
-        self.assertEqual(self.requests.headers.get('sdkVersion'), 'graph-python-'+SDK_VERSION)
+        self.assertTrue('sdkVersion' in self.requests.headers)
+
+    def test_updated_sdk_version(self):
+        self.assertTrue(self.requests.headers.get('sdkVersion')
+                        .startswith('graph-python-'+SDK_VERSION))
 
     def test_initialized_with_middlewares(self):
         graph_session = GraphSession(self.credential)