Skip to content

Commit 7d06719

Browse files
fix unit tests
1 parent 06e05b9 commit 7d06719

File tree

2 files changed

+27
-10
lines changed

2 files changed

+27
-10
lines changed

airbyte_cdk/sources/declarative/parsers/model_to_component_factory.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3146,6 +3146,24 @@ def create_legacy_session_token_authenticator(
31463146
parameters=model.parameters or {},
31473147
)
31483148

3149+
def _get_log_formatter(
3150+
self, log_formatter: Callable[[Response], Any] | None, name: str
3151+
) -> Callable[[Response], Any] | None:
3152+
if self._should_limit_slices_fetched():
3153+
return (
3154+
(
3155+
lambda response: format_http_message(
3156+
response,
3157+
f"Stream '{name}' request",
3158+
f"Request performed in order to extract records for stream '{name}'",
3159+
name,
3160+
)
3161+
)
3162+
if not log_formatter
3163+
else log_formatter
3164+
)
3165+
return None
3166+
31493167
def _should_limit_slices_fetched(self) -> bool:
31503168
"""
31513169
Returns True if the number of slices fetched should be limited, False otherwise.

airbyte_cdk/sources/declarative/retrievers/simple_retriever.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,9 @@ class SimpleRetriever(Retriever, ComponentConstructor[SimpleRetrieverModel]):
132132
ignore_stream_slicer_parameters_on_paginated_requests: bool = False
133133
additional_query_properties: Optional[QueryProperties] = None
134134
log_formatter: Optional[Callable[[requests.Response], Any]] = None
135-
_should_use_lazy_simple_retriever: bool = False
136135

137136
@classmethod
138-
def _validate_if_lazy_simple_retriever_should_be_applied(
137+
def _should_use_lazy_simple_retriever(
139138
cls,
140139
name: str,
141140
model: SimpleRetrieverModel,
@@ -170,7 +169,6 @@ def _validate_if_lazy_simple_retriever_should_be_applied(
170169
raise ValueError(
171170
f"LazySimpleRetriever only supports JsonDecoder. Found: {model.decoder.type}."
172171
)
173-
cls._should_use_lazy_simple_retriever = True
174172
return True
175173

176174
return False
@@ -312,17 +310,13 @@ def _get_log_formatter(
312310
query_properties = dependency_constructor(
313311
model=query_properties_definition,
314312
config=config,
315-
dependency_constructor=dependency_constructor,
316-
additional_flags=additional_flags,
317313
**kwargs,
318314
)
319315

320316
elif hasattr(model.requester, "query_properties") and model.requester.query_properties:
321317
query_properties = dependency_constructor(
322318
model=model.requester.query_properties,
323319
config=config,
324-
dependency_constructor=dependency_constructor,
325-
additional_flags=additional_flags,
326320
**kwargs,
327321
)
328322

@@ -392,7 +386,7 @@ def _get_log_formatter(
392386
"parameters": model.parameters or {},
393387
}
394388

395-
if cls._validate_if_lazy_simple_retriever_should_be_applied(
389+
if cls._should_use_lazy_simple_retriever(
396390
name, model, additional_flags, incremental_sync
397391
):
398392
return resolved_dependencies
@@ -427,8 +421,13 @@ def build(
427421
additional_flags=additional_flags,
428422
**kwargs,
429423
)
430-
if cls._should_use_lazy_simple_retriever:
431-
LazySimpleRetriever(**resolved_dependencies)
424+
if cls._should_use_lazy_simple_retriever(
425+
name=kwargs.get("name"),
426+
model=model,
427+
additional_flags=additional_flags,
428+
incremental_sync=kwargs.get("incremental_sync"),
429+
):
430+
return LazySimpleRetriever(**resolved_dependencies)
432431
return SimpleRetriever(**resolved_dependencies)
433432

434433
def __post_init__(self, parameters: Mapping[str, Any]) -> None:

0 commit comments

Comments
 (0)