ingestr 0.13.65__tar.gz → 0.13.67__tar.gz

{ingestr-0.13.65 → ingestr-0.13.67}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ingestr
-Version: 0.13.65
+Version: 0.13.67
 Summary: ingestr is a command-line application that ingests data from various sources and stores them in any database.
 Project-URL: Homepage, https://github.com/bruin-data/ingestr
 Project-URL: Issues, https://github.com/bruin-data/ingestr/issues
@@ -179,7 +179,7 @@ Requires-Dist: snowflake-connector-python==3.14.0
 Requires-Dist: snowflake-sqlalchemy==1.6.1
 Requires-Dist: sortedcontainers==2.4.0
 Requires-Dist: sqlalchemy-bigquery==1.12.1
-Requires-Dist: sqlalchemy-cratedb==0.42.0.dev2
+Requires-Dist: sqlalchemy-cratedb==0.41.0
 Requires-Dist: sqlalchemy-hana==2.0.0
 Requires-Dist: sqlalchemy-redshift==0.8.14
 Requires-Dist: sqlalchemy-spanner==1.11.0
@@ -202,7 +202,7 @@ Requires-Dist: tzdata==2025.1
 Requires-Dist: tzlocal==5.3
 Requires-Dist: uritemplate==4.1.1
 Requires-Dist: urllib3==2.3.0
-Requires-Dist: verlib2==0.3.1
+Requires-Dist: verlib2==0.2.0
 Requires-Dist: wrapt==1.17.2
 Requires-Dist: yarl==1.18.3
 Requires-Dist: zeep==4.3.1

ingestr-0.13.67/ingestr/src/buildinfo.py

@@ -0,0 +1 @@
+version = "v0.13.67"

{ingestr-0.13.65 → ingestr-0.13.67}/ingestr/src/destinations.py

@@ -18,14 +18,6 @@ from dlt.common.storages.configuration import FileSystemCredentials
 from dlt.destinations.impl.clickhouse.configuration import (
     ClickHouseCredentials,
 )
-from dlt.destinations.impl.mssql.configuration import MsSqlClientConfiguration
-from dlt.destinations.impl.mssql.mssql import (
-    HINT_TO_MSSQL_ATTR,
-    MsSqlJobClient,
-)
-from dlt.destinations.impl.mssql.sql_client import (
-    PyOdbcMsSqlClient,
-)
 
 from ingestr.src.errors import MissingValueError
 from ingestr.src.loader import load_dlt_file
@@ -172,72 +164,90 @@ def handle_datetimeoffset(dto_value: bytes) -> datetime.datetime:
     )
 
 
-class OdbcMsSqlClient(PyOdbcMsSqlClient):
-    SQL_COPT_SS_ACCESS_TOKEN = 1256
-    SKIP_CREDENTIALS = {"PWD", "AUTHENTICATION", "UID"}
+# MSSQL_COPT_SS_ACCESS_TOKEN is a connection attribute used to pass
+# an Azure Active Directory access token to the SQL Server ODBC driver.
+MSSQL_COPT_SS_ACCESS_TOKEN = 1256
 
-    def open_connection(self):
-        cfg = self.credentials._get_odbc_dsn_dict()
-        if (
-            cfg.get("AUTHENTICATION", "").strip().lower()
-            != "activedirectoryaccesstoken"
-        ):
-            return super().open_connection()
 
-        import pyodbc  # type: ignore
+def serialize_azure_token(token):
+    # https://github.com/mkleehammer/pyodbc/issues/228#issuecomment-494773723
+    encoded = token.encode("utf_16_le")
+    return struct.pack("<i", len(encoded)) + encoded
 
-        dsn = ";".join(
-            [f"{k}={v}" for k, v in cfg.items() if k not in self.SKIP_CREDENTIALS]
-        )
 
