Cleanup

Author: pcrespov

services/web/server/src/simcore_service_webserver/__version__.py

@@ -8,4 +8,9 @@
 
 version = Version(__version__)
 
-api_version_prefix: str = f"v{version.major}"
+app_name: str = __name__.split(".")[0]
+api_version: str = __version__
+api_vtag: str = f"v{version.major}"
+
+# legacy
+api_version_prefix: str = api_vtag

services/web/server/src/simcore_service_webserver/settings.py

@@ -8,13 +8,19 @@
 from aiohttp import web
 from pydantic import BaseSettings
 
-APP_SETTINGS_KEY = f"{__name__ }.build_time_settings"
+from .__version__ import app_name, api_version
+
+APP_SETTINGS_KEY = f"{__name__ }.app_settings"
 
 log = logging.getLogger(__name__)
 
 
-class BuildTimeSettings(BaseSettings):
-    # All these settings are defined in the Dockerfile at build-image time
+class ApplicationSettings(BaseSettings):
+    # settings defined by the code
+    app_name: str = app_name
+    api_version: str = api_version
+
+    # settings defined when docker image is built
     vcs_url: Optional[str] = None
     vcs_ref: Optional[str] = None
     build_date: Optional[str] = None
@@ -43,5 +49,5 @@ def public_dict(self) -> Dict:
 
 
 def setup_settings(app: web.Application):
-    app[APP_SETTINGS_KEY] = BuildTimeSettings()
+    app[APP_SETTINGS_KEY] = ApplicationSettings()
     log.info("Captured app settings:\n%s", app[APP_SETTINGS_KEY].json(indent=2))