nucliadb 6.2.1.post3377__py3-none-any.whl → 6.2.1.post3382__py3-none-any.whl

nucliadb/common/ids.py

@@ -26,6 +26,7 @@ paragraphs... Avoiding spread of id construction and parsing everywhere
 from dataclasses import dataclass
 from typing import Optional
 
+from nucliadb_models.common import FieldTypeName
 from nucliadb_protos.resources_pb2 import FieldType
 
 FIELD_TYPE_STR_TO_PB: dict[str, FieldType.ValueType] = {
@@ -38,6 +39,14 @@ FIELD_TYPE_STR_TO_PB: dict[str, FieldType.ValueType] = {
 
 FIELD_TYPE_PB_TO_STR = {v: k for k, v in FIELD_TYPE_STR_TO_PB.items()}
 
+FIELD_TYPE_NAME_TO_STR = {
+    FieldTypeName.TEXT: "t",
+    FieldTypeName.FILE: "f",
+    FieldTypeName.LINK: "u",
+    FieldTypeName.GENERIC: "a",
+    FieldTypeName.CONVERSATION: "c",
+}
+
 
 @dataclass
 class FieldId:

nucliadb/reader/api/v1/services.py

@@ -164,6 +164,7 @@ async def get_labelsets(kbid: str) -> KnowledgeBoxLabels:
     summary="Get a Knowledge Box Label Set",
     response_model=LabelSet,
     tags=["Knowledge Box Services"],
+    responses={"404": {"description": "Knowledge Box or Label Set not found"}},
 )
 @requires(NucliaDBRoles.READER)
 @version(1)
@@ -172,6 +173,12 @@ async def get_labelset_endpoint(request: Request, kbid: str, labelset: str) -> L
         return await get_labelset(kbid, labelset)
     except KnowledgeBoxNotFound:
         raise HTTPException(status_code=404, detail="Knowledge Box does not exist")
+    except LabelSetNotFound:
+        raise HTTPException(status_code=404, detail="Label Set does not exist")
+
+
+class LabelSetNotFound(Exception):
+    pass
 
 
 async def get_labelset(kbid: str, labelset_id: str) -> LabelSet:
@@ -182,15 +189,14 @@ async def get_labelset(kbid: str, labelset_id: str) -> LabelSet:
         kbid=kbid, labelset_id=labelset_id
     )
     if labelset is None:
