airbyte-cdk 6.59.2.post2.dev16455545426__tar.gz → 6.60.0.post8.dev16482866899__tar.gz

{airbyte_cdk-6.59.2.post2.dev16455545426 → airbyte_cdk-6.60.0.post8.dev16482866899}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: airbyte-cdk
-Version: 6.59.2.post2.dev16455545426
+Version: 6.60.0.post8.dev16482866899
 Summary: A framework for writing Airbyte Connectors.
 Home-page: https://airbyte.com
 License: MIT
@@ -37,7 +37,7 @@ Requires-Dist: dpath (>=2.1.6,<3.0.0)
 Requires-Dist: dunamai (>=1.22.0,<2.0.0)
 Requires-Dist: fastavro (>=1.8.0,<1.9.0) ; extra == "file-based"
 Requires-Dist: genson (==1.3.0)
-Requires-Dist: google-cloud-secret-manager (>=2.17.0,<3.0.0)
+Requires-Dist: google-cloud-secret-manager (>=2.17.0,<3.0.0) ; extra == "dev"
 Requires-Dist: isodate (>=0.6.1,<0.7.0)
 Requires-Dist: jsonref (>=0.2,<0.3)
 Requires-Dist: jsonschema (>=4.17.3,<4.18.0)
@@ -52,7 +52,6 @@ Requires-Dist: packaging
 Requires-Dist: pandas (==2.2.2)
 Requires-Dist: pdf2image (==1.16.3) ; extra == "file-based"
 Requires-Dist: pdfminer.six (==20221105) ; extra == "file-based"
-Requires-Dist: psutil (==6.1.0)
 Requires-Dist: pyarrow (>=19.0.0,<20.0.0) ; extra == "file-based"
 Requires-Dist: pydantic (>=2.7,<3.0)
 Requires-Dist: pyjwt (>=2.8.0,<3.0.0)
@@ -64,12 +63,12 @@ Requires-Dist: python-dateutil (>=2.9.0,<3.0.0)
 Requires-Dist: python-snappy (==0.7.3) ; extra == "file-based"
 Requires-Dist: python-ulid (>=3.0.0,<4.0.0)
 Requires-Dist: pytz (==2024.2)
-Requires-Dist: rapidfuzz (>=3.10.1,<4.0.0)
 Requires-Dist: requests
 Requires-Dist: requests_cache
 Requires-Dist: rich
 Requires-Dist: rich-click (>=1.8.8,<2.0.0)
-Requires-Dist: serpyco-rs (>=1.10.2,<2.0.0)
+Requires-Dist: serpyco (>=1.3.0,<2.0.0) ; sys_platform == "emscripten"
+Requires-Dist: serpyco-rs (>=1.10.2,<2.0.0) ; sys_platform != "emscripten"
 Requires-Dist: setuptools (>=80.9.0,<81.0.0)
 Requires-Dist: sqlalchemy (>=2.0,<3.0,!=2.0.36) ; extra == "sql"
 Requires-Dist: tiktoken (==0.8.0) ; extra == "vector-db-based"

{airbyte_cdk-6.59.2.post2.dev16455545426 → airbyte_cdk-6.60.0.post8.dev16482866899}/airbyte_cdk/models/airbyte_protocol.py

@@ -2,11 +2,16 @@
 # Copyright (c) 2023 Airbyte, Inc., all rights reserved.
 #
 
+import sys
 from dataclasses import InitVar, dataclass
 from typing import Annotated, Any, Dict, List, Mapping, Optional, Union
 
 from airbyte_protocol_dataclasses.models import *  # noqa: F403  # Allow '*'
-from serpyco_rs.metadata import Alias
+
+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 *'
 

{airbyte_cdk-6.59.2.post2.dev16455545426 → airbyte_cdk-6.60.0.post8.dev16482866899}/airbyte_cdk/models/airbyte_protocol_serializers.py

@@ -1,8 +1,7 @@
 # Copyright (c) 2024 Airbyte, Inc., all rights reserved.
+import sys
 from typing import Any, Dict
 
