✨ Fix timestamp field name from 'creation_at' to 'created_at' in ProjectJobRpcGet model and related usages

Author: pcrespov

packages/models-library/src/models_library/rpc/webserver/projects.py

@@ -29,7 +29,7 @@ class ProjectJobRpcGet(BaseModel):
     workbench: NodesDict
 
     # timestamps
-    creation_at: datetime
+    created_at: datetime
     modified_at: datetime
 
     # Specific to jobs
@@ -46,15 +46,14 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
                         "name": "My project",
                         "description": "My project description",
                         "workbench": {f"{uuid4()}": n for n in nodes_examples[2:3]},
-                        "creation_at": "2023-01-01T00:00:00Z",
+                        "created_at": "2023-01-01T00:00:00Z",
                         "modified_at": "2023-01-01T00:00:00Z",
-                        "job_parent_resource_name": "solvers/foo/release/1.2.3",
+                        "job_parent_resource_name": "solvers/slv_123/release/1.2.3",
                     },
                 ]
             }
         )
 
-
     model_config = ConfigDict(
         extra="forbid",
         populate_by_name=True,

packages/pytest-simcore/src/pytest_simcore/helpers/webserver_rpc_server.py

@@ -8,7 +8,10 @@
 from models_library.products import ProductName
 from models_library.projects import ProjectID
 from models_library.rest_pagination import PageOffsetInt
-from models_library.rpc.webserver.projects import PageRpcProjectJobRpcGet
+from models_library.rpc.webserver.projects import (
+    PageRpcProjectJobRpcGet,
+    ProjectJobRpcGet,
+)
 from models_library.rpc_pagination import (
     DEFAULT_NUMBER_OF_ITEMS_PER_PAGE,
     PageLimitInt,
@@ -63,10 +66,10 @@ async def list_projects_marked_as_jobs(
         if job_parent_resource_name_filter:
             assert not job_parent_resource_name_filter.startswith("/")
 
-        items = PageRpcProjectJobRpcGet.model_json_schema()["examples"]
+        items = ProjectJobRpcGet.model_json_schema()["examples"]
 
         return PageRpcProjectJobRpcGet.create(
-            items[offset, : offset + limit],
+            items[offset : offset + limit],
             total=len(items),
             limit=limit,
             offset=offset,

services/api-server/src/simcore_service_api_server/_service_solvers.py

@@ -17,7 +17,7 @@
 from packaging.version import Version
 
 from .api.dependencies.webserver_rpc import get_wb_api_rpc_client
-from .models.schemas.jobs import JobInputs, JobModel
+from .models.schemas.jobs import Job, JobInputs
 from .models.schemas.solvers import Solver, SolverKeyId
 from .services_http.solver_job_models_converters import (
     create_job_inputs_from_node_inputs,
@@ -97,7 +97,7 @@ async def list_jobs(
         product_name: ProductName,
         offset: PageOffsetInt = 0,
         limit: PageLimitInt = DEFAULT_PAGINATION_LIMIT,
-    ) -> tuple[list[JobModel], PageMetaInfoLimitOffset]:
+    ) -> tuple[list[Job], PageMetaInfoLimitOffset]:
         """Lists all solver jobs for a user with pagination"""
 
         # NOTE: perhaps we should get comp_tasks instead of projects! or a combinatino of both?
@@ -111,27 +111,32 @@ async def list_jobs(
             job_parent_resource_name_filter="solvers",  # TODO: project shouldr eturn parent resource name and workbench
         )
 
-        jobs: list[JobModel] = []
+        jobs: list[Job] = []
 
-        for prj in projects_page.data:
+        for project_job in projects_page.data:
 
-            assert len(prj.workbench) == 1, "Expected only one solver node in workbench"
+            assert (
+                len(project_job.workbench) == 1
+            ), "Expected only one solver node in workbench"
 
-            solver_node: Node = next(iter(prj.workbench.values()))
+            solver_node: Node = next(iter(project_job.workbench.values()))
             job_inputs: JobInputs = create_job_inputs_from_node_inputs(
                 inputs=solver_node.inputs or {}
             )
-            assert prj.job_parent_resource_name  # nosec
+            assert project_job.job_parent_resource_name  # nosec
 
             jobs.append(
-                JobModel(
-                    id=prj.uuid,
-                    name=JobModel.compose_resource_name(
-                        prj.job_parent_resource_name, prj.uuid
+                Job(
+                    id=project_job.uuid,
+                    name=Job.compose_resource_name(
+                        project_job.job_parent_resource_name, project_job.uuid
                     ),
                     inputs_checksum=job_inputs.compute_checksum(),
-                    created_at=prj.creation_date,
-                    runner_name=prj.job_parent_resource_name,
+                    created_at=project_job.created_at,
+                    runner_name=project_job.job_parent_resource_name,
+                    url=None,
+                    runner_url=None,
+                    outputs_url=None,
                 )
             )
 

services/api-server/src/simcore_service_api_server/models/schemas/jobs.py

@@ -27,7 +27,6 @@
     ValidationInfo,
     field_validator,
 )
-from pydantic.types import JsonDict
 from servicelib.logging_utils import LogLevelInt, LogMessageStr
 from starlette.datastructures import Headers
 
@@ -238,7 +237,7 @@ class JobMetadata(BaseModel):
 #     "jobs/c2789bd2-7385-4e00-91d3-2f100df41185"
 
 
-class JobModel(BaseModel):
+class Job(BaseModel):
     id: JobID
     name: RelativeResourceName
 
@@ -250,41 +249,6 @@ class JobModel(BaseModel):
         ..., description="Runner that executes job"
     )
 
-    @staticmethod
-    def _update_json_schema_extra(schema: JsonDict) -> None:
-        schema.udpate(
-            {
-                "examples": [
-                    {
-                        "id": "f622946d-fd29-35b9-a193-abdd1095167c",
-                        "name": "solvers/isolve/releases/1.3.4/jobs/f622946d-fd29-35b9-a193-abdd1095167c",
-                        "runner_name": "solvers/isolve/releases/1.3.4",
-                        "inputs_checksum": "12345",
-                        "created_at": "2021-01-22T23:59:52.322176",
-                    },
-                ]
-            }
-        )
-
-    model_config = ConfigDict(
-        json_schema_extra=_update_json_schema_extra,
-    )
-
-    @staticmethod
-    def compose_resource_name(
-        parent_name: RelativeResourceName, job_id: UUID
-    ) -> RelativeResourceName:
-        # CAREFUL, this is not guarantee a UNIQUE identifier since the resource
-        # could have some alias entrypoints and the wrong parent_name might be introduced here
-        collection_or_resource_ids = [
-            *split_resource_name(parent_name),
-            "jobs",
-            f"{job_id}",
-        ]
-        return compose_resource_name(*collection_or_resource_ids)
-
-
-class Job(JobModel):
     # Get links to other resources
     url: Annotated[HttpUrl, UriSchema()] | None = Field(
         ..., description="Link to get this resource (self)"
@@ -320,11 +284,6 @@ def _check_name(cls, v, info: ValidationInfo):
             raise ValueError(msg)
         return v
 
-    @property
-    def resource_name(self) -> str:
-        """Relative Resource Name"""
-        return self.name
-
     # constructors ------
 
     @classmethod
@@ -353,6 +312,26 @@ def create_job_from_solver_or_program(
             inputs_checksum=inputs.compute_checksum(),
         )
 
+    @classmethod
+    def compose_resource_name(
+        cls, parent_name: RelativeResourceName, job_id: UUID
+    ) -> RelativeResourceName:
+        assert "jobs" not in parent_name  # nosec
+
+        # CAREFUL, this is not guarantee a UNIQUE identifier since the resource
+        # could have some alias entrypoints and the wrong parent_name might be introduced here
+        collection_or_resource_ids = [
+            *split_resource_name(parent_name),
+            "jobs",
+            f"{job_id}",
+        ]
+        return compose_resource_name(*collection_or_resource_ids)
+
+    @property
+    def resource_name(self) -> str:
+        """Relative Resource Name"""
+        return self.name
+
 
 def get_url(
     solver_or_program: Solver | Program, url_for: Callable[..., HttpUrl], job_id: JobID

services/api-server/src/simcore_service_api_server/services_rpc/wb_api_server.py

@@ -219,7 +219,6 @@ async def mark_project_as_job(
             job_parent_resource_name=job_parent_resource_name,
         )
 
-    @_exception_mapper(rpc_exception_map={})
     async def list_projects_marked_as_jobs(
         self,
         *,

services/api-server/tests/unit/conftest.py

@@ -369,12 +369,12 @@ def mocked_webserver_rpc_api(
         "mark_project_as_job": mocker.patch.object(
             projects_rpc,
             "mark_project_as_job",
-            side_effects.mark_project_as_job,
+            side_effect=side_effects.mark_project_as_job,
         ),
         "list_projects_marked_as_jobs": mocker.patch.object(
             projects_rpc,
             "list_projects_marked_as_jobs",
-            side_effects.list_projects_marked_as_jobs,
+            side_effect=side_effects.list_projects_marked_as_jobs,
         ),
     }
 

services/api-server/tests/unit/test_service_solvers.py

@@ -54,29 +54,8 @@ async def test_list_jobs(
         product_name=product_name,
     )
     assert isinstance(jobs, list)
-    mocked_webserver_rpc_api["list_projects_marked_as_jobs"].assert_called_once_with(
-        product_name=product_name,
-        user_id=user_id,
-        offset=0,
-        limit=999,
-        job_parent_resource_name_filter="solvers",
-    )
+    mocked_webserver_rpc_api["list_projects_marked_as_jobs"].assert_called_once()
     assert page_meta.total >= 0
-    assert page_meta.limit == 999
+    assert page_meta.limit == 49
     assert page_meta.offset == 0
-
-    # Test with explicit pagination
-    mocked_webserver_rpc_api["list_projects_marked_as_jobs"].reset_mock()
-    jobs, page_meta = await solver_service.list_jobs(
-        user_id=user_id,
-        product_name=product_name,
-        offset=10,
-        limit=20,
-    )
-    mocked_webserver_rpc_api["list_projects_marked_as_jobs"].assert_called_once_with(
-        product_name=product_name,
-        user_id=user_id,
-        offset=10,
-        limit=20,
-        job_parent_resource_name_filter="solvers",
-    )
+    assert page_meta.count > 0

services/web/server/src/simcore_service_webserver/projects/_controller/projects_rpc.py

@@ -84,7 +84,7 @@ async def list_projects_marked_as_jobs(
             name=project.name,
             description=project.description,
             workbench=project.workbench,
-            creation_at=project.creation_date,
+            created_at=project.creation_date,
             modified_at=project.last_change_date,
             job_parent_resource_name=project.job_parent_resource_name,
         )