ragit 0.7.3__py3-none-any.whl → 0.7.5__py3-none-any.whl

ragit/config.py

@@ -41,7 +41,7 @@ class Config:
 
     # Default Models
     DEFAULT_LLM_MODEL: str = os.getenv("RAGIT_DEFAULT_LLM_MODEL", "qwen3-vl:235b-instruct")
-    DEFAULT_EMBEDDING_MODEL: str = os.getenv("RAGIT_DEFAULT_EMBEDDING_MODEL", "mxbai-embed-large")
+    DEFAULT_EMBEDDING_MODEL: str = os.getenv("RAGIT_DEFAULT_EMBEDDING_MODEL", "nomic-embed-text:latest")
 
     # Logging
     LOG_LEVEL: str = os.getenv("RAGIT_LOG_LEVEL", "INFO")

ragit/providers/ollama.py

@@ -7,8 +7,17 @@ Ollama provider for LLM and Embedding operations.
 
 This provider connects to a local or remote Ollama server.
 Configuration is loaded from environment variables.
+
+Performance optimizations:
+- Connection pooling via requests.Session()
+- Async parallel embedding via trio + httpx
+- LRU cache for repeated embedding queries
 """
 
+from functools import lru_cache
+from typing import Any
+
+import httpx
 import requests
 
 from ragit.config import config
@@ -20,10 +29,37 @@ from ragit.providers.base import (
 )
 
 
+# Module-level cache for embeddings (shared across instances)
+@lru_cache(maxsize=2048)
+def _cached_embedding(text: str, model: str, embedding_url: str, timeout: int) -> tuple[float, ...]:
+    """Cache embedding results to avoid redundant API calls."""
+    # Truncate oversized inputs
+    if len(text) > OllamaProvider.MAX_EMBED_CHARS:
+        text = text[: OllamaProvider.MAX_EMBED_CHARS]
+
+    response = requests.post(
+        f"{embedding_url}/api/embed",
+        headers={"Content-Type": "application/json"},
+        json={"model": model, "input": text},
+        timeout=timeout,
+    )
+    response.raise_for_status()
+    data = response.json()
+    embeddings = data.get("embeddings", [])
+    if not embeddings or not embeddings[0]:
+        raise ValueError("Empty embedding returned from Ollama")
+    return tuple(embeddings[0])
+
+
 class OllamaProvider(BaseLLMProvider, BaseEmbeddingProvider):
     """
     Ollama provider for both LLM and Embedding operations.
 
+    Performance features:
+    - Connection pooling via requests.Session() for faster sequential requests
+    - Native batch embedding via /api/embed endpoint (single API call)
+    - LRU cache for repeated embedding queries (2048 entries)
+
     Parameters
     ----------
     base_url : str, optional
@@ -32,6 +68,8 @@ class OllamaProvider(BaseLLMProvider, BaseEmbeddingProvider):
         API key for authentication (default: from OLLAMA_API_KEY env var)
     timeout : int, optional
         Request timeout in seconds (default: from OLLAMA_TIMEOUT env var)
+    use_cache : bool, optional
+        Enable embedding cache (default: True)
 
     Examples
     --------
@@ -39,12 +77,12 @@ class OllamaProvider(BaseLLMProvider, BaseEmbeddingProvider):
     >>> response = provider.generate("What is RAG?", model="llama3")
     >>> print(response.text)
 
