add host field

Author: giancarloromeo

packages/models-library/src/models_library/api_schemas_webserver/products.py

@@ -89,6 +89,28 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
     )
 
 
+class ProductHostRpcGet(BaseModel):
+    product_name: ProductName
+    host: str
+
+    @staticmethod
+    def _update_json_schema_extra(schema: JsonDict) -> None:
+        schema.update(
+            {
+                "examples": [
+                    {
+                        "product_name": "osparc",
+                        "credit_amount": "osparc.io",
+                    },
+                ]
+            }
+        )
+
+    model_config = ConfigDict(
+        json_schema_extra=_update_json_schema_extra,
+    )
+
+
 class ProductTemplateGet(OutputSchema):
     id_: Annotated[IDStr, Field(alias="id")]
     content: str

services/web/server/src/simcore_service_webserver/products/_controller/rpc.py

@@ -2,7 +2,10 @@
 
 from aiohttp import web
 from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
-from models_library.api_schemas_webserver.products import CreditResultRpcGet
+from models_library.api_schemas_webserver.products import (
+    CreditResultRpcGet,
+    ProductHostRpcGet,
+)
 from models_library.products import ProductName
 from servicelib.rabbitmq import RPCRouter
 
@@ -27,6 +30,16 @@ async def get_credit_amount(
     return CreditResultRpcGet.model_validate(credit_result, from_attributes=True)
 
 
+@router.expose()
+async def get_product_host(
+    app: web.Application,
+    *,
+    product_name: ProductName,
+) -> ProductHostRpcGet:
+    host: str = await _service.get_product_host(app, product_name=product_name)
+    return ProductHostRpcGet(product_name=product_name, host=host)
+
+
 async def _register_rpc_routes_on_startup(app: web.Application):
     rpc_server = get_rabbitmq_rpc_server(app)
     await rpc_server.register_router(router, WEBSERVER_RPC_NAMESPACE, app)

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

@@ -87,6 +87,8 @@ class Product(BaseModel):
         re.Pattern, BeforeValidator(str.strip), Field(..., description="Host regex")
     ]
 
+    host: Annotated[str, BeforeValidator(str.strip), Field(..., description="Host")]
+
     support_email: Annotated[
         LowerCaseEmailStr,
         Field(

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

@@ -42,6 +42,7 @@
     products.c.display_name,
     products.c.short_name,
     products.c.host_regex,
+    products.c.host,
     products.c.support_email,
     products.c.product_owners_email,
     products.c.twilio_messaging_sid,
@@ -215,6 +216,16 @@ async def get_product_ui(
             row = result.one_or_none()
             return dict(**row.ui) if row else None
 
+    async def get_product_host(
+        self, product_name: ProductName, connection: AsyncConnection | None = None
+    ) -> str | None:
+        query = sa.select(products.c.host).where(products.c.name == product_name)
+
+        async with pass_or_acquire_connection(self.engine, connection) as conn:
+            result = await conn.execute(query)
+            row = result.one_or_none()
+            return f"{row.host}" if row else None
+
     async def auto_create_products_groups(
         self,
         connection: AsyncConnection | None = None,

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

@@ -14,6 +14,7 @@
 from .errors import (
     BelowMinimumPaymentError,
     MissingStripeConfigError,
+    ProductHostNotFoundError,
     ProductNotFoundError,
     ProductPriceNotDefinedError,
     ProductTemplateNotFoundError,
@@ -136,6 +137,14 @@ async def get_template_content(app: web.Application, *, template_name: str):
     return content
 
 
+async def get_product_host(app: web.Application, *, product_name) -> str:
+    repo = ProductRepository.create_from_app(app)
+    host = await repo.get_product_host(product_name)
+    if not host:
+        raise ProductHostNotFoundError(product_name=product_name)
+    return host
+
+
 async def auto_create_products_groups(
     app: web.Application,
 ) -> dict[ProductName, GroupID]:

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

@@ -24,6 +24,10 @@ class ProductTemplateNotFoundError(ProductError):
     msg_template = "Missing template {template_name} for product"
 
 
+class ProductHostNotFoundError(ProductError):
+    msg_template = "Missing host for product {product_name}"
+
+
 class MissingStripeConfigError(ProductError):
     msg_template = (
         "Missing product stripe for product {product_name}.\n"