pr feedback and bug fix so we always include properties if no property chunking

Author: brianjlai

airbyte_cdk/sources/declarative/requesters/query_properties/json_schema_property_selector.py

@@ -36,7 +36,7 @@ def select(self) -> Optional[Set[str]]:
         This is different from the empty set where the json_schema was empty and no schema fields were selected.
         """
 
-        # For CHECK/DISCOVER operations, there is no catalog and therefor no configured stream or selected
+        # For CHECK/DISCOVER operations, there is no catalog and therefore no configured stream or selected
         # columns. In this case we return None which is interpreted by the QueryProperties component to not
         # perform any filtering of schema properties and fetch all of them
         if self.configured_stream is None:

airbyte_cdk/sources/declarative/requesters/query_properties/property_selector/json_schema_property_selector.py

@@ -58,6 +58,15 @@ def get_request_property_chunks(
             )
         else:
             if configured_properties is not None:
-                yield from [[field for field in fields if field in configured_properties]]
+                all_fields = (
+                    [field for field in fields if field in configured_properties]
+                    if configured_properties is not None
+                    else list(fields)
+                )
             else:
-                yield list(fields)
+                all_fields = list(fields)
+
+            if self.always_include_properties:
+                all_fields = list(self.always_include_properties) + all_fields
+
+            yield all_fields

airbyte_cdk/sources/declarative/requesters/query_properties/query_properties.py

@@ -149,6 +149,105 @@ def test_get_request_property_chunks_static_list_with_always_include_properties(
     assert property_chunks[2] == ["zero", "seven", "lotus", "nine"]
 
 
+def test_get_request_no_property_chunking_selected_properties_always_include_properties():
+    configured_airbyte_stream = _create_configured_airbyte_stream(
+        ["santa", "clover", "junpei", "june", "remove_me"]
+    )
+
+    stream_slice = StreamSlice(cursor_slice={}, partition={})
+
+    query_properties = QueryProperties(
+        property_list=[
+            "ace",
+            "snake",
+            "santa",
+            "clover",
+            "junpei",
+            "june",
+            "seven",
+            "lotus",
+            "nine",
+        ],
+        always_include_properties=["zero"],
+        property_chunking=None,
+        property_selector=JsonSchemaPropertySelector(
+            configured_stream=configured_airbyte_stream,
+            properties_transformations=[
+                RemoveFields(field_pointers=[["remove_me"]], parameters={}),
+            ],
+            config=CONFIG,
+            parameters={},
+        ),
+        config=CONFIG,
+        parameters={},
+    )
+
+    property_chunks = list(query_properties.get_request_property_chunks(stream_slice=stream_slice))
+
+    assert len(property_chunks) == 1
+    assert property_chunks[0] == ["zero", "santa", "clover", "junpei", "june"]
+
+
+def test_get_request_no_property_chunking_always_include_properties():
+    configured_airbyte_stream = _create_configured_airbyte_stream(
+        [
+            "ace",
+            "snake",
+            "santa",
+            "clover",
+            "junpei",
+            "june",
+            "seven",
+            "lotus",
+            "nine",
+        ]
+    )
+
+    stream_slice = StreamSlice(cursor_slice={}, partition={})
+
+    query_properties = QueryProperties(
+        property_list=[
+            "ace",
+            "snake",
+            "santa",
+            "clover",
+            "junpei",
+            "june",
+            "seven",
+            "lotus",
+            "nine",
+        ],
+        always_include_properties=["zero"],
+        property_chunking=None,
+        property_selector=JsonSchemaPropertySelector(
+            configured_stream=configured_airbyte_stream,
+            properties_transformations=[
+                RemoveFields(field_pointers=[["remove_me"]], parameters={}),
+            ],
+            config=CONFIG,
+            parameters={},
+        ),
+        config=CONFIG,
+        parameters={},
+    )
+
+    property_chunks = list(query_properties.get_request_property_chunks(stream_slice=stream_slice))
+
+    assert len(property_chunks) == 1
+    assert property_chunks[0] == [
+        "zero",
+        "ace",
+        "snake",
+        "santa",
+        "clover",
+        "junpei",
+        "june",
+        "seven",
+        "lotus",
+        "nine",
+    ]
+
+
 def test_get_request_property_chunks_dynamic_endpoint():
     configured_airbyte_stream = _create_configured_airbyte_stream(
         ["alice", "clover", "dio", "k", "luna", "phi", "quark", "sigma", "tenmyouji"]