-from serpyco_rs import CustomType, Serializer
-
 from .airbyte_protocol import (  # type: ignore[attr-defined] # all classes are imported to airbyte_protocol via *
     AirbyteCatalog,
     AirbyteMessage,
@@ -15,6 +14,14 @@ from .airbyte_protocol import (  # type: ignore[attr-defined] # all classes are
     ConnectorSpecification,
 )
 
+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
+
 
 class AirbyteStateBlobType(CustomType[AirbyteStateBlob, Dict[str, Any]]):
     def serialize(self, value: AirbyteStateBlob) -> Dict[str, Any]:

{airbyte_cdk-6.59.2.post2.dev16455545426 → airbyte_cdk-6.60.0.post8.dev16482866899}/airbyte_cdk/sources/declarative/declarative_component_schema.yaml

@@ -4175,13 +4175,16 @@ definitions:
         default: false
       condition:
         title: Condition
-        description: A condition that must be met for the mapping to be applied.
+        description: A condition that must be met for the mapping to be applied. This property is only supported for `ConfigComponentsResolver`.
         type: string
         interpolation_context:
           - config
           - stream_template_config
           - components_values
           - stream_slice
+        examples:
+          - "{{ components_values.get('cursor_field', None) }}"
+          - "{{ '_incremental' in components_values.get('stream_name', '') }}"
       $parameters:
         type: object
         additionalProperties: true

{airbyte_cdk-6.59.2.post2.dev16455545426 → airbyte_cdk-6.60.0.post8.dev16482866899}/airbyte_cdk/sources/declarative/models/declarative_component_schema.py

@@ -1496,7 +1496,11 @@ class ComponentMappingDefinition(BaseModel):
     )
     condition: Optional[str] = Field(
         None,
-        description="A condition that must be met for the mapping to be applied.",
+        description="A condition that must be met for the mapping to be applied. This property is only supported for `ConfigComponentsResolver`.",
+        examples=[
+            "{{ components_values.get('cursor_field', None) }}",
+            "{{ '_incremental' in components_values.get('stream_name', '') }}",
+        ],
         title="Condition",
     )
     parameters: Optional[Dict[str, Any]] = Field(None, alias="$parameters")

{airbyte_cdk-6.59.2.post2.dev16455545426 → airbyte_cdk-6.60.0.post8.dev16482866899}/airbyte_cdk/sources/declarative/parsers/model_to_component_factory.py

@@ -3819,16 +3819,19 @@ class ModelToComponentFactory:
             transformations=[],
         )
 
