nucliadb 2.46.1.post382__py3-none-any.whl → 6.2.1.post2777__py3-none-any.whl

nucliadb/search/search/chat/query.py

@@ -18,67 +18,43 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 import asyncio
-from dataclasses import dataclass
-from time import monotonic as time
-from typing import AsyncGenerator, AsyncIterator, Optional
-
-from nucliadb_protos.nodereader_pb2 import RelationSearchRequest, RelationSearchResponse
+from typing import Optional
 
+from nucliadb.common.models_utils import to_proto
 from nucliadb.search import logger
 from nucliadb.search.predict import AnswerStatusCode
 from nucliadb.search.requesters.utils import Method, node_query
-from nucliadb.search.search.chat.prompt import PromptContextBuilder
+from nucliadb.search.search.chat.exceptions import NoRetrievalResultsError
 from nucliadb.search.search.exceptions import IncompleteFindResultsError
 from nucliadb.search.search.find import find
 from nucliadb.search.search.merge import merge_relations_results
+from nucliadb.search.search.metrics import RAGMetrics
 from nucliadb.search.search.query import QueryParser
+from nucliadb.search.settings import settings
 from nucliadb.search.utilities import get_predict
 from nucliadb_models.search import (
-    Author,
+    AskRequest,
     ChatContextMessage,
-    ChatModel,
     ChatOptions,
-    ChatRequest,
     FindRequest,
     KnowledgeboxFindResults,
     NucliaDBClientType,
+    PreQueriesStrategy,
+    PreQuery,
+    PreQueryResult,
     PromptContext,
     PromptContextOrder,
     Relations,
     RephraseModel,
     SearchOptions,
-    UserPrompt,
+    parse_rephrase_prompt,
 )
 from nucliadb_protos import audit_pb2
+from nucliadb_protos.nodereader_pb2 import RelationSearchResponse, SearchRequest, SearchResponse
 from nucliadb_telemetry.errors import capture_exception
-from nucliadb_utils.helpers import async_gen_lookahead
 from nucliadb_utils.utilities import get_audit
 
 NOT_ENOUGH_CONTEXT_ANSWER = "Not enough data to answer this."
