nucliadb-utils 6.3.7.post4091__py3-none-any.whl → 6.3.7.post4116__py3-none-any.whl

nucliadb_utils/audit/stream.py

@@ -28,6 +28,7 @@ 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 opentelemetry.trace import format_trace_id, get_current_span
 from starlette.background import BackgroundTask
@@ -35,7 +36,14 @@ from starlette.middleware.base import BaseHTTPMiddleware, RequestResponseEndpoin
 from starlette.responses import Response
 from starlette.types import ASGIApp
 
-from nucliadb_protos.audit_pb2 import AuditField, AuditRequest, ChatContext, ClientType, RetrievedContext
+from nucliadb_protos.audit_pb2 import (
+    AuditField,
+    AuditRequest,
+    AuditSearchRequest,
+    ChatContext,
+    ClientType,
+    RetrievedContext,
+)
 from nucliadb_protos.kb_usage_pb2 import (
     ActivityLogMatch,
     ActivityLogMatchType,
@@ -77,6 +85,23 @@ def get_request_context() -> Optional[RequestContext]:
     return request_context_var.get()
 
 
+def fill_audit_search_request(audit: AuditSearchRequest, request: SearchRequest):
+    audit.body = request.body
+    audit.min_score_bm25 = request.min_score_bm25
+    audit.min_score_semantic = request.min_score_semantic
+    audit.result_per_page = request.result_per_page
+    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):
     def __init__(self, app: ASGIApp, audit_utility_getter: Callable[[], Optional[AuditStorage]]) -> None:
         self.audit_utility_getter = audit_utility_getter
@@ -355,15 +380,17 @@ class StreamAuditStorage(AuditStorage):
         auditrequest.client_type = client_type  # type: ignore
         auditrequest.userid = user
         auditrequest.kbid = kbid
-        auditrequest.search.CopyFrom(search)
         auditrequest.retrieval_time = timeit
         auditrequest.resources = resources
         if "/ask" in context.path:
             auditrequest.type = AuditRequest.CHAT
         else:
             auditrequest.type = AuditRequest.SEARCH
+
+        fill_audit_search_request(auditrequest.search, search)
         if retrieval_rephrased_question is not None:
             auditrequest.retrieval_rephrased_question = retrieval_rephrased_question
+
         trace_id = get_trace_id()
         self.kb_usage_utility.send_kb_usage(
             service=Service.NUCLIA_DB,
@@ -419,8 +446,10 @@ class StreamAuditStorage(AuditStorage):
             auditrequest.generative_answer_time = generative_answer_time
         if generative_answer_first_chunk_time is not None:
             auditrequest.generative_answer_first_chunk_time = generative_answer_first_chunk_time
+
         if retrieval_rephrased_question is not None:
             auditrequest.retrieval_rephrased_question = retrieval_rephrased_question
+
         auditrequest.type = AuditRequest.CHAT
         auditrequest.chat.question = question
         auditrequest.chat.chat_context.extend(chat_context)

{nucliadb_utils-6.3.7.post4091.dist-info → nucliadb_utils-6.3.7.post4116.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nucliadb_utils
-Version: 6.3.7.post4091
+Version: 6.3.7.post4116
 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.post4091
-Requires-Dist: nucliadb-telemetry>=6.3.7.post4091
+Requires-Dist: nucliadb-protos>=6.3.7.post4116
+Requires-Dist: nucliadb-telemetry>=6.3.7.post4116
 Provides-Extra: cache
 Requires-Dist: redis>=4.3.4; extra == "cache"
 Requires-Dist: orjson>=3.6.7; extra == "cache"

{nucliadb_utils-6.3.7.post4091.dist-info → nucliadb_utils-6.3.7.post4116.dist-info}/RECORD

@@ -23,7 +23,7 @@ nucliadb_utils/aiopynecone/models.py,sha256=XkNIZx4bxdbVo9zYVn8IRp70q4DWUMWN79yb
 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=b1W_5XK_8uc9tO1zcEp_sYAm5pG7-ODYbX8zqzMHXUk,16423
+nucliadb_utils/audit/stream.py,sha256=2XDnySbA5fGL3ZV61kCvUXdMDKMpZ5XVZy7sdxMDRdQ,17178
 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
@@ -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.post4091.dist-info/METADATA,sha256=zFHfSPAzWNMy_73pQQfudB_C_fWrDhOboRqCxfIAuTA,2205
-nucliadb_utils-6.3.7.post4091.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-nucliadb_utils-6.3.7.post4091.dist-info/top_level.txt,sha256=fE3vJtALTfgh7bcAWcNhcfXkNPp_eVVpbKK-2IYua3E,15
-nucliadb_utils-6.3.7.post4091.dist-info/RECORD,,
+nucliadb_utils-6.3.7.post4116.dist-info/METADATA,sha256=3Pzr6ZXD0BiZGQfmVk4OTH2c_iw8OU2NN2Towywtyco,2205
+nucliadb_utils-6.3.7.post4116.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+nucliadb_utils-6.3.7.post4116.dist-info/top_level.txt,sha256=fE3vJtALTfgh7bcAWcNhcfXkNPp_eVVpbKK-2IYua3E,15
+nucliadb_utils-6.3.7.post4116.dist-info/RECORD,,

{nucliadb_utils-6.3.7.post4091.dist-info → nucliadb_utils-6.3.7.post4116.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.0)
+Generator: setuptools (79.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any