Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions internal/server/messages_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (

"github.com/labstack/echo/v5"

"github.com/enterpilot/gomodel/ext"
"github.com/enterpilot/gomodel/internal/anthropicapi"
"github.com/enterpilot/gomodel/internal/auditlog"
"github.com/enterpilot/gomodel/internal/core"
Expand Down Expand Up @@ -345,6 +346,14 @@ func (s *translatedInferenceService) dispatchMessages(c *echo.Context, req *core
result.Meta.ProviderType,
result.Meta.ProviderName,
)
notifyChatResponseFeedback(
c,
ext.Endpoint(c.Request().URL.Path),
result.Response,
result.Meta.Model,
result.Meta.ProviderType,
result.Meta.ProviderName,
)

applyPluginResponseHeaders(c)
return c.JSON(http.StatusOK, anthropicapi.FromChatResponse(result.Response))
Expand Down
32 changes: 32 additions & 0 deletions internal/server/messages_handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/enterpilot/gomodel/ext"
"github.com/enterpilot/gomodel/internal/core"
"github.com/enterpilot/gomodel/internal/echotest"
)
Expand Down Expand Up @@ -61,6 +62,37 @@ func TestMessages_NonStreaming(t *testing.T) {
require.Equal(t, "user", msgs[1].Role)
}

// Extensions that requested response feedback must hear about a translated
// (non-native) non-streaming response too, as they do on chat completions.
func TestMessages_TranslatedNonStreamingNotifiesFeedbackObservers(t *testing.T) {
provider := &capturingProvider{
supportedModels: []string{"claude-test"},
response: &core.ChatResponse{
ID: "resp-1",
Object: "chat.completion",
Model: "claude-test",
Choices: []core.Choice{{Message: core.ResponseMessage{Role: "assistant", Content: "Hello back"}, FinishReason: "stop"}},
Usage: core.Usage{
PromptTokens: 9, CompletionTokens: 3, TotalTokens: 12,
PromptTokensDetails: &core.PromptTokensDetails{CachedTokens: 6},
},
},
}

handler := NewHandler(provider, nil, nil, nil)

c, rec := echotest.Post(t, "/v1/messages", `{"model":"claude-test","max_tokens":64,"messages":[{"role":"user","content":"Hi"}]}`)
observer := &recordingFeedbackObserver{}
setResponseFeedbackObservers(c, []ext.ResponseFeedbackObserver{observer})
require.NoError(t, handler.Messages(c))
require.Equal(t, http.StatusOK, rec.Code, rec.Body.String())
require.NotNil(t, provider.capturedChatReq, "the request was not translated")
require.Equal(t, 1, observer.calls)
assert.True(t, observer.observed)
assert.Equal(t, 9, observer.input)
assert.Equal(t, 6, observer.read)
}

func TestMessages_Streaming(t *testing.T) {
chatSSE := strings.Join([]string{
`data: {"id":"resp-2","model":"claude-test","choices":[{"index":0,"delta":{"role":"assistant"},"finish_reason":null}]}`,
Expand Down
Loading