nucliadb 6.3.5.post4033__py3-none-any.whl → 6.3.5.post4041__py3-none-any.whl

nucliadb/search/search/chat/ask.py

@@ -526,6 +526,7 @@ async def ask(
             rephrase_time=rephrase_time,
             user_query=user_query,
             rephrased_query=rephrased_query,
+            retrieval_rephrase_query=err.main_query.rephrased_query if err.main_query else None,
             text_answer=b"",
             status_code=AnswerStatusCode.NO_RETRIEVAL_DATA,
             chat_history=chat_history,
@@ -605,6 +606,7 @@ async def ask(
         origin=origin,
         user_query=user_query,
         rephrased_query=rephrased_query,
+        retrieval_rephrased_query=retrieval_results.main_query.rephrased_query,
         chat_history=chat_history,
         learning_id=nuclia_learning_id,
         query_context=prompt_context,

nucliadb/search/search/chat/query.py

@@ -315,6 +315,7 @@ def maybe_audit_chat(
     rephrase_time: Optional[float],
     user_query: str,
     rephrased_query: Optional[str],
+    retrieval_rephrase_query: Optional[str],
     text_answer: bytes,
     status_code: AnswerStatusCode,
     chat_history: list[ChatContextMessage],
@@ -349,6 +350,7 @@ def maybe_audit_chat(
         generative_answer_first_chunk_time=generative_answer_first_chunk_time,
         rephrase_time=rephrase_time,
         rephrased_question=rephrased_query,
+        retrieval_rephrased_question=retrieval_rephrase_query,
         chat_context=chat_history_context,
         retrieved_context=chat_retrieved_context,
         answer=audit_answer,
@@ -380,6 +382,7 @@ class ChatAuditor:
         origin: str,
         user_query: str,
         rephrased_query: Optional[str],
+        retrieval_rephrased_query: Optional[str],
         chat_history: list[ChatContextMessage],
         learning_id: Optional[str],
         query_context: PromptContext,
@@ -392,6 +395,7 @@ class ChatAuditor:
         self.origin = origin
         self.user_query = user_query
         self.rephrased_query = rephrased_query
+        self.retrieval_rephrased_query = retrieval_rephrased_query
         self.chat_history = chat_history
         self.learning_id = learning_id
         self.query_context = query_context
@@ -413,6 +417,7 @@ class ChatAuditor:
             origin=self.origin,
             user_query=self.user_query,
             rephrased_query=self.rephrased_query,
+            retrieval_rephrase_query=self.retrieval_rephrased_query,
             generative_answer_time=generative_answer_time,
             generative_answer_first_chunk_time=generative_answer_first_chunk_time,
             rephrase_time=rephrase_time,

nucliadb/search/search/find.py

@@ -144,6 +144,7 @@ async def _index_node_retrieval(
             pb_query,
             search_time,
             len(search_results.resources),
+            retrieval_rephrased_question=rephrased_query,
         )
 
     if item.debug:

nucliadb/search/search/metrics.py

@@ -26,6 +26,7 @@ from nucliadb_telemetry import metrics
 merge_observer = metrics.Observer("merge_results", labels={"type": ""})
 node_features = metrics.Counter("nucliadb_node_features", labels={"type": ""})
 query_parse_dependency_observer = metrics.Observer("query_parse_dependency", labels={"type": ""})
+query_parser_observer = metrics.Observer("nucliadb_query_parser", labels={"type": ""})
 
 buckets = [
     0.005,

nucliadb/search/search/query.py

@@ -32,6 +32,7 @@ from nucliadb.search.search.filters import (
 )
 from nucliadb.search.search.metrics import (
     node_features,
+    query_parser_observer,
 )
 from nucliadb.search.search.query_parser.fetcher import Fetcher
 from nucliadb.search.search.rank_fusion import (
@@ -194,6 +195,7 @@ class QueryParser:
         if self.with_synonyms and self.query:
             asyncio.ensure_future(self.fetcher.get_synonyms())
 
+    @query_parser_observer.wrap({"type": "QueryParser"})
     async def parse(self) -> tuple[nodereader_pb2.SearchRequest, bool, list[str], Optional[str]]:
         """
         :return: (request, incomplete, autofilters)

nucliadb/search/search/query_parser/parsers/find.py

@@ -20,6 +20,7 @@
 
 from pydantic import ValidationError
 
+from nucliadb.search.search.metrics import query_parser_observer
 from nucliadb.search.search.query_parser.exceptions import InternalParserError
 from nucliadb.search.search.query_parser.models import (
     NoopReranker,
@@ -35,6 +36,7 @@ from nucliadb_models.search import (
 )
 
 
+@query_parser_observer.wrap({"type": "parse_find"})
 async def parse_find(kbid: str, item: FindRequest) -> UnitRetrieval:
     parser = _FindParser(kbid, item)
     return await parser.parse()

{nucliadb-6.3.5.post4033.dist-info → nucliadb-6.3.5.post4041.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nucliadb
-Version: 6.3.5.post4033
+Version: 6.3.5.post4041
 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.3.5.post4033
-Requires-Dist: nucliadb-utils[cache,fastapi,storages]>=6.3.5.post4033
-Requires-Dist: nucliadb-protos>=6.3.5.post4033
-Requires-Dist: nucliadb-models>=6.3.5.post4033
-Requires-Dist: nidx-protos>=6.3.5.post4033
+Requires-Dist: nucliadb-telemetry[all]>=6.3.5.post4041
+Requires-Dist: nucliadb-utils[cache,fastapi,storages]>=6.3.5.post4041
+Requires-Dist: nucliadb-protos>=6.3.5.post4041
+Requires-Dist: nucliadb-models>=6.3.5.post4041
+Requires-Dist: nidx-protos>=6.3.5.post4041
 Requires-Dist: nucliadb-admin-assets>=1.0.0.post1224
 Requires-Dist: nuclia-models>=0.24.2
 Requires-Dist: uvicorn[standard]

{nucliadb-6.3.5.post4033.dist-info → nucliadb-6.3.5.post4041.dist-info}/RECORD

@@ -233,29 +233,29 @@ 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=pjc-i55j_p_F1H0La4qc9slZSl_gICoFzl3fy6FLYTM,10314
+nucliadb/search/search/find.py,sha256=dGzk6gDN6xdtREhLcZxBX_rTppQ8O1WcSYJQE4r5h-o,10372
 nucliadb/search/search/find_merge.py,sha256=3FnzKFEnVemg6FO_6zveulbAU7klvsiPEBvLrpBBMg8,17450
 nucliadb/search/search/graph_merge.py,sha256=OiUNiXOWwrUVKqStuRcoUJwvDbDYamqIgiAy_FwPdMI,3405
 nucliadb/search/search/graph_strategy.py,sha256=SPJdDHQcTFsNb1IEWdWzklC5j1Vv9igibo0dYQAgcy0,33113
 nucliadb/search/search/hydrator.py,sha256=-R37gCrGxkyaiHQalnTWHNG_FCx11Zucd7qA1vQCxuw,6985
 nucliadb/search/search/ingestion_agents.py,sha256=NeJr4EEX-bvFFMGvXOOwLv8uU7NuQ-ntJnnrhnKfMzY,3174
 nucliadb/search/search/merge.py,sha256=fh5WnA_xnXp-Iiq5Cud9hIGole7_0OW2b3Oymk32D6Y,22689
-nucliadb/search/search/metrics.py,sha256=GGGtXHLhK79_ESV277xkBVjcaMURXHCxYG0EdGamUd8,2886
+nucliadb/search/search/metrics.py,sha256=HJVQPLOIwLuc733G4keqEgx1-Dcg97hyWGKZQTojiSE,2973
 nucliadb/search/search/paragraphs.py,sha256=pNAEiYqJGGUVcEf7xf-PFMVqz0PX4Qb-WNG-_zPGN2o,7799
 nucliadb/search/search/pgcatalog.py,sha256=s_J98fsX_RuFXwpejpkGqG-tD9ELuzz4YQ6U3ew5h2g,9313
 nucliadb/search/search/predict_proxy.py,sha256=IFI3v_ODz2_UU1XZnyaD391fE7-2C0npSmj_HmDvzS4,3123
-nucliadb/search/search/query.py,sha256=Nc-RSP64Tb-R1znhp-MTkNSsrBnhaFEoFBV0NxOL9ZM,30267
+nucliadb/search/search/query.py,sha256=Obd84og7BQJ5zZd3iAc9kyndCTHv0ihSL3PO5GNljR4,30351
 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=OEtN1p9WX_cMX8t-myaafpmFAPTpUEOutR7z1sDuNcY,3242
 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=4Vi4yxnhjToPHZUtdUkFNAEuI85QgkyBXQkcRX-a_vA,37244
+nucliadb/search/search/chat/ask.py,sha256=OLZOfVKAJmnVW7KiKIfDVjYJphkDRd7cMa5NwUQbT-8,37421
 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
-nucliadb/search/search/chat/query.py,sha256=0IoeW-JNaRBe2d9C3bXNfkYpzmsN_IIg3U4Vqb8eOEk,16485
+nucliadb/search/search/chat/query.py,sha256=ILWdd-0kaV97kR4wenwo4lX9K0GN-dXv957wL4CKvx8,16779
 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=vrPgPnebWlrbx9fcelw7eHayEDptxnm9BP1F9LAEMws,15307
@@ -264,7 +264,7 @@ nucliadb/search/search/query_parser/models.py,sha256=7czH-jHskl9axEnZV5XnQY8cyN_
 nucliadb/search/search/query_parser/old_filters.py,sha256=-zbfN-RsXoj_DRjh3Lfp-wShwFXgkISawzVptVzja-A,9071
 nucliadb/search/search/query_parser/parsers/__init__.py,sha256=ySCNSdbesLXGZyR88919njulA6UE10_3PhqMG_Yj1o4,1034
 nucliadb/search/search/query_parser/parsers/catalog.py,sha256=XdBiTweGTQkj8m_V_i2xbwp7P5pPO8K1Tud692XKhMw,7149
-nucliadb/search/search/query_parser/parsers/find.py,sha256=q3wH_i0DGceeKckYEH3c5MqM5EvRiMCL7r-6nCAId9Q,4666
+nucliadb/search/search/query_parser/parsers/find.py,sha256=5Hp3MIlzkf_NdzpBaNAIHS8gWm6CYZEzUMwmrrO9Z-k,4783
 nucliadb/search/search/query_parser/parsers/graph.py,sha256=QJs-pybNXPsMSEkIHctb0Q0xQG-aArks8BtUxbJL5rU,9386
 nucliadb/standalone/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
 nucliadb/standalone/api_router.py,sha256=hgq9FXpihzgjHkwcVGfGCSwyXy67fqXTfLFHuINzIi0,5567
@@ -361,8 +361,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.3.5.post4033.dist-info/METADATA,sha256=3k6HCLT1QjmqSlXDmUdknc4RqNGQQQ6Up3klneIqzwU,4301
-nucliadb-6.3.5.post4033.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-nucliadb-6.3.5.post4033.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
-nucliadb-6.3.5.post4033.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
-nucliadb-6.3.5.post4033.dist-info/RECORD,,
+nucliadb-6.3.5.post4041.dist-info/METADATA,sha256=GxFn38Bmq7__eS-pfLBQ8sJTLFIoeyhqKm6JWiJJsDU,4301
+nucliadb-6.3.5.post4041.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+nucliadb-6.3.5.post4041.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
+nucliadb-6.3.5.post4041.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
+nucliadb-6.3.5.post4041.dist-info/RECORD,,