review feedback

Author: miguelgrinberg

elasticsearch/dsl/_async/document.py

@@ -43,8 +43,7 @@
 
 if TYPE_CHECKING:
     from elasticsearch import AsyncElasticsearch
-
-    from ...esql.esql import ESQLBase
+    from elasticsearch.esql.esql import ESQLBase
 
 
 class AsyncIndexMeta(DocumentMeta):
@@ -561,13 +560,15 @@ async def esql_execute(
         # nested fields, which ES|QL does not return, causing an error. When passing
         # `ignore_missing_fields=True` the list will be generated with
         # `for_esql=True`, so the error will not occur, but the documents will
-        # not have any nested objects in them.
+        # not have any Nested objects in them.
         doc_fields = set(cls._get_field_names(for_esql=ignore_missing_fields))
         if not ignore_missing_fields and not doc_fields.issubset(set(query_columns)):
             raise ValueError(
                 f"Not all fields of {cls.__name__} were returned by the query. "
                 "Make sure your document does not use Nested fields, which are "
-                "currently not supported in ES|QL."
+                "currently not supported in ES|QL. To force the query to be "
+                "evaluated in spite of the missing fields, pass set the "
+                "ignore_missing_fields=True option in the esql_execute() call."
             )
         non_doc_fields: set[str] = set(query_columns) - doc_fields - {"_id"}
         index_id = query_columns.index("_id")

elasticsearch/dsl/_sync/document.py

@@ -43,8 +43,7 @@
 
 if TYPE_CHECKING:
     from elasticsearch import Elasticsearch
-
-    from ...esql.esql import ESQLBase
+    from elasticsearch.esql.esql import ESQLBase
 
 
 class IndexMeta(DocumentMeta):
@@ -553,13 +552,15 @@ def esql_execute(
         # nested fields, which ES|QL does not return, causing an error. When passing
         # `ignore_missing_fields=True` the list will be generated with
         # `for_esql=True`, so the error will not occur, but the documents will
-        # not have any nested objects in them.
+        # not have any Nested objects in them.
         doc_fields = set(cls._get_field_names(for_esql=ignore_missing_fields))
         if not ignore_missing_fields and not doc_fields.issubset(set(query_columns)):
             raise ValueError(
                 f"Not all fields of {cls.__name__} were returned by the query. "
                 "Make sure your document does not use Nested fields, which are "
-                "currently not supported in ES|QL."
+                "currently not supported in ES|QL. To force the query to be "
+                "evaluated in spite of the missing fields, pass set the "
+                "ignore_missing_fields=True option in the esql_execute() call."
             )
         non_doc_fields: set[str] = set(query_columns) - doc_fields - {"_id"}
         index_id = query_columns.index("_id")

elasticsearch/esql/esql.py

@@ -97,10 +97,7 @@ class ESQLBase(ABC):
     commands, used to build ES|QL queries.
     """
 
-    def __init__(
-        self,
-        parent: Optional["ESQLBase"] = None,
-    ):
+    def __init__(self, parent: Optional["ESQLBase"] = None):
         self._parent = parent
 
     def __repr__(self) -> str:

elasticsearch/esql/functions.py

@@ -649,7 +649,7 @@ def min_over_time(field: ExpressionType) -> InstrumentedExpression:
 
 
 def multi_match(
-    query: ExpressionType, *fields: ExpressionType, options: ExpressionType = None
+    query: ExpressionType, fields: ExpressionType, options: ExpressionType = None
 ) -> InstrumentedExpression:
     """Use `MULTI_MATCH` to perform a multi-match query on the specified field.
     The multi_match query builds on the match query to allow multi-field queries.