Skip to content

Commit e7ccead

Browse files
committed
Update models
1 parent e1c7658 commit e7ccead

File tree

1 file changed

+62
-28
lines changed

1 file changed

+62
-28
lines changed

airbyte_cdk/sources/declarative/models/declarative_component_schema.py

Lines changed: 62 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,9 @@ class OAuthAuthenticator(BaseModel):
609609
scopes: Optional[List[str]] = Field(
610610
None,
611611
description="List of scopes that should be granted to the access token.",
612-
examples=[["crm.list.read", "crm.objects.contacts.read", "crm.schema.contacts.read"]],
612+
examples=[
613+
["crm.list.read", "crm.objects.contacts.read", "crm.schema.contacts.read"]
614+
],
613615
title="Scopes",
614616
)
615617
token_expiry_date: Optional[str] = Field(
@@ -1078,24 +1080,28 @@ class OAuthConfigSpecification(BaseModel):
10781080
class Config:
10791081
extra = Extra.allow
10801082

1081-
oauth_user_input_from_connector_config_specification: Optional[Dict[str, Any]] = Field(
1082-
None,
1083-
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 }",
1084-
examples=[
1085-
{"app_id": {"type": "string", "path_in_connector_config": ["app_id"]}},
1086-
{
1087-
"app_id": {
1088-
"type": "string",
1089-
"path_in_connector_config": ["info", "app_id"],
1090-
}
1091-
},
1092-
],
1093-
title="OAuth user input",
1083+
oauth_user_input_from_connector_config_specification: Optional[Dict[str, Any]] = (
1084+
Field(
1085+
None,
1086+
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 }",
1087+
examples=[
1088+
{"app_id": {"type": "string", "path_in_connector_config": ["app_id"]}},
1089+
{
1090+
"app_id": {
1091+
"type": "string",
1092+
"path_in_connector_config": ["info", "app_id"],
1093+
}
1094+
},
1095+
],
1096+
title="OAuth user input",
1097+
)
10941098
)
1095-
oauth_connector_input_specification: Optional[OauthConnectorInputSpecification] = Field(
1096-
None,
1097-
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 }',
1098-
title="DeclarativeOAuth Connector Specification",
1099+
oauth_connector_input_specification: Optional[OauthConnectorInputSpecification] = (
1100+
Field(
1101+
None,
1102+
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 }',
1103+
title="DeclarativeOAuth Connector Specification",
1104+
)
10991105
)
11001106
complete_oauth_output_specification: Optional[Dict[str, Any]] = Field(
11011107
None,
@@ -1113,7 +1119,9 @@ class Config:
11131119
complete_oauth_server_input_specification: Optional[Dict[str, Any]] = Field(
11141120
None,
11151121
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 }",
1116-
examples=[{"client_id": {"type": "string"}, "client_secret": {"type": "string"}}],
1122+
examples=[
1123+
{"client_id": {"type": "string"}, "client_secret": {"type": "string"}}
1124+
],
11171125
title="OAuth input specification",
11181126
)
11191127
complete_oauth_server_output_specification: Optional[Dict[str, Any]] = Field(
@@ -1460,6 +1468,16 @@ class AddFields(BaseModel):
14601468
description="List of transformations (path and corresponding value) that will be added to the record.",
14611469
title="Fields",
14621470
)
1471+
condition: Optional[str] = Field(
1472+
"",
1473+
description="Fields will be added if expression is evaluated to True.,",
1474+
examples=[
1475+
"{{ property|string == '' }}",
1476+
"{{ property is integer }}",
1477+
"{{ property|length > 5 }}",
1478+
"{{ property == 'some_string_to_match' }}",
1479+
],
1480+
)
14631481
parameters: Optional[Dict[str, Any]] = Field(None, alias="$parameters")
14641482

14651483

@@ -1766,7 +1784,9 @@ class RecordSelector(BaseModel):
17661784
description="Responsible for filtering records to be emitted by the Source.",
17671785
title="Record Filter",
17681786
)
1769-
schema_normalization: Optional[Union[SchemaNormalization, CustomSchemaNormalization]] = Field(
1787+
schema_normalization: Optional[
1788+
Union[SchemaNormalization, CustomSchemaNormalization]
1789+
] = Field(
17701790
SchemaNormalization.None_,
17711791
description="Responsible for normalization according to the schema.",
17721792
title="Schema Normalization",
@@ -1977,7 +1997,9 @@ class Config:
19771997
description="Component used to fetch data incrementally based on a time field in the data.",
19781998
title="Incremental Sync",
19791999
)
1980-
name: Optional[str] = Field("", description="The stream name.", example=["Users"], title="Name")
2000+
name: Optional[str] = Field(
2001+
"", description="The stream name.", example=["Users"], title="Name"
2002+
)
19812003
primary_key: Optional[PrimaryKey] = Field(
19822004
"", description="The primary key of the stream.", title="Primary Key"
19832005
)
@@ -2251,7 +2273,11 @@ class SimpleRetriever(BaseModel):
22512273
CustomPartitionRouter,
22522274
ListPartitionRouter,
22532275
SubstreamPartitionRouter,
2254-
List[Union[CustomPartitionRouter, ListPartitionRouter, SubstreamPartitionRouter]],
2276+
List[
2277+
Union[
2278+
CustomPartitionRouter, ListPartitionRouter, SubstreamPartitionRouter
2279+
]
2280+
],
22552281
]
22562282
] = Field(
22572283
[],
@@ -2295,7 +2321,9 @@ class AsyncRetriever(BaseModel):
22952321
)
22962322
download_extractor: Optional[
22972323
Union[CustomRecordExtractor, DpathExtractor, ResponseToFileExtractor]
2298-
] = Field(None, description="Responsible for fetching the records from provided urls.")
2324+
] = Field(
2325+
None, description="Responsible for fetching the records from provided urls."
2326+
)
22992327
creation_requester: Union[CustomRequester, HttpRequester] = Field(
23002328
...,
23012329
description="Requester component that describes how to prepare HTTP requests to send to the source API to create the async server-side job.",
@@ -2329,7 +2357,11 @@ class AsyncRetriever(BaseModel):
23292357
CustomPartitionRouter,
23302358
ListPartitionRouter,
23312359
SubstreamPartitionRouter,
2332-
List[Union[CustomPartitionRouter, ListPartitionRouter, SubstreamPartitionRouter]],
2360+
List[
2361+
Union[
2362+
CustomPartitionRouter, ListPartitionRouter, SubstreamPartitionRouter
2363+
]
2364+
],
23332365
]
23342366
] = Field(
23352367
[],
@@ -2397,10 +2429,12 @@ class DynamicDeclarativeStream(BaseModel):
23972429
stream_template: DeclarativeStream = Field(
23982430
..., description="Reference to the stream template.", title="Stream Template"
23992431
)
2400-
components_resolver: Union[HttpComponentsResolver, ConfigComponentsResolver] = Field(
2401-
...,
2402-
description="Component resolve and populates stream templates with components values.",
2403-
title="Components Resolver",
2432+
components_resolver: Union[HttpComponentsResolver, ConfigComponentsResolver] = (
2433+
Field(
2434+
...,
2435+
description="Component resolve and populates stream templates with components values.",
2436+
title="Components Resolver",
2437+
)
24042438
)
24052439

24062440

0 commit comments

Comments
 (0)