Moved app_fastapi to app.

nomad/app_fastapi/models.py → nomad/app/models.py

@@ -29,7 +29,7 @@ import fnmatch
 from nomad import datamodel  # pylint: disable=unused-import
 from nomad.utils import strip
 from nomad.metainfo import Datetime, MEnum
-from nomad.app_fastapi.utils import parameter_dependency_from_model
+from nomad.app.utils import parameter_dependency_from_model
 from nomad.metainfo.search_extension import metrics, search_quantities
 
 

nomad/app_fastapi/optimade/__init__.py → nomad/app/optimade/__init__.py

@@ -7,7 +7,7 @@ import importlib
 os.environ['OPTIMADE_CONFIG_FILE'] = os.path.join(os.path.dirname(__file__), 'optimade_config.json')
 
 # patch optimade logger (patched module most be outside this module to force import before optimade)
-sys.modules['optimade.server.logger'] = importlib.import_module('nomad.app_fastapi.optimade_logger')
+sys.modules['optimade.server.logger'] = importlib.import_module('nomad.app.optimade_logger')
 
 # patch optimade base path
 from nomad import config, utils  # nopep8

nomad/app_fastapi/routers/auth.py → nomad/app/routers/auth.py

@@ -22,8 +22,8 @@ from pydantic import BaseModel
 
 from nomad import infrastructure
 from nomad.utils import get_logger, strip
-from nomad.app_fastapi.models import User, HTTPExceptionModel
-from nomad.app_fastapi.utils import create_responses
+from nomad.app.models import User, HTTPExceptionModel
+from nomad.app.utils import create_responses
 
 logger = get_logger(__name__)