airbyte-cdk 6.12.1__tar.gz → 6.12.1.dev0__tar.gz

{airbyte_cdk-6.12.1 → airbyte_cdk-6.12.1.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: airbyte-cdk
-Version: 6.12.1
+Version: 6.12.1.dev0
 Summary: A framework for writing Airbyte Connectors.
 Home-page: https://airbyte.com
 License: MIT
@@ -22,7 +22,6 @@ Provides-Extra: sql
 Provides-Extra: vector-db-based
 Requires-Dist: Jinja2 (>=3.1.2,<3.2.0)
 Requires-Dist: PyYAML (>=6.0.1,<7.0.0)
-Requires-Dist: Unidecode (>=1.3,<2.0)
 Requires-Dist: airbyte-protocol-models-dataclasses (>=0.14,<0.15)
 Requires-Dist: avro (>=1.11.2,<1.12.0) ; extra == "file-based"
 Requires-Dist: backoff

{airbyte_cdk-6.12.1 → airbyte_cdk-6.12.1.dev0}/airbyte_cdk/sources/declarative/declarative_component_schema.yaml

@@ -1234,8 +1234,6 @@ definitions:
             - "$ref": "#/definitions/CustomTransformation"
             - "$ref": "#/definitions/RemoveFields"
             - "$ref": "#/definitions/KeysToLower"
-            - "$ref": "#/definitions/KeysToSnakeCase"
-            - "$ref": "#/definitions/FlattenFields"
       state_migrations:
         title: State Migrations
         description: Array of state migrations to be applied on the input state
@@ -1768,18 +1766,6 @@ definitions:
           - "$ref": "#/definitions/AsyncRetriever"
           - "$ref": "#/definitions/CustomRetriever"
           - "$ref": "#/definitions/SimpleRetriever"
-      schema_transformations:
-        title: Schema Transformations
-        description: A list of transformations to be applied to the schema.
-        type: array
-        items:
-          anyOf:
-            - "$ref": "#/definitions/AddFields"
-            - "$ref": "#/definitions/CustomTransformation"
-            - "$ref": "#/definitions/RemoveFields"
-            - "$ref": "#/definitions/KeysToLower"
-            - "$ref": "#/definitions/KeysToSnakeCase"
-            - "$ref": "#/definitions/FlattenFields"
       schema_type_identifier:
         "$ref": "#/definitions/SchemaTypeIdentifier"
       $parameters:
@@ -1852,32 +1838,6 @@ definitions:
       $parameters:
         type: object
         additionalProperties: true
-  KeysToSnakeCase:
-    title: Key to Snake Case
-    description: A transformation that renames all keys to snake case.
-    type: object
-    required:
-      - type
-    properties:
-      type:
-        type: string
-        enum: [KeysToSnakeCase]
-      $parameters:
-        type: object
-        additionalProperties: true
-  FlattenFields:
-    title: Flatten Fields
-    description: A transformation that flatten record to single level format.
-    type: object
-    required:
-      - type
-    properties:
-      type:
-        type: string
-        enum: [FlattenFields]
-      $parameters:
-        type: object
-        additionalProperties: true
   IterableDecoder:
     title: Iterable Decoder
     description: Use this if the response consists of strings separated by new lines (`\n`). The Decoder will wrap each row into a JSON object with the `record` key.
@@ -2170,63 +2130,65 @@ definitions:
           - extract_output
         properties:
           consent_url:
-            title: Consent URL
+            title: DeclarativeOAuth Consent URL
             type: string
             description: |-
               The DeclarativeOAuth Specific string URL string template to initiate the authentication.
               The placeholders are replaced during the processing to provide neccessary values.
             examples:
-              - https://domain.host.com/marketing_api/auth?{client_id_key}={{client_id_key}}&{redirect_uri_key}={urlEncoder:{{redirect_uri_key}}}&{state_key}={{state_key}}
-              - https://endpoint.host.com/oauth2/authorize?{client_id_key}={{client_id_key}}&{redirect_uri_key}={urlEncoder:{{redirect_uri_key}}}&{scope_key}={urlEncoder:{{scope_key}}}&{state_key}={{state_key}}&subdomain={subdomain}
+              - consent_url: https://domain.host.com/marketing_api/auth?{client_id_key}={{client_id_key}}&{redirect_uri_key}={urlEncoder:{{redirect_uri_key}}}&{state_key}={{state_key}}
+              - consent_url: https://endpoint.host.com/oauth2/authorize?{client_id_key}={{client_id_key}}&{redirect_uri_key}={urlEncoder:{{redirect_uri_key}}}&{scope_key}={urlEncoder:{{scope_key}}}&{state_key}={{state_key}}&subdomain={subdomain}
           scope:
-            title: Scopes
+            title: (Optional) DeclarativeOAuth Scope
             type: string
             description: |-
               The DeclarativeOAuth Specific string of the scopes needed to be grant for authenticated user.
             examples:
-              - user:read user:read_orders workspaces:read
+              - scope: user:read user:read_orders workspaces:read
           access_token_url:
-            title: Access Token URL
+            title: DeclarativeOAuth Access Token URL
             type: string
             description: |-
               The DeclarativeOAuth Specific URL templated string to obtain the `access_token`, `refresh_token` etc.
               The placeholders are replaced during the processing to provide neccessary values.
             examples:
-              - https://auth.host.com/oauth2/token?{client_id_key}={{client_id_key}}&{client_secret_key}={{client_secret_key}}&{auth_code_key}={{auth_code_key}}&{redirect_uri_key}={urlEncoder:{{redirect_uri_key}}}
+              - access_token_url: https://auth.host.com/oauth2/token?{client_id_key}={{client_id_key}}&{client_secret_key}={{client_secret_key}}&{auth_code_key}={{auth_code_key}}&{redirect_uri_key}={urlEncoder:{{redirect_uri_key}}}
           access_token_headers:
-            title: Access Token Headers
+            title: (Optional) DeclarativeOAuth Access Token Headers
             type: object
             additionalProperties: true
             description: |-
               The DeclarativeOAuth Specific optional headers to inject while exchanging the `auth_code` to `access_token` during `completeOAuthFlow` step.
             examples:
-              - {
-                  "Authorization": "Basic {base64Encoder:{client_id}:{client_secret}}",
-                }
+              - access_token_headers:
+                  {
+                    "Authorization": "Basic {base64Encoder:{client_id}:{client_secret}}",
+                  }
           access_token_params:
-            title: Access Token Query Params (Json Encoded)
+            title: (Optional) DeclarativeOAuth Access Token Query Params (Json Encoded)
             type: object
             additionalProperties: true
             description: |-
               The DeclarativeOAuth Specific optional query parameters to inject while exchanging the `auth_code` to `access_token` during `completeOAuthFlow` step.
               When this property is provided, the query params will be encoded as `Json` and included in the outgoing API request.
             examples:
-              - {
-                  "{auth_code_key}": "{{auth_code_key}}",
-                  "{client_id_key}": "{{client_id_key}}",
-                  "{client_secret_key}": "{{client_secret_key}}",
-                }
+              - access_token_params:
+                  {
+                    "{auth_code_key}": "{{auth_code_key}}",
+                    "{client_id_key}": "{{client_id_key}}",
+                    "{client_secret_key}": "{{client_secret_key}}",
+                  }
           extract_output:
-            title: Extract Output
+            title: DeclarativeOAuth Extract Output
             type: array
             items:
               type: string
             description: |-
               The DeclarativeOAuth Specific list of strings to indicate which keys should be extracted and returned back to the input config.
             examples:
-              - ["access_token", "refresh_token", "other_field"]
+              - extract_output: ["access_token", "refresh_token", "other_field"]
           state:
-            title: Configurable State Query Param
+            title: (Optional) DeclarativeOAuth Configurable State Query Param
             type: object
             additionalProperties: true
             required:
@@ -2241,49 +2203,49 @@ definitions:
               max:
                 type: integer
             examples:
-              - { "min": 7, "max": 128 }
+              - state: { "min": 7, "max": 128 }
           client_id_key:
-            title: Client ID Key Override
+            title: (Optional) DeclarativeOAuth Client ID Key Override
             type: string
             description: |-
               The DeclarativeOAuth Specific optional override to provide the custom `client_id` key name, if required by data-provider.
             examples:
-              - "my_custom_client_id_key_name"
+              - client_id_key: "my_custom_client_id_key_name"
           client_secret_key:
-            title: Client Secret Key Override
+            title: (Optional) DeclarativeOAuth Client Secret Key Override
             type: string
             description: |-
               The DeclarativeOAuth Specific optional override to provide the custom `client_secret` key name, if required by data-provider.
             examples:
-              - "my_custom_client_secret_key_name"
+              - client_secret_key: "my_custom_client_secret_key_name"
           scope_key:
-            title: Scopes Key Override
+            title: (Optional) DeclarativeOAuth Scope Key Override
             type: string
             description: |-
               The DeclarativeOAuth Specific optional override to provide the custom `scope` key name, if required by data-provider.
             examples:
-              - "my_custom_scope_key_key_name"
+              - scope_key: "my_custom_scope_key_key_name"
           state_key:
-            title: State Key Override
+            title: (Optional) DeclarativeOAuth State Key Override
             type: string
             description: |-
               The DeclarativeOAuth Specific optional override to provide the custom `state` key name, if required by data-provider.
             examples:
-              - "my_custom_state_key_key_name"
+              - state_key: "my_custom_state_key_key_name"
           auth_code_key:
-            title: Auth Code Key Override
+            title: (Optional) DeclarativeOAuth Auth Code Key Override
             type: string
             description: |-
               The DeclarativeOAuth Specific optional override to provide the custom `code` key name to something like `auth_code` or `custom_auth_code`, if required by data-provider.
             examples:
-              - "my_custom_auth_code_key_name"
+              - auth_code_key: "my_custom_auth_code_key_name"
           redirect_uri_key:
-            title: Redirect URI Key Override
+            title: (Optional) DeclarativeOAuth Redirect URI Key Override
             type: string
             description: |-
               The DeclarativeOAuth Specific optional override to provide the custom `redirect_uri` key name to something like `callback_uri`, if required by data-provider.
             examples:
-              - "my_custom_redirect_uri_key_name"
+              - redirect_uri_key: "my_custom_redirect_uri_key_name"
       complete_oauth_output_specification:
         title: "OAuth output specification"
         description: |-

{airbyte_cdk-6.12.1 → airbyte_cdk-6.12.1.dev0}/airbyte_cdk/sources/declarative/models/declarative_component_schema.py

@@ -710,16 +710,6 @@ class KeysToLower(BaseModel):
     parameters: Optional[Dict[str, Any]] = Field(None, alias="$parameters")
 
 
-class KeysToSnakeCase(BaseModel):
-    type: Literal["KeysToSnakeCase"]
-    parameters: Optional[Dict[str, Any]] = Field(None, alias="$parameters")
-
-
-class FlattenFields(BaseModel):
-    type: Literal["FlattenFields"]
-    parameters: Optional[Dict[str, Any]] = Field(None, alias="$parameters")
-
-
 class IterableDecoder(BaseModel):
     type: Literal["IterableDecoder"]
 
@@ -805,90 +795,104 @@ class OauthConnectorInputSpecification(BaseModel):
         ...,
         description="The DeclarativeOAuth Specific string URL string template to initiate the authentication.\nThe placeholders are replaced during the processing to provide neccessary values.",
         examples=[
-            "https://domain.host.com/marketing_api/auth?{client_id_key}={{client_id_key}}&{redirect_uri_key}={urlEncoder:{{redirect_uri_key}}}&{state_key}={{state_key}}",
-            "https://endpoint.host.com/oauth2/authorize?{client_id_key}={{client_id_key}}&{redirect_uri_key}={urlEncoder:{{redirect_uri_key}}}&{scope_key}={urlEncoder:{{scope_key}}}&{state_key}={{state_key}}&subdomain={subdomain}",
+            {
+                "consent_url": "https://domain.host.com/marketing_api/auth?{client_id_key}={{client_id_key}}&{redirect_uri_key}={urlEncoder:{{redirect_uri_key}}}&{state_key}={{state_key}}"
+            },
+            {
+                "consent_url": "https://endpoint.host.com/oauth2/authorize?{client_id_key}={{client_id_key}}&{redirect_uri_key}={urlEncoder:{{redirect_uri_key}}}&{scope_key}={urlEncoder:{{scope_key}}}&{state_key}={{state_key}}&subdomain={subdomain}"
+            },
         ],
-        title="Consent URL",
+        title="DeclarativeOAuth Consent URL",
     )
     scope: Optional[str] = Field(
         None,
         description="The DeclarativeOAuth Specific string of the scopes needed to be grant for authenticated user.",
-        examples=["user:read user:read_orders workspaces:read"],
-        title="Scopes",
+        examples=[{"scope": "user:read user:read_orders workspaces:read"}],
+        title="(Optional) DeclarativeOAuth Scope",
     )
     access_token_url: str = Field(
         ...,
         description="The DeclarativeOAuth Specific URL templated string to obtain the `access_token`, `refresh_token` etc.\nThe placeholders are replaced during the processing to provide neccessary values.",
         examples=[
-            "https://auth.host.com/oauth2/token?{client_id_key}={{client_id_key}}&{client_secret_key}={{client_secret_key}}&{auth_code_key}={{auth_code_key}}&{redirect_uri_key}={urlEncoder:{{redirect_uri_key}}}"
+            {
+                "access_token_url": "https://auth.host.com/oauth2/token?{client_id_key}={{client_id_key}}&{client_secret_key}={{client_secret_key}}&{auth_code_key}={{auth_code_key}}&{redirect_uri_key}={urlEncoder:{{redirect_uri_key}}}"
+            }
         ],
-        title="Access Token URL",
+        title="DeclarativeOAuth Access Token URL",
     )
     access_token_headers: Optional[Dict[str, Any]] = Field(
         None,
         description="The DeclarativeOAuth Specific optional headers to inject while exchanging the `auth_code` to `access_token` during `completeOAuthFlow` step.",
-        examples=[{"Authorization": "Basic {base64Encoder:{client_id}:{client_secret}}"}],
-        title="Access Token Headers",
+        examples=[
+            {
+                "access_token_headers": {
+                    "Authorization": "Basic {base64Encoder:{client_id}:{client_secret}}"
+                }
+            }
+        ],
+        title="(Optional) DeclarativeOAuth Access Token Headers",
     )
     access_token_params: Optional[Dict[str, Any]] = Field(
         None,
         description="The DeclarativeOAuth Specific optional query parameters to inject while exchanging the `auth_code` to `access_token` during `completeOAuthFlow` step.\nWhen this property is provided, the query params will be encoded as `Json` and included in the outgoing API request.",
         examples=[
             {
-                "{auth_code_key}": "{{auth_code_key}}",
-                "{client_id_key}": "{{client_id_key}}",
-                "{client_secret_key}": "{{client_secret_key}}",
+                "access_token_params": {
+                    "{auth_code_key}": "{{auth_code_key}}",
+                    "{client_id_key}": "{{client_id_key}}",
+                    "{client_secret_key}": "{{client_secret_key}}",
+                }
             }
         ],
-        title="Access Token Query Params (Json Encoded)",
+        title="(Optional) DeclarativeOAuth Access Token Query Params (Json Encoded)",
     )
     extract_output: List[str] = Field(
         ...,
         description="The DeclarativeOAuth Specific list of strings to indicate which keys should be extracted and returned back to the input config.",
-        examples=[["access_token", "refresh_token", "other_field"]],
-        title="Extract Output",
+        examples=[{"extract_output": ["access_token", "refresh_token", "other_field"]}],
+        title="DeclarativeOAuth Extract Output",
     )
     state: Optional[State] = Field(
         None,
         description="The DeclarativeOAuth Specific object to provide the criteria of how the `state` query param should be constructed,\nincluding length and complexity.",
-        examples=[{"min": 7, "max": 128}],
-        title="Configurable State Query Param",
+        examples=[{"state": {"min": 7, "max": 128}}],
+        title="(Optional) DeclarativeOAuth Configurable State Query Param",
     )
     client_id_key: Optional[str] = Field(
         None,
         description="The DeclarativeOAuth Specific optional override to provide the custom `client_id` key name, if required by data-provider.",
-        examples=["my_custom_client_id_key_name"],
-        title="Client ID Key Override",
+        examples=[{"client_id_key": "my_custom_client_id_key_name"}],
+        title="(Optional) DeclarativeOAuth Client ID Key Override",
     )
     client_secret_key: Optional[str] = Field(
         None,
         description="The DeclarativeOAuth Specific optional override to provide the custom `client_secret` key name, if required by data-provider.",
-        examples=["my_custom_client_secret_key_name"],
-        title="Client Secret Key Override",
+        examples=[{"client_secret_key": "my_custom_client_secret_key_name"}],
+        title="(Optional) DeclarativeOAuth Client Secret Key Override",
     )
     scope_key: Optional[str] = Field(
         None,
         description="The DeclarativeOAuth Specific optional override to provide the custom `scope` key name, if required by data-provider.",
-        examples=["my_custom_scope_key_key_name"],
-        title="Scopes Key Override",
+        examples=[{"scope_key": "my_custom_scope_key_key_name"}],
+        title="(Optional) DeclarativeOAuth Scope Key Override",
     )
     state_key: Optional[str] = Field(
         None,
         description="The DeclarativeOAuth Specific optional override to provide the custom `state` key name, if required by data-provider.",
-        examples=["my_custom_state_key_key_name"],
-        title="State Key Override",
+        examples=[{"state_key": "my_custom_state_key_key_name"}],
+        title="(Optional) DeclarativeOAuth State Key Override",
     )
     auth_code_key: Optional[str] = Field(
         None,
         description="The DeclarativeOAuth Specific optional override to provide the custom `code` key name to something like `auth_code` or `custom_auth_code`, if required by data-provider.",
-        examples=["my_custom_auth_code_key_name"],
-        title="Auth Code Key Override",
+        examples=[{"auth_code_key": "my_custom_auth_code_key_name"}],
+        title="(Optional) DeclarativeOAuth Auth Code Key Override",
     )
     redirect_uri_key: Optional[str] = Field(
         None,
         description="The DeclarativeOAuth Specific optional override to provide the custom `redirect_uri` key name to something like `callback_uri`, if required by data-provider.",
-        examples=["my_custom_redirect_uri_key_name"],
-        title="Redirect URI Key Override",
+        examples=[{"redirect_uri_key": "my_custom_redirect_uri_key_name"}],
+        title="(Optional) DeclarativeOAuth Redirect URI Key Override",
     )
 
 
