personal_knowledge_library 3.3.2__py3-none-any.whl → 3.4.0__py3-none-any.whl

knowledge/services/asyncio/group.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright © 2024 Wacom. All rights reserved.
+# Copyright © 2024-present Wacom. All rights reserved.
 import asyncio
 import urllib.parse
 from typing import List, Any, Optional, Dict
@@ -16,6 +16,7 @@ from knowledge.services import (
     FORCE_PARAM,
     APPLICATION_JSON_HEADER,
     USER_AGENT_HEADER_FLAG,
+    DEFAULT_TIMEOUT,
 )
 from knowledge.services.asyncio.base import AsyncServiceAPIClient, handle_error
 from knowledge.services.graph import AUTHORIZATION_HEADER_FLAG, CONTENT_TYPE_HEADER_FLAG
@@ -59,7 +60,11 @@ class AsyncGroupManagementService(AsyncServiceAPIClient):
     # ------------------------------------------ Groups handling ------------------------------------------------------
 
     async def create_group(
-        self, name: str, rights: GroupAccessRight = GroupAccessRight(read=True), auth_key: Optional[str] = None
+        self,
+        name: str,
+        rights: GroupAccessRight = GroupAccessRight(read=True),
+        auth_key: Optional[str] = None,
+        timeout: int = DEFAULT_TIMEOUT,
     ) -> Group:
         """
         Creates a group.
@@ -74,6 +79,8 @@ class AsyncGroupManagementService(AsyncServiceAPIClient):
             Access rights
         auth_key: Optional[str]
             If the auth key is set the logged-in user (if any) will be ignored and the auth key will be used.
+        timeout: int
+            Default timeout for the request (in seconds). Default: 60 seconds.
 
         Returns
         -------
@@ -95,7 +102,9 @@ class AsyncGroupManagementService(AsyncServiceAPIClient):
         }
         payload: Dict[str, str] = {NAME_TAG: name, GROUP_USER_RIGHTS_TAG: rights.to_list()}
         async with AsyncServiceAPIClient.__async_session__() as session:
-            async with session.post(url, headers=headers, json=payload, verify_ssl=self.verify_calls) as response:
+            async with session.post(
+                url, headers=headers, json=payload, timeout=timeout, verify_ssl=self.verify_calls
+            ) as response:
                 if not response.ok:
                     raise await handle_error("Creation of group failed.", response, payload=payload, headers=headers)
                 group: Dict[str, Any] = await response.json(loads=orjson.loads)
@@ -103,7 +112,12 @@ class AsyncGroupManagementService(AsyncServiceAPIClient):
         return Group.parse(group)
 
     async def update_group(
-        self, group_id: str, name: str, rights: GroupAccessRight = GroupAccessRight, auth_key: Optional[str] = None
+        self,
+        group_id: str,
+        name: str,
+        rights: GroupAccessRight = GroupAccessRight,
+        auth_key: Optional[str] = None,
+        timeout: int = DEFAULT_TIMEOUT,
     ):
         """
         Updates a group.
@@ -120,7 +134,8 @@ class AsyncGroupManagementService(AsyncServiceAPIClient):
             Access rights
         auth_key: Optional[str]
             If the auth key is set the logged-in user (if any) will be ignored and the auth key will be used.
-
+        timeout: int
+            Default timeout for the request (in seconds). Default: 60 seconds.
         Raises
         ------
         WacomServiceException
@@ -136,12 +151,16 @@ class AsyncGroupManagementService(AsyncServiceAPIClient):
         }
         payload: Dict[str, str] = {NAME_TAG: name, GROUP_USER_RIGHTS_TAG: rights.to_list()}
         async with AsyncServiceAPIClient.__async_session__() as session:
-            async with session.patch(url, headers=headers, json=payload, verify_ssl=self.verify_calls) as response:
+            async with session.patch(
+                url, headers=headers, json=payload, timeout=timeout, verify_ssl=self.verify_calls
+            ) as response:
                 if not response.ok:
                     raise await handle_error("Update of group failed.", response, payload=payload, headers=headers)
         await asyncio.sleep(0.25 if self.use_graceful_shutdown else 0.0)
 
