Skip to content

🐛 Source S3: fix exception when setting CSV stream delimiter to \t. #35246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Feb 23, 2024
Merged

🐛 Source S3: fix exception when setting CSV stream delimiter to \t. #35246

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6ce99e5
fix: Resolves bug in s3 source that did not support tab as a delimiter.
dtiesling Feb 13, 2024
ad5014f
Update metadata and changelog.
dtiesling Feb 14, 2024
e1525c2
Updates the pyproject.toml
dtiesling Feb 15, 2024
b2fc155
Fixes typo in changelog.
dtiesling Feb 15, 2024
ab618f0
Merge branch 'master' into dtiesling/source-s3-csv-tab-delimiter-fix
dtiesling Feb 15, 2024
285f5b9
Merge branch 'master' into dtiesling/source-s3-csv-tab-delimiter-fix
dtiesling Feb 16, 2024
aa5edb7
Merge branch 'master' into dtiesling/source-s3-csv-tab-delimiter-fix
dtiesling Feb 16, 2024
8c61876
Ups version number.
dtiesling Feb 16, 2024
726ef6c
Merge branch 'master' into dtiesling/source-s3-csv-tab-delimiter-fix
marcosmarxm Feb 16, 2024
e7077f3
format files
marcosmarxm Feb 16, 2024
440f681
Moves TSV test to better location.
dtiesling Feb 21, 2024
edeab72
Merge branch 'master' into dtiesling/source-s3-csv-tab-delimiter-fix
dtiesling Feb 21, 2024
5f81791
Ups version to 4.5.6
dtiesling Feb 21, 2024
93eac79
Merge branch 'master' into dtiesling/source-s3-csv-tab-delimiter-fix
marcosmarxm Feb 23, 2024
312003e
run format
marcosmarxm Feb 23, 2024
70f727b
add line
marcosmarxm Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions airbyte-cdk/python/airbyte_cdk/sources/file_based/config/csv_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,8 @@ class Config(OneOfOptionConfig):

@validator("delimiter")
def validate_delimiter(cls, v: str) -> str:
if v == r'\t':
return v
if len(v) != 1:
raise ValueError("delimiter should only be one character")
if v in {"\r", "\n"}:
Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-s3/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ data:
connectorSubtype: file
connectorType: source
definitionId: 69589781-7828-43c5-9f63-8925b1c1ccc2
dockerImageTag: 4.5.3
dockerImageTag: 4.5.4
dockerRepository: airbyte/source-s3
documentationUrl: https://docs.airbyte.com/integrations/sources/s3
githubIssueLabel: source-s3
Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-s3/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ requires = [ "poetry-core>=1.0.0",]
build-backend = "poetry.core.masonry.api"

[tool.poetry]
version = "4.5.3"
version = "4.5.4"
name = "source-s3"
description = "Source implementation for S3."
authors = [ "Airbyte <[email protected]>",]
Expand Down
4 changes: 4 additions & 0 deletions airbyte-integrations/connectors/source-s3/unit_tests/v4/test_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
from airbyte_cdk.sources.file_based.config.csv_format import CsvFormat
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for including a test!


def test_csv_format_tab_delimited():
assert CsvFormat(delimiter=r"\t").delimiter == '\\t'
3 changes: 2 additions & 1 deletion docs/integrations/sources/s3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,8 @@ To perform the text extraction from PDF and Docx files, the connector uses the [

| Version | Date | Pull Request | Subject |
|:--------|:-----------|:----------------------------------------------------------------------------------------------------------------|:---------------------------------------------------------------------------------------------------------------------|
| 4.5.3 | 2024-02-12 | [35164](https://github.com/airbytehq/airbyte/pull/35164) | Manage dependencies with Poetry. |
| 4.5.4 | 2024-02-15 | [35246](https://github.com/airbytehq/airbyte/pull/35246) | Fixes bug that occurred when creating CSV streams with tab delimiter. |
| 4.5.3 | 2024-02-12 | [35164](https://github.com/airbytehq/airbyte/pull/35164) | Manage dependencies with Poetry. |
| 4.5.2 | 2024-02-06 | [34930](https://github.com/airbytehq/airbyte/pull/34930) | Bump CDK version to fix issue when SyncMode is missing from catalog |
| 4.5.1 | 2024-02-02 | [31701](https://github.com/airbytehq/airbyte/pull/31701) | Add `region` support |
| 4.5.0 | 2024-02-01 | [34591](https://github.com/airbytehq/airbyte/pull/34591) | Run full refresh syncs concurrently |
Expand Down