Split function route files and solve other comments

wvangeit · wvangeit · commit 68d8fe512f42 · 2025-05-14T19:41:00.000+02:00
diff --git a/packages/postgres-database/src/simcore_postgres_database/models/funcapi_function_job_collections_table.py b/packages/postgres-database/src/simcore_postgres_database/models/funcapi_function_job_collections_table.py
@@ -1,8 +1,11 @@
 import uuid
 
 import sqlalchemy as sa
+from simcore_postgres_database.models._common import (
+    column_created_datetime,
+    column_modified_datetime,
+)
 from sqlalchemy.dialects.postgresql import UUID
-from sqlalchemy.sql import func
 
 from .base import metadata
 
@@ -27,20 +30,7 @@
         sa.String,
         doc="Description of the function job collection",
     ),
-    sa.Column(
-        "created",
-        sa.DateTime(),
-        nullable=False,
-        server_default=func.now(),
-        doc="Timestamp auto-generated upon creation",
-    ),
-    sa.Column(
-        "modified",
-        sa.DateTime(),
-        nullable=False,
-        server_default=func.now(),
-        onupdate=func.now(),
-        doc="Automaticaly updates on modification of the row",
-    ),
+    column_created_datetime(),
+    column_modified_datetime(),
     sa.PrimaryKeyConstraint("uuid", name="funcapi_function_job_collections_pk"),
 )
