pr feedback to remove QueryProperty method and fix a test

Author: brianjlai

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

@@ -41,6 +41,7 @@ def get_request_property_chunks(
         else:
             yield list(fields)
 
+    # delete later, but leaving this to keep the discussion thread on the PR from getting hidden
     def has_multiple_chunks(self, stream_slice: Optional[StreamSlice]) -> bool:
         property_chunks = iter(self.get_request_property_chunks(stream_slice=stream_slice))
         try:

airbyte_cdk/sources/declarative/retrievers/simple_retriever.py

@@ -456,9 +456,7 @@ def read_records(
                     stream_slice=stream_slice
                 )
             )
-            has_multiple_chunks = self.additional_query_properties.has_multiple_chunks(
-                stream_slice=stream_slice
-            )
+            has_multiple_chunks = self._has_multiple_chunks(stream_slice=stream_slice)
         else:
             property_chunks = [[""]]
             has_multiple_chunks = False
@@ -598,6 +596,20 @@ def _extract_record(
             )
         return None
 
+    def _has_multiple_chunks(self, stream_slice: Optional[StreamSlice]) -> bool:
+        if not self.additional_query_properties:
+            return False
+
+        property_chunks = iter(
+            self.additional_query_properties.get_request_property_chunks(stream_slice=stream_slice)
+        )
+        try:
+            next(property_chunks)
+            next(property_chunks)
+            return True
+        except StopIteration:
+            return False
+
     # stream_slices is defined with arguments on http stream and fixing this has a long tail of dependencies. Will be resolved by the decoupling of http stream and simple retriever
     def stream_slices(self) -> Iterable[Optional[StreamSlice]]:  # type: ignore
         """

unit_tests/sources/declarative/parsers/test_model_to_component_factory.py

@@ -9,6 +9,7 @@
 import freezegun
 import pytest
 import requests
+from pydantic.v1 import ValidationError
 
 from airbyte_cdk import AirbyteTracedException
 from airbyte_cdk.models import (
@@ -161,9 +162,7 @@
     ClampingEndProvider,
     DayClampingStrategy,
     MonthClampingStrategy,
-    NoClamping,
     WeekClampingStrategy,
-    Weekday,
 )
 from airbyte_cdk.sources.streams.concurrent.cursor import ConcurrentCursor
 from airbyte_cdk.sources.streams.concurrent.state_converters.datetime_stream_state_converter import (
@@ -4375,7 +4374,7 @@ def test_create_property_chunking_invalid_property_limit_type():
 
     connector_builder_factory = ModelToComponentFactory(emit_connector_builder_messages=True)
 
-    with pytest.raises:
+    with pytest.raises(ValidationError):
         connector_builder_factory.create_component(
             model_type=PropertyChunkingModel,
             component_definition=property_chunking_model,

unit_tests/sources/declarative/requesters/query_properties/test_query_properties.py

@@ -2,8 +2,6 @@
 
 from unittest.mock import Mock
 
-import pytest
-
 from airbyte_cdk.sources.declarative.requesters.query_properties import (
     PropertiesFromEndpoint,
     QueryProperties,
@@ -115,51 +113,3 @@ def test_get_request_property_chunks_dynamic_endpoint():
     assert len(property_chunks) == 2
     assert property_chunks[0] == ["alice", "clover", "dio", "k", "luna"]
     assert property_chunks[1] == ["phi", "quark", "sigma", "tenmyouji"]
-
-
-@pytest.mark.parametrize(
-    "property_limit,expected_has_multiple_chunks",
-    [
-        pytest.param(
-            5,
-            True,
-            id="test_has_multiple_chunks",
-        ),
-        pytest.param(
-            10,
-            False,
-            id="test_has_multiple_chunks",
-        ),
-    ],
-)
-def test_has_multiple_chunks(property_limit, expected_has_multiple_chunks):
-    stream_slice = StreamSlice(cursor_slice={}, partition={})
-
-    query_properties = QueryProperties(
-        property_list=[
-            "ace",
-            "snake",
-            "santa",
-            "clover",
-            "junpei",
-            "june",
-            "seven",
-            "lotus",
-            "nine",
-        ],
-        always_include_properties=None,
-        property_chunking=PropertyChunking(
-            property_limit_type=PropertyLimitType.property_count,
-            property_limit=property_limit,
-            record_merge_strategy=GroupByKey(key="id", config=CONFIG, parameters={}),
-            config=CONFIG,
-            parameters={},
-        ),
-        config=CONFIG,
-        parameters={},
-    )
-
-    assert (
-        query_properties.has_multiple_chunks(stream_slice=stream_slice)
-        == expected_has_multiple_chunks
-    )