Merge pull request #2790 from tisnik/lcore-3722-enable-ble-ruff-rules-on-ci

LCORE-3722: Enable BLE Ruff rules on CI

Author: tisnik

pyproject.toml

@@ -252,8 +252,8 @@ line-length = 88
 extend-exclude = ["tests/profiles/syntax_error.py"]
 
 [tool.ruff.lint]
-extend-select = ["C", "FA", "FLY", "I", "TID251", "UP006", "UP007", "UP008", "UP010", "UP012", "UP017", "UP024", "UP035", "UP040", "UP041", "RUF100", "B009", "B010", "B011", "DTZ005", "D202", "PLR1733", "RUF022", "PLW1510", "TC004", "PIE790", "PERF402", "FURB129", "RET501", "LOG"]
-ignore = ["UP047", "UP045", "BLE", "S", "C901", "RUF", "SIM", "B017", "TRY004", "TRY201", "TRY203", "TRY401", "B008", "EXE001", "G201", "ISC004", "PYI034", "PYI064"]
+extend-select = ["C", "FA", "FLY", "I", "TID251", "UP006", "UP007", "UP008", "UP010", "UP012", "UP017", "UP024", "UP035", "UP040", "UP041", "RUF100", "B009", "B010", "B011", "BLE", "DTZ005", "D202", "PLR1733", "RUF022", "PLW1510", "TC004", "PIE790", "PERF402", "FURB129", "RET501", "LOG"]
+ignore = ["UP047", "UP045", "S", "C901", "RUF", "SIM", "B017", "TRY004", "TRY201", "TRY203", "TRY401", "B008", "EXE001", "G201", "ISC004", "PYI034", "PYI064"]
 
 [tool.ruff.lint.flake8-tidy-imports.banned-api]
 unittest = { msg = "use pytest instead of unittest" }

src/app/endpoints/a2a.py

