Merge branch 'master' into enh/request-account-with-phone

Author: odeimaiz

.github/workflows/ci-testing-deploy.yml

@@ -1057,7 +1057,7 @@ jobs:
   unit-test-dynamic-sidecar:
     needs: changes
     if: ${{ needs.changes.outputs.dynamic-sidecar == 'true' || github.event_name == 'push' || github.event.inputs.force_all_builds == 'true' }}
-    timeout-minutes: 18 # if this timeout gets too small, then split the tests
+    timeout-minutes: 19 # if this timeout gets too small, then split the tests
     name: "[unit] dynamic-sidecar"
     runs-on: ${{ matrix.os }}
     strategy:

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

@@ -5,6 +5,7 @@
 
 from ..resource_tracker import HardwareInfo, PricingInfo
 from ..services import ServicePortKey
+from ..services_creation import CreateServiceMetricsAdditionalParams
 from ..services_resources import ServiceResourcesDict, ServiceResourcesDictHelpers
 from ..wallets import WalletInfo
 from .dynamic_services_service import RunningDynamicServiceDetails, ServiceDetails
@@ -104,3 +105,11 @@ class GetProjectInactivityResponse(BaseModel):
     is_inactive: bool
 
     model_config = ConfigDict(json_schema_extra={"example": {"is_inactive": "false"}})
+
+
+class ContainersComposeSpec(BaseModel):
+    docker_compose_yaml: str
+
+
+class ContainersCreate(BaseModel):
+    metrics_params: CreateServiceMetricsAdditionalParams

packages/service-library/requirements/_fastapi.in

@@ -3,7 +3,7 @@
 #
 #
 
-
+asgi-lifespan
 fastapi[standard]
 fastapi-lifespan-manager
 httpx[http2]

packages/service-library/requirements/_fastapi.txt

@@ -5,6 +5,8 @@ anyio==4.8.0
     #   httpx
     #   starlette
     #   watchfiles
+asgi-lifespan==2.1.0
+    # via -r requirements/_fastapi.in
 asgiref==3.8.1
     # via opentelemetry-instrumentation-asgi
 certifi==2025.1.31
@@ -129,7 +131,9 @@ sentry-sdk==2.35.0
 shellingham==1.5.4
     # via typer
 sniffio==1.3.1
-    # via anyio
+    # via
+    #   anyio
+    #   asgi-lifespan
 starlette==0.47.2
     # via fastapi
 typer==0.16.1

packages/service-library/requirements/_test.txt

@@ -20,7 +20,9 @@ anyio==4.8.0
     #   -c requirements/_fastapi.txt
     #   httpx
 asgi-lifespan==2.1.0
-    # via -r requirements/_test.in
+    # via
+    #   -c requirements/_fastapi.txt
+    #   -r requirements/_test.in
 attrs==25.1.0
     # via
     #   -c requirements/_aiohttp.txt

packages/service-library/src/servicelib/fastapi/long_running_tasks/_client.py

@@ -88,7 +88,7 @@ def retry_on_http_errors(
     assert asyncio.iscoroutinefunction(request_func)
 
     @functools.wraps(request_func)
-    async def request_wrapper(zelf: "Client", *args, **kwargs) -> Any:
+    async def request_wrapper(zelf: "HttpClient", *args, **kwargs) -> Any:
         async for attempt in AsyncRetrying(
             stop=stop_after_attempt(max_attempt_number=3),
             wait=wait_exponential(min=1),
@@ -106,7 +106,7 @@ async def request_wrapper(zelf: "Client", *args, **kwargs) -> Any:
     return request_wrapper
 
 
-class Client:
+class HttpClient:
     """
     This is a client that aims to simplify the requests to get the
     status, result and/or cancel of a long running task.

packages/service-library/src/servicelib/fastapi/long_running_tasks/_context_manager.py

@@ -1,5 +1,6 @@
 import asyncio
 import logging
+import warnings
 from collections.abc import AsyncIterator
 from contextlib import asynccontextmanager
 from typing import Any, Final
@@ -15,7 +16,7 @@
     TaskId,
     TaskStatus,
 )
-from ._client import Client
+from ._client import HttpClient
 
 _logger = logging.getLogger(__name__)
 
@@ -69,7 +70,7 @@ async def update(
 
 @asynccontextmanager
 async def periodic_task_result(
-    client: Client,
+    client: HttpClient,
     task_id: TaskId,
     *,
     task_timeout: PositiveFloat,
@@ -95,6 +96,13 @@ async def periodic_task_result(
     raises: `asyncio.TimeoutError` NOTE: the remote task will also be removed
     """
 
+    warnings.warn(
+        "This context manager is deprecated and will be removed in future releases. "
+        "Please use the `servicelib.long_running_tasks.lrt_api` instead.",
+        DeprecationWarning,
+        stacklevel=2,
+    )
+
     progress_manager = _ProgressManager(progress_callback)
 
     async def _status_update() -> TaskStatus:

packages/service-library/src/servicelib/fastapi/long_running_tasks/client.py

@@ -2,11 +2,11 @@
 Provides a convenient way to return the result given a TaskId.
 """
 
-from ._client import Client, setup
+from ._client import HttpClient, setup
 from ._context_manager import periodic_task_result  # attach to the same object!
 
 __all__: tuple[str, ...] = (
-    "Client",
+    "HttpClient",
     "periodic_task_result",
     "setup",
 )

packages/service-library/src/servicelib/long_running_tasks/_serialization.py

@@ -78,4 +78,6 @@ def loads(obj_str: str) -> Any:
             msg = f"Could not reconstruct object from data: {data}"
             raise ValueError(msg) from e
 
+    if isinstance(data, Exception):
+        raise data
     return data

packages/service-library/src/servicelib/long_running_tasks/errors.py

@@ -34,6 +34,14 @@ class TaskExceptionError(BaseLongRunningError):
     )
 
 
+class TaskRaisedUnserializableError(BaseLongRunningError):
+    msg_template: str = (
+        "Task {task_id} raised an exception that could not be serialized.\n"
+        "Original exception: '{original_exception_str}'\n"
+        "As a consequence, the following error was raised: '{exception}'"
+    )
+
+
 class TaskClientTimeoutError(BaseLongRunningError):
     msg_template: str = (
         "Timed out after {timeout} seconds while awaiting '{task_id}' to complete"