solve merge conflicts

Author: matusdrobuliak66

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

@@ -57,8 +57,10 @@ class LicensedItemRestGet(OutputSchema):
         dict[str, Any], AfterValidator(to_camel_recursive)
     ]
     pricing_plan_id: PricingPlanId
+
     created_at: datetime
     modified_at: datetime
+
     model_config = ConfigDict(
         json_schema_extra={
             "examples": [

packages/models-library/src/models_library/licensed_items.py

@@ -63,6 +63,16 @@ class LicensedItemDB(BaseModel):
     modified: datetime
     trashed: datetime | None
 
+    licensed_resource_data: dict[str, Any] | None
+
+    pricing_plan_id: PricingPlanId | None
+    product_name: ProductName | None
+
+    # states
+    created: datetime
+    modified: datetime
+    trashed: datetime | None
+
     model_config = ConfigDict(from_attributes=True)
 
 

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

@@ -6,12 +6,7 @@
 import sqlalchemy as sa
 from sqlalchemy.dialects import postgresql
 
-from ._common import (
-    RefActions,
-    column_created_datetime,
-    column_modified_datetime,
-    column_trashed_datetime,
-)
+from ._common import RefActions, column_modified_datetime, column_trashed_datetime
 from .base import metadata
 
 
@@ -47,6 +42,12 @@ class LicensedResourceType(str, enum.Enum):
         nullable=True,
         doc="Resource metadata. Used for read-only purposes",
     ),
+    sa.Column(
+        "licensed_resource_data",
+        postgresql.JSONB,
+        nullable=True,
+        doc="Resource metadata. Used for read-only purposes",
+    ),
     sa.Column(
         "pricing_plan_id",
         sa.BigInteger,
@@ -70,7 +71,6 @@ class LicensedResourceType(str, enum.Enum):
         nullable=True,
         doc="Product name identifier. If None, then the item is not exposed",
     ),
-    column_created_datetime(timezone=True),
     column_modified_datetime(timezone=True),
     column_trashed_datetime("licensed_item"),
 )

services/web/server/src/simcore_service_webserver/application_settings.py

@@ -411,7 +411,7 @@ def _enable_only_if_dev_features_allowed(cls, v, info: ValidationInfo):
 
         return (
             None
-            if info.field_name and is_nullable(cls.model_fields[info.field_name])
+            if info.field_name and is_nullable(dict(cls.model_fields)[info.field_name])
             else False
         )
 

services/web/server/src/simcore_service_webserver/application_settings_utils.py

@@ -202,7 +202,7 @@ def convert_to_environ_vars(  # noqa: C901, PLR0915, PLR0912
     def _set_if_disabled(field_name, section):
         # Assumes that by default is enabled
         enabled = section.get("enabled", True)
-        field = ApplicationSettings.model_fields[field_name]
+        field = dict(ApplicationSettings.model_fields)[field_name]
         if not enabled:
             envs[field_name] = "null" if is_nullable(field) else "0"
         elif get_type(field) == bool:

services/web/server/src/simcore_service_webserver/licenses/_licensed_items_repository.py

@@ -34,6 +34,7 @@
 _logger = logging.getLogger(__name__)
 
 
+_SELECTION_ARGS = get_columns_from_db_model(licensed_items, LicensedItemDB)
 _SELECTION_ARGS = get_columns_from_db_model(licensed_items, LicensedItemDB)
 
 
@@ -51,17 +52,18 @@ async def create(
         result = await conn.execute(
             licensed_items.insert()
             .values(
+                product_name=product_name,
                 licensed_resource_name=licensed_resource_name,
                 licensed_resource_type=licensed_resource_type,
-                pricing_plan_id=pricing_plan_id,
-                product_name=product_name,
                 licensed_resource_data=licensed_resource_data,
+                pricing_plan_id=pricing_plan_id,
                 created=func.now(),
                 modified=func.now(),
             )
             .returning(*_SELECTION_ARGS)
         )
         row = result.one()
+        row = result.one()
         return LicensedItemDB.model_validate(row)
 
 
@@ -73,6 +75,7 @@ async def list_(
     offset: NonNegativeInt,
     limit: NonNegativeInt,
     order_by: OrderBy,
+    # filters
     trashed: Literal["exclude", "only", "include"] = "exclude",
     inactive: Literal["exclude", "only", "include"] = "exclude",
 ) -> tuple[int, list[LicensedItemDB]]:
@@ -89,12 +92,12 @@ async def list_(
     elif trashed == "only":
         base_query = base_query.where(licensed_items.c.trashed.is_not(None))
 
-    if inactive == "exclude":
+    if inactive == "only":
         base_query = base_query.where(
             licensed_items.c.product_name.is_(None)
             | licensed_items.c.licensed_item_id.is_(None)
         )
-    elif inactive == "only":
+    elif inactive == "exclude":
         base_query = base_query.where(
             licensed_items.c.product_name.is_not(None)
             & licensed_items.c.licensed_item_id.is_not(None)

services/web/server/src/simcore_service_webserver/licenses/_licensed_items_service.py

@@ -56,9 +56,15 @@ async def list_licensed_items(
     offset: NonNegativeInt,
     limit: int,
     order_by: OrderBy,
-) -> LicensedItemPage:
-    total_count, licensed_item_db_list = await _licensed_items_repository.list_(
-        app, product_name=product_name, offset=offset, limit=limit, order_by=order_by
+) -> LicensedItemGetPage:
+    total_count, items = await _licensed_items_repository.list_(
+        app,
+        product_name=product_name,
+        offset=offset,
+        limit=limit,
+        order_by=order_by,
+        trashed="exclude",
+        inactive="exclude",
     )
     return LicensedItemPage(
         items=[

services/web/server/tests/unit/isolated/test_users_models.py

@@ -89,7 +89,7 @@ def test_auto_compute_gravatar__deprecated(fake_profile_get: MyProfileGet):
 
     assert (
         "gravatar_id" not in data
-    ), f"{MyProfileGet.model_fields['gravatar_id'].deprecated=}"
+    ), f"{dict(MyProfileGet.model_fields)['gravatar_id'].deprecated=}"
     assert data["id"] == profile.id
     assert data["first_name"] == profile.first_name
     assert data["last_name"] == profile.last_name

services/web/server/tests/unit/with_dbs/04/licenses/test_licensed_items_repository.py

@@ -9,7 +9,6 @@
 from aiohttp.test_utils import TestClient
 from models_library.licensed_items import (
     VIP_DETAILS_EXAMPLE,
-    LicensedItemDB,
     LicensedItemUpdateDB,
     LicensedResourceType,
 )
@@ -21,6 +20,11 @@
 from simcore_service_webserver.projects.models import ProjectDict
 
 
+@pytest.fixture
+def user_role() -> UserRole:
+    return UserRole.USER
+
+
 @pytest.fixture
 def user_role() -> UserRole:
     return UserRole.USER
@@ -34,67 +38,68 @@ async def test_licensed_items_db_crud(
     pricing_plan_id: int,
 ):
     assert client.app
-
-    output: tuple[int, list[LicensedItemDB]] = await _licensed_items_repository.list_(
+    total_count, items = await _licensed_items_repository.list_(
         client.app,
         product_name=osparc_product_name,
         offset=0,
         limit=10,
         order_by=OrderBy(field="modified"),
     )
-    assert output[0] == 0
+    assert total_count == 0
+    assert not items
 
-    licensed_item_db = await _licensed_items_repository.create(
+    got = await _licensed_items_repository.create(
         client.app,
         product_name=osparc_product_name,
         licensed_resource_name="Model A",
+        licensed_resource_name="Model A",
         licensed_resource_type=LicensedResourceType.VIP_MODEL,
         pricing_plan_id=pricing_plan_id,
         licensed_resource_data=VIP_DETAILS_EXAMPLE,
     )
-    _licensed_item_id = licensed_item_db.licensed_item_id
+    licensed_item_id = got.licensed_item_id
 
-    output: tuple[int, list[LicensedItemDB]] = await _licensed_items_repository.list_(
+    total_count, items = await _licensed_items_repository.list_(
         client.app,
         product_name=osparc_product_name,
         offset=0,
         limit=10,
         order_by=OrderBy(field="modified"),
     )
-    assert output[0] == 1
+    assert total_count == 1
+    assert items[0].licensed_item_id == licensed_item_id
 
-    licensed_item_db = await _licensed_items_repository.get(
+    got = await _licensed_items_repository.get(
         client.app,
-        licensed_item_id=_licensed_item_id,
+        licensed_item_id=licensed_item_id,
         product_name=osparc_product_name,
     )
-    assert licensed_item_db.licensed_resource_name == "Model A"
-    assert isinstance(licensed_item_db.licensed_resource_data, dict)
+    assert got.licensed_resource_name == "Model A"
 
     await _licensed_items_repository.update(
         client.app,
-        licensed_item_id=_licensed_item_id,
+        licensed_item_id=licensed_item_id,
         product_name=osparc_product_name,
-        updates=LicensedItemUpdateDB(display_name="Model B"),
+        updates=LicensedItemUpdateDB(licensed_resource_name="Model B"),
     )
 
-    licensed_item_db = await _licensed_items_repository.get(
+    got = await _licensed_items_repository.get(
         client.app,
-        licensed_item_id=_licensed_item_id,
+        licensed_item_id=licensed_item_id,
         product_name=osparc_product_name,
     )
-    assert licensed_item_db.licensed_resource_name == "Model B"
+    assert got.licensed_resource_name == "Model B"
 
-    licensed_item_db = await _licensed_items_repository.delete(
+    got = await _licensed_items_repository.delete(
         client.app,
-        licensed_item_id=_licensed_item_id,
+        licensed_item_id=licensed_item_id,
         product_name=osparc_product_name,
     )
 
     with pytest.raises(LicensedItemNotFoundError):
         await _licensed_items_repository.get(
             client.app,
-            licensed_item_id=_licensed_item_id,
+            licensed_item_id=licensed_item_id,
             product_name=osparc_product_name,
         )
 
@@ -116,23 +121,20 @@ async def test_licensed_items_db_trash(
             product_name=osparc_product_name,
             licensed_resource_name=name,
             licensed_resource_type=LicensedResourceType.VIP_MODEL,
-            licensed_resource_data=None,
             pricing_plan_id=pricing_plan_id,
         )
         licensed_item_ids.append(licensed_item_db.licensed_item_id)
 
-    licensed_item_id1, licensed_item_id2 = licensed_item_ids
-
     # Trash one licensed item
     trashing_at = arrow.now().datetime
     trashed_item = await _licensed_items_repository.update(
         client.app,
-        licensed_item_id=licensed_item_id1,
+        licensed_item_id=licensed_item_ids[0],
         product_name=osparc_product_name,
         updates=LicensedItemUpdateDB(trash=True),
     )
 
-    assert trashed_item.licensed_item_id == licensed_item_id1
+    assert trashed_item.licensed_item_id == licensed_item_ids[0]
     assert trashed_item.trashed
     assert trashing_at < trashed_item.trashed
     assert trashed_item.trashed < arrow.now().datetime
@@ -159,7 +161,7 @@ async def test_licensed_items_db_trash(
         trashed="exclude",
     )
     assert total_count == 1
-    assert items[0].licensed_item_id == licensed_item_id2
+    assert items[0].licensed_item_id == licensed_item_ids[1]
     assert items[0].trashed is None
 
     # List with filter_trashed all

services/web/server/tests/unit/with_dbs/04/wallets/payments/test_payments.py

@@ -362,7 +362,7 @@ async def test_payment_not_found(
 
 
 def test_payment_transaction_state_and_literals_are_in_sync():
-    state_literals = PaymentTransaction.model_fields["state"].annotation
+    state_literals = dict(PaymentTransaction.model_fields)["state"].annotation
     assert (
         TypeAdapter(list[state_literals]).validate_python(
             [f"{s}" for s in PaymentTransactionState]