Skip to content

Commit 70e6665

Browse files
author
octavia-squidington-iii
committed
Auto-fix lint and format issues
1 parent 3210e7a commit 70e6665

File tree

3 files changed

+21
-9
lines changed

3 files changed

+21
-9
lines changed

airbyte_cdk/sources/declarative/manifest_declarative_source.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ def __init__(
8787
self.components_module: ModuleType | None = get_registered_components_module(config=config)
8888

8989
resolved_source_config = ManifestReferenceResolver().preprocess_manifest(manifest)
90-
propagated_source_config = ManifestComponentTransformer().propagate_types_and_parameters("",
91-
resolved_source_config,
92-
{})
90+
propagated_source_config = ManifestComponentTransformer().propagate_types_and_parameters(
91+
"", resolved_source_config, {}
92+
)
9393
self._source_config = propagated_source_config
9494
self._debug = debug
9595
self._emit_connector_builder_messages = emit_connector_builder_messages
@@ -387,7 +387,11 @@ def _dynamic_stream_configs(
387387
for dynamic_stream in components_resolver.resolve_components(
388388
stream_template_config=stream_template_config
389389
):
390-
dynamic_stream = {**ManifestComponentTransformer().propagate_types_and_parameters("", dynamic_stream, {}, use_parent_parameters=True)}
390+
dynamic_stream = {
391+
**ManifestComponentTransformer().propagate_types_and_parameters(
392+
"", dynamic_stream, {}, use_parent_parameters=True
393+
)
394+
}
391395

392396
if "type" not in dynamic_stream:
393397
dynamic_stream["type"] = "DeclarativeStream"

airbyte_cdk/sources/declarative/parsers/manifest_component_transformer.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,11 @@ def propagate_types_and_parameters(
132132
# level take precedence
133133
current_parameters = dict(copy.deepcopy(parent_parameters))
134134
component_parameters = propagated_component.pop(PARAMETERS_STR, {})
135-
current_parameters = {**component_parameters, **current_parameters} if use_parent_parameters else {**current_parameters, **component_parameters}
135+
current_parameters = (
136+
{**component_parameters, **current_parameters}
137+
if use_parent_parameters
138+
else {**current_parameters, **component_parameters}
139+
)
136140

137141
# Parameters should be applied to the current component fields with the existing field taking precedence over parameters if
138142
# both exist
@@ -147,7 +151,10 @@ def propagate_types_and_parameters(
147151
excluded_parameter = current_parameters.pop(field_name, None)
148152
parent_type_field_identifier = f"{propagated_component.get('type')}.{field_name}"
149153
propagated_component[field_name] = self.propagate_types_and_parameters(
150-
parent_type_field_identifier, field_value, current_parameters, use_parent_parameters=use_parent_parameters
154+
parent_type_field_identifier,
155+
field_value,
156+
current_parameters,
157+
use_parent_parameters=use_parent_parameters,
151158
)
152159
if excluded_parameter:
153160
current_parameters[field_name] = excluded_parameter
@@ -160,7 +167,10 @@ def propagate_types_and_parameters(
160167
f"{propagated_component.get('type')}.{field_name}"
161168
)
162169
field_value[i] = self.propagate_types_and_parameters(
163-
parent_type_field_identifier, element, current_parameters, use_parent_parameters=use_parent_parameters
170+
parent_type_field_identifier,
171+
element,
172+
current_parameters,
173+
use_parent_parameters=use_parent_parameters,
164174
)
165175
if excluded_parameter:
166176
current_parameters[field_name] = excluded_parameter

unit_tests/sources/declarative/resolvers/test_http_components_resolver.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -596,5 +596,3 @@ def test_dynamic_streams_with_http_components_resolver_retriever_with_parent_str
596596
actual_record_stream_names.sort()
597597

598598
assert actual_record_stream_names == expected_stream_names
599-
600-

0 commit comments

Comments
 (0)