adds new column

Author: pcrespov

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

@@ -1,9 +1,10 @@
 from datetime import datetime
 from enum import auto
-from typing import TypeAlias
+from typing import Any, TypeAlias
 from uuid import UUID
 
-from pydantic import BaseModel, ConfigDict, Field
+from common_library.exclude import UnSet
+from pydantic import BaseModel, ConfigDict
 
 from .products import ProductName
 from .resource_tracker import PricingPlanId
@@ -24,22 +25,22 @@ class LicensedResourceType(StrAutoEnum):
 class LicensedItemDB(BaseModel):
     licensed_item_id: LicensedItemID
     name: str
+
     license_key: str | None
     licensed_resource_type: LicensedResourceType
+    licensed_resource_data: dict[str, Any] | None
+
     pricing_plan_id: PricingPlanId
     product_name: ProductName
-    created: datetime = Field(
-        ...,
-        description="Timestamp on creation",
-    )
-    modified: datetime = Field(
-        ...,
-        description="Timestamp of last modification",
-    )
-    # ----
+
+    created: datetime  # Timestamp upon creation
+    modified: datetime  # Timestamp on last modification
+    trashed: datetime | None  # Marked as trashed
+
     model_config = ConfigDict(from_attributes=True)
 
 
 class LicensedItemUpdateDB(BaseModel):
     name: str | None = None
     pricing_plan_id: PricingPlanId | None = None
+    trashed: datetime | None | UnSet = UnSet.VALUE

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

@@ -4,9 +4,14 @@
 import enum
 
 import sqlalchemy as sa
-from sqlalchemy.dialects.postgresql import UUID
+from sqlalchemy.dialects import postgresql
 
-from ._common import RefActions, column_created_datetime, column_modified_datetime
+from ._common import (
+    RefActions,
+    column_created_datetime,
+    column_modified_datetime,
+    column_trashed_datetime,
+)
 from .base import metadata
 
 
@@ -19,22 +24,24 @@ class LicensedResourceType(str, enum.Enum):
     metadata,
     sa.Column(
         "licensed_item_id",
-        UUID(as_uuid=True),
+        postgresql.UUID(as_uuid=True),
         nullable=False,
         primary_key=True,
         server_default=sa.text("gen_random_uuid()"),
     ),
-    sa.Column(
-        "name",
-        sa.String,
-        nullable=False,
-    ),
+    sa.Column("name", sa.String, nullable=False, doc="Name identifier"),
     sa.Column(
         "licensed_resource_type",
         sa.Enum(LicensedResourceType),
         nullable=False,
         doc="Item type, ex. VIP_MODEL",
     ),
+    sa.Column(
+        "licensed_resource_data",
+        postgresql.JSONB,
+        nullable=True,
+        doc="Stores data related to this licensed resource that is used for read-only purposes",
+    ),
     sa.Column(
         "pricing_plan_id",
         sa.BigInteger,
@@ -66,4 +73,5 @@ class LicensedResourceType(str, enum.Enum):
     ),
     column_created_datetime(timezone=True),
     column_modified_datetime(timezone=True),
+    column_trashed_datetime("licensed_item"),
 )

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

@@ -20,6 +20,7 @@
 from pydantic import NonNegativeInt
 from simcore_postgres_database.models.licensed_items import licensed_items
 from simcore_postgres_database.utils_repos import (
+    get_columns_from_db_model,
     pass_or_acquire_connection,
     transaction_context,
 )
@@ -33,18 +34,7 @@
 _logger = logging.getLogger(__name__)
 
 
-_SELECTION_ARGS = (
-    licensed_items.c.licensed_item_id,
-    licensed_items.c.name,
-    licensed_items.c.license_key,
-    licensed_items.c.licensed_resource_type,
-    licensed_items.c.pricing_plan_id,
-    licensed_items.c.product_name,
-    licensed_items.c.created,
-    licensed_items.c.modified,
-)
-
-assert set(LicensedItemDB.model_fields) == {c.name for c in _SELECTION_ARGS}  # nosec
+_SELECTION_ARGS = get_columns_from_db_model(licensed_items, LicensedItemDB)
 
 
 async def create(