Merge branch 'master' into pr-osparc-ooil-escape-additional-env-vars

Author: mergify[bot]

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

@@ -13,7 +13,7 @@
 
 from ..basic_types import IDStr
 from ..projects import ProjectID
-from ..projects_nodes_io import NodeID
+from ..projects_nodes_io import NodeID, SimcoreS3FileID
 from ..projects_pipeline import ComputationTask
 from ..users import UserID
 from ..wallets import WalletInfo
@@ -126,6 +126,30 @@ class TaskLogFileGet(BaseModel):
     ] = None
 
 
+class TaskLogFileIdGet(BaseModel):
+    task_id: NodeID
+    file_id: SimcoreS3FileID | None
+
+    model_config = ConfigDict(
+        json_schema_extra={
+            "examples": [
+                {
+                    "task_id": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+                    "file_id": "1c46752c-b096-11ea-a3c4-02420a00392e/3fa85f64-5717-4562-b3fc-2c963f66afa6/logs/task_logs.txt",
+                },
+                {
+                    "task_id": "6ba7b810-9dad-11d1-80b4-00c04fd430c8",
+                    "file_id": "1c46752c-b096-11ea-a3c4-02420a00392e/6ba7b810-9dad-11d1-80b4-00c04fd430c8/logs/debug.log",
+                },
+                {
+                    "task_id": "6ba7b811-9dad-11d1-80b4-00c04fd430c8",
+                    "file_id": None,
+                },
+            ]
+        }
+    )
+
+
 class TasksSelection(BaseModel):
     nodes_ids: list[NodeID]
 

packages/models-library/src/models_library/api_schemas_rpc_async_jobs/async_jobs.py

@@ -30,6 +30,17 @@ class AsyncJobResult(BaseModel):
 
 
 class AsyncJobGet(BaseModel):
+    model_config = ConfigDict(
+        json_schema_extra={
+            "examples": [
+                {
+                    "job_id": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+                    "job_name": "export_data_task",
+                }
+            ]
+        }
+    )
+
     job_id: AsyncJobId
     job_name: AsyncJobName
 
@@ -42,6 +53,18 @@ class AsyncJobAbort(BaseModel):
 class AsyncJobFilter(AsyncJobFilterBase):
     """Data for controlling access to an async job"""
 
