A try to fix imports

Author: HardNorth

reportportal_client/aio/__init__.py

@@ -12,6 +12,8 @@
 #  limitations under the License
 
 """Common package for Asynchronous I/O clients and utilities."""
+import asyncio
+from typing import Coroutine, Optional, TypeVar, Union
 
 from reportportal_client.aio.client import (
     DEFAULT_SHUTDOWN_TIMEOUT,
@@ -24,7 +26,25 @@
 )
 from reportportal_client.aio.tasks import BlockingOperationError, EmptyTask, Task
 
+_T = TypeVar("_T")
+
+
+async def await_if_necessary(obj: Union[_T, Task[_T], Coroutine[_T, None, None]]) -> Optional[_T]:
+    """Await Coroutine, Feature or coroutine Function if given argument is one of them, or return immediately.
+
+    :param obj: value, Coroutine, Feature or coroutine Function
+    :return: result which was returned by Coroutine, Feature or coroutine Function
+    """
+    if obj:
+        if asyncio.isfuture(obj) or asyncio.iscoroutine(obj):
+            return await obj
+        elif asyncio.iscoroutinefunction(obj):
+            return await obj()
+    return obj
+
+
 __all__ = [
+    "await_if_necessary",
     "Task",
     "EmptyTask",
     "BlockingOperationError",

reportportal_client/aio/client.py

@@ -56,7 +56,7 @@
 # noinspection PyProtectedMember
 from reportportal_client._internal.static.abstract import AbstractBaseClass, abstractmethod
 from reportportal_client._internal.static.defines import DEFAULT_LOG_LEVEL
-from reportportal_client.aio import EmptyTask
+from reportportal_client.aio import EmptyTask, await_if_necessary
 
 # noinspection PyProtectedMember
 from reportportal_client.aio.tasks import Task
@@ -81,7 +81,6 @@
     LAUNCH_NAME_LENGTH_LIMIT,
     LifoQueue,
     agent_name_version,
-    await_if_necessary,
     root_uri_join,
     uri_join,
 )

reportportal_client/core/rp_requests.py

@@ -37,10 +37,11 @@
 
 # noinspection PyProtectedMember
 from reportportal_client._internal.static.defines import DEFAULT_LOG_LEVEL, DEFAULT_PRIORITY, LOW_PRIORITY, Priority
+from reportportal_client.aio import await_if_necessary
 from reportportal_client.core.rp_file import RPFile
 from reportportal_client.core.rp_issues import Issue
 from reportportal_client.core.rp_responses import AsyncRPResponse, RPResponse
-from reportportal_client.helpers import await_if_necessary, dict_to_payload
+from reportportal_client.helpers import dict_to_payload
 from reportportal_client.helpers.common_helpers import clean_binary_characters, verify_value_length
 
 try:

reportportal_client/helpers/__init__.py

@@ -14,7 +14,6 @@
     TYPICAL_MULTIPART_FOOTER_LENGTH,
     LifoQueue,
     agent_name_version,
-    await_if_necessary,
     calculate_file_part_size,
     calculate_json_part_size,
     caseless_equal,
@@ -53,7 +52,6 @@
     "TYPICAL_FILE_PART_HEADER",
     "LifoQueue",
     "agent_name_version",
-    "await_if_necessary",
     "calculate_file_part_size",
     "calculate_json_part_size",
     "caseless_equal",

reportportal_client/helpers/common_helpers.py

@@ -13,7 +13,6 @@
 
 """This module contains common functions-helpers of the client and agents."""
 
-import asyncio
 import fnmatch
 import inspect
 import re
@@ -23,9 +22,8 @@
 from datetime import datetime, timezone
 from platform import machine, processor, system
 from types import MappingProxyType
-from typing import Any, Callable, Coroutine, Generic, Iterable, Optional, Sized, TypeVar, Union
+from typing import Any, Callable, Generic, Iterable, Optional, Sized, TypeVar, Union
 
-from reportportal_client.aio import Task
 from reportportal_client.core.rp_file import RPFile
 
 try:
@@ -402,20 +400,6 @@ def agent_name_version(attributes: Optional[Union[list, dict]] = None) -> tuple[
     return agent_name, agent_version
 
 
-async def await_if_necessary(obj: Union[_T, Task[_T], Coroutine[_T, None, None]]) -> Optional[_T]:
-    """Await Coroutine, Feature or coroutine Function if given argument is one of them, or return immediately.
-
-    :param obj: value, Coroutine, Feature or coroutine Function
-    :return: result which was returned by Coroutine, Feature or coroutine Function
-    """
-    if obj:
-        if asyncio.isfuture(obj) or asyncio.iscoroutine(obj):
-            return await obj
-        elif asyncio.iscoroutinefunction(obj):
-            return await obj()
-    return obj
-
-
 def is_binary(iterable: Union[bytes, bytearray, str]) -> bool:
     """Check if given iterable is binary.