airbyte-cdk 6.60.0.post14.dev16483785754__py3-none-any.whl → 6.60.0.post16.dev16484674380__py3-none-any.whl

airbyte_cdk/models/airbyte_protocol.py

@@ -7,87 +7,3 @@ from dataclasses import InitVar, dataclass
 from typing import Annotated, Any, Dict, List, Mapping, Optional, Union
 
 from airbyte_protocol_dataclasses.models import *  # noqa: F403  # Allow '*'
-
-if sys.platform == 'emscripten':
-    from serpyco.metadata import Alias
-else:
-    from serpyco_rs.metadata import Alias
-
-# ruff: noqa: F405  # ignore fuzzy import issues with 'import *'
-
-
-@dataclass
-class AirbyteStateBlob:
-    """
-    A dataclass that dynamically sets attributes based on provided keyword arguments and positional arguments.
-    Used to "mimic" pydantic Basemodel with ConfigDict(extra='allow') option.
-
-    The `AirbyteStateBlob` class allows for flexible instantiation by accepting any number of keyword arguments
-    and positional arguments. These are used to dynamically update the instance's attributes. This class is useful
-    in scenarios where the attributes of an object are not known until runtime and need to be set dynamically.
-
-    Attributes:
-        kwargs (InitVar[Mapping[str, Any]]): A dictionary of keyword arguments used to set attributes dynamically.
-
-    Methods:
-        __init__(*args: Any, **kwargs: Any) -> None:
-            Initializes the `AirbyteStateBlob` by setting attributes from the provided arguments.
-
-        __eq__(other: object) -> bool:
-            Checks equality between two `AirbyteStateBlob` instances based on their internal dictionaries.
-            Returns `False` if the other object is not an instance of `AirbyteStateBlob`.
-    """
-
-    kwargs: InitVar[Mapping[str, Any]]
-
-    def __init__(self, *args: Any, **kwargs: Any) -> None:
-        # Set any attribute passed in through kwargs
-        for arg in args:
-            self.__dict__.update(arg)
-        for key, value in kwargs.items():
-            setattr(self, key, value)
-
-    def __eq__(self, other: object) -> bool:
-        return (
-            False
-            if not isinstance(other, AirbyteStateBlob)
-            else bool(self.__dict__ == other.__dict__)
-        )
-
-
-# The following dataclasses have been redeclared to include the new version of AirbyteStateBlob
-@dataclass
-class AirbyteStreamState:
-    stream_descriptor: StreamDescriptor  # type: ignore [name-defined]
-    stream_state: Optional[AirbyteStateBlob] = None
-
-
-@dataclass
-class AirbyteGlobalState:
-    stream_states: List[AirbyteStreamState]
-    shared_state: Optional[AirbyteStateBlob] = None
-
-
-@dataclass
-class AirbyteStateMessage:
-    type: Optional[AirbyteStateType] = None  # type: ignore [name-defined]
-    stream: Optional[AirbyteStreamState] = None
-    global_: Annotated[AirbyteGlobalState | None, Alias("global")] = (
-        None  # "global" is a reserved keyword in python ⇒ Alias is used for (de-)serialization
-    )
-    data: Optional[Dict[str, Any]] = None
-    sourceStats: Optional[AirbyteStateStats] = None  # type: ignore [name-defined]
-    destinationStats: Optional[AirbyteStateStats] = None  # type: ignore [name-defined]
-
-
-@dataclass
-class AirbyteMessage:
-    type: Type  # type: ignore [name-defined]
-    log: Optional[AirbyteLogMessage] = None  # type: ignore [name-defined]
-    spec: Optional[ConnectorSpecification] = None  # type: ignore [name-defined]
-    connectionStatus: Optional[AirbyteConnectionStatus] = None  # type: ignore [name-defined]
-    catalog: Optional[AirbyteCatalog] = None  # type: ignore [name-defined]
-    record: Optional[AirbyteRecordMessage] = None  # type: ignore [name-defined]
-    state: Optional[AirbyteStateMessage] = None
-    trace: Optional[AirbyteTraceMessage] = None  # type: ignore [name-defined]
-    control: Optional[AirbyteControlMessage] = None  # type: ignore [name-defined]

airbyte_cdk/models/airbyte_protocol_serializers.py

@@ -1,6 +1,9 @@
 # Copyright (c) 2024 Airbyte, Inc., all rights reserved.
 import sys
