use base_url

Author: giancarloromeo

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

@@ -89,9 +89,9 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
     )
 
 
-class ProductHostRpcGet(BaseModel):
+class ProductBaseUrlRpcGet(BaseModel):
     product_name: ProductName
-    host: str
+    base_url: str
 
     @staticmethod
     def _update_json_schema_extra(schema: JsonDict) -> None:

packages/postgres-database/src/simcore_postgres_database/migration/versions/972981ff823a_add_base_url_column_to_products.py

@@ -0,0 +1,33 @@
+"""Add base_url column to products
+
+Revision ID: 972981ff823a
+Revises: 0d52976dc616
+Create Date: 2025-05-06 11:28:58.402681+00:00
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "972981ff823a"
+down_revision = "0d52976dc616"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "products",
+        sa.Column(
+            "base_url", sa.String(), server_default="https://osparc.io", nullable=True
+        ),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("products", "base_url")
+    # ### end Alembic commands ###

packages/postgres-database/src/simcore_postgres_database/migration/versions/fc621eedc163_add_host_column.py

@@ -155,10 +155,10 @@ class ProductLoginSettingsDict(TypedDict, total=False):
         doc="Regular expression that matches product hostname from an url string",
     ),
     sa.Column(
-        "host",
+        "base_url",
         sa.String,
-        server_default="osparc.io",
-        doc="Product hostname",
+        server_default="https://osparc.io",
+        doc="Base URL of the product.",
     ),
     # EMAILS --------------------
     sa.Column(

packages/postgres-database/src/simcore_postgres_database/models/products.py

@@ -0,0 +1,27 @@
+import logging
+
+from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
+from models_library.products import ProductName
+from models_library.rabbitmq_basic_types import RPCMethodName
+from pydantic import TypeAdapter
+
+from ....logging_utils import log_decorator
+from ..._client_rpc import RabbitMQRPCClient
+
+_logger = logging.getLogger(__name__)
+
+
+@log_decorator(_logger, level=logging.DEBUG)
+async def get_product_base_url(
+    rpc_client: RabbitMQRPCClient,
+    *,
+    product_name: ProductName,
+) -> None:
+
+    base_url = await rpc_client.request(
+        WEBSERVER_RPC_NAMESPACE,
+        TypeAdapter(RPCMethodName).validate_python("get_product_base_url"),
+        product_name=product_name,
+    )
+    assert base_url  # nosec
+    return base_url

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/products.py

@@ -23,8 +23,10 @@
 from pydantic import BaseModel
 from servicelib.fastapi.app_state import SingletonInAppStateMixin
 from servicelib.logging_utils import log_context
-from simcore_service_director_v2.core.settings import get_application_settings
+from servicelib.rabbitmq.rpc_interfaces.webserver.products import get_product_host
 
+from ...core.settings import get_application_settings
+from ...modules.rabbitmq import get_rabbitmq_rpc_client
 from ...utils.db import get_repository
 from ...utils.osparc_variables import (
     ContextDict,
@@ -40,6 +42,10 @@
 TBaseModel = TypeVar("TBaseModel", bound=BaseModel)
 
 
+def _make_api_server_base_url(base_url: str):
+    pass
+
+
 async def substitute_vendor_secrets_in_model(
     app: FastAPI,
     model: TBaseModel,
@@ -194,7 +200,7 @@ async def resolve_and_substitute_session_variables_in_model(
             # if it raises an error vars need replacement
             raise_if_unresolved_osparc_variable_identifier_found(model)
     except UnresolvedOsparcVariableIdentifierError:
-        app_settings = get_application_settings(app)
+        api_server_base_url = get_application_settings(app)
         table = OsparcSessionVariablesTable.get_from_app_state(app)
         identifiers = await resolve_variables_from_context(
             table.copy(),
@@ -206,7 +212,10 @@ async def resolve_and_substitute_session_variables_in_model(
                 node_id=node_id,
                 run_id=service_run_id,
                 wallet_id=wallet_id,
-                api_server_base_url=app_settings.DIRECTOR_V2_PUBLIC_API_BASE_URL,
+                api_server_base_url=get_product_host(
+                    get_rabbitmq_rpc_client(app),
+                    product_name=product_name,
+                ),
             ),
         )
         _logger.debug("replacing with the identifiers=%s", identifiers)
@@ -241,7 +250,6 @@ async def resolve_and_substitute_session_variables_in_specs(
             identifiers_to_replace,
         )
         if identifiers_to_replace:
-            app_settings = get_application_settings(app)
             environs = await resolve_variables_from_context(
                 table.copy(include=identifiers_to_replace),
                 context=ContextDict(
@@ -252,7 +260,10 @@ async def resolve_and_substitute_session_variables_in_specs(
                     node_id=node_id,
                     run_id=service_run_id,
                     wallet_id=wallet_id,
-                    api_server_base_url=app_settings.DIRECTOR_V2_PUBLIC_API_BASE_URL,
+                    api_server_base_url=get_product_host(
+                        get_rabbitmq_rpc_client(app),
+                        product_name=product_name,
+                    ),
                 ),
             )
 

services/director-v2/src/simcore_service_director_v2/modules/osparc_variables/substitutions.py

@@ -4,7 +4,7 @@
 from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
 from models_library.api_schemas_webserver.products import (
     CreditResultRpcGet,
-    ProductHostRpcGet,
+    ProductBaseUrlRpcGet,
 )
 from models_library.products import ProductName
 from servicelib.rabbitmq import RPCRouter
@@ -31,13 +31,13 @@ async def get_credit_amount(
 
 
 @router.expose()
-async def get_product_host(
+async def get_product_base_url(
     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)
+) -> ProductBaseUrlRpcGet:
+    base_url: str = await _service.get_product_base_url(app, product_name=product_name)
+    return ProductBaseUrlRpcGet(product_name=product_name, base_url=base_url)
 
 
 async def _register_rpc_routes_on_startup(app: web.Application):

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

@@ -14,6 +14,7 @@
 from models_library.products import ProductName, StripePriceID, StripeTaxRateID
 from models_library.utils.change_case import snake_to_camel
 from pydantic import (
+    AnyHttpUrl,
     BaseModel,
     BeforeValidator,
     ConfigDict,
@@ -87,7 +88,7 @@ class Product(BaseModel):
         re.Pattern, BeforeValidator(str.strip), Field(..., description="Host regex")
     ]
 
-    host: Annotated[str, BeforeValidator(str.strip), Field(..., description="Host")]
+    base_url: Annotated[AnyHttpUrl, Field(..., description="Base URL of the product")]
 
     support_email: Annotated[
         LowerCaseEmailStr,

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

@@ -42,7 +42,7 @@
     products.c.display_name,
     products.c.short_name,
     products.c.host_regex,
-    products.c.host,
+    products.c.base_url,
     products.c.support_email,
     products.c.product_owners_email,
     products.c.twilio_messaging_sid,
@@ -216,15 +216,15 @@ async def get_product_ui(
             row = result.one_or_none()
             return dict(**row.ui) if row else None
 
-    async def get_product_host(
+    async def get_product_base_url(
         self, product_name: ProductName, connection: AsyncConnection | None = None
     ) -> str | None:
-        query = sa.select(products.c.host).where(products.c.name == product_name)
+        query = sa.select(products.c.base_url).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
+            return f"{row.base_url}" if row else None
 
     async def auto_create_products_groups(
         self,

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

@@ -14,7 +14,7 @@
 from .errors import (
     BelowMinimumPaymentError,
     MissingStripeConfigError,
-    ProductHostNotFoundError,
+    ProductBaseUrlNotFoundError,
     ProductNotFoundError,
     ProductPriceNotDefinedError,
     ProductTemplateNotFoundError,
@@ -137,12 +137,12 @@ async def get_template_content(app: web.Application, *, template_name: str):
     return content
 
 
-async def get_product_host(app: web.Application, *, product_name) -> str:
+async def get_product_base_url(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
+    base_url = await repo.get_product_base_url(product_name)
+    if not base_url:
+        raise ProductBaseUrlNotFoundError(product_name=product_name)
+    return base_url
 
 
 async def auto_create_products_groups(