-    async def delete_group(self, group_id: str, force: bool = False, auth_key: Optional[str] = None):
+    async def delete_group(
+        self, group_id: str, force: bool = False, auth_key: Optional[str] = None, timeout: int = DEFAULT_TIMEOUT
+    ):
         """
          Delete a group.
 
@@ -153,6 +172,8 @@ class AsyncGroupManagementService(AsyncServiceAPIClient):
             If True, the group will be deleted even if it is not empty.
          auth_key: Optional[str]
             If the auth key is set the logged-in user (if any) will be ignored and the auth key will be used.
+         timeout: int
+            Default timeout for the request (in seconds). Default: 60 seconds.
 
         Raises
         ------
@@ -168,13 +189,20 @@ class AsyncGroupManagementService(AsyncServiceAPIClient):
         }
         params: Dict[str, str] = {FORCE_TAG: str(force).lower()}
         async with AsyncServiceAPIClient.__async_session__() as session:
-            async with session.delete(url, headers=headers, params=params, verify_ssl=self.verify_calls) as response:
+            async with session.delete(
+                url, headers=headers, params=params, timeout=timeout, verify_ssl=self.verify_calls
+            ) as response:
                 if not response.ok:
                     raise await handle_error("Deletion of group failed.", response, headers=headers)
         await asyncio.sleep(0.25 if self.use_graceful_shutdown else 0.0)
 
     async def listing_groups(
-        self, admin: bool = False, limit: int = 20, offset: int = 0, auth_key: Optional[str] = None
+        self,
+        admin: bool = False,
+        limit: int = 20,
+        offset: int = 0,
+        auth_key: Optional[str] = None,
+        timeout: int = DEFAULT_TIMEOUT,
     ) -> List[Group]:
         """
         Listing all groups configured for this instance.
@@ -190,6 +218,8 @@ class AsyncGroupManagementService(AsyncServiceAPIClient):
             Offset of the first group to return.
         auth_key: Optional[str]
             If the auth key is set the logged-in user (if any) will be ignored and the auth key will be used.
+        timeout: int
+            Default timeout for the request (in seconds). Default: 60 seconds.
 
         Returns
         -------
@@ -212,7 +242,9 @@ class AsyncGroupManagementService(AsyncServiceAPIClient):
             USER_AGENT_HEADER_FLAG: self.user_agent,
         }
         async with AsyncServiceAPIClient.__async_session__() as session:
-            async with session.get(url, headers=headers, params=params, verify_ssl=self.verify_calls) as response:
+            async with session.get(
+                url, headers=headers, params=params, timeout=timeout, verify_ssl=self.verify_calls
+            ) as response:
                 if response.ok:
                     groups: List[Dict[str, Any]] = await response.json(loads=orjson.loads)
                 else:
@@ -220,7 +252,7 @@ class AsyncGroupManagementService(AsyncServiceAPIClient):
         await asyncio.sleep(0.25 if self.use_graceful_shutdown else 0.0)
         return [Group.parse(g) for g in groups]
 
-    async def group(self, group_id: str, auth_key: Optional[str] = None) -> GroupInfo:
+    async def group(self, group_id: str, auth_key: Optional[str] = None, timeout: int = DEFAULT_TIMEOUT) -> GroupInfo:
         """Get a group.
 
         Parameters
@@ -229,6 +261,8 @@ class AsyncGroupManagementService(AsyncServiceAPIClient):
             Group ID
         auth_key: Optional[str]
             If the auth key is set the logged-in user (if any) will be ignored and the auth key will be used.
+        timeout: int
+            Default timeout for the request (in seconds). Default: 60 seconds.
 
         Returns
         -------
@@ -248,14 +282,16 @@ class AsyncGroupManagementService(AsyncServiceAPIClient):
             USER_AGENT_HEADER_FLAG: self.user_agent,
         }
         async with AsyncServiceAPIClient.__async_session__() as session:
-            async with session.get(url, headers=headers, verify_ssl=self.verify_calls) as response:
+            async with session.get(url, headers=headers, timeout=timeout, verify_ssl=self.verify_calls) as response:
                 if response.ok:
                     group: Dict[str, Any] = await response.json(loads=orjson.loads)
                 else:
                     raise await handle_error("Getting of group information failed.", response, headers=headers)
         return GroupInfo.parse(group)
 
-    async def join_group(self, group_id: str, join_key: str, auth_key: Optional[str] = None):
+    async def join_group(
+        self, group_id: str, join_key: str, auth_key: Optional[str] = None, timeout: int = DEFAULT_TIMEOUT
+    ):
         """User joining a group with his auth token.
 
         Parameters
