Merge remote-tracking branch 'upstream/master' into is6880/hash-api-key-secret

Author: giancarloromeo

api/specs/web-server/_computations.py

@@ -1,14 +1,22 @@
 from typing import Annotated
 
+from _common import as_query
 from fastapi import APIRouter, Depends, status
 from models_library.api_schemas_webserver.computations import (
     ComputationGet,
     ComputationPathParams,
+    ComputationRunRestGet,
     ComputationStart,
     ComputationStarted,
+    ComputationTaskRestGet,
 )
 from models_library.generics import Envelope
 from simcore_service_webserver._meta import API_VTAG
+from simcore_service_webserver.director_v2._controller.computations_rest import (
+    ComputationRunListQueryParams,
+    ComputationTaskListQueryParams,
+    ComputationTaskPathParams,
+)
 
 router = APIRouter(
     prefix=f"/{API_VTAG}",
@@ -53,3 +61,22 @@ async def start_computation(
     status_code=status.HTTP_204_NO_CONTENT,
 )
 async def stop_computation(_path: Annotated[ComputationPathParams, Depends()]): ...
+
+
+@router.get(
+    "/computations/-/iterations/latest",
+    response_model=Envelope[list[ComputationRunRestGet]],
+)
+async def list_computations_latest_iteration(
+    _query: Annotated[as_query(ComputationRunListQueryParams), Depends()],
+): ...
+
+
+@router.get(
+    "/computations/{project_id}/iterations/latest/tasks",
+    response_model=Envelope[list[ComputationTaskRestGet]],
+)
+async def list_computations_latest_iteration_tasks(
+    _query: Annotated[as_query(ComputationTaskListQueryParams), Depends()],
+    _path: Annotated[ComputationTaskPathParams, Depends()],
+): ...

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

@@ -1,8 +1,19 @@
+from typing import Final
+
+from pydantic import TypeAdapter
+
+from ..rabbitmq_basic_types import RPCNamespace
 from . import clusters, dynamic_services
 
 assert clusters  # nosec
 assert dynamic_services  # nosec
 
+
+DIRECTOR_V2_RPC_NAMESPACE: Final[RPCNamespace] = TypeAdapter(
+    RPCNamespace
+).validate_python("director-v2")
+
+
 __all__: tuple[str, ...] = (
     "clusters",
     "dynamic_services",

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

@@ -0,0 +1,103 @@
+from datetime import datetime
+from typing import Annotated, Any, NamedTuple
+
+from pydantic import (
+    BaseModel,
+    BeforeValidator,
+    ConfigDict,
+    PositiveInt,
+)
+
+from ..projects import ProjectID
+from ..projects_nodes_io import NodeID
+from ..projects_state import RunningState
+
+
+class ComputationRunRpcGet(BaseModel):
+    project_uuid: ProjectID
+    iteration: int
+    state: RunningState
+    info: dict[str, Any]
+    submitted_at: datetime
+    started_at: datetime | None
+    ended_at: datetime | None
+
+    model_config = ConfigDict(
+        json_schema_extra={
+            "examples": [
+                {
+                    "project_uuid": "beb16d18-d57d-44aa-a638-9727fa4a72ef",
+                    "iteration": 1,
+                    "state": "SUCCESS",
+                    "info": {
+                        "wallet_id": 9866,
+                        "user_email": "[email protected]",
+                        "wallet_name": "test",
+                        "product_name": "osparc",
+                        "project_name": "test",
+                        "project_metadata": {
+                            "parent_node_id": "12e0c8b2-bad6-40fb-9948-8dec4f65d4d9",
+                            "parent_node_name": "UJyfwFVYySnPCaLuQIaz",
+                            "parent_project_id": "beb16d18-d57d-44aa-a638-9727fa4a72ef",
+                            "parent_project_name": "qTjDmYPxeqAWfCKCQCYF",
+                            "root_parent_node_id": "37176e84-d977-4993-bc49-d76fcfc6e625",
+                            "root_parent_node_name": "UEXExIZVPeFzGRmMglPr",
+                            "root_parent_project_id": "beb16d18-d57d-44aa-a638-9727fa4a72ef",
+                            "root_parent_project_name": "FuDpjjFIyeNTWRUWCuKo",
+                        },
+                        "node_id_names_map": {},
+                        "simcore_user_agent": "agent",
+                    },
+                    "submitted_at": "2023-01-11 13:11:47.293595",
+                    "started_at": "2023-01-11 13:11:47.293595",
+                    "ended_at": "2023-01-11 13:11:47.293595",
+                }
+            ]
+        }
+    )
+
+
+class ComputationRunRpcGetPage(NamedTuple):
+    items: list[ComputationRunRpcGet]
+    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)]
+    image: dict[str, Any]
+    started_at: datetime | None
+    ended_at: datetime | None
+
+    model_config = ConfigDict(
+        json_schema_extra={
+            "examples": [
+                {
+                    "project_uuid": "beb16d18-d57d-44aa-a638-9727fa4a72ef",
+                    "node_id": "12e0c8b2-bad6-40fb-9948-8dec4f65d4d9",
+                    "state": "SUCCESS",
+                    "progress": 0.0,
+                    "image": {
+                        "name": "simcore/services/comp/ti-solutions-optimizer",
+                        "tag": "1.0.19",
+                        "node_requirements": {"CPU": 8.0, "RAM": 25769803776},
+                    },
+                    "started_at": "2023-01-11 13:11:47.293595",
+                    "ended_at": "2023-01-11 13:11:47.293595",
+                }
+            ]
+        }
+    )
+
+
+class ComputationTaskRpcGetPage(NamedTuple):
+    items: list[ComputationTaskRpcGet]
+    total: PositiveInt

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

