From 9b9d2333170d5721f7e53a0e5bbbd7c70f1ed374 Mon Sep 17 00:00:00 2001 From: brianjlai Date: Tue, 20 Dec 2022 16:19:45 -0800 Subject: [PATCH] remove the extra yaml manifest committed and regenerate models w/ latest schema updates --- .../low_code_component_schema.yaml | 918 ------------------ .../sources/declarative/models/__init__.py | 1 - .../models/declarative_component_schema.py | 6 +- 3 files changed, 3 insertions(+), 922 deletions(-) delete mode 100644 airbyte-cdk/python/airbyte_cdk/sources/declarative/low_code_component_schema.yaml diff --git a/airbyte-cdk/python/airbyte_cdk/sources/declarative/low_code_component_schema.yaml b/airbyte-cdk/python/airbyte_cdk/sources/declarative/low_code_component_schema.yaml deleted file mode 100644 index 02fdc9d3b24b..000000000000 --- a/airbyte-cdk/python/airbyte_cdk/sources/declarative/low_code_component_schema.yaml +++ /dev/null @@ -1,918 +0,0 @@ -"$schema": http://json-schema.org/draft-07/schema# -"$id": https://github.com/airbytehq/airbyte/blob/master/airbyte-cdk/python/airbyte_cdk/sources/declarative/handwritten_manifest.yaml -title: LowCodeComponentManifest -type: object -description: Low Code connector components -version: 1.0.0 -required: - - check - - streams - - version -properties: - check: - "$ref": "#/definitions/CheckStream" - streams: - type: array - items: - "$ref": "#/definitions/DeclarativeStream" - version: - type: string - spec: - "$ref": "#/definitions/Spec" -definitions: - AddedFieldDefinition: - description: Defines the field to add on a record - type: object - required: - - type - - path - - value - properties: - type: - enum: [AddedFieldDefinition] - path: - type: array - items: - type: string - value: - type: string - AddFields: - description: Transformation which adds field to an output record. The path of the added field can be nested. - type: object - required: - - type - - fields - properties: - type: - enum: [AddFields] - fields: - type: array - items: - - "$ref": "#/definitions/AddedFieldDefinition" - $options: - type: object - additionalProperties: true - ApiKeyAuthenticator: - description: Authenticator for requests requiring an api token - type: object - required: - - type - - api_token - properties: - type: - enum: [ApiKeyAuthenticator] - api_token: - type: string - header: - type: string - BasicHttpAuthenticator: - description: Authenticator for requests authenticated with a username and optional password - type: object - required: - - type - - username - properties: - type: - enum: [BasicHttpAuthenticator] - username: - type: string - password: - type: string - BearerAuthenticator: - description: Authenticator for requests authenticated with a Bearer token - type: object - required: - - type - - api_token - properties: - type: - enum: [BearerAuthenticator] - api_token: - type: string - CartesianProductStreamSlicer: - description: Stream slicer that iterates over the cartesian product of input stream slicers - type: object - required: - - type - - stream_slicers - properties: - type: - enum: [CartesianProductStreamSlicer] - stream_slicers: - type: array - items: - anyOf: - - "$ref": "#/definitions/CustomStreamSlicer" - - "$ref": "#/definitions/DatetimeStreamSlicer" - - "$ref": "#/definitions/ListStreamSlicer" - - "$ref": "#/definitions/SingleSlice" - - "$ref": "#/definitions/SubstreamSlicer" - $options: - type: object - additionalProperties: true - CheckStream: - description: Checks the connections by trying to read records from one or many of the streams selected by the developer - type: object - required: - - type - - stream_names - properties: - type: - enum: [CheckStream] - stream_names: - type: array - items: - type: string - CompositeErrorHandler: - description: Error handler that sequentially iterates over a list of error handlers - type: object - required: - - error_handlers - properties: - type: - enum: [CompositeErrorHandler] - error_handlers: - type: array - items: - anyOf: - - "$ref": "#/definitions/CompositeErrorHandler" - - "$ref": "#/definitions/DefaultErrorHandler" - $options: - type: object - additionalProperties: true - ConstantBackoffStrategy: - description: Backoff strategy with a constant backoff interval - type: object - required: - - type - - backoff_time_in_seconds - properties: - type: - enum: [ConstantBackoffStrategy] - backoff_time_in_seconds: - anyOf: - - type: number - - type: string - $options: - type: object - additionalProperties: true - CursorPagination: - description: Pagination strategy that evaluates an interpolated string to define the next page token - type: object - required: - - type - - cursor_value - properties: - type: - enum: [CursorPagination] - cursor_value: - type: string - page_size: - type: integer - stop_condition: - type: string - decoder: - "$ref": "#/definitions/JsonDecoder" - $options: - type: object - additionalProperties: true - CustomAuthenticator: - description: Authenticator component whose behavior is derived from a custom code implementation of the connector - type: object - additionalProperties: true - required: - - type - - class_name - properties: - type: - enum: [CustomAuthenticator] - class_name: - type: string - additionalProperties: true - $options: - type: object - additionalProperties: true - CustomBackoffStrategy: - description: Backoff strategy component whose behavior is derived from a custom code implementation of the connector - type: object - additionalProperties: true - required: - - type - - class_name - properties: - type: - enum: [CustomBackoffStrategy] - class_name: - type: string - $options: - type: object - additionalProperties: true - CustomErrorHandler: - description: Error handler component whose behavior is derived from a custom code implementation of the connector - type: object - additionalProperties: true - required: - - type - - class_name - properties: - type: - enum: [CustomErrorHandler] - class_name: - type: string - $options: - type: object - additionalProperties: true - CustomPaginationStrategy: - description: Pagination strategy component whose behavior is derived from a custom code implementation of the connector - type: object - additionalProperties: true - required: - - type - - class_name - properties: - type: - enum: [CustomPaginationStrategy] - class_name: - type: string - $options: - type: object - additionalProperties: true - CustomRecordExtractor: - description: Record extractor component whose behavior is derived from a custom code implementation of the connector - type: object - additionalProperties: true - required: - - type - - class_name - properties: - type: - enum: [CustomRecordExtractor] - class_name: - type: string - $options: - type: object - additionalProperties: true - CustomStreamSlicer: - description: Stream slicer component whose behavior is derived from a custom code implementation of the connector - type: object - additionalProperties: true - required: - - type - - class_name - properties: - type: - enum: [CustomStreamSlicer] - class_name: - type: string - $options: - type: object - additionalProperties: true - DatetimeStreamSlicer: - description: Stream slicer that slices the stream over a datetime range - type: object - required: - - type - - cursor_field - - end_datetime - - datetime_format - - start_datetime - - step - properties: - type: - enum: [DatetimeStreamSlicer] - cursor_field: - type: string - datetime_format: - type: string - end_datetime: - anyOf: - - type: string - - "$ref": "#/definitions/MinMaxDatetime" - start_datetime: - anyOf: - - type: string - - "$ref": "#/definitions/MinMaxDatetime" - step: - type: string - end_time_option: - "$ref": "#/definitions/RequestOption" - lookback_window: - type: string - start_time_option: - "$ref": "#/definitions/RequestOption" - stream_state_field_end: - type: string - stream_state_field_start: - type: string - $options: - type: object - additionalProperties: true - DeclarativeOauth2Authenticator: - description: Authenticator for requests using Oauth authentication - type: object - required: - - type - - client_id - - client_secret - - refresh_token - - token_refresh_endpoint - properties: - type: - enum: [DeclarativeOauth2Authenticator] - client_id: - type: string - client_secret: - type: string - refresh_token: - type: string - token_refresh_endpoint: - type: string - access_token_name: - type: string - expires_in_name: - type: string - grant_type: - type: string - refresh_request_body: - type: object - additionalProperties: true - scopes: - type: array - items: - type: string - token_expiry_date: - type: string - DeclarativeStream: - description: A stream whose behavior is described by a set of declarative low code components - type: object - additionalProperties: true - required: - - type - - retriever - properties: - type: - enum: [DeclarativeStream] - retriever: - "$ref": "#/definitions/SimpleRetriever" - checkpoint_interval: - type: integer - name: - type: string - default: "" - primary_key: - anyOf: - - type: string - - type: array - items: - type: string - - type: array - items: - type: array - items: - type: string - default: "" - schema_loader: - anyOf: - - "$ref": "#/definitions/DefaultSchemaLoader" - - "$ref": "#/definitions/JsonFileSchemaLoader" - stream_cursor_field: - anyOf: - - type: string - - type: array - items: - - type: string - transformations: - type: array - items: - anyOf: - - "$ref": "#/definitions/AddFields" - - "$ref": "#/definitions/RemoveFields" - $options: - type: object - additional_properties: true - DefaultErrorHandler: - description: The default error handler. Default behavior includes only retrying server errors (HTTP 5XX) and too many requests (HTTP 429) with an exponential backoff - type: object - properties: - type: - enum: [DefaultErrorHandler] - backoff_strategies: - type: array - items: - anyOf: - - "$ref": "#/definitions/ConstantBackoffStrategy" - - "$ref": "#/definitions/CustomBackoffStrategy" - - "$ref": "#/definitions/ExponentialBackoffStrategy" - - "$ref": "#/definitions/WaitTimeFromHeaderBackoffStrategy" - - "$ref": "#/definitions/WaitUntilTimeFromHeaderBackoffStrategy" - max_retries: - type: integer - default: 5 - response_filters: - type: array - items: - "$ref": "#/definitions/HttpResponseFilter" - $options: - type: object - additional_properties: true - DefaultPaginator: - description: Default pagination implementation to request pages of results with a fixed size until the pagination strategy no longer returns a next_page_token - type: object - required: - - type - - pagination_strategy - - url_base - properties: - type: - enum: [DefaultPaginator] - pagination_strategy: - anyOf: - - "$ref": "#/definitions/CursorPagination" - - "$ref": "#/definitions/CustomPaginationStrategy" - - "$ref": "#/definitions/OffsetIncrement" - - "$ref": "#/definitions/PageIncrement" - url_base: - type: string - decoder: - "$ref": "#/definitions/JsonDecoder" - page_size_option: - "$ref": "#/definitions/RequestOption" - page_token_option: - "$ref": "#/definitions/RequestOption" - $options: - type: object - additionalProperties: true - DefaultSchemaLoader: - description: Loads a schema from the default location or returns an empty schema for streams that have not defined their schema file yet. - type: object - required: - - type - properties: - type: - enum: [DefaultSchemaLoader] - $options: - type: object - additionalProperties: true - DpathExtractor: - description: Record extractor that searches a decoded response over a path defined as an array of fields - type: object - required: - - type - - field_pointer - properties: - type: - enum: [DpathExtractor] - field_pointer: - type: array - items: - - type: string - decoder: - "$ref": "#/definitions/JsonDecoder" - $options: - type: object - additionalProperties: true - ExponentialBackoffStrategy: - description: Backoff strategy with an exponential backoff interval - type: object - required: - - type - properties: - type: - enum: [ExponentialBackoffStrategy] - factor: - anyOf: - - type: number - - type: string - default: 5 - $options: - type: object - additionalProperties: true - HttpRequester: - description: Default implementation of a requester - type: object - required: - - type - - name - - path - - url_base - properties: - type: - enum: [HttpRequester] - name: - type: string - path: - type: string - url_base: - type: string - authenticator: - anyOf: - - "$ref": "#/definitions/ApiKeyAuthenticator" - - "$ref": "#/definitions/BasicHttpAuthenticator" - - "$ref": "#/definitions/BearerAuthenticator" - - "$ref": "#/definitions/CustomAuthenticator" - - "$ref": "#/definitions/DeclarativeOauth2Authenticator" - - "$ref": "#/definitions/NoAuth" - error_handler: - anyOf: - - "$ref": "#/definitions/DefaultErrorHandler" - - "$ref": "#/definitions/CustomErrorHandler" - - "$ref": "#/definitions/CompositeErrorHandler" - http_method: - anyOf: - - type: string - - type: string - enum: - - GET - - POST - default: GET - request_options_provider: - "$ref": "#/definitions/InterpolatedRequestOptionsProvider" - $options: - type: object - additionalProperties: true - HttpResponseFilter: - description: A filter that is used to select on properties of the HTTP response received - type: object - required: - - action - properties: - type: - enum: [HttpResponseFilter] - action: - type: string - enum: - - SUCCESS - - FAIL - - RETRY - - IGNORE - error_message: - type: string - error_message_contains: - type: string - http_codes: - type: array - items: - type: integer - uniqueItems: true - predicate: - type: string - $options: - type: object - additionalProperties: true - InterpolatedRequestOptionsProvider: - description: Defines the request options to set on an outgoing HTTP request by evaluating `InterpolatedMapping`s - type: object - required: - - type - properties: - type: - enum: [InterpolatedRequestOptionsProvider] - request_body_data: - anyOf: - - type: string - - type: object - additionalProperties: - type: string - request_body_json: - anyOf: - - type: string - - type: object - additionalProperties: - type: string - request_headers: - anyOf: - - type: string - - type: object - additionalProperties: - type: string - request_parameters: - anyOf: - - type: string - - type: object - additionalProperties: - type: string - $options: - type: object - additionalProperties: true - JsonFileSchemaLoader: - description: Loads the schema from a json file - type: object - required: - - type - properties: - type: - enum: [JsonFileSchemaLoader] - file_path: - type: string - $options: - type: object - additionalProperties: true - JsonDecoder: - type: object - required: - - type - properties: - type: - enum: [JsonDecoder] - ListStreamSlicer: - description: Stream slicer that iterates over the values of a list - type: object - required: - - type - - cursor_field - - slice_values - properties: - type: - enum: [ListStreamSlicer] - cursor_field: - type: string - slice_values: - anyOf: - - type: string - - type: array - items: - type: string - request_option: - "$ref": "#/definitions/RequestOption" - $options: - type: object - additionalProperties: true - MinMaxDatetime: - description: Compares the provided date against optional minimum or maximum times. The max_datetime serves as the ceiling and will be returned when datetime exceeds it. The min_datetime serves as the floor - type: object - required: - - type - - datetime - properties: - type: - enum: [MinMaxDatetime] - datetime: - type: string - datetime_format: - type: string - default: "" - max_datetime: - type: string - min_datetime: - type: string - $options: - type: object - additionalProperties: true - NoAuth: - description: Authenticator for requests requiring no authentication - type: object - required: - - type - properties: - type: - enum: [NoAuth] - $options: - type: object - additionalProperties: true - NoPagination: - description: Pagination implementation that never returns a next page - type: object - required: - - type - properties: - type: - enum: [NoPagination] - OffsetIncrement: - description: Pagination strategy that returns the number of records reads so far and returns it as the next page token - type: object - required: - - type - - page_size - properties: - type: - enum: [OffsetIncrement] - page_size: - type: integer - $options: - type: object - additionalProperties: true - PageIncrement: - description: Pagination strategy that returns the number of pages reads so far and returns it as the next page token - type: object - required: - - type - - page_size - properties: - type: - enum: [PageIncrement] - page_size: - type: integer - start_from_page: - type: integer - default: 0 - $options: - type: object - additionalProperties: true - ParentStreamConfig: - description: Describes how to create a stream slice from a parent stream - type: object - required: - - type - - parent_key - - stream - - stream_slice_field - properties: - type: - enum: [ParentStreamConfig] - parent_key: - type: string - stream: - "$ref": "#/definitions/DeclarativeStream" - stream_slice_field: - type: string - request_option: - "$ref": "#/definitions/RequestOption" - $options: - type: object - additionalProperties: true - RecordFilter: - description: Filter applied on a list of Records - type: object - required: - - type - properties: - type: - enum: [RecordFilter] - backoff_time_in_seconds: - type: string - default: "" - $options: - type: object - additionalProperties: true - RecordSelector: - description: Responsible for translating an HTTP response into a list of records by extracting records from the response and optionally filtering records based on a heuristic. - type: object - required: - - type - - extractor - properties: - type: - enum: [RecordSelector] - extractor: - anyOf: - - "$ref": "#/definitions/CustomRecordExtractor" - - "$ref": "#/definitions/DpathExtractor" - record_filter: - "$ref": "#/definitions/RecordFilter" - $options: - type: object - additionalProperties: true - RemoveFields: - description: A transformation which removes fields from a record. The fields removed are designated using FieldPointers. During transformation, if a field or any of its parents does not exist in the record, no error is thrown. - type: object - required: - - type - - field_pointers - properties: - type: - enum: [RemoveFields] - field_pointers: - type: array - items: - items: - type: string - RequestOption: - description: Describes an option to set on a request - type: object - required: - - type - - inject_into - properties: - type: - enum: [RequestOption] - inject_into: - enum: - - request_parameter - - header - - path - - body_data - - body_json - field_name: - type: string - SimpleRetriever: - description: Retrieves records by synchronously sending requests to fetch records. The retriever acts as an orchestrator between the requester, the record selector, the paginator, and the stream slicer. - type: object - required: - - type - - record_selector - - requester - properties: - type: - enum: [SimpleRetriever] - record_selector: - "$ref": "#/definitions/RecordSelector" - requester: - "$ref": "#/definitions/HttpRequester" - name: - type: string - default: "" - paginator: - anyOf: - - "$ref": "#/definitions/DefaultPaginator" - - "$ref": "#/definitions/NoPagination" - primary_key: - anyOf: - - type: string - - type: array - items: - type: string - - type: array - items: - type: array - items: - type: string - default: "" - stream_slicer: - anyOf: - - "$ref": "#/definitions/CartesianProductStreamSlicer" - - "$ref": "#/definitions/CustomStreamSlicer" - - "$ref": "#/definitions/DatetimeStreamSlicer" - - "$ref": "#/definitions/ListStreamSlicer" - - "$ref": "#/definitions/SingleSlice" - - "$ref": "#/definitions/SubstreamSlicer" - $options: - type: object - additionalProperties: true - SingleSlice: - description: Stream slicer returning only a single stream slice - type: object - required: - - type - properties: - type: - enum: [SingleSlice] - $options: - type: object - additionalProperties: true - Spec: - description: A connection specification made up of information about the connector and how it can be configured - type: object - required: - - type - - connection_specification - - documentation_url - properties: - type: - enum: [Spec] - connection_specification: - type: object - additionalProperties: true - documentation_url: - type: string - SubstreamSlicer: - description: Stream slicer that iterates over the parent's stream slices and records and emits slices by interpolating the slice_definition mapping - type: object - required: - - type - - parent_stream_configs - properties: - type: - enum: [SubstreamSlicer] - parent_stream_configs: - type: array - items: - "$ref": "#/definitions/ParentStreamConfig" - $options: - type: object - additionalProperties: true - WaitTimeFromHeaderBackoffStrategy: - description: Extract wait time from http header - type: object - required: - - type - - header - properties: - type: - enum: [WaitTimeFromHeaderBackoffStrategy] - header: - type: string - regex: - type: string - $options: - type: object - additionalProperties: true - WaitUntilTimeFromHeaderBackoffStrategy: - description: Extract time at which we can retry the request from response header and wait for the difference between now and that time - type: object - required: - - type - - header - properties: - type: - enum: [WaitUntilTimeFromHeaderBackoffStrategy] - header: - type: string - min_wait: - anyOf: - - type: number - - type: string - regex: - type: string - $options: - type: object - additionalProperties: true diff --git a/airbyte-cdk/python/airbyte_cdk/sources/declarative/models/__init__.py b/airbyte-cdk/python/airbyte_cdk/sources/declarative/models/__init__.py index 986458e0779a..de07af17cd15 100644 --- a/airbyte-cdk/python/airbyte_cdk/sources/declarative/models/__init__.py +++ b/airbyte-cdk/python/airbyte_cdk/sources/declarative/models/__init__.py @@ -1,3 +1,2 @@ # generated by generate-component-manifest-files from .declarative_component_schema import * -from .low_code_component_schema import * diff --git a/airbyte-cdk/python/airbyte_cdk/sources/declarative/models/declarative_component_schema.py b/airbyte-cdk/python/airbyte_cdk/sources/declarative/models/declarative_component_schema.py index aff43c54c4a5..e2153536819c 100644 --- a/airbyte-cdk/python/airbyte_cdk/sources/declarative/models/declarative_component_schema.py +++ b/airbyte-cdk/python/airbyte_cdk/sources/declarative/models/declarative_component_schema.py @@ -126,8 +126,8 @@ class Config: _options: Optional[Dict[str, Any]] = Field(None, alias="$options") -class DeclarativeOauth2Authenticator(BaseModel): - type: Literal["DeclarativeOauth2Authenticator"] +class OAuthAuthenticator(BaseModel): + type: Literal["OAuthAuthenticator"] client_id: str client_secret: str refresh_token: str @@ -399,7 +399,7 @@ class HttpRequester(BaseModel): BasicHttpAuthenticator, BearerAuthenticator, CustomAuthenticator, - DeclarativeOauth2Authenticator, + OAuthAuthenticator, NoAuth, SessionTokenAuthenticator, ]