Merge branch 'main' into empty-body

Author: kiersten-stokes

docs/source/operators/security.rst

@@ -101,7 +101,7 @@ as all requests requiring _authorization_ must first complete _authentication_.
 Identity Providers
 ******************
 
-The :class:`.IdentityProvider` class is responsible for the "authorization" step,
+The :class:`.IdentityProvider` class is responsible for the "authentication" step,
 identifying the user making the request,
 and constructing information about them.
 

jupyter_server/services/nbconvert/handlers.py

@@ -11,11 +11,16 @@
 AUTH_RESOURCE = "nbconvert"
 
 
-LOCK = asyncio.Lock()
-
-
 class NbconvertRootHandler(APIHandler):
     auth_resource = AUTH_RESOURCE
+    _exporter_lock: asyncio.Lock
+
+    def initialize(self, **kwargs):
+        super().initialize(**kwargs)
+        # share lock across instances of this handler class
+        if not hasattr(self.__class__, "_exporter_lock"):
+            self.__class__._exporter_lock = asyncio.Lock()
+        self._exporter_lock = self.__class__._exporter_lock
 
     @web.authenticated
     @authorized
@@ -28,22 +33,22 @@ async def get(self):
         # Some exporters use the filesystem when instantiating, delegate that
         # to a thread so we don't block the event loop for it.
         exporters = await run_sync(base.get_export_names)
-        for exporter_name in exporters:
-            try:
-                async with LOCK:
+        async with self._exporter_lock:
+            for exporter_name in exporters:
+                try:
                     exporter_class = await run_sync(base.get_exporter, exporter_name)
-            except ValueError:
-                # I think the only way this will happen is if the entrypoint
-                # is uninstalled while this method is running
-                continue
-            # XXX: According to the docs, it looks like this should be set to None
-            # if the exporter shouldn't be exposed to the front-end and a friendly
-            # name if it should. However, none of the built-in exports have it defined.
-            # if not exporter_class.export_from_notebook:
-            #    continue
-            res[exporter_name] = {
-                "output_mimetype": exporter_class.output_mimetype,
-            }
+                except ValueError:
+                    # I think the only way this will happen is if the entrypoint
+                    # is uninstalled while this method is running
+                    continue
+                # XXX: According to the docs, it looks like this should be set to None
+                # if the exporter shouldn't be exposed to the front-end and a friendly
+                # name if it should. However, none of the built-in exports have it defined.
+                # if not exporter_class.export_from_notebook:
+                #    continue
+                res[exporter_name] = {
+                    "output_mimetype": exporter_class.output_mimetype,
+                }
 
         self.finish(json.dumps(res))