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

[PR #9930] [CLOSED] Limit collation 9929 #38972

New Issue
Closed
opened 2026-04-22 23:37:18 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-22 23:37:18 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/9930
Author: @gabe-l-hart
Created: 3/21/2025
Status: ❌ Closed

Base: main ← Head: LimitCollation-9929

📝 Commits (3)

  • e08fd5a feat: Expose IsKnowMessageRole outside of the parser package
  • ff6e184 feat: Only collate if msg.Role is one of the known roles
  • 2eb645e test: Add a unit test to validate collation of known roles only

📊 Changes

3 files changed (+74 additions, -2 deletions)

View changed files

📝 parser/parser.go (+5 -1)
📝 template/template.go (+2 -1)
📝 template/template_test.go (+67 -0)

📄 Description

Description

Closes #9929

This PR limits the collation logic to only apply to "user", "system", and "assistant" roles.

Discussion

  • It looks like #9874 was reverted in #9917, but there's no discussion on the PR, so I'm not clear if the decision to support other roles was revisited, or if this is a temporary state.
  • In the current implementation, I exposed IsKnownMessageRole as a public function in the parser package, but there may be a better central place to put the list of "known" roles

🔄 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/9930 **Author:** [@gabe-l-hart](https://github.com/gabe-l-hart) **Created:** 3/21/2025 **Status:** ❌ Closed **Base:** `main` ← **Head:** `LimitCollation-9929` --- ### 📝 Commits (3) - [`e08fd5a`](https://github.com/ollama/ollama/commit/e08fd5a4bf9351d8ce0c851952b956ec2693d23b) feat: Expose IsKnowMessageRole outside of the parser package - [`ff6e184`](https://github.com/ollama/ollama/commit/ff6e184366e7f3831f4631017c60f398d58650d8) feat: Only collate if msg.Role is one of the known roles - [`2eb645e`](https://github.com/ollama/ollama/commit/2eb645e7e764c8d0d2a217e754ef9b1d5aa98c3d) test: Add a unit test to validate collation of known roles only ### 📊 Changes **3 files changed** (+74 additions, -2 deletions) <details> <summary>View changed files</summary> 📝 `parser/parser.go` (+5 -1) 📝 `template/template.go` (+2 -1) 📝 `template/template_test.go` (+67 -0) </details> ### 📄 Description ## Description Closes #9929 This PR limits the collation logic to only apply to `"user"`, `"system"`, and `"assistant"` roles. ## Discussion * It looks like #9874 was reverted in #9917, but there's no discussion on the PR, so I'm not clear if the decision to support other roles was revisited, or if this is a temporary state. * In the current implementation, I exposed `IsKnownMessageRole` as a public function in the `parser` package, but there may be a better central place to put the list of "known" roles --- <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-22 23:37:18 -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#38972
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?