@@ -265,8 +301,9 @@ class AsyncGroupManagementService(AsyncServiceAPIClient):
         join_key: str
             Key which is used to join the group.
         auth_key: Optional[str]
-            If the auth key is set the logged-in user (if any) will be ignored and the auth key will be used.
-
+            If the auth key is set, the logged-in user (if any) will be ignored and the auth key will be used.
+        timeout: int
+            Default timeout for the request (in seconds). Default: 60 seconds.
         Raises
         ------
         WacomServiceException
@@ -283,12 +320,14 @@ class AsyncGroupManagementService(AsyncServiceAPIClient):
             JOIN_KEY_PARAM: join_key,
         }
         async with AsyncServiceAPIClient.__async_session__() as session:
-            async with session.post(url, headers=headers, params=params, verify_ssl=self.verify_calls) as response:
+            async with session.post(
+                url, headers=headers, params=params, timeout=timeout, verify_ssl=self.verify_calls
+            ) as response:
                 if not response.ok:
                     raise await handle_error("Joining of group failed.", response, headers=headers, parameters=params)
         await asyncio.sleep(0.25 if self.use_graceful_shutdown else 0.0)
 
-    async def leave_group(self, group_id: str, auth_key: Optional[str] = None):
+    async def leave_group(self, group_id: str, auth_key: Optional[str] = None, timeout: int = DEFAULT_TIMEOUT):
         """User leaving a group with his auth token.
 
         Parameters
@@ -297,6 +336,8 @@ class AsyncGroupManagementService(AsyncServiceAPIClient):
             Group ID
         auth_key: Optional[str]
             If the auth key is set the logged-in user (if any) will be ignored and the auth key will be used.
+        timeout: int
+            Default timeout for the request (in seconds). Default: 60 seconds.
 
         Raises
         ------
@@ -311,12 +352,14 @@ class AsyncGroupManagementService(AsyncServiceAPIClient):
             USER_AGENT_HEADER_FLAG: self.user_agent,
         }
         async with AsyncServiceAPIClient.__async_session__() as session:
-            async with session.post(url, headers=headers, verify_ssl=self.verify_calls) as response:
+            async with session.post(url, headers=headers, timeout=timeout, verify_ssl=self.verify_calls) as response:
                 if not response.ok:
                     raise await handle_error("Leaving of group failed.", response, headers=headers)
         await asyncio.sleep(0.25 if self.use_graceful_shutdown else 0.0)
 
-    async def add_user_to_group(self, group_id: str, user_id: str, auth_key: Optional[str] = None):
+    async def add_user_to_group(
+        self, group_id: str, user_id: str, auth_key: Optional[str] = None, timeout: int = DEFAULT_TIMEOUT
+    ):
         """Adding a user to group.
 
         Parameters
@@ -327,6 +370,8 @@ class AsyncGroupManagementService(AsyncServiceAPIClient):
             User who is added to the group
         auth_key: Optional[str]
             If the auth key is set the logged-in user (if any) will be ignored and the auth key will be used.
+        timeout: int
+            Default timeout for the request (in seconds). Default: 60 seconds.
 
         Raises
         ------
@@ -344,7 +389,9 @@ class AsyncGroupManagementService(AsyncServiceAPIClient):
             USER_TO_ADD_PARAM: user_id,
         }
         async with AsyncServiceAPIClient.__async_session__() as session:
