Review fixes

Author: catsona

lib/dl_connector_ydb/dl_connector_ydb/core/base/adapter.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import datetime
 import logging
 from typing import (
     TYPE_CHECKING,
@@ -13,13 +12,15 @@
 
 import attr
 import sqlalchemy as sa
-import ydb_sqlalchemy as ydb_sa
+import ydb_sqlalchemy.sqlalchemy as ydb_sa
 
 from dl_core import exc
 from dl_core.connection_executors.adapters.adapters_base_sa_classic import BaseClassicAdapter
 from dl_core.connection_models import TableIdent
 import dl_sqlalchemy_ydb.dialect
 
+import dl_connector_ydb.core.base.row_converters
+
 
 if TYPE_CHECKING:
     from dl_core.connection_executors.models.connection_target_dto_base import BaseSQLConnTargetDTO  # noqa: F401
@@ -91,34 +92,10 @@ def _cursor_column_to_sa(self, cursor_col: tuple[Any, ...], require: bool = True
 
     _subselect_cursor_info_where_false: ClassVar[bool] = False
 
-    @staticmethod
-    def _convert_bytes(value: bytes) -> str:
-        return value.decode("utf-8", errors="replace")
-
-    @staticmethod
-    def _convert_interval(value: datetime.timedelta | int) -> int:
-        if value is None:
-            return None
-        if isinstance(value, datetime.timedelta):
-            return int(value.total_seconds() * 1_000_000)
-        return value
-
-    @staticmethod
-    def _convert_ts(value: int | datetime.datetime) -> datetime.datetime:
-        if isinstance(value, datetime.datetime):
-            return value.replace(tzinfo=datetime.timezone.utc)
-        return datetime.datetime.utcfromtimestamp(value / 1e6).replace(tzinfo=datetime.timezone.utc)
-
     def _get_row_converters(self, cursor_info: ExecutionStepCursorInfo) -> tuple[Optional[Callable[[Any], Any]], ...]:
-        type_names_norm = [col[1].lower().strip("?") for col in cursor_info.raw_cursor_description]
+        type_names_norm = [col[1].lower().replace("?", "") for col in cursor_info.raw_cursor_description]
         return tuple(
-            self._convert_bytes
-            if type_name_norm == "string"
-            else self._convert_ts
-            if type_name_norm == "timestamp"
-            else self._convert_interval
-            if type_name_norm == "interval"
-            else None
+            dl_connector_ydb.core.base.row_converters.ROW_CONVERTERS.get(type_name_norm, None)
             for type_name_norm in type_names_norm
         )
 

lib/dl_connector_ydb/dl_connector_ydb/core/base/row_converters.py

@@ -0,0 +1,33 @@
+import datetime
+from typing import (
+    Any,
+    Callable,
+)
+
+
+def convert_list_of_string(value: list[bytes | None]) -> list[str | None]:
+    return [v.decode("utf-8", errors="replace") if v is not None else None for v in value]
+
+
+def convert_bytes(value: bytes) -> str:
+    return value.decode("utf-8", errors="replace")
+
+
+def convert_interval(value: datetime.timedelta | int) -> int:
+    if isinstance(value, datetime.timedelta):
+        return int(value.total_seconds() * 1_000_000)
+    return value
+
+
+def convert_timestamp(value: int | datetime.datetime) -> datetime.datetime:
+    if isinstance(value, datetime.datetime):
+        return value.replace(tzinfo=datetime.timezone.utc)
+    return datetime.datetime.utcfromtimestamp(value / 1e6).replace(tzinfo=datetime.timezone.utc)
+
+
+ROW_CONVERTERS: dict[str, Callable[[Any], Any]] = {
+    "list<string>": convert_bytes,
+    "string": convert_bytes,
+    "timestamp": convert_timestamp,
+    "interval": convert_interval,
+}

lib/dl_connector_ydb/dl_connector_ydb/db_testing/engine_wrapper.py

@@ -13,7 +13,7 @@
 import sqlalchemy as sa
 from sqlalchemy.types import TypeEngine
 import ydb
-import ydb_sqlalchemy as ydb_sa
+import ydb_sqlalchemy.sqlalchemy as ydb_sa
 
 from dl_db_testing.database.engine_wrapper import EngineWrapperBase
 import dl_sqlalchemy_ydb.dialect

lib/dl_connector_ydb/dl_connector_ydb/formula/definitions/functions_datetime.py

@@ -1,6 +1,6 @@
 import sqlalchemy as sa
 from sqlalchemy.sql.elements import ClauseElement
-import ydb_sqlalchemy as ydb_sa
+import ydb_sqlalchemy.sqlalchemy as ydb_sa
 
 from dl_formula.connectors.base.literal import Literal
 from dl_formula.definitions.base import (

lib/dl_connector_ydb/dl_connector_ydb/formula/definitions/operators_binary.py

@@ -1,5 +1,5 @@
 import sqlalchemy as sa
-import ydb_sqlalchemy as ydb_sa
+import ydb_sqlalchemy.sqlalchemy as ydb_sa
 
 from dl_formula.definitions.base import TranslationVariant
 from dl_formula.definitions.common_datetime import (