Merge remote-tracking branch 'upstream/master' into 2025/fix/ooil1

Author: mrnicegyu11

.env-devel

@@ -371,6 +371,7 @@ WEBSERVER_GARBAGE_COLLECTOR=null
 WEBSERVER_GROUPS=1
 WEBSERVER_GUNICORN_CMD_ARGS=--timeout=180
 WEBSERVER_HOST=webserver
+WEBSERVER_LICENSES=true
 WEBSERVER_LOGIN={}
 WEBSERVER_LOGLEVEL=INFO
 WEBSERVER_META_MODELING=1

.github/mergify.yml

@@ -0,0 +1,43 @@
+# NOTE: the PR is added to the queue when all checks have passed
+# and the CI is fully green.
+# If the PR is behind the queue will take care of updating it
+queue_rules:
+  - name: default
+    queue_conditions:
+      # general prerequisits fo accept the PR in the queue
+      - label=🤖-automerge # let Mergify know that the PR can be merged (added manually)
+      - label!=🤖-do-not-merge # block Mergify from merging the PR (added manually)
+      - base=master
+      - -draft # PR is not in draft state
+      - -conflict # No merge conflicts
+
+      # Check for required reviews
+      - "#approved-reviews-by>=2" # Requires 2 approving reviews
+      - "#changes-requested-reviews-by=0" # No changes requested
+      - "#review-threads-unresolved=0" # All review threads resolved
+
+    merge_conditions:
+      # list of CI checks that need to pass
+      - check-success=unit-tests
+      - check-success=integration-tests
+      - check-success=system-tests
+
+# NOTE: in case of flaky tests you above checks will fail
+# the PR will be removed from the queue.
+# This retries the checks, as soon as they become green,
+# the PR will be pusehd to the queu again
+pull_request_rules:
+  - name: retry CI on fails (used for flaky tests)
+    conditions:
+      - label=🤖-automerge
+      - label!=🤖-do-not-merge
+      - base=master
+      - or:
+          - check-failure=unit-tests
+          - check-failure=integration-tests
+          - check-failure=system-tests
+    actions:
+      github_actions:
+        workflow:
+          dispatch:
+            - workflow: .github/workflows/ci-testing-deploy.yml

.ruff.toml

@@ -1,5 +1,5 @@
 
