daily work

Author: matusdrobuliak66

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

@@ -38,16 +38,34 @@ class ServiceRunStatus(StrAutoEnum):
 
 
 class CreditTransactionStatus(StrAutoEnum):
+    # Represents the possible statuses of a credit transaction.
+
     PENDING = auto()
+    # The transaction is pending and has not yet been finalized.
+    # Example: During the running of a service, the transaction remains in the Pending state until the service is stopped.
+
     BILLED = auto()
+    # The transaction has been successfully billed.
+
+    IN_DEBT = auto()
+    # The transaction is marked as in debt.
+    # Example: This occurs when a computational job continues to run even though the user does not have sufficient credits in their wallet.
+
     NOT_BILLED = auto()
+    # The transaction will not be billed.
+    # Example: This status is used when there is an issue on our side, and we decide not to bill the user.
+
     REQUIRES_MANUAL_REVIEW = auto()
+    # The transaction requires manual review due to potential issues.
+    # NOTE: This status is currently not in use.
 
 
 class CreditClassification(StrAutoEnum):
     ADD_WALLET_TOP_UP = auto()  # user top up credits
     DEDUCT_SERVICE_RUN = auto()  # computational/dynamic service run costs)
     DEDUCT_LICENSE_PURCHASE = auto()
+    ADD_WALLET_EXCHANGE = auto()
+    DEDUCT_WALLET_EXCHANGE = auto()
 
 
 class PricingPlanClassification(StrAutoEnum):

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/resource_usage_tracker/credit_transactions.py

@@ -0,0 +1,68 @@
+import logging
+from typing import Final
+
+from models_library.api_schemas_resource_usage_tracker import (
+    RESOURCE_USAGE_TRACKER_RPC_NAMESPACE,
+)
+from models_library.api_schemas_resource_usage_tracker.credit_transactions import (
+    CreditTransactionCreateBody,
+    WalletTotalCredits,
+)
+from models_library.products import ProductName
+from models_library.projects import ProjectID
+from models_library.rabbitmq_basic_types import RPCMethodName
+from models_library.resource_tracker import CreditTransactionStatus
+from models_library.wallets import WalletID
+from pydantic import NonNegativeInt, TypeAdapter
+
+from ....logging_utils import log_decorator
+from ....rabbitmq import RabbitMQRPCClient
+
+_logger = logging.getLogger(__name__)
+
+
+_DEFAULT_TIMEOUT_S: Final[NonNegativeInt] = 20
+
+_RPC_METHOD_NAME_ADAPTER: TypeAdapter[RPCMethodName] = TypeAdapter(RPCMethodName)
+
+
+@log_decorator(_logger, level=logging.DEBUG)
+async def get_wallet_total_credits(
+    rabbitmq_rpc_client: RabbitMQRPCClient,
+    *,
+    product_name: ProductName,
+    wallet_id: WalletID,
+    transaction_status: CreditTransactionStatus | None = None,
+    project_id: ProjectID | None = None,
+) -> WalletTotalCredits:
+    result = await rabbitmq_rpc_client.request(
+        RESOURCE_USAGE_TRACKER_RPC_NAMESPACE,
+        _RPC_METHOD_NAME_ADAPTER.validate_python("get_wallet_total_credits"),
+        product_name=product_name,
+        wallet_id=wallet_id,
+        transaction_status=transaction_status,
+        project_id=project_id,
+        timeout_s=_DEFAULT_TIMEOUT_S,
+    )
+    assert isinstance(result, WalletTotalCredits)  # nosec
+    return result
+
+
+@log_decorator(_logger, level=logging.DEBUG)
+async def pay_project_debt(
+    rabbitmq_rpc_client: RabbitMQRPCClient,
+    *,
+    project_id: ProjectID,
+    current_wallet_transaction: CreditTransactionCreateBody,
+    new_wallet_transaction: CreditTransactionCreateBody,
+) -> None:
+    result = await rabbitmq_rpc_client.request(
+        RESOURCE_USAGE_TRACKER_RPC_NAMESPACE,
+        _RPC_METHOD_NAME_ADAPTER.validate_python("pay_project_debt"),
+        project_id=project_id,
+        current_wallet_transaction=current_wallet_transaction,
+        new_wallet_transaction=new_wallet_transaction,
+        timeout_s=_DEFAULT_TIMEOUT_S,
+    )
+    assert isinstance(result, None)  # nosec
+    return result

services/efs-guardian/src/simcore_service_efs_guardian/services/background_tasks.py

@@ -45,11 +45,12 @@ async def removal_policy_task(app: FastAPI) -> None:
             _project_last_change_date = (
                 await projects_repo.get_project_last_change_date(project_id)
             )
