Fix ambiguities

Author: iuliadmtru

src/Experimental/RAGTools/generation.jl

@@ -37,8 +37,8 @@ context = build_context(ContextEnumerator(), index, candidates; chunks_window_ma
 ```
 """
 function build_context(contexter::ContextEnumerator,
-        index::AbstractManagedIndex,
-        candidates::AbstractCandidateWithChunks;
+        index::AbstractDocumentIndex,
+        candidates::AbstractCandidateChunks;
         verbose::Bool = true,
         chunks_window_margin::Tuple{Int, Int} = (1, 1), kwargs...)
     ## Checks
@@ -99,7 +99,12 @@ end
 
 # Mutating version that dispatches on the result to the underlying implementation
 function build_context!(contexter::ContextEnumerator,
-        index::Union{AbstractDocumentIndex, AbstractManagedIndex}, result::AbstractRAGResult; kwargs...)
+        index::AbstractDocumentIndex, result::AbstractRAGResult; kwargs...)
+    result.context = build_context(contexter, index, result.reranked_candidates; kwargs...)
+    return result
+end
+function build_context!(contexter::ContextEnumerator,
+        index::AbstractManagedIndex, result::AbstractRAGResult; kwargs...)
     result.context = build_context(contexter, index, result.reranked_candidates; kwargs...)
     return result
 end
@@ -144,7 +149,32 @@ Generates an answer using the `aigenerate` function with the provided `result.co
 
 """
 function answer!(
-        answerer::SimpleAnswerer, index::Union{AbstractDocumentIndex, AbstractManagedIndex}, result::AbstractRAGResult;
+        answerer::SimpleAnswerer, index::AbstractDocumentIndex, result::AbstractRAGResult;
+        model::AbstractString = PT.MODEL_CHAT, verbose::Bool = true,
+        template::Symbol = :RAGAnswerFromContext,
+        cost_tracker = Threads.Atomic{Float64}(0.0),
+        kwargs...)
+    ## Checks
+    placeholders = only(aitemplates(template)).variables # only one template should be found
+    @assert (:question in placeholders)&&(:context in placeholders) "Provided RAG Template $(template) is not suitable. It must have placeholders: `question` and `context`."
+    ##
+    (; context, question) = result
+    conv = aigenerate(template; question,
+        context = join(context, "\n\n"), model, verbose = false,
+        return_all = true,
+        kwargs...)
+    msg = conv[end]
+    result.answer = strip(msg.content)
+    result.conversations[:answer] = conv
+    ## Increment the cost tracker
+    Threads.atomic_add!(cost_tracker, msg.cost)
+    verbose &&
+        @info "Done generating the answer. Cost: \$$(round(msg.cost,digits=3))"
+
+    return result
+end
+function answer!(
+        answerer::SimpleAnswerer, index::AbstractManagedIndex, result::AbstractRAGResult;
         model::AbstractString = PT.MODEL_CHAT, verbose::Bool = true,
         template::Symbol = :RAGAnswerFromContext,
         cost_tracker = Threads.Atomic{Float64}(0.0),

src/Experimental/RAGTools/preparation.jl

@@ -741,12 +741,12 @@ Builds a `PineconeIndex` containing a Pinecone context (API key, index and names
 function build_index(
         indexer::PineconeIndexer,
         context::Pinecone.PineconeContextv3 = Pinecone.init_v3(""),
-        index::Pinecone.PineconeIndexv3 = "",
-        namespace::AbstractString,
+        index::Pinecone.PineconeIndexv3 = nothing,
+        namespace::AbstractString = "",
         verbose::Integer = 1,
         index_id = gensym(namespace),
         cost_tracker = Threads.Atomic{Float64}(0.0))
-    @assert !isempty(context.api_key) && !isempty(index) "Pinecone context and index not set"
+    @assert !isempty(context.apikey) && !isnothing(index) "Pinecone context and index not set"
 
     # TODO: add chunking, embedding, tags?
 

src/Experimental/RAGTools/rag_interface.jl

@@ -138,6 +138,8 @@ abstract type AbstractTagger <: AbstractIndexingMethod end
 ### Index itself - return type of `build_index`
 abstract type AbstractDocumentIndex end
 
+abstract type AbstractManagedIndex end
+
 """
     AbstractMultiIndex <: AbstractDocumentIndex
 

src/Experimental/RAGTools/retrieval.jl

@@ -734,9 +734,20 @@ function rerank(reranker::AbstractReranker,
 end
 
 function rerank(reranker::NoReranker,
-        index::Union{AbstractDocumentIndex, AbstractManagedIndex},
+        index::AbstractDocumentIndex,
+        question::AbstractString,
+        candidates::AbstractCandidateChunks;
+        top_n::Integer = length(candidates),
+        kwargs...)
+    # Since this is almost a passthrough strategy, it returns the candidate_chunks unchanged
+    # but it truncates to `top_n` if necessary
+    return first(candidates, top_n)
+end
+
+function rerank(reranker::NoReranker,
+        index::AbstractManagedIndex,
         question::AbstractString,
-        candidates::Union{AbstractCandidateChunks, AbstractCandidateWithChunks};
+        candidates::AbstractCandidateWithChunks;
         top_n::Integer = length(candidates),
         kwargs...)
     # Since this is almost a passthrough strategy, it returns the candidate_chunks unchanged

src/Experimental/RAGTools/types.jl

@@ -136,7 +136,6 @@ chunkdata(index::ChunkEmbeddingsIndex) = embeddings(index)
 # For backward compatibility
 const ChunkIndex = ChunkEmbeddingsIndex
 
-abstract type AbstractManagedIndex end
 indexid(index::AbstractManagedIndex) = index.id
 
 using Pinecone: Pinecone, PineconeContextv3, PineconeIndexv3