diff --git a/pkg/azureopenai/azureopenai.go b/pkg/azureopenai/azureopenai.go index f61d017..38a17db 100644 --- a/pkg/azureopenai/azureopenai.go +++ b/pkg/azureopenai/azureopenai.go @@ -16,6 +16,7 @@ package azureopenai import ( "encoding/json" "net/http" + "strings" ) var ( @@ -41,6 +42,7 @@ type ModelsList struct { } func Models(endpoint, apikey string) (*ModelsList, error) { + endpoint = removeTrailingSlash(endpoint) var modelsl ModelsList req, _ := http.NewRequest(http.MethodGet, endpoint+"/openai/deployments?api-version=2022-12-01", nil) req.Header.Set("api-key", apikey) @@ -56,3 +58,11 @@ func Models(endpoint, apikey string) (*ModelsList, error) { return &modelsl, nil } + +func removeTrailingSlash(s string) string { + const prefix = "openai.azure.com/" + if strings.HasPrefix(s, prefix) && strings.HasSuffix(s, "/") { + return s[:len(s)-1] + } + return s +} diff --git a/store/keydb.go b/store/keydb.go index 05f6d9c..64d3510 100644 --- a/store/keydb.go +++ b/store/keydb.go @@ -3,13 +3,13 @@ package store import "time" type Key struct { - ID uint `gorm:"primarykey" json:"id,omitempty"` - Key string `gorm:"unique;not null" json:"key,omitempty"` - Name string `gorm:"unique;not null" json:"name,omitempty"` - UserId string `json:"-,omitempty"` - KeyType string - EndPoint string - DeploymentName string + ID uint `gorm:"primarykey" json:"id,omitempty"` + Key string `gorm:"unique;not null" json:"key,omitempty"` + Name string `gorm:"unique;not null" json:"name,omitempty"` + UserId string `json:"-,omitempty"` + ApiType string `gorm:"column:api_type"` + EndPoint string `gorm:"column:endpoint"` + DeploymentName string `gorm:"column:deployment_name"` CreatedAt time.Time `json:"createdAt,omitempty"` UpdatedAt time.Time `json:"updatedAt,omitempty"` }