72ef18e39d
Every section inherited plain BaseModel, so unknown keys were dropped silently: providers.docling_serve.timeout was documented for months while being ignored, and a typo in any setting took the default. Sections now derive from ConfigModel, which forbids extras, so a stale or misspelled key fails with its path. This already found search.context_radius in a live app config and providers.vllm in soliplex's example. converter, chunker and chunker_type are Literals. Sizes, limits, dimensions, token budgets, attempt counts and breaker thresholds must be positive; retention, delays, intervals and cooldowns non-negative; similarity_threshold within 0-1; port within 0-65535. port 0 keeps its OS-assigned meaning and worker_count allows 0 for an API-and-reaper-only process. get_reranker caught ImportError and returned None, so a configured reranker whose extra was missing silently disappeared. It now propagates. raise_missing_extra names the install command and re-raises when the failure came from inside an installed package, so a broken transitive import is not reported as a missing one. zeroentropy imported bare and now guards like the others. The haiku.rag package declares the jina extra. jina-local already worked there through cross-encoder's transitive transformers and torch; the resolved package set is unchanged, but the support is now promised rather than inherited. Provider fields stay unconstrained: get_model ends in a pass-through to pydantic-ai for any provider it supports, so a Literal there would reject valid configurations.
33 lines
1.1 KiB
Python
33 lines
1.1 KiB
Python
from haiku.rag.utils import raise_missing_extra
|
|
|
|
try:
|
|
import cohere
|
|
except ModuleNotFoundError as e: # pragma: no cover
|
|
raise_missing_extra("cohere", "cohere", e)
|
|
|
|
from haiku.rag.reranking.base import RerankerBase
|
|
from haiku.rag.store.models.chunk import Chunk
|
|
|
|
|
|
class CohereReranker(RerankerBase): # pragma: no cover
|
|
def __init__(self, model: str | None = None):
|
|
self._model = model
|
|
# Cohere SDK reads CO_API_KEY from environment by default
|
|
self._client = cohere.AsyncClientV2()
|
|
|
|
async def _rerank(
|
|
self, query: str, chunks: list[Chunk], top_n: int = 10
|
|
) -> list[tuple[Chunk, float]]:
|
|
documents = [chunk.content for chunk in chunks]
|
|
|
|
model_name = self._model or "rerank-v3.5"
|
|
response = await self._client.rerank(
|
|
model=model_name, query=query, documents=documents, top_n=top_n
|
|
)
|
|
|
|
reranked_chunks = []
|
|
for result in response.results:
|
|
original_chunk = chunks[result.index]
|
|
reranked_chunks.append((original_chunk, result.relevance_score))
|
|
|
|
return reranked_chunks
|