starred/ollama-ollama
1
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2026-04-17 15:53:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

revert context length warnings change (#15121)

Browse Source
This commit is contained in:
Parth Sareen
2026-03-28 16:43:59 -07:00
committed by GitHub
parent 7c8da5679e
commit 8e54823fd3
6 changed files with 1 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/routes.go
View File

@@ -1937,19 +1937,11 @@ func streamResponse(c *gin.Context, ch chan any) {
func (s *Server) StatusHandler(c *gin.Context) {
disabled, source := internalcloud.Status()
contextLength := int(envconfig.ContextLength())
if contextLength == 0 {
slog.Warn("OLLAMA_CONTEXT_LENGTH is not set, using default", "default", s.defaultNumCtx)
contextLength = s.defaultNumCtx
}
c.JSON(http.StatusOK, api.StatusResponse{
Cloud: api.CloudStatus{
Disabled: disabled,
Source: source,
},
ContextLength: contextLength,
})
}

56
server/routes_cloud_test.go
View File

@@ -44,62 +44,6 @@ func TestStatusHandler(t *testing.T) {
}
}
func TestStatusHandlerContextLength(t *testing.T) {
gin.SetMode(gin.TestMode)
setTestHome(t, t.TempDir())
tests := []struct {
name string
envContextLen string
defaultNumCtx int
wantContextLen int
}{
{
name: "env var takes precedence over VRAM default",
envContextLen: "8192",
defaultNumCtx: 32768,
wantContextLen: 8192,
},
{
name: "falls back to VRAM default when env not set",
envContextLen: "",
defaultNumCtx: 32768,
wantContextLen: 32768,
},
{
name: "zero when neither is set",
envContextLen: "",
defaultNumCtx: 0,
wantContextLen: 0,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if tt.envContextLen != "" {
t.Setenv("OLLAMA_CONTEXT_LENGTH", tt.envContextLen)
} else {
t.Setenv("OLLAMA_CONTEXT_LENGTH", "")
}
s := Server{defaultNumCtx: tt.defaultNumCtx}
w := createRequest(t, s.StatusHandler, nil)
if w.Code != http.StatusOK {
t.Fatalf("expected status 200, got %d", w.Code)
}
var resp api.StatusResponse
if err := json.NewDecoder(w.Body).Decode(&resp); err != nil {
t.Fatal(err)
}
if resp.ContextLength != tt.wantContextLen {
t.Fatalf("expected context_length %d, got %d", tt.wantContextLen, resp.ContextLength)
}
})
}
}
func TestCloudDisabledBlocksRemoteOperations(t *testing.T) {
gin.SetMode(gin.TestMode)
setTestHome(t, t.TempDir())