Merge remote-tracking branch 'upstream/master' into pr-osparc-stream-zipping-of-s3-content

Author: Andrei Neagu

.env-devel

@@ -141,6 +141,7 @@ FUNCTION_SERVICES_AUTHORS='{"UN": {"name": "Unknown", "email": "[email protected]
 
 WEBSERVER_LICENSES={}
 LICENSES_ITIS_VIP_SYNCER_ENABLED=false
+LICENSES_ITIS_VIP_SYNCER_PERIODICITY=1D00:00:00
 LICENSES_ITIS_VIP_API_URL=https://replace-with-itis-api/{category}
 LICENSES_ITIS_VIP_CATEGORIES='{"HumanWholeBody": "Humans", "HumanBodyRegion": "Humans (Region)", "AnimalWholeBody": "Animal"}'
 LICENSES_SPEAG_PHANTOMS_API_URL=https://replace-with-speag-api/{category}

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

@@ -28,6 +28,7 @@ class LicensedItemRpcGet(BaseModel):
     licensed_resource_type: LicensedResourceType
     licensed_resources: list[dict[str, Any]]
     pricing_plan_id: PricingPlanId
+    is_hidden_on_market: bool
     created_at: datetime
     modified_at: datetime
 
@@ -42,6 +43,7 @@ class LicensedItemRpcGet(BaseModel):
                     "licensed_resource_type": f"{LicensedResourceType.VIP_MODEL}",
                     "licensed_resources": [cast(JsonDict, VIP_DETAILS_EXAMPLE)],
                     "pricing_plan_id": "15",
+                    "is_hidden_on_market": False,
                     "created_at": "2024-12-12 09:59:26.422140",
                     "modified_at": "2024-12-12 09:59:26.422140",
                 }

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

@@ -81,6 +81,7 @@ class LicensedItemDB(BaseModel):
 
     pricing_plan_id: PricingPlanId
     product_name: ProductName
+    is_hidden_on_market: bool
 
     # states
     created: datetime
@@ -124,6 +125,7 @@ class LicensedItem(BaseModel):
     licensed_resource_type: LicensedResourceType
     licensed_resources: list[dict[str, Any]]
     pricing_plan_id: PricingPlanId
+    is_hidden_on_market: bool
     created_at: datetime
     modified_at: datetime
 
@@ -149,6 +151,7 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
                             )
                         ],
                         "pricing_plan_id": "15",
+                        "is_hidden_on_market": False,
                         "created_at": "2024-12-12 09:59:26.422140",
                         "modified_at": "2024-12-12 09:59:26.422140",
                     }

packages/postgres-database/src/simcore_postgres_database/migration/versions/e8ffc0c96336_add_is_hidden_on_market_field.py

@@ -0,0 +1,35 @@
+"""add is_hidden_on_market field
+
+Revision ID: e8ffc0c96336
+Revises: a53c3c153bc8
+Create Date: 2025-02-13 18:05:42.851252+00:00
+
+"""
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "e8ffc0c96336"
+down_revision = "a53c3c153bc8"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "licensed_items",
+        sa.Column(
+            "is_hidden_on_market",
+            sa.Boolean(),
+            server_default=sa.text("false"),
+            nullable=False,
+        ),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("licensed_items", "is_hidden_on_market")
+    # ### end Alembic commands ###

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

@@ -69,6 +69,13 @@ class LicensedResourceType(str, enum.Enum):
         nullable=False,
         doc="Product name identifier. If None, then the item is not exposed",
     ),
+    sa.Column(
+        "is_hidden_on_market",
+        sa.Boolean(),
+        nullable=False,
+        server_default=sa.text("false"),
+        doc="If true, the item is not listed on the market. (Public API might want to see all of them, even if they are not listed on the Market)",
+    ),
     column_created_datetime(timezone=True),
     column_modified_datetime(timezone=True),
     sa.Index("idx_licensed_items_key_version", "key", "version", unique=True),

services/api-server/openapi.json

@@ -6716,6 +6716,10 @@
             "title": "Pricing Plan Id",
             "minimum": 0
           },
+          "is_hidden_on_market": {
+            "type": "boolean",
+            "title": "Is Hidden On Market"
+          },
           "created_at": {
             "type": "string",
             "format": "date-time",
@@ -6736,6 +6740,7 @@
           "licensed_resource_type",
           "licensed_resources",
           "pricing_plan_id",
+          "is_hidden_on_market",
           "created_at",
           "modified_at"
         ],

services/api-server/src/simcore_service_api_server/models/schemas/model_adapter.py

@@ -148,6 +148,7 @@ class LicensedItemGet(BaseModel):
     licensed_resource_type: LicensedResourceType
     licensed_resources: list[dict[str, Any]]
     pricing_plan_id: PricingPlanId
+    is_hidden_on_market: bool
     created_at: datetime
     modified_at: datetime
     model_config = ConfigDict(

services/api-server/src/simcore_service_api_server/services_rpc/wb_api_server.py

@@ -64,6 +64,7 @@ def _create_licensed_items_get_page(
                 licensed_resource_type=elm.licensed_resource_type,
                 licensed_resources=elm.licensed_resources,
                 pricing_plan_id=elm.pricing_plan_id,
+                is_hidden_on_market=elm.is_hidden_on_market,
                 created_at=elm.created_at,
                 modified_at=elm.modified_at,
             )

services/docker-compose.yml

@@ -727,6 +727,7 @@ services:
 
       WEBSERVER_LICENSES: ${WEBSERVER_LICENSES}
       LICENSES_ITIS_VIP_SYNCER_ENABLED : ${LICENSES_ITIS_VIP_SYNCER_ENABLED}
+      LICENSES_ITIS_VIP_SYNCER_PERIODICITY: ${LICENSES_ITIS_VIP_SYNCER_PERIODICITY}
       LICENSES_ITIS_VIP_API_URL: ${LICENSES_ITIS_VIP_API_URL}
       LICENSES_ITIS_VIP_CATEGORIES: ${LICENSES_ITIS_VIP_CATEGORIES}
       LICENSES_SPEAG_PHANTOMS_API_URL: ${LICENSES_SPEAG_PHANTOMS_API_URL}

services/static-webserver/client/source/class/osparc/desktop/credits/BillingCenter.js

@@ -36,7 +36,8 @@ qx.Class.define("osparc.desktop.credits.BillingCenter", {
 
     if (osparc.product.Utils.showS4LStore()) {
       this.__addPurchasesPage();
-      this.__addCheckoutsPage();
+      // For now, do not add checkouts page
+      // this.__addCheckoutsPage();
     }
   },
 
@@ -102,7 +103,7 @@ qx.Class.define("osparc.desktop.credits.BillingCenter", {
 
     __addPurchasesPage: function() {
       const title = this.tr("Purchases");
-      const iconSrc = "@FontAwesome5Solid/list/22";
+      const iconSrc = "@FontAwesome5Solid/shopping-bag/22";
       const purchases = new osparc.desktop.credits.Purchases();
       const page = this.addTab(title, iconSrc, purchases);
       return page;