Skip to content

Improve conflict resolution prompt template handling of empty entities #49

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
illeatmyhat merged 2 commits into from
Feb 3, 2026
Merged

Improve conflict resolution prompt template handling of empty entities #49

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
1f4a389
add conflict resolution unit tests
illeatmyhat Feb 3, 2026
4062a9d
Create test_conflict_resolution.py
illeatmyhat Feb 3, 2026
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
4 changes: 2 additions & 2 deletions kaizen/llm/conflict_resolution/prompts/conflict_resolution.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Below is a list of entities which I have collected up until now:

{% if old_entities %}
{% if old_entities and old_entities != "[]" %}
{{ old_entities }}
{% else %}
Currently contains no entities
Expand Down Expand Up @@ -37,4 +37,4 @@ Follow the instruction mentioned below:
- If there is a deletion, the object corresponding to that entity should be removed from the list of entities.
- If there is an update, the ID key should remain the same and only the content needs to be updated.

Do not return anything except the JSON formatted object.
Do not return anything except the JSON formatted object.
Loading