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
8 changes: 6 additions & 2 deletions controller/metaproxy_provision.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ func validateMetaproxyProvisionRequest(
return errors.New("channels exceeds the 256-channel limit")
}

modelRatios, err := parseRatioMap("ModelRatio", request.Options.ModelRatio, false)
modelRatios, err := parseRatioMap("ModelRatio", request.Options.ModelRatio, true)
if err != nil {
return err
}
Expand Down Expand Up @@ -219,9 +219,13 @@ func validateMetaproxyProvisionRequest(
continue
}
for _, modelName := range models {
if _, priced := modelRatios[modelName]; !priced {
ratio, priced := modelRatios[modelName]
if !priced {
return fmt.Errorf("enabled model %q in an offered group is missing from ModelRatio", modelName)
}
if ratio == 0 {
return fmt.Errorf("enabled model %q in an offered group must have a positive ModelRatio", modelName)
}
}
}
return nil
Expand Down
14 changes: 14 additions & 0 deletions controller/metaproxy_provision_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,20 @@ func TestValidateMetaproxyProvisionRequestAllowsUnpricedModelInUnpublishedGroup(
require.NoError(t, validateMetaproxyProvisionRequest(request, request.Digest, "none"))
}

func TestValidateMetaproxyProvisionRequestAllowsLegacyZeroRatioOutsideManagedChannels(t *testing.T) {
request := validMetaproxyProvisionRequest()
request.Options.ModelRatio = `{"model-one":1,"legacy-disabled-model":0}`
require.NoError(t, validateMetaproxyProvisionRequest(request, request.Digest, "none"))
}

func TestValidateMetaproxyProvisionRequestRejectsZeroRatioForOfferedModel(t *testing.T) {
request := validMetaproxyProvisionRequest()
request.Options.ModelRatio = `{"model-one":0}`
err := validateMetaproxyProvisionRequest(request, request.Digest, "none")
require.ErrorContains(t, err, "model-one")
require.ErrorContains(t, err, "positive ModelRatio")
}

func TestValidateMetaproxyProvisionRequestRejectsMalformedRatioJson(t *testing.T) {
request := validMetaproxyProvisionRequest()
request.Options.GroupRatio = `{"standard":"free"}`
Expand Down