@@ -1664,16 +1668,7 @@ class DeclarativeStream(BaseModel):
         title="Schema Loader",
     )
     transformations: Optional[
-        List[
-            Union[
-                AddFields,
-                CustomTransformation,
-                RemoveFields,
-                KeysToLower,
-                KeysToSnakeCase,
-                FlattenFields,
-            ]
-        ]
+        List[Union[AddFields, CustomTransformation, RemoveFields, KeysToLower]]
     ] = Field(
         None,
         description="A list of transformations to be applied to each output record.",
@@ -1837,22 +1832,6 @@ class DynamicSchemaLoader(BaseModel):
         description="Component used to coordinate how records are extracted across stream slices and request pages.",
         title="Retriever",
     )
-    schema_transformations: Optional[
-        List[
-            Union[
-                AddFields,
-                CustomTransformation,
-                RemoveFields,
-                KeysToLower,
-                KeysToSnakeCase,
-                FlattenFields,
-            ]
-        ]
-    ] = Field(
-        None,
-        description="A list of transformations to be applied to the schema.",
-        title="Schema Transformations",
-    )
     schema_type_identifier: SchemaTypeIdentifier
     parameters: Optional[Dict[str, Any]] = Field(None, alias="$parameters")
 

{airbyte_cdk-6.12.1 → airbyte_cdk-6.12.1.dev0}/airbyte_cdk/sources/declarative/parsers/model_to_component_factory.py

