Skip to content
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

Jump to bottom

Sort language detection results by descending score #800

Merged
merged 1 commit into from
Sep 17, 2024
Merged

Sort language detection results by descending score #800

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
12 changes: 8 additions & 4 deletions annif/rest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,14 @@ def detect_language(body: dict[str, Any]):
)

result = {
"results": [
{"language": lang if lang != "unk" else None, "score": score}
for lang, score in proportions.items()
]
"results": sorted(
[
{"language": lang if lang != "unk" else None, "score": score}
for lang, score in proportions.items()
],
key=lambda x: x["score"],
reverse=True,
)
}
return result, 200, {"Content-Type": "application/json"}

Expand Down
6 changes: 3 additions & 3 deletions tests/test_rest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def test_rest_detect_language_english(app):
result = annif.rest.detect_language(
{"text": "example text", "languages": ["en", "fi", "sv"]}
)[0]
assert {"language": "en", "score": 1} in result["results"]
assert result["results"][0] == {"language": "en", "score": 1}


def test_rest_detect_language_unknown(app):
Expand All @@ -68,13 +68,13 @@ def test_rest_detect_language_unknown(app):
result = annif.rest.detect_language(
{"text": "exampley texty", "languages": ["fi", "sv"]}
)[0]
assert {"language": None, "score": 1} in result["results"]
assert result["results"][0] == {"language": None, "score": 1}


def test_rest_detect_language_no_text(app):
with app.app_context():
result = annif.rest.detect_language({"text": "", "languages": ["en"]})[0]
assert {"language": None, "score": 1} in result["results"]
assert result["results"][0] == {"language": None, "score": 1}


def test_rest_detect_language_unsupported_candidates(app):
Expand Down
Loading