github-starred/ollama
2
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2026-05-07 00:22:43 -05:00
Code Issues 14.5k Packages Projects Releases 120 Wiki Activity

[PR #5639] [MERGED] do not automatically aggregate system messages #11866

New Issue
Closed
opened 2026-04-12 23:41:02 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-12 23:41:02 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/5639
Author: @mxyng
Created: 7/11/2024
Status: ✅ Merged
Merged: 7/12/2024
Merged by: @mxyng

Base: main ← Head: mxyng/unaggregated-system

📝 Commits (3)

  • e64f9eb do no automatically aggregate system messages
  • 57ec690 revert embedded templates to use prompt/response
  • 5056bb9 rename aggregate to contents

📊 Changes

24 files changed (+124 additions, -258 deletions)

View changed files

📝 server/routes_create_test.go (+2 -2)
📝 template/alfred.gotmpl (+1 -8)
📝 template/alpaca.gotmpl (+0 -13)
📝 template/chatml.gotmpl (+0 -9)
📝 template/chatqa.gotmpl (+0 -12)
📝 template/codellama-70b-instruct.gotmpl (+3 -12)
📝 template/falcon-instruct.gotmpl (+0 -10)
📝 template/gemma-instruct.gotmpl (+0 -12)
📝 template/granite-instruct.gotmpl (+0 -14)
📝 template/llama2-chat.gotmpl (+4 -14)
📝 template/llama3-instruct.gotmpl (+1 -13)
📝 template/magicoder.gotmpl (+0 -13)
📝 template/mistral-instruct.gotmpl (+3 -10)
📝 template/openchat.gotmpl (+1 -11)
📝 template/phi-3.gotmpl (+0 -9)
📝 template/solar-instruct.gotmpl (+0 -14)
📝 template/starcoder2-instruct.gotmpl (+0 -15)
📝 template/template.go (+21 -19)
📝 template/template_test.go (+79 -24)
📝 template/testdata/llama2-chat.gotmpl/system-user-assistant-user (+3 -1)

...and 4 more files

📄 Description

add a helper for aggregating system prompts

revert embedded templates to use prompt/response templates for better compatibility

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/ollama/ollama/pull/5639 **Author:** [@mxyng](https://github.com/mxyng) **Created:** 7/11/2024 **Status:** ✅ Merged **Merged:** 7/12/2024 **Merged by:** [@mxyng](https://github.com/mxyng) **Base:** `main` ← **Head:** `mxyng/unaggregated-system` --- ### 📝 Commits (3) - [`e64f9eb`](https://github.com/ollama/ollama/commit/e64f9ebb44b584d94094274f62acd90a5195dd89) do no automatically aggregate system messages - [`57ec690`](https://github.com/ollama/ollama/commit/57ec6901eb59cca9d0c29adca3f0fd4b95c1c989) revert embedded templates to use prompt/response - [`5056bb9`](https://github.com/ollama/ollama/commit/5056bb9c010f06316b0ff280b879b9c36a7c995c) rename aggregate to contents ### 📊 Changes **24 files changed** (+124 additions, -258 deletions) <details> <summary>View changed files</summary> 📝 `server/routes_create_test.go` (+2 -2) 📝 `template/alfred.gotmpl` (+1 -8) 📝 `template/alpaca.gotmpl` (+0 -13) 📝 `template/chatml.gotmpl` (+0 -9) 📝 `template/chatqa.gotmpl` (+0 -12) 📝 `template/codellama-70b-instruct.gotmpl` (+3 -12) 📝 `template/falcon-instruct.gotmpl` (+0 -10) 📝 `template/gemma-instruct.gotmpl` (+0 -12) 📝 `template/granite-instruct.gotmpl` (+0 -14) 📝 `template/llama2-chat.gotmpl` (+4 -14) 📝 `template/llama3-instruct.gotmpl` (+1 -13) 📝 `template/magicoder.gotmpl` (+0 -13) 📝 `template/mistral-instruct.gotmpl` (+3 -10) 📝 `template/openchat.gotmpl` (+1 -11) 📝 `template/phi-3.gotmpl` (+0 -9) 📝 `template/solar-instruct.gotmpl` (+0 -14) 📝 `template/starcoder2-instruct.gotmpl` (+0 -15) 📝 `template/template.go` (+21 -19) 📝 `template/template_test.go` (+79 -24) 📝 `template/testdata/llama2-chat.gotmpl/system-user-assistant-user` (+3 -1) _...and 4 more files_ </details> ### 📄 Description add a helper for aggregating system prompts revert embedded templates to use prompt/response templates for better compatibility --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-04-12 23:41:02 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
amd
api
app
bug
build
cli
cloud
compatibility
context-length
create
docker
documentation
embeddings
feature request
feedback wanted
good first issue
gpt-oss
gpu
harmony
help wanted
image
install
intel
js
launch
linux
macos
memory
mlx
model
needs more info
networking
nvidia
ollama.com
performance
pull-request
Mirrored from GitHub Pull Request
 python
question
registry
rendering
thinking
tools
top
vulkan
windows
wsl
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/ollama#11866
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?