-        self._conn = pyodbc.connect(
-            dsn,
-            timeout=self.credentials.connect_timeout,
-            attrs_before={
-                self.SQL_COPT_SS_ACCESS_TOKEN: self.serialize_token(cfg["PWD"]),
-            },
-        )
+def build_mssql_dest():
+    # https://github.com/bruin-data/ingestr/issues/293
 
-        # https://github.com/mkleehammer/pyodbc/wiki/Using-an-Output-Converter-function
-        self._conn.add_output_converter(-155, handle_datetimeoffset)
-        self._conn.autocommit = True
-        return self._conn
-
-    def serialize_token(self, token):
-        # https://github.com/mkleehammer/pyodbc/issues/228#issuecomment-494773723
-        encoded = token.encode("utf_16_le")
-        return struct.pack("<i", len(encoded)) + encoded
-
-
-class MsSqlClient(MsSqlJobClient):
-    def __init__(
-        self,
-        schema: Schema,
-        config: MsSqlClientConfiguration,
-        capabilities: DestinationCapabilitiesContext,
-    ) -> None:
-        sql_client = OdbcMsSqlClient(
-            config.normalize_dataset_name(schema),
-            config.normalize_staging_dataset_name(schema),
-            config.credentials,
-            capabilities,
-        )
-        super(MsSqlJobClient, self).__init__(schema, config, sql_client)
-        self.config: MsSqlClientConfiguration = config
-        self.sql_client = sql_client
-        self.active_hints = HINT_TO_MSSQL_ATTR if self.config.create_indexes else {}
-        self.type_mapper = capabilities.get_type_mapper()
+    from dlt.destinations.impl.mssql.configuration import MsSqlClientConfiguration
+    from dlt.destinations.impl.mssql.mssql import (
+        HINT_TO_MSSQL_ATTR,
+        MsSqlJobClient,
+    )
+    from dlt.destinations.impl.mssql.sql_client import (
+        PyOdbcMsSqlClient,
+    )
 
+    class OdbcMsSqlClient(PyOdbcMsSqlClient):
+        SKIP_CREDENTIALS = {"PWD", "AUTHENTICATION", "UID"}
 
-class MsSqlDestImpl(dlt.destinations.mssql):
-    @property
-    def client_class(self):
-        return MsSqlClient
+        def open_connection(self):
+            cfg = self.credentials._get_odbc_dsn_dict()
+            if (
+                cfg.get("AUTHENTICATION", "").strip().lower()
+                != "activedirectoryaccesstoken"
+            ):
+                return super().open_connection()
+
+            import pyodbc  # type: ignore
+
+            dsn = ";".join(
+                [f"{k}={v}" for k, v in cfg.items() if k not in self.SKIP_CREDENTIALS]
+            )
+
+            self._conn = pyodbc.connect(
+                dsn,
+                timeout=self.credentials.connect_timeout,
+                attrs_before={
+                    MSSQL_COPT_SS_ACCESS_TOKEN: serialize_azure_token(cfg["PWD"]),
+                },
+            )
+
+            # https://github.com/mkleehammer/pyodbc/wiki/Using-an-Output-Converter-function
+            self._conn.add_output_converter(-155, handle_datetimeoffset)
+            self._conn.autocommit = True
+            return self._conn
+
+    class MsSqlClient(MsSqlJobClient):
+        def __init__(
+            self,
+            schema: Schema,
+            config: MsSqlClientConfiguration,
+            capabilities: DestinationCapabilitiesContext,
+        ) -> None:
+            sql_client = OdbcMsSqlClient(
+                config.normalize_dataset_name(schema),
+                config.normalize_staging_dataset_name(schema),
+                config.credentials,
+                capabilities,
+            )
+            super(MsSqlJobClient, self).__init__(schema, config, sql_client)
+            self.config: MsSqlClientConfiguration = config
+            self.sql_client = sql_client
+            self.active_hints = HINT_TO_MSSQL_ATTR if self.config.create_indexes else {}
+            self.type_mapper = capabilities.get_type_mapper()
+
+    class MsSqlDestImpl(dlt.destinations.mssql):
+        @property
+        def client_class(self):
+            return MsSqlClient
+
+    return MsSqlDestImpl
 
 
 class MsSQLDestination(GenericSqlDestination):
     def dlt_dest(self, uri: str, **kwargs):
