openmetadata-ingestion 1.8.7.0__py3-none-any.whl → 1.8.8.0__py3-none-any.whl

metadata/sampler/sqlalchemy/sampler.py

@@ -13,7 +13,6 @@ Helper module to handle data sampling
 for the profiler
 """
 import hashlib
-from contextlib import contextmanager
 from typing import List, Optional, Union, cast
 
 from sqlalchemy import Column, inspect, text
@@ -75,7 +74,7 @@ class SQASampler(SamplerInterface, SQAInterfaceMixin):
         self._table = self.build_table_orm(
             self.entity, self.service_connection_config, self.ometa_client
         )
-        self._active_sessions = set()
+        self.session_factory = create_and_bind_thread_safe_session(self.connection)
 
     @property
     def raw_dataset(self):
@@ -83,21 +82,7 @@ class SQASampler(SamplerInterface, SQAInterfaceMixin):
 
     def get_client(self):
         """Build the SQA Client"""
-        session_factory = create_and_bind_thread_safe_session(self.connection)
-        session = session_factory()
-        self._active_sessions.add(session)
-        return session
-
-    @contextmanager
-    def get_client_context(self):
-        """Get client as context manager for proper cleanup"""
-        session = self.get_client()
-        try:
-            yield session
-        finally:
-            if session in self._active_sessions:
-                self._active_sessions.remove(session)
-            session.close()
+        return self.session_factory()
 
     def set_tablesample(self, selectable: Table):
         """Set the tablesample for the table. To be implemented by the child SQA sampler class
@@ -147,17 +132,17 @@ class SQASampler(SamplerInterface, SQAInterfaceMixin):
         """
         # only sample the column if we are computing a column metric to limit the amount of data scaned
         selectable = self.set_tablesample(self.raw_dataset.__table__)
-        client = self.get_client()
 
-        entity = selectable if column is None else selectable.c.get(column.key)
-        if label is not None:
-            query = client.query(entity, label)
-        else:
-            query = client.query(entity)
+        with self.session_factory() as client:
+            entity = selectable if column is None else selectable.c.get(column.key)
+            if label is not None:
+                query = client.query(entity, label)
+            else:
+                query = client.query(entity)
 
-        if self.partition_details:
-            query = self.get_partitioned_query(query)
-        return query
+            if self.partition_details:
+                query = self.get_partitioned_query(query)
+            return query
 
     def get_sampler_table_name(self) -> str:
         """Get the base name of the SQA table for sampling.
@@ -172,34 +157,34 @@ class SQASampler(SamplerInterface, SQAInterfaceMixin):
 
     def get_sample_query(self, *, column=None) -> Query:
         """get query for sample data"""
