Skip to content

Commit be25429

Browse files
committed
Merge branch 'ac8/file-api/connector-builder-support-3' into ac8/file-api/handle-include-files
2 parents 9b81b74 + bc4c7d6 commit be25429

File tree

1 file changed

+20
-26
lines changed

1 file changed

+20
-26
lines changed

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

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ class DefaultFileUploader(FileUploader):
4343
parameters: InitVar[Mapping[str, Any]]
4444

4545
filename_extractor: Optional[Union[InterpolatedString, str]] = None
46-
content_extractor: Optional[RecordExtractor] = None
4746

4847
def __post_init__(self, parameters: Mapping[str, Any]) -> None:
4948
if self.filename_extractor:
@@ -71,33 +70,28 @@ def upload(self, record: Record) -> None:
7170
),
7271
)
7372

74-
if self.content_extractor:
75-
raise NotImplementedError(
76-
"Content extraction is not yet implemented. The content_extractor component is currently not supported."
77-
)
78-
else:
79-
files_directory = Path(get_files_directory())
73+
files_directory = Path(get_files_directory())
8074

81-
file_name = (
82-
self.filename_extractor.eval(self.config, record=record)
83-
if self.filename_extractor
84-
else str(uuid.uuid4())
85-
)
86-
file_name = file_name.lstrip("/")
87-
file_relative_path = Path(record.stream_name) / Path(file_name)
75+
file_name = (
76+
self.filename_extractor.eval(self.config, record=record)
77+
if self.filename_extractor
78+
else str(uuid.uuid4())
79+
)
80+
file_name = file_name.lstrip("/")
81+
file_relative_path = Path(record.stream_name) / Path(file_name)
8882

89-
full_path = files_directory / file_relative_path
90-
full_path.parent.mkdir(parents=True, exist_ok=True)
83+
full_path = files_directory / file_relative_path
84+
full_path.parent.mkdir(parents=True, exist_ok=True)
9185

92-
file_size_bytes = self.file_writer.write(full_path, content=response.content)
86+
file_size_bytes = self.file_writer.write(full_path, content=response.content)
9387

94-
logger.info("File uploaded successfully")
95-
logger.info(f"File url: {str(full_path)}")
96-
logger.info(f"File size: {file_size_bytes / 1024} KB")
97-
logger.info(f"File relative path: {str(file_relative_path)}")
88+
logger.info("File uploaded successfully")
89+
logger.info(f"File url: {str(full_path)}")
90+
logger.info(f"File size: {file_size_bytes / 1024} KB")
91+
logger.info(f"File relative path: {str(file_relative_path)}")
9892

99-
record.file_reference = AirbyteRecordMessageFileReference(
100-
staging_file_url=str(full_path),
101-
source_file_relative_path=str(file_relative_path),
102-
file_size_bytes=file_size_bytes,
103-
)
93+
record.file_reference = AirbyteRecordMessageFileReference(
94+
staging_file_url=str(full_path),
95+
source_file_relative_path=str(file_relative_path),
96+
file_size_bytes=file_size_bytes,
97+
)

0 commit comments

Comments
 (0)