Skip to content

Commit aafbe22

Browse files
Avijit-MicrosoftAvijit-Microsoft
authored
Merge pull request #367 from microsoft/psl-pk-aiagentPlugin
fix: Fix CodeQL issue
2 parents c339a5a + 46000c3 commit aafbe22

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

‎src/api/api/api_routes.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ async def fetch_chart_data():
2121
response = chart_service.fetch_chart_data()
2222
return JSONResponse(content=response)
2323
except Exception as e:
24-
logger.exception("Error in fetch_chart_data")
25-
return JSONResponse(content={"error": f"Failed to fetch chart data: {str(e)}"}, status_code=500)
24+
logger.exception("Error in fetch_chart_data: %s", str(e))
25+
return JSONResponse(content={"error": "Failed to fetch chart data due to an internal error."}, status_code=500)
2626

2727

2828
@router.post("/fetchChartDataWithFilters")
@@ -33,8 +33,8 @@ async def fetch_chart_data_with_filters(chart_filters: ChartFilters):
3333
response = await chart_service.fetch_chart_data_with_filters(chart_filters)
3434
return JSONResponse(content=response)
3535
except Exception as e:
36-
logger.exception("Error in fetch_chart_data_with_filters")
37-
return JSONResponse(content={"error": f"Failed to fetch chart data: {str(e)}"}, status_code=500)
36+
logger.exception("Error in fetch_chart_data_with_filters: %s", str(e))
37+
return JSONResponse(content={"error": "Failed to fetch chart data due to an internal error."}, status_code=500)
3838

3939

4040
@router.get("/fetchFilterData")
@@ -44,8 +44,8 @@ async def fetch_filter_data():
4444
response = chart_service.fetch_filter_data()
4545
return JSONResponse(content=response)
4646
except Exception as e:
47-
logger.exception("Error in fetch_filter_data")
48-
return JSONResponse(content={"error": f"Failed to fetch filter data: {str(e)}"}, status_code=500)
47+
logger.exception("Error in fetch_filter_data: %s", str(e))
48+
return JSONResponse(content={"error": "Failed to fetch filter data due to an internal error."}, status_code=500)
4949

5050

5151
@router.post("/chat")
@@ -71,8 +71,8 @@ async def conversation(request: Request):
7171
return JSONResponse(content=result)
7272

7373
except Exception as ex:
74-
logger.exception("Error in conversation endpoint")
75-
return JSONResponse(content={"error": str(ex)}, status_code=getattr(ex, "status_code", 500))
74+
logger.exception("Error in conversation endpoint: %s", str(ex))
75+
return JSONResponse(content={"error": "An internal error occurred while processing the conversation."}, status_code=500)
7676

7777

7878
@router.get("/layout-config")
@@ -83,8 +83,8 @@ async def get_layout_config():
8383
layout_config_json = json.loads(layout_config_str) # Parse the string into JSON
8484
return JSONResponse(content=layout_config_json) # Return the parsed JSON
8585
except json.JSONDecodeError as e:
86-
logger.exception("Failed to parse layout config JSON")
87-
return JSONResponse(content={"error": f"Invalid JSON format: {str(e)}"}, status_code=400)
86+
logger.exception("Failed to parse layout config JSON: %s", str(e))
87+
return JSONResponse(content={"error": "Invalid layout configuration format."}, status_code=400)
8888
return JSONResponse(content={"error": "Layout config not found in environment variables"}, status_code=400)
8989

9090

‎src/api/api/history_routes.py‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ async def add_conversation(request: Request):
2828
return response
2929

3030
except Exception as e:
31-
logger.exception("Exception in /generate")
32-
return JSONResponse(content={"error": str(e)}, status_code=500)
31+
logger.exception("Exception in /generate: %s", str(e))
32+
return JSONResponse(content={"error": "An internal error has occurred!"}, status_code=500)
3333

3434

3535
@router.post("/update")
@@ -64,8 +64,8 @@ async def update_conversation(request: Request):
6464
status_code=200,
6565
)
6666
except Exception as e:
67-
logger.exception("Exception in /history/update")
68-
return JSONResponse(content={"error": str(e)}, status_code=500)
67+
logger.exception("Exception in /history/update: %s", str(e))
68+
return JSONResponse(content={"error": "An internal error has occurred!"}, status_code=500)
6969

7070

7171
@router.post("/message_feedback")
@@ -104,8 +104,8 @@ async def update_message_feedback(request: Request):
104104
)
105105

