chore: fix ruff linting issues in rag module

linting, list embedding handling, and test update

Author: greysonlalonde

src/crewai/rag/__init__.py

@@ -1,17 +1,17 @@
 """RAG (Retrieval-Augmented Generation) infrastructure for CrewAI."""
 
-import sys
 import importlib
+import sys
 from types import ModuleType
 from typing import Any
 
 from crewai.rag.config.types import RagConfigType
 from crewai.rag.config.utils import set_rag_config
 
-
 _module_path = __path__
 _module_file = __file__
 
+
 class _RagModule(ModuleType):
     """Module wrapper to intercept attribute setting for config."""
 
@@ -51,8 +51,10 @@ def __getattr__(self, name: str) -> Any:
         """
         try:
             return importlib.import_module(f"{self.__name__}.{name}")
-        except ImportError:
-            raise AttributeError(f"module '{self.__name__}' has no attribute '{name}'")
+        except ImportError as e:
+            raise AttributeError(
+                f"module '{self.__name__}' has no attribute '{name}'"
+            ) from e
 
 
 sys.modules[__name__] = _RagModule(__name__)

src/crewai/rag/config/optional_imports/__init__.py

@@ -1 +1 @@
-"""Optional imports for RAG configuration providers."""
+"""Optional imports for RAG configuration providers."""

src/crewai/rag/config/optional_imports/base.py

@@ -1,7 +1,7 @@
 """Base classes for missing provider configurations."""
 
-from typing import Literal
 from dataclasses import field
+from typing import Literal
 
 from pydantic import ConfigDict
 from pydantic.dataclasses import dataclass as pyd_dataclass

src/crewai/rag/config/optional_imports/protocols.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Protocol, TYPE_CHECKING
+from typing import TYPE_CHECKING, Protocol
 
 if TYPE_CHECKING:
     from crewai.rag.chromadb.client import ChromaDBClient

src/crewai/rag/config/optional_imports/providers.py

@@ -1,7 +1,8 @@
 """Provider-specific missing configuration classes."""
 
-from typing import Literal
 from dataclasses import field
+from typing import Literal
+
 from pydantic import ConfigDict
 from pydantic.dataclasses import dataclass as pyd_dataclass
 

src/crewai/rag/config/types.py

@@ -1,6 +1,7 @@
 """Type definitions for RAG configuration."""
 
-from typing import Annotated, TypeAlias, TYPE_CHECKING
+from typing import TYPE_CHECKING, Annotated, TypeAlias
+
 from pydantic import Field
 
 from crewai.rag.config.constants import DISCRIMINATOR

src/crewai/rag/config/utils.py

@@ -4,14 +4,14 @@
 
 from pydantic import BaseModel, Field
 
-from crewai.utilities.import_utils import require
-from crewai.rag.core.base_client import BaseClient
-from crewai.rag.config.types import RagConfigType
 from crewai.rag.config.constants import (
-    DEFAULT_RAG_CONFIG_PATH,
     DEFAULT_RAG_CONFIG_CLASS,
+    DEFAULT_RAG_CONFIG_PATH,
 )
+from crewai.rag.config.types import RagConfigType
+from crewai.rag.core.base_client import BaseClient
 from crewai.rag.factory import create_client
+from crewai.utilities.import_utils import require
 
 
 class RagContext(BaseModel):

src/crewai/rag/embeddings/__init__.py

@@ -1 +1 @@
-"""Embedding components for RAG infrastructure."""
+"""Embedding components for RAG infrastructure."""

src/crewai/rag/embeddings/configurator.py

@@ -1,5 +1,5 @@
 import os
-from typing import Any, Dict, Optional, cast
+from typing import Any, cast
 
 from chromadb import Documents, EmbeddingFunction, Embeddings
 from chromadb.api.types import validate_embedding_function
@@ -23,7 +23,7 @@ def __init__(self):
 
     def configure_embedder(
         self,
-        embedder_config: Optional[Dict[str, Any]] = None,
+        embedder_config: dict[str, Any] | None = None,
     ) -> EmbeddingFunction:
         """Configures and returns an embedding function based on the provided config."""
         if embedder_config is None:
@@ -42,9 +42,9 @@ def configure_embedder(
             embedding_function = self.embedding_functions[provider]
         except ImportError as e:
             missing_package = str(e).split()[-1]
-            raise ImportError( 
+            raise ImportError(
                 f"{missing_package} is not installed. Please install it with: pip install {missing_package}"
-            )
+            ) from e
 
         return (
             embedding_function(config)
@@ -147,7 +147,7 @@ def _configure_cohere(config, model_name):
 
     @staticmethod
     def _configure_voyageai(config, model_name):
-        from chromadb.utils.embedding_functions.voyageai_embedding_function import (
+        from chromadb.utils.embedding_functions.voyageai_embedding_function import (  # type: ignore[import-not-found]
             VoyageAIEmbeddingFunction,
         )
 
@@ -181,9 +181,11 @@ def _configure_huggingface(config, model_name):
     @staticmethod
     def _configure_watson(config, model_name):
         try:
-            import ibm_watsonx_ai.foundation_models as watson_models
-            from ibm_watsonx_ai import Credentials
-            from ibm_watsonx_ai.metanames import EmbedTextParamsMetaNames as EmbedParams
+            import ibm_watsonx_ai.foundation_models as watson_models  # type: ignore[import-not-found]
+            from ibm_watsonx_ai import Credentials  # type: ignore[import-not-found]
+            from ibm_watsonx_ai.metanames import (  # type: ignore[import-not-found]
+                EmbedTextParamsMetaNames as EmbedParams,
+            )
         except ImportError as e:
             raise ImportError(
                 "IBM Watson dependencies are not installed. Please install them to use Watson embedding."
@@ -225,7 +227,7 @@ def _configure_custom(config):
                 validate_embedding_function(custom_embedder)
                 return custom_embedder
             except Exception as e:
-                raise ValueError(f"Invalid custom embedding function: {str(e)}")
+                raise ValueError(f"Invalid custom embedding function: {e!s}") from e
         elif callable(custom_embedder):
             try:
                 instance = custom_embedder()
@@ -236,7 +238,7 @@ def _configure_custom(config):
                     "Custom embedder does not create an EmbeddingFunction instance"
                 )
             except Exception as e:
-                raise ValueError(f"Error instantiating custom embedder: {str(e)}")
+                raise ValueError(f"Error instantiating custom embedder: {e!s}") from e
         else:
             raise ValueError(
                 "Custom embedder must be an instance of `EmbeddingFunction` or a callable that creates one"

src/crewai/rag/embeddings/types.py

@@ -1,11 +1,11 @@
 """Type definitions for the embeddings module."""
 
 from typing import Literal
+
 from pydantic import BaseModel, Field, SecretStr
 
 from crewai.rag.types import EmbeddingFunction
 
-
 EmbeddingProvider = Literal[
     "openai",
     "cohere",