Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: (CDK) (AsyncRetriever) - Add the request and response to each async operations #356

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ def _read_with_chunks(
"""

try:
# TODO: Add support for other file types, like `json`, with `pd.read_json()`
with open(path, "r", encoding=file_encoding) as data:
chunks = pd.read_csv(
data, chunksize=chunk_size, iterator=True, dialect="unix", dtype=object
Expand Down
46 changes: 42 additions & 4 deletions airbyte_cdk/sources/declarative/requesters/http_job_repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
)
from airbyte_cdk.sources.declarative.requesters.requester import Requester
from airbyte_cdk.sources.declarative.retrievers.simple_retriever import SimpleRetriever
from airbyte_cdk.sources.http_logger import format_http_message
from airbyte_cdk.sources.types import Record, StreamSlice
from airbyte_cdk.utils import AirbyteTracedException

Expand Down Expand Up @@ -71,7 +72,15 @@ def _get_validated_polling_response(self, stream_slice: StreamSlice) -> requests
"""

polling_response: Optional[requests.Response] = self.polling_requester.send_request(
stream_slice=stream_slice
stream_slice=stream_slice,
log_formatter=lambda polling_response: format_http_message(
response=polling_response,
title="Async Job -- Polling",
description="Poll the status of the server-side async job.",
stream_name=None,
is_auxiliary=True,
type="ASYNC_POLL",
),
)
if polling_response is None:
raise AirbyteTracedException(
Expand Down Expand Up @@ -118,8 +127,17 @@ def _start_job_and_validate_response(self, stream_slice: StreamSlice) -> request
"""

response: Optional[requests.Response] = self.creation_requester.send_request(
stream_slice=stream_slice
stream_slice=stream_slice,
log_formatter=lambda response: format_http_message(
response=response,
title="Async Job -- Create",
description="Create the server-side async job.",
stream_name=None,
is_auxiliary=True,
type="ASYNC_CREATE",
),
)

if not response:
raise AirbyteTracedException(
internal_message="Always expect a response or an exception from creation_requester",
Expand Down Expand Up @@ -217,13 +235,33 @@ def abort(self, job: AsyncJob) -> None:
if not self.abort_requester:
return

self.abort_requester.send_request(stream_slice=self._get_create_job_stream_slice(job))
abort_response = self.abort_requester.send_request(
stream_slice=self._get_create_job_stream_slice(job),
log_formatter=lambda abort_response: format_http_message(
response=abort_response,
title="Async Job -- Abort",
description="Abort the running server-side async job.",
stream_name=None,
is_auxiliary=True,
type="ASYNC_ABORT",
),
)

def delete(self, job: AsyncJob) -> None:
if not self.delete_requester:
return

self.delete_requester.send_request(stream_slice=self._get_create_job_stream_slice(job))
delete_job_reponse = self.delete_requester.send_request(
stream_slice=self._get_create_job_stream_slice(job),
log_formatter=lambda delete_job_reponse: format_http_message(
response=delete_job_reponse,
title="Async Job -- Delete",
description="Delete the specified job from the list of Jobs.",
stream_name=None,
is_auxiliary=True,
type="ASYNC_DELETE",
),
)
self._clean_up_job(job.api_job_id())

def _clean_up_job(self, job_id: str) -> None:
Expand Down
Loading