-            async with session.post(url, headers=headers, params=params, verify_ssl=self.verify_calls) as response:
+            async with session.post(
+                url, headers=headers, params=params, timeout=timeout, verify_ssl=self.verify_calls
+            ) as response:
                 if not response.ok:
                     raise await handle_error(
                         "Adding of user to group failed.", response, headers=headers, parameters=params
@@ -352,7 +399,12 @@ class AsyncGroupManagementService(AsyncServiceAPIClient):
         await asyncio.sleep(0.25 if self.use_graceful_shutdown else 0.0)
 
     async def remove_user_from_group(
-        self, group_id: str, user_id: str, force: bool = False, auth_key: Optional[str] = None
+        self,
+        group_id: str,
+        user_id: str,
+        force: bool = False,
+        auth_key: Optional[str] = None,
+        timeout: int = DEFAULT_TIMEOUT,
     ):
         """Remove a user from group.
 
@@ -366,7 +418,8 @@ class AsyncGroupManagementService(AsyncServiceAPIClient):
             If true remove user and entities owned by the user if any
         auth_key: Optional[str]
             If the auth key is set the logged-in user (if any) will be ignored and the auth key will be used.
-
+        timeout: int
+            Default timeout for the request (in seconds). Default: 60 seconds.
         Raises
         ------
         WacomServiceException
@@ -381,7 +434,9 @@ class AsyncGroupManagementService(AsyncServiceAPIClient):
         }
         params: Dict[str, str] = {USER_TO_REMOVE_PARAM: user_id, FORCE_PARAM: str(force)}
         async with AsyncServiceAPIClient.__async_session__() as session:
-            async with session.post(url, headers=headers, params=params, verify_ssl=self.verify_calls) as response:
+            async with session.post(
+                url, headers=headers, params=params, timeout=timeout, verify_ssl=self.verify_calls
+            ) as response:
                 if not response.ok:
                     raise await handle_error(
                         "Removing of user from group failed.", response, headers=headers, parameters=params

knowledge/services/asyncio/search.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright © 2024 Wacom. All rights reserved.
+# Copyright © 2024-present Wacom. All rights reserved.
 import asyncio
 from typing import Dict, Any, Optional, List, Literal
 
@@ -35,7 +35,7 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
         super().__init__("Async Semantic Search ", service_url, service_endpoint)
 
     async def retrieve_document_chunks(
-        self, locale: LocaleCode, uri: str, auth_key: Optional[str] = None
+        self, locale: LocaleCode, uri: str, auth_key: Optional[str] = None, timeout: int = DEFAULT_TIMEOUT
     ) -> List[VectorDBDocument]:
         """
         Retrieve document chunks from vector database. The service is automatically chunking the document into
@@ -49,6 +49,8 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
             URI of the document
         auth_key: Optional[str] (Default:= None)
             If the auth key is set the logged-in user (if any) will be ignored and the auth key will be used.
+        timeout: int
+            Default timeout for the request (default: 60 seconds)
 
         Returns
         -------
@@ -71,7 +73,7 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
         }
         async with self.__async_session__() as session:
             async with session.get(
-                url, params={"locale": locale, "uri": uri}, headers=headers, timeout=DEFAULT_TIMEOUT
+                url, params={"locale": locale, "uri": uri}, headers=headers, timeout=timeout
             ) as response:
                 if response.ok:
                     docs: List[VectorDBDocument] = [
@@ -88,7 +90,7 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
         return docs
 
     async def retrieve_labels(
-        self, locale: LocaleCode, uri: str, auth_key: Optional[str] = None
+        self, locale: LocaleCode, uri: str, auth_key: Optional[str] = None, timeout: int = DEFAULT_TIMEOUT
     ) -> List[VectorDBDocument]:
         """
         Retrieve labels from vector database.
@@ -101,6 +103,8 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
             URI of the document
         auth_key: Optional[str] (Default:= None)
             If the auth key is set the logged-in user (if any) will be ignored and the auth key will be used.
+        timeout: int
+            Default timeout for the request (default: 60 seconds)
 
         Returns
         -------
@@ -123,7 +127,7 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
         }
         async with self.__async_session__() as session:
             async with session.get(
-                url, params={"locale": locale, "uri": uri}, headers=headers, timeout=DEFAULT_TIMEOUT
+                url, params={"locale": locale, "uri": uri}, headers=headers, timeout=timeout
             ) as response:
                 if response.ok:
                     docs: List[VectorDBDocument] = [
@@ -140,7 +144,11 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
         return docs
 
     async def count_documents(
-        self, locale: LocaleCode, concept_type: Optional[str] = None, auth_key: Optional[str] = None
+        self,
+        locale: LocaleCode,
+        concept_type: Optional[str] = None,
+        auth_key: Optional[str] = None,
+        timeout: int = DEFAULT_TIMEOUT,
     ) -> int:
         """
         Count all documents for a tenant.
@@ -153,6 +161,8 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
             Concept type.
         auth_key: Optional[str] (Default:= None)
             If the auth key is set the logged-in user (if any) will be ignored and the auth key will be used.
+        timeout: int
+            Default timeout for the request (default: 60 seconds)
 
         Returns
         -------
@@ -176,7 +186,7 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
         if concept_type:
             params["concept_type"] = concept_type
         async with self.__async_session__() as session:
-            async with session.get(url, params=params, headers=headers) as response:
+            async with session.get(url, params=params, headers=headers, timeout=timeout) as response:
                 if response.ok:
                     count: int = (await response.json(loads=orjson.loads)).get("count", 0)
                 else:
@@ -187,7 +197,11 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
         return count
 
     async def count_documents_filter(
-        self, locale: LocaleCode, filters: Dict[str, Any], auth_key: Optional[str] = None
+        self,
+        locale: LocaleCode,
+        filters: Dict[str, Any],
+        auth_key: Optional[str] = None,
+        timeout: int = DEFAULT_TIMEOUT,
     ) -> int:
         """
         Count all documents for a tenant using a filter.
@@ -200,6 +214,8 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
             Filters for the search
         auth_key: Optional[str] (Default:= None)
             If the auth key is set the logged-in user (if any) will be ignored and the auth key will be used.
+        timeout: int
+            Default timeout for the request (default: 60 seconds).
 
         Returns
         -------
@@ -220,7 +236,9 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
             AUTHORIZATION_HEADER_FLAG: f"Bearer {auth_key}",
         }
         async with self.__async_session__() as session:
-            async with session.post(url, json={"locale": locale, "filter": filters}, headers=headers) as response:
+            async with session.post(
+                url, json={"locale": locale, "filter": filters}, timeout=timeout, headers=headers
+            ) as response:
                 if response.ok:
                     count: int = (await response.json(loads=orjson.loads)).get("count", 0)
                 else:
@@ -234,7 +252,11 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
         return count
 
     async def count_labels(
-        self, locale: str, concept_type: Optional[str] = None, auth_key: Optional[str] = None
+        self,
+        locale: str,
+        concept_type: Optional[str] = None,
+        auth_key: Optional[str] = None,
+        timeout: int = DEFAULT_TIMEOUT,
     ) -> int:
         """
         Count all labels entries for a tenant.
@@ -247,6 +269,8 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
             Concept type.
         auth_key: Optional[str] (Default:= None)
             If auth key is provided, it will be used for the request.
+        timeout: int
+            Default timeout for the request (default: 60 seconds)
 
         Returns
         -------
@@ -270,7 +294,7 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
         if concept_type:
             params["concept_type"] = concept_type
         async with self.__async_session__() as session:
-            async with session.get(url, params=params, headers=headers) as response:
+            async with session.get(url, params=params, headers=headers, timeout=timeout) as response:
                 if response.ok:
                     count: int = (await response.json(loads=orjson.loads)).get("count", 0)
                 else:
@@ -281,7 +305,11 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
         return count
 
     async def count_labels_filter(
-        self, locale: LocaleCode, filters: Dict[str, Any], auth_key: Optional[str] = None
+        self,
+        locale: LocaleCode,
+        filters: Dict[str, Any],
+        auth_key: Optional[str] = None,
+        timeout: int = DEFAULT_TIMEOUT,
     ) -> int:
         """
         Count all labels for a tenant using a filter.
@@ -294,6 +322,8 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
             Filters for the search
         auth_key: Optional[str] (Default:= None)
             If the auth key is set the logged-in user (if any) will be ignored and the auth key will be used.
+        timeout: int
+            Default timeout for the request (default: 60 seconds).
 
         Returns
         -------
@@ -314,7 +344,9 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
             AUTHORIZATION_HEADER_FLAG: f"Bearer {auth_key}",
         }
         async with self.__async_session__() as session:
-            async with session.post(url, json={"locale": locale, "filter": filters}, headers=headers) as response:
+            async with session.post(
+                url, json={"locale": locale, "filter": filters}, timeout=timeout, headers=headers
+            ) as response:
                 if response.ok:
                     count: int = (await response.json(loads=orjson.loads)).get("count", 0)
                 else:
@@ -335,6 +367,7 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
         max_results: int = 10,
         filter_mode: Optional[Literal["AND", "OR"]] = None,
         auth_key: Optional[str] = None,
+        timeout: int = DEFAULT_TIMEOUT,
     ) -> DocumentSearchResponse:
         """
         Async Semantic search.
@@ -353,7 +386,8 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
             Filter mode for the search. If None is provided, the default is "AND".
         auth_key: Optional[str] (Default:= None)
             If the auth key is set the logged-in user (if any) will be ignored and the auth key will be used.
-
+        timeout: int
+            Default timeout for the request (default: 60 seconds)
         Returns
         -------
         response: DocumentSearchResponse
@@ -381,7 +415,7 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
         if filter_mode:
             params["filter_mode"] = filter_mode
         async with self.__async_session__() as session:
-            async with session.post(url, headers=headers, json=params) as response:
+            async with session.post(url, headers=headers, json=params, timeout=timeout) as response:
                 if response.ok:
                     response_dict: Dict[str, Any] = await response.json(loads=orjson.loads)
                 else:
@@ -397,6 +431,7 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
         max_results: int = 10,
         filter_mode: Optional[Literal["AND", "OR"]] = None,
         auth_key: Optional[str] = None,
+        timeout: int = DEFAULT_TIMEOUT,
     ) -> LabelMatchingResponse:
         """
         Async search for semantically similar labels.
@@ -415,7 +450,8 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
             Filter mode for the search. If None is provided, the default is "AND".
         auth_key: Optional[str] (Default:= None)
             If the auth key is set the logged-in user (if any) will be ignored and the auth key will be used.
-
+        timeout: int
+            Default timeout for the request (default: 60 seconds).
         Returns
         -------
         response: LabelMatchingResponse
@@ -438,7 +474,7 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
         if filter_mode:
             params["filter_mode"] = filter_mode
         async with self.__async_session__() as session:
-            async with session.post(url, headers=headers, json=params) as response:
+            async with session.post(url, headers=headers, json=params, timeout=timeout) as response:
                 if response.ok:
                     response_dict: Dict[str, Any] = await response.json(loads=orjson.loads)
                 else:

knowledge/services/asyncio/users.py

@@ -59,7 +59,12 @@ class AsyncUserManagementService(AsyncServiceAPIClient):
     # ------------------------------------------ Users handling --------------------------------------------------------
 
     async def create_user(
-        self, tenant_key: str, external_id: str, meta_data: Dict[str, str] = None, roles: List[UserRole] = None
+        self,
+        tenant_key: str,
+        external_id: str,
+        meta_data: Dict[str, str] = None,
+        roles: List[UserRole] = None,
+        timeout: int = DEFAULT_TIMEOUT,
     ) -> Tuple[User, str, str, datetime]:
         """
         Creates user for a tenant.
