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

[PR #14126] parser: allow multiple spaces after PARAMETER and MESSAGE keywords #19798

New Issue
Open
opened 2026-04-16 07:16:40 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-16 07:16:40 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/14126
Author: @4RH1T3CT0R7
Created: 2/6/2026
Status: 🔄 Open

Base: main ← Head: fix/modelfile-whitespace-parsing

📝 Commits (1)

  • 2ed36e5 parser: allow multiple spaces after PARAMETER and MESSAGE keywords

📊 Changes

2 files changed (+43 additions, -7 deletions)

View changed files

📝 parser/parser.go (+15 -7)
📝 parser/parser_test.go (+28 -0)

📄 Description

Summary

Fixes #13359

The Modelfile parser fails when there are multiple spaces between PARAMETER/MESSAGE keywords and their arguments:

  • PARAMETER temperature 0.5 works
  • PARAMETER temperature 0.5 fails with "unknown parameter ''"
  • MESSAGE user hello fails with "message role must be one of..."

Root cause: In ParseFile(), when stateParameter or stateMessage transitions on a space character, the accumulated buffer is used as cmd.Name or role. If only spaces have been read since entering the state (buffer is empty), the transition fires prematurely with an empty string.

Fix: Check if the buffer is empty before transitioning out of stateParameter/stateMessage. If empty, stay in the current state to skip leading whitespace. This is a minimal change (6 lines of logic) that only affects these two states — it does not touch SYSTEM, FROM, ADAPTER, or any triple-quote handling.

Test plan

  • Added test cases to TestParseFileTrimSpace with multiple spaces after PARAMETER
  • Added test cases to TestParseFileMessages with multiple spaces after MESSAGE
  • All existing parser tests pass (go test ./parser/ -v — 60+ tests)

🔄 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/14126 **Author:** [@4RH1T3CT0R7](https://github.com/4RH1T3CT0R7) **Created:** 2/6/2026 **Status:** 🔄 Open **Base:** `main` ← **Head:** `fix/modelfile-whitespace-parsing` --- ### 📝 Commits (1) - [`2ed36e5`](https://github.com/ollama/ollama/commit/2ed36e5fefefd942bd9b599bd38bd160804259bc) parser: allow multiple spaces after PARAMETER and MESSAGE keywords ### 📊 Changes **2 files changed** (+43 additions, -7 deletions) <details> <summary>View changed files</summary> 📝 `parser/parser.go` (+15 -7) 📝 `parser/parser_test.go` (+28 -0) </details> ### 📄 Description ## Summary Fixes #13359 The Modelfile parser fails when there are multiple spaces between `PARAMETER`/`MESSAGE` keywords and their arguments: - `PARAMETER temperature 0.5` works - `PARAMETER temperature 0.5` fails with "unknown parameter ''" - `MESSAGE user hello` fails with "message role must be one of..." **Root cause:** In `ParseFile()`, when `stateParameter` or `stateMessage` transitions on a space character, the accumulated buffer is used as `cmd.Name` or role. If only spaces have been read since entering the state (buffer is empty), the transition fires prematurely with an empty string. **Fix:** Check if the buffer is empty before transitioning out of `stateParameter`/`stateMessage`. If empty, stay in the current state to skip leading whitespace. This is a minimal change (6 lines of logic) that only affects these two states — it does not touch `SYSTEM`, `FROM`, `ADAPTER`, or any triple-quote handling. ## Test plan - [x] Added test cases to `TestParseFileTrimSpace` with multiple spaces after `PARAMETER` - [x] Added test cases to `TestParseFileMessages` with multiple spaces after `MESSAGE` - [x] All existing parser tests pass (`go test ./parser/ -v` — 60+ tests) --- <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-16 07:16:40 -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#19798
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?