@@ -1086,7 +1086,7 @@ async def _handle_a2a_jsonrpc(  # pylint: disable=too-many-locals,too-many-state
                 logger.warning(
                     "Could not parse A2A request body for method detection: %s", str(e)
                 )
-    except Exception as e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except  # noqa: BLE001
         logger.error("Error detecting streaming request: %s", str(e))
 
     with tracer.start_as_current_span("a2a.dispatch") as span:

src/app/endpoints/vector_stores.py

@@ -750,7 +750,9 @@ async def add_file_to_vector_store(  # pylint: disable=too-many-locals,too-many-
         ):
             try:
                 await client.files.delete(body.file_id)
-            except Exception as delete_error:  # pylint: disable=broad-exception-caught
+            except (
+                Exception  # pylint: disable=broad-exception-caught  # noqa: BLE001
+            ) as delete_error:
                 logger.warning(
                     "Failed to delete file %s after vector store attach: %s",
                     body.file_id,

src/authentication/k8s.py

@@ -382,7 +382,7 @@ def get_user_info(token: str) -> Optional[kubernetes.client.V1TokenReviewStatus]
             cause=f"Kubernetes API request failed: {e.reason} (status {e.status})",
         )
         raise HTTPException(**response_obj.model_dump()) from e
-    except Exception as e:  # pylint: disable=broad-exception-caught
+    except Exception as e:  # pylint: disable=broad-exception-caught  # noqa: BLE001
         logger.error("Unexpected error during TokenReview: %s", e)
         return None
 

src/cache/sqlite_cache.py

@@ -230,7 +230,9 @@ def connected(self) -> bool:
             if cursor is not None:
                 try:
                     cursor.close()
-                except Exception:  # pylint: disable=broad-exception-caught
+                except (
+                    Exception  # pylint: disable=broad-exception-caught  # noqa: BLE001
+                ):
                     logger.warning("Unable to close cursor")
 
     def initialize_cache(self) -> None:

src/runners/quota_scheduler.py

@@ -62,7 +62,7 @@ def quota_scheduler(config: QuotaHandlersConfiguration) -> bool:
             # if connection is established, we are ok
             if connection is not None:
                 break
-        except Exception as e:  # pylint: disable=broad-exception-caught
+        except Exception as e:  # pylint: disable=broad-exception-caught  # noqa: BLE001
             logger.warning("Can not connect to database, will try later: %s", e)
         sleep(config.scheduler.database_reconnection_delay)
     else:
@@ -99,7 +99,9 @@ def quota_scheduler(config: QuotaHandlersConfiguration) -> bool:
                     try:
                         if connection is not None:
                             connection.close()
-                    except Exception:  # pylint: disable=broad-exception-caught
+                    except (  # pylint: disable=broad-exception-caught
+                        Exception  # noqa: BLE001
+                    ):
                         pass  # Connection already dead
                     connection = connect(config)
                     if connection is None:
@@ -108,7 +110,9 @@ def quota_scheduler(config: QuotaHandlersConfiguration) -> bool:
                 quota_revocation(
                     connection, limiter, increase_quota_statement, reset_quota_statement
                 )
-            except Exception as e:  # pylint: disable=broad-exception-caught
+            except (
+                Exception  # pylint: disable=broad-exception-caught  # noqa: BLE001
+            ) as e:
                 logger.error("Quota revoke error: %s", e)
         logger.info("Quota scheduler sync finished")
         sleep(period)
@@ -138,7 +142,7 @@ def connected(connection: Any) -> bool:
         cursor.close()
         logger.info("Connection to storage is ok")
         return True
-    except Exception as e:  # pylint: disable=broad-exception-caught
+    except Exception as e:  # pylint: disable=broad-exception-caught  # noqa: BLE001
         logger.error("Disconnected from storage: %s", e)
         return False
 

src/utils/query.py

@@ -456,7 +456,7 @@ def update_conversation_topic_summary(
             configuration.conversation_cache.set_topic_summary(
                 user_id, conversation_id, topic_summary, skip_userid_check
             )
-        except Exception as e:  # pylint: disable=broad-except  # noqa: BLE001 RUF100
+        except Exception as e:  # pylint: disable=broad-except  # noqa: BLE001
             logger.warning(
                 "Failed to update topic summary in cache for %s: %s",
                 normalized_id,

src/utils/reranker.py

@@ -50,9 +50,7 @@ async def _get_cross_encoder(model_name: str) -> Any:
             model = await asyncio.to_thread(CrossEncoder, model_name)
             _cross_encoder_models[model_name] = model
             logger.info("Loaded cross-encoder for RAG reranking: %s", model_name)
-        except (
-            Exception  # pylint: disable=broad-exception-caught  # noqa: BLE001 RUF100
-        ) as e:
+        except Exception as e:  # pylint: disable=broad-exception-caught  # noqa: BLE001
             logger.warning(
                 "Could not load cross-encoder for reranking (%s): %s", model_name, e
             )
@@ -170,9 +168,7 @@ async def rerank_chunks_with_cross_encoder(
             for score, chunk in top_indexed
         ]
 
-    except (
-        Exception  # pylint: disable=broad-exception-caught  # noqa: BLE001 RUF100
-    ) as e:
+    except Exception as e:  # pylint: disable=broad-exception-caught  # noqa: BLE001
         logger.warning(
             "Cross-encoder reranking failed, falling back to original scoring: %s", e
         )

src/utils/vector_search.py

@@ -296,9 +296,7 @@ async def _query_store_for_byok_rag(  # pylint: disable=too-many-arguments,too-m
             },
         )
         return _extract_byok_rag_chunks(search_response, vector_store_id, weight)
-    except (
-        Exception  # pylint: disable=broad-exception-caught  # noqa: BLE001 RUF100
-    ) as e:
+    except Exception as e:  # pylint: disable=broad-exception-caught  # noqa: BLE001
         logger.warning("Failed to search '%s': %s", vector_store_id, e)
         return []
 
@@ -569,9 +567,7 @@ async def _fetch_byok_rag(  # pylint: disable=too-many-locals
         # Extract referenced documents from BYOK RAG chunks (now with resolved sources)
         referenced_documents = _process_byok_rag_chunks_for_documents(top_results)
 
-    except (
-        Exception  # pylint: disable=broad-exception-caught  # noqa: BLE001 RUF100
-    ) as e:
+    except Exception as e:  # pylint: disable=broad-exception-caught  # noqa: BLE001
         logger.warning("Failed to perform BYOK RAG search: %s", e)
         logger.debug("BYOK RAG error details: %s", traceback.format_exc())
 
@@ -640,9 +636,7 @@ async def _fetch_okp_rag(  # pylint: disable=too-many-locals
                 )
                 logger.debug("OKP RAG returned %d chunks", len(rag_chunks))
 
-    except (
-        Exception  # pylint: disable=broad-exception-caught  # noqa: BLE001 RUF100
-    ) as e:
+    except Exception as e:  # pylint: disable=broad-exception-caught  # noqa: BLE001
         logger.warning("Failed to query OKP for chunks: %s", e)
         logger.debug("OKP query error details: %s", traceback.format_exc())