Skip to content

Commit 6a142a7

Browse files
committed
Move default log_formatter value to post init
1 parent 272efe6 commit 6a142a7

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

airbyte_cdk/sources/declarative/parsers/model_to_component_factory.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3171,12 +3171,7 @@ def _get_url() -> str:
31713171
config=config,
31723172
maximum_number_of_slices=self._limit_slices_fetched or 5,
31733173
ignore_stream_slicer_parameters_on_paginated_requests=ignore_stream_slicer_parameters_on_paginated_requests,
3174-
log_formatter=(lambda response: format_http_message(
3175-
response,
3176-
f"Stream '{name}' request",
3177-
f"Request performed in order to extract records for stream '{name}'",
3178-
name,
3179-
)) if not log_formatter else log_formatter,
3174+
log_formatter=log_formatter,
31803175
parameters=model.parameters or {},
31813176
)
31823177
return SimpleRetriever(

airbyte_cdk/sources/declarative/retrievers/simple_retriever.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import requests
2424
from typing_extensions import deprecated
25-
25+
from airbyte_cdk.sources.http_logger import format_http_message
2626
from airbyte_cdk.models import AirbyteMessage
2727
from airbyte_cdk.sources.declarative.extractors.http_selector import HttpSelector
2828
from airbyte_cdk.sources.declarative.incremental import ResumableFullRefreshCursor
@@ -655,6 +655,13 @@ class SimpleRetrieverTestReadDecorator(SimpleRetriever):
655655

656656
def __post_init__(self, options: Mapping[str, Any]) -> None:
657657
super().__post_init__(options)
658+
self.log_formatter = (lambda response: format_http_message(
659+
response,
660+
f"Stream '{self.name}' request",
661+
f"Request performed in order to extract records for stream '{self.name}'",
662+
self.name,
663+
)) if not self.log_formatter else self.log_formatter
664+
658665
if self.maximum_number_of_slices and self.maximum_number_of_slices < 1:
659666
raise ValueError(
660667
f"The maximum number of slices on a test read needs to be strictly positive. Got {self.maximum_number_of_slices}"

unit_tests/sources/declarative/retrievers/test_simple_retriever.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -921,11 +921,8 @@ def test_emit_log_request_response_messages(mocker):
921921
stream_state={}, stream_slice=StreamSlice(cursor_slice={}, partition={})
922922
)
923923

924-
assert requester.send_request.call_args_list[0][1]["log_formatter"] is not None
925-
assert (
926-
requester.send_request.call_args_list[0][1]["log_formatter"](response)
927-
== format_http_message_mock.return_value
928-
)
924+
assert retriever.log_formatter is not None
925+
assert retriever.log_formatter(response) == format_http_message_mock.return_value
929926

930927

931928
def test_retriever_last_page_size_for_page_increment():

0 commit comments

Comments
 (0)