api: only write api specs if is_gunicorn

materialsproject · Aug 27, 2021 · 4cb85dd · 4cb85dd
1 parent a2e4a61
commit 4cb85dd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/mpcontribs-api/main.sh → mpcontribs-api/main.py b/mpcontribs-api/main.sh → mpcontribs-api/main.py
diff --git a/mpcontribs-api/mpcontribs/api/__init__.py b/mpcontribs-api/mpcontribs/api/__init__.py
@@ -33,6 +33,8 @@
 delimiter, max_depth = ".", 4
 invalidChars = set(punctuation.replace("*", ""))
 invalidChars.add(" ")
+is_gunicorn = "gunicorn" in os.environ.get("SERVER_SOFTWARE", "")
+
 
 for mod in [
     "matplotlib",
@@ -208,9 +210,6 @@ def create_app():
         except AttributeError as ex:
             logger.error(f"Failed to register {module_path}: {collection} {ex}")
 
-    # only load/register what's needed when run as part of `flask rq worker/scheduler` (not gunicorn)
-    is_gunicorn = "gunicorn" in os.environ.get("SERVER_SOFTWARE", "")
-
     if app.kernels:
         from mpcontribs.api.notebooks.views import rq, make
         rq.init_app(app)

diff --git a/mpcontribs-api/mpcontribs/api/core.py b/mpcontribs-api/mpcontribs/api/core.py
@@ -17,6 +17,7 @@
 from mongoengine.queryset.visitor import Q
 from werkzeug.exceptions import Unauthorized
 from mpcontribs.api.config import DOC_DIR
+from mpcontribs.api import is_gunicorn
 
 logger = logging.getLogger("app")
 
@@ -448,11 +449,12 @@ def __init__(cls, name, bases, d):
                         if not os.path.exists(file_path):
                             os.makedirs(dir_path, exist_ok=True)
 
-                        with open(file_path, "w") as f:
-                            yaml.dump(spec, f)
-                            logger.warning(
-                                f"{cls.tags[0]}.{method.__name__} written to {file_path}"
-                            )
+                        if is_gunicorn:
+                            with open(file_path, "w") as f:
+                                yaml.dump(spec, f)
+                                logger.warning(
+                                    f"{cls.tags[0]}.{method.__name__} written to {file_path}"
+                                )
 
 
 class SwaggerView(OriginalSwaggerView, ResourceView, metaclass=SwaggerViewType):