@@ -74,6 +79,8 @@ class AsyncUserManagementService(AsyncServiceAPIClient):
             Meta-data dictionary.
         roles: List[UserRole]
             List of roles.
+        timeout: int
+            Denotes the timeout for the request in seconds (default: 60 seconds).
 
         Returns
         -------
@@ -103,7 +110,7 @@ class AsyncUserManagementService(AsyncServiceAPIClient):
         }
         async with self.__async_session__() as session:
             async with session.post(
-                url, headers=headers, json=payload, timeout=DEFAULT_TIMEOUT, verify_ssl=self.verify_calls
+                url, headers=headers, json=payload, timeout=timeout, verify_ssl=self.verify_calls
             ) as response:
                 if response.ok:
                     results: Dict[str, Union[str, Dict[str, str], List[str]]] = await response.json(loads=orjson.loads)
@@ -130,6 +137,7 @@ class AsyncUserManagementService(AsyncServiceAPIClient):
         external_id: str,
         meta_data: Dict[str, str] = None,
         roles: List[UserRole] = None,
+        timeout: int = DEFAULT_TIMEOUT,
     ):
         """Updates user for a tenant.
 
@@ -145,6 +153,8 @@ class AsyncUserManagementService(AsyncServiceAPIClient):
             Meta-data dictionary.
         roles: List[UserRole]
             List of roles.
+        timeout: int
+            Denotes the timeout for the request in seconds (default: 60 seconds).
 
         Raises
         ------
@@ -164,13 +174,15 @@ class AsyncUserManagementService(AsyncServiceAPIClient):
         params: Dict[str, str] = {USER_ID_TAG: internal_id, EXTERNAL_USER_ID_TAG: external_id}
         async with self.__async_session__() as session:
             async with session.patch(
-                url, headers=headers, json=payload, params=params, timeout=DEFAULT_TIMEOUT, verify_ssl=self.verify_calls
+                url, headers=headers, json=payload, params=params, timeout=timeout, verify_ssl=self.verify_calls
             ) as response:
                 if not response.ok:
                     raise await handle_error("Failed to update the user.", response, headers=headers, payload=payload)
         await asyncio.sleep(0.25 if self.use_graceful_shutdown else 0.0)
 
-    async def delete_user(self, tenant_key: str, external_id: str, internal_id: str, force: bool = False):
+    async def delete_user(
+        self, tenant_key: str, external_id: str, internal_id: str, force: bool = False, timeout: int = DEFAULT_TIMEOUT
+    ):
         """Deletes user from tenant.
 
         Parameters
