nucliadb 6.9.2.post5254__py3-none-any.whl → 6.9.2.post5260__py3-none-any.whl

nucliadb/common/filter_expression.py

@@ -52,37 +52,20 @@ from nucliadb_models.filters import (
 )
 
 # Filters that end up as a facet
-FacetFilter = Union[
-    OriginTag,
-    Label,
-    ResourceMimetype,
-    FieldMimetype,
-    Entity,
-    Language,
-    OriginMetadata,
-    OriginPath,
-    Generated,
-    Kind,
-    OriginCollaborator,
-    OriginSource,
-    Status,
-]
-# In Python 3.9 we cannot do isinstance against an union
-# Once we support only 3.10+, we can remove this
-FacetFilterTypes = (
-    OriginTag,
-    Label,
-    ResourceMimetype,
-    FieldMimetype,
-    Entity,
-    Language,
-    OriginMetadata,
-    OriginPath,
-    Generated,
-    Kind,
-    OriginCollaborator,
-    OriginSource,
-    Status,
+FacetFilter = (
+    OriginTag
+    | Label
+    | ResourceMimetype
+    | FieldMimetype
+    | Entity
+    | Language
+    | OriginMetadata
+    | OriginPath
+    | Generated
+    | Kind
+    | OriginCollaborator
+    | OriginSource
+    | Status
 )
 
 
@@ -131,7 +114,7 @@ async def parse_expression(
             f.date.since.FromDatetime(expr.since)
         if expr.until:
             f.date.until.FromDatetime(expr.until)
-    elif isinstance(expr, FacetFilterTypes):
+    elif isinstance(expr, FacetFilter):
         f.facet.facet = facet_from_filter(expr)
     else:
         # This is a trick so mypy generates an error if this branch can be reached,

nucliadb/search/api/v1/find.py

@@ -46,7 +46,6 @@ from nucliadb_models.search import (
     KnowledgeboxFindResults,
     NucliaDBClientType,
     RankFusionName,
-    Reranker,
     RerankerName,
     ResourceProperties,
     SearchParamDefaults,
@@ -131,7 +130,7 @@ async def find_knowledgebox(
     security_groups: list[str] = fastapi_query(SearchParamDefaults.security_groups),
     show_hidden: bool = fastapi_query(SearchParamDefaults.show_hidden),
     rank_fusion: RankFusionName = fastapi_query(SearchParamDefaults.rank_fusion),
-    reranker: Union[RerankerName, Reranker] = fastapi_query(SearchParamDefaults.reranker),
+    reranker: RerankerName = fastapi_query(SearchParamDefaults.reranker),
     search_configuration: Optional[str] = Query(
         default=None,
         description="Load find parameters from this configuration. Parameters in the request override parameters from the configuration.",

nucliadb/search/search/query_parser/parsers/catalog.py

@@ -21,7 +21,7 @@
 from nucliadb.common import datamanagers
 from nucliadb.common.catalog.interface import CatalogExpression, CatalogQuery
 from nucliadb.common.exceptions import InvalidQueryError
-from nucliadb.common.filter_expression import FacetFilterTypes, facet_from_filter
+from nucliadb.common.filter_expression import FacetFilter, facet_from_filter
 from nucliadb.search.search.filters import translate_label
 from nucliadb_models import search as search_models
 from nucliadb_models.filters import (
@@ -189,7 +189,7 @@ async def parse_filter_expression(expr: ResourceFilterExpression, kbid: str) ->
         cat.date = CatalogExpression.Date(field="created_at", since=expr.since, until=expr.until)
     elif isinstance(expr, DateModified):
         cat.date = CatalogExpression.Date(field="modified_at", since=expr.since, until=expr.until)
-    elif isinstance(expr, FacetFilterTypes):
+    elif isinstance(expr, FacetFilter):
         cat.facet = facet_from_filter(expr)
     else:
         # This is a trick so mypy generates an error if this branch can be reached,

{nucliadb-6.9.2.post5254.dist-info → nucliadb-6.9.2.post5260.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nucliadb
-Version: 6.9.2.post5254
+Version: 6.9.2.post5260
 Summary: NucliaDB
 Author-email: Nuclia <nucliadb@nuclia.com>
 License-Expression: AGPL-3.0-or-later
@@ -12,18 +12,17 @@ Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Information Technology
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3 :: Only
-Requires-Python: <4,>=3.9
+Requires-Python: <4,>=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: nucliadb-telemetry[all]>=6.9.2.post5254
-Requires-Dist: nucliadb-utils[cache,fastapi,storages]>=6.9.2.post5254
-Requires-Dist: nucliadb-protos>=6.9.2.post5254
-Requires-Dist: nucliadb-models>=6.9.2.post5254
-Requires-Dist: nidx-protos>=6.9.2.post5254
+Requires-Dist: nucliadb-telemetry[all]>=6.9.2.post5260
+Requires-Dist: nucliadb-utils[cache,fastapi,storages]>=6.9.2.post5260
+Requires-Dist: nucliadb-protos>=6.9.2.post5260
+Requires-Dist: nucliadb-models>=6.9.2.post5260
+Requires-Dist: nidx-protos>=6.9.2.post5260
 Requires-Dist: nucliadb-admin-assets>=1.0.0.post1224
 Requires-Dist: nuclia-models>=0.50.0
 Requires-Dist: uvicorn[standard]
@@ -57,7 +56,7 @@ Requires-Dist: jwcrypto>=1.5.6
 Requires-Dist: pyyaml>=5.1
 Requires-Dist: fastapi-versioning>=0.10.0
 Requires-Dist: fastapi>=0.95.2
-Requires-Dist: sentry-sdk>=2.8.0
+Requires-Dist: sentry-sdk[fastapi]>=2.8.0
 Requires-Dist: pyjwt>=2.4.0
 Requires-Dist: mmh3>=3.0.0
 Requires-Dist: httpx>=0.23.0

{nucliadb-6.9.2.post5254.dist-info → nucliadb-6.9.2.post5260.dist-info}/RECORD

@@ -67,7 +67,7 @@ nucliadb/common/cache.py,sha256=FmMVPoxmKGODvOCyO_pxEHjAV3sYeefW9Jeh1cVLTU0,6538
 nucliadb/common/constants.py,sha256=QpigxJh_CtD85Evy0PtV5cVq6x0U_f9xfIcXz1ymkUg,869
 nucliadb/common/counters.py,sha256=8lOi3A2HeLDDlcNaS2QT1SfD3350VPBjiY3FkmHH1V8,977
 nucliadb/common/exceptions.py,sha256=_PJk_NfAhZBFBvmgAfvsJKZ9KuRt5Y1cNsH3-cXE07w,1120
-nucliadb/common/filter_expression.py,sha256=-6buKY1SCVYpkrG_60Ui3ebSDWnXeF_xVmBCrNipoII,6569
+nucliadb/common/filter_expression.py,sha256=qVNVBqhD-RgKR3U_fBnp_a33vhuw684dkKaoMgjyWjI,6233
 nucliadb/common/ids.py,sha256=M4bcl6gmBhVeD3XhRMv40YsbY83bOgSHInQ2ol33Mjc,8829
 nucliadb/common/locking.py,sha256=eZG47mI1OPnKbxSd95qa6jDXBhUoxVBIuSjxoEuBRWE,5894
 nucliadb/common/nidx.py,sha256=W0NkbYfhXgyP9f0QCdAZDv4P-S99QuVrt6ft3B8CZM8,10089
@@ -229,7 +229,7 @@ nucliadb/search/api/v1/__init__.py,sha256=hiIGqIVD0ETJWHvX41_RDEMPHq7jWrE4q4rFQo
 nucliadb/search/api/v1/ask.py,sha256=hZUnk1opZuXp1IwTiingSatlUefg2CZ9r_Z9sUwZMaU,5698
 nucliadb/search/api/v1/catalog.py,sha256=zMflTu9UKfvuEO_u4Et33Q2kSni0TIk2E5t-_Ad5BXM,8069
 nucliadb/search/api/v1/feedback.py,sha256=kNLc4dHz2SXHzV0PwC1WiRAwY88fDptPcP-kO0q-FrQ,2620
-nucliadb/search/api/v1/find.py,sha256=j6mxEyxjlLnZSqCT_N2LmOJlytsm1vkY4KFFmJRrtP8,10904
+nucliadb/search/api/v1/find.py,sha256=kwbEJ_gWwqjuULIGFVRcWkXH44G9JTIvIyCmLb6xj9g,10873
 nucliadb/search/api/v1/graph.py,sha256=gthqxCOn9biE6D6s93jRGLglk0ono8U7OyS390kWiI8,4178
 nucliadb/search/api/v1/hydrate.py,sha256=31HuYvQPZthBhDulVWU8q3EPiBfm4bJDpWMbtM3gtCk,11954
 nucliadb/search/api/v1/knowledgebox.py,sha256=e9xeLPUqnQTx33i4A8xuV93ENvtJGrpjPlLRbGJtAI8,8415
@@ -285,7 +285,7 @@ nucliadb/search/search/query_parser/models.py,sha256=ARJYv88bj-u1G4-JxLKNbaz8gwC
 nucliadb/search/search/query_parser/old_filters.py,sha256=GsU3T3-WiSPvjucP7evHkshzAWZOli8qsuXChvWRCY0,9092
 nucliadb/search/search/query_parser/parsers/__init__.py,sha256=ySCNSdbesLXGZyR88919njulA6UE10_3PhqMG_Yj1o4,1034
 nucliadb/search/search/query_parser/parsers/ask.py,sha256=ySa3lBhUuammIchJvj7xodeGIYGkR0uyLnHuOtLfWE8,2810
-nucliadb/search/search/query_parser/parsers/catalog.py,sha256=DErVfWJ9a_F5a8Qbht1WY4Lm8r3ui9Y3C7oJMOOZOng,7474
+nucliadb/search/search/query_parser/parsers/catalog.py,sha256=ZECncFrgcxtsXrvAA2sqH9h0HJrQvSdezdlQhPR78Lk,7464
 nucliadb/search/search/query_parser/parsers/common.py,sha256=LvpCHL5a8mwVn3_3MMZq9WiVHOFMfLuJlZKvh_neHiM,6872
 nucliadb/search/search/query_parser/parsers/find.py,sha256=7z6GDscMGybvlXENAKOs7XM3p1IJmdC-AZsb4GX_O3g,12698
 nucliadb/search/search/query_parser/parsers/graph.py,sha256=s7nCB7ly_4BZWds-8zce1R-r2fHSiEhAK8P-eL14wTk,9390
@@ -385,8 +385,8 @@ nucliadb/writer/tus/local.py,sha256=7jYa_w9b-N90jWgN2sQKkNcomqn6JMVBOVeDOVYJHto,
 nucliadb/writer/tus/s3.py,sha256=vu1BGg4VqJ_x2P1u2BxqPKlSfw5orT_a3R-Ln5oPUpU,8483
 nucliadb/writer/tus/storage.py,sha256=ToqwjoYnjI4oIcwzkhha_MPxi-k4Jk3Lt55zRwaC1SM,2903
 nucliadb/writer/tus/utils.py,sha256=MSdVbRsRSZVdkaum69_0wku7X3p5wlZf4nr6E0GMKbw,2556
-nucliadb-6.9.2.post5254.dist-info/METADATA,sha256=ZwrIiTp7GOAq5xo-N7wUL5h22qkJc0oF0tsDx5K7bwA,4158
-nucliadb-6.9.2.post5254.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nucliadb-6.9.2.post5254.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
-nucliadb-6.9.2.post5254.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
-nucliadb-6.9.2.post5254.dist-info/RECORD,,
+nucliadb-6.9.2.post5260.dist-info/METADATA,sha256=Te6flE0ilSxOp5VO2RHB43wSXDTG0ZEiMXBYTybX49M,4118
+nucliadb-6.9.2.post5260.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nucliadb-6.9.2.post5260.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
+nucliadb-6.9.2.post5260.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
+nucliadb-6.9.2.post5260.dist-info/RECORD,,