updated after the review

Author: Oleksandr Bazarnov

airbyte_cdk/connector_builder/test_reader/reader.py

@@ -114,7 +114,7 @@ def run_test_read(
         stream = source.streams(config)[0]
 
         # get any deprecation warnings during the component creation
-        deprecation_warnings: List[AirbyteLogMessage] = source.deprecation_warnings()
+        deprecation_warnings: List[LogMessage] = source.deprecation_warnings()
 
         schema_inferrer = SchemaInferrer(
             self._pk_to_nested_and_composite_field(stream.primary_key),
@@ -130,8 +130,12 @@ def run_test_read(
         )
 
         slices, log_messages, auxiliary_requests, latest_config_update = self._categorise_groups(
-            message_group, deprecation_warnings
+            message_group
         )
+
+        # append deprecation warnings to the log messages
+        log_messages += deprecation_warnings
+
         schema, log_messages = self._get_infered_schema(
             configured_catalog, schema_inferrer, log_messages
         )
@@ -243,11 +247,7 @@ def _check_record_limit(self, record_limit: Optional[int] = None) -> int:
 
         return record_limit
 
-    def _categorise_groups(
-        self,
-        message_groups: MESSAGE_GROUPS,
-        deprecation_warnings: Optional[List[Any]] = None,
-    ) -> GROUPED_MESSAGES:
+    def _categorise_groups(self, message_groups: MESSAGE_GROUPS) -> GROUPED_MESSAGES:
         """
         Categorizes a sequence of message groups into slices, log messages, auxiliary requests, and the latest configuration update.
 
@@ -308,17 +308,6 @@ def _categorise_groups(
                 case _:
                     raise ValueError(f"Unknown message group type: {type(message_group)}")
 
-        # process deprecation warnings, if present
-        if deprecation_warnings is not None:
-            for deprecation in deprecation_warnings:
-                match deprecation:
-                    case AirbyteLogMessage():
-                        log_messages.append(
-                            LogMessage(message=deprecation.message, level=deprecation.level.value)
-                        )
-                    case _:
-                        raise ValueError(f"Unknown message group type: {type(deprecation)}")
-
         return slices, log_messages, auxiliary_requests, latest_config_update
 
     def _get_infered_schema(

airbyte_cdk/sources/declarative/declarative_source.py

@@ -6,8 +6,8 @@
 from abc import abstractmethod
 from typing import Any, List, Mapping, Tuple
 
-from airbyte_cdk.models import (
-    AirbyteLogMessage,
+from airbyte_cdk.connector_builder.models import (
+    LogMessage as ConnectorBuilderLogMessage,
 )
 from airbyte_cdk.sources.abstract_source import AbstractSource
 from airbyte_cdk.sources.declarative.checks.connection_checker import ConnectionChecker
@@ -38,7 +38,7 @@ def check_connection(
         """
         return self.connection_checker.check_connection(self, logger, config)
 
-    def deprecation_warnings(self) -> List[AirbyteLogMessage]:
+    def deprecation_warnings(self) -> List[ConnectorBuilderLogMessage]:
         """
         Returns a list of deprecation warnings for the source.
         """

airbyte_cdk/sources/declarative/manifest_declarative_source.py

@@ -15,9 +15,11 @@
 from jsonschema.validators import validate
 from packaging.version import InvalidVersion, Version
 
+from airbyte_cdk.connector_builder.models import (
+    LogMessage as ConnectorBuilderLogMessage,
+)
 from airbyte_cdk.models import (
     AirbyteConnectionStatus,
-    AirbyteLogMessage,
     AirbyteMessage,
     AirbyteStateMessage,
     ConfiguredAirbyteCatalog,
@@ -124,7 +126,7 @@ def dynamic_streams(self) -> List[Dict[str, Any]]:
             manifest=self._source_config, config=self._config, with_dynamic_stream_name=True
         )
 
-    def deprecation_warnings(self) -> List[AirbyteLogMessage]:
+    def deprecation_warnings(self) -> List[ConnectorBuilderLogMessage]:
         return self._constructor.get_model_deprecations()
 
     @property

airbyte_cdk/sources/declarative/models/base_model_with_deprecations.py

@@ -8,10 +8,7 @@
 
 from pydantic.v1 import BaseModel
 
-from airbyte_cdk.models import (
-    AirbyteLogMessage,
-    Level,
-)
+from airbyte_cdk.connector_builder.models import LogMessage as ConnectorBuilderLogMessage
 
 # format the warning message
 warnings.formatwarning = (
@@ -55,7 +52,7 @@ def __init__(self, **model_fields: Any) -> None:
         # set the placeholder for the default deprecation messages
         self._default_deprecation_messages: List[str] = []
         # set the placeholder for the deprecation logs
-        self._deprecation_logs: List[AirbyteLogMessage] = []
+        self._deprecation_logs: List[ConnectorBuilderLogMessage] = []
         # process deprecated fields, if present
         self._process_fields(model_fields)
         # emit default deprecation messages
@@ -130,7 +127,9 @@ def _create_warning(self, field_name: str, message: str) -> None:
             self._default_deprecation_messages.append(deprecated_message)
 
         # Create an Airbyte deprecation log message
-        deprecation_log_message = AirbyteLogMessage(level=Level.WARN, message=deprecated_message)
+        deprecation_log_message = ConnectorBuilderLogMessage(
+            level="WARN", message=deprecated_message
+        )
         # Add the deprecation message to the Airbyte log messages,
         # this logs are displayed in the Connector Builder.
         if deprecation_log_message not in self._deprecation_logs:

airbyte_cdk/sources/declarative/parsers/model_to_component_factory.py

@@ -27,7 +27,10 @@
 from isodate import parse_duration
 from pydantic.v1 import BaseModel
 
-from airbyte_cdk.models import AirbyteLogMessage, FailureType, Level
+from airbyte_cdk.connector_builder.models import (
+    LogMessage as ConnectorBuilderLogMessage,
+)
+from airbyte_cdk.models import FailureType, Level
 from airbyte_cdk.sources.connector_state_manager import ConnectorStateManager
 from airbyte_cdk.sources.declarative.async_job.job_orchestrator import AsyncJobOrchestrator
 from airbyte_cdk.sources.declarative.async_job.job_tracker import JobTracker
@@ -592,7 +595,7 @@ def __init__(
         self._api_budget: Optional[Union[APIBudget, HttpAPIBudget]] = None
         self._job_tracker: JobTracker = JobTracker(max_concurrent_async_job_count or 1)
         # placeholder for deprecation warnings
-        self._collected_deprecation_logs: List[AirbyteLogMessage] = []
+        self._collected_deprecation_logs: List[ConnectorBuilderLogMessage] = []
 
     def _init_mappings(self) -> None:
         self.PYDANTIC_MODEL_TO_CONSTRUCTOR: Mapping[Type[BaseModel], Callable[..., Any]] = {
@@ -747,7 +750,7 @@ def _create_component_from_model(self, model: BaseModel, config: Config, **kwarg
 
         return component_constructor(model=model, config=config, **kwargs)
 
-    def get_model_deprecations(self) -> List[Any]:
+    def get_model_deprecations(self) -> List[ConnectorBuilderLogMessage]:
         """
         Returns the deprecation warnings that were collected during the creation of components.
         """