@@ -197,9 +197,6 @@ from airbyte_cdk.sources.declarative.models.declarative_component_schema import
 from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
     ExponentialBackoffStrategy as ExponentialBackoffStrategyModel,
 )
-from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
-    FlattenFields as FlattenFieldsModel,
-)
 from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
     GzipJsonDecoder as GzipJsonDecoderModel,
 )
@@ -239,9 +236,6 @@ from airbyte_cdk.sources.declarative.models.declarative_component_schema import
 from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
     KeysToLower as KeysToLowerModel,
 )
-from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
-    KeysToSnakeCase as KeysToSnakeCaseModel,
-)
 from airbyte_cdk.sources.declarative.models.declarative_component_schema import (
     LegacySessionTokenAuthenticator as LegacySessionTokenAuthenticatorModel,
 )
@@ -329,9 +323,6 @@ from airbyte_cdk.sources.declarative.partition_routers import (
     SinglePartitionRouter,
     SubstreamPartitionRouter,
 )
-from airbyte_cdk.sources.declarative.partition_routers.async_job_partition_router import (
-    AsyncJobPartitionRouter,
-)
 from airbyte_cdk.sources.declarative.partition_routers.substream_partition_router import (
     ParentStreamConfig,
 )
@@ -396,15 +387,9 @@ from airbyte_cdk.sources.declarative.transformations import (
     RemoveFields,
 )
 from airbyte_cdk.sources.declarative.transformations.add_fields import AddedFieldDefinition
