nucliadb-models 6.3.0.post3396__py3-none-any.whl → 6.3.0.post3402__py3-none-any.whl

nucliadb_models/filter.py

@@ -18,6 +18,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
+from enum import Enum
 from typing import Any, Generic, Literal, Optional, TypeVar, Union
 
 import pydantic
@@ -301,9 +302,9 @@ class FilterExpression(BaseModel, extra="forbid"):
     `fields`, `filters`, `range_*`, `resource_filters`, `keyword_filters`.
     """
 
-    # class Operator(str, Enum):
-    #     AND = "and"
-    #     OR = "or"
+    class Operator(str, Enum):
+        AND = "and"
+        OR = "or"
 
     field: Optional[FieldFilterExpression] = pydantic.Field(
         default=None, description="Filter to apply to fields"
@@ -312,12 +313,11 @@ class FilterExpression(BaseModel, extra="forbid"):
         default=None, description="Filter to apply to each text block"
     )
 
-    # TODO: Not exposed until implemented in nidx
-    # operator: Operator = pydantic.Field(
-    #     default=Operator.AND,
-    #     description=(
-    #         "How to combine field and paragraph filters (default is AND)."
-    #         "AND returns text blocks that match both filters."
-    #         "OR returns text_blocks that match one of the two filters"
-    #     ),
-    # )
+    operator: Operator = pydantic.Field(
+        default=Operator.AND,
+        description=(
+            "How to combine field and paragraph filters (default is AND)."
+            "AND returns text blocks that match both filters."
+            "OR returns text_blocks that match one of the two filters"
+        ),
+    )

{nucliadb_models-6.3.0.post3396.dist-info → nucliadb_models-6.3.0.post3402.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nucliadb_models
-Version: 6.3.0.post3396
+Version: 6.3.0.post3402
 Author-email: Nuclia <nucliadb@nuclia.com>
 License: AGPL
 Project-URL: Homepage, https://nuclia.com

{nucliadb_models-6.3.0.post3396.dist-info → nucliadb_models-6.3.0.post3402.dist-info}/RECORD

@@ -8,7 +8,7 @@ nucliadb_models/export_import.py,sha256=A1KTjwQCRtyVAWcgabXsdltI78rauXBmZX1ie6Rx
 nucliadb_models/external_index_providers.py,sha256=aVyj-P4kVqfqPjF13E_lUM0FZsq8-DTbIsh-kHOgt2s,1787
 nucliadb_models/extracted.py,sha256=wnTjMsSPk1iZFtn4eFrBC9fSOZkNTeHQ_B9CRyaL0cA,6444
 nucliadb_models/file.py,sha256=4pDfQtXaBNB-ExeXC7NIdt33RbJp_u53_x8ACVkHXCM,2174
-nucliadb_models/filter.py,sha256=c6lgFaN8SATosD9d-fuuxsDrloVcZpGq23i8w656YaA,11034
+nucliadb_models/filter.py,sha256=3CxqwhhVBy8a-aFhwxv0DLu1h3--mSz0wgiNCK9YvBU,10984
 nucliadb_models/labels.py,sha256=OUlX-apmFkibEN9bWThRJlbCD84hzJdddN1YYUV2Y3w,4201
 nucliadb_models/link.py,sha256=NRfsjLQpjZXndkb5o8qnSVPqb2knqk2kk5_iQB4AkaY,2785
 nucliadb_models/metadata.py,sha256=fiIJfht0Eg5a65ud2FdmHzElZ8VGdrDQ-F65-VJI4IE,8151
@@ -29,7 +29,7 @@ nucliadb_models/agents/ingestion.py,sha256=mV7gV6VpYg4VNpc59K3275TMUJZbUzeUnp3SZ
 nucliadb_models/internal/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
 nucliadb_models/internal/predict.py,sha256=5rgUPrH_98gerySOZ-TR2PX_qzCGF1_8VxyOu3bGhis,2281
 nucliadb_models/internal/shards.py,sha256=uZLsMkYWrJDHq3xy_w7snSeV2X3aDBuht9GC_MG3sKc,1976
-nucliadb_models-6.3.0.post3396.dist-info/METADATA,sha256=_22YMJS5B6beKJwP_00UfU6jO6XO5D8BUwWhuslGBeA,759
-nucliadb_models-6.3.0.post3396.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-nucliadb_models-6.3.0.post3396.dist-info/top_level.txt,sha256=UrY1I8oeovIRwkXLYplssTrxQdUjhSEFDFbnwaIV3tA,16
-nucliadb_models-6.3.0.post3396.dist-info/RECORD,,
+nucliadb_models-6.3.0.post3402.dist-info/METADATA,sha256=_8pFavb_oaaTHICxIE_ESdb582q8TtFy6bu9w1VWuIU,759
+nucliadb_models-6.3.0.post3402.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+nucliadb_models-6.3.0.post3402.dist-info/top_level.txt,sha256=UrY1I8oeovIRwkXLYplssTrxQdUjhSEFDFbnwaIV3tA,16
+nucliadb_models-6.3.0.post3402.dist-info/RECORD,,