From 08bdd097c48de3e7f95512b6a845be8707cdd3d8 Mon Sep 17 00:00:00 2001 From: Pavan-Microsoft Date: Wed, 16 Apr 2025 22:58:11 +0530 Subject: [PATCH] fix codeQL issue --- src/api/api/api_routes.py | 20 ++++++++-------- src/api/api/history_routes.py | 44 +++++++++++++++++------------------ 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/api/api/api_routes.py b/src/api/api/api_routes.py index 59100f7c5..8f8188ee2 100644 --- a/src/api/api/api_routes.py +++ b/src/api/api/api_routes.py @@ -21,8 +21,8 @@ async def fetch_chart_data(): response = chart_service.fetch_chart_data() return JSONResponse(content=response) except Exception as e: - logger.exception("Error in fetch_chart_data") - return JSONResponse(content={"error": f"Failed to fetch chart data: {str(e)}"}, status_code=500) + logger.exception("Error in fetch_chart_data: %s", str(e)) + return JSONResponse(content={"error": "Failed to fetch chart data due to an internal error."}, status_code=500) @router.post("/fetchChartDataWithFilters") @@ -33,8 +33,8 @@ async def fetch_chart_data_with_filters(chart_filters: ChartFilters): response = await chart_service.fetch_chart_data_with_filters(chart_filters) return JSONResponse(content=response) except Exception as e: - logger.exception("Error in fetch_chart_data_with_filters") - return JSONResponse(content={"error": f"Failed to fetch chart data: {str(e)}"}, status_code=500) + logger.exception("Error in fetch_chart_data_with_filters: %s", str(e)) + return JSONResponse(content={"error": "Failed to fetch chart data due to an internal error."}, status_code=500) @router.get("/fetchFilterData") @@ -44,8 +44,8 @@ async def fetch_filter_data(): response = chart_service.fetch_filter_data() return JSONResponse(content=response) except Exception as e: - logger.exception("Error in fetch_filter_data") - return JSONResponse(content={"error": f"Failed to fetch filter data: {str(e)}"}, status_code=500) + logger.exception("Error in fetch_filter_data: %s", str(e)) + return JSONResponse(content={"error": "Failed to fetch filter data due to an internal error."}, status_code=500) @router.post("/chat") @@ -71,8 +71,8 @@ async def conversation(request: Request): return JSONResponse(content=result) except Exception as ex: - logger.exception("Error in conversation endpoint") - return JSONResponse(content={"error": str(ex)}, status_code=getattr(ex, "status_code", 500)) + logger.exception("Error in conversation endpoint: %s", str(ex)) + return JSONResponse(content={"error": "An internal error occurred while processing the conversation."}, status_code=500) @router.get("/layout-config") @@ -83,8 +83,8 @@ async def get_layout_config(): layout_config_json = json.loads(layout_config_str) # Parse the string into JSON return JSONResponse(content=layout_config_json) # Return the parsed JSON except json.JSONDecodeError as e: - logger.exception("Failed to parse layout config JSON") - return JSONResponse(content={"error": f"Invalid JSON format: {str(e)}"}, status_code=400) + logger.exception("Failed to parse layout config JSON: %s", str(e)) + return JSONResponse(content={"error": "Invalid layout configuration format."}, status_code=400) return JSONResponse(content={"error": "Layout config not found in environment variables"}, status_code=400) diff --git a/src/api/api/history_routes.py b/src/api/api/history_routes.py index 7c9b95ee0..60827fbfc 100644 --- a/src/api/api/history_routes.py +++ b/src/api/api/history_routes.py @@ -28,8 +28,8 @@ async def add_conversation(request: Request): return response except Exception as e: - logger.exception("Exception in /generate") - return JSONResponse(content={"error": str(e)}, status_code=500) + logger.exception("Exception in /generate: %s", str(e)) + return JSONResponse(content={"error": "An internal error has occurred!"}, status_code=500) @router.post("/update") @@ -64,8 +64,8 @@ async def update_conversation(request: Request): status_code=200, ) except Exception as e: - logger.exception("Exception in /history/update") - return JSONResponse(content={"error": str(e)}, status_code=500) + logger.exception("Exception in /history/update: %s", str(e)) + return JSONResponse(content={"error": "An internal error has occurred!"}, status_code=500) @router.post("/message_feedback") @@ -104,8 +104,8 @@ async def update_message_feedback(request: Request): ) except Exception as e: - logger.exception("Exception in /history/message_feedback") - return JSONResponse(content={"error": str(e)}, status_code=500) + logger.exception("Exception in /history/message_feedback: %s", str(e)) + return JSONResponse(content={"error": "An internal error has occurred!"}, status_code=500) @router.delete("/delete") @@ -135,8 +135,8 @@ async def delete_conversation(request: Request): status_code=404, detail=f"Conversation {conversation_id} not found or user does not have permission.") except Exception as e: - logger.exception("Exception in /history/delete") - return JSONResponse(content={"error": str(e)}, status_code=500) + logger.exception("Exception in /history/delete: %s", str(e)) + return JSONResponse(content={"error": "An internal error has occurred!"}, status_code=500) @router.get("/list") @@ -164,8 +164,8 @@ async def list_conversations( return JSONResponse(content=conversations, status_code=200) except Exception as e: - logger.exception("Exception in /history/list") - return JSONResponse(content={"error": str(e)}, status_code=500) + logger.exception("Exception in /history/list: %s", str(e)) + return JSONResponse(content={"error": "An internal error has occurred!"}, status_code=500) @router.post("/read") @@ -197,8 +197,8 @@ async def get_conversation_messages(request: Request): status_code=200) except Exception as e: - logger.exception("Exception in /history/read") - return JSONResponse(content={"error": str(e)}, status_code=500) + logger.exception("Exception in /history/read: %s", str(e)) + return JSONResponse(content={"error": "An internal error has occurred!"}, status_code=500) @router.post("/rename") @@ -223,8 +223,8 @@ async def rename_conversation(request: Request): return JSONResponse(content=rename_conversation, status_code=200) except Exception as e: - logger.exception("Exception in /history/rename") - return JSONResponse(content={"error": str(e)}, status_code=500) + logger.exception("Exception in /history/rename: %s", str(e)) + return JSONResponse(content={"error": "An internal error has occurred!"}, status_code=500) @router.delete("/delete_all") @@ -252,8 +252,8 @@ async def delete_all_conversations(request: Request): ) except Exception as e: - logging.exception("Exception in /history/delete_all") - return JSONResponse(content={"error": str(e)}, status_code=500) + logging.exception("Exception in /history/delete_all: %s", str(e)) + return JSONResponse(content={"error": "An internal error has occurred!"}, status_code=500) @router.post("/clear") @@ -285,8 +285,8 @@ async def clear_messages(request: Request): status_code=200) except Exception as e: - logger.exception("Exception in /history/clear") - return JSONResponse(content={"error": str(e)}, status_code=500) + logger.exception("Exception in /history/clear: %s", str(e)) + return JSONResponse(content={"error": "An internal error has occurred!"}, status_code=500) @router.get("/history/ensure") @@ -303,15 +303,15 @@ async def ensure_cosmos(): "message": "CosmosDB is configured and working"}, status_code=200) except Exception as e: - logger.exception("Exception in /history/ensure") + logger.exception("Exception in /history/ensure: %s", str(e)) cosmos_exception = str(e) if "Invalid credentials" in cosmos_exception: - return JSONResponse(content={"error": cosmos_exception}, status_code=401) + return JSONResponse(content={"error": "Invalid credentials"}, status_code=401) elif "Invalid CosmosDB database name" in cosmos_exception or "Invalid CosmosDB container name" in cosmos_exception: - return JSONResponse(content={"error": cosmos_exception}, status_code=422) + return JSONResponse(content={"error": "Invalid CosmosDB configuration"}, status_code=422) else: return JSONResponse( content={ - "error": f"CosmosDB is not configured or not working: {cosmos_exception}"}, + "error": "CosmosDB is not configured or not working"}, status_code=500)