Merge branch 'master' into enh/json-schema-for-ui-config

Author: odeimaiz

.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}

.vscode/settings.template.json

@@ -59,9 +59,7 @@
   },
   "hadolint.hadolintPath": "${workspaceFolder}/scripts/hadolint.bash",
   "hadolint.cliOptions": [],
-  "ruff.lint.args": [
-    "--config=${workspaceFolder}/.ruff.toml"
-  ],
+  "ruff.configuration": "${workspaceFolder}/.ruff.toml",
   "ruff.path": [
     "${workspaceFolder}/.venv/bin/ruff"
   ],

api/specs/web-server/_licensed_items.py

@@ -9,9 +9,11 @@
 from typing import Annotated
 
 from _common import as_query
-from fastapi import APIRouter, Depends, status
+from fastapi import APIRouter, Depends
 from models_library.api_schemas_webserver.licensed_items import LicensedItemRestGet
-from models_library.generics import Envelope
+from models_library.api_schemas_webserver.licensed_items_purchases import (
+    LicensedItemPurchaseGet,
+)
 from models_library.rest_error import EnvelopedError
 from models_library.rest_pagination import Page
 from simcore_service_webserver._meta import API_VTAG
@@ -46,19 +48,9 @@ async def list_licensed_items(
     ...
 
 
-@router.get(
-    "/catalog/licensed-items/{licensed_item_id}",
-    response_model=Envelope[LicensedItemRestGet],
-)
-async def get_licensed_item(
-    _path: Annotated[LicensedItemsPathParams, Depends()],
-):
-    ...
-
-
 @router.post(
     "/catalog/licensed-items/{licensed_item_id}:purchase",
-    status_code=status.HTTP_204_NO_CONTENT,
+    response_model=LicensedItemPurchaseGet,
 )
 async def purchase_licensed_item(
     _path: Annotated[LicensedItemsPathParams, Depends()],

api/specs/web-server/_storage.py

@@ -7,7 +7,9 @@
 from typing import TypeAlias
 
 from fastapi import APIRouter, Query, status
-from models_library.api_schemas_storage import (
+from models_library.generics import Envelope
+from models_library.projects_nodes_io import LocationID
+from models_library.storage_schemas import (
     FileLocation,
     FileMetaDataGet,
     FileUploadCompleteFutureResponse,
@@ -17,8 +19,6 @@
     LinkType,
     PresignedLink,
 )
-from models_library.generics import Envelope
-from models_library.projects_nodes_io import LocationID
 from pydantic import AnyUrl, ByteSize
 from simcore_service_webserver._meta import API_VTAG
 from simcore_service_webserver.storage.schemas import DatasetMetaData, FileMetaData

packages/aws-library/src/aws_library/s3/_client.py

@@ -13,8 +13,8 @@
 from boto3.s3.transfer import TransferConfig
 from botocore import exceptions as botocore_exc
 from botocore.client import Config
-from models_library.api_schemas_storage import ETag, S3BucketName, UploadedPart
 from models_library.basic_types import SHA256Str
+from models_library.storage_schemas import ETag, S3BucketName, UploadedPart
 from pydantic import AnyUrl, ByteSize, TypeAdapter
 from servicelib.logging_utils import log_catch, log_context
 from servicelib.utils import limited_gather

packages/aws-library/src/aws_library/s3/_models.py

@@ -2,8 +2,8 @@
 from dataclasses import dataclass
 from typing import TypeAlias
 
-from models_library.api_schemas_storage import ETag
 from models_library.basic_types import SHA256Str
+from models_library.storage_schemas import ETag
 from pydantic import AnyUrl, BaseModel, ByteSize
 from types_aiobotocore_s3.type_defs import HeadObjectOutputTypeDef, ObjectTypeDef
 

packages/aws-library/tests/test_s3_client.py

@@ -29,8 +29,8 @@
 )
 from aws_library.s3._models import MultiPartUploadLinks
 from faker import Faker
-from models_library.api_schemas_storage import S3BucketName, UploadedPart
 from models_library.basic_types import SHA256Str
+from models_library.storage_schemas import S3BucketName, UploadedPart
 from moto.server import ThreadedMotoServer
 from pydantic import AnyUrl, ByteSize, TypeAdapter
 from pytest_benchmark.plugin import BenchmarkFixture

packages/models-library/src/models_library/api_schemas_resource_usage_tracker/licensed_items_checkouts.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 from typing import NamedTuple
 
-from models_library.licenses import LicensedItemID
+from models_library.licenses import LicensedItemID, LicensedItemKey, LicensedItemVersion
 from models_library.products import ProductName
 from models_library.resource_tracker_licensed_items_checkouts import (
     LicensedItemCheckoutID,
@@ -15,6 +15,8 @@
 class LicensedItemCheckoutGet(BaseModel):
     licensed_item_checkout_id: LicensedItemCheckoutID
     licensed_item_id: LicensedItemID
+    key: LicensedItemKey
+    version: LicensedItemVersion
     wallet_id: WalletID
     user_id: UserID
     user_email: str
@@ -30,6 +32,8 @@ class LicensedItemCheckoutGet(BaseModel):
                 {
                     "licensed_item_checkout_id": "beb16d18-d57d-44aa-a638-9727fa4a72ef",
                     "licensed_item_id": "303942ef-6d31-4ba8-afbe-dbb1fce2a953",
+                    "key": "Duke",
+                    "version": "1.0.0",
                     "wallet_id": 1,
                     "user_id": 1,
                     "user_email": "[email protected]",

packages/models-library/src/models_library/api_schemas_resource_usage_tracker/licensed_items_purchases.py

@@ -2,7 +2,7 @@
 from decimal import Decimal
 from typing import NamedTuple
 
-from models_library.licenses import LicensedItemID
+from models_library.licenses import LicensedItemID, LicensedItemKey, LicensedItemVersion
 from models_library.products import ProductName
 from models_library.resource_tracker import PricingUnitCostId
 from models_library.resource_tracker_licensed_items_purchases import (
@@ -17,6 +17,8 @@ class LicensedItemPurchaseGet(BaseModel):
     licensed_item_purchase_id: LicensedItemPurchaseID
     product_name: ProductName
     licensed_item_id: LicensedItemID
+    key: LicensedItemKey
+    version: LicensedItemVersion
     wallet_id: WalletID
     wallet_name: str
     pricing_unit_cost_id: PricingUnitCostId
@@ -36,6 +38,8 @@ class LicensedItemPurchaseGet(BaseModel):
                     "licensed_item_purchase_id": "beb16d18-d57d-44aa-a638-9727fa4a72ef",
                     "product_name": "osparc",
                     "licensed_item_id": "303942ef-6d31-4ba8-afbe-dbb1fce2a953",
+                    "key": "Duke",
+                    "version": "1.0.0",
                     "wallet_id": 1,
                     "wallet_name": "My Wallet",
                     "pricing_unit_cost_id": 1,