Skip to content
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

Normalization: handle non-object top-level schemas; treat binary data as string #22165

Merged
merged 8 commits into from
Jan 31, 2023
+27 −13
Merged

Normalization: handle non-object top-level schemas; treat binary data as string #22165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
96c4e2f
handle dumb top-level schemas
edgao Jan 31, 2023
9986fb1
version bump
edgao Jan 31, 2023
2b9a651
also definitions
edgao Jan 31, 2023
01c0da1
treat binary as string
edgao Jan 31, 2023
bb73a1f
fallback case
edgao Jan 31, 2023
255280a
format
edgao Jan 31, 2023
431f8c9
Merge branch 'master' into edgao/fixes
edgao Jan 31, 2023
cf2a30d
new variable
edgao Jan 31, 2023
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
18 changes: 9 additions & 9 deletions airbyte-config/init/src/main/resources/seed/destination_definitions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
icon: bigquery.svg
normalizationConfig:
normalizationRepository: airbyte/normalization
normalizationTag: 0.3.1
normalizationTag: 0.3.2
normalizationIntegrationType: bigquery
supportsDbt: true
resourceRequirements:
Expand Down Expand Up @@ -91,7 +91,7 @@
releaseStage: alpha
normalizationConfig:
normalizationRepository: airbyte/normalization-clickhouse
normalizationTag: 0.3.1
normalizationTag: 0.3.2
normalizationIntegrationType: clickhouse
supportsDbt: true
- name: Cloudflare R2
Expand Down Expand Up @@ -213,7 +213,7 @@
releaseStage: alpha
normalizationConfig:
normalizationRepository: airbyte/normalization-mssql
normalizationTag: 0.3.1
normalizationTag: 0.3.2
normalizationIntegrationType: mssql
supportsDbt: true
- name: MeiliSearch
Expand All @@ -239,7 +239,7 @@
releaseStage: alpha
normalizationConfig:
normalizationRepository: airbyte/normalization-mysql
normalizationTag: 0.3.1
normalizationTag: 0.3.2
normalizationIntegrationType: mysql
supportsDbt: true
- name: Oracle
Expand All @@ -251,7 +251,7 @@
releaseStage: alpha
normalizationConfig:
normalizationRepository: airbyte/normalization-oracle
normalizationTag: 0.3.1
normalizationTag: 0.3.2
normalizationIntegrationType: oracle
supportsDbt: true
- name: Postgres
Expand All @@ -263,7 +263,7 @@
releaseStage: alpha
normalizationConfig:
normalizationRepository: airbyte/normalization
normalizationTag: 0.3.1
normalizationTag: 0.3.2
normalizationIntegrationType: postgres
supportsDbt: true
- name: Pulsar
Expand Down Expand Up @@ -295,7 +295,7 @@
icon: redshift.svg
normalizationConfig:
normalizationRepository: airbyte/normalization-redshift
normalizationTag: 0.3.1
normalizationTag: 0.3.2
normalizationIntegrationType: redshift
supportsDbt: true
resourceRequirements:
Expand Down Expand Up @@ -353,7 +353,7 @@
icon: snowflake.svg
normalizationConfig:
normalizationRepository: airbyte/normalization-snowflake
normalizationTag: 0.3.1
normalizationTag: 0.3.2
normalizationIntegrationType: snowflake
supportsDbt: true
resourceRequirements:
Expand Down Expand Up @@ -407,7 +407,7 @@
releaseStage: alpha
normalizationConfig:
normalizationRepository: airbyte/normalization-tidb
normalizationTag: 0.3.1
normalizationTag: 0.3.2
normalizationIntegrationType: tidb
supportsDbt: true
- name: Typesense
Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/bases/base-normalization/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ WORKDIR /airbyte
ENV AIRBYTE_ENTRYPOINT "/airbyte/entrypoint.sh"
ENTRYPOINT ["/airbyte/entrypoint.sh"]

LABEL io.airbyte.version=0.3.1
LABEL io.airbyte.version=0.3.2
LABEL io.airbyte.name=airbyte/normalization
12 changes: 11 additions & 1 deletion ...ntegrations/bases/base-normalization/normalization/transform_catalog/catalog_processor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,17 @@ def build_stream_processor(
primary_key = get_field(configured_stream, "primary_key", f"Undefined primary key for stream {stream_name}")

message = f"'json_schema'.'properties' are not defined for stream {stream_name}"
properties = get_field(get_field(stream_config, "json_schema", message), "properties", message)
stream_schema = get_field(stream_config, "json_schema", f"'json_schema' is not defined for stream {stream_name}")
if "properties" in stream_schema:
properties = get_field(stream_schema, "properties", message)
elif "oneOf" in stream_schema:
options = list(filter(lambda option: "properties" in option, stream_schema["oneOf"]))
if len(options) == 0:
raise KeyError(f"Stream {stream_name} does not have any properties")
grishick marked this conversation as resolved.
Show resolved Hide resolved
# If there are multiple oneOf options, just pick the first one - we don't really support oneOf to begin with
grishick marked this conversation as resolved.
Show resolved Hide resolved
properties = options[0]["properties"]
else:
raise KeyError(f"Stream {stream_name} does not have any properties and no oneOf option with properties")

from_table = dbt_macro.Source(schema_name, raw_table_name)

Expand Down
7 changes: 5 additions & 2 deletions airbyte-integrations/bases/base-normalization/normalization/transform_catalog/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,14 @@ def is_reftype(definition: dict) -> bool:


def is_string(definition: dict) -> bool:
return is_type_included(definition, get_reftype_function(data_type.STRING_TYPE))
return is_type_included(definition, get_reftype_function(data_type.STRING_TYPE)) or is_type_included(
definition, get_reftype_function(data_type.BINARY_DATA_TYPE)
)


def is_binary_datatype(definition: dict) -> bool:
return is_type_included(definition, get_reftype_function(data_type.BINARY_DATA_TYPE))
return False
# return is_type_included(definition, get_reftype_function(data_type.BINARY_DATA_TYPE))


def is_datetime(definition: dict) -> bool:
Expand Down
1 change: 1 addition & 0 deletions docs/understanding-airbyte/basic-normalization.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,7 @@ Therefore, in order to "upgrade" to the desired normalization version, you need

| Airbyte Version | Normalization Version | Date | Pull Request | Subject |
|:----------------|:----------------------|:-----------|:-------------------------------------------------------------------------------------------------------------------------------------|:---------------------------------------------------------------------------------------------------------------------|
| | 0.3.2 | 2023-01-31 | [\#22165](https://github.com/airbytehq/airbyte/pull/22165) | Fix support for non-object top-level schemas |
| | 0.3.1 | 2023-01-31 | [\#22161](https://github.com/airbytehq/airbyte/pull/22161) | Fix handling for combined primitive types |
| | 0.3.0 | 2023-01-30 | [\#19721](https://github.com/airbytehq/airbyte/pull/19721) | Update normalization to airbyte-protocol v1.0.0 |
| | 0.2.25 | 2022-12-05 | [\#19573](https://github.com/airbytehq/airbyte/pull/19573) | Update Clickhouse dbt version |
Expand Down