Merge branch 'master' into functions_draft

Author: wvangeit

packages/aws-library/requirements/_base.txt

@@ -1,8 +1,8 @@
 aio-pika==9.5.5
     # via -r requirements/../../../packages/service-library/requirements/_base.in
-aioboto3==14.1.0
+aioboto3==14.3.0
     # via -r requirements/_base.in
-aiobotocore==2.21.1
+aiobotocore==2.22.0
     # via aioboto3
 aiocache==0.12.3
     # via
@@ -57,9 +57,9 @@ attrs==25.1.0
     #   aiohttp
     #   jsonschema
     #   referencing
-boto3==1.37.1
+boto3==1.37.3
     # via aiobotocore
-botocore==1.37.1
+botocore==1.37.3
     # via
     #   aiobotocore
     #   boto3

packages/aws-library/requirements/_test.txt

@@ -20,12 +20,12 @@ aws-xray-sdk==2.14.0
     # via moto
 blinker==1.9.0
     # via flask
-boto3==1.37.1
+boto3==1.37.3
     # via
     #   -c requirements/_base.txt
     #   aws-sam-translator
     #   moto
-botocore==1.37.1
+botocore==1.37.3
     # via
     #   -c requirements/_base.txt
     #   aws-xray-sdk

packages/models-library/src/models_library/api_schemas_directorv2/comp_runs.py

@@ -1,9 +1,10 @@
 from datetime import datetime
-from typing import Annotated, Any, NamedTuple
+from typing import Any, NamedTuple
 
+from models_library.services_types import ServiceRunID
 from pydantic import (
+    AnyUrl,
     BaseModel,
-    BeforeValidator,
     ConfigDict,
     PositiveInt,
 )
@@ -62,20 +63,16 @@ class ComputationRunRpcGetPage(NamedTuple):
     total: PositiveInt
 
 
-def _none_to_zero_float_pre_validator(value: Any):
-    if value is None:
-        return 0.0
-    return value
-
-
 class ComputationTaskRpcGet(BaseModel):
     project_uuid: ProjectID
     node_id: NodeID
     state: RunningState
-    progress: Annotated[float, BeforeValidator(_none_to_zero_float_pre_validator)]
+    progress: float
     image: dict[str, Any]
     started_at: datetime | None
     ended_at: datetime | None
+    log_download_link: AnyUrl | None
+    service_run_id: ServiceRunID
 
     model_config = ConfigDict(
         json_schema_extra={
@@ -92,6 +89,8 @@ class ComputationTaskRpcGet(BaseModel):
                     },
                     "started_at": "2023-01-11 13:11:47.293595",
                     "ended_at": "2023-01-11 13:11:47.293595",
+                    "log_download_link": "https://example.com/logs",
+                    "service_run_id": "comp_1_12e0c8b2-bad6-40fb-9948-8dec4f65d4d9_1",
                 }
             ]
         }

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

@@ -1,8 +1,10 @@
 from datetime import datetime