@@ -183,6 +195,8 @@ class AsyncUserManagementService(AsyncServiceAPIClient):
             Internal id of user.
         force: bool
             If set to true removes all user data including groups and entities.
+        timeout: int
+            Default timeout for the request (in seconds) (Default:= 60 seconds).
 
         Raises
         ------
@@ -194,13 +208,13 @@ class AsyncUserManagementService(AsyncServiceAPIClient):
         params: Dict[str, str] = {USER_ID_TAG: internal_id, EXTERNAL_USER_ID_TAG: external_id, FORCE_TAG: str(force)}
         async with self.__async_session__() as session:
             async with session.delete(
-                url, headers=headers, params=params, timeout=DEFAULT_TIMEOUT, verify_ssl=self.verify_calls
+                url, headers=headers, params=params, timeout=timeout, verify_ssl=self.verify_calls
             ) as response:
                 if not response.ok:
                     raise await handle_error("Failed to delete the user.", response, headers=headers)
         await asyncio.sleep(0.25 if self.use_graceful_shutdown else 0.0)
 
-    async def user_internal_id(self, tenant_key: str, external_id: str) -> str:
+    async def user_internal_id(self, tenant_key: str, external_id: str, timeout: int = DEFAULT_TIMEOUT) -> str:
         """User internal id.
 
         Parameters
@@ -209,7 +223,8 @@ class AsyncUserManagementService(AsyncServiceAPIClient):
             API key for tenant
         external_id: str
             External id of user
-
+        timeout: int
+            Default timeout for the request (in seconds) (Default:= 60 seconds).
         Returns
         -------
         internal_user_id: str
@@ -225,7 +240,7 @@ class AsyncUserManagementService(AsyncServiceAPIClient):
         parameters: Dict[str, str] = {EXTERNAL_USER_ID_TAG: external_id}
         async with self.__async_session__() as session:
             async with session.get(
-                url, headers=headers, params=parameters, timeout=DEFAULT_TIMEOUT, verify_ssl=self.verify_calls
+                url, headers=headers, params=parameters, timeout=timeout, verify_ssl=self.verify_calls
             ) as response:
                 if response.ok:
                     response_dict: Dict[str, Any] = await response.json(loads=orjson.loads)
@@ -234,7 +249,9 @@ class AsyncUserManagementService(AsyncServiceAPIClient):
         await asyncio.sleep(0.25 if self.use_graceful_shutdown else 0.0)
         return response_dict[INTERNAL_USER_ID_TAG]
 
-    async def listing_users(self, tenant_key: str, offset: int = 0, limit: int = 20) -> List[User]:
+    async def listing_users(
+        self, tenant_key: str, offset: int = 0, limit: int = 20, timeout: int = DEFAULT_TIMEOUT
+    ) -> List[User]:
         """
         Listing all users configured for this instance.
 
