vector db work (split)

Author: aaronsteers

airbyte_cdk/__init__.py

@@ -193,7 +193,6 @@
 from .utils.constants import ENV_REQUEST_CACHE_PATH
 from .utils.event_timing import create_timer
 from .utils.oneof_option_config import OneOfOptionConfig
-from .utils.spec_schema_transformations import resolve_refs
 from .utils.stream_status_utils import as_airbyte_message
 
 __all__ = [
@@ -340,7 +339,6 @@
     "ENV_REQUEST_CACHE_PATH",
     "create_timer",
     "OneOfOptionConfig",
-    "resolve_refs",
     "as_airbyte_message",
     # Types
     "Config",

airbyte_cdk/destinations/vector_db_based/config.py

@@ -7,8 +7,8 @@
 import dpath
 from pydantic.v1 import BaseModel, Field
 
+from airbyte_cdk.sources.utils.schema_helpers import expand_refs
 from airbyte_cdk.utils.oneof_option_config import OneOfOptionConfig
-from airbyte_cdk.utils.spec_schema_transformations import resolve_refs
 
 
 class SeparatorSplitterConfigModel(BaseModel):
@@ -293,6 +293,6 @@ def remove_discriminator(schema: Dict[str, Any]) -> None:
     def schema(cls, by_alias: bool = True, ref_template: str = "") -> Dict[str, Any]:
         """we're overriding the schema classmethod to enable some post-processing"""
         schema: Dict[str, Any] = super().schema()
-        schema = resolve_refs(schema)
+        expand_refs(schema)
         cls.remove_discriminator(schema)
         return schema

airbyte_cdk/utils/spec_schema_transformations.py

@@ -901,12 +901,7 @@ def test_handle_429_response():
 
     limits = TestLimits()
     catalog = ConfiguredAirbyteCatalogSerializer.load(CONFIGURED_CATALOG)
-    source = create_source(
-        config=config,
-        limits=limits,
-        catalog=catalog,
-        state=None,
-    )
+    source = create_source(config=config, limits=limits, catalog=catalog, state=None)
 
     with patch("requests.Session.send", return_value=response) as mock_send:
         response = handle_connector_builder_request(

unit_tests/connector_builder/test_connector_builder_handler.py

@@ -15,7 +15,7 @@
     OpenAIEmbeddingConfigModel,
     ProcessingConfigModel,
 )
-from airbyte_cdk.utils.spec_schema_transformations import resolve_refs
+from airbyte_cdk.sources.utils.schema_helpers import expand_refs
 
 
 class IndexingModel(BaseModel):
@@ -64,7 +64,7 @@ def remove_discriminator(schema: dict) -> None:
     def schema(cls):
         """we're overriding the schema classmethod to enable some post-processing"""
         schema = super().schema()
-        schema = resolve_refs(schema)
+        schema = expand_refs(schema)
         cls.remove_discriminator(schema)
         return schema