Merge branch 'master' into add-project-grouping-for-task-manager

Author: matusdrobuliak66

packages/aws-library/requirements/_test.txt

@@ -84,9 +84,9 @@ flexparser==0.4
     # via pint
 graphql-core==3.2.6
     # via moto
-h11==0.14.0
+h11==0.16.0
     # via httpcore
-httpcore==1.0.7
+httpcore==1.0.9
     # via httpx
 httpx==0.28.1
     # via

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

@@ -6,7 +6,7 @@ class BaseAsyncjobRpcError(OsparcErrorMixin, RuntimeError):
 
 
 class JobSchedulerError(BaseAsyncjobRpcError):
-    msg_template: str = "Celery exception: {exc}"
+    msg_template: str = "Async job scheduler exception: {exc}"
 
 
 class JobMissingError(BaseAsyncjobRpcError):

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

@@ -0,0 +1,88 @@
+# pylint: disable=unused-argument
+
+from dataclasses import dataclass
+
+from models_library.api_schemas_rpc_async_jobs.async_jobs import (
+    AsyncJobGet,
+    AsyncJobId,
+    AsyncJobNameData,
+    AsyncJobResult,
+    AsyncJobStatus,
+)
+from models_library.api_schemas_rpc_async_jobs.exceptions import BaseAsyncjobRpcError
+from models_library.progress_bar import ProgressReport
+from models_library.rabbitmq_basic_types import RPCNamespace
+from pydantic import validate_call
+from pytest_mock import MockType
+from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
+
+
+@dataclass
+class AsyncJobSideEffects:
+    exception: BaseAsyncjobRpcError | None = None
+
+    @validate_call(config={"arbitrary_types_allowed": True})
+    async def cancel(
+        self,
+        rabbitmq_rpc_client: RabbitMQRPCClient | MockType,
+        *,
+        rpc_namespace: RPCNamespace,
+        job_id: AsyncJobId,
+        job_id_data: AsyncJobNameData,
+    ) -> None:
+        if self.exception is not None:
+            raise self.exception
+        return None
+
+    @validate_call(config={"arbitrary_types_allowed": True})
+    async def status(
+        self,
+        rabbitmq_rpc_client: RabbitMQRPCClient | MockType,
+        *,
+        rpc_namespace: RPCNamespace,
+        job_id: AsyncJobId,
+        job_id_data: AsyncJobNameData,
+    ) -> AsyncJobStatus:
+        if self.exception is not None:
+            raise self.exception
+
+        return AsyncJobStatus(
+            job_id=job_id,
+            progress=ProgressReport(
+                actual_value=50.0,
+                total=100.0,
+                attempt=1,
+            ),
+            done=False,
+        )
+
+    @validate_call(config={"arbitrary_types_allowed": True})
+    async def result(
+        self,
+        rabbitmq_rpc_client: RabbitMQRPCClient | MockType,
+        *,
+        rpc_namespace: RPCNamespace,
+        job_id: AsyncJobId,
+        job_id_data: AsyncJobNameData,
+    ) -> AsyncJobResult:
+        if self.exception is not None:
+            raise self.exception
+        return AsyncJobResult(result="Success")
+
+    @validate_call(config={"arbitrary_types_allowed": True})
+    async def list_jobs(
+        self,
+        rabbitmq_rpc_client: RabbitMQRPCClient | MockType,
+        *,
+        rpc_namespace: RPCNamespace,
+        job_id_data: AsyncJobNameData,
+        filter_: str = "",
+    ) -> list[AsyncJobGet]:
+        if self.exception is not None:
+            raise self.exception
+        return [
+            AsyncJobGet(
+                job_id=AsyncJobId("123e4567-e89b-12d3-a456-426614174000"),
+                job_name="Example Job",
+            )
+        ]

packages/service-integration/requirements/_base.in

@@ -13,5 +13,5 @@ jinja2_time
 jsonschema # pytest-plugin
 pytest # pytest-plugin
 pyyaml
-typer[all]
+typer
 yarl

packages/service-library/requirements/_fastapi.txt

@@ -32,15 +32,15 @@ fastapi-cli==0.0.7
     # via fastapi
 fastapi-lifespan-manager==0.1.4
     # via -r requirements/_fastapi.in
-h11==0.14.0
+h11==0.16.0
     # via
     #   httpcore
     #   uvicorn
 h2==4.2.0
     # via httpx
 hpack==4.1.0
     # via h2
-httpcore==1.0.7
+httpcore==1.0.9
     # via httpx
 httptools==0.6.4
     # via uvicorn

packages/service-library/requirements/_test.txt

@@ -65,11 +65,11 @@ greenlet==3.1.1
     # via
     #   -c requirements/_aiohttp.txt
     #   sqlalchemy
-h11==0.14.0
+h11==0.16.0
     # via
     #   -c requirements/_fastapi.txt
     #   httpcore
-httpcore==1.0.7
+httpcore==1.0.9
     # via
     #   -c requirements/_fastapi.txt
     #   httpx

scripts/metrics/requirements.txt

@@ -1,5 +1,5 @@
 black
 httpx[http2]
-pydantic[email,dotenv]
+pydantic[email]
 pylint
-typer[all]
+typer

scripts/release/pyproject.toml

@@ -8,7 +8,7 @@ version = "1.2.3"
 authors = [{name="Matus Drobuliak", email="[email protected]" }]
 description = "Helper script for monitoring releases"
 readme = "README.md"
-dependencies = ["arrow", "python-dotenv","pydantic", "pydantic-settings", "typer[all]>=0.9", "rich", "requests"]
+dependencies = ["arrow", "python-dotenv","pydantic", "pydantic-settings", "typer>=0.9", "rich", "requests"]
 requires-python = ">=3.10"
 
 [project.scripts]

services/agent/requirements/_base.txt

@@ -112,15 +112,15 @@ googleapis-common-protos==1.69.1
     #   opentelemetry-exporter-otlp-proto-http
 grpcio==1.70.0
     # via opentelemetry-exporter-otlp-proto-grpc
-h11==0.14.0
+h11==0.16.0
     # via
     #   httpcore
     #   uvicorn
 h2==4.2.0
     # via httpx
 hpack==4.1.0
     # via h2
-httpcore==1.0.7
+httpcore==1.0.9
     # via httpx
 httptools==0.6.4
     # via uvicorn

services/agent/requirements/_test.txt

@@ -102,11 +102,11 @@ frozenlist==1.5.0
     #   aiosignal
 graphql-core==3.2.6
     # via moto
-h11==0.14.0
+h11==0.16.0
     # via
     #   -c requirements/_base.txt
     #   httpcore
-httpcore==1.0.7
+httpcore==1.0.9
     # via
     #   -c requirements/_base.txt
     #   httpx