@@ -246,6 +263,8 @@ class AsyncUserManagementService(AsyncServiceAPIClient):
             Offset value to define starting position in list. [DEFAULT:= 0]
         limit: int - [optional]
             Define the limit of the list size. [DEFAULT:= 20]
+        timeout: int - [optional]
+            Default timeout for the request (in seconds) (Default:= 60 seconds).
 
         Returns
         -------
@@ -254,10 +273,10 @@ class AsyncUserManagementService(AsyncServiceAPIClient):
         """
         url: str = f"{self.service_base_url}{AsyncUserManagementService.USER_ENDPOINT}"
         headers: Dict[str, str] = {USER_AGENT_TAG: self.user_agent, TENANT_API_KEY_FLAG: tenant_key}
-        params: Dict[str, str] = {OFFSET_TAG: offset, LIMIT_TAG: limit}
+        params: Dict[str, int] = {OFFSET_TAG: offset, LIMIT_TAG: limit}
         async with self.__async_session__() as session:
             async with session.get(
-                url, headers=headers, params=params, timeout=DEFAULT_TIMEOUT, verify_ssl=self.verify_calls
+                url, headers=headers, params=params, timeout=timeout, verify_ssl=self.verify_calls
             ) as response:
                 if response.ok:
                     users: List[Dict[str, Any]] = await response.json(loads=orjson.loads)