Moved app_fastapi to app.

Dockerfile

@@ -123,12 +123,12 @@ COPY --from=build /install/docs/.build /app/docs/.build
 COPY --from=build /usr/local/bin/nomad /usr/bin/nomad
 # copy the gui
 RUN mkdir -p /app/gui
-COPY --from=gui_build /app/build /app/nomad/app_fastapi/flask/static/gui
+COPY --from=gui_build /app/build /app/nomad/app/flask/static/gui
 # copy the encyclopedia gui production code
-COPY --from=gui_build /encyclopedia /app/nomad/app_fastapi/flask/static/encyclopedia
+COPY --from=gui_build /encyclopedia /app/nomad/app/flask/static/encyclopedia
 # remove the developer config on the gui, will be generated by run.sh from nomad.yaml
-RUN rm -f /app/nomad/app_fastapi/flask/static/gui/env.js
-RUN rm -f /app/nomad/app_fastapi/flask/static/encyclopedia/conf.js
+RUN rm -f /app/nomad/app/flask/static/gui/env.js
+RUN rm -f /app/nomad/app/flask/static/encyclopedia/conf.js
 # build the python package dist
 RUN python setup.py compile
 RUN python setup.py sdist

docs/api_reference.rst

@@ -11,7 +11,7 @@ consult our *swagger* dashboards:
 Summary
 -------
 
-.. qrefflask:: nomad.app_fastapi.flask:app
+.. qrefflask:: nomad.app.flask:app
   :undoc-static:
 
 
@@ -19,5 +19,5 @@ Summary
 API(s) Details
 --------------
 
-.. autoflask:: nomad.app_fastapi.flask:app
+.. autoflask:: nomad.app.flask:app
   :undoc-static:

nomad/app_fastapi/flask/api/__init__.py → nomad/app/flask/api/__init__.py

@@ -21,11 +21,11 @@ The official NOMAD API.
 
 There is a separate documentation for the API endpoints from a client perspective.
 
-.. automodule:: nomad.app_fastapi.flask.api.api
-.. automodule:: nomad.app_fastapi.flask.api.auth
-.. automodule:: nomad.app_fastapi.flask.api.upload
-.. automodule:: nomad.app_fastapi.flask.api.repo
-.. automodule:: nomad.app_fastapi.flask.api.archive
+.. automodule:: nomad.app.flask.api.api
+.. automodule:: nomad.app.flask.api.auth
+.. automodule:: nomad.app.flask.api.upload
+.. automodule:: nomad.app.flask.api.repo
+.. automodule:: nomad.app.flask.api.archive
 '''
 
 from .api import api, blueprint

nomad/app_fastapi/flask/api/common.py → nomad/app/flask/api/common.py

@@ -35,7 +35,7 @@ import gzip
 from functools import wraps
 
 from nomad import search, config, datamodel, utils
-from nomad.app_fastapi.optimade import filterparser
+from nomad.app.optimade import filterparser
 from nomad.files import Restricted
 
 from ..common import RFC3339DateTime, rfc3339DateTime