Skip to content

Commit 4cd7fec

Browse files
miguelgrinbergmiguelgrinberg
committed
add integration test
1 parent cf1c30a commit 4cd7fec

File tree

3 files changed

+172
-0
lines changed

3 files changed

+172
-0
lines changed

‎elasticsearch/dsl/field.py‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,7 @@ class AggregateMetricDouble(Field):
584584
"""
585585
:arg default_metric: (required)
586586
:arg metrics: (required)
587+
:arg ignore_malformed:
587588
:arg time_series_metric:
588589
:arg meta: Metadata about the field.
589590
:arg properties:
@@ -604,6 +605,7 @@ def __init__(
604605
*args: Any,
605606
default_metric: Union[str, "DefaultType"] = DEFAULT,
606607
metrics: Union[Sequence[str], "DefaultType"] = DEFAULT,
608+
ignore_malformed: Union[bool, "DefaultType"] = DEFAULT,
607609
time_series_metric: Union[
608610
Literal["gauge", "counter", "summary", "histogram", "position"],
609611
"DefaultType",
@@ -624,6 +626,8 @@ def __init__(
624626
kwargs["default_metric"] = default_metric
625627
if metrics is not DEFAULT:
626628
kwargs["metrics"] = metrics
629+
if ignore_malformed is not DEFAULT:
630+
kwargs["ignore_malformed"] = ignore_malformed
627631
if time_series_metric is not DEFAULT:
628632
kwargs["time_series_metric"] = time_series_metric
629633
if meta is not DEFAULT:
@@ -1798,6 +1802,7 @@ class Flattened(Field):
17981802
:arg null_value:
17991803
:arg similarity:
18001804
:arg split_queries_on_whitespace:
1805+
:arg time_series_dimensions:
18011806
:arg meta: Metadata about the field.
18021807
:arg properties:
18031808
:arg ignore_above:
@@ -1826,6 +1831,7 @@ def __init__(
18261831
null_value: Union[str, "DefaultType"] = DEFAULT,
18271832
similarity: Union[str, "DefaultType"] = DEFAULT,
18281833
split_queries_on_whitespace: Union[bool, "DefaultType"] = DEFAULT,
1834+
time_series_dimensions: Union[Sequence[str], "DefaultType"] = DEFAULT,
18291835
meta: Union[Mapping[str, str], "DefaultType"] = DEFAULT,
18301836
properties: Union[Mapping[str, Field], "DefaultType"] = DEFAULT,
18311837
ignore_above: Union[int, "DefaultType"] = DEFAULT,
@@ -1856,6 +1862,8 @@ def __init__(
18561862
kwargs["similarity"] = similarity
18571863
if split_queries_on_whitespace is not DEFAULT:
18581864
kwargs["split_queries_on_whitespace"] = split_queries_on_whitespace
1865+
if time_series_dimensions is not DEFAULT:
1866+
kwargs["time_series_dimensions"] = time_series_dimensions
18591867
if meta is not DEFAULT:
18601868
kwargs["meta"] = meta
18611869
if properties is not DEFAULT:
@@ -1957,6 +1965,7 @@ class GeoPoint(Field):
19571965
:arg index:
19581966
:arg on_script_error:
19591967
:arg script:
1968+
:arg time_series_metric:
19601969
:arg doc_values:
19611970
:arg copy_to:
19621971
:arg store:
@@ -1990,6 +1999,9 @@ def __init__(
19901999
index: Union[bool, "DefaultType"] = DEFAULT,
19912000
on_script_error: Union[Literal["fail", "continue"], "DefaultType"] = DEFAULT,
19922001
script: Union["types.Script", Dict[str, Any], "DefaultType"] = DEFAULT,
2002+
time_series_metric: Union[
2003+
Literal["gauge", "counter", "position"], "DefaultType"
2004+
] = DEFAULT,
19932005
doc_values: Union[bool, "DefaultType"] = DEFAULT,
19942006
copy_to: Union[
19952007
Union[str, "InstrumentedField"],
@@ -2021,6 +2033,8 @@ def __init__(
20212033
kwargs["on_script_error"] = on_script_error
20222034
if script is not DEFAULT:
20232035
kwargs["script"] = script
2036+
if time_series_metric is not DEFAULT:
2037+
kwargs["time_series_metric"] = time_series_metric
20242038
if doc_values is not DEFAULT:
20252039
kwargs["doc_values"] = doc_values
20262040
if copy_to is not DEFAULT:
@@ -3536,6 +3550,62 @@ def __init__(
35363550
super().__init__(*args, **kwargs)
35373551

35383552

3553+
class RankVectors(Field):
3554+
"""
3555+
Technical preview
3556+
3557+
:arg element_type:
3558+
:arg dims:
3559+
:arg meta: Metadata about the field.
3560+
:arg properties:
3561+
:arg ignore_above:
3562+
:arg dynamic:
3563+
:arg fields:
3564+
:arg synthetic_source_keep:
3565+
"""
3566+
3567+
name = "rank_vectors"
3568+
_param_defs = {
3569+
"properties": {"type": "field", "hash": True},
3570+
"fields": {"type": "field", "hash": True},
3571+
}
3572+
3573+
def __init__(
3574+
self,
3575+
*args: Any,
3576+
element_type: Union[Literal["byte", "float", "bit"], "DefaultType"] = DEFAULT,
3577+
dims: Union[int, "DefaultType"] = DEFAULT,
3578+
meta: Union[Mapping[str, str], "DefaultType"] = DEFAULT,
3579+
properties: Union[Mapping[str, Field], "DefaultType"] = DEFAULT,
3580+
ignore_above: Union[int, "DefaultType"] = DEFAULT,
3581+
dynamic: Union[
3582+
Literal["strict", "runtime", "true", "false"], bool, "DefaultType"
3583+
] = DEFAULT,
3584+
fields: Union[Mapping[str, Field], "DefaultType"] = DEFAULT,
3585+
synthetic_source_keep: Union[
3586+
Literal["none", "arrays", "all"], "DefaultType"
3587+
] = DEFAULT,
3588+
**kwargs: Any,
3589+
):
3590+
if element_type is not DEFAULT:
3591+
kwargs["element_type"] = element_type
3592+
if dims is not DEFAULT:
3593+
kwargs["dims"] = dims
3594+
if meta is not DEFAULT:
3595+
kwargs["meta"] = meta
3596+
if properties is not DEFAULT:
3597+
kwargs["properties"] = properties
3598+
if ignore_above is not DEFAULT:
3599+
kwargs["ignore_above"] = ignore_above
3600+
if dynamic is not DEFAULT:
3601+
kwargs["dynamic"] = dynamic
3602+
if fields is not DEFAULT:
3603+
kwargs["fields"] = fields
3604+
if synthetic_source_keep is not DEFAULT:
3605+
kwargs["synthetic_source_keep"] = synthetic_source_keep
3606+
super().__init__(*args, **kwargs)
3607+
3608+
35393609
class ScaledFloat(Float):
35403610
"""
35413611
:arg null_value:
@@ -4010,6 +4080,7 @@ def __init__(
40104080

40114081
class SparseVector(Field):
40124082
"""
4083+
:arg store:
40134084
:arg meta: Metadata about the field.
40144085
:arg properties:
40154086
:arg ignore_above:
@@ -4027,6 +4098,7 @@ class SparseVector(Field):
40274098
def __init__(
40284099
self,
40294100
*args: Any,
4101+
store: Union[bool, "DefaultType"] = DEFAULT,
40304102
meta: Union[Mapping[str, str], "DefaultType"] = DEFAULT,
40314103
properties: Union[Mapping[str, Field], "DefaultType"] = DEFAULT,
40324104
ignore_above: Union[int, "DefaultType"] = DEFAULT,
@@ -4039,6 +4111,8 @@ def __init__(
40394111
] = DEFAULT,
40404112
**kwargs: Any,
40414113
):
4114+
if store is not DEFAULT:
4115+
kwargs["store"] = store
40424116
if meta is not DEFAULT:
40434117
kwargs["meta"] = meta
40444118
if properties is not DEFAULT:

‎test_elasticsearch/test_dsl/test_integration/_async/test_document.py‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
Ip,
4343
Keyword,
4444
Long,
45+
M,
4546
Mapping,
4647
MetaField,
4748
Nested,
@@ -52,6 +53,8 @@
5253
analyzer,
5354
mapped_field,
5455
)
56+
from elasticsearch.dsl.query import Match
57+
from elasticsearch.dsl.types import MatchQuery
5558
from elasticsearch.dsl.utils import AttrList
5659
from elasticsearch.helpers.errors import BulkIndexError
5760

@@ -850,3 +853,51 @@ class Index:
850853
assert docs[0].float_vector == doc.float_vector
851854
assert docs[0].byte_vector == doc.byte_vector
852855
assert docs[0].bit_vector == doc.bit_vector
856+
857+
858+
@pytest.mark.asyncio
859+
async def test_copy_to(async_client: AsyncElasticsearch) -> None:
860+
class Person(AsyncDocument):
861+
first_name: M[str] = mapped_field(Text(copy_to=["full_name", "all"]))
862+
last_name: M[str] = mapped_field(Text(copy_to=["full_name", "all"]))
863+
birth_place: M[str] = mapped_field(Text(copy_to="all"))
864+
full_name: M[str | None] = mapped_field(init=False)
865+
all: M[str | None] = mapped_field(init=False)
866+
867+
class Index:
868+
name = "people"
869+
870+
await Person._index.delete(ignore_unavailable=True)
871+
await Person.init()
872+
873+
person = Person(first_name="Jane", last_name="Doe", birth_place="Springfield")
874+
await person.save()
875+
await Person._index.refresh()
876+
877+
match = (
878+
await Person.search()
879+
.query(Match(Person.full_name, MatchQuery(query="Jane")))
880+
.execute()
881+
)
882+
assert len(match) == 1
883+
884+
match = (
885+
await Person.search()
886+
.query(Match(Person.all, MatchQuery(query="Doe")))
887+
.execute()
888+
)
889+
assert len(match) == 1
890+
891+
match = (
892+
await Person.search()
893+
.query(Match(Person.full_name, MatchQuery(query="Springfield")))
894+
.execute()
895+
)
896+
assert len(match) == 0
897+
898+
match = (
899+
await Person.search()
900+
.query(Match(Person.all, MatchQuery(query="Springfield")))
901+
.execute()
902+
)
903+
assert len(match) == 1

‎test_elasticsearch/test_dsl/test_integration/_sync/test_document.py‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
Ip,
4242
Keyword,
4343
Long,
44+
M,
4445
Mapping,
4546
MetaField,
4647
Nested,
@@ -52,6 +53,8 @@
5253
analyzer,
5354
mapped_field,
5455
)
56+
from elasticsearch.dsl.query import Match
57+
from elasticsearch.dsl.types import MatchQuery
5558
from elasticsearch.dsl.utils import AttrList
5659
from elasticsearch.helpers.errors import BulkIndexError
5760

@@ -842,3 +845,47 @@ class Index:
842845
assert docs[0].float_vector == doc.float_vector
843846
assert docs[0].byte_vector == doc.byte_vector
844847
assert docs[0].bit_vector == doc.bit_vector
848+
849+
850+
@pytest.mark.sync
851+
def test_copy_to(client: Elasticsearch) -> None:
852+
class Person(Document):
853+
first_name: M[str] = mapped_field(Text(copy_to=["full_name", "all"]))
854+
last_name: M[str] = mapped_field(Text(copy_to=["full_name", "all"]))
855+
birth_place: M[str] = mapped_field(Text(copy_to="all"))
856+
full_name: M[str | None] = mapped_field(init=False)
857+
all: M[str | None] = mapped_field(init=False)
858+
859+
class Index:
860+
name = "people"
861+
862+
Person._index.delete(ignore_unavailable=True)
863+
Person.init()
864+
865+
person = Person(first_name="Jane", last_name="Doe", birth_place="Springfield")
866+
person.save()
867+
Person._index.refresh()
868+
869+
match = (
870+
Person.search()
871+
.query(Match(Person.full_name, MatchQuery(query="Jane")))
872+
.execute()
873+
)
874+
assert len(match) == 1
875+
876+
match = Person.search().query(Match(Person.all, MatchQuery(query="Doe"))).execute()
877+
assert len(match) == 1
878+
879+
match = (
880+
Person.search()
881+
.query(Match(Person.full_name, MatchQuery(query="Springfield")))
882+
.execute()
883+
)
884+
assert len(match) == 0
885+
886+
match = (
887+
Person.search()
888+
.query(Match(Person.all, MatchQuery(query="Springfield")))
889+
.execute()
890+
)
891+
assert len(match) == 1

0 commit comments

Comments
 (0)