save

Author: pcrespov

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

@@ -0,0 +1,29 @@
+# pylint: disable=not-context-manager
+# pylint: disable=protected-access
+# pylint: disable=redefined-outer-name
+# pylint: disable=unused-argument
+# pylint: disable=unused-variable
+
+
+from models_library.projects import ProjectID
+from pydantic import TypeAdapter
+from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
+
+
+class WebserverRpcSideEffects:
+    # pylint: disable=no-self-use
+
+    async def mark_project_as_job(
+        self,
+        rpc_client: RabbitMQRPCClient,
+        *,
+        project_uuid: ProjectID,
+        job_parent_resource_name: str,
+    ) -> None:
+        assert rpc_client
+
+        assert not job_parent_resource_name.startswith("/")  # nosec
+        assert "/" in job_parent_resource_name  # nosec
+        assert not job_parent_resource_name.endswith("/")  # nosec
+
+        TypeAdapter(ProjectID).validate_python(project_uuid)

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/projects.py

@@ -0,0 +1,27 @@
+import logging
+
+from models_library.projects import ProjectID
+from pydantic import TypeAdapter
+from servicelib.logging_utils import log_decorator
+from servicelib.rabbitmq import RabbitMQRPCClient
+
+_logger = logging.getLogger(__name__)
+
+
+@log_decorator(_logger, level=logging.DEBUG)
+async def mark_project_as_job(
+    rpc_client: RabbitMQRPCClient,
+    *,
+    project_uuid: ProjectID,
+    job_parent_resource_name: str,
+) -> None:
+
+    assert rpc_client
+
+    assert not job_parent_resource_name.startswith("/")  # nosec
+    assert "/" in job_parent_resource_name  # nosec
+    assert not job_parent_resource_name.endswith("/")  # nosec
+
+    TypeAdapter(ProjectID).validate_python(project_uuid)
+
+    raise NotImplementedError

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

@@ -37,28 +37,28 @@ class ClientFile(BaseModel):
     filename: FileName = Field(..., description="File name")
     filesize: NonNegativeInt = Field(..., description="File size in bytes")
     sha256_checksum: SHA256Str = Field(..., description="SHA256 checksum")
+    destination: Annotated[
+        ProgramJobFilePath | None,
+        Field(..., description="Destination within a program job"),
+    ]
 
 
 class File(BaseModel):
     """Represents a file stored on the server side i.e. a unique reference to a file in the cloud."""
 
-    # WARNING: from pydantic import File as FileParam
-    # NOTE: see https://ant.apache.org/manual/Tasks/checksum.html
-
-    id: UUID = Field(..., description="Resource identifier")
-
-    filename: str = Field(..., description="Name of the file with extension")
-    content_type: str | None = Field(
-        default=None,
-        description="Guess of type content [EXPERIMENTAL]",
-        validate_default=True,
-    )
-    sha256_checksum: SHA256Str | None = Field(
-        default=None,
-        description="SHA256 hash of the file's content",
-        alias="checksum",  # alias for backwards compatibility
-    )
-    e_tag: ETag | None = Field(default=None, description="S3 entity tag")
+    id: Annotated[UUID, Field(description="Resource identifier")]
+    filename: Annotated[str, Field(description="Name of the file with extension")]
+    content_type: Annotated[
+        str | None,
+        Field(
+            description="Guess of type content [EXPERIMENTAL]", validate_default=True
+        ),
+    ] = None
+    sha256_checksum: Annotated[
+        SHA256Str | None,
+        Field(description="SHA256 hash of the file's content", alias="checksum"),
+    ] = None
+    e_tag: Annotated[ETag | None, Field(description="S3 entity tag")] = None
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -163,16 +163,18 @@ def quoted_storage_file_id(self) -> str:
 
 
 class UploadLinks(BaseModel):
-    abort_upload: str
-    complete_upload: str
+    abort_upload: Annotated[str, Field()]
+    complete_upload: Annotated[str, Field()]
 
 
 class FileUploadData(BaseModel):
-    chunk_size: NonNegativeInt
-    urls: list[Annotated[AnyHttpUrl, UriSchema()]]
-    links: UploadLinks
+    chunk_size: Annotated[int, Field(description="Chunk size in bytes")]
+    urls: Annotated[list[Annotated[AnyHttpUrl, UriSchema()]], Field()]
+    links: Annotated[UploadLinks, Field()]
 
 
 class ClientFileUploadData(BaseModel):
-    file_id: UUID = Field(..., description="The file resource id")
-    upload_schema: FileUploadData = Field(..., description="Schema for uploading file")
+    file_id: Annotated[UUID, Field(description="The file resource id")]
+    upload_schema: Annotated[
+        FileUploadData, Field(description="Schema for uploading file")
+    ]

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

@@ -27,6 +27,7 @@
 from servicelib.rabbitmq.rpc_interfaces.resource_usage_tracker.errors import (
     NotEnoughAvailableSeatsError,
 )
