Merge branch 'master' into feature/new-plus-button

Author: mergify[bot]

packages/common-library/src/common_library/basic_types.py

@@ -3,11 +3,12 @@
 
 from pydantic_core import PydanticUndefined
 
-# SEE https://github.com/fastapi/fastapi/blob/master/fastapi/_compat.py#L75-L78
 Undefined = PydanticUndefined
 DEFAULT_FACTORY: Any = Undefined
-# Use `UNSET` as default when default_factory
+# Use `DEFAULT_FACTORY` as field default when using Field(default_factory=...)
 # SEE https://github.com/ITISFoundation/osparc-simcore/pull/6882
+# SEE https://github.com/ITISFoundation/osparc-simcore/pull/7112#discussion_r1933432238
+# SEE https://github.com/fastapi/fastapi/blob/master/fastapi/_compat.py#L75-L78
 
 
 class LogLevel(StrEnum):

packages/postgres-database/src/simcore_postgres_database/migration/versions/1bc517536e0a_add_product_owners_email_col.py

@@ -0,0 +1,29 @@
+"""Add product owners email col
+
+Revision ID: 1bc517536e0a
+Revises: 5f88b513cd4c
+Create Date: 2025-01-29 10:05:58.254306+00:00
+
+"""
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "1bc517536e0a"
+down_revision = "5f88b513cd4c"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "products", sa.Column("product_owners_email", sa.String(), nullable=True)
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("products", "product_owners_email")
+    # ### end Alembic commands ###

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

@@ -154,6 +154,12 @@ class ProductLoginSettingsDict(TypedDict, total=False):
         doc="Support email for this product"
         'Therefore smtp_sender = f"{display_name} support <{support_email}>"',
     ),
