Merge branch 'master' into switch-to-new-projects-nodes-repo

Author: giancarloromeo

.env-devel

@@ -371,6 +371,7 @@ WEBSERVER_GARBAGE_COLLECTOR=null
 WEBSERVER_GROUPS=1
 WEBSERVER_GUNICORN_CMD_ARGS=--timeout=180
 WEBSERVER_HOST=webserver
+WEBSERVER_LICENSES=true
 WEBSERVER_LOGIN={}
 WEBSERVER_LOGLEVEL=INFO
 WEBSERVER_META_MODELING=1

.github/mergify.yml

@@ -24,20 +24,30 @@ queue_rules:
 
 # NOTE: in case of flaky tests you above checks will fail
 # the PR will be removed from the queue.
-# This retries the checks, as soon as they become green,
-# the PR will be pusehd to the queu again
+# Once the PR is ready to be merged the flaky tests will
+# be retried automatically.
+# As soon as the CI is green, the PR will be pushed to the queue
 pull_request_rules:
-  - name: retry CI on fails (used for flaky tests)
+  - name: retry flaky tests (when PR is approved)
     conditions:
       - label=🤖-automerge
       - label!=🤖-do-not-merge
       - base=master
+
+      - -draft # PR is not in draft state
+      - -conflict # No merge conflicts
+      - "#approved-reviews-by>=2" # Requires 2 approving reviews
+      - "#changes-requested-reviews-by=0" # No changes requested
+      - "#review-threads-unresolved=0" # All review threads resolved
+
       - or:
           - check-failure=unit-tests
           - check-failure=integration-tests
           - check-failure=system-tests
     actions:
+      comment:
+        message: "Restarted CI due to failing tests"
       github_actions:
         workflow:
           dispatch:
-            - workflow: .github/workflows/ci-testing-deploy.yml
+            - workflow: ci-testing-deploy.yml

api/specs/web-server/_licensed_items.py

@@ -14,8 +14,10 @@
 from models_library.generics import Envelope
 from models_library.rest_error import EnvelopedError
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.licenses._exceptions_handlers import _TO_HTTP_ERROR_MAP
-from simcore_service_webserver.licenses._models import (
+from simcore_service_webserver.licenses._common.exceptions_handlers import (
+    _TO_HTTP_ERROR_MAP,
+)
+from simcore_service_webserver.licenses._common.models import (
     LicensedItemsBodyParams,
     LicensedItemsListQueryParams,
     LicensedItemsPathParams,

api/specs/web-server/_licensed_items_checkouts.py

@@ -17,7 +17,9 @@
 from models_library.rest_error import EnvelopedError
 from models_library.rest_pagination import Page
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.licenses._exceptions_handlers import _TO_HTTP_ERROR_MAP
+from simcore_service_webserver.licenses._common.exceptions_handlers import (
+    _TO_HTTP_ERROR_MAP,
+)
 from simcore_service_webserver.licenses._licensed_items_checkouts_models import (
     LicensedItemCheckoutPathParams,
     LicensedItemsCheckoutsListQueryParams,

api/specs/web-server/_licensed_items_purchases.py

@@ -17,8 +17,10 @@
 from models_library.rest_error import EnvelopedError
 from models_library.rest_pagination import Page
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.licenses._exceptions_handlers import _TO_HTTP_ERROR_MAP
-from simcore_service_webserver.licenses._models import (
+from simcore_service_webserver.licenses._common.exceptions_handlers import (
+    _TO_HTTP_ERROR_MAP,
+)
+from simcore_service_webserver.licenses._common.models import (
     LicensedItemsPurchasesListQueryParams,
     LicensedItemsPurchasesPathParams,
 )

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