Add ruff rules for bugbear (#551)

Author: cbornet

libs/colbert/ragstack_colbert/cassandra_database.py

@@ -183,9 +183,8 @@ async def _limited_put(
         text: Optional[str] = None,
         metadata: Optional[Dict[str, Any]] = None,
         vector: Optional[Vector] = None,
-    ) -> Tuple[str, int, int, Exception]:
+    ) -> Tuple[str, int, int, Optional[Exception]]:
         row_id = (chunk_id, embedding_id)
-        exp = None
         async with sem:
             try:
                 if vector is None:
@@ -199,10 +198,9 @@ async def _limited_put(
                     await self._table.aput(
                         partition_id=doc_id, row_id=row_id, vector=vector
                     )
+                return doc_id, chunk_id, embedding_id, None
             except Exception as e:
-                exp = e
-            finally:
-                return doc_id, chunk_id, embedding_id, exp
+                return doc_id, chunk_id, embedding_id, e
 
     async def aadd_chunks(
         self, chunks: List[Chunk], concurrent_inserts: Optional[int] = 100
@@ -311,15 +309,13 @@ async def _limited_delete(
         self,
         sem: asyncio.Semaphore,
         doc_id: str,
-    ) -> Tuple[str, Exception]:
-        exp = None
+    ) -> Tuple[str, Optional[Exception]]:
         async with sem:
             try:
                 await self._table.adelete_partition(partition_id=doc_id)
+                return doc_id, None
             except Exception as e:
-                exp = e
-            finally:
-                return doc_id, exp
+                return doc_id, e
 
     async def adelete_chunks(
         self, doc_ids: List[str], concurrent_deletes: Optional[int] = 100

libs/e2e-tests/e2e_tests/test_utils/vector_store_handler.py

@@ -67,4 +67,4 @@ def before_test(self) -> VectorStoreTestContext:
         pass
 
     def after_test(self):
-        pass
+        return

libs/knowledge-graph/ragstack_knowledge_graph/cassandra_graph_store.py

@@ -54,7 +54,7 @@ def add_graph_documents(
         self.graph.insert(_elements(graph_documents))
 
     # TODO: should this include the types of each node?
-    def query(self, query: str, params: dict = {}) -> List[Dict[str, Any]]:
+    def query(self, query: str, params: dict = {}) -> List[Dict[str, Any]]:  # noqa: B006
         raise ValueError("Querying Cassandra should use `as_runnable`.")
 
     @property

libs/langchain/ragstack_langchain/colbert/__init__.py

@@ -1,10 +1,10 @@
 try:
     from ragstack_colbert.base_retriever import BaseRetriever  # noqa
-except (ImportError, ModuleNotFoundError):
+except (ImportError, ModuleNotFoundError) as e:
     raise ImportError(
         "Could not import ragstack-ai-colbert. "
         "Please install it with `pip install ragstack-ai-langchain[colbert]`."
-    )
+    ) from e
 
 from .colbert_retriever import ColbertRetriever
 from .colbert_vector_store import ColbertVectorStore

libs/langchain/ragstack_langchain/graph_store/base.py

@@ -59,13 +59,13 @@ def _texts_to_nodes(
     for text in texts:
         try:
             _metadata = next(metadatas_it).copy() if metadatas_it else {}
-        except StopIteration:
-            raise ValueError("texts iterable longer than metadatas")
+        except StopIteration as e:
+            raise ValueError("texts iterable longer than metadatas") from e
         try:
             _id = next(ids_it) if ids_it else None
             _id = _id or _metadata.pop(METADATA_CONTENT_ID_KEY, None)
-        except StopIteration:
-            raise ValueError("texts iterable longer than ids")
+        except StopIteration as e:
+            raise ValueError("texts iterable longer than ids") from e
 
         links = _metadata.pop(METADATA_LINKS_KEY, set())
         if not isinstance(links, Set):
@@ -90,8 +90,8 @@ def _documents_to_nodes(
         try:
             _id = next(ids_it) if ids_it else None
             _id = _id or doc.metadata.pop(METADATA_CONTENT_ID_KEY, None)
-        except StopIteration:
-            raise ValueError("documents iterable longer than ids")
+        except StopIteration as e:
+            raise ValueError("documents iterable longer than ids") from e
         metadata = doc.metadata.copy()
         links = metadata.pop(METADATA_LINKS_KEY, set())
         if not isinstance(links, Set):

libs/langchain/ragstack_langchain/graph_store/extractors/html_link_extractor.py

@@ -68,11 +68,11 @@ def __init__(self, *, kind: str = "hyperlink", drop_fragments: bool = True):
         """
         try:
             import bs4  # noqa:F401
-        except ImportError:
+        except ImportError as e:
             raise ImportError(
                 "BeautifulSoup4 is required for HtmlLinkExtractor. "
                 "Please install it with `pip install beautifulsoup4`."
-            )
+            ) from e
 
         self._kind = kind
         self.drop_fragments = drop_fragments

libs/llamaindex/ragstack_llamaindex/colbert/__init__.py

@@ -1,10 +1,10 @@
 try:
     from ragstack_colbert.base_retriever import BaseRetriever  # noqa
-except (ImportError, ModuleNotFoundError):
+except (ImportError, ModuleNotFoundError) as e:
     raise ImportError(
         "Could not import ragstack-ai-colbert. "
         "Please install it with `pip install ragstack-ai-llamaindex[colbert]`."
-    )
+    ) from e
 
 from .colbert_retriever import ColbertRetriever
 

pyproject.toml

@@ -63,6 +63,7 @@ ignore = [
 ]
 
 select = [
+    "B",
     "E",
     "F",
     "FLY",

scripts/format-example-notebooks.py

@@ -11,7 +11,7 @@ def main():
     }
 
     nb_path = os.path.join("examples", "notebooks")
-    for root, dirs, files in os.walk(nb_path):
+    for root, _, files in os.walk(nb_path):
         for file in files:
             file = os.path.join(root, file)
             if ".ipynb_checkpoints" not in file and file.endswith(".ipynb"):