adds ITISFoundation#8440

Author: pcrespov

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

@@ -15,10 +15,12 @@ def __init__(
         self,
         rpc_client: RabbitMQRPCClient,
         namespace: RPCNamespace,
+        *,
         rpc_request_kwargs: dict[str, Any] | None = None,
     ):
         self._rpc_client = rpc_client
         self._namespace = namespace
+        # extra kwargs to be passed to every rpc request
         self._rpc_request_kwargs = rpc_request_kwargs or {}
 
     async def _request(
@@ -27,12 +29,8 @@ async def _request(
         *,
         product_name: ProductName,
         user_id: UserID,
-        **optional_kwargs: Any
+        **optional_kwargs: Any,
     ) -> Any:
-        assert self._rpc_request_kwargs.keys().isdisjoint(optional_kwargs.keys()), (
-            "Conflict between request extras and kwargs"
-            "Please rename the conflicting keys."
-        )
 
         return await self._request_without_authentication(
             method_name,
@@ -45,6 +43,7 @@ async def _request(
     async def _request_without_authentication(
         self, method_name: RPCMethodName, *, product_name: ProductName, **kwargs: Any
     ) -> Any:
+
         assert self._rpc_request_kwargs.keys().isdisjoint(kwargs.keys()), (
             "Conflict between request extras and kwargs"
             "Please rename the conflicting keys."

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

@@ -1,6 +1,6 @@
 """Functions RPC API subclient."""
 
-from typing import Literal, cast
+from typing import Annotated, Any, Literal, cast
 
 from models_library.api_schemas_webserver.functions import (
     Function,
@@ -28,17 +28,42 @@
     RegisteredFunctionJobWithStatus,
 )
 from models_library.products import ProductName
+from models_library.rabbitmq_basic_types import RPCNamespace
 from models_library.rest_ordering import OrderBy
 from models_library.rest_pagination import PageMetaInfoLimitOffset
 from models_library.users import UserID
-from pydantic import TypeAdapter
+from pydantic import PositiveInt, TypeAdapter
+from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
 
 from ._base import BaseRpcApi
 
+_FUNCTION_RPC_TIMEOUT_SEC: Annotated[int, PositiveInt] = 30
+
 
 class FunctionsRpcApi(BaseRpcApi):
     """RPC client for function-related operations."""
 
+    def __init__(
+        self,
+        rpc_client: RabbitMQRPCClient,
+        namespace: RPCNamespace,
+        rpc_request_kwargs: dict[str, Any] | None = None,
+    ):
+        rpc_request_kwargs = rpc_request_kwargs or {}
+        assert "timeout_s" not in rpc_request_kwargs, (
+            "timeout_s should not be set in rpc_request_kwargs, "
+            f"it is set by default to {_FUNCTION_RPC_TIMEOUT_SEC} seconds"
+        )
+
+        super().__init__(
+            rpc_client,
+            namespace,
+            rpc_request_kwargs={
+                **rpc_request_kwargs,
+                "timeout_s": _FUNCTION_RPC_TIMEOUT_SEC,
+            },
+        )
+
     # pylint: disable=too-many-public-methods
 
     async def register_function(