Skip to content

Sort the final output for a deterministic order #43

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
egeakman merged 2 commits into from
Jun 16, 2024
Merged

Sort the final output for a deterministic order #43

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
24b2883
Sort the final output
egeakman Jun 12, 2024
36bee20
Add fallback keys
egeakman Jun 12, 2024
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
27 changes: 27 additions & 0 deletions src/utils/sort.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
class Sort:
@staticmethod
def sort_nested(data, sort_keys=None):
"""
TODO: This is probably too generic and not the best way, but it works for now
"""
if sort_keys is None:
sort_keys = ["start", "code", "title", "name"]

def get_sort_key(item):
return tuple(item.get(key, "") for key in sort_keys)

if isinstance(data, dict):
return {
key: Sort.sort_nested(value, sort_keys)
for key, value in sorted(data.items())
}
elif isinstance(data, list):
if all(isinstance(item, dict) for item in data):
return sorted(
(Sort.sort_nested(item, sort_keys) for item in data),
key=get_sort_key,
)
else:
return sorted(Sort.sort_nested(item, sort_keys) for item in data)
else:
return data
9 changes: 7 additions & 2 deletions src/utils/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from src.misc import Room
from src.models.europython import EuroPythonSession, EuroPythonSpeaker, Schedule
from src.models.pretalx import PretalxScheduleBreak, PretalxSpeaker, PretalxSubmission
from src.utils.sort import Sort


class Utils:
Expand Down Expand Up @@ -172,10 +173,14 @@ def write_to_file(
if not direct_dump:
with open(output_file, "w") as fd:
json.dump(
{k: json.loads(v.model_dump_json()) for k, v in data.items()},
Sort.sort_nested(
{k: json.loads(v.model_dump_json()) for k, v in data.items()}
),
fd,
indent=2,
)
else:
with open(output_file, "w") as fd:
json.dump(json.loads(data.model_dump_json()), fd, indent=2)
json.dump(
Sort.sort_nested(json.loads(data.model_dump_json())), fd, indent=2
)