Merge pull request #65 from kubeflow/main

[pull] main from kubeflow:main
opendatahub-io · May 20, 2024 · 39ea1a5 · 39ea1a5
2 parents 674d429 + 4374347
commit 39ea1a5
Show file tree

Hide file tree

Showing 5 changed files with 215 additions and 297 deletions.
diff --git a/clients/python/poetry.lock b/clients/python/poetry.lock
diff --git a/clients/python/pyproject.toml b/clients/python/pyproject.toml
@@ -27,7 +27,7 @@ hf = ["huggingface-hub"]
 sphinx = "^7.2.6"
 furo = "^2023.9.10"
 myst-parser = { extras = ["linkify"], version = "^2.0.0" }
-pytest = "^7.4.2"
+pytest = ">=7.4.2,<9.0.0"
 coverage = { extras = ["toml"], version = "^7.3.2" }
 pytest-cov = "^4.1.0"
 sphinx-autobuild = "^2021.3.14"

diff --git a/internal/apiutils/api_utils.go b/internal/apiutils/api_utils.go
@@ -1,14 +1,15 @@
 package apiutils
 
 import (
+	"fmt"
+
 	"github.com/kubeflow/model-registry/internal/converter"
 	"github.com/kubeflow/model-registry/internal/ml_metadata/proto"
 	"github.com/kubeflow/model-registry/pkg/api"
 	model "github.com/kubeflow/model-registry/pkg/openapi"
 )
 
 func BuildListOperationOptions(listOptions api.ListOptions) (*proto.ListOperationOptions, error) {
-
 	result := proto.ListOperationOptions{}
 	if listOptions.PageSize != nil {
 		result.MaxResultSize = listOptions.PageSize
@@ -63,7 +64,7 @@ func BuildListOption(pageSize string, orderBy model.OrderByField, sortOrder mode
 	if pageSize != "" {
 		conv, err := converter.StringToInt32(pageSize)
 		if err != nil {
-			return api.ListOptions{}, err
+			return api.ListOptions{}, fmt.Errorf("%v: %w", err, api.ErrBadRequest)
 		}
 		pageSizeInt32 = &conv
 	}