Skip to content

Statnett-142: Fix bug in the calculation of the aggregated results in case of an output from DESCRIBE query containing the string "results" #30

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Statnett-142: Fix bug in the calculation of the aggregated results in case of an output from DESCRIBE query containing the string "results" #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion graphrag_eval/aggregation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def update_steps_summary(
if step["status"] != "error":
try:
res = json.loads(step["output"])
if "results" in res and "bindings" in res["results"]:
if isinstance(res, dict) and "results" in res.keys() and "bindings" in res["results"]:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is enough:

Suggested change
if isinstance(res, dict) and "results" in res.keys() and "bindings" in res["results"]:
if isinstance(res, dict) and "results" in res and "bindings" in res["results"]:

We do not need to specify .keys().

if not res["results"]["bindings"]:
template_steps_summary["empty_results"][name] += 1
except json.decoder.JSONDecodeError:
Expand Down
15 changes: 15 additions & 0 deletions tests/test_aggregation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
from pathlib import Path

import yaml

from graphrag_eval import compute_aggregates

DATA_DIR = Path(__file__).parent / "test_data"


def test_compute_aggregates_doesnt_throw_exception():
# The issue was that the actual SPARQL query is a DESCRIBE query containing the string "results" in the text.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# The issue was that the actual SPARQL query is a DESCRIBE query containing the string "results" in the text.
"""
Check that `compute_aggregates()` works when the actual SPARQL query
is a DESCRIBE query containing the string "results" in the text.
"""

evaluation_results_file = DATA_DIR / f"evaluation_3.yaml"
with open(evaluation_results_file, "r", encoding="utf-8") as yaml_file:
per_question_eval = yaml.safe_load(yaml_file)
compute_aggregates(per_question_eval)
Loading
Loading