nucliadb-utils 6.3.7.post4114__py3-none-any.whl → 6.3.7.post4119__py3-none-any.whl

nucliadb_utils/audit/audit.py

@@ -20,9 +20,9 @@
 from typing import List, Optional
 
 from google.protobuf.timestamp_pb2 import Timestamp
+from nidx_protos.nodereader_pb2 import SearchRequest
 
 from nucliadb_protos.audit_pb2 import AuditField, AuditRequest, ChatContext, RetrievedContext
-from nucliadb_protos.nodereader_pb2 import SearchRequest
 from nucliadb_protos.resources_pb2 import FieldID
 
 

nucliadb_utils/audit/basic.py

@@ -20,9 +20,9 @@
 from typing import List, Optional
 
 from google.protobuf.timestamp_pb2 import Timestamp
+from nidx_protos.nodereader_pb2 import SearchRequest
 
 from nucliadb_protos.audit_pb2 import AuditField, AuditRequest, ChatContext, RetrievedContext
-from nucliadb_protos.nodereader_pb2 import SearchRequest
 from nucliadb_protos.resources_pb2 import FieldID
 from nucliadb_protos.writer_pb2 import BrokerMessage
 from nucliadb_utils import logger

nucliadb_utils/audit/stream.py

@@ -28,7 +28,9 @@ import backoff
 import mmh3
 import nats
 from fastapi import Request
+from google.protobuf.json_format import MessageToDict
 from google.protobuf.timestamp_pb2 import Timestamp
+from nidx_protos.nodereader_pb2 import SearchRequest
 from opentelemetry.trace import format_trace_id, get_current_span
 from starlette.background import BackgroundTask
 from starlette.middleware.base import BaseHTTPMiddleware, RequestResponseEndpoint
