Skip to content

Commit a765ffe

Browse files
committed
fixed format
1 parent 569d883 commit a765ffe

File tree

5 files changed

+28
-12
lines changed

5 files changed

+28
-12
lines changed

packages/google-cloud-firestore/google/cloud/firestore_v1/pipeline_expressions.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2958,7 +2958,7 @@ class DocumentMatches(BooleanExpression):
29582958
"""Creates a boolean expression for a document match query.
29592959
29602960
Note: This Expression can only be used within a `Search` stage.
2961-
2961+
29622962
Example:
29632963
>>> # Find documents matching the query string
29642964
>>> DocumentMatches("search query")
@@ -2976,4 +2976,3 @@ def __init__(self, query: Expression | str):
29762976
[Expression._cast_to_expr_or_convert_to_constant(query)],
29772977
use_infix_repr=False,
29782978
)
2979-

packages/google-cloud-firestore/google/cloud/firestore_v1/pipeline_stages.py

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ def percentage(value: float):
112112

113113
class QueryEnhancement(Enum):
114114
"""Define the query expansion behavior used by full-text search expressions."""
115+
115116
DISABLED = "disabled"
116117
REQUIRED = "required"
117118
PREFERRED = "preferred"
@@ -157,10 +158,16 @@ def __init__(
157158
self.retrieval_depth = retrieval_depth
158159
self.sort = [sort] if isinstance(sort, Ordering) else sort
159160
self.add_fields = add_fields
160-
self.select = [Field(s) if isinstance(s, str) else s for s in select] if select is not None else None
161+
self.select = (
162+
[Field(s) if isinstance(s, str) else s for s in select]
163+
if select is not None
164+
else None
165+
)
161166
self.offset = offset
162167
self.query_enhancement = (
163-
QueryEnhancement(query_enhancement.lower()) if isinstance(query_enhancement, str) else query_enhancement
168+
QueryEnhancement(query_enhancement.lower())
169+
if isinstance(query_enhancement, str)
170+
else query_enhancement
164171
)
165172
self.language_code = language_code
166173

@@ -516,17 +523,23 @@ def _pb_options(self) -> dict[str, Value]:
516523
if self.options.limit is not None:
517524
options["limit"] = Value(integer_value=self.options.limit)
518525
if self.options.retrieval_depth is not None:
519-
options["retrieval_depth"] = Value(integer_value=self.options.retrieval_depth)
526+
options["retrieval_depth"] = Value(
527+
integer_value=self.options.retrieval_depth
528+
)
520529
if self.options.sort is not None:
521-
options["sort"] = Value(array_value={"values": [s._to_pb() for s in self.options.sort]})
530+
options["sort"] = Value(
531+
array_value={"values": [s._to_pb() for s in self.options.sort]}
532+
)
522533
if self.options.add_fields is not None:
523534
options["add_fields"] = Selectable._to_value(self.options.add_fields)
524535
if self.options.select is not None:
525536
options["select"] = Selectable._to_value(self.options.select)
526537
if self.options.offset is not None:
527538
options["offset"] = Value(integer_value=self.options.offset)
528539
if self.options.query_enhancement is not None:
529-
options["query_enhancement"] = Value(string_value=self.options.query_enhancement.value)
540+
options["query_enhancement"] = Value(
541+
string_value=self.options.query_enhancement.value
542+
)
530543
if self.options.language_code is not None:
531544
options["language_code"] = Value(string_value=self.options.language_code)
532545
return options

packages/google-cloud-firestore/tests/system/test_pipeline_acceptance.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
from google.cloud.firestore_v1 import pipeline_expressions as expr
3434
from google.cloud.firestore_v1 import pipeline_stages as stages
3535
from google.cloud.firestore_v1.vector import Vector
36-
from google.cloud.firestore_v1 import GeoPoint
3736

3837
FIRESTORE_PROJECT = os.environ.get("GCLOUD_PROJECT")
3938

packages/google-cloud-firestore/tests/unit/v1/test_pipeline_expressions.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,10 @@ def test_between(self):
799799
assert len(instance.params) == 2
800800
assert instance.params[0].name == "greater_than_or_equal"
801801
assert instance.params[1].name == "less_than_or_equal"
802-
assert repr(instance) == "And(Left.greater_than_or_equal(Lower), Left.less_than_or_equal(Upper))"
802+
assert (
803+
repr(instance)
804+
== "And(Left.greater_than_or_equal(Lower), Left.less_than_or_equal(Upper))"
805+
)
803806
infix_instance = arg1.between(arg2, arg3)
804807
assert infix_instance == instance
805808

packages/google-cloud-firestore/tests/unit/v1/test_pipeline_stages.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -833,20 +833,22 @@ def test_search_string_query_wrapping(self):
833833
assert options.query.name == "document_matches"
834834

835835
def test_search_query_enhancement_enum(self):
836-
options = stages.SearchOptions(query="q", query_enhancement=stages.QueryEnhancement.REQUIRED)
836+
options = stages.SearchOptions(
837+
query="q", query_enhancement=stages.QueryEnhancement.REQUIRED
838+
)
837839
assert options.query_enhancement == stages.QueryEnhancement.REQUIRED
838-
840+
839841
stage = stages.Search(options)
840842
pb_opts = stage._pb_options()
841843
assert pb_opts["query_enhancement"].string_value == "required"
842844

843-
844845
def test_search_string_field_coercion(self):
845846
options = stages.SearchOptions(query="tech", select=["title"])
846847
assert len(options.select) == 1
847848
assert isinstance(options.select[0], Field)
848849
assert options.select[0].path == "title"
849850

851+
850852
class TestSelect:
851853
def _make_one(self, *args, **kwargs):
852854
return stages.Select(*args, **kwargs)

0 commit comments

Comments
 (0)