-from airbyte_cdk.sources.declarative.transformations.flatten_fields import (
-    FlattenFields,
-)
 from airbyte_cdk.sources.declarative.transformations.keys_to_lower_transformation import (
     KeysToLowerTransformation,
 )
-from airbyte_cdk.sources.declarative.transformations.keys_to_snake_transformation import (
-    KeysToSnakeCaseTransformation,
-)
 from airbyte_cdk.sources.message import (
     InMemoryMessageRepository,
     LogAppenderMessageRepositoryDecorator,
@@ -487,8 +472,6 @@ class ModelToComponentFactory:
             JsonlDecoderModel: self.create_jsonl_decoder,
             GzipJsonDecoderModel: self.create_gzipjson_decoder,
             KeysToLowerModel: self.create_keys_to_lower_transformation,
-            KeysToSnakeCaseModel: self.create_keys_to_snake_transformation,
-            FlattenFieldsModel: self.create_flatten_fields,
             IterableDecoderModel: self.create_iterable_decoder,
             XmlDecoderModel: self.create_xml_decoder,
             JsonFileSchemaLoaderModel: self.create_json_file_schema_loader,
@@ -604,16 +587,6 @@ class ModelToComponentFactory:
     ) -> KeysToLowerTransformation:
         return KeysToLowerTransformation()
 
