Skip to content

fix(merge): reorder branches so streaming deltas always concatenate #436

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

Draft
cpsievert wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

fix(merge): reorder branches so streaming deltas always concatenate #436

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
8d6c15f
fix(merge): reorder branches so streaming deltas always concatenate
cpsievert Sep 14, 2026
ac3d807
chore: update provider types and pricing data
github-actions[bot] Sep 14, 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
12 changes: 6 additions & 6 deletions chatlas/_merge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@ def merge_dicts(left: dict[str, Any], *others: dict[str, Any]) -> dict[str, Any]
merged[right_k] = None
elif left_v is None:
merged[right_k] = right_v
elif left_v == right_v:
continue
elif isinstance(left_v, str):
merged[right_k] += right_v
elif isinstance(left_v, (int, float)):
merged[right_k] = right_v
elif isinstance(merged[right_k], dict):
elif isinstance(left_v, dict):
merged[right_k] = merge_dicts(merged[right_k], right_v)
elif isinstance(merged[right_k], list):
elif isinstance(left_v, list):
merged[right_k] = merge_lists(merged[right_k], right_v)
elif left_v == right_v:
continue
elif isinstance(left_v, (int, float)):
merged[right_k] = right_v
elif type(merged[right_k]) is not type(right_v):
raise TypeError(
f'additional_kwargs["{right_k}"] already exists in this message,'
Expand Down
Loading