move filters.py to SEA utils

Signed-off-by: varun-edachali-dbx <varun.edachali@databricks.com>

Author: varun-edachali-dbx

src/databricks/sql/backend/sea/backend.py

@@ -724,7 +724,7 @@ def get_tables(
         assert result is not None, "execute_command returned None in synchronous mode"
 
         # Apply client-side filtering by table_types
-        from databricks.sql.backend.filters import ResultSetFilter
+        from databricks.sql.backend.sea.utils.filters import ResultSetFilter
 
         result = ResultSetFilter.filter_tables_by_type(result, table_types)
 

src/databricks/sql/backend/filters.py renamed to src/databricks/sql/backend/sea/utils/filters.py

@@ -83,11 +83,11 @@ def _filter_sea_result_set(
 
     @staticmethod
     def filter_by_column_values(
-        result_set: ResultSet,
+        result_set: SeaResultSet,
         column_index: int,
         allowed_values: List[str],
         case_sensitive: bool = False,
-    ) -> ResultSet:
+    ) -> SeaResultSet:
         """
         Filter a result set by values in a specific column.
 
@@ -105,34 +105,24 @@ def filter_by_column_values(
         if not case_sensitive:
             allowed_values = [v.upper() for v in allowed_values]
 
-        # Determine the type of result set and apply appropriate filtering
-        from databricks.sql.result_set import SeaResultSet
-
-        if isinstance(result_set, SeaResultSet):
-            return ResultSetFilter._filter_sea_result_set(
-                result_set,
-                lambda row: (
-                    len(row) > column_index
-                    and isinstance(row[column_index], str)
-                    and (
-                        row[column_index].upper()
-                        if not case_sensitive
-                        else row[column_index]
-                    )
-                    in allowed_values
-                ),
-            )
-
-        # For other result set types, return the original (should be handled by specific implementations)
-        logger.warning(
-            f"Filtering not implemented for result set type: {type(result_set).__name__}"
+        return ResultSetFilter._filter_sea_result_set(
+            result_set,
+            lambda row: (
+                len(row) > column_index
+                and isinstance(row[column_index], str)
+                and (
+                    row[column_index].upper()
+                    if not case_sensitive
+                    else row[column_index]
+                )
+                in allowed_values
+            ),
         )
-        return result_set
 
     @staticmethod
     def filter_tables_by_type(
-        result_set: ResultSet, table_types: Optional[List[str]] = None
-    ) -> ResultSet:
+        result_set: SeaResultSet, table_types: Optional[List[str]] = None
+    ) -> SeaResultSet:
         """
         Filter a result set of tables by the specified table types.
 

tests/unit/test_filters.py

@@ -5,7 +5,7 @@
 import unittest
 from unittest.mock import MagicMock, patch
 
-from databricks.sql.backend.filters import ResultSetFilter
+from databricks.sql.backend.sea.utils.filters import ResultSetFilter
 
 
 class TestResultSetFilter(unittest.TestCase):
@@ -73,7 +73,9 @@ def test_filter_by_column_values(self):
         # Case 1: Case-sensitive filtering
         allowed_values = ["table1", "table3"]
 
-        with patch("databricks.sql.backend.filters.isinstance", return_value=True):
+        with patch(
+            "databricks.sql.backend.sea.utils.filters.isinstance", return_value=True
+        ):
             with patch(
                 "databricks.sql.result_set.SeaResultSet"
             ) as mock_sea_result_set_class:
@@ -98,7 +100,9 @@ def test_filter_by_column_values(self):
 
         # Case 2: Case-insensitive filtering
         mock_sea_result_set_class.reset_mock()
-        with patch("databricks.sql.backend.filters.isinstance", return_value=True):
+        with patch(
+            "databricks.sql.backend.sea.utils.filters.isinstance", return_value=True
+        ):
             with patch(
                 "databricks.sql.result_set.SeaResultSet"
             ) as mock_sea_result_set_class:
@@ -114,22 +118,14 @@ def test_filter_by_column_values(self):
                 )
                 mock_sea_result_set_class.assert_called_once()
 
-        # Case 3: Unsupported result set type
-        mock_unsupported_result_set = MagicMock()
-        with patch("databricks.sql.backend.filters.isinstance", return_value=False):
-            with patch("databricks.sql.backend.filters.logger") as mock_logger:
-                result = ResultSetFilter.filter_by_column_values(
-                    mock_unsupported_result_set, 0, ["value"], True
-                )
-                mock_logger.warning.assert_called_once()
-                self.assertEqual(result, mock_unsupported_result_set)
-
     def test_filter_tables_by_type(self):
         """Test filtering tables by type with various options."""
         # Case 1: Specific table types
         table_types = ["TABLE", "VIEW"]
 
-        with patch("databricks.sql.backend.filters.isinstance", return_value=True):
+        with patch(
+            "databricks.sql.backend.sea.utils.filters.isinstance", return_value=True
+        ):
             with patch.object(
                 ResultSetFilter, "filter_by_column_values"
             ) as mock_filter:
@@ -143,7 +139,9 @@ def test_filter_tables_by_type(self):
                 self.assertEqual(kwargs.get("case_sensitive"), True)
 
         # Case 2: Default table types (None or empty list)
-        with patch("databricks.sql.backend.filters.isinstance", return_value=True):
+        with patch(
+            "databricks.sql.backend.sea.utils.filters.isinstance", return_value=True
+        ):
             with patch.object(
                 ResultSetFilter, "filter_by_column_values"
             ) as mock_filter:

tests/unit/test_sea_backend.py

@@ -735,7 +735,7 @@ def test_get_tables(self, sea_client, sea_session_id, mock_cursor):
         ) as mock_execute:
             # Mock the filter_tables_by_type method
             with patch(
-                "databricks.sql.backend.filters.ResultSetFilter.filter_tables_by_type",
+                "databricks.sql.backend.sea.utils.filters.ResultSetFilter.filter_tables_by_type",
                 return_value=mock_result_set,
             ) as mock_filter:
                 # Case 1: With catalog name only