@@ -55,7 +57,6 @@ from nucliadb_protos.kb_usage_pb2 import (
 from nucliadb_protos.kb_usage_pb2 import (
     ClientType as ClientTypeKbUsage,
 )
-from nucliadb_protos.nodereader_pb2 import SearchRequest
 from nucliadb_protos.resources_pb2 import FieldID
 from nucliadb_utils import logger
 from nucliadb_utils.audit.audit import AuditStorage
@@ -92,6 +93,13 @@ def fill_audit_search_request(audit: AuditSearchRequest, request: SearchRequest)
     audit.security.CopyFrom(request.security)
     audit.vector.extend(request.vector)
     audit.vectorset = request.vectorset
+    audit.filter = json.dumps(
+        {
+            "field": MessageToDict(request.field_filter),
+            "paragraph": MessageToDict(request.paragraph_filter),
+            "operator": request.filter_operator,
+        }
+    )
 
 
 class AuditMiddleware(BaseHTTPMiddleware):

nucliadb_utils/storages/storage.py

@@ -36,8 +36,9 @@ from typing import (
     cast,
 )
 
-from nucliadb_protos.noderesources_pb2 import Resource as BrainResource
-from nucliadb_protos.nodewriter_pb2 import IndexMessage
+from nidx_protos.noderesources_pb2 import Resource as BrainResource
+from nidx_protos.nodewriter_pb2 import IndexMessage
+
 from nucliadb_protos.resources_pb2 import CloudFile
 from nucliadb_protos.writer_pb2 import BrokerMessage
 from nucliadb_utils import logger

{nucliadb_utils-6.3.7.post4114.dist-info → nucliadb_utils-6.3.7.post4119.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nucliadb_utils
-Version: 6.3.7.post4114
+Version: 6.3.7.post4119
 Summary: NucliaDB util library
 Author-email: Nuclia <nucliadb@nuclia.com>
 License: AGPL
@@ -27,8 +27,8 @@ Requires-Dist: nats-py[nkeys]>=2.6.0
 Requires-Dist: PyNaCl
 Requires-Dist: pyjwt>=2.4.0
 Requires-Dist: mrflagly>=0.2.9
-Requires-Dist: nucliadb-protos>=6.3.7.post4114
-Requires-Dist: nucliadb-telemetry>=6.3.7.post4114
+Requires-Dist: nucliadb-protos>=6.3.7.post4119
+Requires-Dist: nucliadb-telemetry>=6.3.7.post4119
 Provides-Extra: cache
 Requires-Dist: redis>=4.3.4; extra == "cache"
 Requires-Dist: orjson>=3.6.7; extra == "cache"

{nucliadb_utils-6.3.7.post4114.dist-info → nucliadb_utils-6.3.7.post4119.dist-info}/RECORD

@@ -21,9 +21,9 @@ nucliadb_utils/aiopynecone/client.py,sha256=MPyHnDXwhukJr7U3CJh7BpsekfSuOkyM4g5b
 nucliadb_utils/aiopynecone/exceptions.py,sha256=fUErx3ceKQK1MUbOnYcZhIzpNe8UVAptZE9JIRDLXDE,4000
 nucliadb_utils/aiopynecone/models.py,sha256=XkNIZx4bxdbVo9zYVn8IRp70q4DWUMWN79ybGloFj2Q,3492
 nucliadb_utils/audit/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
-nucliadb_utils/audit/audit.py,sha256=m5Mkm4m1W4O91t8jsVQocy57hqYSjboCyFw8P1-g-7A,3497
-nucliadb_utils/audit/basic.py,sha256=trH4IgLnb-VRj2vrRL2686HL7z9Zcdb6bZ7I47Usrt8,4145
-nucliadb_utils/audit/stream.py,sha256=l2meSchmp3TgxwDtzCAl1mGs_GbmXdC9qcBof3qKoIs,16894
+nucliadb_utils/audit/audit.py,sha256=QNrohgWcWkO0exDOi-U7wp1YY7s8ezJqJESWGx4KnYM,3493
+nucliadb_utils/audit/basic.py,sha256=4NX3IkZtTM_F2jD9TGE8-1eoS-hc-_zWwFGYVahGNSs,4141
+nucliadb_utils/audit/stream.py,sha256=lyQXTPswlbGlQLvZsHorCKkMSiLk0_tXToZqPyjHbq0,17174
 nucliadb_utils/cache/__init__.py,sha256=itSI7dtTwFP55YMX4iK7JzdMHS5CQVUiB1XzQu4UBh8,833
 nucliadb_utils/cache/exceptions.py,sha256=Zu-O_-0-yctOEgoDGI92gPzWfBMRrpiAyESA62ld6MA,975
 nucliadb_utils/cache/nats.py,sha256=-AjCfkFgKVdJUlGR0hT9JDSNkPVFg4S6w9eW-ZIcXPM,7037
@@ -47,7 +47,7 @@ nucliadb_utils/storages/nuclia.py,sha256=vEv94xAT7QM2g80S25QyrOw2pzvP2BAX-ADgZLt
 nucliadb_utils/storages/object_store.py,sha256=2PueRP5Q3XOuWgKhj6B9Kp2fyBql5np0T400YRUbqn4,4535
 nucliadb_utils/storages/s3.py,sha256=4-cs_uFC4ZoLHLTZqvGi8v3nQcbrPBFJZuIeWltkFHI,21026
 nucliadb_utils/storages/settings.py,sha256=ugCPy1zxBOmA2KosT-4tsjpvP002kg5iQyi42yCGCJA,1285
-nucliadb_utils/storages/storage.py,sha256=mAP4u_96yXmmbFOWxqFiIDcgiUeZ-Jj_ev466ifdnmo,21859
+nucliadb_utils/storages/storage.py,sha256=4pHkxjwhBpupklp-vFtRCUazlTsGF13LHuF-c2ooYNA,21852
 nucliadb_utils/storages/utils.py,sha256=8g2rIwJeYIumQLOB47Yw1rx3twlhRB_cJxer65QfZmk,1479
 nucliadb_utils/tests/__init__.py,sha256=Oo9CAE7B0eW5VHn8sHd6o30SQzOWUhktLPRXdlDOleA,1456
 nucliadb_utils/tests/asyncbenchmark.py,sha256=vrX_x9ifCXi18PfNShc23w9x_VUiB_Ph-2nuolh9z3Q,10707
@@ -57,7 +57,7 @@ nucliadb_utils/tests/gcs.py,sha256=MBMzn_UHU5SU6iILuCsB5zU4umhNcaCw_MKrxZhwvOc,4
 nucliadb_utils/tests/local.py,sha256=cxIfPrKuqs5Ef0nbrVYQQAH2mwc4E0iD9bC2sWegS-c,1934
 nucliadb_utils/tests/nats.py,sha256=RWHjwqq5esuO7OFbP24yYX1cXnpPLcWJwDUdmwCpH28,1897
 nucliadb_utils/tests/s3.py,sha256=DACUh3HvgH3BchKFZ9R7RFUzsrg3v9A-cxTcXx4nmvA,3734
-nucliadb_utils-6.3.7.post4114.dist-info/METADATA,sha256=ujy_ezLIaVZY6_yXtu0T9OiRjg6S4qsaNuYb-lhMxB8,2205
-nucliadb_utils-6.3.7.post4114.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-nucliadb_utils-6.3.7.post4114.dist-info/top_level.txt,sha256=fE3vJtALTfgh7bcAWcNhcfXkNPp_eVVpbKK-2IYua3E,15
-nucliadb_utils-6.3.7.post4114.dist-info/RECORD,,
+nucliadb_utils-6.3.7.post4119.dist-info/METADATA,sha256=CKmrgePqKnBrEsey3YAuflkhk-UzM1LkX4Iy6kzF7Nc,2205
+nucliadb_utils-6.3.7.post4119.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+nucliadb_utils-6.3.7.post4119.dist-info/top_level.txt,sha256=fE3vJtALTfgh7bcAWcNhcfXkNPp_eVVpbKK-2IYua3E,15
+nucliadb_utils-6.3.7.post4119.dist-info/RECORD,,