-        return MsSqlDestImpl(credentials=uri, **kwargs)
+        cls = build_mssql_dest()
+        return cls(credentials=uri, **kwargs)
 
 
 class DatabricksDestination(GenericSqlDestination):

{ingestr-0.13.65 → ingestr-0.13.67}/ingestr/src/sources.py

@@ -268,8 +268,9 @@ class SqlSource:
                 from sqlalchemy import create_engine
 
                 from ingestr.src.destinations import (
-                    OdbcMsSqlClient,
+                    MSSQL_COPT_SS_ACCESS_TOKEN,
                     handle_datetimeoffset,
+                    serialize_azure_token,
                 )
 
                 cfg = {
@@ -283,7 +284,7 @@ class SqlSource:
                     if k.lower() not in ["driver", "authentication", "connect_timeout"]:
                         cfg[k.upper()] = v[0]
 
-                token = OdbcMsSqlClient.serialize_token(None, parsed_uri.password)  # type: ignore[arg-type]
+                token = serialize_azure_token(parsed_uri.password)
                 dsn = ";".join([f"{k}={v}" for k, v in cfg.items()])
 
                 def creator():
@@ -292,7 +293,7 @@ class SqlSource:
                         autocommit=True,
                         timeout=kwargs.get("connect_timeout", 30),
                         attrs_before={
-                            OdbcMsSqlClient.SQL_COPT_SS_ACCESS_TOKEN: token,
+                            MSSQL_COPT_SS_ACCESS_TOKEN: token,
                         },
                     )
                     connection.add_output_converter(-155, handle_datetimeoffset)

{ingestr-0.13.65 → ingestr-0.13.67}/requirements.in

@@ -25,7 +25,7 @@ rich==13.9.4
 rudder-sdk-python==2.1.4
 snowflake-sqlalchemy==1.6.1
 sqlalchemy-bigquery==1.12.1
-sqlalchemy-cratedb==0.42.0.dev2
+sqlalchemy-cratedb==0.41.0
 sqlalchemy-hana==2.0.0
 sqlalchemy-redshift==0.8.14
 SQLAlchemy==1.4.52

{ingestr-0.13.65 → ingestr-0.13.67}/requirements.txt

@@ -553,7 +553,7 @@ sqlalchemy==1.4.52
     #   sqlalchemy-spanner
 sqlalchemy-bigquery==1.12.1
     # via -r requirements.in
-sqlalchemy-cratedb==0.42.0.dev2
+sqlalchemy-cratedb==0.41.0
     # via -r requirements.in
 sqlalchemy-hana==2.0.0
     # via -r requirements.in
@@ -626,7 +626,7 @@ urllib3==2.3.0
     #   pyairtable
     #   requests
     #   types-requests
-verlib2==0.3.1
+verlib2==0.2.0
     # via
     #   crate
     #   sqlalchemy-cratedb

{ingestr-0.13.65 → ingestr-0.13.67}/requirements_arm64.txt

@@ -546,7 +546,7 @@ sqlalchemy==1.4.52
     #   sqlalchemy-spanner
 sqlalchemy-bigquery==1.12.1
     # via -r requirements.in
-sqlalchemy-cratedb==0.42.0.dev2
+sqlalchemy-cratedb==0.41.0
     # via -r requirements.in
 sqlalchemy-hana==2.0.0
     # via -r requirements.in
@@ -622,7 +622,7 @@ urllib3==2.5.0
     #   pyairtable
     #   requests
     #   types-requests
-verlib2==0.3.1
+verlib2==0.2.0
     # via
     #   crate
     #   sqlalchemy-cratedb

ingestr-0.13.65/ingestr/src/buildinfo.py

@@ -1 +0,0 @@
-version = "v0.13.65"