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
39 changes: 4 additions & 35 deletions core/controller/channel.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"net/http"
"slices"
"strconv"
"strings"
"time"

"github.com/bytedance/sonic"
Expand Down Expand Up @@ -166,13 +165,13 @@ func AddChannels(c *gin.Context) {

_channels := make([]*model.Channel, 0, len(channels))
for _, channel := range channels {
channels, err := channel.ToChannels()
channel, err := channel.ToChannel()
if err != nil {
middleware.ErrorResponse(c, http.StatusBadRequest, err.Error())
return
}

_channels = append(_channels, channels...)
_channels = append(_channels, channel)
}

err = model.BatchInsertChannels(_channels)
Expand Down Expand Up @@ -332,36 +331,6 @@ func (r *AddChannelRequest) ToChannel() (*model.Channel, error) {
}, nil
}

func (r *AddChannelRequest) ToChannels() ([]*model.Channel, error) {
keys := strings.Split(r.Key, "\n")

channels := make([]*model.Channel, 0, len(keys))
for _, key := range keys {
if key == "" {
continue
}

c, err := r.ToChannel()
if err != nil {
return nil, err
}

c.Key = key
channels = append(channels, c)
}

if len(channels) == 0 {
ch, err := r.ToChannel()
if err != nil {
return nil, err
}

return []*model.Channel{ch}, nil
}

return channels, nil
}

// AddChannel godoc
//
// @Summary Add a single channel
Expand All @@ -382,13 +351,13 @@ func AddChannel(c *gin.Context) {
return
}

channels, err := channel.ToChannels()
ch, err := channel.ToChannel()
if err != nil {
middleware.ErrorResponse(c, http.StatusBadRequest, err.Error())
return
}

err = model.BatchInsertChannels(channels)
err = model.BatchInsertChannels([]*model.Channel{ch})
if err != nil {
middleware.ErrorResponse(c, http.StatusInternalServerError, err.Error())
return
Expand Down
13 changes: 13 additions & 0 deletions core/controller/channel_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,19 @@ import (
"github.com/stretchr/testify/require"
)

func TestAddChannelRequestToChannelPreservesNewlinesInKey(t *testing.T) {
const key = "first-key\nsecond-key"

channel, err := (&AddChannelRequest{
Type: model.ChannelTypeOpenAI,
Name: "channel",
Key: key,
}).ToChannel()

require.NoError(t, err)
require.Equal(t, key, channel.Key)
}

func TestRunAutoTestBannedModelsHonorsConcurrencyLimit(t *testing.T) {
const (
concurrency = 7
Expand Down
4 changes: 2 additions & 2 deletions core/controller/import.go
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,12 @@ func AddOneAPIChannel(ch OneAPIChannel) error {
add.BaseURL += "/v1"
}

chs, err := add.ToChannels()
channel, err := add.ToChannel()
if err != nil {
return err
}

return model.BatchInsertChannels(chs)
return model.BatchInsertChannels([]*model.Channel{channel})
}

// ImportChannelFromOneAPI godoc
Expand Down
Loading