Commit aa321ca9 authored by Markus Scheidgen's avatar Markus Scheidgen
Browse files

Moved old app to flask.

parent f919592b
......@@ -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/static/gui
COPY --from=gui_build /app/build /app/nomad/app_fastapi/flask/static/gui
# copy the encyclopedia gui production code
COPY --from=gui_build /encyclopedia /app/nomad/app/static/encyclopedia
COPY --from=gui_build /encyclopedia /app/nomad/app_fastapi/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/static/gui/env.js
RUN rm -f /app/nomad/app/static/encyclopedia/conf.js
RUN rm -f /app/nomad/app_fastapi/flask/static/gui/env.js
RUN rm -f /app/nomad/app_fastapi/flask/static/encyclopedia/conf.js
# build the python package dist
RUN python setup.py compile
RUN python setup.py sdist
......
Subproject commit 6566fba137ccfd725b1b902febc59f680c89b561
Subproject commit 1e27a32e5626ba8c7e1a97bc5564ccd2998df559
Subproject commit 4c9ffd8c1d6bb99ffa263b279807d979040fbc50
Subproject commit 3ef48d14dcd5114b8be91776f72cff550c96e817
......@@ -11,7 +11,7 @@ consult our *swagger* dashboards:
Summary
-------
.. qrefflask:: nomad.app:app
.. qrefflask:: nomad.app_fastapi.flask:app
:undoc-static:
......@@ -19,5 +19,5 @@ Summary
API(s) Details
--------------
.. autoflask:: nomad.app:app
.. autoflask:: nomad.app_fastapi.flask:app
:undoc-static:
......@@ -21,11 +21,11 @@ The official NOMAD API.
There is a separate documentation for the API endpoints from a client perspective.
.. automodule:: nomad.app.api.api
.. automodule:: nomad.app.api.auth
.. automodule:: nomad.app.api.upload
.. automodule:: nomad.app.api.repo
.. automodule:: nomad.app.api.archive
.. 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
'''
from .api import api, blueprint
......
......@@ -33,8 +33,8 @@ from nomad.archive import (
query_archive, ArchiveQueryError, filter_archive, read_partial_archives_from_mongo,
compute_required_with_referenced)
from nomad import search, config
from nomad.app import common
from .. import common
from .auth import authenticate, create_authorization_predicate
from .api import api
from .common import calc_route, streamed_zipfile, search_model, add_search_parameters,\
......
......@@ -36,9 +36,9 @@ from functools import wraps
from nomad import search, config, datamodel, utils
from nomad.app_fastapi.optimade import filterparser
from nomad.app.common import RFC3339DateTime, rfc3339DateTime
from nomad.files import Restricted
from ..common import RFC3339DateTime, rfc3339DateTime
from .api import api
......
......@@ -24,8 +24,8 @@ from nomad import utils, processing as proc
from nomad.datamodel import Dataset
from nomad.metainfo.flask_extension import generate_flask_restplus_model
from nomad.doi import DOI
from nomad.app import common
from .. import common
from .api import api
from .auth import authenticate
from .common import pagination_model, pagination_request_parser
......
......@@ -33,8 +33,8 @@ import urllib.parse
from nomad import search, utils, config
from nomad.files import UploadFiles, Restricted
from nomad.processing import Calc
from nomad.app import common
from .. import common
from .api import api
from .auth import authenticate, create_authorization_predicate
from .common import streamed_zipfile, add_search_parameters, apply_search_parameters,\
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment