nucliadb 6.3.7.post4068__py3-none-any.whl → 6.3.7.post4077__py3-none-any.whl

nucliadb/search/search/chat/query.py

@@ -108,7 +108,6 @@ async def get_find_results(
                     x_ndb_client=ndb_client,
                     x_nucliadb_user=user,
                     x_forwarded_for=origin,
-                    generative_model=item.generative_model,
                     metrics=metrics,
                 )
                 prefilter_matching_resources = {
@@ -210,6 +209,7 @@ def find_request_from_ask_request(item: AskRequest, query: str) -> FindRequest:
     # We don't support pagination, we always get the top_k results.
     find_request.top_k = item.top_k
     find_request.show_hidden = item.show_hidden
+    find_request.generative_model = item.generative_model
 
     # this executes the model validators, that can tweak some fields
     return FindRequest.model_validate(find_request)
@@ -232,7 +232,6 @@ async def run_main_query(
         ndb_client,
         user,
         origin,
-        generative_model=item.generative_model,
         metrics=metrics,
     )
     if incomplete:
@@ -469,7 +468,6 @@ async def run_prequeries(
                 x_ndb_client,
                 x_nucliadb_user,
                 x_forwarded_for,
-                generative_model=generative_model,
                 metrics=metrics,
             )
             return prequery, find_results

nucliadb/search/search/find.py

@@ -19,7 +19,6 @@
 #
 import logging
 from time import time
-from typing import Optional
 
 from nucliadb.common.external_index_providers.base import ExternalIndexManager
 from nucliadb.common.external_index_providers.manager import get_external_index_manager
@@ -65,7 +64,6 @@ async def find(
     x_ndb_client: NucliaDBClientType,
     x_nucliadb_user: str,
     x_forwarded_for: str,
-    generative_model: Optional[str] = None,
     metrics: RAGMetrics = RAGMetrics(),
 ) -> tuple[KnowledgeboxFindResults, bool, ParsedQuery]:
     external_index_manager = await get_external_index_manager(kbid=kbid)
@@ -74,11 +72,10 @@ async def find(
             kbid,
             item,
             external_index_manager,
-            generative_model,
         )
     else:
         return await _index_node_retrieval(
-            kbid, item, x_ndb_client, x_nucliadb_user, x_forwarded_for, generative_model, metrics
+            kbid, item, x_ndb_client, x_nucliadb_user, x_forwarded_for, metrics
         )
 
 
@@ -88,14 +85,13 @@ async def _index_node_retrieval(
     x_ndb_client: NucliaDBClientType,
     x_nucliadb_user: str,
     x_forwarded_for: str,
-    generative_model: Optional[str] = None,
     metrics: RAGMetrics = RAGMetrics(),
 ) -> tuple[KnowledgeboxFindResults, bool, ParsedQuery]:
     audit = get_audit()
     start_time = time()
 
     with metrics.time("query_parse"):
-        parsed = await parse_find(kbid, item, generative_model=generative_model)
+        parsed = await parse_find(kbid, item)
         rank_fusion = get_rank_fusion(parsed.retrieval.rank_fusion)
         reranker = get_reranker(parsed.retrieval.reranker)
         pb_query, incomplete_results, autofilters, rephrased_query = await convert_retrieval_to_proto(
@@ -179,13 +175,12 @@ async def _external_index_retrieval(
     kbid: str,
     item: FindRequest,
     external_index_manager: ExternalIndexManager,
-    generative_model: Optional[str] = None,
 ) -> tuple[KnowledgeboxFindResults, bool, ParsedQuery]:
     """
     Parse the query, query the external index, and hydrate the results.
     """
     # Parse query
-    parsed = await parse_find(kbid, item, generative_model=generative_model)
+    parsed = await parse_find(kbid, item)
     reranker = get_reranker(parsed.retrieval.reranker)
     search_request, incomplete_results, _, rephrased_query = await convert_retrieval_to_proto(parsed)
 

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

@@ -61,17 +61,16 @@ from .common import (
 async def parse_find(
     kbid: str,
     item: FindRequest,
-    generative_model: Optional[str] = None,
     *,
     fetcher: Optional[Fetcher] = None,
 ) -> ParsedQuery:
-    fetcher = fetcher or fetcher_for_find(kbid, item, generative_model)
+    fetcher = fetcher or fetcher_for_find(kbid, item)
     parser = _FindParser(kbid, item, fetcher)
     retrieval = await parser.parse()
     return ParsedQuery(fetcher=fetcher, retrieval=retrieval, generation=None)
 
 
-def fetcher_for_find(kbid: str, item: FindRequest, generative_model: Optional[str]) -> Fetcher:
+def fetcher_for_find(kbid: str, item: FindRequest) -> Fetcher:
     return Fetcher(
         kbid=kbid,
         query=item.query,
@@ -79,7 +78,7 @@ def fetcher_for_find(kbid: str, item: FindRequest, generative_model: Optional[st
         vectorset=item.vectorset,
         rephrase=item.rephrase,
         rephrase_prompt=item.rephrase_prompt,
-        generative_model=generative_model,
+        generative_model=item.generative_model,
     )
 
 

{nucliadb-6.3.7.post4068.dist-info → nucliadb-6.3.7.post4077.dist-info}/METADATA

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

{nucliadb-6.3.7.post4068.dist-info → nucliadb-6.3.7.post4077.dist-info}/RECORD

@@ -233,7 +233,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=d3OufK9xPaGgSQ9RzER6VJ_rk-d_uly4ia452wmGiz8,8182
+nucliadb/search/search/find.py,sha256=p1W_7cmtpmhIJOX2ttlnMAfBRdn85YkF6vJjeh5aOOA,7904
 nucliadb/search/search/find_merge.py,sha256=sS_0ZeTDs7AiWWuDmYos8mThG5XvaTE92DBoQOPHGTQ,17964
 nucliadb/search/search/graph_merge.py,sha256=OiUNiXOWwrUVKqStuRcoUJwvDbDYamqIgiAy_FwPdMI,3405
 nucliadb/search/search/graph_strategy.py,sha256=hwof-jxYELI6EYmvccDViDda3urE6E7v24-_-IsEF3E,32916
@@ -255,7 +255,7 @@ nucliadb/search/search/chat/ask.py,sha256=nGReEt6MRfBibMxWuH3H7jw5ktK3OmSW9ixzx-
 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=ScZd2-hX9m36A8JGxesN8F5NKZV4FTiF-tN585gxg1M,16806
+nucliadb/search/search/chat/query.py,sha256=YZCp4rrc1wSQevHixXT6eUz4ylF7pZ55L15K6yoGn-U,16705
 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=SkvBRDfSKmuz-QygNKLAU4AhZhhDo1dnOZmt1zA28RA,16851
@@ -266,7 +266,7 @@ nucliadb/search/search/query_parser/parsers/__init__.py,sha256=ySCNSdbesLXGZyR88
 nucliadb/search/search/query_parser/parsers/ask.py,sha256=eTz8wS-EJHuAagR384h6TT64itymFZRpfZJGX8r6aZM,2771
 nucliadb/search/search/query_parser/parsers/catalog.py,sha256=XdBiTweGTQkj8m_V_i2xbwp7P5pPO8K1Tud692XKhMw,7149
 nucliadb/search/search/query_parser/parsers/common.py,sha256=InUWq5cL_LBDptuibQiSMw-9OeByqymTTqW0dzp7rM0,6265
-nucliadb/search/search/query_parser/parsers/find.py,sha256=MHEcFcukGUT8UMeq3wmefnv-FIEslrLsGNrDjtSvQ5A,11262
+nucliadb/search/search/query_parser/parsers/find.py,sha256=EM60bCJ49TyIz2VLITHXP4fdVxzolkzqnFE9pPOBJ1A,11172
 nucliadb/search/search/query_parser/parsers/graph.py,sha256=QJs-pybNXPsMSEkIHctb0Q0xQG-aArks8BtUxbJL5rU,9386
 nucliadb/search/search/query_parser/parsers/search.py,sha256=Qh_xVdLW-jGyD2xDfiRU0K7vDuPu_3JsZEWJn81TLHw,9805
 nucliadb/search/search/query_parser/parsers/unit_retrieval.py,sha256=2NS11DnSUqj3A58mZVMsVRkH00ah9S1lXgUvJZF8NCI,6773
@@ -365,8 +365,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.7.post4068.dist-info/METADATA,sha256=5s-XgWMQEi0Ea8TUODlJ7Us6DomG6DTvnWvJneE2I3Y,4301
-nucliadb-6.3.7.post4068.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-nucliadb-6.3.7.post4068.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
-nucliadb-6.3.7.post4068.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
-nucliadb-6.3.7.post4068.dist-info/RECORD,,
+nucliadb-6.3.7.post4077.dist-info/METADATA,sha256=WRPirUecgZ_EDPYrHotmTIAe_Ae4HRLQi2LG32Su9fk,4301
+nucliadb-6.3.7.post4077.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+nucliadb-6.3.7.post4077.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
+nucliadb-6.3.7.post4077.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
+nucliadb-6.3.7.post4077.dist-info/RECORD,,