106106
except Exception as e:
107-
logger.exception("Exception in /history/message_feedback")
108-
return JSONResponse(content={"error": str(e)}, status_code=500)
107+
logger.exception("Exception in /history/message_feedback: %s", str(e))
108+
return JSONResponse(content={"error": "An internal error has occurred!"}, status_code=500)
109109

110110

111111
@router.delete("/delete")
@@ -135,8 +135,8 @@ async def delete_conversation(request: Request):
135135
status_code=404,
136136
detail=f"Conversation {conversation_id} not found or user does not have permission.")
137137
except Exception as e:
138-
logger.exception("Exception in /history/delete")
139-
return JSONResponse(content={"error": str(e)}, status_code=500)
138+
logger.exception("Exception in /history/delete: %s", str(e))
139+
return JSONResponse(content={"error": "An internal error has occurred!"}, status_code=500)
140140

141141

142142
@router.get("/list")
@@ -164,8 +164,8 @@ async def list_conversations(
164164
return JSONResponse(content=conversations, status_code=200)
165165

166166
except Exception as e:
167-
logger.exception("Exception in /history/list")
168-
return JSONResponse(content={"error": str(e)}, status_code=500)
167+
logger.exception("Exception in /history/list: %s", str(e))
168+
return JSONResponse(content={"error": "An internal error has occurred!"}, status_code=500)
169169

170170

171171
@router.post("/read")
@@ -197,8 +197,8 @@ async def get_conversation_messages(request: Request):
197197
status_code=200)
198198

199199
except Exception as e:
200-
logger.exception("Exception in /history/read")
201-
return JSONResponse(content={"error": str(e)}, status_code=500)
200+
logger.exception("Exception in /history/read: %s", str(e))
201+
return JSONResponse(content={"error": "An internal error has occurred!"}, status_code=500)
202202

203203

204204
@router.post("/rename")
@@ -223,8 +223,8 @@ async def rename_conversation(request: Request):
223223
return JSONResponse(content=rename_conversation, status_code=200)
224224

225225
except Exception as e:
226-
logger.exception("Exception in /history/rename")
227-
return JSONResponse(content={"error": str(e)}, status_code=500)
226+
logger.exception("Exception in /history/rename: %s", str(e))
227+
return JSONResponse(content={"error": "An internal error has occurred!"}, status_code=500)
228228

229229

230230
@router.delete("/delete_all")
@@ -252,8 +252,8 @@ async def delete_all_conversations(request: Request):
252252
)
253253

254254
except Exception as e:
255-
logging.exception("Exception in /history/delete_all")
256-
return JSONResponse(content={"error": str(e)}, status_code=500)
255+
logging.exception("Exception in /history/delete_all: %s", str(e))
256+
return JSONResponse(content={"error": "An internal error has occurred!"}, status_code=500)
257257

258258

259259
@router.post("/clear")
@@ -285,8 +285,8 @@ async def clear_messages(request: Request):
285285
status_code=200)
286286

287287
except Exception as e:
288-
logger.exception("Exception in /history/clear")
289-
return JSONResponse(content={"error": str(e)}, status_code=500)
288+
logger.exception("Exception in /history/clear: %s", str(e))
289+
return JSONResponse(content={"error": "An internal error has occurred!"}, status_code=500)
290290

291291

292292
@router.get("/history/ensure")
@@ -303,15 +303,15 @@ async def ensure_cosmos():
303303
"message": "CosmosDB is configured and working"},
304304
status_code=200)
305305
except Exception as e:
306-
logger.exception("Exception in /history/ensure")
306+
logger.exception("Exception in /history/ensure: %s", str(e))
307307
cosmos_exception = str(e)
308308

309309
if "Invalid credentials" in cosmos_exception:
310-
return JSONResponse(content={"error": cosmos_exception}, status_code=401)
310+
return JSONResponse(content={"error": "Invalid credentials"}, status_code=401)
311311
elif "Invalid CosmosDB database name" in cosmos_exception or "Invalid CosmosDB container name" in cosmos_exception:
312-
return JSONResponse(content={"error": cosmos_exception}, status_code=422)
312+
return JSONResponse(content={"error": "Invalid CosmosDB configuration"}, status_code=422)
313313
else:
314314
return JSONResponse(
315315
content={
316-
"error": f"CosmosDB is not configured or not working: {cosmos_exception}"},
316+
"error": "CosmosDB is not configured or not working"},
317317
status_code=500)

0 commit comments

Comments
 (0)