Skip to content

Commit 5aaa9fc

Browse files
octavia-squidington-iiialdogonzalez8
authored andcommitted
Auto-fix lint and format issues
1 parent 66c1f7d commit 5aaa9fc

File tree

10 files changed

+51
-27
lines changed

10 files changed

+51
-27
lines changed

airbyte_cdk/sources/declarative/parsers/model_to_component_factory.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -481,8 +481,13 @@
481481
SimpleRetriever,
482482
SimpleRetrieverTestReadDecorator,
483483
)
484-
from airbyte_cdk.sources.declarative.retrievers.file_uploader import FileUploader, FileWriter, NoopFileWriter, \
485-
ConnectorBuilderFileUploader, BaseFileUploader
484+
from airbyte_cdk.sources.declarative.retrievers.file_uploader import (
485+
BaseFileUploader,
486+
ConnectorBuilderFileUploader,
487+
FileUploader,
488+
FileWriter,
489+
NoopFileWriter,
490+
)
486491
from airbyte_cdk.sources.declarative.schema import (
487492
ComplexFieldType,
488493
DefaultSchemaLoader,
@@ -3617,7 +3622,11 @@ def create_file_uploader(
36173622
filename_extractor=model.filename_extractor if model.filename_extractor else None,
36183623
)
36193624

3620-
return ConnectorBuilderFileUploader(file_uploader) if emit_connector_builder_messages else file_uploader
3625+
return (
3626+
ConnectorBuilderFileUploader(file_uploader)
3627+
if emit_connector_builder_messages
3628+
else file_uploader
3629+
)
36213630

36223631
def create_moving_window_call_rate_policy(
36233632
self, model: MovingWindowCallRatePolicyModel, config: Config, **kwargs: Any
Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
1-
from .file_uploader import FileUploader
21
from .base_file_uploader import BaseFileUploader
32
from .base_file_writer import BaseFileWriter
43
from .connector_builder_file_uploader import ConnectorBuilderFileUploader
5-
from .noop_file_writer import NoopFileWriter
4+
from .file_uploader import FileUploader
65
from .file_writer import FileWriter
6+
from .noop_file_writer import NoopFileWriter
77

8-
__all__ = ["FileUploader", "FileWriter", "NoopFileWriter", "ConnectorBuilderFileUploader", "BaseFileUploader", "BaseFileWriter"]
8+
__all__ = [
9+
"FileUploader",
10+
"FileWriter",
11+
"NoopFileWriter",
12+
"ConnectorBuilderFileUploader",
13+
"BaseFileUploader",
14+
"BaseFileWriter",
15+
]

airbyte_cdk/sources/declarative/retrievers/file_uploader/base_file_uploader.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
33
#
44

5+
from abc import ABC, abstractmethod
56
from dataclasses import dataclass
67

7-
from abc import ABC, abstractmethod
88
from airbyte_cdk.sources.declarative.types import Record
99

1010

@@ -19,4 +19,4 @@ def upload(self, record: Record) -> None:
1919
"""
2020
Uploads the file to the specified location
2121
"""
22-
...
22+
...

airbyte_cdk/sources/declarative/retrievers/file_uploader/base_file_writer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
33
#
44

5+
from abc import ABC, abstractmethod
56
from pathlib import Path
67

7-
from abc import ABC, abstractmethod
88

99
class BaseFileWriter(ABC):
1010
"""
@@ -16,4 +16,4 @@ def write(self, file_path: Path, content: bytes) -> int:
1616
"""
1717
Writes the file to the specified location
1818
"""
19-
...
19+
...

airbyte_cdk/sources/declarative/retrievers/file_uploader/connector_builder_file_uploader.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,16 @@ class ConnectorBuilderFileUploader(BaseFileUploader):
1414
Connector builder file uploader
1515
Acts as a decorator or wrapper around a FileUploader instance, copying the attributes from record.file_reference into the record.data.
1616
"""
17+
1718
file_uploader: FileUploader
1819

1920
def upload(self, record: Record) -> None:
2021
self.file_uploader.upload(record=record)
21-
for file_reference_attribute in [file_reference_attribute for file_reference_attribute in record.file_reference.__dict__ if not file_reference_attribute.startswith('_')]:
22-
record.data[file_reference_attribute] = getattr(record.file_reference, file_reference_attribute)
22+
for file_reference_attribute in [
23+
file_reference_attribute
24+
for file_reference_attribute in record.file_reference.__dict__
25+
if not file_reference_attribute.startswith("_")
26+
]:
27+
record.data[file_reference_attribute] = getattr(
28+
record.file_reference, file_reference_attribute
29+
)

airbyte_cdk/sources/declarative/retrievers/file_uploader/file_uploader.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
logger = logging.getLogger("airbyte")
2929

3030

31-
3231
@dataclass
3332
class FileUploader(BaseFileUploader):
3433
"""
3534
File uploader class
3635
Handles the upload logic: fetching the download target, making the request via its requester, determining the file path, and calling self.file_writer.write()
3736
Different types of file_writer:BaseFileWriter can be injected to handle different file writing strategies.
3837
"""
38+
3939
requester: Requester
4040
download_target_extractor: RecordExtractor
4141
config: Config
@@ -99,6 +99,3 @@ def upload(self, record: Record) -> None:
9999
source_file_relative_path=str(file_relative_path),
100100
file_size_bytes=file_size_bytes,
101101
)
102-
103-
104-

airbyte_cdk/sources/declarative/retrievers/file_uploader/file_writer.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@
88

99

1010
class FileWriter(BaseFileWriter):
11-
1211
def write(self, file_path: Path, content: bytes) -> int:
1312
"""
1413
Writes the file to the specified location
1514
"""
1615
with open(str(file_path), "wb") as f:
1716
f.write(content)
1817

19-
return file_path.stat().st_size
18+
return file_path.stat().st_size

airbyte_cdk/sources/declarative/retrievers/file_uploader/noop_file_writer.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88

99

1010
class NoopFileWriter(BaseFileWriter):
11-
1211
def write(self, file_path: Path, content: bytes) -> int:
1312
"""
1413
Noop file writer
1514
"""
16-
return 0
15+
return 0

airbyte_cdk/sources/declarative/yaml_declarative_source.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def __init__(
2424
catalog: Optional[ConfiguredAirbyteCatalog] = None,
2525
config: Optional[Mapping[str, Any]] = None,
2626
state: Optional[List[AirbyteStateMessage]] = None,
27-
emit_connector_builder_messages: Optional[bool] = False
27+
emit_connector_builder_messages: Optional[bool] = False,
2828
) -> None:
2929
"""
3030
:param path_to_yaml: Path to the yaml file describing the source
@@ -37,7 +37,7 @@ def __init__(
3737
config=config or {},
3838
state=state or [],
3939
source_config=source_config,
40-
emit_connector_builder_messages=emit_connector_builder_messages
40+
emit_connector_builder_messages=emit_connector_builder_messages,
4141
)
4242

4343
def _read_and_parse_yaml_file(self, path_to_yaml_file: str) -> ConnectionDefinition:

unit_tests/sources/declarative/file/test_file_stream.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def _source(
3434
config: Dict[str, Any],
3535
state: Optional[List[AirbyteStateMessage]] = None,
3636
yaml_file: Optional[str] = None,
37-
emit_connector_builder_messages: Optional[bool] = False
37+
emit_connector_builder_messages: Optional[bool] = False,
3838
) -> YamlDeclarativeSource:
3939
if not yaml_file:
4040
yaml_file = "file_stream_manifest.yaml"
@@ -43,7 +43,7 @@ def _source(
4343
catalog=catalog,
4444
config=config,
4545
state=state,
46-
emit_connector_builder_messages=emit_connector_builder_messages
46+
emit_connector_builder_messages=emit_connector_builder_messages,
4747
)
4848

4949

@@ -53,12 +53,16 @@ def read(
5353
state_builder: Optional[StateBuilder] = None,
5454
expecting_exception: bool = False,
5555
yaml_file: Optional[str] = None,
56-
emit_connector_builder_messages: Optional[bool] = False
56+
emit_connector_builder_messages: Optional[bool] = False,
5757
) -> EntrypointOutput:
5858
config = config_builder.build()
5959
state = state_builder.build() if state_builder else StateBuilder().build()
6060
return entrypoint_read(
61-
_source(catalog, config, state, yaml_file, emit_connector_builder_messages), config, catalog, state, expecting_exception
61+
_source(catalog, config, state, yaml_file, emit_connector_builder_messages),
62+
config,
63+
catalog,
64+
state,
65+
expecting_exception,
6266
)
6367

6468

@@ -232,7 +236,9 @@ def test_get_article_attachments_messages_for_connector_builder(self) -> None:
232236
# Assert file reference fields are copied to record data
233237
record_data = output.records[0].record.data
234238
assert record_data["staging_file_url"] == file_reference.staging_file_url
235-
assert record_data["source_file_relative_path"] == file_reference.source_file_relative_path
239+
assert (
240+
record_data["source_file_relative_path"] == file_reference.source_file_relative_path
241+
)
236242
assert record_data["file_size_bytes"] == file_reference.file_size_bytes
237243

238244
def test_discover_article_attachments(self) -> None:

0 commit comments

Comments
 (0)