airbyte-cdk 6.8.0__tar.gz → 6.8.0rc1__tar.gz

{airbyte_cdk-6.8.0 → airbyte_cdk-6.8.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: airbyte-cdk
-Version: 6.8.0
+Version: 6.8.0rc1
 Summary: A framework for writing Airbyte Connectors.
 Home-page: https://airbyte.com
 License: MIT

{airbyte_cdk-6.8.0 → airbyte_cdk-6.8.0rc1}/airbyte_cdk/entrypoint.py

@@ -15,8 +15,8 @@ from functools import wraps
 from typing import Any, DefaultDict, Iterable, List, Mapping, Optional
 from urllib.parse import urlparse
 
-import orjson
 import requests
+from orjson import orjson
 from requests import PreparedRequest, Response, Session
 
 from airbyte_cdk.connector import TConfig
@@ -129,11 +129,7 @@ class AirbyteEntrypoint(object):
 
         source_spec: ConnectorSpecification = self.source.spec(self.logger)
         try:
-            with tempfile.TemporaryDirectory(
-                # Cleanup can fail on Windows due to file locks. Ignore if so,
-                # rather than failing the whole process.
-                ignore_cleanup_errors=True,
-            ) as temp_dir:
+            with tempfile.TemporaryDirectory() as temp_dir:
                 os.environ[ENV_REQUEST_CACHE_PATH] = (
                     temp_dir  # set this as default directory for request_cache to store *.sqlite files
                 )
@@ -250,18 +246,12 @@ class AirbyteEntrypoint(object):
     ) -> AirbyteMessage:
         match message.type:
             case Type.RECORD:
-                if message.record is None:
-                    raise ValueError("Record message must have a record attribute")
-
                 stream_message_count[
                     HashableStreamDescriptor(
                         name=message.record.stream, namespace=message.record.namespace
                     )
                 ] += 1.0  # type: ignore[union-attr] # record has `stream` and `namespace`
             case Type.STATE:
-                if message.state is None:
-                    raise ValueError("State message must have a state attribute")
-
                 stream_descriptor = message_utils.get_stream_descriptor(message)
 
                 # Set record count from the counter onto the state message

{airbyte_cdk-6.8.0 → airbyte_cdk-6.8.0rc1}/airbyte_cdk/sources/declarative/concurrent_declarative_source.py

@@ -200,23 +200,23 @@ class ConcurrentDeclarativeSource(ManifestDeclarativeSource, Generic[TState]):
             # Some low-code sources use a combination of DeclarativeStream and regular Python streams. We can't inspect
             # these legacy Python streams the way we do low-code streams to determine if they are concurrent compatible,
             # so we need to treat them as synchronous
-            if (
-                isinstance(declarative_stream, DeclarativeStream)
-                and name_to_stream_mapping[declarative_stream.name].get("retriever")["type"]
-                == "SimpleRetriever"
-            ):
+            if isinstance(declarative_stream, DeclarativeStream):
                 incremental_sync_component_definition = name_to_stream_mapping[
                     declarative_stream.name
                 ].get("incremental_sync")
 
+                is_without_partition_router_or_cursor = not bool(
+                    incremental_sync_component_definition
+                ) and not (
+                    name_to_stream_mapping[declarative_stream.name]
+                    .get("retriever", {})
+                    .get("partition_router")
+                )
                 partition_router_component_definition = (
                     name_to_stream_mapping[declarative_stream.name]
                     .get("retriever")
                     .get("partition_router")
                 )
-                is_without_partition_router_or_cursor = not bool(
-                    incremental_sync_component_definition
-                ) and not bool(partition_router_component_definition)
 
                 is_substream_without_incremental = (
                     partition_router_component_definition
@@ -272,8 +272,9 @@ class ConcurrentDeclarativeSource(ManifestDeclarativeSource, Generic[TState]):
                         )
                     )
                 elif (
-                    is_substream_without_incremental or is_without_partition_router_or_cursor
-                ) and hasattr(declarative_stream.retriever, "stream_slicer"):
+                    is_substream_without_incremental
+                    and hasattr(declarative_stream.retriever, "stream_slicer")
+                ) or is_without_partition_router_or_cursor:
                     partition_generator = StreamSlicerPartitionGenerator(
                         DeclarativePartitionFactory(
                             declarative_stream.name,
@@ -314,12 +315,10 @@ class ConcurrentDeclarativeSource(ManifestDeclarativeSource, Generic[TState]):
         return concurrent_streams, synchronous_streams
 
     def _is_datetime_incremental_without_partition_routing(
-        self,
-        declarative_stream: DeclarativeStream,
-        incremental_sync_component_definition: Mapping[str, Any],
-    ) -> bool:
+        self, declarative_stream, incremental_sync_component_definition
+    ):
         return (
-            bool(incremental_sync_component_definition)
+            incremental_sync_component_definition
             and incremental_sync_component_definition.get("type", "")
             == DatetimeBasedCursorModel.__name__
             and self._stream_supports_concurrent_partition_processing(

{airbyte_cdk-6.8.0 → airbyte_cdk-6.8.0rc1}/airbyte_cdk/sources/streams/concurrent/helpers.py

@@ -13,15 +13,8 @@ def get_primary_key_from_stream(
     elif isinstance(stream_primary_key, str):
         return [stream_primary_key]
     elif isinstance(stream_primary_key, list):
-        are_all_elements_str = all(isinstance(k, str) for k in stream_primary_key)
-        are_all_elements_list_of_size_one = all(
-            isinstance(k, list) and len(k) == 1 for k in stream_primary_key
-        )
-
-        if are_all_elements_str:
+        if len(stream_primary_key) > 0 and all(isinstance(k, str) for k in stream_primary_key):
             return stream_primary_key  # type: ignore # We verified all items in the list are strings
-        elif are_all_elements_list_of_size_one:
-            return list(map(lambda x: x[0], stream_primary_key))
         else:
             raise ValueError(f"Nested primary keys are not supported. Found {stream_primary_key}")
     else:

{airbyte_cdk-6.8.0 → airbyte_cdk-6.8.0rc1}/pyproject.toml

@@ -23,7 +23,7 @@ classifiers = [
 keywords = ["airbyte", "connector-development-kit", "cdk"]
 
 # Python CDK uses dynamic versioning: https://github.com/mtkennerly/poetry-dynamic-versioning
-version = "6.8.0"  # Version will be calculated dynamically.
+version = "6.8.0rc1"  # Version will be calculated dynamically.
 
 [tool.poetry-dynamic-versioning]
 enable = false