+    model_config = ConfigDict(
+        json_schema_extra={
+            "examples": [
+                {
+                    "product_name": "osparc",
+                    "user_id": 123,
+                    "client_name": "web_client",
+                }
+            ]
+        },
+    )
+
     product_name: ProductName
     user_id: UserID
     client_name: Annotated[

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

@@ -0,0 +1,30 @@
+# pylint: disable=no-self-use
+# 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.api_schemas_directorv2.computations import TaskLogFileIdGet
+from models_library.projects import ProjectID
+from pydantic import TypeAdapter, validate_call
+from pytest_mock import MockType
+from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
+
+
+class DirectorV2SideEffects:
+    # pylint: disable=no-self-use
+    @validate_call(config={"arbitrary_types_allowed": True})
+    async def get_computation_task_log_file_ids(
+        self,
+        rpc_client: RabbitMQRPCClient | MockType,
+        *,
+        project_id: ProjectID,
+    ) -> list[TaskLogFileIdGet]:
+        assert rpc_client
+        assert project_id
+
+        return TypeAdapter(list[TaskLogFileIdGet]).validate_python(
+            TaskLogFileIdGet.model_json_schema()["examples"],
+        )

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

@@ -0,0 +1,48 @@
+# pylint: disable=no-self-use
+# pylint: disable=not-context-manager
+# pylint: disable=protected-access
+# pylint: disable=redefined-outer-name
+# pylint: disable=unused-argument
+# pylint: disable=unused-variable
+
+
+from typing import Literal
+
+from models_library.api_schemas_rpc_async_jobs.async_jobs import (
+    AsyncJobFilter,
+    AsyncJobGet,
+)
+from models_library.api_schemas_webserver.storage import PathToExport
+from models_library.products import ProductName
+from models_library.users import UserID
+from pydantic import TypeAdapter, validate_call
+from pytest_mock import MockType
+from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
+
+
+class StorageSideEffects:
+    # pylint: disable=no-self-use
+    @validate_call(config={"arbitrary_types_allowed": True})
+    async def start_export_data(
+        self,
+        rabbitmq_rpc_client: RabbitMQRPCClient | MockType,
+        *,
+        user_id: UserID,
+        product_name: ProductName,
+        paths_to_export: list[PathToExport],
+        export_as: Literal["path", "download_link"],
+    ) -> tuple[AsyncJobGet, AsyncJobFilter]:
+        assert rabbitmq_rpc_client
+        assert user_id
+        assert product_name
+        assert paths_to_export
+        assert export_as
+
+        async_job_get = TypeAdapter(AsyncJobGet).validate_python(
+            AsyncJobGet.model_json_schema()["examples"][0],
+        )
+        async_job_filter = TypeAdapter(AsyncJobFilter).validate_python(
+            AsyncJobFilter.model_json_schema()["examples"][0],
+        )
+
+        return async_job_get, async_job_filter

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/director_v2/computations_tasks.py

@@ -0,0 +1,41 @@
+# pylint: disable=too-many-arguments
+import logging
+from typing import Final
+
+from models_library.api_schemas_directorv2 import (
+    DIRECTOR_V2_RPC_NAMESPACE,
+)
+from models_library.api_schemas_directorv2.computations import TaskLogFileIdGet
+from models_library.projects import ProjectID
+from models_library.rabbitmq_basic_types import RPCMethodName
+from pydantic import TypeAdapter
+
+from ....logging_utils import log_decorator
+from ... import RabbitMQRPCClient
+
+_logger = logging.getLogger(__name__)
+
+
+_RPC_METHOD_NAME_ADAPTER: TypeAdapter[RPCMethodName] = TypeAdapter(RPCMethodName)
+
+_GET_COMPUTATION_TASK_LOG_FILE_IDS: Final[RPCMethodName] = (
+    _RPC_METHOD_NAME_ADAPTER.validate_python("get_computation_task_log_file_ids")
+)
+
+
+@log_decorator(_logger, level=logging.DEBUG)
+async def get_computation_task_log_file_ids(
+    rabbitmq_rpc_client: RabbitMQRPCClient, *, project_id: ProjectID
+) -> list[TaskLogFileIdGet]:
+    """
+    Raises:
+        ComputationalTaskMissingError
+    """
+    result = await rabbitmq_rpc_client.request(
+        DIRECTOR_V2_RPC_NAMESPACE,
+        _GET_COMPUTATION_TASK_LOG_FILE_IDS,
+        project_id=project_id,
+    )
+    assert isinstance(result, list)  # nosec
+    assert all(isinstance(item, TaskLogFileIdGet) for item in result)  # nosec
+    return result

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/director_v2/errors.py

@@ -0,0 +1,9 @@
+from ..._errors import RPCInterfaceError
+
+
+class BaseRpcError(RPCInterfaceError):
+    pass
+
+
+class ComputationalTaskMissingError(BaseRpcError):
+    msg_template = "Computational run not found for project {project_id}"

packages/service-library/src/servicelib/utils_meta.py

@@ -1,13 +1,16 @@
-"""  Utilities to implement _meta.py
-
-"""
+"""Utilities to implement _meta.py"""
 
+import re
 from importlib.metadata import distribution
 
 from models_library.basic_types import VersionStr
 from packaging.version import Version
 from pydantic import TypeAdapter
 
+_APP_NAME_PATTERN = re.compile(
+    r"^[a-z0-9]+(-[a-z0-9]+)*$"
+)  # matches lowercase string with words and non-negative integers separated by dashes (no whitespace)
+
 
 class PackageInfo:
     """Thin wrapper around pgk_resources.Distribution to access package distribution metadata
@@ -29,11 +32,31 @@ def __init__(self, package_name: str):
         package_name: as defined in 'setup.name'
         """
         self._distribution = distribution(package_name)
+        # property checks
+        if re.match(_APP_NAME_PATTERN, self.app_name) is None:
+            raise ValueError(
+                f"Invalid package name {self.app_name}. "
+                "It must be all lowercase and words separated by dashes ('-')."
+            )
 
     @property
     def project_name(self) -> str:
         return self._distribution.metadata["Name"]
 
+    @property
+    def app_name(self) -> str:
+        """
+        Returns the application name as a lowercase string with words separated by dashes ('-').
+        """
+        return self._distribution.metadata["Name"]
+
+    @property
+    def prometheus_friendly_app_name(self) -> str:
+        """
+        Returns a version of the app name which is compatible with Prometheus metrics naming conventions (no dashes).
+        """
+        return self.app_name.replace("-", "_")
+
     @property
     def version(self) -> Version:
         return Version(self._distribution.version)

packages/service-library/tests/test_utils_meta.py

@@ -1,7 +1,9 @@
 from typing import Final
 
+import pytest
 from models_library.basic_types import VersionStr
 from packaging.version import Version
+from pytest_mock import MockerFixture
 from servicelib.utils_meta import PackageInfo
 
 
@@ -32,3 +34,33 @@ def test_meta_module_implementation():
 
     assert __version__ in APP_FINISHED_BANNER_MSG
     assert PROJECT_NAME in APP_FINISHED_BANNER_MSG
+
+
+@pytest.mark.parametrize(
+    "package_name, app_name, is_valid_app_name, is_correct_app_name",
+    [
+        ("simcore-service-library", "simcore-service-library", True, True),
+        ("simcore-service-lib", "simcore-service-library", True, False),
+        ("simcore_service_library", "simcore_service_library", False, True),
+    ],
+)
+def test_app_name(
+    mocker: MockerFixture,
+    package_name: str,
+    app_name: str,
+    is_valid_app_name: bool,
+    is_correct_app_name: bool,
+):
+
+    def mock_distribution(name):
+        return mocker.Mock(metadata={"Name": name, "Version": "1.0.0"})
+
+    mocker.patch("servicelib.utils_meta.distribution", side_effect=mock_distribution)
+    if is_valid_app_name:
+        info = PackageInfo(package_name=package_name)
+        if is_correct_app_name:
+            assert info.app_name == app_name
+            assert info.prometheus_friendly_app_name == app_name.replace("-", "_")
+    else:
+        with pytest.raises(ValueError):
+            _ = PackageInfo(package_name=package_name)

services/api-server/VERSION

@@ -1 +1 @@
-0.9.2
+0.10.0