-        client = self.get_client()
-        if self.sample_config.profileSampleType == ProfileSampleType.PERCENTAGE:
-            rnd = self._base_sample_query(
+        with self.session_factory() as client:
+            if self.sample_config.profileSampleType == ProfileSampleType.PERCENTAGE:
+                rnd = self._base_sample_query(
+                    column,
+                    (ModuloFn(RandomNumFn(), 100)).label(RANDOM_LABEL),
+                ).cte(f"{self.get_sampler_table_name()}_rnd")
+                session_query = client.query(rnd)
+                return session_query.where(
+                    rnd.c.random <= self.sample_config.profileSample
+                ).cte(f"{self.get_sampler_table_name()}_sample")
+
+            table_query = client.query(self.raw_dataset)
+            if self.partition_details:
+                table_query = self.get_partitioned_query(table_query)
+            session_query = self._base_sample_query(
                 column,
-                (ModuloFn(RandomNumFn(), 100)).label(RANDOM_LABEL),
-            ).cte(f"{self.get_sampler_table_name()}_rnd")
-            session_query = client.query(rnd)
-            return session_query.where(
-                rnd.c.random <= self.sample_config.profileSample
-            ).cte(f"{self.get_sampler_table_name()}_sample")
-
-        table_query = client.query(self.raw_dataset)
-        if self.partition_details:
-            table_query = self.get_partitioned_query(table_query)
-        session_query = self._base_sample_query(
-            column,
-            (ModuloFn(RandomNumFn(), table_query.count())).label(RANDOM_LABEL)
-            if self.sample_config.randomizedSample
-            else None,
-        )
-        query = (
-            session_query.order_by(RANDOM_LABEL)
-            if self.sample_config.randomizedSample
-            else session_query
-        )
-        return query.limit(self.sample_config.profileSample).cte(
-            f"{self.get_sampler_table_name()}_rnd"
-        )
+                (ModuloFn(RandomNumFn(), table_query.count())).label(RANDOM_LABEL)
+                if self.sample_config.randomizedSample
+                else None,
+            )
+            query = (
+                session_query.order_by(RANDOM_LABEL)
+                if self.sample_config.randomizedSample
+                else session_query
+            )
+            return query.limit(self.sample_config.profileSample).cte(
+                f"{self.get_sampler_table_name()}_rnd"
+            )
 
     def get_dataset(self, column=None, **__) -> Union[DeclarativeMeta, AliasedClass]:
         """
@@ -247,7 +232,7 @@ class SQASampler(SamplerInterface, SQAInterfaceMixin):
                 if col.name != RANDOM_LABEL and col.name in names
             ]
 
-        with self.get_client_context() as client:
+        with self.session_factory() as client:
 
             # Handle array columns with special query modification
             max_elements = self._get_max_array_elements()
@@ -298,7 +283,7 @@ class SQASampler(SamplerInterface, SQAInterfaceMixin):
         if not is_safe_sql_query(self.sample_query):
             raise RuntimeError(f"SQL expression is not safe\n\n{self.sample_query}")
 
-        with self.get_client_context() as client:
+        with self.session_factory() as client:
             rnd = client.execute(f"{self.sample_query}")
         try:
             columns = [col.name for col in rnd.cursor.description]
@@ -316,11 +301,11 @@ class SQASampler(SamplerInterface, SQAInterfaceMixin):
 
         stmt = text(f"{self.sample_query}")
         stmt = stmt.columns(*list(inspect(self.raw_dataset).c))
-        return (
-            self.get_client()
-            .query(stmt.subquery())
-            .cte(f"{self.get_sampler_table_name()}_user_sampled")
-        )
+
+        with self.session_factory() as client:
+            return client.query(stmt.subquery()).cte(
+                f"{self.get_sampler_table_name()}_user_sampled"
+            )
 
     def _partitioned_table(self) -> Query:
         """Return the Query object for partitioned tables"""
@@ -337,7 +322,9 @@ class SQASampler(SamplerInterface, SQAInterfaceMixin):
         )
         if query is not None:
             return query.filter(partition_filter)
-        return self.get_client().query(self.raw_dataset).filter(partition_filter)
+
+        with self.session_factory() as client:
+            return client.query(self.raw_dataset).filter(partition_filter)
 
     def get_columns(self):
         """get columns from entity"""
@@ -345,6 +332,15 @@ class SQASampler(SamplerInterface, SQAInterfaceMixin):
 
     def close(self):
         """Close the connection"""
-        for session in self._active_sessions:
-            session.close()
-        self.connection.pool.dispose()
+        try:
+            self.connection.pool.dispose()
+        except Exception as e:
+            logger.warning(f"Error disposing connection pool: {e}")
+
+    def __del__(self):
+        """Destructor to ensure cleanup when object is garbage collected"""
+        try:
+            self.close()
+        except Exception:
+            # Ignore errors during cleanup in destructor
+            pass

metadata/sampler/sqlalchemy/snowflake/sampler.py

@@ -91,5 +91,6 @@ class SnowflakeSampler(SQASampler):
         rnd = self._base_sample_query(column).cte(
             f"{self.get_sampler_table_name()}_rnd"
         )
-        query = self.get_client().query(rnd)
+        with self.session_factory() as client:
+            query = client.query(rnd)
         return query.cte(f"{self.get_sampler_table_name()}_sample")