-    def create_keys_to_snake_transformation(
-        self, model: KeysToSnakeCaseModel, config: Config, **kwargs: Any
-    ) -> KeysToSnakeCaseTransformation:
-        return KeysToSnakeCaseTransformation()
-
-    def create_flatten_fields(
-        self, model: FlattenFieldsModel, config: Config, **kwargs: Any
-    ) -> FlattenFields:
-        return FlattenFields()
-
     @staticmethod
     def _json_schema_type_name_to_type(value_type: Optional[ValueType]) -> Optional[Type[Any]]:
         if not value_type:
@@ -1665,13 +1638,6 @@ class ModelToComponentFactory:
             model.retriever, stream_slicer
         )
 
-        schema_transformations = []
-        if model.schema_transformations:
-            for transformation_model in model.schema_transformations:
-                schema_transformations.append(
-                    self._create_component_from_model(model=transformation_model, config=config)
-                )
-
         retriever = self._create_component_from_model(
             model=model.retriever,
             config=config,
@@ -1686,7 +1652,6 @@ class ModelToComponentFactory:
         return DynamicSchemaLoader(
             retriever=retriever,
             config=config,
-            schema_transformations=schema_transformations,
             schema_type_identifier=schema_type_identifier,
             parameters=model.parameters or {},
         )
@@ -2263,24 +2228,18 @@ class ModelToComponentFactory:
             urls_extractor=urls_extractor,
         )
 
