Merge remote-tracking branch 'upstream/master' into pr-osparc-add-not-long-running-rpc-interface-to-dy-sidecar

Author: Andrei Neagu

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,
@@ -79,7 +81,11 @@ class ComputationStarted(OutputSchemaWithoutCamelCase):
 class ComputationRunListQueryParams(
     PageQueryParameters,
     ComputationRunListOrderParams,  # type: ignore[misc, valid-type]
-): ...
+):
+    filter_only_running: bool = Field(
+        default=False,
+        description="If true, only running computations are returned",
+    )
 
 
 class ComputationRunRestGet(OutputSchema):
@@ -90,6 +96,8 @@ class ComputationRunRestGet(OutputSchema):
     submitted_at: datetime
     started_at: datetime | None
     ended_at: datetime | None
+    root_project_name: str
+    project_custom_metadata: dict[str, Any]
 
 
 ### Computation Task
@@ -123,3 +131,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,38 @@
+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
+
+
+class ComputationRunWithAttributes(BaseModel):
+    project_uuid: ProjectID
+    iteration: int
+    state: RunningState
+    info: dict[str, Any]
+    submitted_at: datetime
+    started_at: datetime | None
+    ended_at: datetime | None
+
+    # Attributes added by the webserver
+    root_project_name: str
+    project_custom_metadata: dict[str, Any]

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

@@ -35,14 +35,18 @@ class RunningState(str, Enum):
     ABORTED = "ABORTED"
     WAITING_FOR_CLUSTER = "WAITING_FOR_CLUSTER"
 
-    def is_running(self) -> bool:
-        return self in (
+    @staticmethod
+    def list_running_states() -> list["RunningState"]:
+        return [
             RunningState.PUBLISHED,
             RunningState.PENDING,
             RunningState.WAITING_FOR_RESOURCES,
             RunningState.STARTED,
             RunningState.WAITING_FOR_CLUSTER,
-        )
+        ]
+
+    def is_running(self) -> bool:
+        return self in self.list_running_states()
 
 
 @unique

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/director_v2/computations.py

@@ -33,6 +33,8 @@ async def list_computations_latest_iteration_page(
     *,
     product_name: ProductName,
     user_id: UserID,
+    # filters
+    filter_only_running: bool = False,
     # pagination
     offset: int = 0,
     limit: int = 20,
@@ -46,6 +48,7 @@ async def list_computations_latest_iteration_page(
         ),
         product_name=product_name,
         user_id=user_id,
+        filter_only_running=filter_only_running,
         offset=offset,
         limit=limit,
         order_by=order_by,

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