Skip to content

Commit

Permalink
change update provider setting behavior
Browse files Browse the repository at this point in the history
  • Loading branch information
spikelu2016 committed Apr 10, 2024
1 parent 9baeb71 commit 4c8ad7f
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 1.15.4 - 2024-04-09
### Changed
- Changed update provider setting behavior to only do partial updates for `setting` field

## 1.15.3 - 2024-04-09
### Added
- Provider settings APIs start returning `setting` field without containing `apikey`
Expand Down
9 changes: 8 additions & 1 deletion internal/manager/provider_setting.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func (m *ProviderSettingsManager) UpdateSetting(id string, setting *provider.Upd
return nil, internal_errors.NewValidationError("id cannot be empty")
}

existing, _ := m.Storage.GetProviderSetting(id, false)
existing, _ := m.Storage.GetProviderSetting(id, true)
if existing == nil {
return nil, internal_errors.NewNotFoundError("provider setting is not found")
}
Expand All @@ -128,6 +128,13 @@ func (m *ProviderSettingsManager) UpdateSetting(id string, setting *provider.Upd
if err := m.validateSettings(existing.Provider, setting.Setting); err != nil {
return nil, err
}

merged := existing.Setting
for k, v := range setting.Setting {
merged[k] = v
}

setting.Setting = merged
}

setting.UpdatedAt = time.Now().Unix()
Expand Down
4 changes: 4 additions & 0 deletions internal/provider/openai/cost.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ var OpenAiPerThousandTokenCost = map[string]map[string]float64{
"prompt": {
"gpt-4-1106-preview": 0.01,
"gpt-4-turbo-preview": 0.01,
"gpt-4-turbo": 0.01,
"gpt-4-turbo-2024-04-09": 0.01,
"gpt-4-0125-preview": 0.01,
"gpt-4-1106-vision-preview": 0.01,
"gpt-4-vision-preview": 0.01,
Expand Down Expand Up @@ -90,6 +92,8 @@ var OpenAiPerThousandTokenCost = map[string]map[string]float64{
"completion": {
"gpt-3.5-turbo-1106": 0.002,
"gpt-4-turbo-preview": 0.03,
"gpt-4-turbo": 0.03,
"gpt-4-turbo-2024-04-09": 0.03,
"gpt-4-1106-preview": 0.03,
"gpt-4-0125-preview": 0.03,
"gpt-4-1106-vision-preview": 0.03,
Expand Down

0 comments on commit 4c8ad7f

Please sign in to comment.