+from decimal import Decimal
 from typing import Annotated, Any
 
 from common_library.basic_types import DEFAULT_FACTORY
 from pydantic import (
+    AnyUrl,
     BaseModel,
     ConfigDict,
     Field,
@@ -123,3 +125,6 @@ class ComputationTaskRestGet(OutputSchema):
     image: dict[str, Any]
     started_at: datetime | None
     ended_at: datetime | None
+    log_download_link: AnyUrl | None
+    node_name: str
+    osparc_credits: Decimal | None

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

@@ -0,0 +1,24 @@
+from datetime import datetime
+from decimal import Decimal
+from typing import Any
+
+from pydantic import AnyUrl, BaseModel
+
+from .projects import ProjectID
+from .projects_nodes_io import NodeID
+from .projects_state import RunningState
+
+
+class ComputationTaskWithAttributes(BaseModel):
+    project_uuid: ProjectID
+    node_id: NodeID
+    state: RunningState
+    progress: float
+    image: dict[str, Any]
+    started_at: datetime | None
+    ended_at: datetime | None
+    log_download_link: AnyUrl | None
+
+    # Attributes added by the webserver
+    node_name: str
+    osparc_credits: Decimal | None

packages/pytest-simcore/src/pytest_simcore/aws_s3_service.py

@@ -25,7 +25,7 @@ async def s3_client(s3_settings: S3Settings) -> typing.AsyncIterator[S3Client]:
     exit_stack = contextlib.AsyncExitStack()
     session_client = session.client(
         "s3",
-        endpoint_url=f"{s3_settings.S3_ENDPOINT}",
+        endpoint_url=f"{s3_settings.S3_ENDPOINT}" if s3_settings.S3_ENDPOINT else None,
         aws_access_key_id=s3_settings.S3_ACCESS_KEY,
         aws_secret_access_key=s3_settings.S3_SECRET_KEY,
         region_name=s3_settings.S3_REGION,

packages/service-library/src/servicelib/aiohttp/long_running_tasks/server.py

@@ -5,6 +5,7 @@
 The server only has to return a `TaskId` in the handler creating the long
 running task.
 """
+
 from ...long_running_tasks._errors import TaskAlreadyRunningError, TaskCancelledError
 from ...long_running_tasks._models import ProgressMessage, ProgressPercent
 from ...long_running_tasks._task import (
@@ -14,12 +15,17 @@
     TasksManager,
     TaskStatus,
 )
-from ._dependencies import create_task_name_from_request, get_tasks_manager
+from ._dependencies import (
+    create_task_name_from_request,
+    get_task_context,
+    get_tasks_manager,
+)
 from ._routes import TaskGet
 from ._server import setup, start_long_running_task
 
 __all__: tuple[str, ...] = (
     "create_task_name_from_request",
+    "get_task_context",
     "get_tasks_manager",
     "ProgressMessage",
     "ProgressPercent",

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

@@ -1,4 +1,5 @@
 import logging
+from decimal import Decimal
 from typing import Final
 
 from models_library.api_schemas_resource_usage_tracker import (
@@ -12,6 +13,7 @@
 from models_library.projects import ProjectID
 from models_library.rabbitmq_basic_types import RPCMethodName
 from models_library.resource_tracker import CreditTransactionStatus
+from models_library.services_types import ServiceRunID
 from models_library.wallets import WalletID
 from pydantic import NonNegativeInt, TypeAdapter
 
@@ -82,3 +84,21 @@ async def pay_project_debt(
         new_wallet_transaction=new_wallet_transaction,
         timeout_s=_DEFAULT_TIMEOUT_S,
     )
+
+
+@log_decorator(_logger, level=logging.DEBUG)
+async def get_transaction_current_credits_by_service_run_id(
+    rabbitmq_rpc_client: RabbitMQRPCClient,
+    *,
+    service_run_id: ServiceRunID,
+) -> Decimal:
+    result = await rabbitmq_rpc_client.request(
+        RESOURCE_USAGE_TRACKER_RPC_NAMESPACE,
+        _RPC_METHOD_NAME_ADAPTER.validate_python(
+            "get_transaction_current_credits_by_service_run_id"
+        ),
+        service_run_id=service_run_id,
+        timeout_s=_DEFAULT_TIMEOUT_S,
+    )
+    assert isinstance(result, Decimal)  # nosec
+    return result

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

@@ -1,8 +1,7 @@
 from common_library.errors_classes import OsparcErrorMixin
 
 
-class LicensesBaseError(OsparcErrorMixin, Exception):
-    ...
+class LicensesBaseError(OsparcErrorMixin, Exception): ...
 
 
 class NotEnoughAvailableSeatsError(LicensesBaseError):
@@ -36,11 +35,13 @@ class WalletTransactionError(OsparcErrorMixin, Exception):
     msg_template = "{msg}"
 
 
+class CreditTransactionNotFoundError(OsparcErrorMixin, Exception): ...
+
+
 ### Pricing Plans Error
 
 
-class PricingPlanBaseError(OsparcErrorMixin, Exception):
-    ...
+class PricingPlanBaseError(OsparcErrorMixin, Exception): ...
 
 
 class PricingUnitDuplicationError(PricingPlanBaseError):

packages/service-library/tests/aiohttp/test_tracing.py

@@ -3,8 +3,8 @@
 # pylint: disable=unused-variable
 
 import importlib
-from collections.abc import Callable
-from typing import Any, Iterator
+from collections.abc import Callable, Iterator
+from typing import Any
 
 import pip
 import pytest
@@ -92,6 +92,9 @@ def manage_package(request):
     uninstall_package(package)
 
 
+@pytest.mark.skip(
+    reason="this test installs always the latest version of the package which creates conflicts."
+)
 @pytest.mark.parametrize(
     "tracing_settings_in, manage_package",
     [