+    sa.Column(
+        "product_owners_email",
+        sa.String,
+        nullable=True,
+        doc="Alternative support email directed to POs only (e.g. for account request, sales, etc)",
+    ),
     sa.Column(
         "twilio_messaging_sid",
         sa.String,

packages/pytest-simcore/src/pytest_simcore/helpers/faker_factories.py

@@ -227,7 +227,12 @@ def random_product(
         "short_name": suffix[:4],
         "host_regex": r"[a-zA-Z0-9]+\.com",
         "support_email": f"support@{suffix}.io",
-        "twilio_messaging_sid": fake.random_element(elements=(None, fake.uuid4()[:34])),
+        "product_owners_email": fake.random_element(
+            elements=[f"product-onwers@{suffix}.io", None]
+        ),
+        "twilio_messaging_sid": fake.random_element(
+            elements=(None, f"{fake.uuid4()}"[:34])
+        ),
         "vendor": Vendor(
             name=fake.company(),
             copyright=fake.company_suffix(),

packages/settings-library/setup.cfg

@@ -14,6 +14,7 @@ universal = 1
 # Define setup.py command aliases here
 test = pytest
 
-# NOTE: uncomment when pytest-asyncio is added in requirements
-# [tool:pytest]
-# asyncio_mode = auto
+[tool:pytest]
+# SEE https://docs.pytest.org/en/stable/how-to/capture-warnings.html
+filterwarnings =
+    error

packages/settings-library/src/settings_library/application.py

@@ -1,3 +1,5 @@
+from typing import Annotated
+
 from pydantic import Field, PositiveInt
 
 from .base import BaseCustomSettings
@@ -18,11 +20,13 @@ class BaseApplicationSettings(BaseCustomSettings):
     # @Dockerfile
     SC_BOOT_MODE: BootModeEnum | None = None
     SC_BOOT_TARGET: BuildTargetEnum | None = None
-    SC_HEALTHCHECK_TIMEOUT: PositiveInt | None = Field(
-        default=None,
-        description="If a single run of the check takes longer than timeout seconds "
-        "then the check is considered to have failed."
-        "It takes retries consecutive failures of the health check for the container to be considered unhealthy.",
-    )
+    SC_HEALTHCHECK_TIMEOUT: Annotated[
+        PositiveInt | None,
+        Field(
+            description="If a single run of the check takes longer than timeout seconds "
+            "then the check is considered to have failed."
+            "It takes retries consecutive failures of the health check for the container to be considered unhealthy.",
+        ),
+    ] = None
     SC_USER_ID: int | None = None
     SC_USER_NAME: str | None = None

packages/settings-library/src/settings_library/director_v0.py

@@ -1,4 +1,5 @@
 from functools import cached_property
+from typing import Annotated
 
 from pydantic import AnyHttpUrl, Field, TypeAdapter
 from settings_library.base import BaseCustomSettings
@@ -10,9 +11,9 @@ class DirectorV0Settings(BaseCustomSettings):
 
     DIRECTOR_HOST: str = "director"
     DIRECTOR_PORT: PortInt = TypeAdapter(PortInt).validate_python(8000)
-    DIRECTOR_VTAG: VersionTag = Field(
-        default="v0", description="Director-v0 service API's version tag"
-    )
+    DIRECTOR_VTAG: Annotated[
+        VersionTag, Field(description="Director-v0 service API's version tag")
+    ] = "v0"
 
     @cached_property
     def endpoint(self) -> str:

packages/settings-library/src/settings_library/docker_registry.py

@@ -1,5 +1,5 @@
 from functools import cached_property
-from typing import Any, Self
+from typing import Annotated, Any, Self
 
 from pydantic import (
     AnyHttpUrl,
@@ -15,37 +15,45 @@
 
 
 class RegistrySettings(BaseCustomSettings):
-    REGISTRY_AUTH: bool = Field(..., description="do registry authentication")
-    REGISTRY_PATH: str | None = Field(
-        default=None,
-        # This is useful in case of a local registry, where the registry url (path) is relative to the host docker engine"
-        description="development mode only, in case a local registry is used - "
-        "this is the hostname to the docker registry as seen from the host running the containers (e.g. 127.0.0.1:5000)",
-    )
-    # NOTE: name is missleading, http or https protocol are not included
-    REGISTRY_URL: str = Field(
-        ...,
-        description="hostname of docker registry (without protocol but with port if available)",
-        min_length=1,
-    )
+    REGISTRY_AUTH: Annotated[bool, Field(description="do registry authentication")]
+    REGISTRY_PATH: Annotated[
+        str | None,
+        Field(
+            # This is useful in case of a local registry, where the registry url (path) is relative to the host docker engine"
+            description="development mode only, in case a local registry is used - "
+            "this is the hostname to the docker registry as seen from the host running the containers (e.g. 127.0.0.1:5000)",
+        ),
+    ] = None
 
-    REGISTRY_USER: str = Field(
-        ..., description="username to access the docker registry"
-    )
-    REGISTRY_PW: SecretStr = Field(
-        ..., description="password to access the docker registry"
-    )
-    REGISTRY_SSL: bool = Field(
-        ..., description="True if docker registry is using HTTPS protocol"
-    )
+    REGISTRY_URL: Annotated[
+        str,
+        Field(
+            # NOTE: name is missleading, http or https protocol are not included
+            description="hostname of docker registry (without protocol but with port if available)",
+            min_length=1,
+        ),
+    ]
+
+    REGISTRY_USER: Annotated[
+        str,
+        Field(description="username to access the docker registry"),
+    ]
+    REGISTRY_PW: Annotated[
+        SecretStr,
+        Field(description="password to access the docker registry"),
+    ]
+    REGISTRY_SSL: Annotated[
+        bool,
+        Field(description="True if docker registry is using HTTPS protocol"),
+    ]
 
     @field_validator("REGISTRY_PATH", mode="before")
     @classmethod
     def _escape_none_string(cls, v) -> Any | None:
         return None if v == "None" else v
 
     @model_validator(mode="after")
-    def check_registry_authentication(self: Self) -> Self:
+    def _check_registry_authentication(self: Self) -> Self:
         if self.REGISTRY_AUTH and any(
             not v for v in (self.REGISTRY_USER, self.REGISTRY_PW)
         ):

packages/settings-library/src/settings_library/ec2.py

@@ -1,18 +1,19 @@
 from typing import Annotated
 
-from pydantic import AnyHttpUrl, BeforeValidator, Field, TypeAdapter
+from pydantic import BeforeValidator, Field
 from pydantic_settings import SettingsConfigDict
 
 from .base import BaseCustomSettings
-
-ANY_HTTP_URL_ADAPTER: TypeAdapter = TypeAdapter(AnyHttpUrl)
+from .utils_validators import validate_nullable_url
 
 
 class EC2Settings(BaseCustomSettings):
     EC2_ACCESS_KEY_ID: str
     EC2_ENDPOINT: Annotated[
-        str, BeforeValidator(lambda x: str(ANY_HTTP_URL_ADAPTER.validate_python(x)))
-    ] | None = Field(default=None, description="do not define if using standard AWS")
+        str | None,
+        BeforeValidator(validate_nullable_url),
+        Field(description="do not define if using standard AWS"),
+    ] = None
     EC2_REGION_NAME: str = "us-east-1"
     EC2_SECRET_ACCESS_KEY: str
 

packages/settings-library/src/settings_library/efs.py

@@ -1,19 +1,26 @@
 from pathlib import Path
+from typing import Annotated
 
 from pydantic import Field
 
 from .base import BaseCustomSettings
 
 
 class AwsEfsSettings(BaseCustomSettings):
-    EFS_DNS_NAME: str = Field(
-        description="AWS Elastic File System DNS name",
-        examples=["fs-xxx.efs.us-east-1.amazonaws.com"],
-    )
+    EFS_DNS_NAME: Annotated[
+        str,
+        Field(
+            description="AWS Elastic File System DNS name",
+            examples=["fs-xxx.efs.us-east-1.amazonaws.com"],
+        ),
+    ]
     EFS_PROJECT_SPECIFIC_DATA_DIRECTORY: str
-    EFS_MOUNTED_PATH: Path = Field(
-        description="This is the path where EFS is mounted to the EC2 machine",
-    )
+    EFS_MOUNTED_PATH: Annotated[
+        Path,
+        Field(
+            description="This is the path where EFS is mounted to the EC2 machine",
+        ),
+    ]
 
 
 NFS_PROTOCOL = "4.1"