PY-321 Add requested URL to the retry exception (#205)

Author: gabrys

src/neptune_api_codegen/docker/rofiles/templates/endpoint_module.py.jinja

@@ -111,6 +111,7 @@ def _parse_response(*, client: Union[AuthenticatedClient, Client], response: htt
 
 def _build_response(*, client: Union[AuthenticatedClient, Client], response: httpx.Response) -> Response[{{ return_string }}]:
     return Response(
+        url=str(response.url),
         status_code=HTTPStatus(response.status_code),
         content=response.content,
         headers=response.headers,

src/neptune_api_codegen/docker/rofiles/templates/types.py.jinja

@@ -79,6 +79,7 @@ T = TypeVar("T")
 class Response(Generic[T]):
     """ A response from an endpoint """
 
+    url: str
     status_code: HTTPStatus
     content: bytes
     headers: MutableMapping[str, str]

src/neptune_query/exceptions.py

@@ -199,7 +199,12 @@ def __init__(self, status_code: int, content: bytes) -> None:
 
 class NeptuneRetryError(NeptuneError):
     def __init__(
-        self, retries: int, time: float, last_status_code: Optional[int] = None, last_content: Optional[bytes] = None
+        self,
+        retries: int,
+        time: float,
+        last_status_code: Optional[int] = None,
+        last_content: Optional[bytes] = None,
+        url: Optional[str] = None,
     ) -> None:
         content_str = _decode_content(last_content) if last_content else ""
         super().__init__(
@@ -216,11 +221,13 @@ def __init__(
 https://docs.neptune.ai/environment_variables/neptune_query#neptune_query_retry_soft_timeout
 https://docs.neptune.ai/environment_variables/neptune_query#neptune_query_retry_hard_timeout
 
+{url_line}
 {status_code_line}
 {content_line}
 """,
             retries=retries,
             time=time,
+            url_line=f"Requested URL: {url}" if url is not None else "",
             status_code_line=f"Last response status: {last_status_code}" if last_status_code is not None else "",
             content_line=f"Last response content: {content_str}" if last_content is not None else "",
             soft_limit=env.NEPTUNE_QUERY_RETRY_SOFT_TIMEOUT.get(),

src/neptune_query/generated/neptune_api/api/backend/exchange_api_token.py

@@ -90,6 +90,7 @@ def _build_response(
     *, client: Union[AuthenticatedClient, Client], response: httpx.Response
 ) -> Response[Union[Any, Error, NeptuneOauthToken]]:
     return Response(
+        url=str(response.url),
         status_code=HTTPStatus(response.status_code),
         content=response.content,
         headers=response.headers,

src/neptune_query/generated/neptune_api/api/backend/get_client_config.py

@@ -103,6 +103,7 @@ def _build_response(
     *, client: Union[AuthenticatedClient, Client], response: httpx.Response
 ) -> Response[Union[Any, ClientConfig, Error]]:
     return Response(
+        url=str(response.url),
         status_code=HTTPStatus(response.status_code),
         content=response.content,
         headers=response.headers,

src/neptune_query/generated/neptune_api/api/backend/get_project.py

@@ -96,6 +96,7 @@ def _build_response(
     *, client: Union[AuthenticatedClient, Client], response: httpx.Response
 ) -> Response[Union[Any, Error, ProjectDTO]]:
     return Response(
+        url=str(response.url),
         status_code=HTTPStatus(response.status_code),
         content=response.content,
         headers=response.headers,

src/neptune_query/generated/neptune_api/api/ingestion/bulk_check_status.py

@@ -104,6 +104,7 @@ def _build_response(
     *, client: Union[AuthenticatedClient, Client], response: httpx.Response
 ) -> Response[Union[Any, File]]:
     return Response(
+        url=str(response.url),
         status_code=HTTPStatus(response.status_code),
         content=response.content,
         headers=response.headers,

src/neptune_query/generated/neptune_api/api/ingestion/check_details.py

@@ -104,6 +104,7 @@ def _build_response(
     *, client: Union[AuthenticatedClient, Client], response: httpx.Response
 ) -> Response[Union[Any, File]]:
     return Response(
+        url=str(response.url),
         status_code=HTTPStatus(response.status_code),
         content=response.content,
         headers=response.headers,

src/neptune_query/generated/neptune_api/api/ingestion/check_status.py

@@ -108,6 +108,7 @@ def _build_response(
     *, client: Union[AuthenticatedClient, Client], response: httpx.Response
 ) -> Response[Union[Any, File]]:
     return Response(
+        url=str(response.url),
         status_code=HTTPStatus(response.status_code),
         content=response.content,
         headers=response.headers,

src/neptune_query/generated/neptune_api/api/ingestion/ingest.py

@@ -95,6 +95,7 @@ def _build_response(
     *, client: Union[AuthenticatedClient, Client], response: httpx.Response
 ) -> Response[Union[Any, File]]:
     return Response(
+        url=str(response.url),
         status_code=HTTPStatus(response.status_code),
         content=response.content,
         headers=response.headers,