Skip to content

fix: Fix CodeQL issue #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Avijit-Microsoft merged 2 commits into from
Apr 16, 2025
Merged

fix: Fix CodeQL issue #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08bdd09
fix codeQL issue
Pavan-Microsoft Apr 16, 2025
46000c3
Merge branch 'dev' of https://github.com/microsoft/Conversation-Knowl…
Pavan-Microsoft Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/api/api/api_routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
Expand All @@ -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")
Expand All @@ -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")
Expand All @@ -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)


Expand Down
44 changes: 22 additions & 22 deletions src/api/api/history_routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand All @@ -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")
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand All @@ -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)
Loading