fix: use the same interface

evadb/interfaces/relational/db.py

@@ -20,7 +20,7 @@
 from evadb.database import EvaDBDatabase, init_evadb_instance
 from evadb.expression.tuple_value_expression import TupleValueExpression
 from evadb.interfaces.relational.relation import EvaDBQuery
-from evadb.interfaces.relational.utils import execute_statement, try_binding
+from evadb.interfaces.relational.utils import try_binding
 from evadb.models.server.response import Response
 from evadb.models.storage.batch import Batch
 from evadb.parser.alias import Alias
@@ -40,6 +40,7 @@
     parse_show,
     parse_table_clause,
 )
+from evadb.server.command_handler import execute_statement
 from evadb.udfs.udf_bootstrap_queries import init_builtin_udfs
 from evadb.utils.generic_utils import find_nearest_word, is_ray_enabled_and_installed
 from evadb.utils.logging_manager import logger

evadb/interfaces/relational/relation.py

@@ -20,7 +20,6 @@
 from evadb.interfaces.relational.utils import (
     create_limit_expression,
     create_star_expression,
-    execute_statement,
     handle_select_clause,
     sql_predicate_to_expresssion_tree,
     sql_string_to_expresssion_list,
@@ -34,6 +33,7 @@
 from evadb.parser.table_ref import JoinNode, TableRef
 from evadb.parser.types import JoinType
 from evadb.parser.utils import parse_sql_orderby_expr
+from evadb.server.command_handler import execute_statement
 
 
 class EvaDBQuery:

evadb/interfaces/relational/utils.py

@@ -16,14 +16,9 @@
 
 from evadb.binder.statement_binder import StatementBinder
 from evadb.binder.statement_binder_context import StatementBinderContext
-from evadb.database import EvaDBDatabase
-from evadb.executor.plan_executor import PlanExecutor
 from evadb.expression.abstract_expression import AbstractExpression
 from evadb.expression.constant_value_expression import ConstantValueExpression
 from evadb.expression.tuple_value_expression import TupleValueExpression
-from evadb.models.storage.batch import Batch
-from evadb.optimizer.plan_generator import PlanGenerator
-from evadb.optimizer.statement_to_opr_converter import StatementToPlanConverter
 from evadb.parser.select_statement import SelectStatement
 from evadb.parser.statement import AbstractStatement
 from evadb.parser.table_ref import TableRef
@@ -51,16 +46,6 @@ def sql_predicate_to_expresssion_tree(expr: str) -> AbstractExpression:
     return parse_predicate_expression(expr)
 
 
-def execute_statement(evadb: EvaDBDatabase, statement: AbstractStatement) -> Batch:
-    StatementBinder(StatementBinderContext(evadb.catalog)).bind(statement)
-    l_plan = StatementToPlanConverter().visit(statement)
-    p_plan = PlanGenerator(evadb).build(l_plan)
-    output = PlanExecutor(evadb, p_plan).execute_plan()
-    if output:
-        batch_list = list(output)
-        return Batch.concat(batch_list, copy=False)
-
-
 def string_to_lateral_join(expr: str, alias: str):
     return parse_lateral_join(expr, alias)
 

evadb/server/command_handler.py

@@ -23,11 +23,37 @@
 from evadb.optimizer.plan_generator import PlanGenerator
 from evadb.optimizer.statement_to_opr_converter import StatementToPlanConverter
 from evadb.parser.parser import Parser
+from evadb.parser.statement import AbstractStatement
 from evadb.parser.utils import SKIP_BINDER_AND_OPTIMIZER_STATEMENTS
 from evadb.utils.logging_manager import logger
 from evadb.utils.stats import Timer
 
 
+def execute_statement(
+    evadb: EvaDBDatabase,
+    stmt: AbstractStatement,
+    do_not_raise_exceptions: bool = False,
+    do_not_print_exceptions: bool = False,
+    **kwargs
+) -> Iterator[Batch]:
+    # For certain statements, we plan to omit binder and optimizer to keep the code
+    # clean. So, we handle such cases here and pass the statement directly to the
+    # executor.
+    plan_generator = kwargs.pop("plan_generator", PlanGenerator(evadb))
+    if not isinstance(stmt, SKIP_BINDER_AND_OPTIMIZER_STATEMENTS):
+        StatementBinder(StatementBinderContext(evadb.catalog)).bind(stmt)
+        l_plan = StatementToPlanConverter().visit(stmt)
+        p_plan = plan_generator.build(l_plan)
+    else:
+        p_plan = stmt
+    output = PlanExecutor(evadb, p_plan).execute_plan(
+        do_not_raise_exceptions, do_not_print_exceptions
+    )
+    if output:
+        batch_list = list(output)
+        return Batch.concat(batch_list, copy=False)
+
+
 def execute_query(
     evadb: EvaDBDatabase,
     query,
@@ -40,27 +66,17 @@ def execute_query(
     Execute the query and return a result generator.
     """
     query_compile_time = Timer()
-    plan_generator = kwargs.pop("plan_generator", PlanGenerator(evadb))
+
     with query_compile_time:
         stmt = Parser().parse(query)[0]
-
-        # For certain statements, we plan to omit binder and optimizer to keep the code
-        # clean. So, we handle such cases here and pass the statement directly to the
-        # executor.
-        if not isinstance(stmt, SKIP_BINDER_AND_OPTIMIZER_STATEMENTS):
-            StatementBinder(StatementBinderContext(evadb.catalog)).bind(stmt)
-            l_plan = StatementToPlanConverter().visit(stmt)
-            p_plan = plan_generator.build(l_plan)
-        else:
-            p_plan = stmt
-        output = PlanExecutor(evadb, p_plan).execute_plan(
-            do_not_raise_exceptions, do_not_print_exceptions
+        res_batch = execute_statement(
+            evadb, stmt, do_not_raise_exceptions, do_not_print_exceptions, **kwargs
         )
 
     if report_time is True:
         query_compile_time.log_elapsed_time("Query Compile Time")
 
-    return output
+    return res_batch
 
 
 def execute_query_fetch_all(
@@ -74,17 +90,15 @@ def execute_query_fetch_all(
     """
     Execute the query and fetch all results into one Batch object.
     """
-    output = execute_query(
+    res_batch = execute_query(
         evadb,
         query,
         report_time,
         do_not_raise_exceptions,
         do_not_print_exceptions,
         **kwargs
     )
-    if output:
-        batch_list = list(output)
-        return Batch.concat(batch_list, copy=False)
+    return res_batch
 
 
 async def handle_request(evadb: EvaDBDatabase, client_writer, request_message):

evadb/utils/generic_utils.py

@@ -471,6 +471,14 @@ def try_to_import_qdrant_client():
         )
 
 
+def is_qdrant_available() -> bool:
+    try:
+        try_to_import_qdrant_client()
+        return True
+    except ValueError:  # noqa: E722
+        return False
+
+
 ##############################
 ## UTILS
 ##############################

test/integration_tests/long/test_similarity.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 import os
 import unittest
-from test.markers import gpu_skip_marker
+from test.markers import gpu_skip_marker, qdrant_skip_marker
 from test.util import (
     create_sample_image,
     get_evadb_for_testing,
@@ -369,6 +369,7 @@ def test_end_to_end_index_scan_should_work_correctly_on_image_dataset(self):
         self.assertEqual(res_batch.frames["testsimilarityimagedataset._row_id"][0], 5)
 
     @gpu_skip_marker
+    @qdrant_skip_marker
     def test_end_to_end_index_scan_should_work_correctly_on_image_dataset_qdrant(self):
         create_index_query = """CREATE INDEX testFaissIndexImageDataset
                                     ON testSimilarityImageDataset (DummyFeatureExtractor(data))

test/markers.py

@@ -18,14 +18,18 @@
 
 import pytest
 
-from evadb.utils.generic_utils import is_gpu_available, is_ludwig_available
+from evadb.utils.generic_utils import (
+    is_gpu_available,
+    is_ludwig_available,
+    is_qdrant_available,
+)
 
 asyncio_skip_marker = pytest.mark.skipif(
     sys.version_info < (3, 8), reason="Test case requires asyncio support"
 )
 
 qdrant_skip_marker = pytest.mark.skipif(
-    sys.version_info.minor == 11,
+    is_qdrant_available() is False,
     reason="qdrant requires grcpio which is broken on 3.11",
 )