Fix review comments

Author: HardNorth

reportportal_client/_internal/aio/http.py

@@ -100,8 +100,8 @@ async def __request(self, method: Callable, url, **kwargs: Any) -> ClientRespons
         for i in range(self.__retry_number + 1):  # add one for the first attempt, which is not a retry
             retry_factor = None
             if result is not None:
-                # Close previous result if it's retried to release resources
-                result.close()
+                # Release previous result to return connection to pool
+                await result.release()
             try:
                 result = await method(url, **kwargs)
             except Exception as exc:
@@ -210,8 +210,8 @@ async def __request(self, method: Callable, url: str, **kwargs: Any) -> ClientRe
         if result.status in AUTH_PROBLEM_STATUSES and self.__auth:
             refreshed_header = await self.__auth.refresh()
             if refreshed_header:
-                # Close previous result if it's retried to release resources
-                result.close()
+                # Release previous result to return connection to pool
+                await result.release()
                 # Retry with new auth header
                 request_kwargs["headers"] = request_kwargs.get("headers", {}).copy()
                 request_kwargs["headers"]["Authorization"] = refreshed_header

reportportal_client/_internal/http.py

@@ -17,7 +17,8 @@
 from types import TracebackType
 from typing import Any, Callable, Optional, Type, Union
 
-import requests
+from requests import Response, Session
+from requests.adapters import BaseAdapter
 
 from reportportal_client._internal.services.auth import Auth
 
@@ -27,7 +28,7 @@
 class ClientSession:
     """Class wraps requests.Session and adds authentication support."""
 
-    _client: requests.Session
+    _client: Session
     __auth: Optional[Auth]
 
     def __init__(
@@ -38,10 +39,10 @@ def __init__(
 
         :param auth: authentication instance to use for requests
         """
-        self._client = requests.Session()
+        self._client = Session()
         self.__auth = auth
 
-    def __request(self, method: Callable, url: Union[str, bytes], **kwargs: Any) -> requests.Response:
+    def __request(self, method: Callable, url: Union[str, bytes], **kwargs: Any) -> Response:
         """Make a request with authentication support.
 
         The method adds Authorization header if auth is configured and handles auth refresh
@@ -73,19 +74,19 @@ def __request(self, method: Callable, url: Union[str, bytes], **kwargs: Any) ->
 
         return result
 
-    def get(self, url: str, **kwargs: Any) -> requests.Response:
+    def get(self, url: Union[str, bytes], **kwargs: Any) -> Response:
         """Perform HTTP GET request."""
         return self.__request(self._client.get, url, **kwargs)
 
-    def post(self, url: str, **kwargs: Any) -> requests.Response:
+    def post(self, url: Union[str, bytes], **kwargs: Any) -> Response:
         """Perform HTTP POST request."""
         return self.__request(self._client.post, url, **kwargs)
 
-    def put(self, url: str, **kwargs: Any) -> requests.Response:
+    def put(self, url: Union[str, bytes], **kwargs: Any) -> Response:
         """Perform HTTP PUT request."""
         return self.__request(self._client.put, url, **kwargs)
 
-    def mount(self, prefix: str, adapter: requests.adapters.BaseAdapter) -> None:
+    def mount(self, prefix: str, adapter: BaseAdapter) -> None:
         """Mount an adapter to a specific URL prefix.
 
         :param prefix: URL prefix (e.g., 'http://', 'https://')

tests/_internal/services/test_auth.py

@@ -426,7 +426,7 @@ async def test_refresh_request_401_fallback_to_password_grant(self):
         assert result1 == f"Bearer {ACCESS_TOKEN}"
 
         # Wait for token to expire
-        time.sleep(1)
+        await asyncio.sleep(1)
 
         # Simulate refresh failure and password grant success
         refresh_response = mock.AsyncMock()
@@ -468,7 +468,7 @@ async def test_refresh_request_403_fallback_to_password_grant(self):
         assert result1 == f"Bearer {ACCESS_TOKEN}"
 
         # Wait for token to expire
-        time.sleep(1)
+        await asyncio.sleep(1)
 
         # Simulate refresh failure with 403 and password grant success
         refresh_response = mock.AsyncMock()
@@ -520,7 +520,7 @@ async def test_refresh_method_on_valid_token(self):
         mock_session.post.return_value = refreshed_response
 
         # Wait to avoid throttling
-        time.sleep(1)
+        await asyncio.sleep(1)
 
         result2 = await oauth.refresh()
         assert result2 == f"Bearer {new_token}"