-        except DBProjectNotFoundError as exc:
-            _logger.warning(
-                "Project %s not found, this should not happen, please investigate (contact MD)",
-                exc.msg_template,
+        except DBProjectNotFoundError:
+            _logger.info(
+                "Project %s not found. Removing EFS data for project {project_id} started",
+                project_id,
             )
+            await efs_manager.remove_project_efs_data(project_id)
         if (
             _project_last_change_date
             < base_start_timestamp

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/api/rpc/_credit_transactions.py

@@ -0,0 +1,50 @@
+from fastapi import FastAPI
+from models_library.api_schemas_resource_usage_tracker.credit_transactions import (
+    CreditTransactionCreateBody,
+    WalletTotalCredits,
+)
+from models_library.products import ProductName
+from models_library.projects import ProjectID
+from models_library.resource_tracker import CreditTransactionStatus
+from models_library.wallets import WalletID
+from servicelib.rabbitmq import RPCRouter
+
+from ...services import credit_transactions
+
+router = RPCRouter()
+
+
+@router.expose(reraise_if_error_type=())
+async def get_wallet_total_credits(
+    app: FastAPI,
+    *,
+    product_name: ProductName,
+    wallet_id: WalletID,
+    # internal filters
+    transaction_status: CreditTransactionStatus | None = None,
+    project_id: ProjectID | None = None,
+) -> WalletTotalCredits:
+    return await credit_transactions.sum_credit_transactions_by_product_and_wallet(
+        db_engine=app.state.engine,
+        product_name=product_name,
+        wallet_id=wallet_id,
+        transaction_status=transaction_status,
+        project_id=project_id,
+    )
+
+
+@router.expose(reraise_if_error_type=())
+async def pay_project_debt(
+    app: FastAPI,
+    *,
+    project_id: ProjectID,
+    current_wallet_transaction: CreditTransactionCreateBody,
+    new_wallet_transaction: CreditTransactionCreateBody,
+) -> None:
+    return await credit_transactions.pay_project_debt(
+        db_engine=app.state.engine,
+        rabbitmq_client=app.state.rabbitmq_client,
+        project_id=project_id,
+        current_wallet_transaction=current_wallet_transaction,
+        new_wallet_transaction=new_wallet_transaction,
+    )

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/api/rpc/_resource_tracker.py renamed to services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/api/rpc/_pricing_plans.py

@@ -4,10 +4,6 @@
     PricingPlanToServiceGet,
     PricingUnitGet,
 )
-from models_library.api_schemas_resource_usage_tracker.service_runs import (
-    OsparcCreditsAggregatedUsagesPage,
-    ServiceRunPage,
-)
 from models_library.products import ProductName
 from models_library.resource_tracker import (
     PricingPlanCreate,
@@ -16,108 +12,15 @@
     PricingUnitId,
     PricingUnitWithCostCreate,
     PricingUnitWithCostUpdate,
-    ServiceResourceUsagesFilters,
-    ServicesAggregatedUsagesTimePeriod,
-    ServicesAggregatedUsagesType,
 )
-from models_library.rest_ordering import OrderBy
 from models_library.services import ServiceKey, ServiceVersion
-from models_library.users import UserID
-from models_library.wallets import WalletID
-from pydantic import AnyUrl
 from servicelib.rabbitmq import RPCRouter
 
-from ...core.settings import ApplicationSettings
-from ...services import pricing_plans, pricing_units, service_runs
-from ...services.modules.s3 import get_s3_client
+from ...services import pricing_plans, pricing_units
 
 router = RPCRouter()
 
 
-## Service runs
-
-
-@router.expose(reraise_if_error_type=())
-async def get_service_run_page(
-    app: FastAPI,
-    *,
-    user_id: UserID,
-    product_name: ProductName,
-    limit: int = 20,
-    offset: int = 0,
-    wallet_id: WalletID | None = None,
-    access_all_wallet_usage: bool = False,
-    order_by: OrderBy | None = None,
-    filters: ServiceResourceUsagesFilters | None = None,
-) -> ServiceRunPage:
-    return await service_runs.list_service_runs(
-        user_id=user_id,
-        product_name=product_name,
-        db_engine=app.state.engine,
-        limit=limit,
-        offset=offset,
-        wallet_id=wallet_id,
-        access_all_wallet_usage=access_all_wallet_usage,
-        order_by=order_by,
-        filters=filters,
-    )
-
-
-@router.expose(reraise_if_error_type=())
-async def export_service_runs(
-    app: FastAPI,
-    *,
-    user_id: UserID,
-    product_name: ProductName,
-    wallet_id: WalletID | None = None,
-    access_all_wallet_usage: bool = False,
-    order_by: OrderBy | None = None,
-    filters: ServiceResourceUsagesFilters | None = None,
-) -> AnyUrl:
-    app_settings: ApplicationSettings = app.state.settings
-    s3_settings = app_settings.RESOURCE_USAGE_TRACKER_S3
-    assert s3_settings  # nosec
-
-    return await service_runs.export_service_runs(
-        s3_client=get_s3_client(app),
-        bucket_name=f"{s3_settings.S3_BUCKET_NAME}",
-        s3_region=s3_settings.S3_REGION,
-        user_id=user_id,
-        product_name=product_name,
-        db_engine=app.state.engine,
-        wallet_id=wallet_id,
-        access_all_wallet_usage=access_all_wallet_usage,
-        order_by=order_by,
-        filters=filters,
-    )
-
-
-@router.expose(reraise_if_error_type=())
-async def get_osparc_credits_aggregated_usages_page(
-    app: FastAPI,
-    *,
-    user_id: UserID,
-    product_name: ProductName,
-    aggregated_by: ServicesAggregatedUsagesType,
-    time_period: ServicesAggregatedUsagesTimePeriod,
-    limit: int = 20,
-    offset: int = 0,
-    wallet_id: WalletID,
-    access_all_wallet_usage: bool = False,
-) -> OsparcCreditsAggregatedUsagesPage:
-    return await service_runs.get_osparc_credits_aggregated_usages_page(
-        user_id=user_id,
-        product_name=product_name,
-        db_engine=app.state.engine,
-        aggregated_by=aggregated_by,
-        time_period=time_period,
-        limit=limit,
-        offset=offset,
-        wallet_id=wallet_id,
-        access_all_wallet_usage=access_all_wallet_usage,
-    )
-
-
 ## Pricing plans