Changed _get_endpoint_for_user_filter to static and used in constructor class instead of each class method

Author: lucabem

jupyter_server/gateway/managers.py

@@ -494,11 +494,20 @@ class GatewayKernelSpecManager(KernelSpecManager):
 
     def __init__(self, **kwargs):
         super(GatewayKernelSpecManager, self).__init__(**kwargs)
-        self.base_endpoint = url_path_join(GatewayClient.instance().url,
-                                           GatewayClient.instance().kernelspecs_endpoint)
+        base_endpoint = url_path_join(GatewayClient.instance().url,
+                                      GatewayClient.instance().kernelspecs_endpoint)
+
+        self.base_endpoint = GatewayKernelSpecManager._get_endpoint_for_user_filter(base_endpoint)
         self.base_resource_endpoint = url_path_join(GatewayClient.instance().url,
                                                     GatewayClient.instance().kernelspecs_resource_endpoint)
 
+    @staticmethod
+    def _get_endpoint_for_user_filter(default_endpoint):
+        kernel_user = os.environ.get('KERNEL_USERNAME')
+        if kernel_user:
+            return '?user='.join([default_endpoint, kernel_user])
+        return default_endpoint
+
     def _get_kernelspecs_endpoint_url(self, kernel_name=None):
         """Builds a url for the kernels endpoint
 
@@ -511,14 +520,8 @@ def _get_kernelspecs_endpoint_url(self, kernel_name=None):
 
         return self.base_endpoint
 
-    def _get_endpoint_for_user_filter(self, default_endpoint):
-        kernel_user = os.environ.get('KERNEL_USERNAME')
-        if kernel_user:
-            return '?user='.join([default_endpoint, kernel_user])
-        return default_endpoint
-
     async def get_all_specs(self):
-        fetched_kspecs = yield self.list_kernel_specs()
+        fetched_kspecs = await self.list_kernel_specs()
 
         # get the default kernel name and compare to that of this server.
         # If different log a warning and reset the default.  However, the
@@ -539,9 +542,6 @@ async def get_all_specs(self):
     async def list_kernel_specs(self):
         """Get a list of kernel specs."""
         kernel_spec_url = self._get_kernelspecs_endpoint_url()
-
-        kernel_spec_url = self._get_endpoint_for_user_filter(kernel_spec_url)
-
         self.log.debug("Request list kernel specs at: %s", kernel_spec_url)
         response = await gateway_request(kernel_spec_url, method='GET')
         kernel_specs = json_decode(response.body)
@@ -556,9 +556,6 @@ async def get_kernel_spec(self, kernel_name, **kwargs):
             The name of the kernel.
         """
         kernel_spec_url = self._get_kernelspecs_endpoint_url(kernel_name=str(kernel_name))
-
-        kernel_spec_url = self._get_endpoint_for_user_filter(kernel_spec_url)
-
         self.log.debug("Request kernel spec at: %s" % kernel_spec_url)
         try:
             response = await gateway_request(kernel_spec_url, method='GET')
@@ -588,7 +585,6 @@ async def get_kernel_spec_resource(self, kernel_name, path):
             The name of the desired resource
         """
         kernel_spec_resource_url = url_path_join(self.base_resource_endpoint, str(kernel_name), str(path))
-        kernel_spec_resource_url = self._get_endpoint_for_user_filter(kernel_spec_resource_url)
         self.log.debug("Request kernel spec resource '{}' at: {}".format(path, kernel_spec_resource_url))
         try:
             response = await gateway_request(kernel_spec_resource_url, method='GET')