-        response = LabelSet()
-    else:
-        response = LabelSet(
-            **MessageToDict(
-                labelset,
-                preserving_proto_field_name=True,
-                including_default_value_fields=True,
-            )
+        raise LabelSetNotFound()
+    response = LabelSet(
+        **MessageToDict(
+            labelset,
+            preserving_proto_field_name=True,
+            including_default_value_fields=True,
         )
+    )
     return response
 
 

nucliadb/search/api/v1/find.py

@@ -35,6 +35,7 @@ from nucliadb.search.search.exceptions import InvalidQueryError
 from nucliadb.search.search.find import find
 from nucliadb.search.search.utils import maybe_log_request_payload, min_score_from_query_params
 from nucliadb_models.common import FieldTypeName
+from nucliadb_models.filter import FilterExpression
 from nucliadb_models.resource import ExtractedDataTypeName, NucliaDBRoles
 from nucliadb_models.search import (
     FindRequest,
@@ -80,6 +81,9 @@ async def find_knowledgebox(
     response: Response,
     kbid: str,
     query: str = fastapi_query(SearchParamDefaults.query),
+    filter_expression: Optional[str] = fastapi_query(
+        SearchParamDefaults.filter_expression, include_in_schema=False
+    ),
     fields: list[str] = fastapi_query(SearchParamDefaults.fields),
     filters: list[str] = fastapi_query(SearchParamDefaults.filters),
     top_k: Optional[int] = fastapi_query(SearchParamDefaults.top_k),
@@ -132,11 +136,14 @@ async def find_knowledgebox(
     x_forwarded_for: str = Header(""),
 ) -> Union[KnowledgeboxFindResults, HTTPClientError]:
     try:
+        expr = FilterExpression.model_validate_json(filter_expression) if filter_expression else None
+
         security = None
         if len(security_groups) > 0:
             security = RequestSecurity(groups=security_groups)
         item = FindRequest(
             query=query,
+            filter_expression=expr,
             fields=fields,
             filters=filters,
             top_k=top_k,  # type: ignore

nucliadb/search/api/v1/search.py

@@ -45,6 +45,7 @@ from nucliadb.search.search.utils import (
     should_disable_vector_search,
 )
 from nucliadb_models.common import FieldTypeName
+from nucliadb_models.filter import FilterExpression
 from nucliadb_models.metadata import ResourceProcessingStatus
 from nucliadb_models.resource import ExtractedDataTypeName, NucliaDBRoles
 from nucliadb_models.search import (
@@ -102,6 +103,9 @@ async def search_knowledgebox(
     response: Response,
     kbid: str,
     query: str = fastapi_query(SearchParamDefaults.query),
+    filter_expression: Optional[str] = fastapi_query(
+        SearchParamDefaults.filter_expression, include_in_schema=False
+    ),
     fields: list[str] = fastapi_query(SearchParamDefaults.fields),
     filters: list[str] = fastapi_query(SearchParamDefaults.filters),
     faceted: list[str] = fastapi_query(SearchParamDefaults.faceted),
@@ -157,11 +161,14 @@ async def search_knowledgebox(
     x_forwarded_for: str = Header(""),
 ) -> Union[KnowledgeboxSearchResults, HTTPClientError]:
     try:
+        expr = FilterExpression.model_validate_json(filter_expression) if filter_expression else None
+
         security = None
         if len(security_groups) > 0:
             security = RequestSecurity(groups=security_groups)
         item = SearchRequest(
             query=query,
+            filter_expression=expr,
             fields=fields,
             filters=filters,
             faceted=faceted,
@@ -270,6 +277,7 @@ async def search(
         kbid=kbid,
         features=item.features,
         query=item.query,
+        filter_expression=item.filter_expression,
         faceted=item.faceted,
         sort=item.sort,
         top_k=item.top_k,

nucliadb/search/api/v1/suggest.py

@@ -33,6 +33,7 @@ from nucliadb.search.search.merge import merge_suggest_results
 from nucliadb.search.search.query import suggest_query_to_pb
 from nucliadb.search.search.utils import filter_hidden_resources
 from nucliadb_models.common import FieldTypeName
+from nucliadb_models.filter import FilterExpression
 from nucliadb_models.resource import NucliaDBRoles
 from nucliadb_models.search import (
     KnowledgeboxSuggestResults,
@@ -61,6 +62,9 @@ async def suggest_knowledgebox(
     response: Response,
     kbid: str,
     query: str = fastapi_query(SearchParamDefaults.suggest_query),
+    filter_expression: Optional[str] = fastapi_query(
+        SearchParamDefaults.filter_expression, include_in_schema=False
+    ),
     fields: list[str] = fastapi_query(SearchParamDefaults.fields),
     filters: list[str] = fastapi_query(SearchParamDefaults.filters),
     faceted: list[str] = fastapi_query(SearchParamDefaults.faceted),
@@ -85,10 +89,13 @@ async def suggest_knowledgebox(
     show_hidden: bool = fastapi_query(SearchParamDefaults.show_hidden),
 ) -> Union[KnowledgeboxSuggestResults, HTTPClientError]:
     try:
+        expr = FilterExpression.model_validate_json(filter_expression) if filter_expression else None
+
         return await suggest(
             response,
             kbid,
             query,
+            expr,
             fields,
             filters,
             faceted,
@@ -114,6 +121,7 @@ async def suggest(
     response,
     kbid: str,
     query: str,
+    filter_expression: Optional[FilterExpression],
     fields: list[str],
     filters: list[str],
     faceted: list[str],
@@ -137,6 +145,7 @@ async def suggest(
             kbid,
             features,
             query,
+            filter_expression,
             fields,
             filters,
             faceted,

nucliadb/search/search/chat/ask.py

@@ -788,6 +788,7 @@ async def retrieval_in_resource(
                 kbid=kbid,
                 features=[],
                 query="",
+                filter_expression=ask_request.filter_expression,
                 old_filters=OldFilterParams(
                     label_filters=ask_request.filters,
                     keyword_filters=ask_request.keyword_filters,

nucliadb/search/search/find.py

@@ -273,6 +273,7 @@ async def query_parser_from_find_request(
         features=item.features,
         query=item.query,
         query_entities=item.query_entities,
+        filter_expression=item.filter_expression,
         faceted=None,
         sort=None,
         top_k=item.top_k,

nucliadb/search/search/query.py

@@ -18,7 +18,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 import asyncio
-import json
 import string
 from datetime import datetime
 from typing import Any, Awaitable, Optional
@@ -40,11 +39,11 @@ from nucliadb.search.search.rank_fusion import (
 from nucliadb.search.search.rerankers import (
     Reranker,
 )
+from nucliadb_models.filter import FilterExpression
 from nucliadb_models.internal.predict import QueryInfo
 from nucliadb_models.labels import LABEL_HIDDEN, translate_system_to_alias_label
 from nucliadb_models.metadata import ResourceProcessingStatus
 from nucliadb_models.search import (
-    Filter,
     KnowledgeGraphEntity,
     MaxTokens,
     MinScore,
@@ -60,6 +59,7 @@ from nucliadb_protos import nodereader_pb2, utils_pb2
 from nucliadb_protos.noderesources_pb2 import Resource
 
 from .exceptions import InvalidQueryError
+from .query_parser.filter_expression import add_and_expression, parse_expression
 from .query_parser.old_filters import OldFilterParams, parse_old_filters
 
 INDEX_SORTABLE_FIELDS = [
@@ -91,6 +91,7 @@ class QueryParser:
         top_k: int,
         min_score: MinScore,
         old_filters: OldFilterParams,
+        filter_expression: Optional[FilterExpression] = None,
         query_entities: Optional[list[KnowledgeGraphEntity]] = None,
         faceted: Optional[list[str]] = None,
         sort: Optional[SortOptions] = None,
@@ -114,11 +115,6 @@ class QueryParser:
         self.query = query
         self.query_entities = query_entities
         self.hidden = hidden
-        if self.hidden is not None:
-            if self.hidden:
-                old_filters.label_filters.append(Filter(all=[LABEL_HIDDEN]))  # type: ignore
-            else:
-                old_filters.label_filters.append(Filter(none=[LABEL_HIDDEN]))  # type: ignore
         self.faceted = faceted or []
         self.top_k = top_k
         self.min_score = min_score
@@ -137,6 +133,7 @@ class QueryParser:
         self.max_tokens = max_tokens
         self.rank_fusion = rank_fusion
         self.reranker = reranker
+        self.filter_expression = filter_expression
         self.old_filters = old_filters
         self.fetcher = Fetcher(
             kbid=kbid,
@@ -212,7 +209,6 @@ class QueryParser:
         self.parse_document_search(request)
         self.parse_paragraph_search(request)
         incomplete, rephrased_query = await self.parse_vector_search(request)
-        # BUG: autofilters are not used to filter, but we say we do
         autofilters = await self.parse_relation_search(request)
         await self.parse_synonyms(request)
         await self.parse_min_score(request, incomplete)
@@ -232,12 +228,40 @@ class QueryParser:
         if self.with_status is not None:
             request.with_status = PROCESSING_STATUS_TO_PB_MAP[self.with_status]
 
+        has_old_filters = False
         if self.old_filters:
             field_expr, paragraph_expr = await parse_old_filters(self.old_filters, self.fetcher)
             if field_expr is not None:
                 request.field_filter.CopyFrom(field_expr)
+                has_old_filters = True
             if paragraph_expr is not None:
                 request.paragraph_filter.CopyFrom(paragraph_expr)
+                has_old_filters = True
+
+        if self.filter_expression and has_old_filters:
+            raise InvalidQueryError("filter_expression", "Cannot mix old filters with filter_expression")
+
+        if self.filter_expression:
+            if self.filter_expression.field:
+                expr = await parse_expression(self.filter_expression.field, self.kbid)
+                if expr:
+                    request.field_filter.CopyFrom(expr)
+
+            if self.filter_expression.paragraph:
+                expr = await parse_expression(self.filter_expression.paragraph, self.kbid)
+                if expr:
+                    request.paragraph_filter.CopyFrom(expr)
+
+            # TODO: Pass operator to PB
+
+        if self.hidden is not None:
+            expr = nodereader_pb2.FilterExpression()
+            if self.hidden:
+                expr.facet.facet = LABEL_HIDDEN
+            else:
+                expr.bool_not.facet.facet = LABEL_HIDDEN
+
+            add_and_expression(request.field_filter, expr)
 
     def parse_sorting(self, request: nodereader_pb2.SearchRequest) -> None:
         if len(self.query) == 0:
@@ -360,7 +384,7 @@ class QueryParser:
                     )
                 node_features.inc({"type": "relations"})
             if self.autofilter:
-                entity_filters = parse_entities_to_filters(request, detected_entities)
+                entity_filters = apply_entities_filter(request, detected_entities)
                 autofilters.extend([translate_system_to_alias_label(e) for e in entity_filters])
         return autofilters
 
@@ -558,7 +582,7 @@ def expand_entities(
     return list(result_entities.values())
 
 
-def parse_entities_to_filters(
+def apply_entities_filter(
     request: nodereader_pb2.SearchRequest,
     detected_entities: list[utils_pb2.RelationNode],
 ) -> list[str]:
@@ -568,19 +592,13 @@ def parse_entities_to_filters(
         for entity in detected_entities
         if entity.ntype == utils_pb2.RelationNode.NodeType.ENTITY
     ]:
-        if entity_filter not in request.filter.field_labels:
-            request.filter.field_labels.append(entity_filter)
+        if entity_filter not in added_filters:
             added_filters.append(entity_filter)
+            # Add the entity to the filter expression (with AND)
+            entity_expr = nodereader_pb2.FilterExpression()
+            entity_expr.facet.facet = translate_label(entity_filter)
+            add_and_expression(request.field_filter, entity_expr)
 
-    # We need to expand the filter expression with the automatically detected entities.
-    if len(added_filters) > 0:
-        # So far, autofilters feature will only yield 'and' expressions with the detected entities.
-        # More complex autofilters can be added here if we leverage the query endpoint.
-        expanded_expression = {"and": [{"literal": entity} for entity in added_filters]}
-        if request.filter.labels_expression:
-            expression = json.loads(request.filter.labels_expression)
-            expanded_expression["and"].append(expression)
-        request.filter.labels_expression = json.dumps(expanded_expression)
     return added_filters
 
 
@@ -588,6 +606,7 @@ async def suggest_query_to_pb(
     kbid: str,
     features: list[SuggestOptions],
     query: str,
+    filter_expression: Optional[FilterExpression],
     fields: list[str],
     filters: list[str],
     faceted: list[str],
@@ -606,12 +625,6 @@ async def suggest_query_to_pb(
     if SuggestOptions.PARAGRAPH in features:
         request.features.append(nodereader_pb2.SuggestFeatures.PARAGRAPHS)
 
-    if hidden is not None:
-        if hidden:
-            filters.append(Filter(all=[LABEL_HIDDEN]))  # type: ignore
-        else:
-            filters.append(Filter(none=[LABEL_HIDDEN]))  # type: ignore
-
     old = OldFilterParams(
         label_filters=filters,
         keyword_filters=[],
@@ -631,9 +644,38 @@ async def suggest_query_to_pb(
         generative_model=None,
     )
     field_expr, _ = await parse_old_filters(old, fetcher)
+    if field_expr is not None and filter_expression is not None:
+        raise InvalidQueryError("filter_expression", "Cannot mix old filters with filter_expression")
+
     if field_expr is not None:
         request.field_filter.CopyFrom(field_expr)
 
+    if filter_expression:
+        if filter_expression.field:
+            expr = await parse_expression(filter_expression.field, kbid)
+            if expr:
+                request.field_filter.CopyFrom(expr)
+
+        if filter_expression.paragraph:
+            raise InvalidQueryError(
+                "filter_expression", "paragraph filters not yet available in suggest"
+            )
+            # TODO
+            # expr = await parse_expression(filter_expression.paragraph, kbid)
+            # if expr:
+            #     request.paragraph_filter.CopyFrom(expr)
+
+        # TODO: Pass operator to PB
+
+    if hidden is not None:
+        expr = nodereader_pb2.FilterExpression()
+        if hidden:
+            expr.facet.facet = LABEL_HIDDEN
+        else:
+            expr.bool_not.facet.facet = LABEL_HIDDEN
+
+        add_and_expression(request.field_filter, expr)
+
     return request
 
 

nucliadb/search/search/query_parser/filter_expression.py

@@ -0,0 +1,146 @@
+# Copyright (C) 2021 Bosutech XXI S.L.
+#
+# nucliadb is offered under the AGPL v3.0 and as commercial software.
+# For commercial licensing, contact us at info@nuclia.com.
+#
+# AGPL:
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+from typing import Union
+
+from nucliadb.common import datamanagers
+from nucliadb.common.ids import FIELD_TYPE_NAME_TO_STR
+from nucliadb.search.search.exceptions import InvalidQueryError
+from nucliadb_models.filter import (
+    And,
+    DateCreated,
+    DateModified,
+    Entity,
+    Field,
+    FieldFilterExpression,
+    FieldMimetype,
+    Generated,
+    Keyword,
+    Kind,
+    Label,
+    Language,
+    Not,
+    Or,
+    OriginMetadata,
+    OriginPath,
+    OriginTag,
+    ParagraphFilterExpression,
+    Resource,
+    ResourceMimetype,
+)
+from nucliadb_protos.nodereader_pb2 import FilterExpression as PBFilterExpression
+
+
+async def parse_expression(
+    expr: Union[FieldFilterExpression, ParagraphFilterExpression],
+    kbid: str,
+) -> PBFilterExpression:
+    f = PBFilterExpression()
+
+    if isinstance(expr, And):
+        for op in expr.operands:
+            f.bool_and.operands.append(await parse_expression(op, kbid))
+    elif isinstance(expr, Or):
+        for op in expr.operands:
+            f.bool_or.operands.append(await parse_expression(op, kbid))
+    elif isinstance(expr, Not):
+        f.bool_not.CopyFrom(await parse_expression(expr.operand, kbid))
+    elif isinstance(expr, Resource):
+        if expr.id:
+            f.resource.resource_id = expr.id
+        else:
+            rid = await datamanagers.atomic.resources.get_resource_uuid_from_slug(
+                kbid=kbid, slug=expr.slug
+            )
+            if rid is None:
+                raise InvalidQueryError("slug", f"Cannot find slug {expr.slug}")
+            f.resource.resource_id = rid
+    elif isinstance(expr, Field):
+        f.field.field_type = FIELD_TYPE_NAME_TO_STR[expr.type]
+        if expr.name:
+            f.field.field_id = expr.name
+    elif isinstance(expr, Keyword):
+        f.keyword.keyword = expr.word
+    elif isinstance(expr, DateCreated):
+        f.date.field = PBFilterExpression.DateRangeFilter.DateField.CREATED
+        if expr.since:
+            f.date.since.FromDatetime(expr.since)
+        if expr.until:
+            f.date.until.FromDatetime(expr.until)
+    elif isinstance(expr, DateModified):
+        f.date.field = PBFilterExpression.DateRangeFilter.DateField.MODIFIED
+        if expr.since:
+            f.date.since.FromDatetime(expr.since)
+        if expr.until:
+            f.date.until.FromDatetime(expr.until)
+    elif isinstance(expr, OriginTag):
+        f.facet.facet = f"/t/{expr.tag}"
+    elif isinstance(expr, Label):
+        f.facet.facet = f"/l/{expr.labelset}"
+        if expr.label:
+            f.facet.facet += f"/{expr.label}"
+    elif isinstance(expr, ResourceMimetype):
+        f.facet.facet = f"/n/i/{expr.type}"
+        if expr.subtype:
+            f.facet.facet += f"/{expr.subtype}"
+    elif isinstance(expr, FieldMimetype):
+        f.facet.facet = f"/mt/{expr.type}"
+        if expr.subtype:
+            f.facet.facet += f"/{expr.subtype}"
+    elif isinstance(expr, Entity):
+        f.facet.facet = f"/e/{expr.subtype}"
+        if expr.value:
+            f.facet.facet += f"/{expr.value}"
+    elif isinstance(expr, Language):
+        if expr.only_primary:
+            f.facet.facet = f"/s/p/{expr.language}"
+        else:
+            f.facet.facet = f"/s/s/{expr.language}"
+    elif isinstance(expr, OriginMetadata):
+        f.facet.facet = f"/m/{expr.field}"
+        if expr.value:
+            f.facet.facet += f"/{expr.value}"
+    elif isinstance(expr, OriginPath):
+        f.facet.facet = f"/p/{expr.prefix}"
+    elif isinstance(expr, Generated):
+        f.facet.facet = "/g/da"
+        if expr.da_task:
+            f.facet.facet += f"/{expr.da_task}"
+    elif isinstance(expr, Kind):
+        f.facet.facet = f"/k/{expr.kind.lower()}"
+    else:
+        # This is a trick so mypy generates an error if this branch can be reached,
+        # that is, if we are missing some ifs
+        _a: int = "a"
+
+    return f
+
+
+def add_and_expression(dest: PBFilterExpression, add: PBFilterExpression):
+    dest_expr_type = dest.WhichOneof("expr")
+    if dest_expr_type is None:
+        dest.CopyFrom(add)
+    elif dest_expr_type == "bool_and":
+        dest.bool_and.operands.append(add)
+    else:
+        and_expr = PBFilterExpression()
+        and_expr.bool_and.operands.append(dest)
+        and_expr.bool_and.operands.append(add)
+        dest.CopyFrom(and_expr)

nucliadb/writer/api/v1/learning_config.py

@@ -95,5 +95,5 @@ async def delete_strategy(
     strategy_id: str,
 ):
     return await learning_config_proxy(
-        request, "POST", f"/extract_strategies/{kbid}/strategies/{strategy_id}"
+        request, "DELETE", f"/extract_strategies/{kbid}/strategies/{strategy_id}"
     )

{nucliadb-6.2.1.post3377.dist-info → nucliadb-6.2.1.post3382.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nucliadb
-Version: 6.2.1.post3377
+Version: 6.2.1.post3382
 Summary: NucliaDB
 Author-email: Nuclia <nucliadb@nuclia.com>
 License: AGPL
@@ -20,11 +20,11 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: <4,>=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: nucliadb-telemetry[all]>=6.2.1.post3377
-Requires-Dist: nucliadb-utils[cache,fastapi,storages]>=6.2.1.post3377
-Requires-Dist: nucliadb-protos>=6.2.1.post3377
-Requires-Dist: nucliadb-models>=6.2.1.post3377
-Requires-Dist: nidx-protos>=6.2.1.post3377
+Requires-Dist: nucliadb-telemetry[all]>=6.2.1.post3382
+Requires-Dist: nucliadb-utils[cache,fastapi,storages]>=6.2.1.post3382
+Requires-Dist: nucliadb-protos>=6.2.1.post3382
+Requires-Dist: nucliadb-models>=6.2.1.post3382
+Requires-Dist: nidx-protos>=6.2.1.post3382
 Requires-Dist: nucliadb-admin-assets>=1.0.0.post1224
 Requires-Dist: nuclia-models>=0.24.2
 Requires-Dist: uvicorn

{nucliadb-6.2.1.post3377.dist-info → nucliadb-6.2.1.post3382.dist-info}/RECORD

@@ -40,7 +40,7 @@ nucliadb/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nucliadb/common/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
 nucliadb/common/constants.py,sha256=QpigxJh_CtD85Evy0PtV5cVq6x0U_f9xfIcXz1ymkUg,869
 nucliadb/common/counters.py,sha256=8lOi3A2HeLDDlcNaS2QT1SfD3350VPBjiY3FkmHH1V8,977
-nucliadb/common/ids.py,sha256=HMb213Kz9HaY4IsBwaQJFhUErntKWV-29s0UHaGcf1E,8004
+nucliadb/common/ids.py,sha256=4QjoIofes_vtKj2HsFWZf8VVIVWXxdkYtLpx1n618Us,8239
 nucliadb/common/locking.py,sha256=RL0CabZVPzxHZyUjYeUyLvsJTm7W3J9o4fEgsY_ufNc,5896
 nucliadb/common/nidx.py,sha256=_LoU8D4afEtlW0c3vGUCoatDZvMr0-2l_GtIGap7VxA,10185
 nucliadb/common/cluster/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
@@ -173,7 +173,7 @@ nucliadb/reader/api/v1/knowledgebox.py,sha256=Uu-yPB8KKZt1VaFrFNMMaXOvLsclBJDK9d
 nucliadb/reader/api/v1/learning_config.py,sha256=CZ7pFXzBZkJE2dXbC1wArszJw_ZLpuEb6gnsz2MKEz0,5525
 nucliadb/reader/api/v1/resource.py,sha256=SFIv_vpgkdJQv7L_UgYZS5FvubipJ0ligpExGDjKHV0,14064
 nucliadb/reader/api/v1/router.py,sha256=eyNmEGSP9zHkCIG5XlAXl6sukq950B7gFT3X2peMtIE,1011
-nucliadb/reader/api/v1/services.py,sha256=B8fD4zcUydZ5Fl1DDxfXGNuW6C8rhGYc920O5Zy5Yv8,11716
+nucliadb/reader/api/v1/services.py,sha256=hGD7VHOsLYeaA8kwX92iC-BkbGbh4d_v5W4434ezjuY,11916
 nucliadb/reader/api/v1/vectorsets.py,sha256=insTwaykshz442cMKa2VP74wJwvZrIYi0U7M9EM3aCM,1822
 nucliadb/reader/reader/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
 nucliadb/reader/reader/notifications.py,sha256=HVZNUlfbSuoZ9BsSs8wmzPeYurl0U0O2ooVlR9KSM3U,7792
@@ -192,12 +192,12 @@ nucliadb/search/api/v1/__init__.py,sha256=8w6VhZ5rbzX1xLSXr336d2IE-O0dQiv-ba6UYd
 nucliadb/search/api/v1/ask.py,sha256=F2dR3-swb3Xz8MfZPYL3G65KY2R_mgef4YVBbu8kLi4,4352
 nucliadb/search/api/v1/catalog.py,sha256=TF19WN-qgZZLkqBwVH5xNsMxYTrmdEflPvy7qft_4lE,7010
 nucliadb/search/api/v1/feedback.py,sha256=kNLc4dHz2SXHzV0PwC1WiRAwY88fDptPcP-kO0q-FrQ,2620
-nucliadb/search/api/v1/find.py,sha256=DsnWkySu_cFajDWJIxN8DYvLL_Rm2yiCjHD8TsqPfRk,9304
+nucliadb/search/api/v1/find.py,sha256=2_YX0p6Y8dYVYy99OB0cgPlre13P_JfWmE07MnbVwlE,9627
 nucliadb/search/api/v1/knowledgebox.py,sha256=rWhx3PYWryingu19qwwFDbVvVYynq5Ky23FSlzmTutQ,8721
 nucliadb/search/api/v1/predict_proxy.py,sha256=QrGzo0hKjtmyGZ6pjlJHYAh4hxwVUIOTcVcerRCw7eE,3047
 nucliadb/search/api/v1/router.py,sha256=mtT07rBZcVfpa49doaw9b1tj3sdi3qLH0gn9Io6NYM0,988
-nucliadb/search/api/v1/search.py,sha256=CBszxidsfoLmrCbVL8cuZboWJlmt_GAfpjix0Tdp_yA,13650
-nucliadb/search/api/v1/suggest.py,sha256=Cc1vvT5AFEq0j6_IAx5jSVekMJpIi6kY-DWhzi7vkLg,5931
+nucliadb/search/api/v1/search.py,sha256=DLXxh2FRXmLnZIIXaSLT7XaNoY2GZJTkpcduLTDyVW4,14023
+nucliadb/search/api/v1/suggest.py,sha256=tQX7rvPRjE_epk6qN8JB_Xue8JL02uUeVUNpbaJECQE,6318
 nucliadb/search/api/v1/summarize.py,sha256=VAHJvE6V3xUgEBfqNKhgoxmDqCvh30RnrEIBVhMcNLU,2499
 nucliadb/search/api/v1/utils.py,sha256=5Ve-frn7LAE2jqAgB85F8RSeqxDlyA08--gS-AdOLS4,1434
 nucliadb/search/api/v1/resource/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
@@ -213,7 +213,7 @@ nucliadb/search/search/cut.py,sha256=ytY0_GY7ocNjfxTb4aosxEp4ZfhQNDP--JkhEMGD298
 nucliadb/search/search/exceptions.py,sha256=klGLgAGGrXcSGix_W6418ZBMqDchAIGjN77ofkOScEI,1039
 nucliadb/search/search/fetch.py,sha256=XJHIFnZmXM_8Kb37lb4lg1GYG7cZ1plT-qAIb_QziX4,6184
 nucliadb/search/search/filters.py,sha256=1MkHlJjAQqoRCj7e5cEzK2HvBxGLE17I_omsjiklbtw,6476
-nucliadb/search/search/find.py,sha256=BC_5p3oRKeQBVmuFCDdCd36Qr2TqJZPIjC0XfRuDJWU,10186
+nucliadb/search/search/find.py,sha256=jQZOqu8VeX8k3ELV8bLK4TwUUjGrvmubouxvO1IvJV0,10236
 nucliadb/search/search/find_merge.py,sha256=3FnzKFEnVemg6FO_6zveulbAU7klvsiPEBvLrpBBMg8,17450
 nucliadb/search/search/graph_strategy.py,sha256=ahwcUTQZ0Ll-rnS285DO9PmRyiM-1p4BM3UvmOYVwhM,31750
 nucliadb/search/search/hydrator.py,sha256=-R37gCrGxkyaiHQalnTWHNG_FCx11Zucd7qA1vQCxuw,6985
@@ -223,14 +223,14 @@ nucliadb/search/search/metrics.py,sha256=81X-tahGW4n2CLvUzCPdNxNClmZqUWZjcVOGCUH
 nucliadb/search/search/paragraphs.py,sha256=pNAEiYqJGGUVcEf7xf-PFMVqz0PX4Qb-WNG-_zPGN2o,7799
 nucliadb/search/search/pgcatalog.py,sha256=IaNK4dAxdXs38PoIkTdgqMDuZDjeiOtcXn3LeaT-OMw,8855
 nucliadb/search/search/predict_proxy.py,sha256=IFI3v_ODz2_UU1XZnyaD391fE7-2C0npSmj_HmDvzS4,3123
-nucliadb/search/search/query.py,sha256=vSnnqJPB5iHI7kugaL6boH1l4j5HV6ln4EKbskJnFWw,27346
+nucliadb/search/search/query.py,sha256=A1HnP7FzBtn3G4-oId_x-x0MHYlQPCTzrtP73LxoEwo,28733
 nucliadb/search/search/rank_fusion.py,sha256=tRGo_KlsFsVx1CQEy1iqQ6f0T1Dq1kf0axDXHuuzvvM,6946
 nucliadb/search/search/rerankers.py,sha256=3vep4EOVNeDJGsMdx-1g6Ar4ZGJG3IHym3HkxnbwtAQ,7321
 nucliadb/search/search/shards.py,sha256=JSRSrHgHcF4sXyuZZoJdMfK0v_LHpoSRf1lCr5-K5ko,2742
 nucliadb/search/search/summarize.py,sha256=ksmYPubEQvAQgfPdZHfzB_rR19B2ci4IYZ6jLdHxZo8,4996
 nucliadb/search/search/utils.py,sha256=iF2tbBA56gRMJH1TlE2hMrqeXqjoeOPt4KgRdp2m9Ek,3313
 nucliadb/search/search/chat/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
-nucliadb/search/search/chat/ask.py,sha256=q0CSXQJs69z52XWleIklcn5_bvHJQT7z94XUqKW506Y,36451
+nucliadb/search/search/chat/ask.py,sha256=xmHAO9rmw1hvutGeYc0kxmioxHPpYEjlB-sTC4ArX-k,36516
 nucliadb/search/search/chat/exceptions.py,sha256=Siy4GXW2L7oPhIR86H3WHBhE9lkV4A4YaAszuGGUf54,1356
 nucliadb/search/search/chat/images.py,sha256=PA8VWxT5_HUGfW1ULhKTK46UBsVyINtWWqEM1ulzX1E,3095
 nucliadb/search/search/chat/prompt.py,sha256=Jnja-Ss7skgnnDY8BymVfdeYsFPnIQFL8tEvcRXTKUE,47356
@@ -238,6 +238,7 @@ nucliadb/search/search/chat/query.py,sha256=sFRJag80ahpXA7q3oP0XfIsUyRMNz0Y6K6nz
 nucliadb/search/search/query_parser/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
 nucliadb/search/search/query_parser/exceptions.py,sha256=szAOXUZ27oNY-OSa9t2hQ5HHkQQC0EX1FZz_LluJHJE,1224
 nucliadb/search/search/query_parser/fetcher.py,sha256=jhr__J0KmAzjdsTTadWQmD9qf6lZvqlKAfZdYjZH_UY,15742
+nucliadb/search/search/query_parser/filter_expression.py,sha256=wdqqQzdMe5nMS4jZh0HT21ppSd5ur50jyZRjzjGI7o4,5123
 nucliadb/search/search/query_parser/models.py,sha256=2iWuTcH24RDF8xokgXr0j5qbMoURQ1TFyqJIYs16LqU,2283
 nucliadb/search/search/query_parser/old_filters.py,sha256=-zbfN-RsXoj_DRjh3Lfp-wShwFXgkISawzVptVzja-A,9071
 nucliadb/search/search/query_parser/parser.py,sha256=m6meq5QQO_ofdtbrvEORsZLjxURWfRR0dINrgDXmYRg,6323
@@ -314,7 +315,7 @@ nucliadb/writer/api/v1/__init__.py,sha256=akI9A_jloNLb0dU4T5zjfdyvmSAiDeIdjAlzNx
 nucliadb/writer/api/v1/export_import.py,sha256=Cv4DNtqoR_x2LMNx80C9ehyaCaFIxhq2eutEk2uzcZg,8249
 nucliadb/writer/api/v1/field.py,sha256=OsWOYA0WQ6onE5Rkl20QIEdtrSi7Jgnu62fUt90Ziy8,17503
 nucliadb/writer/api/v1/knowledgebox.py,sha256=MLeIuym4jPrJgfy1NTcN9CpUGwuBiqDHMcx0hY9DR7g,9530
-nucliadb/writer/api/v1/learning_config.py,sha256=i9fkyZfHYLFEQGqdF98yWnucIES8HzMyh9OtBlxRooo,3115
+nucliadb/writer/api/v1/learning_config.py,sha256=CKBjqcbewkfPwGUPLDWzZSpro6XkmCaVppe5Qtpu5Go,3117
 nucliadb/writer/api/v1/resource.py,sha256=A8fAHlN5XFsg6XFYKhfWJS8czgNH6yXr-PsnUqz2WUE,18757
 nucliadb/writer/api/v1/router.py,sha256=RjuoWLpZer6Kl2BW_wznpNo6XL3BOpdTGqXZCn3QrrQ,1034
 nucliadb/writer/api/v1/services.py,sha256=THnBnRxiHrEZPpBTL-E-vplEUfcD-fZpuslKRonM6xs,10286
@@ -336,8 +337,8 @@ nucliadb/writer/tus/local.py,sha256=7jYa_w9b-N90jWgN2sQKkNcomqn6JMVBOVeDOVYJHto,
 nucliadb/writer/tus/s3.py,sha256=vF0NkFTXiXhXq3bCVXXVV-ED38ECVoUeeYViP8uMqcU,8357
 nucliadb/writer/tus/storage.py,sha256=ToqwjoYnjI4oIcwzkhha_MPxi-k4Jk3Lt55zRwaC1SM,2903
 nucliadb/writer/tus/utils.py,sha256=MSdVbRsRSZVdkaum69_0wku7X3p5wlZf4nr6E0GMKbw,2556
-nucliadb-6.2.1.post3377.dist-info/METADATA,sha256=qkAN9pDnp84ZNF8ywzbwKqVjROHktWkM_KOYhfzzYK0,4291
-nucliadb-6.2.1.post3377.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-nucliadb-6.2.1.post3377.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
-nucliadb-6.2.1.post3377.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
-nucliadb-6.2.1.post3377.dist-info/RECORD,,
+nucliadb-6.2.1.post3382.dist-info/METADATA,sha256=44Lp7-8JChfxhjnEjkNJECK8F8rPbezf9KGEeH_UE78,4291
+nucliadb-6.2.1.post3382.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+nucliadb-6.2.1.post3382.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
+nucliadb-6.2.1.post3382.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
+nucliadb-6.2.1.post3382.dist-info/RECORD,,