-    >>> embedding = provider.embed("Hello world", model="nomic-embed-text")
-    >>> print(len(embedding.embedding))
+    >>> # Batch embedding (single API call)
+    >>> embeddings = provider.embed_batch(texts, "mxbai-embed-large")
     """
 
     # Known embedding model dimensions
-    EMBEDDING_DIMENSIONS = {
+    EMBEDDING_DIMENSIONS: dict[str, int] = {
         "nomic-embed-text": 768,
         "nomic-embed-text:latest": 768,
         "mxbai-embed-large": 1024,
@@ -57,7 +95,7 @@ class OllamaProvider(BaseLLMProvider, BaseEmbeddingProvider):
     }
 
     # Max characters per embedding request (safe limit for 512 token models)
-    MAX_EMBED_CHARS = 1500
+    MAX_EMBED_CHARS = 2000
 
     def __init__(
         self,
@@ -65,14 +103,39 @@ class OllamaProvider(BaseLLMProvider, BaseEmbeddingProvider):
         embedding_url: str | None = None,
         api_key: str | None = None,
         timeout: int | None = None,
+        use_cache: bool = True,
     ) -> None:
         self.base_url = (base_url or config.OLLAMA_BASE_URL).rstrip("/")
         self.embedding_url = (embedding_url or config.OLLAMA_EMBEDDING_URL).rstrip("/")
         self.api_key = api_key or config.OLLAMA_API_KEY
         self.timeout = timeout or config.OLLAMA_TIMEOUT
+        self.use_cache = use_cache
         self._current_embed_model: str | None = None
         self._current_dimensions: int = 768  # default
 
+        # Connection pooling via session
+        self._session: requests.Session | None = None
+
+    @property
+    def session(self) -> requests.Session:
+        """Lazy-initialized session for connection pooling."""
+        if self._session is None:
+            self._session = requests.Session()
+            self._session.headers.update({"Content-Type": "application/json"})
+            if self.api_key:
+                self._session.headers.update({"Authorization": f"Bearer {self.api_key}"})
+        return self._session
+
+    def close(self) -> None:
+        """Close the session and release resources."""
+        if self._session is not None:
+            self._session.close()
+            self._session = None
+
+    def __del__(self) -> None:
+        """Cleanup on garbage collection."""
+        self.close()
+
     def _get_headers(self, include_auth: bool = True) -> dict[str, str]:
         """Get request headers including authentication if API key is set."""
         headers = {"Content-Type": "application/json"}
@@ -91,21 +154,19 @@ class OllamaProvider(BaseLLMProvider, BaseEmbeddingProvider):
     def is_available(self) -> bool:
         """Check if Ollama server is reachable."""
         try:
-            response = requests.get(
+            response = self.session.get(
                 f"{self.base_url}/api/tags",
-                headers=self._get_headers(),
                 timeout=5,
             )
             return response.status_code == 200
         except requests.RequestException:
             return False
 
-    def list_models(self) -> list[dict[str, str]]:
+    def list_models(self) -> list[dict[str, Any]]:
         """List available models on the Ollama server."""
         try:
-            response = requests.get(
+            response = self.session.get(
                 f"{self.base_url}/api/tags",
-                headers=self._get_headers(),
                 timeout=10,
             )
             response.raise_for_status()
@@ -138,9 +199,8 @@ class OllamaProvider(BaseLLMProvider, BaseEmbeddingProvider):
             payload["system"] = system_prompt
 
         try:
-            response = requests.post(
+            response = self.session.post(
                 f"{self.base_url}/api/generate",
-                headers=self._get_headers(),
                 json=payload,
                 timeout=self.timeout,
             )
@@ -161,33 +221,34 @@ class OllamaProvider(BaseLLMProvider, BaseEmbeddingProvider):
             raise ConnectionError(f"Ollama generate failed: {e}") from e
 
     def embed(self, text: str, model: str) -> EmbeddingResponse:
-        """Generate embedding using Ollama (uses embedding_url, no auth for local)."""
+        """Generate embedding using Ollama with optional caching."""
         self._current_embed_model = model
         self._current_dimensions = self.EMBEDDING_DIMENSIONS.get(model, 768)
 
-        # Truncate oversized inputs to prevent context length errors
-        if len(text) > self.MAX_EMBED_CHARS:
-            text = text[: self.MAX_EMBED_CHARS]
-
         try:
-            response = requests.post(
-                f"{self.embedding_url}/api/embeddings",
-                headers=self._get_headers(include_auth=False),
-                json={"model": model, "prompt": text},
-                timeout=self.timeout,
-            )
-            response.raise_for_status()
-            data = response.json()
-
-            embedding = data.get("embedding", [])
-            if not embedding:
-                raise ValueError("Empty embedding returned from Ollama")
+            if self.use_cache:
+                # Use cached version
+                embedding = _cached_embedding(text, model, self.embedding_url, self.timeout)
+            else:
+                # Direct call without cache
+                truncated = text[: self.MAX_EMBED_CHARS] if len(text) > self.MAX_EMBED_CHARS else text
+                response = self.session.post(
+                    f"{self.embedding_url}/api/embed",
+                    json={"model": model, "input": truncated},
+                    timeout=self.timeout,
+                )
+                response.raise_for_status()
+                data = response.json()
+                embeddings = data.get("embeddings", [])
+                if not embeddings or not embeddings[0]:
+                    raise ValueError("Empty embedding returned from Ollama")
+                embedding = tuple(embeddings[0])
 
             # Update dimensions from actual response
             self._current_dimensions = len(embedding)
 
             return EmbeddingResponse(
-                embedding=tuple(embedding),
+                embedding=embedding,
                 model=model,
                 provider=self.provider_name,
                 dimensions=len(embedding),
@@ -196,44 +257,115 @@ class OllamaProvider(BaseLLMProvider, BaseEmbeddingProvider):
             raise ConnectionError(f"Ollama embed failed: {e}") from e
 
     def embed_batch(self, texts: list[str], model: str) -> list[EmbeddingResponse]:
-        """Generate embeddings for multiple texts (uses embedding_url, no auth for local).
+        """Generate embeddings for multiple texts in a single API call.
 
-        Note: Ollama /api/embeddings only supports single prompts, so we loop.
+        The /api/embed endpoint supports batch inputs natively.
         """
         self._current_embed_model = model
         self._current_dimensions = self.EMBEDDING_DIMENSIONS.get(model, 768)
 
