Merge remote-tracking branch 'upstream/pydantic_v2_migration' into pr-osparc-pydantic2-dask-sidecar2

Author: Andrei Neagu

packages/models-library/src/models_library/api_schemas_payments/errors.py

@@ -1,7 +1,7 @@
-from pydantic.errors import PydanticErrorMixin
+from common_library.errors_classes import OsparcErrorMixin
 
 
-class _BaseRpcApiError(PydanticErrorMixin, ValueError):
+class _BaseRpcApiError(OsparcErrorMixin, ValueError):
     @classmethod
     def get_full_class_name(cls) -> str:
         # Can be used as unique code identifier

packages/postgres-database/tests/test_models_payments_transactions.py

@@ -6,6 +6,7 @@
 
 import decimal
 from collections.abc import Callable
+from typing import Any
 
 import pytest
 import sqlalchemy as sa
@@ -43,14 +44,25 @@ async def test_numerics_precission_and_scale(connection: SAConnection):
         assert float(got) == expected
 
 
+def _remove_not_required(data: dict[str, Any]) -> dict[str, Any]:
+    for to_remove in (
+        "completed_at",
+        "invoice_url",
+        "invoice_pdf_url",
+        "state",
+        "state_message",
+        "stripe_invoice_id",
+    ):
+        data.pop(to_remove)
+    return data
+
+
 @pytest.fixture
 def init_transaction(connection: SAConnection):
     async def _init(payment_id: str):
         # get payment_id from payment-gateway
-        values = random_payment_transaction(payment_id=payment_id)
-        # remove states
-        values.pop("state")
-        values.pop("completed_at")
+        values = _remove_not_required(random_payment_transaction(payment_id=payment_id))
+
         # init successful: set timestamp
         values["initiated_at"] = utcnow()
 
@@ -180,10 +192,8 @@ def create_fake_user_transactions(connection: SAConnection, user_id: int) -> Cal
     async def _go(expected_total=5):
         payment_ids = []
         for _ in range(expected_total):
-            values = random_payment_transaction(user_id=user_id)
-            # remove states
-            values.pop("state")
-            values.pop("completed_at")
+            values = _remove_not_required(random_payment_transaction(user_id=user_id))
+
             payment_id = await insert_init_payment_transaction(connection, **values)
             assert payment_id
             payment_ids.append(payment_id)

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

@@ -301,6 +301,10 @@ def random_payment_transaction(
         "initiated_at": utcnow(),
         "state": PaymentTransactionState.PENDING,
         "completed_at": None,
+        "invoice_url": None,
+        "stripe_invoice_id": None,
+        "invoice_pdf_url": None,
+        "state_message": None,
     }
     # state is not added on purpose
     assert set(data.keys()).issubset({c.name for c in payments_transactions.columns})

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

@@ -69,9 +69,9 @@ def print_as_envfile(
 def print_as_json(
     settings_obj,
     *,
-    compact=False,
+    compact: bool = False,
+    show_secrets: bool,
     json_serializer,
-    show_secrets,
     **pydantic_export_options,
 ):
     typer.echo(