-AUDIT_TEXT_RESULT_SEP = " \n\n "
-START_OF_CITATIONS = b"_CIT_"
-
-
-class FoundStatusCode:
-    def __init__(self, default: AnswerStatusCode = AnswerStatusCode.SUCCESS):
-        self._value = AnswerStatusCode.SUCCESS
-
-    def set(self, value: AnswerStatusCode) -> None:
-        self._value = value
-
-    @property
-    def value(self) -> AnswerStatusCode:
-        return self._value
-
-
-@dataclass
-class ChatResult:
-    nuclia_learning_id: Optional[str]
-    answer_stream: AsyncIterator[bytes]
-    status_code: FoundStatusCode
-    find_results: KnowledgeboxFindResults
-    prompt_context: PromptContext
-    prompt_context_order: PromptContextOrder
 
 
 async def rephrase_query(
@@ -100,70 +76,120 @@ async def rephrase_query(
     return await predict.rephrase_query(kbid, req)
 
 
-async def format_generated_answer(
-    answer_generator: AsyncGenerator[bytes, None], output_status_code: FoundStatusCode
-):
-    status_code: Optional[AnswerStatusCode] = None
-    is_last_chunk = False
-    async for answer_chunk, is_last_chunk in async_gen_lookahead(answer_generator):
-        if is_last_chunk:
-            try:
-                status_code = _parse_answer_status_code(answer_chunk)
-            except ValueError:
-                # TODO: remove this in the future, it's
-                # just for bw compatibility until predict
-                # is updated to the new protocol
-                status_code = AnswerStatusCode.SUCCESS
-                yield answer_chunk
-            else:
-                # TODO: this should be needed but, in case we receive the status
-                # code mixed with text, we strip it and return the text
-                if len(answer_chunk) != len(status_code.encode()):
-                    answer_chunk = answer_chunk.rstrip(status_code.encode())
-                    yield answer_chunk
-            break
-        yield answer_chunk
-    if not is_last_chunk:
-        logger.warning("BUG: /chat endpoint without last chunk")
-
-    output_status_code.set(status_code or AnswerStatusCode.SUCCESS)
-
-
 async def get_find_results(
     *,
     kbid: str,
     query: str,
-    chat_request: ChatRequest,
+    item: AskRequest,
     ndb_client: NucliaDBClientType,
     user: str,
     origin: str,
+    metrics: RAGMetrics = RAGMetrics(),
+    prequeries_strategy: Optional[PreQueriesStrategy] = None,
+) -> tuple[KnowledgeboxFindResults, Optional[list[PreQueryResult]], QueryParser]:
+    prequeries_results = None
+    prefilter_queries_results = None
+    queries_results = None
+    if prequeries_strategy is not None:
+        prefilters = [prequery for prequery in prequeries_strategy.queries if prequery.prefilter]
+        prequeries = [prequery for prequery in prequeries_strategy.queries if not prequery.prefilter]
+        if len(prefilters) > 0:
+            with metrics.time("prefilters"):
+                prefilter_queries_results = await run_prequeries(
+                    kbid,
+                    prefilters,
+                    x_ndb_client=ndb_client,
+                    x_nucliadb_user=user,
+                    x_forwarded_for=origin,
+                    generative_model=item.generative_model,
+                    metrics=metrics,
+                )
+                prefilter_matching_resources = {
+                    resource
+                    for _, find_results in prefilter_queries_results
+                    for resource in find_results.resources.keys()
+                }
+                if len(prefilter_matching_resources) == 0:
+                    raise NoRetrievalResultsError()
+                # Make sure the main query and prequeries use the same resource filters.
+                # This is important to avoid returning results that don't match the prefilter.
+                item.resource_filters = list(prefilter_matching_resources)
+                for prequery in prequeries:
+                    prequery.request.resource_filters = list(prefilter_matching_resources)
+                    prequery.request.show_hidden = item.show_hidden
+
+        if prequeries:
+            with metrics.time("prequeries"):
+                queries_results = await run_prequeries(
+                    kbid,
+                    prequeries,
+                    x_ndb_client=ndb_client,
+                    x_nucliadb_user=user,
+                    x_forwarded_for=origin,
+                    generative_model=item.generative_model,
+                    metrics=metrics,
+                )
+
+        prequeries_results = (prefilter_queries_results or []) + (queries_results or [])
+
+    with metrics.time("main_query"):
+        main_results, query_parser = await run_main_query(
+            kbid,
+            query,
+            item,
+            ndb_client,
+            user,
+            origin,
+            metrics=metrics,
+        )
+    return main_results, prequeries_results, query_parser
+
+
+async def run_main_query(
+    kbid: str,
+    query: str,
+    item: AskRequest,
+    ndb_client: NucliaDBClientType,
+    user: str,
+    origin: str,
+    metrics: RAGMetrics = RAGMetrics(),
 ) -> tuple[KnowledgeboxFindResults, QueryParser]:
     find_request = FindRequest()
-    find_request.resource_filters = chat_request.resource_filters
+    find_request.resource_filters = item.resource_filters
     find_request.features = []
-    if ChatOptions.VECTORS in chat_request.features:
-        find_request.features.append(SearchOptions.VECTOR)
-    if ChatOptions.PARAGRAPHS in chat_request.features:
-        find_request.features.append(SearchOptions.PARAGRAPH)
-    if ChatOptions.RELATIONS in chat_request.features:
+    if ChatOptions.SEMANTIC in item.features:
+        find_request.features.append(SearchOptions.SEMANTIC)
+    if ChatOptions.KEYWORD in item.features:
+        find_request.features.append(SearchOptions.KEYWORD)
+    if ChatOptions.RELATIONS in item.features:
         find_request.features.append(SearchOptions.RELATIONS)
     find_request.query = query
-    find_request.fields = chat_request.fields
-    find_request.filters = chat_request.filters
-    find_request.field_type_filter = chat_request.field_type_filter
-    find_request.min_score = chat_request.min_score
-    find_request.range_creation_start = chat_request.range_creation_start
-    find_request.range_creation_end = chat_request.range_creation_end
-    find_request.range_modification_start = chat_request.range_modification_start
-    find_request.range_modification_end = chat_request.range_modification_end
-    find_request.show = chat_request.show
-    find_request.extracted = chat_request.extracted
-    find_request.shards = chat_request.shards
-    find_request.autofilter = chat_request.autofilter
-    find_request.highlight = chat_request.highlight
-    find_request.security = chat_request.security
-    find_request.debug = chat_request.debug
-    find_request.rephrase = chat_request.rephrase
+    find_request.fields = item.fields
+    find_request.filters = item.filters
+    find_request.field_type_filter = item.field_type_filter
+    find_request.min_score = item.min_score
+    find_request.vectorset = item.vectorset
+    find_request.range_creation_start = item.range_creation_start
+    find_request.range_creation_end = item.range_creation_end
+    find_request.range_modification_start = item.range_modification_start
+    find_request.range_modification_end = item.range_modification_end
+    find_request.show = item.show
+    find_request.extracted = item.extracted
+    find_request.shards = item.shards
+    find_request.autofilter = item.autofilter
+    find_request.highlight = item.highlight
+    find_request.security = item.security
+    find_request.debug = item.debug
+    find_request.rephrase = item.rephrase
+    find_request.rephrase_prompt = parse_rephrase_prompt(item)
+    find_request.rank_fusion = item.rank_fusion
+    find_request.reranker = item.reranker
+    # 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
+
+    # this executes the model validators, that can tweak some fields
+    FindRequest.model_validate(find_request)
 
     find_results, incomplete, query_parser = await find(
         kbid,
@@ -171,7 +197,8 @@ async def get_find_results(
         ndb_client,
         user,
         origin,
-        generative_model=chat_request.generative_model,
+        generative_model=item.generative_model,
+        metrics=metrics,
     )
     if incomplete:
         raise IncompleteFindResultsError()
@@ -179,230 +206,210 @@ async def get_find_results(
 
 
 async def get_relations_results(
-    *, kbid: str, chat_request: ChatRequest, text_answer: str
+    *,
+    kbid: str,
+    text_answer: str,
+    target_shard_replicas: Optional[list[str]],
+    timeout: Optional[float] = None,
 ) -> Relations:
     try:
         predict = get_predict()
         detected_entities = await predict.detect_entities(kbid, text_answer)
-        relation_request = RelationSearchRequest()
-        relation_request.subgraph.entry_points.extend(detected_entities)
-        relation_request.subgraph.depth = 1
+        request = SearchRequest()
+        request.relation_subgraph.entry_points.extend(detected_entities)
+        request.relation_subgraph.depth = 1
 
-        relations_results: list[RelationSearchResponse]
+        results: list[SearchResponse]
         (
-            relations_results,
+            results,
             _,
             _,
         ) = await node_query(
             kbid,
-            Method.RELATIONS,
-            relation_request,
-            target_shard_replicas=chat_request.shards,
-        )
-        return await merge_relations_results(
-            relations_results, relation_request.subgraph
+            Method.SEARCH,
+            request,
+            target_shard_replicas=target_shard_replicas,
+            timeout=timeout,
+            use_read_replica_nodes=True,
+            retry_on_primary=False,
         )
+        relations_results: list[RelationSearchResponse] = [result.relation for result in results]
+        return await merge_relations_results(relations_results, request.relation_subgraph)
     except Exception as exc:
         capture_exception(exc)
         logger.exception("Error getting relations results")
         return Relations(entities={})
 
 
-async def not_enough_context_generator():
-    await asyncio.sleep(0)
-    yield NOT_ENOUGH_CONTEXT_ANSWER.encode()
-    yield AnswerStatusCode.NO_CONTEXT.encode()
-
-
-async def chat(
-    kbid: str,
-    chat_request: ChatRequest,
-    user_id: str,
-    client_type: NucliaDBClientType,
-    origin: str,
-) -> ChatResult:
-    start_time = time()
-    nuclia_learning_id: Optional[str] = None
-    chat_history = chat_request.context or []
-    user_context = chat_request.extra_context or []
-    user_query = chat_request.query
-    rephrased_query = None
-    prompt_context: PromptContext = {}
-    prompt_context_order: PromptContextOrder = {}
-
-    if len(chat_history) > 0 or len(user_context) > 0:
-        rephrased_query = await rephrase_query(
-            kbid,
-            chat_history=chat_history,
-            query=user_query,
-            user_id=user_id,
-            user_context=user_context,
-            generative_model=chat_request.generative_model,
-        )
-
-    find_results, query_parser = await get_find_results(
-        kbid=kbid,
-        query=rephrased_query or user_query,
-        chat_request=chat_request,
-        ndb_client=client_type,
-        user=user_id,
-        origin=origin,
-    )
-
-    status_code = FoundStatusCode()
-    if len(find_results.resources) == 0:
-        answer_stream = format_generated_answer(
-            not_enough_context_generator(), status_code
-        )
-    else:
-        prompt_context_builder = PromptContextBuilder(
-            kbid=kbid,
-            find_results=find_results,
-            user_context=user_context,
-            strategies=chat_request.rag_strategies,
-            image_strategies=chat_request.rag_images_strategies,
-            max_context_size=await query_parser.get_max_context(),
-            visual_llm=await query_parser.get_visual_llm_enabled(),
-        )
-        (
-            prompt_context,
-            prompt_context_order,
-            prompt_context_images,
-        ) = await prompt_context_builder.build()
-        user_prompt = None
-        if chat_request.prompt is not None:
-            user_prompt = UserPrompt(prompt=chat_request.prompt)
-
-        chat_model = ChatModel(
-            user_id=user_id,
-            query_context=prompt_context,
-            query_context_order=prompt_context_order,
-            chat_history=chat_history,
-            question=user_query,
-            truncate=True,
-            user_prompt=user_prompt,
-            citations=chat_request.citations,
-            generative_model=chat_request.generative_model,
-            max_tokens=chat_request.max_tokens,
-            query_context_images=prompt_context_images,
-        )
-        predict = get_predict()
-        nuclia_learning_id, predict_generator = await predict.chat_query(
-            kbid, chat_model
-        )
-
-        async def _wrapped_stream():
-            # so we can audit after streamed out answer
-            text_answer = b""
-            async for chunk in format_generated_answer(predict_generator, status_code):
-                text_answer += chunk
-                yield chunk
-
-            await maybe_audit_chat(
-                kbid=kbid,
-                user_id=user_id,
-                client_type=client_type,
-                origin=origin,
-                duration=time() - start_time,
-                user_query=user_query,
-                rephrased_query=rephrased_query,
-                text_answer=text_answer,
-                status_code=status_code.value,
-                chat_history=chat_history,
-                query_context=prompt_context,
-                learning_id=nuclia_learning_id,
-            )
-
-        answer_stream = _wrapped_stream()
-
-    return ChatResult(
-        nuclia_learning_id=nuclia_learning_id,
-        answer_stream=answer_stream,
-        status_code=status_code,
-        find_results=find_results,
-        prompt_context=prompt_context,
-        prompt_context_order=prompt_context_order,
-    )
-
-
-def _parse_answer_status_code(chunk: bytes) -> AnswerStatusCode:
-    """
-    Parses the status code from the last chunk of the answer.
-    """
-    try:
-        return AnswerStatusCode(chunk.decode())
-    except ValueError:
-        # In some cases, even if the status code was yield separately
-        # at the server side, the status code is appended to the previous chunk...
-        # It may be a bug in the aiohttp.StreamResponse implementation,
-        # but we haven't spotted it yet. For now, we just try to parse the status code
-        # from the tail of the chunk.
-        logger.debug(
-            f"Error decoding status code from /chat's last chunk. Chunk: {chunk!r}"
-        )
-        if chunk == b"":
-            raise
-        if chunk.endswith(b"0"):
-            return AnswerStatusCode.SUCCESS
-        return AnswerStatusCode(chunk[-2:].decode())
-
-
-async def maybe_audit_chat(
+def maybe_audit_chat(
     *,
     kbid: str,
     user_id: str,
     client_type: NucliaDBClientType,
     origin: str,
-    duration: float,
+    generative_answer_time: float,
+    generative_answer_first_chunk_time: float,
+    rephrase_time: Optional[float],
     user_query: str,
     rephrased_query: Optional[str],
     text_answer: bytes,
-    status_code: Optional[AnswerStatusCode],
+    status_code: AnswerStatusCode,
     chat_history: list[ChatContextMessage],
-    query_context: list[str],
+    query_context: PromptContext,
+    query_context_order: PromptContextOrder,
     learning_id: str,
+    model: str,
 ):
     audit = get_audit()
     if audit is None:
         return
 
     audit_answer = parse_audit_answer(text_answer, status_code)
+    # Append chat history
+    chat_history_context = [
+        audit_pb2.ChatContext(author=message.author, text=message.text) for message in chat_history
+    ]
 
-    # Append chat history and query context
-    audit_context = [
-        audit_pb2.ChatContext(author=message.author, text=message.text)
-        for message in chat_history
+    # Append paragraphs retrieved on this chat
+    chat_retrieved_context = [
+        audit_pb2.RetrievedContext(text_block_id=paragraph_id, text=text)
+        for paragraph_id, text in query_context.items()
     ]
-    audit_context.append(
-        audit_pb2.ChatContext(
-            author=Author.NUCLIA,
-            text=AUDIT_TEXT_RESULT_SEP.join(query_context),
-        )
-    )
-    await audit.chat(
+
+    audit.chat(
         kbid,
         user_id,
-        client_type.to_proto(),
+        to_proto.client_type(client_type),
         origin,
-        duration,
         question=user_query,
+        generative_answer_time=generative_answer_time,
+        generative_answer_first_chunk_time=generative_answer_first_chunk_time,
+        rephrase_time=rephrase_time,
         rephrased_question=rephrased_query,
-        context=audit_context,
+        chat_context=chat_history_context,
+        retrieved_context=chat_retrieved_context,
         answer=audit_answer,
         learning_id=learning_id,
+        status_code=int(status_code.value),
+        model=model,
     )
 
 
-def parse_audit_answer(
-    raw_text_answer: bytes, status_code: Optional[AnswerStatusCode]
-) -> Optional[str]:
+def parse_audit_answer(raw_text_answer: bytes, status_code: AnswerStatusCode) -> Optional[str]:
     if status_code == AnswerStatusCode.NO_CONTEXT:
         # We don't want to audit "Not enough context to answer this." and instead set a None.
         return None
-    # Split citations part from answer
-    try:
-        raw_audit_answer, _ = raw_text_answer.split(START_OF_CITATIONS)
-    except ValueError:
-        raw_audit_answer = raw_text_answer
-    audit_answer = raw_audit_answer.decode()
-    return audit_answer
+    return raw_text_answer.decode()
+
+
+def tokens_to_chars(n_tokens: int) -> int:
+    # Multiply by 3 to have a good margin and guess between characters and tokens.
+    # This will be properly cut at the NUA predict API.
+    return n_tokens * 3
+
+
+class ChatAuditor:
+    def __init__(
+        self,
+        kbid: str,
+        user_id: str,
+        client_type: NucliaDBClientType,
+        origin: str,
+        user_query: str,
+        rephrased_query: Optional[str],
+        chat_history: list[ChatContextMessage],
+        learning_id: Optional[str],
+        query_context: PromptContext,
+        query_context_order: PromptContextOrder,
+        model: str,
+    ):
+        self.kbid = kbid
+        self.user_id = user_id
+        self.client_type = client_type
+        self.origin = origin
+        self.user_query = user_query
+        self.rephrased_query = rephrased_query
+        self.chat_history = chat_history
+        self.learning_id = learning_id
+        self.query_context = query_context
+        self.query_context_order = query_context_order
+        self.model = model
+
+    def audit(
+        self,
+        text_answer: bytes,
+        generative_answer_time: float,
+        generative_answer_first_chunk_time: float,
+        rephrase_time: Optional[float],
+        status_code: AnswerStatusCode,
+    ):
+        maybe_audit_chat(
+            kbid=self.kbid,
+            user_id=self.user_id,
+            client_type=self.client_type,
+            origin=self.origin,
+            user_query=self.user_query,
+            rephrased_query=self.rephrased_query,
+            generative_answer_time=generative_answer_time,
+            generative_answer_first_chunk_time=generative_answer_first_chunk_time,
+            rephrase_time=rephrase_time,
+            text_answer=text_answer,
+            status_code=status_code,
+            chat_history=self.chat_history,
+            query_context=self.query_context,
+            query_context_order=self.query_context_order,
+            learning_id=self.learning_id or "unknown",
+            model=self.model,
+        )
+
+
+def sorted_prompt_context_list(context: PromptContext, order: PromptContextOrder) -> list[str]:
+    """
+    context = {"x": "foo", "y": "bar"}
+    order = {"y": 1, "x": 0}
+    sorted_prompt_context_list(context, order) == ["foo", "bar"]
+    """
+    sorted_items = sorted(
+        context.items(),
+        key=lambda item: order.get(item[0], float("inf")),
+    )
+    return list(map(lambda item: item[1], sorted_items))
+
+
+async def run_prequeries(
+    kbid: str,
+    prequeries: list[PreQuery],
+    x_ndb_client: NucliaDBClientType,
+    x_nucliadb_user: str,
+    x_forwarded_for: str,
+    generative_model: Optional[str] = None,
+    metrics: RAGMetrics = RAGMetrics(),
+) -> list[PreQueryResult]:
+    """
+    Runs simultaneous find requests for each prequery and returns the merged results according to the normalized weights.
+    """
+    results: list[PreQueryResult] = []
+    max_parallel_prequeries = asyncio.Semaphore(settings.prequeries_max_parallel)
+
+    async def _prequery_find(
+        prequery: PreQuery,
+    ):
+        async with max_parallel_prequeries:
+            find_results, _, _ = await find(
+                kbid,
+                prequery.request,
+                x_ndb_client,
+                x_nucliadb_user,
+                x_forwarded_for,
+                generative_model=generative_model,
+                metrics=metrics,
+            )
+            return prequery, find_results
+
+    ops = []
+    for prequery in prequeries:
+        ops.append(asyncio.create_task(_prequery_find(prequery)))
+    ops_results = await asyncio.gather(*ops)
+    for prequery, find_results in ops_results:
+        results.append((prequery, find_results))
+    return results

nucliadb/{writer/resource/slug.py → search/search/cut.py}

@@ -18,11 +18,13 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from nucliadb.common.maindb.utils import get_driver
-from nucliadb.ingest.orm.knowledgebox import KnowledgeBox
+from typing import TypeVar
 
+T = TypeVar("T")
 
-async def resource_slug_exists(kbid: str, slug: str) -> bool:
-    driver = get_driver()
-    async with driver.transaction() as txn:
-        return await KnowledgeBox.resource_slug_exists(txn, kbid, slug)
+
+def cut_page(items: list[T], top_k: int) -> tuple[list[T], bool]:
+    """Return a slice of `items` representing the specified page and a boolean
+    indicating whether there is a next page or not"""
+    next_page = len(items) > top_k
+    return items[:top_k], next_page