Skip to content

Commit b37b979

Browse files
committed
Update description
1 parent 8eabfca commit b37b979

File tree

2 files changed

+60
-40
lines changed

2 files changed

+60
-40
lines changed

airbyte_cdk/sources/declarative/declarative_component_schema.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1422,7 +1422,9 @@ definitions:
14221422
schema_loader:
14231423
title: Schema Loader
14241424
description:
1425-
Component used to retrieve the schema for the current stream.
1425+
One or many schema loaders can be used to retrieve the schema for the current stream. When
1426+
multiple schema loaders are defined, schema properties will be merged together. Schema
1427+
loaders defined first taking precedence in the event of a conflict.
14261428
anyOf:
14271429
- "$ref": "#/definitions/InlineSchemaLoader"
14281430
- "$ref": "#/definitions/DynamicSchemaLoader"

airbyte_cdk/sources/declarative/models/declarative_component_schema.py

Lines changed: 57 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,24 +1126,28 @@ class OAuthConfigSpecification(BaseModel):
11261126
class Config:
11271127
extra = Extra.allow
11281128

1129-
oauth_user_input_from_connector_config_specification: Optional[Dict[str, Any]] = Field(
1130-
None,
1131-
description="OAuth specific blob. This is a Json Schema used to validate Json configurations used as input to OAuth.\nMust be a valid non-nested JSON that refers to properties from ConnectorSpecification.connectionSpecification\nusing special annotation 'path_in_connector_config'.\nThese are input values the user is entering through the UI to authenticate to the connector, that might also shared\nas inputs for syncing data via the connector.\nExamples:\nif no connector values is shared during oauth flow, oauth_user_input_from_connector_config_specification=[]\nif connector values such as 'app_id' inside the top level are used to generate the API url for the oauth flow,\n oauth_user_input_from_connector_config_specification={\n app_id: {\n type: string\n path_in_connector_config: ['app_id']\n }\n }\nif connector values such as 'info.app_id' nested inside another object are used to generate the API url for the oauth flow,\n oauth_user_input_from_connector_config_specification={\n app_id: {\n type: string\n path_in_connector_config: ['info', 'app_id']\n }\n }",
1132-
examples=[
1133-
{"app_id": {"type": "string", "path_in_connector_config": ["app_id"]}},
1134-
{
1135-
"app_id": {
1136-
"type": "string",
1137-
"path_in_connector_config": ["info", "app_id"],
1138-
}
1139-
},
1140-
],
1141-
title="OAuth user input",
1129+
oauth_user_input_from_connector_config_specification: Optional[Dict[str, Any]] = (
1130+
Field(
1131+
None,
1132+
description="OAuth specific blob. This is a Json Schema used to validate Json configurations used as input to OAuth.\nMust be a valid non-nested JSON that refers to properties from ConnectorSpecification.connectionSpecification\nusing special annotation 'path_in_connector_config'.\nThese are input values the user is entering through the UI to authenticate to the connector, that might also shared\nas inputs for syncing data via the connector.\nExamples:\nif no connector values is shared during oauth flow, oauth_user_input_from_connector_config_specification=[]\nif connector values such as 'app_id' inside the top level are used to generate the API url for the oauth flow,\n oauth_user_input_from_connector_config_specification={\n app_id: {\n type: string\n path_in_connector_config: ['app_id']\n }\n }\nif connector values such as 'info.app_id' nested inside another object are used to generate the API url for the oauth flow,\n oauth_user_input_from_connector_config_specification={\n app_id: {\n type: string\n path_in_connector_config: ['info', 'app_id']\n }\n }",
1133+
examples=[
1134+
{"app_id": {"type": "string", "path_in_connector_config": ["app_id"]}},
1135+
{
1136+
"app_id": {
1137+
"type": "string",
1138+
"path_in_connector_config": ["info", "app_id"],
1139+
}
1140+
},
1141+
],
1142+
title="OAuth user input",
1143+
)
11421144
)
1143-
oauth_connector_input_specification: Optional[OauthConnectorInputSpecification] = Field(
1144-
None,
1145-
description='The DeclarativeOAuth specific blob.\nPertains to the fields defined by the connector relating to the OAuth flow.\n\nInterpolation capabilities:\n- The variables placeholders are declared as `{{my_var}}`.\n- The nested resolution variables like `{{ {{my_nested_var}} }}` is allowed as well.\n\n- The allowed interpolation context is:\n + base64Encoder - encode to `base64`, {{ {{my_var_a}}:{{my_var_b}} | base64Encoder }}\n + base64Decorer - decode from `base64` encoded string, {{ {{my_string_variable_or_string_value}} | base64Decoder }}\n + urlEncoder - encode the input string to URL-like format, {{ https://test.host.com/endpoint | urlEncoder}}\n + urlDecorer - decode the input url-encoded string into text format, {{ urlDecoder:https%3A%2F%2Fairbyte.io | urlDecoder}}\n + codeChallengeS256 - get the `codeChallenge` encoded value to provide additional data-provider specific authorisation values, {{ {{state_value}} | codeChallengeS256 }}\n\nExamples:\n - The TikTok Marketing DeclarativeOAuth spec:\n {\n "oauth_connector_input_specification": {\n "type": "object",\n "additionalProperties": false,\n "properties": {\n "consent_url": "https://ads.tiktok.com/marketing_api/auth?{{client_id_key}}={{client_id_value}}&{{redirect_uri_key}}={{ {{redirect_uri_value}} | urlEncoder}}&{{state_key}}={{state_value}}",\n "access_token_url": "https://business-api.tiktok.com/open_api/v1.3/oauth2/access_token/",\n "access_token_params": {\n "{{ auth_code_key }}": "{{ auth_code_value }}",\n "{{ client_id_key }}": "{{ client_id_value }}",\n "{{ client_secret_key }}": "{{ client_secret_value }}"\n },\n "access_token_headers": {\n "Content-Type": "application/json",\n "Accept": "application/json"\n },\n "extract_output": ["data.access_token"],\n "client_id_key": "app_id",\n "client_secret_key": "secret",\n "auth_code_key": "auth_code"\n }\n }\n }',
1146-
title="DeclarativeOAuth Connector Specification",
1145+
oauth_connector_input_specification: Optional[OauthConnectorInputSpecification] = (
1146+
Field(
1147+
None,
1148+
description='The DeclarativeOAuth specific blob.\nPertains to the fields defined by the connector relating to the OAuth flow.\n\nInterpolation capabilities:\n- The variables placeholders are declared as `{{my_var}}`.\n- The nested resolution variables like `{{ {{my_nested_var}} }}` is allowed as well.\n\n- The allowed interpolation context is:\n + base64Encoder - encode to `base64`, {{ {{my_var_a}}:{{my_var_b}} | base64Encoder }}\n + base64Decorer - decode from `base64` encoded string, {{ {{my_string_variable_or_string_value}} | base64Decoder }}\n + urlEncoder - encode the input string to URL-like format, {{ https://test.host.com/endpoint | urlEncoder}}\n + urlDecorer - decode the input url-encoded string into text format, {{ urlDecoder:https%3A%2F%2Fairbyte.io | urlDecoder}}\n + codeChallengeS256 - get the `codeChallenge` encoded value to provide additional data-provider specific authorisation values, {{ {{state_value}} | codeChallengeS256 }}\n\nExamples:\n - The TikTok Marketing DeclarativeOAuth spec:\n {\n "oauth_connector_input_specification": {\n "type": "object",\n "additionalProperties": false,\n "properties": {\n "consent_url": "https://ads.tiktok.com/marketing_api/auth?{{client_id_key}}={{client_id_value}}&{{redirect_uri_key}}={{ {{redirect_uri_value}} | urlEncoder}}&{{state_key}}={{state_value}}",\n "access_token_url": "https://business-api.tiktok.com/open_api/v1.3/oauth2/access_token/",\n "access_token_params": {\n "{{ auth_code_key }}": "{{ auth_code_value }}",\n "{{ client_id_key }}": "{{ client_id_value }}",\n "{{ client_secret_key }}": "{{ client_secret_value }}"\n },\n "access_token_headers": {\n "Content-Type": "application/json",\n "Accept": "application/json"\n },\n "extract_output": ["data.access_token"],\n "client_id_key": "app_id",\n "client_secret_key": "secret",\n "auth_code_key": "auth_code"\n }\n }\n }',
1149+
title="DeclarativeOAuth Connector Specification",
1150+
)
11471151
)
11481152
complete_oauth_output_specification: Optional[Dict[str, Any]] = Field(
11491153
None,
@@ -1161,7 +1165,9 @@ class Config:
11611165
complete_oauth_server_input_specification: Optional[Dict[str, Any]] = Field(
11621166
None,
11631167
description="OAuth specific blob. This is a Json Schema used to validate Json configurations persisted as Airbyte Server configurations.\nMust be a valid non-nested JSON describing additional fields configured by the Airbyte Instance or Workspace Admins to be used by the\nserver when completing an OAuth flow (typically exchanging an auth code for refresh token).\nExamples:\n complete_oauth_server_input_specification={\n client_id: {\n type: string\n },\n client_secret: {\n type: string\n }\n }",
1164-
examples=[{"client_id": {"type": "string"}, "client_secret": {"type": "string"}}],
1168+
examples=[
1169+
{"client_id": {"type": "string"}, "client_secret": {"type": "string"}}
1170+
],
11651171
title="OAuth input specification",
11661172
)
11671173
complete_oauth_server_output_specification: Optional[Dict[str, Any]] = Field(
@@ -1887,7 +1893,9 @@ class RecordSelector(BaseModel):
18871893
description="Responsible for filtering records to be emitted by the Source.",
18881894
title="Record Filter",
18891895
)
1890-
schema_normalization: Optional[Union[SchemaNormalization, CustomSchemaNormalization]] = Field(
1896+
schema_normalization: Optional[
1897+
Union[SchemaNormalization, CustomSchemaNormalization]
1898+
] = Field(
18911899
None,
18921900
description="Responsible for normalization according to the schema.",
18931901
title="Schema Normalization",
@@ -2133,7 +2141,9 @@ class Config:
21332141
extra = Extra.allow
21342142

21352143
type: Literal["DeclarativeStream"]
2136-
name: Optional[str] = Field("", description="The stream name.", example=["Users"], title="Name")
2144+
name: Optional[str] = Field(
2145+
"", description="The stream name.", example=["Users"], title="Name"
2146+
)
21372147
retriever: Union[SimpleRetriever, AsyncRetriever, CustomRetriever] = Field(
21382148
...,
21392149
description="Component used to coordinate how records are extracted across stream slices and request pages.",
@@ -2164,7 +2174,7 @@ class Config:
21642174
]
21652175
] = Field(
21662176
None,
2167-
description="Component used to retrieve the schema for the current stream.",
2177+
description="One or many schema loaders can be used to retrieve the schema for the current stream. When multiple schema loaders are defined, schema properties will be merged together. Schema loaders defined first taking precedence in the event of a conflict.",
21682178
title="Schema Loader",
21692179
)
21702180
transformations: Optional[
@@ -2311,18 +2321,20 @@ class HttpRequester(BaseModelWithDeprecations):
23112321
description="Allows for retrieving a dynamic set of properties from an API endpoint which can be injected into outbound request using the stream_partition.extra_fields.",
23122322
title="Fetch Properties from Endpoint",
23132323
)
2314-
request_parameters: Optional[Union[Dict[str, Union[str, QueryProperties]], str]] = Field(
2315-
None,
2316-
description="Specifies the query parameters that should be set on an outgoing HTTP request given the inputs.",
2317-
examples=[
2318-
{"unit": "day"},
2319-
{
2320-
"query": 'last_event_time BETWEEN TIMESTAMP "{{ stream_interval.start_time }}" AND TIMESTAMP "{{ stream_interval.end_time }}"'
2321-
},
2322-
{"searchIn": "{{ ','.join(config.get('search_in', [])) }}"},
2323-
{"sort_by[asc]": "updated_at"},
2324-
],
2325-
title="Query Parameters",
2324+
request_parameters: Optional[Union[Dict[str, Union[str, QueryProperties]], str]] = (
2325+
Field(
2326+
None,
2327+
description="Specifies the query parameters that should be set on an outgoing HTTP request given the inputs.",
2328+
examples=[
2329+
{"unit": "day"},
2330+
{
2331+
"query": 'last_event_time BETWEEN TIMESTAMP "{{ stream_interval.start_time }}" AND TIMESTAMP "{{ stream_interval.end_time }}"'
2332+
},
2333+
{"searchIn": "{{ ','.join(config.get('search_in', [])) }}"},
2334+
{"sort_by[asc]": "updated_at"},
2335+
],
2336+
title="Query Parameters",
2337+
)
23262338
)
23272339
request_headers: Optional[Union[Dict[str, str], str]] = Field(
23282340
None,
@@ -2517,7 +2529,9 @@ class QueryProperties(BaseModel):
25172529

25182530
class StateDelegatingStream(BaseModel):
25192531
type: Literal["StateDelegatingStream"]
2520-
name: str = Field(..., description="The stream name.", example=["Users"], title="Name")
2532+
name: str = Field(
2533+
..., description="The stream name.", example=["Users"], title="Name"
2534+
)
25212535
full_refresh_stream: DeclarativeStream = Field(
25222536
...,
25232537
description="Component used to coordinate how records are extracted across stream slices and request pages when the state is empty or not provided.",
@@ -2606,7 +2620,9 @@ class AsyncRetriever(BaseModel):
26062620
)
26072621
download_extractor: Optional[
26082622
Union[DpathExtractor, CustomRecordExtractor, ResponseToFileExtractor]
2609-
] = Field(None, description="Responsible for fetching the records from provided urls.")
2623+
] = Field(
2624+
None, description="Responsible for fetching the records from provided urls."
2625+
)
26102626
creation_requester: Union[HttpRequester, CustomRequester] = Field(
26112627
...,
26122628
description="Requester component that describes how to prepare HTTP requests to send to the source API to create the async server-side job.",
@@ -2746,10 +2762,12 @@ class DynamicDeclarativeStream(BaseModel):
27462762
stream_template: DeclarativeStream = Field(
27472763
..., description="Reference to the stream template.", title="Stream Template"
27482764
)
2749-
components_resolver: Union[HttpComponentsResolver, ConfigComponentsResolver] = Field(
2750-
...,
2751-
description="Component resolve and populates stream templates with components values.",
2752-
title="Components Resolver",
2765+
components_resolver: Union[HttpComponentsResolver, ConfigComponentsResolver] = (
2766+
Field(
2767+
...,
2768+
description="Component resolve and populates stream templates with components values.",
2769+
title="Components Resolver",
2770+
)
27532771
)
27542772

27552773

0 commit comments

Comments
 (0)