@@ -1,13 +1,27 @@
-from typing import Annotated
+from datetime import datetime
+from typing import Annotated, Any
 
 from common_library.basic_types import DEFAULT_FACTORY
-from pydantic import BaseModel, Field
+from pydantic import (
+    BaseModel,
+    ConfigDict,
+    Field,
+)
 
 from ..api_schemas_directorv2.computations import (
     ComputationGet as _DirectorV2ComputationGet,
 )
+from ..basic_types import IDStr
 from ..projects import CommitID, ProjectID
-from ._base import InputSchemaWithoutCamelCase, OutputSchemaWithoutCamelCase
+from ..projects_nodes_io import NodeID
+from ..projects_state import RunningState
+from ..rest_ordering import OrderBy, create_ordering_query_model_class
+from ..rest_pagination import PageQueryParameters
+from ._base import (
+    InputSchemaWithoutCamelCase,
+    OutputSchema,
+    OutputSchemaWithoutCamelCase,
+)
 
 
 class ComputationPathParams(BaseModel):
@@ -41,3 +55,71 @@ class ComputationStarted(OutputSchemaWithoutCamelCase):
             json_schema_extra={"default": []},
         ),
     ] = DEFAULT_FACTORY
+
+
+### Computation Run
+
+
+ComputationRunListOrderParams = create_ordering_query_model_class(
+    ordering_fields={
+        "submitted_at",
+        "started_at",
+        "ended_at",
+        "state",
+    },
+    default=OrderBy(field=IDStr("submitted_at")),
+    ordering_fields_api_to_column_map={
+        "submitted_at": "created",
+        "started_at": "started",
+        "ended_at": "ended",
+    },
+)
+
+
+class ComputationRunListQueryParams(
+    PageQueryParameters,
+    ComputationRunListOrderParams,  # type: ignore[misc, valid-type]
+): ...
+
+
+class ComputationRunRestGet(OutputSchema):
+    project_uuid: ProjectID
+    iteration: int
+    state: RunningState
+    info: dict[str, Any]
+    submitted_at: datetime
+    started_at: datetime | None
+    ended_at: datetime | None
+
+
+### Computation Task
+
+
+class ComputationTaskPathParams(BaseModel):
+    project_id: ProjectID
+    model_config = ConfigDict(populate_by_name=True, extra="forbid")
+
+
+ComputationTaskListOrderParams = create_ordering_query_model_class(
+    ordering_fields={
+        "started_at",
+    },
+    default=OrderBy(field=IDStr("started_at")),
+    ordering_fields_api_to_column_map={"started_at": "start"},
+)
+
+
+class ComputationTaskListQueryParams(
+    PageQueryParameters,
+    ComputationTaskListOrderParams,  # type: ignore[misc, valid-type]
+): ...
+
+
+class ComputationTaskRestGet(OutputSchema):
+    project_uuid: ProjectID
+    node_id: NodeID
+    state: RunningState
+    progress: float
+    image: dict[str, Any]
+    started_at: datetime | None
+    ended_at: datetime | None

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

@@ -1,5 +1,5 @@
 """
-    Models both project and node states
+Models both project and node states
 """
 
 from enum import Enum, unique

packages/postgres-database/src/simcore_postgres_database/migration/versions/f65f7786cd4b_add_indexes_to_comp_tables.py

@@ -0,0 +1,53 @@
+"""add indexes to comp tables
+
+Revision ID: f65f7786cd4b
+Revises: cf8f743fd0b7
+Create Date: 2025-04-17 12:44:27.577984+00:00
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "f65f7786cd4b"
+down_revision = "cf8f743fd0b7"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_index("ix_comp_runs_user_id", "comp_runs", ["user_id"], unique=False)
+    op.create_index(
+        "ix_comp_tasks_project_id", "comp_tasks", ["project_id"], unique=False
+    )
+    op.drop_index("idx_projects_last_change_date_desc", table_name="projects")
+    op.create_index(
+        "idx_projects_last_change_date_desc",
+        "projects",
+        ["last_change_date"],
+        unique=False,
+        postgresql_using="btree",
+        postgresql_ops={"last_change_date": "DESC"},
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(
+        "idx_projects_last_change_date_desc",
+        table_name="projects",
+        postgresql_using="btree",
+        postgresql_ops={"last_change_date": "DESC"},
+    )
+    op.create_index(
+        "idx_projects_last_change_date_desc",
+        "projects",
+        [sa.text("last_change_date DESC")],
+        unique=False,
+    )
+    op.drop_index("ix_comp_tasks_project_id", table_name="comp_tasks")
+    op.drop_index("ix_comp_runs_user_id", table_name="comp_runs")
+    # ### end Alembic commands ###

packages/postgres-database/src/simcore_postgres_database/models/comp_runs.py

@@ -99,4 +99,5 @@
         doc="the run uses on demand clusters",
     ),
     sa.UniqueConstraint("project_uuid", "user_id", "iteration"),
+    sa.Index("ix_comp_runs_user_id", "user_id"),
 )

packages/postgres-database/src/simcore_postgres_database/models/comp_tasks.py

@@ -110,6 +110,7 @@ class NodeClass(enum.Enum):
     ),
     # ------
     sa.UniqueConstraint("project_id", "node_id", name="project_node_uniqueness"),
+    sa.Index("ix_comp_tasks_project_id", "project_id"),
 )
 
 register_modified_datetime_auto_update_trigger(comp_tasks)