-        results = []
+        # Truncate oversized inputs
+        truncated_texts = [text[: self.MAX_EMBED_CHARS] if len(text) > self.MAX_EMBED_CHARS else text for text in texts]
+
         try:
-            for text in texts:
-                # Truncate oversized inputs to prevent context length errors
-                if len(text) > self.MAX_EMBED_CHARS:
-                    text = text[: self.MAX_EMBED_CHARS]
-
-                response = requests.post(
-                    f"{self.embedding_url}/api/embeddings",
-                    headers=self._get_headers(include_auth=False),
-                    json={"model": model, "prompt": text},
+            response = self.session.post(
+                f"{self.embedding_url}/api/embed",
+                json={"model": model, "input": truncated_texts},
+                timeout=self.timeout,
+            )
+            response.raise_for_status()
+            data = response.json()
+            embeddings_list = data.get("embeddings", [])
+
+            if not embeddings_list:
+                raise ValueError("Empty embeddings returned from Ollama")
+
+            results = []
+            for embedding_data in embeddings_list:
+                embedding = tuple(embedding_data) if embedding_data else ()
+                if embedding:
+                    self._current_dimensions = len(embedding)
+
+                results.append(
+                    EmbeddingResponse(
+                        embedding=embedding,
+                        model=model,
+                        provider=self.provider_name,
+                        dimensions=len(embedding),
+                    )
+                )
+            return results
+        except requests.RequestException as e:
+            raise ConnectionError(f"Ollama batch embed failed: {e}") from e
+
+    async def embed_batch_async(
+        self,
+        texts: list[str],
+        model: str,
+        max_concurrent: int = 10,  # kept for API compatibility, no longer used
+    ) -> list[EmbeddingResponse]:
+        """Generate embeddings for multiple texts asynchronously.
+
+        The /api/embed endpoint supports batch inputs natively, so this
+        makes a single async HTTP request for all texts.
+
+        Parameters
+        ----------
+        texts : list[str]
+            Texts to embed.
+        model : str
+            Embedding model name.
+        max_concurrent : int
+            Deprecated, kept for API compatibility. No longer used since
+            the API now supports native batching.
+
+        Returns
+        -------
+        list[EmbeddingResponse]
+            Embeddings in the same order as input texts.
+
+        Examples
+        --------
+        >>> import trio
+        >>> embeddings = trio.run(provider.embed_batch_async, texts, "mxbai-embed-large")
+        """
+        self._current_embed_model = model
+        self._current_dimensions = self.EMBEDDING_DIMENSIONS.get(model, 768)
+
+        # Truncate oversized inputs
+        truncated_texts = [text[: self.MAX_EMBED_CHARS] if len(text) > self.MAX_EMBED_CHARS else text for text in texts]
+
+        try:
+            async with httpx.AsyncClient() as client:
+                response = await client.post(
+                    f"{self.embedding_url}/api/embed",
+                    json={"model": model, "input": truncated_texts},
                     timeout=self.timeout,
                 )
                 response.raise_for_status()
                 data = response.json()
 
-                embedding = data.get("embedding", [])
+            embeddings_list = data.get("embeddings", [])
+            if not embeddings_list:
+                raise ValueError("Empty embeddings returned from Ollama")
+
+            results = []
+            for embedding_data in embeddings_list:
+                embedding = tuple(embedding_data) if embedding_data else ()
                 if embedding:
                     self._current_dimensions = len(embedding)
 
                 results.append(
                     EmbeddingResponse(
-                        embedding=tuple(embedding),
+                        embedding=embedding,
                         model=model,
                         provider=self.provider_name,
                         dimensions=len(embedding),
                     )
                 )
             return results
-        except requests.RequestException as e:
-            raise ConnectionError(f"Ollama batch embed failed: {e}") from e
+        except httpx.HTTPError as e:
+            raise ConnectionError(f"Ollama async batch embed failed: {e}") from e
 
     def chat(
         self,
@@ -273,9 +405,8 @@ class OllamaProvider(BaseLLMProvider, BaseEmbeddingProvider):
         }
 
         try:
-            response = requests.post(
+            response = self.session.post(
                 f"{self.base_url}/api/chat",
-                headers=self._get_headers(),
                 json=payload,
                 timeout=self.timeout,
             )
@@ -293,3 +424,23 @@ class OllamaProvider(BaseLLMProvider, BaseEmbeddingProvider):
             )
         except requests.RequestException as e:
             raise ConnectionError(f"Ollama chat failed: {e}") from e
+
+    @staticmethod
+    def clear_embedding_cache() -> None:
+        """Clear the embedding cache."""
+        _cached_embedding.cache_clear()
+
+    @staticmethod
+    def embedding_cache_info() -> dict[str, int]:
+        """Get embedding cache statistics."""
+        info = _cached_embedding.cache_info()
+        return {
+            "hits": info.hits,
+            "misses": info.misses,
+            "maxsize": info.maxsize or 0,
+            "currsize": info.currsize,
+        }
+
+
+# Export the EMBEDDING_DIMENSIONS for external use
+EMBEDDING_DIMENSIONS = OllamaProvider.EMBEDDING_DIMENSIONS

ragit/version.py

@@ -2,4 +2,4 @@
 # Copyright RODMENA LIMITED 2025
 # SPDX-License-Identifier: Apache-2.0
 #
-__version__ = "0.7.3"
+__version__ = "0.7.5"

{ragit-0.7.3.dist-info → ragit-0.7.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ragit
-Version: 0.7.3
+Version: 0.7.5
 Summary: Automatic RAG Pattern Optimization Engine
 Author: RODMENA LIMITED
 Maintainer-email: RODMENA LIMITED <info@rodmena.co.uk>
@@ -26,6 +26,8 @@ Requires-Dist: pydantic>=2.0.0
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: scikit-learn>=1.5.0
 Requires-Dist: tqdm>=4.66.0
+Requires-Dist: trio>=0.24.0
+Requires-Dist: httpx>=0.27.0
 Provides-Extra: dev
 Requires-Dist: ragit[test]; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
@@ -443,6 +445,77 @@ print(f"Score: {best.score:.3f}")
 
 The experiment tests different combinations of chunk sizes, overlaps, and retrieval parameters to find what works best for your content.
 
+## Performance Features
+
+Ragit includes several optimizations for production workloads:
+
+### Connection Pooling
+
+`OllamaProvider` uses HTTP connection pooling via `requests.Session()` for faster sequential requests:
+
+```python
+from ragit.providers import OllamaProvider
+
+provider = OllamaProvider()
+
+# All requests reuse the same connection pool
+for text in texts:
+    provider.embed(text, model="mxbai-embed-large")
+
+# Explicitly close when done (optional, auto-closes on garbage collection)
+provider.close()
+```
+
+### Async Parallel Embedding
+
+For large batches, use `embed_batch_async()` with trio for 5-10x faster embedding:
+
+```python
+import trio
+from ragit.providers import OllamaProvider
+
+provider = OllamaProvider()
+
+async def embed_documents():
+    texts = ["doc1...", "doc2...", "doc3...", ...]  # hundreds of texts
+    embeddings = await provider.embed_batch_async(
+        texts,
+        model="mxbai-embed-large",
+        max_concurrent=10  # Adjust based on server capacity
+    )
+    return embeddings
+
+# Run with trio
+results = trio.run(embed_documents)
+```
+
+### Embedding Cache
+
+Repeated embedding calls are cached automatically (2048 entries LRU):
+
+```python
+from ragit.providers import OllamaProvider
+
+provider = OllamaProvider(use_cache=True)  # Default
+
+# First call hits the API
+provider.embed("Hello world", model="mxbai-embed-large")
+
+# Second call returns cached result instantly
+provider.embed("Hello world", model="mxbai-embed-large")
+
+# View cache statistics
+print(OllamaProvider.embedding_cache_info())
+# {'hits': 1, 'misses': 1, 'maxsize': 2048, 'currsize': 1}
+
+# Clear cache if needed
+OllamaProvider.clear_embedding_cache()
+```
+
+### Pre-normalized Embeddings
+
+Vector similarity uses pre-normalized embeddings, making cosine similarity a simple dot product (O(1) per comparison).
+
 ## API Reference
 
 ### Document Loading

{ragit-0.7.3.dist-info → ragit-0.7.5.dist-info}/RECORD

@@ -1,18 +1,18 @@
 ragit/__init__.py,sha256=PjQogIWMlydZFWVECqhmxw-X9i7lEXdUTe2XlT6qYUQ,2213
 ragit/assistant.py,sha256=lXjZRUr_WsYLP3XLOktabgfPVyKOZPdREzyL7cSRufk,11251
-ragit/config.py,sha256=uKLchJQHjH8MImZ2OJahDjSzyasFqgrFb9Z4aHxJ7og,1495
+ragit/config.py,sha256=aSGWQGiaRm6hrjssvCjhqZOa76pxegeOtcFbFRlQx4M,1501
 ragit/loaders.py,sha256=keusuPzXPBiLDVj4hKfPCcge-rm-cnzNRk50fGXvTJs,5571
-ragit/version.py,sha256=CFB-alDHREO05xLFCQR7rPNEORp480k5e07n0I_NisQ,97
+ragit/version.py,sha256=Vj5ogQMaioIPZOEL7StQIcdzW1RI4gnuLlRkcVqW7qk,97
 ragit/core/__init__.py,sha256=j53PFfoSMXwSbK1rRHpMbo8mX2i4R1LJ5kvTxBd7-0w,100
 ragit/core/experiment/__init__.py,sha256=4vAPOOYlY5Dcr2gOolyhBSPGIUxZKwEkgQffxS9BodA,452
 ragit/core/experiment/experiment.py,sha256=Qh1NJkY9LbKaidRfiI8GOwBZqopjK-MSVBuD_JEgO-k,16582
 ragit/core/experiment/results.py,sha256=KHpN3YSLJ83_JUfIMccRPS-q7LEt0S9p8ehDRawk_4k,3487
 ragit/providers/__init__.py,sha256=iliJt74Lt3mFUlKGfSFW-D0cMonUygY6sRZ6lLjeU7M,435
 ragit/providers/base.py,sha256=MJ8mVeXuGWhkX2XGTbkWIY3cVoTOPr4h5XBXw8rAX2Q,3434
-ragit/providers/ollama.py,sha256=amDDD3KYOU1Hl-ifXtw8Ljvd9Dl5R3JcXGhAAq6telI,9957
+ragit/providers/ollama.py,sha256=bGZfcmlfchnVP5851noWaf3c1weMhknGOs7Fu69Oz4E,15404
 ragit/utils/__init__.py,sha256=-UsE5oJSnmEnBDswl-ph0A09Iu8yKNbPhd1-_7Lcb8Y,3051
-ragit-0.7.3.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-ragit-0.7.3.dist-info/METADATA,sha256=UhrFbq_2mob4_11wihdvy_kIvCb-mskBp79eOKhDifo,13662
-ragit-0.7.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ragit-0.7.3.dist-info/top_level.txt,sha256=pkPbG7yrw61wt9_y_xcLE2vq2a55fzockASD0yq0g4s,6
-ragit-0.7.3.dist-info/RECORD,,
+ragit-0.7.5.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+ragit-0.7.5.dist-info/METADATA,sha256=T_wNuarfzzkfhViVmigIe8n4Kz5FLFCbVj3oWAA_D9w,15528
+ragit-0.7.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ragit-0.7.5.dist-info/top_level.txt,sha256=pkPbG7yrw61wt9_y_xcLE2vq2a55fzockASD0yq0g4s,6
+ragit-0.7.5.dist-info/RECORD,,