Fix function unit tests

Author: wvangeit

packages/postgres-database/src/simcore_postgres_database/migration/versions/7cefc13e3b2b_function_db_details.py

@@ -0,0 +1,72 @@
+"""Function db details
+
+Revision ID: 7cefc13e3b2b
+Revises: 44f40f1069aa
+Create Date: 2025-05-12 11:28:32.298331+00:00
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "7cefc13e3b2b"
+down_revision = "44f40f1069aa"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "funcapi_function_job_collections",
+        sa.Column(
+            "created", sa.DateTime(), server_default=sa.text("now()"), nullable=False
+        ),
+    )
+    op.add_column(
+        "funcapi_function_job_collections",
+        sa.Column(
+            "modified", sa.DateTime(), server_default=sa.text("now()"), nullable=False
+        ),
+    )
+    op.add_column(
+        "funcapi_function_job_collections_to_function_jobs",
+        sa.Column(
+            "created", sa.DateTime(), server_default=sa.text("now()"), nullable=False
+        ),
+    )
+    op.add_column(
+        "funcapi_function_job_collections_to_function_jobs",
+        sa.Column(
+            "modified", sa.DateTime(), server_default=sa.text("now()"), nullable=False
+        ),
+    )
+    op.add_column(
+        "funcapi_function_jobs", sa.Column("description", sa.String(), nullable=True)
+    )
+    op.add_column(
+        "funcapi_function_jobs",
+        sa.Column(
+            "created", sa.DateTime(), server_default=sa.text("now()"), nullable=False
+        ),
+    )
+    op.add_column(
+        "funcapi_function_jobs",
+        sa.Column(
+            "modified", sa.DateTime(), server_default=sa.text("now()"), nullable=False
+        ),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("funcapi_function_jobs", "modified")
+    op.drop_column("funcapi_function_jobs", "created")
+    op.drop_column("funcapi_function_jobs", "description")
+    op.drop_column("funcapi_function_job_collections_to_function_jobs", "modified")
+    op.drop_column("funcapi_function_job_collections_to_function_jobs", "created")
+    op.drop_column("funcapi_function_job_collections", "modified")
+    op.drop_column("funcapi_function_job_collections", "created")
+    # ### end Alembic commands ###

services/api-server/src/simcore_service_api_server/api/routes/functions_routes.py

@@ -367,7 +367,7 @@ async def register_function_job(
 
 @function_job_router.get(
     "/{function_job_id:uuid}",
-    response_model=FunctionJob,
+    response_model=RegisteredFunctionJob,
     responses={**_COMMON_FUNCTION_JOB_ERROR_RESPONSES},
     description="Get function job",
 )
@@ -502,7 +502,7 @@ async def function_job_outputs(
 
 @function_router.post(
     "/{function_id:uuid}:map",
-    response_model=FunctionJobCollection,
+    response_model=RegisteredFunctionJobCollection,
     responses={**_COMMON_FUNCTION_ERROR_RESPONSES},
     description="Map function over input parameters",
 )
@@ -558,7 +558,7 @@ async def map_function(  # noqa: PLR0913
 
 @function_job_collections_router.get(
     "/{function_job_collection_id:uuid}",
-    response_model=FunctionJobCollection,
+    response_model=RegisteredFunctionJobCollection,
     responses={**_COMMON_FUNCTION_JOB_COLLECTION_ERROR_RESPONSES},
     description="Get function job collection",
 )
@@ -573,7 +573,7 @@ async def get_function_job_collection(
 
 @function_job_collections_router.post(
     "",
-    response_model=FunctionJobCollection,
+    response_model=RegisteredFunctionJobCollection,
     description="Register function job collection",
 )
 async def register_function_job_collection(
@@ -602,7 +602,7 @@ async def delete_function_job_collection(
 
 @function_job_collections_router.get(
     "/{function_job_collection_id:uuid}/function_jobs",
-    response_model=list[FunctionJob],
+    response_model=list[RegisteredFunctionJob],
     responses={**_COMMON_FUNCTION_JOB_COLLECTION_ERROR_RESPONSES},
     description="Get the function jobs in function job collection",
 )

services/api-server/tests/unit/api_functions/test_api_routers_functions.py

@@ -12,6 +12,7 @@
     JSONFunctionInputSchema,
     JSONFunctionOutputSchema,
     RegisteredFunction,
+    RegisteredFunctionJob,
     RegisteredFunctionJobCollection,
 )
 from models_library.rest_pagination import PageMetaInfoLimitOffset
@@ -64,7 +65,7 @@ def __init__(self) -> None:
         self._function_jobs = {}
         self._function_job_collections = {}
 
-    async def register_function(self, function: Function) -> Function:
+    async def register_function(self, function: Function) -> RegisteredFunction:
         # Mimic returning the same function that was passed and store it for later retrieval
         uid = uuid4()
         self._functions[uid] = TypeAdapter(RegisteredFunction).validate_python(
@@ -81,7 +82,7 @@ async def register_function(self, function: Function) -> Function:
         )
         return self._functions[uid]
 
-    async def get_function(self, function_id: str) -> dict:
+    async def get_function(self, function_id: str) -> RegisteredFunction:
         # Mimic retrieval of a function based on function_id and raise 404 if not found
         if function_id not in self._functions:
             raise HTTPException(status_code=404, detail="Function not found")
@@ -100,7 +101,7 @@ async def list_functions(
         self,
         pagination_offset: int,
         pagination_limit: int,
-    ) -> tuple[list[Function], PageMetaInfoLimitOffset]:
+    ) -> tuple[list[RegisteredFunction], PageMetaInfoLimitOffset]:
         # Mimic listing all functions
         functions_list = list(self._functions.values())[
             pagination_offset : pagination_offset + pagination_limit
@@ -121,10 +122,12 @@ async def delete_function(self, function_id: str) -> None:
         else:
             raise HTTPException(status_code=404, detail="Function not found")
 
-    async def register_function_job(self, function_job: FunctionJob) -> FunctionJob:
+    async def register_function_job(
+        self, function_job: FunctionJob
+    ) -> RegisteredFunctionJob:
         # Mimic registering a function job
         uid = uuid4()
-        self._function_jobs[uid] = TypeAdapter(FunctionJob).validate_python(
+        self._function_jobs[uid] = TypeAdapter(RegisteredFunctionJob).validate_python(
             {
                 "uid": str(uid),
                 "function_uid": function_job.function_uid,
@@ -138,7 +141,7 @@ async def register_function_job(self, function_job: FunctionJob) -> FunctionJob:
         )
         return self._function_jobs[uid]
 
-    async def get_function_job(self, function_job_id: str) -> dict:
+    async def get_function_job(self, function_job_id: str) -> RegisteredFunctionJob:
         # Mimic retrieval of a function job based on function_job_id and raise 404 if not found
         if function_job_id not in self._function_jobs:
             raise HTTPException(status_code=404, detail="Function job not found")
@@ -148,7 +151,7 @@ async def list_function_jobs(
         self,
         pagination_offset: int,
         pagination_limit: int,
-    ) -> tuple[list[FunctionJob], PageMetaInfoLimitOffset]:
+    ) -> tuple[list[RegisteredFunctionJob], PageMetaInfoLimitOffset]:
         # Mimic listing all function jobs
         function_jobs_list = list(self._function_jobs.values())[
             pagination_offset : pagination_offset + pagination_limit
@@ -188,7 +191,7 @@ async def register_function_job_collection(
 
     async def get_function_job_collection(
         self, function_job_collection_id: str
-    ) -> dict:
+    ) -> RegisteredFunctionJobCollection:
         # Mimic retrieval of a function job collection based on collection_id and raise 404 if not found
         if function_job_collection_id not in self._function_job_collections:
             raise HTTPException(
@@ -200,7 +203,7 @@ async def list_function_job_collections(
         self,
         pagination_offset: int,
         pagination_limit: int,
-    ) -> tuple[list[FunctionJobCollection], PageMetaInfoLimitOffset]:
+    ) -> tuple[list[RegisteredFunctionJobCollection], PageMetaInfoLimitOffset]:
         # Mimic listing all function job collections
         function_job_collections_list = list(self._function_job_collections.values())[
             pagination_offset : pagination_offset + pagination_limit
@@ -229,7 +232,6 @@ async def delete_function_job_collection(
 def test_register_function(api_app) -> None:
     client = TestClient(api_app)
     sample_function = {
-        "uid": None,
         "title": "test_function",
         "function_class": "project",
         "project_id": str(uuid4()),
@@ -469,7 +471,6 @@ def test_register_function_job(api_app: FastAPI) -> None:
 
     client = TestClient(api_app)
     mock_function_job = {
-        "uid": None,
         "function_uid": str(uuid4()),
         "title": "Test Function Job",
         "description": "A test function job",