repalced

Author: Andrei Neagu

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

@@ -6,14 +6,15 @@
 
 from ..projects import ProjectID
 from ..projects_nodes_io import NodeID
-from ..resource_tracker import CreditTransactionStatus, ServiceRunId, ServiceRunStatus
+from ..resource_tracker import CreditTransactionStatus, ServiceRunStatus
 from ..services import ServiceKey, ServiceVersion
+from ..services_types import RunID
 from ..users import UserID
 from ..wallets import WalletID
 
 
 class ServiceRunGet(BaseModel):
-    service_run_id: ServiceRunId
+    service_run_id: RunID
     wallet_id: WalletID | None
     wallet_name: str | None
     user_id: UserID

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

@@ -11,12 +11,12 @@
     PricingPlanId,
     PricingUnitCostUpdate,
     PricingUnitId,
-    ServiceRunId,
     ServiceRunStatus,
     SpecificInfo,
     UnitExtraInfo,
 )
 from ..services import ServiceKey, ServiceVersion
+from ..services_types import RunID
 from ..users import UserID
 from ..wallets import WalletID
 from ._base import InputSchema, OutputSchema
@@ -27,7 +27,7 @@
 class ServiceRunGet(
     BaseModel
 ):  # NOTE: this is already in use so I didnt modidy inheritance from OutputSchema
-    service_run_id: ServiceRunId
+    service_run_id: RunID
     wallet_id: WalletID | None
     wallet_name: str | None
     user_id: UserID

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

@@ -20,7 +20,6 @@
 
 _logger = logging.getLogger(__name__)
 
-ServiceRunId: TypeAlias = str
 PricingPlanId: TypeAlias = PositiveInt
 PricingUnitId: TypeAlias = PositiveInt
 PricingUnitCostId: TypeAlias = PositiveInt

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/licenses/licensed_items.py

@@ -8,7 +8,7 @@
 from models_library.licensed_items import LicensedItemID
 from models_library.products import ProductName
 from models_library.rabbitmq_basic_types import RPCMethodName
-from models_library.resource_tracker import ServiceRunId
+from models_library.services_types import RunID
 from models_library.users import UserID
 from models_library.wallets import WalletID
 from pydantic import TypeAdapter
@@ -65,7 +65,7 @@ async def checkout_licensed_item_for_wallet(
     wallet_id: WalletID,
     licensed_item_id: LicensedItemID,
     num_of_seats: int,
-    service_run_id: ServiceRunId,
+    service_run_id: RunID,
 ) -> None:
     result = await rabbitmq_rpc_client.request(
         WEBSERVER_RPC_NAMESPACE,
@@ -89,7 +89,7 @@ async def release_licensed_item_for_wallet(
     wallet_id: WalletID,
     licensed_item_id: LicensedItemID,
     num_of_seats: int,
-    service_run_id: ServiceRunId,
+    service_run_id: RunID,
 ) -> None:
     result = await rabbitmq_rpc_client.request(
         WEBSERVER_RPC_NAMESPACE,

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/models/credit_transactions.py

@@ -9,11 +9,11 @@
     PricingPlanId,
     PricingUnitCostId,
     PricingUnitId,
-    ServiceRunId,
 )
 from models_library.resource_tracker_licensed_items_purchases import (
     LicensedItemPurchaseID,
 )
+from models_library.services_types import RunID
 from models_library.users import UserID
 from models_library.wallets import WalletID
 from pydantic import BaseModel, ConfigDict
@@ -31,21 +31,21 @@ class CreditTransactionCreate(BaseModel):
     osparc_credits: Decimal
     transaction_status: CreditTransactionStatus
     transaction_classification: CreditClassification
-    service_run_id: ServiceRunId | None
+    service_run_id: RunID | None
     payment_transaction_id: str | None
     created_at: datetime
     last_heartbeat_at: datetime
     licensed_item_purchase_id: LicensedItemPurchaseID | None
 
 
 class CreditTransactionCreditsUpdate(BaseModel):
-    service_run_id: ServiceRunId
+    service_run_id: RunID
     osparc_credits: Decimal
     last_heartbeat_at: datetime
 
 
 class CreditTransactionCreditsAndStatusUpdate(BaseModel):
-    service_run_id: ServiceRunId
+    service_run_id: RunID
     osparc_credits: Decimal
     transaction_status: CreditTransactionStatus
 
@@ -63,7 +63,7 @@ class CreditTransactionDB(BaseModel):
     osparc_credits: Decimal
     transaction_status: CreditTransactionStatus
     transaction_classification: CreditClassification
-    service_run_id: ServiceRunId | None
+    service_run_id: RunID | None
     payment_transaction_id: str | None
     created: datetime
     last_heartbeat_at: datetime

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/models/service_runs.py

@@ -10,18 +10,18 @@
     PricingUnitCostId,
     PricingUnitId,
     ResourceTrackerServiceType,
-    ServiceRunId,
     ServiceRunStatus,
 )
 from models_library.services import ServiceKey, ServiceVersion
+from models_library.services_types import RunID
 from models_library.users import UserID
 from models_library.wallets import WalletID
 from pydantic import BaseModel, ConfigDict, NonNegativeInt
 
 
 class ServiceRunCreate(BaseModel):
     product_name: ProductName
-    service_run_id: ServiceRunId
+    service_run_id: RunID
     wallet_id: WalletID | None
     wallet_name: str | None
     pricing_plan_id: PricingPlanId | None
@@ -51,20 +51,20 @@ class ServiceRunCreate(BaseModel):
 
 
 class ServiceRunLastHeartbeatUpdate(BaseModel):
-    service_run_id: ServiceRunId
+    service_run_id: RunID
     last_heartbeat_at: datetime
 
 
 class ServiceRunStoppedAtUpdate(BaseModel):
