refactor: Improve code organization and extend stopwords validation

Three improvements:

1. Rename test class for clarity
   - TestMultipleCommandsScenarioIntegration → TestFieldModifierIntegration
   - test_mlp_commands_index_creation → test_index_creation_with_multiple_modifiers
   - Use general naming instead of MLP-specific terminology for open-source

2. Move imports to file level
   - Moved FilterQuery import from inside test function to top of file
   - Follows standard Python convention

3. Extend stopwords validation to AggregateHybridQuery
   - Added AggregateHybridQuery to stopwords warning in _validate_query()
   - Both TextQuery and AggregateHybridQuery now warn when using query-time
     stopwords with index-level STOPWORDS 0
   - Warning message now includes the specific query type for clarity

Author: nkanu17

redisvl/index/index.py

@@ -81,6 +81,7 @@
     FilterQuery,
     TextQuery,
 )
+from redisvl.query.aggregate import AggregateHybridQuery
 from redisvl.query.filter import FilterExpression
 from redisvl.redis.connection import (
     RedisConnectionFactory,
@@ -250,24 +251,25 @@ def _validate_query(self, query: BaseQuery) -> None:
                 )
 
         # Warn if using query-time stopwords with index-level STOPWORDS 0
-        if isinstance(query, TextQuery):
+        if isinstance(query, (TextQuery, AggregateHybridQuery)):
             index_stopwords = self.schema.index.stopwords
             query_stopwords = query.stopwords
 
             # Check if index has STOPWORDS 0 (empty list) and query has stopwords configured
-            # Note: query.stopwords is a set, and when stopwords=None is passed to TextQuery,
+            # Note: query.stopwords is a set, and when stopwords=None is passed to TextQuery/AggregateHybridQuery,
             # it becomes an empty set. So we check if the set is non-empty.
             if (
                 index_stopwords is not None
                 and len(index_stopwords) == 0
                 and len(query_stopwords) > 0
             ):
+                query_type = "TextQuery" if isinstance(query, TextQuery) else "AggregateHybridQuery"
                 warnings.warn(
-                    "Query-time stopwords are configured but the index has STOPWORDS 0 (stopwords = []). "
+                    f"Query-time stopwords are configured but the index has STOPWORDS 0 (stopwords = []). "
                     "This is counterproductive: all words including common words like 'of', 'the', 'a' are indexed, "
                     "but your query-time stopwords will filter them from the search query. "
                     "This makes your search less precise than it could be. "
-                    "Consider setting stopwords=None in TextQuery to search for all indexed words. "
+                    f"Consider setting stopwords=None in {query_type} to search for all indexed words. "
                     "See docs/stopwords_interaction_guide.md for more information.",
                     UserWarning,
                     stacklevel=3,

tests/integration/test_field_modifier_ordering_integration.py

@@ -304,10 +304,10 @@ def test_mixed_field_types_with_modifiers(self, client, redis_url, worker_id):
         index.delete(drop=True)
 
 
-class TestMultipleCommandsScenarioIntegration:
-    """Integration tests for mlp_commands.txt scenario."""
+class TestFieldModifierIntegration:
+    """Integration tests for complex field modifier combinations."""
 
-    def test_mlp_commands_index_creation(self, client, redis_url, worker_id):
+    def test_index_creation_with_multiple_modifiers(self, client, redis_url, worker_id):
         """Test creating index with INDEXMISSING SORTABLE UNF modifiers.
 
         This test verifies that an index with all three modifiers

tests/integration/test_stopwords_integration.py

@@ -3,6 +3,7 @@
 import pytest
 
 from redisvl.index import SearchIndex
+from redisvl.query import FilterQuery
 from redisvl.schema import IndexSchema
 
 
@@ -180,8 +181,6 @@ def test_stopwords_disabled_allows_searching_common_words(
         client.hset(key, mapping=data)
 
     # Search for "of" - should find "Bank of America"
-    from redisvl.query import FilterQuery
-
     query = FilterQuery(
         filter_expression="@title:(of)",
         return_fields=["title"],