+from servicelib.rabbitmq.rpc_interfaces.webserver import projects as projects_rpc
 from servicelib.rabbitmq.rpc_interfaces.webserver.functions.functions import (
     ping as _ping,
 )
@@ -211,7 +212,11 @@ async def mark_project_as_job(
 
         assert project_uuid
 
-        raise NotImplementedError
+        await projects_rpc.mark_project_as_job(
+            rpc_client=self._client,
+            project_uuid=project_uuid,
+            job_parent_resource_name=job_parent_resource_name,
+        )
 
 
 def setup(app: FastAPI, rabbitmq_rmp_client: RabbitMQRPCClient):

services/api-server/tests/unit/_with_db/test_api_user.py

@@ -54,6 +54,7 @@ async def test_get_profile(
     client: httpx.AsyncClient,
     auth: httpx.BasicAuth,
     mocked_webserver_service_api: MockRouter,
+    mocked_rpc_webserver_service_api: dict[str, MockType],
 ):
     # needs no auth
     resp = await client.get(f"/{API_VTAG}/meta")
@@ -77,6 +78,7 @@ async def test_update_profile(
     client: httpx.AsyncClient,
     auth: httpx.BasicAuth,
     mocked_webserver_service_api: MockRouter,
+    mocked_rpc_webserver_service_api: dict[str, MockType],
 ):
     # needs auth
     resp = await client.put(

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

@@ -13,7 +13,9 @@
 from fastapi import FastAPI, status
 from fastapi.encoders import jsonable_encoder
 from models_library.projects_state import RunningState
+from pytest_mock import MockerFixture, MockType
 from pytest_simcore.helpers import faker_catalog
+from pytest_simcore.helpers.webserver_rpc_server import WebserverRpcSideEffects
 from respx import MockRouter
 from simcore_service_api_server.core.settings import ApplicationSettings
 from simcore_service_api_server.services_http.director_v2 import ComputationTaskGet
@@ -43,6 +45,26 @@ def mocked_webserver_service_api(
     return mocked_webserver_service_api_base
 
 
+@pytest.fixture
+def mocked_rpc_webserver_service_api(
+    app: FastAPI, mocker: MockerFixture
+) -> dict[str, MockType]:
+    from simcore_service_api_server.services_rpc.wb_api_server import projects_rpc
+
+    settings: ApplicationSettings = app.state.settings
+    assert settings.API_SERVER_WEBSERVER
+
+    side_effects = WebserverRpcSideEffects()
+
+    return {
+        "mark_project_as_job": mocker.patch.object(
+            projects_rpc,
+            "mark_project_as_job",
+            side_effects.mark_project_as_job,
+        ),
+    }
+
+
 @pytest.fixture
 def mocked_catalog_service_api(
     app: FastAPI,

services/api-server/tests/unit/api_solvers/test_api_routers_solvers_jobs.py

@@ -18,6 +18,7 @@
 from models_library.services import ServiceMetaDataPublished
 from models_library.utils.fastapi_encoders import jsonable_encoder
 from pydantic import AnyUrl, HttpUrl, TypeAdapter
+from pytest_mock import MockType
 from respx import MockRouter
 from simcore_service_api_server._meta import API_VTAG
 from simcore_service_api_server.core.settings import ApplicationSettings
@@ -206,6 +207,7 @@ async def test_run_solver_job(
     mocked_catalog_service_api: MockRouter,
     mocked_directorv2_service_api: MockRouter,
     mocked_webserver_service_api: MockRouter,
+    mocked_rpc_webserver_service_api: dict[str, MockType],
     auth: httpx.BasicAuth,
     project_id: str,
     solver_key: str,

services/api-server/tests/unit/api_solvers/test_api_routers_solvers_jobs_delete.py

@@ -33,6 +33,7 @@ class MockedBackendApiDict(TypedDict):
 @pytest.fixture
 def mocked_backend_services_apis_for_delete_non_existing_project(
     mocked_webserver_service_api: MockRouter,
+    mocked_rpc_webserver_service_api: dict[str, MockType],
     project_tests_dir: Path,
 ) -> MockedBackendApiDict:
     mock_name = "delete_project_not_found.json"
@@ -85,6 +86,7 @@ async def test_delete_non_existing_solver_job(
 @pytest.fixture
 def mocked_backend_services_apis_for_create_and_delete_solver_job(
     mocked_webserver_service_api: MockRouter,
+    mocked_rpc_webserver_service_api: dict[str, MockType],
     mocked_catalog_service_api: MockRouter,
     project_tests_dir: Path,
 ) -> MockedBackendApiDict:

services/api-server/tests/unit/api_solvers/test_api_routers_solvers_jobs_metadata.py

@@ -38,6 +38,7 @@ def _as_path_regex(initial_path: str):
 @pytest.fixture
 def mocked_backend(
     mocked_webserver_service_api: MockRouter,
+    mocked_rpc_webserver_service_api: dict[str, MockType],
     mocked_catalog_service_api: MockRouter,
     project_tests_dir: Path,
 ) -> MockedBackendApiDict: