feat: sync deployed v1.0.0-rc.38-custom.42

Sync production source including routing, billing, Astra detection and public uptime. Update custom build instructions and license packaging.

relay/channel/ollama/stream_test.go

@@ -97,3 +97,148 @@ func TestOllamaChatHandlerNonStreamToolCalls(t *testing.T) {
 		})
 	}
 }
+
+func TestBuildOllamaStreamDelta(t *testing.T) {
+	tests := []struct {
+		name          string
+		raw           string
+		startIndex    int
+		wantContent   string
+		wantReasoning string
+		wantToolCalls []struct {
+			id        string
+			name      string
+			index     int
+			arguments string
+		}
+		wantNextIndex int
+		wantPayload   bool
+	}{
+		{
+			name:        "chat content",
+			raw:         `{"message":{"content":"hello"}}`,
+			wantContent: "hello",
+			wantPayload: true,
+		},
+		{
+			name:        "generate content",
+			raw:         `{"response":"hello"}`,
+			wantContent: "hello",
+			wantPayload: true,
+		},
+		{
+			name:          "thinking json string",
+			raw:           `{"message":{"thinking":"consider this"}}`,
+			wantReasoning: "consider this",
+			wantPayload:   true,
+		},
+		{
+			name:          "thinking raw fallback",
+			raw:           `{"message":{"thinking":{"step":"consider this"}}}`,
+			wantReasoning: `{"step":"consider this"}`,
+			wantPayload:   true,
+		},
+		{
+			name:       "multiple tool calls",
+			raw:        `{"message":{"tool_calls":[{"id":"call_upstream","function":{"name":"get_weather","arguments":{"city":"Paris"}}},{"function":{"name":"get_time","arguments":{"timezone":"UTC"}}}]}}`,
+			startIndex: 2,
+			wantToolCalls: []struct {
+				id        string
+				name      string
+				index     int
+				arguments string
+			}{
+				{id: "call_upstream", name: "get_weather", index: 2, arguments: `{"city":"Paris"}`},
+				{id: "call_3", name: "get_time", index: 3, arguments: `{"timezone":"UTC"}`},
+			},
+			wantNextIndex: 4,
+			wantPayload:   true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var chunk ollamaChatStreamChunk
+			require.NoError(t, common.Unmarshal([]byte(tt.raw), &chunk))
+
+			toolCallIndex := tt.startIndex
+			delta, hasPayload := buildOllamaStreamDelta(&chunk, "response-id", 123, "model", &toolCallIndex)
+			assert.Equal(t, tt.wantPayload, hasPayload)
+			assert.Equal(t, tt.wantContent, delta.Choices[0].Delta.GetContentString())
+			assert.Equal(t, tt.wantReasoning, delta.Choices[0].Delta.GetReasoningContent())
+			assert.Equal(t, tt.wantNextIndex, toolCallIndex)
+
+			if tt.wantToolCalls == nil {
+				assert.Empty(t, delta.Choices[0].Delta.ToolCalls)
+				return
+			}
+			require.Len(t, delta.Choices[0].Delta.ToolCalls, len(tt.wantToolCalls))
+			for i, want := range tt.wantToolCalls {
+				got := delta.Choices[0].Delta.ToolCalls[i]
+				assert.Equal(t, want.id, got.ID)
+				assert.Equal(t, "function", got.Type)
+				assert.Equal(t, want.name, got.Function.Name)
+				assert.Equal(t, want.arguments, got.Function.Arguments)
+				require.NotNil(t, got.Index)
+				assert.Equal(t, want.index, *got.Index)
+			}
+		})
+	}
+}
+
+func TestOllamaStreamHandlerDoneToolCalls(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	w := httptest.NewRecorder()
+	c, _ := gin.CreateTestContext(w)
+
+	resp := &http.Response{
+		StatusCode: http.StatusOK,
+		Header:     make(http.Header),
+		Body:       io.NopCloser(strings.NewReader(`{"model":"qwen3-coder","created_at":"2026-05-27T12:00:00Z","message":{"role":"assistant","content":"","tool_calls":[{"function":{"name":"get_weather","arguments":{"city":"北京"}}},{"function":{"name":"get_time","arguments":{"timezone":"Asia/Shanghai"}}}]},"done":true,"done_reason":"stop","prompt_eval_count":5,"eval_count":7}`)),
+	}
+
+	usage, apiErr := ollamaStreamHandler(c, &relaycommon.RelayInfo{
+		ChannelMeta: &relaycommon.ChannelMeta{UpstreamModelName: "fallback-model"},
+	}, resp)
+	require.Nil(t, apiErr)
+	require.NotNil(t, usage)
+	assert.Equal(t, 12, usage.TotalTokens)
+
+	var chunks []dto.ChatCompletionsStreamResponse
+	for _, line := range strings.Split(w.Body.String(), "\n") {
+		data, ok := strings.CutPrefix(line, "data: ")
+		if !ok || data == "[DONE]" {
+			continue
+		}
+		var chunk dto.ChatCompletionsStreamResponse
+		require.NoError(t, common.Unmarshal([]byte(data), &chunk))
+		chunks = append(chunks, chunk)
+	}
+
+	var toolChunkIndex, stopChunkIndex int = -1, -1
+	for i := range chunks {
+		if len(chunks[i].Choices) == 0 {
+			continue
+		}
+		if len(chunks[i].Choices[0].Delta.ToolCalls) > 0 {
+			toolChunkIndex = i
+		}
+		if chunks[i].Choices[0].FinishReason != nil {
+			stopChunkIndex = i
+		}
+	}
+	require.NotEqual(t, -1, toolChunkIndex)
+	require.NotEqual(t, -1, stopChunkIndex)
+	assert.Less(t, toolChunkIndex, stopChunkIndex)
+
+	toolCalls := chunks[toolChunkIndex].Choices[0].Delta.ToolCalls
+	require.Len(t, toolCalls, 2)
+	assert.Equal(t, "call_0", toolCalls[0].ID)
+	assert.Equal(t, "call_1", toolCalls[1].ID)
+	require.NotNil(t, toolCalls[0].Index)
+	require.NotNil(t, toolCalls[1].Index)
+	assert.Equal(t, 0, *toolCalls[0].Index)
+	assert.Equal(t, 1, *toolCalls[1].Index)
+	assert.Equal(t, constant.FinishReasonToolCalls, *chunks[stopChunkIndex].Choices[0].FinishReason)
+	assert.Contains(t, w.Body.String(), "data: [DONE]")
+}