refactor: replace try-except blocks with contextlib.suppress for cleaner exception handling (#24284)

api/core/rag/datasource/vdb/clickzetta/clickzetta_vector.py

@@ -1,3 +1,4 @@
+import contextlib
 import json
 import logging
 import queue
@@ -214,10 +215,8 @@ class ClickzettaConnectionPool:
                     return connection
                 else:
                     # Connection expired or invalid, close it
-                    try:
+                    with contextlib.suppress(Exception):
                         connection.close()
-                    except Exception:
-                        pass
 
             # No valid connection found, create new one
             return self._create_connection(config)
@@ -228,10 +227,8 @@ class ClickzettaConnectionPool:
 
         if config_key not in self._pool_locks:
             # Pool was cleaned up, just close the connection
-            try:
+            with contextlib.suppress(Exception):
                 connection.close()
-            except Exception:
-                pass
             return
 
         with self._pool_locks[config_key]:
@@ -243,10 +240,8 @@ class ClickzettaConnectionPool:
                 logger.debug("Returned ClickZetta connection to pool")
             else:
                 # Pool full or connection invalid, close it
-                try:
+                with contextlib.suppress(Exception):
                     connection.close()
-                except Exception:
-                    pass
 
     def _cleanup_expired_connections(self) -> None:
         """Clean up expired connections from all pools."""
@@ -265,10 +260,8 @@ class ClickzettaConnectionPool:
                         if current_time - last_used < self._connection_timeout:
                             valid_connections.append((connection, last_used))
                         else:
-                            try:
+                            with contextlib.suppress(Exception):
                                 connection.close()
-                            except Exception:
-                                pass
 
                     self._pools[config_key] = valid_connections
 
@@ -299,10 +292,8 @@ class ClickzettaConnectionPool:
                 with self._pool_locks[config_key]:
                     pool = self._pools[config_key]
                     for connection, _ in pool:
-                        try:
+                        with contextlib.suppress(Exception):
                             connection.close()
-                        except Exception:
-                            pass
                     pool.clear()
 
 

api/core/rag/extractor/pdf_extractor.py

@@ -1,5 +1,6 @@
 """Abstract interface for document loader implementations."""
 
+import contextlib
 from collections.abc import Iterator
 from typing import Optional, cast
 
@@ -25,12 +26,10 @@ class PdfExtractor(BaseExtractor):
     def extract(self) -> list[Document]:
         plaintext_file_exists = False
         if self._file_cache_key:
-            try:
+            with contextlib.suppress(FileNotFoundError):
                 text = cast(bytes, storage.load(self._file_cache_key)).decode("utf-8")
                 plaintext_file_exists = True
                 return [Document(page_content=text)]
-            except FileNotFoundError:
-                pass
         documents = list(self.load())
         text_list = []
         for document in documents:

api/core/rag/extractor/unstructured/unstructured_eml_extractor.py

@@ -1,4 +1,5 @@
 import base64
+import contextlib
 import logging
 from typing import Optional
 
@@ -33,7 +34,7 @@ class UnstructuredEmailExtractor(BaseExtractor):
             elements = partition_email(filename=self._file_path)
 
         # noinspection PyBroadException
-        try:
+        with contextlib.suppress(Exception):
             for element in elements:
                 element_text = element.text.strip()
 
@@ -43,8 +44,6 @@ class UnstructuredEmailExtractor(BaseExtractor):
                 element_decode = base64.b64decode(element_text)
                 soup = BeautifulSoup(element_decode.decode("utf-8"), "html.parser")
                 element.text = soup.get_text()
-        except Exception:
-            pass
 
         from unstructured.chunking.title import chunk_by_title