Skip to content

Commit 1d82943

Browse files
roma-glushkoroma-glushko
committed
#153: Fixed lint
1 parent 97ee774 commit 1d82943

File tree

6 files changed

+29
-21
lines changed

6 files changed

+29
-21
lines changed

‎pkg/api/schemas/chat.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ func (r *ChatRequest) Params(modelID string, modelName string) *ChatParams {
4444
reqMessage := r.Message
4545

4646
if override := r.ModelParams(modelName); override != nil {
47-
reqMessage = override.Message
4847
// TODO(185): set other params
48+
reqMessage = override.Message
4949
}
5050

5151
if override := r.ModelParams(modelID); override != nil {
52-
reqMessage = override.Message
5352
// TODO(185): set other params
53+
reqMessage = override.Message
5454
}
5555

5656
params.Messages = append(params.Messages, r.MessageHistory...)

‎pkg/providers/octoml/chat.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ type ChatRequest struct {
2929
}
3030

3131
func (r *ChatRequest) ApplyParams(params *schemas.ChatParams) {
32-
r.Messages = params.Messages
3332
// TODO(185): set other params
33+
r.Messages = params.Messages
3434
}
3535

3636
// NewChatRequestFromConfig fills the struct from the config. Not using reflection because of performance penalty it gives

‎pkg/providers/ollama/chat.go‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ type ChatRequest struct {
4141
}
4242

4343
func (r *ChatRequest) ApplyParams(params *schemas.ChatParams) {
44-
r.Messages = params.Messages
4544
// TODO(185): set other params
45+
r.Messages = params.Messages
4646
}
4747

4848
// NewChatRequestFromConfig fills the struct from the config. Not using reflection because of performance penalty it gives
@@ -84,7 +84,7 @@ func (c *Client) Chat(ctx context.Context, params *schemas.ChatParams) (*schemas
8484
return chatResponse, nil
8585
}
8686

87-
func (c *Client) doChatRequest(ctx context.Context, payload *ChatRequest) (*schemas.ChatResponse, error) {
87+
func (c *Client) doChatRequest(ctx context.Context, payload *ChatRequest) (*schemas.ChatResponse, error) { //nolint:cyclop
8888
// Build request payload
8989
rawPayload, err := json.Marshal(payload)
9090
if err != nil {
@@ -146,6 +146,7 @@ func (c *Client) doChatRequest(ctx context.Context, payload *ChatRequest) (*sche
146146
bodyBytes, err := io.ReadAll(resp.Body)
147147
if err != nil {
148148
c.telemetry.Logger.Error("failed to read ollama chat response", zap.Error(err))
149+
149150
return nil, err
150151
}
151152

@@ -170,9 +171,6 @@ func (c *Client) doChatRequest(ctx context.Context, payload *ChatRequest) (*sche
170171
ModelName: ollamaCompletion.Model,
171172
Cached: false,
172173
ModelResponse: schemas.ModelResponse{
173-
Metadata: map[string]string{
174-
"system_fingerprint": "",
175-
},
176174
Message: schemas.ChatMessage{
177175
Role: ollamaCompletion.Message.Role,
178176
Content: ollamaCompletion.Message.Content,

‎pkg/providers/openai/schemas.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ type ChatRequest struct {
2323
}
2424

2525
func (r *ChatRequest) ApplyParams(params *schemas.ChatParams) {
26-
r.Messages = params.Messages
2726
// TODO(185): set other params
27+
r.Messages = params.Messages
2828
}
2929

3030
// ChatCompletion

‎pkg/providers/testing/lang.go‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,13 @@ type ProviderMock struct {
9797
chatResps *[]RespMock
9898
chatStreams *[]RespStreamMock
9999
supportStreaming bool
100+
modelName *string
100101
}
101102

102-
func NewProviderMock(responses []RespMock) *ProviderMock {
103+
func NewProviderMock(modelName *string, responses []RespMock) *ProviderMock {
103104
return &ProviderMock{
104105
idx: 0,
106+
modelName: modelName,
105107
chatResps: &responses,
106108
supportStreaming: false,
107109
}
@@ -152,3 +154,11 @@ func (c *ProviderMock) ChatStream(_ context.Context, _ *schemas.ChatParams) (cli
152154
func (c *ProviderMock) Provider() string {
153155
return "provider_mock"
154156
}
157+
158+
func (c *ProviderMock) ModelName() string {
159+
if c.modelName != nil {
160+
return "model_mock"
161+
}
162+
163+
return *c.modelName
164+
}

‎pkg/routers/router_test.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ func TestLangRouter_Chat_PickFistHealthy(t *testing.T) {
2424
langModels := []*providers.LanguageModel{
2525
providers.NewLangModel(
2626
"first",
27-
ptesting.NewProviderMock([]ptesting.RespMock{{Msg: "1"}, {Msg: "2"}}),
27+
ptesting.NewProviderMock(nil, []ptesting.RespMock{{Msg: "1"}, {Msg: "2"}}),
2828
budget,
2929
*latConfig,
3030
1,
3131
),
3232
providers.NewLangModel(
3333
"second",
34-
ptesting.NewProviderMock([]ptesting.RespMock{{Msg: "1"}}),
34+
ptesting.NewProviderMock(nil, []ptesting.RespMock{{Msg: "1"}}),
3535
budget,
3636
*latConfig,
3737
1,
@@ -71,21 +71,21 @@ func TestLangRouter_Chat_PickThirdHealthy(t *testing.T) {
7171
langModels := []*providers.LanguageModel{
7272
providers.NewLangModel(
7373
"first",
74-
ptesting.NewProviderMock([]ptesting.RespMock{{Err: &schemas.ErrNoModelAvailable}, {Msg: "3"}}),
74+
ptesting.NewProviderMock(nil, []ptesting.RespMock{{Err: &schemas.ErrNoModelAvailable}, {Msg: "3"}}),
7575
budget,
7676
*latConfig,
7777
1,
7878
),
7979
providers.NewLangModel(
8080
"second",
81-
ptesting.NewProviderMock([]ptesting.RespMock{{Err: &schemas.ErrNoModelAvailable}, {Msg: "4"}}),
81+
ptesting.NewProviderMock(nil, []ptesting.RespMock{{Err: &schemas.ErrNoModelAvailable}, {Msg: "4"}}),
8282
budget,
8383
*latConfig,
8484
1,
8585
),
8686
providers.NewLangModel(
8787
"third",
88-
ptesting.NewProviderMock([]ptesting.RespMock{{Msg: "1"}, {Msg: "2"}}),
88+
ptesting.NewProviderMock(nil, []ptesting.RespMock{{Msg: "1"}, {Msg: "2"}}),
8989
budget,
9090
*latConfig,
9191
1,
@@ -129,14 +129,14 @@ func TestLangRouter_Chat_SuccessOnRetry(t *testing.T) {
129129
langModels := []*providers.LanguageModel{
130130
providers.NewLangModel(
131131
"first",
132-
ptesting.NewProviderMock([]ptesting.RespMock{{Err: &schemas.ErrNoModelAvailable}, {Msg: "2"}}),
132+
ptesting.NewProviderMock(nil, []ptesting.RespMock{{Err: &schemas.ErrNoModelAvailable}, {Msg: "2"}}),
133133
budget,
134134
*latConfig,
135135
1,
136136
),
137137
providers.NewLangModel(
138138
"second",
139-
ptesting.NewProviderMock([]ptesting.RespMock{{Err: &schemas.ErrNoModelAvailable}, {Msg: "1"}}),
139+
ptesting.NewProviderMock(nil, []ptesting.RespMock{{Err: &schemas.ErrNoModelAvailable}, {Msg: "1"}}),
140140
budget,
141141
*latConfig,
142142
1,
@@ -173,14 +173,14 @@ func TestLangRouter_Chat_UnhealthyModelInThePool(t *testing.T) {
173173
langModels := []*providers.LanguageModel{
174174
providers.NewLangModel(
175175
"first",
176-
ptesting.NewProviderMock([]ptesting.RespMock{{Err: clients.ErrProviderUnavailable}, {Msg: "3"}}),
176+
ptesting.NewProviderMock(nil, []ptesting.RespMock{{Err: clients.ErrProviderUnavailable}, {Msg: "3"}}),
177177
budget,
178178
*latConfig,
179179
1,
180180
),
181181
providers.NewLangModel(
182182
"second",
183-
ptesting.NewProviderMock([]ptesting.RespMock{{Msg: "1"}, {Msg: "2"}}),
183+
ptesting.NewProviderMock(nil, []ptesting.RespMock{{Msg: "1"}, {Msg: "2"}}),
184184
budget,
185185
*latConfig,
186186
1,
@@ -219,14 +219,14 @@ func TestLangRouter_Chat_AllModelsUnavailable(t *testing.T) {
219219
langModels := []*providers.LanguageModel{
220220
providers.NewLangModel(
221221
"first",
222-
ptesting.NewProviderMock([]ptesting.RespMock{{Err: &schemas.ErrNoModelAvailable}, {Err: &schemas.ErrNoModelAvailable}}),
222+
ptesting.NewProviderMock(nil, []ptesting.RespMock{{Err: &schemas.ErrNoModelAvailable}, {Err: &schemas.ErrNoModelAvailable}}),
223223
budget,
224224
*latConfig,
225225
1,
226226
),
227227
providers.NewLangModel(
228228
"second",
229-
ptesting.NewProviderMock([]ptesting.RespMock{{Err: &schemas.ErrNoModelAvailable}, {Err: &schemas.ErrNoModelAvailable}}),
229+
ptesting.NewProviderMock(nil, []ptesting.RespMock{{Err: &schemas.ErrNoModelAvailable}, {Err: &schemas.ErrNoModelAvailable}}),
230230
budget,
231231
*latConfig,
232232
1,

0 commit comments

Comments
 (0)