airbyte-cdk 6.26.0.dev4102__tar.gz → 6.26.0.dev4104__tar.gz

{airbyte_cdk-6.26.0.dev4102 → airbyte_cdk-6.26.0.dev4104}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: airbyte-cdk
-Version: 6.26.0.dev4102
+Version: 6.26.0.dev4104
 Summary: A framework for writing Airbyte Connectors.
 License: MIT
 Keywords: airbyte,connector-development-kit,cdk

{airbyte_cdk-6.26.0.dev4102 → airbyte_cdk-6.26.0.dev4104}/airbyte_cdk/sources/file_based/config/abstract_file_based_spec.py

@@ -31,10 +31,8 @@ class DeliverRecords(BaseModel):
         default=False,
         airbyte_hidden=True,
     )
-    identities: Optional[IdentitiesStreamConfig] = Field(
-        title="Identities configuration",
-        description="Configuration for identities",
-        airbyte_hidden=True,
+    domain: Optional[str] = Field(
+        title="Domain", description="The domain of the identities.", airbyte_hidden=True
     )
 
 

{airbyte_cdk-6.26.0.dev4102 → airbyte_cdk-6.26.0.dev4104}/airbyte_cdk/sources/file_based/file_based_source.py

@@ -33,9 +33,6 @@ from airbyte_cdk.sources.file_based.config.file_based_stream_config import (
     FileBasedStreamConfig,
     ValidationPolicy,
 )
-from airbyte_cdk.sources.file_based.config.identities_based_stream_config import (
-    IdentitiesStreamConfig,
-)
 from airbyte_cdk.sources.file_based.discovery_policy import (
     AbstractDiscoveryPolicy,
     DefaultDiscoveryPolicy,
@@ -64,6 +61,7 @@ from airbyte_cdk.sources.file_based.stream.concurrent.cursor import (
     FileBasedFinalStateCursor,
 )
 from airbyte_cdk.sources.file_based.stream.cursor import AbstractFileBasedCursor
+from airbyte_cdk.sources.file_based.stream.identities_stream import IDENTITIES_STREAM_NAME
 from airbyte_cdk.sources.message.repository import InMemoryMessageRepository, MessageRepository
 from airbyte_cdk.sources.streams import Stream
 from airbyte_cdk.sources.streams.concurrent.cursor import CursorField
@@ -73,6 +71,7 @@ from airbyte_cdk.utils.traced_exception import AirbyteTracedException
 DEFAULT_CONCURRENCY = 100
 MAX_CONCURRENCY = 100
 INITIAL_N_PARTITIONS = MAX_CONCURRENCY // 2
+IDENTITIES_STREAM = "identities"
 
 
 class FileBasedSource(ConcurrentSourceAdapter, ABC):
@@ -301,11 +300,8 @@ class FileBasedSource(ConcurrentSourceAdapter, ABC):
 
                 streams.append(stream)
 
-            identities_stream_config = self._get_identities_stream_config(parsed_config)
-            if identities_stream_config:
-                identities_stream = self._make_identities_stream(
-                    stream_config=identities_stream_config
-                )
+            if self._sync_acl_permissions(parsed_config):
+                identities_stream = self._make_identities_stream()
                 streams.append(identities_stream)
             return streams
 
@@ -335,11 +331,9 @@ class FileBasedSource(ConcurrentSourceAdapter, ABC):
 
     def _make_identities_stream(
         self,
-        stream_config: IdentitiesStreamConfig,
     ) -> Stream:
         return IdentitiesStream(
-            config=stream_config,
-            catalog_schema=self.stream_schemas.get(stream_config.name),
+            catalog_schema=self.stream_schemas.get(IDENTITIES_STREAM_NAME),
             stream_reader=self.stream_reader,
             discovery_policy=self.discovery_policy,
             errors_collector=self.errors_collector,
@@ -457,18 +451,3 @@ class FileBasedSource(ConcurrentSourceAdapter, ABC):
         ):
             return parsed_config.delivery_method.sync_acl_permissions
         return False
-
-    @staticmethod
-    def _get_identities_stream_config(
-        parsed_config: AbstractFileBasedSpec,
-    ) -> Optional[IdentitiesStreamConfig]:
-        identities_stream_config = None
-        if (
-            FileBasedSource._sync_acl_permissions(parsed_config)
-            and hasattr(parsed_config.delivery_method, "identities")
-            and parsed_config.delivery_method.identities is not None
-            and isinstance(parsed_config.delivery_method.identities, IdentitiesStreamConfig)
-            and parsed_config.delivery_method.identities.domain
-        ):
-            identities_stream_config = parsed_config.delivery_method.identities
-        return identities_stream_config

{airbyte_cdk-6.26.0.dev4102 → airbyte_cdk-6.26.0.dev4104}/airbyte_cdk/sources/file_based/file_based_stream_reader.py

@@ -210,7 +210,7 @@ class AbstractFileBasedStreamReader(ABC):
         """
         return {}
 
-    def load_identity_groups(self) -> Iterable[Dict[str, Any]]:
+    def load_identity_groups(self, logger: logging.Logger) -> Iterable[Dict[str, Any]]:
         """
         This is required for connectors that will support syncing
         identities.

{airbyte_cdk-6.26.0.dev4102 → airbyte_cdk-6.26.0.dev4104}/airbyte_cdk/sources/file_based/stream/identities_stream.py

@@ -25,6 +25,8 @@ from airbyte_cdk.sources.streams.core import JsonSchema
 from airbyte_cdk.sources.utils.record_helper import stream_data_to_airbyte_message
 from airbyte_cdk.utils.traced_exception import AirbyteTracedException
 
+IDENTITIES_STREAM_NAME = "identities"
+
 
 class IdentitiesStream(Stream):
     """
@@ -36,14 +38,12 @@ class IdentitiesStream(Stream):
 
     def __init__(
         self,
-        config: IdentitiesStreamConfig,
         catalog_schema: Optional[Mapping[str, Any]],
         stream_reader: AbstractFileBasedStreamReader,
         discovery_policy: AbstractDiscoveryPolicy,
         errors_collector: FileBasedErrorsCollector,
     ):
         super().__init__()
-        self.config = config
         self.catalog_schema = catalog_schema
         self.stream_reader = stream_reader
         self._discovery_policy = discovery_policy
@@ -71,7 +71,7 @@ class IdentitiesStream(Stream):
         stream_state: Optional[Mapping[str, Any]] = None,
     ) -> Iterable[Mapping[str, Any] | AirbyteMessage]:
         try:
-            identity_groups = self.stream_reader.load_identity_groups()
+            identity_groups = self.stream_reader.load_identity_groups(logger=self.logger)
             for record in identity_groups:
                 yield stream_data_to_airbyte_message(self.name, record)
         except AirbyteTracedException as exc:
@@ -93,7 +93,7 @@ class IdentitiesStream(Stream):
 
     @property
     def name(self) -> str:
-        return self.config.name
+        return IDENTITIES_STREAM_NAME
 
     def get_cursor(self) -> Optional[Cursor]:
         return None

{airbyte_cdk-6.26.0.dev4102 → airbyte_cdk-6.26.0.dev4104}/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.26.0.dev04102"  # Version will be calculated dynamically.
+version = "6.26.0.dev04104"  # Version will be calculated dynamically.
 
 [tool.poetry-dynamic-versioning]
 enable = false