-        async_job_partition_router = AsyncJobPartitionRouter(
+        return AsyncRetriever(
             job_orchestrator_factory=lambda stream_slices: AsyncJobOrchestrator(
                 job_repository,
                 stream_slices,
-                JobTracker(1),
-                # FIXME eventually make the number of concurrent jobs in the API configurable. Until then, we limit to 1
+                JobTracker(
+                    1
+                ),  # FIXME eventually make the number of concurrent jobs in the API configurable. Until then, we limit to 1
                 self._message_repository,
-                has_bulk_parent=False,
-                # FIXME work would need to be done here in order to detect if a stream as a parent stream that is bulk
+                has_bulk_parent=False,  # FIXME work would need to be done here in order to detect if a stream as a parent stream that is bulk
             ),
-            stream_slicer=stream_slicer,
-            config=config,
-            parameters=model.parameters or {},
-        )
-
-        return AsyncRetriever(
             record_selector=record_selector,
-            stream_slicer=async_job_partition_router,
+            stream_slicer=stream_slicer,
             config=config,
             parameters=model.parameters or {},
         )

{airbyte_cdk-6.12.1 → airbyte_cdk-6.12.1.dev0}/airbyte_cdk/sources/declarative/partition_routers/__init__.py

@@ -2,18 +2,10 @@
 # Copyright (c) 2022 Airbyte, Inc., all rights reserved.
 #
 
-from airbyte_cdk.sources.declarative.partition_routers.async_job_partition_router import AsyncJobPartitionRouter
 from airbyte_cdk.sources.declarative.partition_routers.cartesian_product_stream_slicer import CartesianProductStreamSlicer
 from airbyte_cdk.sources.declarative.partition_routers.list_partition_router import ListPartitionRouter
 from airbyte_cdk.sources.declarative.partition_routers.single_partition_router import SinglePartitionRouter
 from airbyte_cdk.sources.declarative.partition_routers.substream_partition_router import SubstreamPartitionRouter
 from airbyte_cdk.sources.declarative.partition_routers.partition_router import PartitionRouter
 
-__all__ = [
-    "AsyncJobPartitionRouter",
-    "CartesianProductStreamSlicer",
-    "ListPartitionRouter",
-    "SinglePartitionRouter",
-    "SubstreamPartitionRouter",
-    "PartitionRouter"
-]
+__all__ = ["CartesianProductStreamSlicer", "ListPartitionRouter", "SinglePartitionRouter", "SubstreamPartitionRouter", "PartitionRouter"]

{airbyte_cdk-6.12.1 → airbyte_cdk-6.12.1.dev0}/airbyte_cdk/sources/declarative/retrievers/async_retriever.py

@@ -1,8 +1,8 @@
 # Copyright (c) 2024 Airbyte, Inc., all rights reserved.
 
 
-from dataclasses import InitVar, dataclass
-from typing import Any, Iterable, Mapping, Optional
+from dataclasses import InitVar, dataclass, field
+from typing import Any, Callable, Iterable, Mapping, Optional
 
 from typing_extensions import deprecated
 
@@ -12,10 +12,9 @@ from airbyte_cdk.sources.declarative.async_job.job_orchestrator import (
     AsyncPartition,
 )
 from airbyte_cdk.sources.declarative.extractors.record_selector import RecordSelector
-from airbyte_cdk.sources.declarative.partition_routers.async_job_partition_router import (
-    AsyncJobPartitionRouter,
-)
+from airbyte_cdk.sources.declarative.partition_routers import SinglePartitionRouter
 from airbyte_cdk.sources.declarative.retrievers import Retriever
+from airbyte_cdk.sources.declarative.stream_slicers import StreamSlicer
 from airbyte_cdk.sources.source import ExperimentalClassWarning
 from airbyte_cdk.sources.streams.core import StreamData
 from airbyte_cdk.sources.types import Config, StreamSlice, StreamState
@@ -30,10 +29,15 @@ from airbyte_cdk.utils.traced_exception import AirbyteTracedException
 class AsyncRetriever(Retriever):
     config: Config
     parameters: InitVar[Mapping[str, Any]]
+    job_orchestrator_factory: Callable[[Iterable[StreamSlice]], AsyncJobOrchestrator]
     record_selector: RecordSelector
-    stream_slicer: AsyncJobPartitionRouter
+    stream_slicer: StreamSlicer = field(
+        default_factory=lambda: SinglePartitionRouter(parameters={})
+    )
 
     def __post_init__(self, parameters: Mapping[str, Any]) -> None:
+        self._job_orchestrator_factory = self.job_orchestrator_factory
+        self.__job_orchestrator: Optional[AsyncJobOrchestrator] = None
         self._parameters = parameters
 
     @property
@@ -50,6 +54,17 @@ class AsyncRetriever(Retriever):
         """
         pass
 
+    @property
+    def _job_orchestrator(self) -> AsyncJobOrchestrator:
+        if not self.__job_orchestrator:
+            raise AirbyteTracedException(
+                message="Invalid state within AsyncJobRetriever. Please contact Airbyte Support",
+                internal_message="AsyncPartitionRepository is expected to be accessed only after `stream_slices`",
+                failure_type=FailureType.system_error,
+            )
+
+        return self.__job_orchestrator
+
     def _get_stream_state(self) -> StreamState:
         """
         Gets the current state of the stream.
@@ -84,7 +99,15 @@ class AsyncRetriever(Retriever):
         return stream_slice["partition"]  # type: ignore  # stream_slice["partition"] has been added as an AsyncPartition as part of stream_slices
 
     def stream_slices(self) -> Iterable[Optional[StreamSlice]]:
-        return self.stream_slicer.stream_slices()
+        slices = self.stream_slicer.stream_slices()
+        self.__job_orchestrator = self._job_orchestrator_factory(slices)
+
+        for completed_partition in self._job_orchestrator.create_and_get_completed_partitions():
+            yield StreamSlice(
+                partition=dict(completed_partition.stream_slice.partition)
+                | {"partition": completed_partition},
+                cursor_slice=completed_partition.stream_slice.cursor_slice,
+            )
 
     def read_records(
         self,
@@ -93,7 +116,7 @@ class AsyncRetriever(Retriever):
     ) -> Iterable[StreamData]:
         stream_state: StreamState = self._get_stream_state()
         partition: AsyncPartition = self._validate_and_get_stream_slice_partition(stream_slice)
-        records: Iterable[Mapping[str, Any]] = self.stream_slicer.fetch_records(partition)
+        records: Iterable[Mapping[str, Any]] = self._job_orchestrator.fetch_records(partition)
 
         yield from self.record_selector.filter_and_transform(
             all_data=records,