-        components_mapping = [
-            self._create_component_from_model(
-                model=components_mapping_definition_model,
-                value_type=ModelToComponentFactory._json_schema_type_name_to_type(
-                    components_mapping_definition_model.value_type
-                ),
-                config=config,
+        components_mapping = []
+        for component_mapping_definition_model in model.components_mapping:
+            if component_mapping_definition_model.condition:
+                raise ValueError("`condition` is only supported for     `ConfigComponentsResolver`")
+            components_mapping.append(
+                self._create_component_from_model(
+                    model=component_mapping_definition_model,
+                    value_type=ModelToComponentFactory._json_schema_type_name_to_type(
+                        component_mapping_definition_model.value_type
+                    ),
+                    config=config,
+                )
             )
-            for components_mapping_definition_model in model.components_mapping
-        ]
 
         return HttpComponentsResolver(
             retriever=retriever,
@@ -3892,16 +3895,20 @@ class ModelToComponentFactory:
         stream_parameters = StreamParametersDefinition(
             list_of_parameters_for_stream=model.stream_parameters.list_of_parameters_for_stream
         )
-        components_mapping = [
-            self._create_component_from_model(
-                model=components_mapping_definition_model,
-                value_type=ModelToComponentFactory._json_schema_type_name_to_type(
-                    components_mapping_definition_model.value_type
-                ),
-                config=config,
+
+        components_mapping = []
+        for components_mapping_definition_model in model.components_mapping:
+            if components_mapping_definition_model.condition:
+                raise ValueError("`condition` is only supported for `ConfigComponentsResolver`")
+            components_mapping.append(
+                self._create_component_from_model(
+                    model=components_mapping_definition_model,
+                    value_type=ModelToComponentFactory._json_schema_type_name_to_type(
+                        components_mapping_definition_model.value_type
+                    ),
+                    config=config,
+                )
             )
-            for components_mapping_definition_model in model.components_mapping
-        ]
         return ParametrizedComponentsResolver(
             stream_parameters=stream_parameters,
             config=config,

{airbyte_cdk-6.59.2.post2.dev16455545426 → airbyte_cdk-6.60.0.post8.dev16482866899}/airbyte_cdk/sources/declarative/resolvers/http_components_resolver.py

@@ -10,7 +10,6 @@ import dpath
 from typing_extensions import deprecated
 
 from airbyte_cdk.sources.declarative.interpolation import InterpolatedString
-from airbyte_cdk.sources.declarative.interpolation.interpolated_boolean import InterpolatedBoolean
 from airbyte_cdk.sources.declarative.resolvers.components_resolver import (
     ComponentMappingDefinition,
     ComponentsResolver,
@@ -50,12 +49,6 @@ class HttpComponentsResolver(ComponentsResolver):
             parameters (Mapping[str, Any]): Parameters for interpolation.
         """
         for component_mapping in self.components_mapping:
-            interpolated_condition = (
-                InterpolatedBoolean(condition=component_mapping.condition, parameters=parameters)
-                if component_mapping.condition
-                else None
-            )
-
             if isinstance(component_mapping.value, (str, InterpolatedString)):
                 interpolated_value = (
                     InterpolatedString.create(component_mapping.value, parameters=parameters)
@@ -74,7 +67,6 @@ class HttpComponentsResolver(ComponentsResolver):
                         value=interpolated_value,
                         value_type=component_mapping.value_type,
                         parameters=parameters,
-                        condition=interpolated_condition,
                     )
                 )
             else:
@@ -105,12 +97,6 @@ class HttpComponentsResolver(ComponentsResolver):
                 kwargs["stream_slice"] = stream_slice  # type: ignore[assignment] # stream_slice will always be of type Mapping[str, Any]
 
                 for resolved_component in self._resolved_components:
-                    if (
-                        resolved_component.condition is not None
-                        and not resolved_component.condition.eval(self.config, **kwargs)
-                    ):
-                        continue
-
                     valid_types = (
                         (resolved_component.value_type,) if resolved_component.value_type else None
                     )

{airbyte_cdk-6.59.2.post2.dev16455545426 → airbyte_cdk-6.60.0.post8.dev16482866899}/airbyte_cdk/sources/declarative/resolvers/parametrized_components_resolver.py

@@ -12,7 +12,6 @@ from typing_extensions import deprecated
 from yaml.parser import ParserError
 
 from airbyte_cdk.sources.declarative.interpolation import InterpolatedString
-from airbyte_cdk.sources.declarative.interpolation.interpolated_boolean import InterpolatedBoolean
 from airbyte_cdk.sources.declarative.resolvers.components_resolver import (
     ComponentMappingDefinition,
     ComponentsResolver,
@@ -56,12 +55,6 @@ class ParametrizedComponentsResolver(ComponentsResolver):
         """
 
         for component_mapping in self.components_mapping:
-            interpolated_condition = (
-                InterpolatedBoolean(condition=component_mapping.condition, parameters=parameters)
-                if component_mapping.condition
-                else None
-            )
-
             if isinstance(component_mapping.value, (str, InterpolatedString)):
                 interpolated_value = (
                     InterpolatedString.create(component_mapping.value, parameters=parameters)
@@ -81,7 +74,6 @@ class ParametrizedComponentsResolver(ComponentsResolver):
                         value_type=component_mapping.value_type,
                         create_or_update=component_mapping.create_or_update,
                         parameters=parameters,
-                        condition=interpolated_condition,
                     )
                 )
             else:
@@ -98,12 +90,6 @@ class ParametrizedComponentsResolver(ComponentsResolver):
             updated_config = deepcopy(stream_template_config)
             kwargs["components_values"] = components_values  # type: ignore[assignment] # component_values will always be of type Mapping[str, Any]
             for resolved_component in self._resolved_components:
-                if (
-                    resolved_component.condition is not None
-                    and not resolved_component.condition.eval(self.config, **kwargs)
-                ):
-                    continue
-
                 valid_types = (
                     (resolved_component.value_type,) if resolved_component.value_type else None
                 )

{airbyte_cdk-6.59.2.post2.dev16455545426 → airbyte_cdk-6.60.0.post8.dev16482866899}/airbyte_cdk/test/entrypoint_wrapper.py

@@ -17,6 +17,7 @@ than that, there are integrations point that are annoying to integrate with usin
 import json
 import logging
 import re
+import sys
 import tempfile
 import traceback
 from collections import deque
@@ -28,7 +29,11 @@ from typing import Any, List, Literal, Optional, Union, final, overload
 
 import orjson
 from pydantic import ValidationError as V2ValidationError
-from serpyco_rs import SchemaValidationError
+
+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

{airbyte_cdk-6.59.2.post2.dev16455545426 → airbyte_cdk-6.60.0.post8.dev16482866899}/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.59.2.post2.dev16455545426"  # Version will be calculated dynamically.
+version = "6.60.0.post8.dev16482866899"  # Version will be calculated dynamically.
 
 [tool.poetry-dynamic-versioning]
 enable = false
@@ -39,20 +39,18 @@ click = "^8.1.8"
 dpath = "^2.1.6"
 dunamai = "^1.22.0"
 genson = "1.3.0"
-google-cloud-secret-manager = "^2.17.0"
+google-cloud-secret-manager = { version = "^2.17.0", optional = true } # 'dev' extra
 isodate = "~0.6.1"
 Jinja2 = "~3.1.2"
 jsonref = "~0.2"
 jsonschema = "~4.17.3"  # 4.18 has some significant breaking changes: https://github.com/python-jsonschema/jsonschema/releases/tag/v4.18.0
 packaging = "*"  # Transitive dependency used directly in code
 pandas = "2.2.2"
-psutil = "6.1.0" # TODO: Remove if unused
 pydantic = "^2.7"
 pyrate-limiter = "~3.1.0"
 python-dateutil = "^2.9.0"
 python-ulid = "^3.0.0"
 PyYAML = "^6.0.1"
-rapidfuzz = "^3.10.1" # TODO: Remove if unused
 requests = "*"
 requests_cache = "*"
 rich = "*"  # Use whichever version meets other constraints
@@ -85,7 +83,8 @@ cryptography = ">=44.0.0,<45.0.0"  # Constrained as transitive dependency due to
 pytz = "2024.2"
 pytest = {version = "^7", optional = true }
 orjson = "^3.10.7"
-serpyco-rs = "^1.10.2"
+serpyco-rs = {version = "^1.10.2", markers = "sys_platform != 'emscripten'"}
+serpyco = {version = "^1.3.0", markers = "sys_platform == 'emscripten'"}
 sqlalchemy = {version = "^2.0,!=2.0.36", optional = true }
 xmltodict = ">=0.13,<0.15"
 anyascii = "^0.3.2"
@@ -120,7 +119,7 @@ deptry = "^0.23.0"
 file-based = ["avro", "fastavro", "pyarrow", "unstructured", "pdf2image", "pdfminer.six", "unstructured.pytesseract", "pytesseract", "markdown", "python-calamine", "python-snappy"]
 vector-db-based = ["langchain", "openai", "cohere", "tiktoken"]
 sql = ["sqlalchemy"]
-dev = ["pytest"]
+dev = ["pytest", "google-cloud-secret-manager"]
 
 [tool.poetry.scripts]
 
@@ -229,14 +228,12 @@ DEP001 = [
 DEP002 = [
   "setuptools",  # Incorrectly used without declaring in some connectors (e.g. source-shopify)
   "cryptography",  # Constrained as transitive dependency due to a bug in newer versions
-  "google-cloud-secret-manager",  # Deptry can't detect that `google.cloud.secretmanager_v1` uses this package
+  "google-cloud-secret-manager",  # Deptry can't detect that `google.cloud.secretmanager_v1` uses this package - optional 'dev' dependency
   "dateparser",  # Used by `source-amazon-seller-partner` for parsing string-formatted dates w/ timezone abbreviations. May add to `AirbyteDateTime`.
   "unidecode",  # IMPORTANT: DO NOT USE. Added to support source-google-sheets migration. This dep is deprecated in favour of `anyascii` and is slated for removal.
 
   # TODO: Remove these dependencies if not needed:
   "avro",  # Only imported in `unit_tests` code
-  "psutil",
-  "rapidfuzz",
   "cohere",
   "markdown",
   "openai",