web states

Author: pcrespov

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

@@ -28,8 +28,6 @@
 assert APP_CLIENT_SESSION_KEY  # nosec
 assert APP_CONFIG_KEY  # nosec
 
-# Application storage keys
-APP_PRODUCTS_KEY: Final[str] = f"{__name__ }.APP_PRODUCTS_KEY"
 
 # Public config per product returned in /config
 APP_PUBLIC_CONFIG_PER_PRODUCT: Final[str] = f"{__name__}.APP_PUBLIC_CONFIG_PER_PRODUCT"

services/web/server/src/simcore_service_webserver/products/_service.py

@@ -8,8 +8,8 @@
 from servicelib.exceptions import InvalidConfig
 from simcore_postgres_database.utils_products_prices import ProductPriceInfo
 
-from ..constants import APP_PRODUCTS_KEY
-from ._models import CreditResult, ProductStripeInfo
+from ._app_state import APP_PRODUCTS_KEY
+from ._models import CreditResult, Product, ProductStripeInfo
 from ._repository import ProductRepository
 from .errors import (
     BelowMinimumPaymentError,
@@ -18,7 +18,6 @@
     ProductPriceNotDefinedError,
     ProductTemplateNotFoundError,
 )
-from .models import Product
 
 
 async def load_products(app: web.Application) -> list[Product]:

services/web/server/src/simcore_service_webserver/products/_web_events.py

@@ -6,9 +6,9 @@
 from aiohttp import web
 from models_library.products import ProductName
 
-from ..constants import APP_PRODUCTS_KEY
 from . import _service
 from ._models import Product
+from ._web_app_states import APP_PRODUCTS_KEY, APP_PRODUCTS_KEY_DEFAULT
 
 _logger = logging.getLogger(__name__)
 
@@ -36,7 +36,7 @@ def _set_app_state(
     # cache them in the `app` upon startup
     app[APP_PRODUCTS_KEY] = app_products
     assert default_product_name in app_products  # nosec
-    app[f"{APP_PRODUCTS_KEY}_default"] = default_product_name
+    app[APP_PRODUCTS_KEY_DEFAULT] = default_product_name
 
 
 async def _load_products_on_startup(app: web.Application):

services/web/server/src/simcore_service_webserver/products/_web_middlewares.py

@@ -7,15 +7,16 @@
 from servicelib.rest_constants import X_PRODUCT_NAME_HEADER
 
 from .._meta import API_VTAG
-from ..constants import APP_PRODUCTS_KEY, RQ_PRODUCT_KEY
+from ..constants import RQ_PRODUCT_KEY
 from ..utils_aiohttp import iter_origins
+from ._web_app_states import APP_PRODUCTS_KEY, APP_PRODUCTS_KEY_DEFAULT
 from .models import Product
 
 _logger = logging.getLogger(__name__)
 
 
 def _get_default_product_name(app: web.Application) -> str:
-    product_name: str = app[f"{APP_PRODUCTS_KEY}_default"]
+    product_name: str = app[APP_PRODUCTS_KEY_DEFAULT]
     return product_name
 
 

services/web/server/src/simcore_service_webserver/products/_web_states.py

@@ -0,0 +1,9 @@
+from typing import Final
+
+from aiohttp import web
+
+from ._models import Product, ProductName
+
+APP_PRODUCTS_KEY: Final = web.AppKey("APP_PRODUCTS_KEY", dict[ProductName, Product])
+
+APP_PRODUCTS_KEY_DEFAULT: Final = web.AppKey("_APP_PRODUCTS_KEY_DEFAULT", ProductName)

services/web/server/src/simcore_service_webserver/products/products_web.py

@@ -1,3 +1,4 @@
+from ._web_app_states import APP_PRODUCTS_KEY
 from ._web_helpers import (
     get_current_product,
     get_current_product_credit_price_info,
@@ -7,6 +8,7 @@
 )
 
 __all__: tuple[str, ...] = (
+    "APP_PRODUCTS_KEY",
     "get_current_product",
     "get_current_product_credit_price_info",
     "get_product_name",

services/web/server/src/simcore_service_webserver/statics/_events.py

@@ -18,8 +18,8 @@
 from yarl import URL
 
 from ..application_settings import ApplicationSettings, get_application_settings
-from ..constants import APP_PRODUCTS_KEY
 from ..products.models import Product
+from ..products.products_web import APP_PRODUCTS_KEY
 from ._constants import (
     APP_FRONTEND_CACHED_INDEXES_KEY,
     APP_FRONTEND_CACHED_STATICS_JSON_KEY,
@@ -119,7 +119,7 @@ async def create_and_cache_statics_json(app: web.Application) -> None:
         common.update(frontend_settings.to_statics())
 
     # Adds products defined in db
-    products: dict[str, Product] = app[APP_PRODUCTS_KEY]
+    products = app[APP_PRODUCTS_KEY]
     assert products  # nosec
 
     app[APP_FRONTEND_CACHED_STATICS_JSON_KEY] = {}