Merge branch 'main' into lmossman/add-suggestions-for-datetime-fields

Author: lmossman

airbyte_cdk/sources/declarative/declarative_component_schema.yaml

@@ -4191,11 +4191,9 @@ definitions:
           - stream_slice
           - stream_template_config
         examples:
-          - ["data"]
-          - ["data", "records"]
-          - ["data", 1, "name"]
-          - ["data", "{{ components_values.name }}"]
-          - ["data", "*", "record"]
+          - ["name"]
+          - ["retriever", "requester", "url"]
+          - ["retriever", "requester", "{{ components_values.field }}"]
           - ["*", "**", "name"]
       value:
         title: Value
@@ -4826,6 +4824,12 @@ interpolation:
     - title: stream_slice
       description: This variable is deprecated. Use stream_interval or stream_partition instead.
       type: object
+    - title: components_values
+      description: The record object produced by the components resolver for which a stream will be generated.
+      type: object
+      examples:
+        - name: "accounts"
+          id: 1234
   macros:
     - title: now_utc
       description: Returns the current date and time in the UTC timezone.

airbyte_cdk/sources/declarative/models/declarative_component_schema.py

@@ -1463,11 +1463,9 @@ class ComponentMappingDefinition(BaseModel):
         ...,
         description="A list of potentially nested fields indicating the full path where value will be added or updated.",
         examples=[
-            ["data"],
-            ["data", "records"],
-            ["data", 1, "name"],
-            ["data", "{{ components_values.name }}"],
-            ["data", "*", "record"],
+            ["name"],
+            ["retriever", "requester", "url"],
+            ["retriever", "requester", "{{ components_values.field }}"],
             ["*", "**", "name"],
         ],
         title="Field Path",

airbyte_cdk/sources/declarative/parsers/model_to_component_factory.py

@@ -2090,6 +2090,12 @@ def create_declarative_stream(
             elif concurrent_cursor:
                 cursor = concurrent_cursor
 
+            # FIXME to be removed once we migrate everything to DefaultStream
+            if isinstance(retriever, SimpleRetriever):
+                # We zero it out here, but since this is a cursor reference, the state is still properly
+                # instantiated for the other components that reference it
+                retriever.cursor = None
+
             partition_generator = StreamSlicerPartitionGenerator(
                 DeclarativePartitionFactory(
                     stream_name,