-from typing import Any, Dict
+from typing import Any, Dict, Type, TypeVar
+
+import orjson
+from pydantic import ValidationError
 
 from .airbyte_protocol import (  # type: ignore[attr-defined] # all classes are imported to airbyte_protocol via *
     AirbyteCatalog,
@@ -17,39 +20,98 @@ from .airbyte_protocol import (  # type: ignore[attr-defined] # all classes are
 USE_RUST_BACKEND = sys.platform != "emscripten"
 """When run in WASM, use the pure Python backend for serpyco."""
 
-if USE_RUST_BACKEND:
-    from serpyco_rs import CustomType, Serializer
-else:
-    from serpyco import CustomType, Serializer
 
+T = TypeVar("T")
+
+class CustomSerializer:
+    """Custom serializer that mimics serpyco-rs Serializer API"""
+
+    def __init__(
+        self,
+        model_class: Type[T],
+        omit_none: bool = False,
+        custom_type_resolver: Callable | None = None,
+    ):
+        self.model_class = model_class
+        self.omit_none = omit_none
+        self.custom_type_resolver = custom_type_resolver
+
+    def dump(self, obj: T) -> Dict[str, Any]:
+        """Convert dataclass to dictionary, omitting None values if configured"""
+        if hasattr(obj, "__dict__"):
+            result = {}
+            for key, value in obj.__dict__.items():
+                if self.omit_none and value is None:
+                    continue
+                # Handle custom types like AirbyteStateBlob
+                if self.custom_type_resolver and hasattr(value, "__class__"):
+                    custom_handler = self.custom_type_resolver(value.__class__)
+                    if custom_handler:
+                        value = custom_handler.serialize(value)
+                # Recursively handle nested objects
+                if hasattr(value, "__dict__"):
+                    value = self._serialize_nested(value)
+                elif isinstance(value, list):
+                    value = [
+                        self._serialize_nested(item) if hasattr(item, "__dict__") else item
+                        for item in value
+                    ]
+                result[key] = value
+            return result
+        return obj.__dict__ if hasattr(obj, "__dict__") else {}
 
-class AirbyteStateBlobType(CustomType[AirbyteStateBlob, Dict[str, Any]]):
-    def serialize(self, value: AirbyteStateBlob) -> Dict[str, Any]:
-        # cant use orjson.dumps() directly because private attributes are excluded, e.g. "__ab_full_refresh_sync_complete"
-        return {k: v for k, v in value.__dict__.items()}
+    def load(self, data: Dict[str, Any]) -> T:
+        """Convert dictionary to dataclass instance"""
+        # Handle custom types
+        return self.model_class(**data)
+
+    def _serialize_nested(self, obj: Any) -> Any:
+        """Helper to serialize nested objects"""
+        if hasattr(obj, "__dict__"):
+            result = {}
+            for key, value in obj.__dict__.items():
+                if self.omit_none and value is None:
+                    continue
+                result[key] = value
+            return result
+        return obj
+
+
+if USE_RUST_BACKEND:
+    from serpyco_rs import CustomType, Serializer  # type: ignore[import]
 
-    def deserialize(self, value: Dict[str, Any]) -> AirbyteStateBlob:
-        return AirbyteStateBlob(value)
+SERIALIZER = Serializer if USE_RUST_BACKEND else CustomSerializer
 
-    def get_json_schema(self) -> Dict[str, Any]:
-        return {"type": "object"}
+# Making this a no-op for now:
+custom_type_resolver = None
 
+# No idea why this is here. Commenting out for now.
+# def custom_type_resolver(t: type) -> AirbyteStateBlobType | None:
+#     return AirbyteStateBlobType() if t is AirbyteStateBlob else None
+#
+# class AirbyteStateBlobType(CustomType[AirbyteStateBlob, Dict[str, Any]]):
+#     def serialize(self, value: AirbyteStateBlob) -> Dict[str, Any]:
+#         # cant use orjson.dumps() directly because private attributes are excluded, e.g. "__ab_full_refresh_sync_complete"
+#         return {k: v for k, v in value.__dict__.items()}
 
-def custom_type_resolver(t: type) -> CustomType[AirbyteStateBlob, Dict[str, Any]] | None:
-    return AirbyteStateBlobType() if t is AirbyteStateBlob else None
+#     def deserialize(self, value: Dict[str, Any]) -> AirbyteStateBlob:
+#         return AirbyteStateBlob(value)
 
+#     def get_json_schema(self) -> Dict[str, Any]:
+#         return {"type": "object"}
 
-AirbyteCatalogSerializer = Serializer(AirbyteCatalog, omit_none=True)
-AirbyteStreamSerializer = Serializer(AirbyteStream, omit_none=True)
-AirbyteStreamStateSerializer = Serializer(
+# Create serializer instances maintaining the same API
+AirbyteCatalogSerializer = SERIALIZER(AirbyteCatalog, omit_none=True)
+AirbyteStreamSerializer = SERIALIZER(AirbyteStream, omit_none=True)
+AirbyteStreamStateSerializer = SERIALIZER(
     AirbyteStreamState, omit_none=True, custom_type_resolver=custom_type_resolver
 )
-AirbyteStateMessageSerializer = Serializer(
+AirbyteStateMessageSerializer = SERIALIZER(
     AirbyteStateMessage, omit_none=True, custom_type_resolver=custom_type_resolver
 )
-AirbyteMessageSerializer = Serializer(
+AirbyteMessageSerializer = SERIALIZER(
     AirbyteMessage, omit_none=True, custom_type_resolver=custom_type_resolver
 )
-ConfiguredAirbyteCatalogSerializer = Serializer(ConfiguredAirbyteCatalog, omit_none=True)
-ConfiguredAirbyteStreamSerializer = Serializer(ConfiguredAirbyteStream, omit_none=True)
-ConnectorSpecificationSerializer = Serializer(ConnectorSpecification, omit_none=True)
+ConfiguredAirbyteCatalogSerializer = SERIALIZER(ConfiguredAirbyteCatalog, omit_none=True)
+ConfiguredAirbyteStreamSerializer = SERIALIZER(ConfiguredAirbyteStream, omit_none=True)
+ConnectorSpecificationSerializer = SERIALIZER(ConnectorSpecification, omit_none=True)

airbyte_cdk/test/entrypoint_wrapper.py

@@ -30,11 +30,6 @@ from typing import Any, List, Literal, Optional, Union, final, overload
 import orjson
 from pydantic import ValidationError as V2ValidationError
 
-if sys.platform == 'emscripten':
-    from serpyco import SchemaValidationError
-else:
-    from serpyco_rs import SchemaValidationError
-
 from airbyte_cdk.entrypoint import AirbyteEntrypoint
 from airbyte_cdk.exception_handler import assemble_uncaught_exception
 from airbyte_cdk.logger import AirbyteLogFormatter
@@ -55,6 +50,13 @@ from airbyte_cdk.models import (
 from airbyte_cdk.sources import Source
 from airbyte_cdk.test.models.scenario import ExpectedOutcome
 
+JsonValidationErrors: tuple[type[Exception], ...] = (orjson.JSONDecodeError,)
+# Conditionally import and create a union type for exception handling
+if sys.platform != "emscripten":
+    from serpyco_rs import SchemaValidationError
+
+    JsonValidationErrors = (orjson.JSONDecodeError, SchemaValidationError)
+
 
 class AirbyteEntrypointException(Exception):
     """Exception raised for errors in the AirbyteEntrypoint execution.
@@ -123,7 +125,7 @@ class EntrypointOutput:
     def _parse_message(message: str) -> AirbyteMessage:
         try:
             return AirbyteMessageSerializer.load(orjson.loads(message))
-        except (orjson.JSONDecodeError, SchemaValidationError):
+        except JsonValidationErrors:
             # The platform assumes that logs that are not of AirbyteMessage format are log messages
             return AirbyteMessage(
                 type=Type.LOG, log=AirbyteLogMessage(level=Level.INFO, message=message)

{airbyte_cdk-6.60.0.post14.dev16483785754.dist-info → airbyte_cdk-6.60.0.post16.dev16484674380.dist-info}/METADATA

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

{airbyte_cdk-6.60.0.post14.dev16483785754.dist-info → airbyte_cdk-6.60.0.post16.dev16484674380.dist-info}/RECORD

@@ -49,8 +49,8 @@ airbyte_cdk/manifest_migrations/migrations/http_requester_url_base_to_url.py,sha
 airbyte_cdk/manifest_migrations/migrations/registry.yaml,sha256=F-hdapvl_vZnsI7CQsV00Rb7g7j4Nt2zaM83-Tbwgbg,956
 airbyte_cdk/manifest_migrations/migrations_registry.py,sha256=zly2fwaOxDukqC7eowzrDlvhA2v71FjW74kDzvRXhSY,2619
 airbyte_cdk/models/__init__.py,sha256=Et9wJWs5VOWynGbb-3aJRhsdAHAiLkNNLxdwqJAuqkw,2114
-airbyte_cdk/models/airbyte_protocol.py,sha256=KpKBePA74K_ay231JBIuQVePCwZa-b8qb0RKRdy-nGk,3707
-airbyte_cdk/models/airbyte_protocol_serializers.py,sha256=Rx7UXQOWckJ2BVkcM6vdVc3I4Tx17Ze4g5h75y8oY0Q,2129
+airbyte_cdk/models/airbyte_protocol.py,sha256=R1G1lvnBDRCZDa9_9Mgy5OEeyMXbvGWsDOnwQkImRKA,266
+airbyte_cdk/models/airbyte_protocol_serializers.py,sha256=4lJUZrnoLypM3BFagf4R64XyhRbsMfUffZ_1nHCDNKQ,4503
 airbyte_cdk/models/connector_metadata.py,sha256=BD6CO8c3mHavxRJAcwP29sHtNNVLVSNFNQLgHOVxrwA,3229
 airbyte_cdk/models/well_known_types.py,sha256=EquepbisGPuCSrs_D7YVVnMR9-ShhUr21wnFz3COiJs,156
 airbyte_cdk/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -380,7 +380,7 @@ airbyte_cdk/sql/shared/sql_processor.py,sha256=jR-hdLZsPf2sNBa_wvWKLvys8ZJ-SQCIi
 airbyte_cdk/sql/types.py,sha256=XEIhRAo_ASd0kVLBkdLf5bHiRhNple-IJrC9TibcDdY,5880
 airbyte_cdk/test/__init__.py,sha256=f_XdkOg4_63QT2k3BbKY34209lppwgw-svzfZstQEq4,199
 airbyte_cdk/test/catalog_builder.py,sha256=-y05Cz1x0Dlk6oE9LSKhCozssV2gYBNtMdV5YYOPOtk,3015
-airbyte_cdk/test/entrypoint_wrapper.py,sha256=RLWFMu01DnvAJr3wPcjQbMmb2OLNNKBEBPP0NTBhu44,18090
+airbyte_cdk/test/entrypoint_wrapper.py,sha256=Ha1yhuKRpjlC_hRcHB_3y5dtnhygkl-VIX4_WtpNKnU,18235
 airbyte_cdk/test/mock_http/__init__.py,sha256=jE5kC6CQ0OXkTqKhciDnNVZHesBFVIA2YvkdFGwva7k,322
 airbyte_cdk/test/mock_http/matcher.py,sha256=4Qj8UnJKZIs-eodshryce3SN1Ayc8GZpBETmP6hTEyc,1446
 airbyte_cdk/test/mock_http/mocker.py,sha256=XgsjMtVoeMpRELPyALgrkHFauH9H5irxrz1Kcxh2yFY,8013
@@ -424,9 +424,9 @@ airbyte_cdk/utils/slice_hasher.py,sha256=EDxgROHDbfG-QKQb59m7h_7crN1tRiawdf5uU7G
 airbyte_cdk/utils/spec_schema_transformations.py,sha256=-5HTuNsnDBAhj-oLeQXwpTGA0HdcjFOf2zTEMUTTg_Y,816
 airbyte_cdk/utils/stream_status_utils.py,sha256=ZmBoiy5HVbUEHAMrUONxZvxnvfV9CesmQJLDTAIWnWw,1171
 airbyte_cdk/utils/traced_exception.py,sha256=C8uIBuCL_E4WnBAOPSxBicD06JAldoN9fGsQDp463OY,6292
-airbyte_cdk-6.60.0.post14.dev16483785754.dist-info/LICENSE.txt,sha256=Wfe61S4BaGPj404v8lrAbvhjYR68SHlkzeYrg3_bbuM,1051
-airbyte_cdk-6.60.0.post14.dev16483785754.dist-info/LICENSE_SHORT,sha256=aqF6D1NcESmpn-cqsxBtszTEnHKnlsp8L4x9wAh3Nxg,55
-airbyte_cdk-6.60.0.post14.dev16483785754.dist-info/METADATA,sha256=FNr7dds6D131S9SVeA4PfdW9YpAVlU65oiMqhBUDJ-Y,6512
-airbyte_cdk-6.60.0.post14.dev16483785754.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-airbyte_cdk-6.60.0.post14.dev16483785754.dist-info/entry_points.txt,sha256=AKWbEkHfpzzk9nF9tqBUaw1MbvTM4mGtEzmZQm0ZWvM,139
-airbyte_cdk-6.60.0.post14.dev16483785754.dist-info/RECORD,,
+airbyte_cdk-6.60.0.post16.dev16484674380.dist-info/LICENSE.txt,sha256=Wfe61S4BaGPj404v8lrAbvhjYR68SHlkzeYrg3_bbuM,1051
+airbyte_cdk-6.60.0.post16.dev16484674380.dist-info/LICENSE_SHORT,sha256=aqF6D1NcESmpn-cqsxBtszTEnHKnlsp8L4x9wAh3Nxg,55
+airbyte_cdk-6.60.0.post16.dev16484674380.dist-info/METADATA,sha256=GDM0HugwhrNDrv8RkxuytvPw9-hRyp2tROFfiSJEvog,6512
+airbyte_cdk-6.60.0.post16.dev16484674380.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+airbyte_cdk-6.60.0.post16.dev16484674380.dist-info/entry_points.txt,sha256=AKWbEkHfpzzk9nF9tqBUaw1MbvTM4mGtEzmZQm0ZWvM,139
+airbyte_cdk-6.60.0.post16.dev16484674380.dist-info/RECORD,,