-    service_run_id: ServiceRunId
+    service_run_id: RunID
     stopped_at: datetime
     service_run_status: ServiceRunStatus
     service_run_status_msg: str | None
 
 
 class ServiceRunDB(BaseModel):
     product_name: ProductName
-    service_run_id: ServiceRunId
+    service_run_id: RunID
     wallet_id: WalletID | None
     wallet_name: str | None
     pricing_plan_id: PricingPlanId | None
@@ -113,7 +113,7 @@ class OsparcCreditsAggregatedByServiceKeyDB(BaseModel):
 
 
 class ServiceRunForCheckDB(BaseModel):
-    service_run_id: ServiceRunId
+    service_run_id: RunID
     last_heartbeat_at: datetime
     missed_heartbeat_counter: NonNegativeInt
     modified: datetime

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/background_task_periodic_heartbeat_check.py

@@ -6,9 +6,9 @@
 from models_library.resource_tracker import (
     CreditTransactionStatus,
     ResourceTrackerServiceType,
-    ServiceRunId,
     ServiceRunStatus,
 )
+from models_library.services_types import RunID
 from pydantic import NonNegativeInt, PositiveInt
 from sqlalchemy.ext.asyncio import AsyncEngine
 
@@ -28,7 +28,7 @@ async def _check_service_heartbeat(
     base_start_timestamp: datetime,
     resource_usage_tracker_missed_heartbeat_interval: timedelta,
     resource_usage_tracker_missed_heartbeat_counter_fail: NonNegativeInt,
-    service_run_id: ServiceRunId,
+    service_run_id: RunID,
     last_heartbeat_at: datetime,
     missed_heartbeat_counter: NonNegativeInt,
     modified_at: datetime,
@@ -74,7 +74,7 @@ async def _check_service_heartbeat(
 
 async def _close_unhealthy_service(
     db_engine: AsyncEngine,
-    service_run_id: ServiceRunId,
+    service_run_id: RunID,
     base_start_timestamp: datetime,
 ):
     # 1. Close the service_run

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/modules/db/service_runs_db.py

@@ -9,10 +9,10 @@
 from models_library.resource_tracker import (
     CreditClassification,
     CreditTransactionStatus,
-    ServiceRunId,
     ServiceRunStatus,
 )
 from models_library.rest_ordering import OrderBy, OrderDirection
+from models_library.services_types import RunID
 from models_library.users import UserID
 from models_library.wallets import WalletID
 from pydantic import PositiveInt
@@ -46,7 +46,7 @@ async def create_service_run(
     connection: AsyncConnection | None = None,
     *,
     data: ServiceRunCreate,
-) -> ServiceRunId:
+) -> RunID:
     async with transaction_context(engine, connection) as conn:
         insert_stmt = (
             resource_tracker_service_runs.insert()
@@ -88,7 +88,7 @@ async def create_service_run(
     row = result.first()
     if row is None:
         raise ServiceRunNotCreatedDBError(data=data)
-    return cast(ServiceRunId, row[0])
+    return cast(RunID, row[0])
 
 
 async def update_service_run_last_heartbeat(
@@ -160,7 +160,7 @@ async def get_service_run_by_id(
     engine: AsyncEngine,
     connection: AsyncConnection | None = None,
     *,
-    service_run_id: ServiceRunId,
+    service_run_id: RunID,
 ) -> ServiceRunDB | None:
     async with transaction_context(engine, connection) as conn:
         stmt = sa.select(resource_tracker_service_runs).where(
@@ -590,7 +590,7 @@ async def update_service_missed_heartbeat_counter(
     engine: AsyncEngine,
     connection: AsyncConnection | None = None,
     *,
-    service_run_id: ServiceRunId,
+    service_run_id: RunID,
     last_heartbeat_at: datetime,
     missed_heartbeat_counter: int,
 ) -> ServiceRunDB | None:

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/utils.py

@@ -14,7 +14,8 @@
     WalletCreditsLimitReachedMessage,
     WalletCreditsMessage,
 )
-from models_library.resource_tracker import ServiceRunId, ServiceRunStatus
+from models_library.resource_tracker import ServiceRunStatus
+from models_library.services_types import RunID
 from models_library.users import UserID
 from models_library.wallets import WalletID
 from pydantic import PositiveInt
@@ -58,7 +59,7 @@ async def sum_credit_transactions_and_publish_to_rabbitmq(
 
 async def _publish_to_rabbitmq_wallet_credits_limit_reached(
     rabbitmq_client: RabbitMQClient,
-    service_run_id: ServiceRunId,
+    service_run_id: RunID,
     user_id: UserID,
     project_id: ProjectID,
     node_id: NodeID,

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

@@ -4,8 +4,8 @@
 from models_library.basic_types import IDStr
 from models_library.licensed_items import LicensedItemID
 from models_library.products import ProductName
-from models_library.resource_tracker import ServiceRunId
 from models_library.rest_ordering import OrderBy
+from models_library.services_types import RunID
 from models_library.users import UserID
 from models_library.wallets import WalletID
 from servicelib.rabbitmq import RPCRouter
@@ -56,7 +56,7 @@ async def checkout_licensed_item_for_wallet(
     wallet_id: WalletID,
     licensed_item_id: LicensedItemID,
     num_of_seats: int,
-    service_run_id: ServiceRunId,
+    service_run_id: RunID,
 ) -> None:
     raise NotImplementedError
 
@@ -70,7 +70,7 @@ async def release_licensed_item_for_wallet(
     wallet_id: WalletID,
     licensed_item_id: LicensedItemID,
     num_of_seats: int,
-    service_run_id: ServiceRunId,
+    service_run_id: RunID,
 ) -> None:
     raise NotImplementedError