diff --git a/packages/postgres-database/src/simcore_postgres_database/models/funcapi_function_job_collections_to_function_jobs_table.py b/packages/postgres-database/src/simcore_postgres_database/models/funcapi_function_job_collections_to_function_jobs_table.py
@@ -4,9 +4,8 @@
 """
 
 import sqlalchemy as sa
-from sqlalchemy.sql import func
 
-from ._common import RefActions
+from ._common import RefActions, column_created_datetime, column_modified_datetime
 from .base import metadata
 from .funcapi_function_job_collections_table import function_job_collections_table
 from .funcapi_function_jobs_table import function_jobs_table
@@ -22,6 +21,7 @@
             ondelete=RefActions.CASCADE,
             name="fk_func_job_coll_to_func_jobs_to_func_job_coll_uuid",
         ),
+        nullable=False,
         doc="Unique identifier of the function job collection",
     ),
     sa.Column(
@@ -32,21 +32,14 @@
             ondelete=RefActions.CASCADE,
             name="fk_func_job_coll_to_func_jobs_to_func_job_uuid",
         ),
-        doc="Unique identifier of the function job",
-    ),
-    sa.Column(
-        "created",
-        sa.DateTime(),
         nullable=False,
-        server_default=func.now(),
-        doc="Timestamp auto-generated upon creation",
+        doc="Unique identifier of the function job",
     ),
-    sa.Column(
-        "modified",
-        sa.DateTime(),
-        nullable=False,
-        server_default=func.now(),
-        onupdate=func.now(),
-        doc="Automaticaly updates on modification of the row",
+    column_created_datetime(),
+    column_modified_datetime(),
+    sa.PrimaryKeyConstraint(
+        "function_job_collection_uuid",
+        "function_job_uuid",
+        name="funcapi_function_job_collections_to_function_jobs_pk",
     ),
 )
diff --git a/packages/postgres-database/src/simcore_postgres_database/models/funcapi_function_jobs_table.py b/packages/postgres-database/src/simcore_postgres_database/models/funcapi_function_jobs_table.py
@@ -7,9 +7,8 @@
 
 import sqlalchemy as sa
 from sqlalchemy.dialects.postgresql import UUID
-from sqlalchemy.sql import func
 
-from ._common import RefActions
+from ._common import RefActions, column_created_datetime, column_modified_datetime
 from .base import metadata
 from .funcapi_functions_table import functions_table
 
@@ -72,20 +71,7 @@
         nullable=True,
         doc="Fields specific for a function class",
     ),
-    sa.Column(
-        "created",
-        sa.DateTime(),
-        nullable=False,
-        server_default=func.now(),
-        doc="Timestamp auto-generated upon creation",
-    ),
-    sa.Column(
-        "modified",
-        sa.DateTime(),
-        nullable=False,
-        server_default=func.now(),
-        onupdate=func.now(),
-        doc="Automaticaly updates on modification of the row",
-    ),
+    column_created_datetime(),
+    column_modified_datetime(),
     sa.PrimaryKeyConstraint("uuid", name="funcapi_function_jobs_pk"),
 )
diff --git a/packages/postgres-database/src/simcore_postgres_database/models/funcapi_functions_table.py b/packages/postgres-database/src/simcore_postgres_database/models/funcapi_functions_table.py
@@ -6,6 +6,10 @@
 import uuid
 
 import sqlalchemy as sa
+from simcore_postgres_database.models._common import (
+    column_created_datetime,
+    column_modified_datetime,
+)
 from sqlalchemy.dialects.postgresql import UUID
 
 from .base import metadata
@@ -70,20 +74,7 @@
         nullable=True,
         doc="Default inputs of the function",
     ),
-    sa.Column(
-        "created",
-        sa.DateTime,
-        nullable=False,
-        server_default=sa.func.now(),
-        doc="Creation timestamp of the function",
-    ),
-    sa.Column(
-        "modified",
-        sa.DateTime,
-        nullable=False,
-        server_default=sa.func.now(),
-        onupdate=sa.func.now(),
-        doc="Last update timestamp of the function",
-    ),
+    column_created_datetime(),
+    column_modified_datetime(),
     sa.PrimaryKeyConstraint("uuid", name="funcapi_functions_pk"),
 )
diff --git a/packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/functions/functions_rpc_interface.py b/packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/functions/functions_rpc_interface.py
@@ -113,12 +113,9 @@ async def list_functions(
             pagination_limit=pagination_limit,
         )
     )
-    assert isinstance(result, tuple)
-    TypeAdapter(list[RegisteredFunction]).validate_python(
-        result[0]
-    )  # Validates the result as a list of RegisteredFunctions
-    assert isinstance(result[1], PageMetaInfoLimitOffset)  # nosec
-    return result
+    return TypeAdapter(
+        tuple[list[RegisteredFunction], PageMetaInfoLimitOffset]
+    ).validate_python(result)
 
 
 @log_decorator(_logger, level=logging.DEBUG)
@@ -136,16 +133,9 @@ async def list_function_jobs(
             pagination_limit=pagination_limit,
         )
     )
-    assert isinstance(result, tuple)  # nosec
-    assert isinstance(result[0], list)  # nosec
-    assert all(
-        TypeAdapter(RegisteredFunctionJob).validate_python(item) for item in result[0]
-    )  # nosec
-    assert isinstance(result[1], PageMetaInfoLimitOffset)  # nosec
-    return (
-        TypeAdapter(list[RegisteredFunctionJob]).validate_python(result[0]),
-        TypeAdapter(PageMetaInfoLimitOffset).validate_python(result[1]),
-    )
+    return TypeAdapter(
+        tuple[list[RegisteredFunctionJob], PageMetaInfoLimitOffset]
+    ).validate_python(result)
 
 
 @log_decorator(_logger, level=logging.DEBUG)
diff --git a/services/api-server/src/simcore_service_api_server/api/root.py b/services/api-server/src/simcore_service_api_server/api/root.py
@@ -6,6 +6,8 @@
 from .routes import credits as _credits
 from .routes import (
     files,
+    function_job_collections_routes,
+    function_jobs_routes,
     functions_routes,
     health,
     licensed_items,
@@ -46,12 +48,12 @@ def create_router(settings: ApplicationSettings):
     router.include_router(studies.router, tags=["studies"], prefix="/studies")
     router.include_router(studies_jobs.router, tags=["studies"], prefix="/studies")
     router.include_router(
-        functions_routes.function_job_router,
+        function_jobs_routes.function_job_router,
         tags=["function_jobs"],
         prefix=_FUNCTION_JOBS_PREFIX,
     )
     router.include_router(
-        functions_routes.function_job_collections_router,
+        function_job_collections_routes.function_job_collections_router,
         tags=["function_job_collections"],
         prefix=_FUNCTION_JOB_COLLECTIONS_PREFIX,
     )
diff --git a/services/api-server/src/simcore_service_api_server/api/routes/function_job_collections_routes.py b/services/api-server/src/simcore_service_api_server/api/routes/function_job_collections_routes.py
@@ -0,0 +1,154 @@
+import asyncio
+from typing import Annotated, Final
+
+from fastapi import APIRouter, Depends, status
+from fastapi_pagination.api import create_page
+from models_library.api_schemas_webserver.functions_wb_schema import (
+    FunctionJobCollection,
+    FunctionJobCollectionID,
+    FunctionJobCollectionStatus,
+    RegisteredFunctionJob,
+    RegisteredFunctionJobCollection,
+)
+from pydantic import PositiveInt
+
+from ...models.pagination import Page, PaginationParams
+from ...models.schemas.errors import ErrorGet
+from ...services_http.director_v2 import DirectorV2Api
+from ...services_rpc.wb_api_server import WbApiRpcClient
+from ..dependencies.authentication import get_current_user_id
+from ..dependencies.services import get_api_client
+from ..dependencies.webserver_rpc import get_wb_api_rpc_client
+from .function_jobs_routes import function_job_status, get_function_job
+
+# pylint: disable=too-many-arguments
+
+function_job_collections_router = APIRouter()
+
+
+_COMMON_FUNCTION_JOB_COLLECTION_ERROR_RESPONSES: Final[dict] = {
+    status.HTTP_404_NOT_FOUND: {
+        "description": "Function job collection not found",
+        "model": ErrorGet,
+    },
+}
+
+
+@function_job_collections_router.get(
+    "",
+    response_model=Page[RegisteredFunctionJobCollection],
+    description="List function job collections",
+)
+async def list_function_job_collections(
+    wb_api_rpc: Annotated[WbApiRpcClient, Depends(get_wb_api_rpc_client)],
+    page_params: Annotated[PaginationParams, Depends()],
+):
+    function_job_collection_list, meta = await wb_api_rpc.list_function_job_collections(
+        pagination_offset=page_params.offset,
+        pagination_limit=page_params.limit,
+    )
+    return create_page(
+        function_job_collection_list,
+        total=meta.total,
+        params=page_params,
+    )
+
+
+@function_job_collections_router.get(
+    "/{function_job_collection_id:uuid}",
+    response_model=RegisteredFunctionJobCollection,
+    responses={**_COMMON_FUNCTION_JOB_COLLECTION_ERROR_RESPONSES},
+    description="Get function job collection",
+)
+async def get_function_job_collection(
+    function_job_collection_id: FunctionJobCollectionID,
+    wb_api_rpc: Annotated[WbApiRpcClient, Depends(get_wb_api_rpc_client)],
+) -> RegisteredFunctionJobCollection:
+    return await wb_api_rpc.get_function_job_collection(
+        function_job_collection_id=function_job_collection_id
+    )
+
+
+@function_job_collections_router.post(
+    "",
+    response_model=RegisteredFunctionJobCollection,
+    description="Register function job collection",
+)
+async def register_function_job_collection(
+    function_job_collection: FunctionJobCollection,
+    wb_api_rpc: Annotated[WbApiRpcClient, Depends(get_wb_api_rpc_client)],
+) -> RegisteredFunctionJobCollection:
+    return await wb_api_rpc.register_function_job_collection(
+        function_job_collection=function_job_collection
+    )
+
+
+@function_job_collections_router.delete(
+    "/{function_job_collection_id:uuid}",
+    response_model=None,
+    responses={**_COMMON_FUNCTION_JOB_COLLECTION_ERROR_RESPONSES},
+    description="Delete function job collection",
+)
+async def delete_function_job_collection(
+    function_job_collection_id: FunctionJobCollectionID,
+    wb_api_rpc: Annotated[WbApiRpcClient, Depends(get_wb_api_rpc_client)],
+) -> None:
+    return await wb_api_rpc.delete_function_job_collection(
+        function_job_collection_id=function_job_collection_id
+    )
+
+
+@function_job_collections_router.get(
+    "/{function_job_collection_id:uuid}/function_jobs",
+    response_model=list[RegisteredFunctionJob],
+    responses={**_COMMON_FUNCTION_JOB_COLLECTION_ERROR_RESPONSES},
+    description="Get the function jobs in function job collection",
+)
+async def function_job_collection_list_function_jobs(
+    function_job_collection_id: FunctionJobCollectionID,
+    wb_api_rpc: Annotated[WbApiRpcClient, Depends(get_wb_api_rpc_client)],
+) -> list[RegisteredFunctionJob]:
+    function_job_collection = await get_function_job_collection(
+        function_job_collection_id=function_job_collection_id,
+        wb_api_rpc=wb_api_rpc,
+    )
+    return [
+        await get_function_job(
+            job_id,
+            wb_api_rpc=wb_api_rpc,
+        )
+        for job_id in function_job_collection.job_ids
+    ]
+
+
+@function_job_collections_router.get(
+    "/{function_job_collection_id:uuid}/status",
+    response_model=FunctionJobCollectionStatus,
+    responses={**_COMMON_FUNCTION_JOB_COLLECTION_ERROR_RESPONSES},
+    description="Get function job collection status",
+)
+async def function_job_collection_status(
+    function_job_collection_id: FunctionJobCollectionID,
+    wb_api_rpc: Annotated[WbApiRpcClient, Depends(get_wb_api_rpc_client)],
+    director2_api: Annotated[DirectorV2Api, Depends(get_api_client(DirectorV2Api))],
+    user_id: Annotated[PositiveInt, Depends(get_current_user_id)],
+) -> FunctionJobCollectionStatus:
+    function_job_collection = await get_function_job_collection(
+        function_job_collection_id=function_job_collection_id,
+        wb_api_rpc=wb_api_rpc,
+    )
+
+    job_statuses = await asyncio.gather(
+        *[
+            function_job_status(
+                job_id,
+                wb_api_rpc=wb_api_rpc,
+                director2_api=director2_api,
+                user_id=user_id,
+            )
+            for job_id in function_job_collection.job_ids
+        ]
+    )
+    return FunctionJobCollectionStatus(
+        status=[job_status.status for job_status in job_statuses]
+    )
diff --git a/services/api-server/src/simcore_service_api_server/api/routes/function_jobs_routes.py b/services/api-server/src/simcore_service_api_server/api/routes/function_jobs_routes.py
diff --git a/services/api-server/src/simcore_service_api_server/api/routes/functions_routes.py b/services/api-server/src/simcore_service_api_server/api/routes/functions_routes.py
diff --git a/services/web/server/src/simcore_service_webserver/functions/_functions_controller_rpc.py b/services/web/server/src/simcore_service_webserver/functions/_functions_controller_rpc.py