-select = [
+lint.select = [
   "A",     # [https://pypi.org/project/flake8-builtins/]
   "ARG",   # [https://pypi.org/project/flake8-unused-arguments/]
   "ASYNC", # [https://pypi.org/project/flake8-async/]
@@ -40,7 +40,7 @@ select = [
   "W",     # [https://pypi.org/project/pycodestyle/] warnings
   "YTT",   # [https://pypi.org/project/flake8-2020/]
 ]
-ignore = [
+lint.ignore = [
   "E501",   # line too long, handled by black
   "S101",   # use of `assert` detected hanbled by pylance, does not support noseq
   "TID252", # [*] Relative imports from parent modules are banned
@@ -50,7 +50,7 @@ ignore = [
 target-version = "py311"
 
 
-[per-file-ignores]
+[lint.per-file-ignores]
 "**/{tests,pytest_simcore}/**" = [
   "T201",    # print found
   "ARG001",  # unused function argument
@@ -64,10 +64,10 @@ target-version = "py311"
   "FBT001",  # Boolean positional arg in function definition
 ]
 
-[flake8-pytest-style]
+[lint.flake8-pytest-style]
 fixture-parentheses = false
 parametrize-names-type = "csv"
 
 
-[pylint]
+[lint.pylint]
 max-args = 10

api/specs/web-server/_licensed_items.py

@@ -14,8 +14,10 @@
 from models_library.generics import Envelope
 from models_library.rest_error import EnvelopedError
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.licenses._exceptions_handlers import _TO_HTTP_ERROR_MAP
-from simcore_service_webserver.licenses._models import (
+from simcore_service_webserver.licenses._common.exceptions_handlers import (
+    _TO_HTTP_ERROR_MAP,
+)
+from simcore_service_webserver.licenses._common.models import (
     LicensedItemsBodyParams,
     LicensedItemsListQueryParams,
     LicensedItemsPathParams,

api/specs/web-server/_licensed_items_checkouts.py

@@ -17,7 +17,9 @@
 from models_library.rest_error import EnvelopedError
 from models_library.rest_pagination import Page
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.licenses._exceptions_handlers import _TO_HTTP_ERROR_MAP
+from simcore_service_webserver.licenses._common.exceptions_handlers import (
+    _TO_HTTP_ERROR_MAP,
+)
 from simcore_service_webserver.licenses._licensed_items_checkouts_models import (
     LicensedItemCheckoutPathParams,
     LicensedItemsCheckoutsListQueryParams,

api/specs/web-server/_licensed_items_purchases.py

@@ -17,8 +17,10 @@
 from models_library.rest_error import EnvelopedError
 from models_library.rest_pagination import Page
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.licenses._exceptions_handlers import _TO_HTTP_ERROR_MAP
-from simcore_service_webserver.licenses._models import (
+from simcore_service_webserver.licenses._common.exceptions_handlers import (
+    _TO_HTTP_ERROR_MAP,
+)
+from simcore_service_webserver.licenses._common.models import (
     LicensedItemsPurchasesListQueryParams,
     LicensedItemsPurchasesPathParams,
 )

api/specs/web-server/_resource_usage.py

@@ -21,6 +21,7 @@
     CreatePricingPlanBodyParams,
     CreatePricingUnitBodyParams,
     PricingPlanAdminGet,
+    PricingPlanGet,
     PricingPlanToServiceAdminGet,
     PricingUnitAdminGet,
     PricingUnitGet,
@@ -29,15 +30,16 @@
     UpdatePricingUnitBodyParams,
 )
 from models_library.generics import Envelope
+from models_library.rest_pagination import Page, PageQueryParameters
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.resource_usage._pricing_plans_admin_handlers import (
+from simcore_service_webserver.resource_usage._pricing_plans_admin_rest import (
     PricingPlanGetPathParams,
     PricingUnitGetPathParams,
 )
-from simcore_service_webserver.resource_usage._pricing_plans_handlers import (
+from simcore_service_webserver.resource_usage._pricing_plans_rest import (
     PricingPlanUnitGetPathParams,
 )
-from simcore_service_webserver.resource_usage._service_runs_handlers import (
+from simcore_service_webserver.resource_usage._service_runs_rest import (
     ServicesAggregatedUsagesListQueryParams,
     ServicesResourceUsagesListQueryParams,
     ServicesResourceUsagesReportQueryParams,
@@ -48,7 +50,7 @@
 
 @router.get(
     "/services/-/resource-usages",
-    response_model=Envelope[list[ServiceRunGet]],
+    response_model=Page[ServiceRunGet],
     summary="Retrieve finished and currently running user services"
     " (user and product are taken from context, optionally wallet_id parameter might be provided).",
     tags=["usage"],
@@ -61,7 +63,7 @@ async def list_resource_usage_services(
 
 @router.get(
     "/services/-/aggregated-usages",
-    response_model=Envelope[list[OsparcCreditsAggregatedByServiceGet]],
+    response_model=Page[OsparcCreditsAggregatedByServiceGet],
     summary="Used credits based on aggregate by type, currently supported `services`"
     ". (user and product are taken from context, optionally wallet_id parameter might be provided).",
     tags=["usage"],
@@ -93,7 +95,6 @@ async def export_resource_usage_services(
 @router.get(
     "/pricing-plans/{pricing_plan_id}/pricing-units/{pricing_unit_id}",
     response_model=Envelope[PricingUnitGet],
-    summary="Retrieve detail information about pricing unit",
     tags=["pricing-plans"],
 )
 async def get_pricing_plan_unit(
@@ -102,27 +103,50 @@ async def get_pricing_plan_unit(
     ...
 
 
+@router.get(
+    "/pricing-plans",
+    response_model=Page[PricingPlanGet],
+    tags=["pricing-plans"],
+    description="To keep the listing lightweight, the pricingUnits field is None.",
+)
+async def list_pricing_plans(
+    _query: Annotated[as_query(PageQueryParameters), Depends()]
+):
+    ...
+
+
+@router.get(
+    "/pricing-plans/{pricing_plan_id}",
+    response_model=Envelope[PricingPlanGet],
+    tags=["pricing-plans"],
+)
+async def get_pricing_plan(
+    _path: Annotated[PricingPlanGetPathParams, Depends()],
+):
+    ...
+
+
 ## Pricing plans for Admin panel
 
 
 @router.get(
     "/admin/pricing-plans",
-    response_model=Envelope[list[PricingPlanAdminGet]],
-    summary="List pricing plans",
+    response_model=Page[PricingPlanAdminGet],
     tags=["admin"],
     description="To keep the listing lightweight, the pricingUnits field is None.",
 )
-async def list_pricing_plans():
+async def list_pricing_plans_for_admin_user(
+    _query: Annotated[as_query(PageQueryParameters), Depends()]
+):
     ...
 
 
 @router.get(
     "/admin/pricing-plans/{pricing_plan_id}",
     response_model=Envelope[PricingPlanAdminGet],
-    summary="Retrieve detail information about pricing plan",
     tags=["admin"],
 )
-async def get_pricing_plan(
+async def get_pricing_plan_for_admin_user(
     _path: Annotated[PricingPlanGetPathParams, Depends()],
 ):
     ...
@@ -131,7 +155,6 @@ async def get_pricing_plan(
 @router.post(
     "/admin/pricing-plans",
     response_model=Envelope[PricingPlanAdminGet],
-    summary="Create pricing plan",
     tags=["admin"],
 )
 async def create_pricing_plan(
@@ -143,7 +166,6 @@ async def create_pricing_plan(
 @router.put(
     "/admin/pricing-plans/{pricing_plan_id}",
     response_model=Envelope[PricingPlanAdminGet],
-    summary="Update detail information about pricing plan",
     tags=["admin"],
 )
 async def update_pricing_plan(
@@ -159,7 +181,6 @@ async def update_pricing_plan(
 @router.get(
     "/admin/pricing-plans/{pricing_plan_id}/pricing-units/{pricing_unit_id}",
     response_model=Envelope[PricingUnitAdminGet],
-    summary="Retrieve detail information about pricing unit",
     tags=["admin"],
 )
 async def get_pricing_unit(
@@ -171,7 +192,6 @@ async def get_pricing_unit(
 @router.post(
     "/admin/pricing-plans/{pricing_plan_id}/pricing-units",
     response_model=Envelope[PricingUnitAdminGet],
-    summary="Create pricing unit",
     tags=["admin"],
 )
 async def create_pricing_unit(
@@ -184,7 +204,6 @@ async def create_pricing_unit(
 @router.put(
     "/admin/pricing-plans/{pricing_plan_id}/pricing-units/{pricing_unit_id}",
     response_model=Envelope[PricingUnitAdminGet],
-    summary="Update detail information about pricing plan",
     tags=["admin"],
 )
 async def update_pricing_unit(
@@ -200,7 +219,6 @@ async def update_pricing_unit(
 @router.get(
     "/admin/pricing-plans/{pricing_plan_id}/billable-services",
     response_model=Envelope[list[PricingPlanToServiceAdminGet]],
-    summary="List services that are connected to the provided pricing plan",
     tags=["admin"],
 )
 async def list_connected_services_to_pricing_plan(
@@ -212,7 +230,6 @@ async def list_connected_services_to_pricing_plan(
 @router.post(
     "/admin/pricing-plans/{pricing_plan_id}/billable-services",
     response_model=Envelope[PricingPlanToServiceAdminGet],
-    summary="Connect service with pricing plan",
     tags=["admin"],
 )
 async def connect_service_to_pricing_plan(

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

@@ -17,6 +17,7 @@ class LicensedItemCheckoutGet(BaseModel):
     licensed_item_id: LicensedItemID
     wallet_id: WalletID
     user_id: UserID
+    user_email: str
     product_name: ProductName
     service_run_id: ServiceRunID
     started_at: datetime
@@ -31,6 +32,7 @@ class LicensedItemCheckoutGet(BaseModel):
                     "licensed_item_id": "303942ef-6d31-4ba8-afbe-dbb1fce2a953",
                     "wallet_id": 1,
                     "user_id": 1,
+                    "user_email": "[email protected]",
                     "product_name": "osparc",
                     "service_run_id": "run_1",
                     "started_at": "2023-01-11 13:11:47.293595",

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

@@ -25,6 +25,7 @@ class LicensedItemPurchaseGet(BaseModel):
     expire_at: datetime
     num_of_seats: int
     purchased_by_user: UserID
+    user_email: str
     purchased_at: datetime
     modified: datetime
 
@@ -43,6 +44,7 @@ class LicensedItemPurchaseGet(BaseModel):
                     "expire_at": "2023-01-11 13:11:47.293595",
                     "num_of_seats": 1,
                     "purchased_by_user": 1,
+                    "user_email": "[email protected]",
                     "purchased_at": "2023-01-11 13:11:47.293595",
                     "modified": "2023-01-11 13:11:47.293595",
                 }

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

@@ -1,7 +1,8 @@
 from datetime import datetime
 from decimal import Decimal
+from typing import NamedTuple
 
-from pydantic import BaseModel, ConfigDict
+from pydantic import BaseModel, ConfigDict, PositiveInt
 
 from ..resource_tracker import (
     HardwareInfo,
@@ -76,6 +77,11 @@ class PricingPlanGet(BaseModel):
     )
 
 
+class PricingPlanPage(NamedTuple):
+    items: list[PricingPlanGet]
+    total: PositiveInt
+
+
 class PricingPlanToServiceGet(BaseModel):
     pricing_plan_id: PricingPlanId
     service_key: ServiceKey