diff --git a/.github/workflows/build-image-pr.yml b/.github/workflows/build-image-pr.yml index 1c3cc0033..71f3c0010 100644 --- a/.github/workflows/build-image-pr.yml +++ b/.github/workflows/build-image-pr.yml @@ -43,11 +43,11 @@ jobs: IMG: "quay.io/opendatahub/model-registry:${{ steps.tags.outputs.tag }}" run: | echo "Deploying operator from model-registry-operator branch ${BRANCH}" - kubectl apply -k "https://github.com/opendatahub-io/model-registry-operator.git/config/default?ref=${BRANCH}" + kubectl apply -k "https://github.com/kubeflow/model-registry-operator.git/config/default?ref=${BRANCH}" kubectl set env -n model-registry-operator-system deployment/model-registry-operator-controller-manager REST_IMAGE="${IMG}" - name: Create Test Registry run: | - kubectl apply -k "https://github.com/opendatahub-io/model-registry-operator.git/config/samples?ref=${BRANCH}" + kubectl apply -k "https://github.com/kubeflow/model-registry-operator.git/config/samples?ref=${BRANCH}" kubectl get mr - name: Wait for Test Registry Deployment run: | diff --git a/Makefile b/Makefile index 9147383f0..fe6c99339 100644 --- a/Makefile +++ b/Makefile @@ -37,19 +37,19 @@ api/grpc/ml_metadata/proto/metadata_source.proto: mkdir -p api/grpc/ml_metadata/proto/ cd api/grpc/ml_metadata/proto/ && \ curl -LO "https://raw.githubusercontent.com/google/ml-metadata/v${MLMD_VERSION}/ml_metadata/proto/metadata_source.proto" && \ - sed -i 's#syntax = "proto[23]";#&\noption go_package = "github.com/opendatahub-io/model-registry/internal/ml_metadata/proto";#' metadata_source.proto + sed -i 's#syntax = "proto[23]";#&\noption go_package = "github.com/kubeflow/model-registry/internal/ml_metadata/proto";#' metadata_source.proto api/grpc/ml_metadata/proto/metadata_store.proto: mkdir -p api/grpc/ml_metadata/proto/ cd api/grpc/ml_metadata/proto/ && \ curl -LO "https://raw.githubusercontent.com/google/ml-metadata/v${MLMD_VERSION}/ml_metadata/proto/metadata_store.proto" && \ - sed -i 's#syntax = "proto[23]";#&\noption go_package = "github.com/opendatahub-io/model-registry/internal/ml_metadata/proto";#' metadata_store.proto + sed -i 's#syntax = "proto[23]";#&\noption go_package = "github.com/kubeflow/model-registry/internal/ml_metadata/proto";#' metadata_store.proto api/grpc/ml_metadata/proto/metadata_store_service.proto: mkdir -p api/grpc/ml_metadata/proto/ cd api/grpc/ml_metadata/proto/ && \ curl -LO "https://raw.githubusercontent.com/google/ml-metadata/v${MLMD_VERSION}/ml_metadata/proto/metadata_store_service.proto" && \ - sed -i 's#syntax = "proto[23]";#&\noption go_package = "github.com/opendatahub-io/model-registry/internal/ml_metadata/proto";#' metadata_store_service.proto + sed -i 's#syntax = "proto[23]";#&\noption go_package = "github.com/kubeflow/model-registry/internal/ml_metadata/proto";#' metadata_store_service.proto internal/ml_metadata/proto/%.pb.go: api/grpc/ml_metadata/proto/%.proto protoc -I./api/grpc --go_out=./internal --go_opt=paths=source_relative \ @@ -59,7 +59,7 @@ internal/ml_metadata/proto/%.pb.go: api/grpc/ml_metadata/proto/%.proto gen/grpc: internal/ml_metadata/proto/metadata_store.pb.go internal/ml_metadata/proto/metadata_store_service.pb.go internal/converter/generated/converter.go: internal/converter/*.go - ${GOVERTER} gen github.com/opendatahub-io/model-registry/internal/converter/ + ${GOVERTER} gen github.com/kubeflow/model-registry/internal/converter/ .PHONY: gen/converter gen/converter: gen/grpc internal/converter/generated/converter.go diff --git a/README.md b/README.md index a37676c61..1d3d2686f 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ Model registry provides a central repository for model developers to store and m - Red Hat drives the project's development through Open Source principles, ensuring transparency, sustainability, and community ownership. - Red Hat values the Kubeflow community and commits to providing a minimum of 12 months' notice before ending project maintenance after the initial release. -![build checks status](https://github.com/opendatahub-io/model-registry/actions/workflows/build.yml/badge.svg?branch=main) -[![codecov](https://codecov.io/github/opendatahub-io/model-registry/graph/badge.svg?token=61URLQA3VS)](https://codecov.io/github/opendatahub-io/model-registry) +![build checks status](https://github.com/kubeflow/model-registry/actions/workflows/build.yml/badge.svg?branch=main) +[![codecov](https://codecov.io/github/kubeflow/model-registry/graph/badge.svg?token=61URLQA3VS)](https://codecov.io/github/kubeflow/model-registry) ## Pre-requisites: - go >= 1.19 @@ -19,7 +19,7 @@ Model registry provides a central repository for model developers to store and m The model registry proxy server implementation follows a contract-first approach, where the contract is identified by [model-registry.yaml](api/openapi/model-registry.yaml) OpenAPI specification. -You can also easily display the latest OpenAPI contract for model-registry in a Swagger-like editor directly from this repository; for example, [here](https://editor.swagger.io/?url=https://raw.githubusercontent.com/opendatahub-io/model-registry/main/api/openapi/model-registry.yaml). +You can also easily display the latest OpenAPI contract for model-registry in a Swagger-like editor directly from this repository; for example, [here](https://editor.swagger.io/?url=https://raw.githubusercontent.com/kubeflow/model-registry/main/api/openapi/model-registry.yaml). ### Starting the OpenAPI Proxy Server Run the following command to start the OpenAPI proxy server from source: diff --git a/api/grpc/ml_metadata/proto/metadata_store.proto b/api/grpc/ml_metadata/proto/metadata_store.proto index 8e59ff6c2..a3128e589 100644 --- a/api/grpc/ml_metadata/proto/metadata_store.proto +++ b/api/grpc/ml_metadata/proto/metadata_store.proto @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ syntax = "proto2"; -option go_package = "github.com/opendatahub-io/model-registry/internal/ml_metadata/proto"; +option go_package = "github.com/kubeflow/model-registry/internal/ml_metadata/proto"; package ml_metadata; diff --git a/api/grpc/ml_metadata/proto/metadata_store_service.proto b/api/grpc/ml_metadata/proto/metadata_store_service.proto index f4a169199..9c3b4ce3a 100644 --- a/api/grpc/ml_metadata/proto/metadata_store_service.proto +++ b/api/grpc/ml_metadata/proto/metadata_store_service.proto @@ -14,7 +14,7 @@ limitations under the License. ==============================================================================*/ syntax = "proto2"; -option go_package = "github.com/opendatahub-io/model-registry/internal/ml_metadata/proto"; +option go_package = "github.com/kubeflow/model-registry/internal/ml_metadata/proto"; package ml_metadata; diff --git a/clients/python/README.md b/clients/python/README.md index febca492e..e542e8e2f 100644 --- a/clients/python/README.md +++ b/clients/python/README.md @@ -1,6 +1,6 @@ # Model Registry Python Client -[![Python](https://img.shields.io/badge/python%20-3.9%7C3.10-blue)](https://github.com/opendatahub-io/model-registry) +[![Python](https://img.shields.io/badge/python%20-3.9%7C3.10-blue)](https://github.com/kubeflow/model-registry) [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](../../../LICENSE) This library provides a high level interface for interacting with a model registry server. @@ -85,7 +85,7 @@ Use `nox -l` to list sessions and execute them using `nox -s [session]`. ### Running Locally on Mac M1 or M2 (arm64 architecture) -If you want run tests locally you will need to set up a colima develeopment environment using the instructions [here](https://github.com/opendatahub-io/model-registry/blob/main/CONTRIBUTING.md#colima) +If you want run tests locally you will need to set up a colima develeopment environment using the instructions [here](https://github.com/kubeflow/model-registry/blob/main/CONTRIBUTING.md#colima) You will also have to change the package source to one compatible with ARM64 architecture. This can be actioned by uncommenting lines 14 or 15 in the pyproject.toml file. Run the following command after you have uncommented the line. diff --git a/clients/python/pyproject.toml b/clients/python/pyproject.toml index 56988c693..98e54843e 100644 --- a/clients/python/pyproject.toml +++ b/clients/python/pyproject.toml @@ -5,10 +5,10 @@ description = "Client for Red Hat OpenDataHub Model Registry" authors = ["Isabella Basso do Amaral "] license = "Apache-2.0" readme = "README.md" -homepage = "https://github.com/opendatahub-io/model-registry" +homepage = "https://github.com/kubeflow/model-registry" [tool.poetry.urls] -"Issues" = "https://github.com/opendatahub-io/model-registry/issues" +"Issues" = "https://github.com/kubeflow/model-registry/issues" [tool.poetry.dependencies] python = ">= 3.9, < 3.11" diff --git a/cmd/proxy.go b/cmd/proxy.go index f3ef67932..f69d16b96 100644 --- a/cmd/proxy.go +++ b/cmd/proxy.go @@ -7,9 +7,9 @@ import ( "time" "github.com/golang/glog" - "github.com/opendatahub-io/model-registry/internal/mlmdtypes" - "github.com/opendatahub-io/model-registry/internal/server/openapi" - "github.com/opendatahub-io/model-registry/pkg/core" + "github.com/kubeflow/model-registry/internal/mlmdtypes" + "github.com/kubeflow/model-registry/internal/server/openapi" + "github.com/kubeflow/model-registry/pkg/core" "github.com/spf13/cobra" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/docs/mr_go_library.md b/docs/mr_go_library.md index 1754eec62..3f57cdee2 100644 --- a/docs/mr_go_library.md +++ b/docs/mr_go_library.md @@ -6,7 +6,7 @@ The Model Registry Service go library provides a convenient interface for managi The recommended way is using `go get`, from your custom project run: ```bash -go get github.com/opendatahub-io/model-registry +go get github.com/kubeflow/model-registry ``` ## Getting Started @@ -50,7 +50,7 @@ Once the gRPC connection is setup, let's create the `ModelRegistryService`: ```go import ( "fmt" - "github.com/opendatahub-io/model-registry/pkg/core" + "github.com/kubeflow/model-registry/pkg/core" ) service, err := core.NewModelRegistryService(conn) diff --git a/docs/remote_only_packaging_of_MLMD_Python_lib.md b/docs/remote_only_packaging_of_MLMD_Python_lib.md index 57bd0c655..4c7dab38b 100644 --- a/docs/remote_only_packaging_of_MLMD_Python_lib.md +++ b/docs/remote_only_packaging_of_MLMD_Python_lib.md @@ -9,7 +9,7 @@ whilst also making it [architecture specific](https://pypi.org/project/ml-metada The [Model Registry project](https://docs.google.com/document/d/1G-pjdGaS2kLELsB5kYk_D4AmH-fTfnCnJOhJ8xENjx0/edit?usp=sharing) (MR) is built on top of MLMD. The Go implementation interfaces with the MLMD server via gRPC, typically available as a Docker container. -The [MR Python client](https://github.com/opendatahub-io/model-registry/tree/main/clients/python#readme) wraps the MLMD client. +The [MR Python client](https://github.com/kubeflow/model-registry/tree/main/clients/python#readme) wraps the MLMD client. As the MLMD client is architecture specific, so is the MR Python client, which **severely limits the targets it can run on**, as it only supports x86-64. This **poses many challenges to contributors** using other CPU architectures, specially ARM, as that's become more prevalent in recent years. @@ -97,7 +97,7 @@ Cons: ### Packaging Option2: mix resulting artifact inside Model Registry repo -This delivery option considers placing the resulting artifact by executing the exercise from the alternative selected above and placing it directly inside the Model Registry repo, with the python client source [location](https://github.com/opendatahub-io/model-registry/tree/main/clients/python). (for analogy, this is similar to “shading”/”uberjar” in Java world for those familiar with the concept) +This delivery option considers placing the resulting artifact by executing the exercise from the alternative selected above and placing it directly inside the Model Registry repo, with the python client source [location](https://github.com/kubeflow/model-registry/tree/main/clients/python). (for analogy, this is similar to “shading”/”uberjar” in Java world for those familiar with the concept) Pros: @@ -117,10 +117,10 @@ Based on analysis of the alternatives provided, we decided to further pursue: - the repackaging by **Alternative B** because makes it actually easier to demonstrate the steps and modifications required using as baseline the upstream repo. - the distribution by **Packaging Option1** because it will make it easier to "revert" to the upstream `ml-metadata` dependency if upstream will publish for all architectures, OSes, etc. and as the pros outweight considered cons. -MR python client [tests](https://github.com/opendatahub-io/model-registry/blob/259b39320953bf05942dcec1fb5ec74f7eb5d4a7/clients/python/tests/conftest.py#L19) should be rewritten using Testcontainers, and not leveraging the embedded server (already done with [this PR](https://github.com/opendatahub-io/model-registry/pull/225)). +MR python client [tests](https://github.com/kubeflow/model-registry/blob/259b39320953bf05942dcec1fb5ec74f7eb5d4a7/clients/python/tests/conftest.py#L19) should be rewritten using Testcontainers, and not leveraging the embedded server (already done with [this PR](https://github.com/kubeflow/model-registry/pull/225)). The group concur this is a sensible approach ([recorded here](https://redhat-internal.slack.com/archives/C05LGBNUK9C/p1700763823505259?thread_ts=1700427888.670999&cid=C05LGBNUK9C)). -This change would also better align the test approach used for the MR python client, by aligning with the same strategy of the MR core Go layer test framework, which already makes use of Testcontainers for Go ([reference](https://github.com/opendatahub-io/model-registry/blob/259b39320953bf05942dcec1fb5ec74f7eb5d4a7/internal/testutils/test_container_utils.go#L59)). +This change would also better align the test approach used for the MR python client, by aligning with the same strategy of the MR core Go layer test framework, which already makes use of Testcontainers for Go ([reference](https://github.com/kubeflow/model-registry/blob/259b39320953bf05942dcec1fb5ec74f7eb5d4a7/internal/testutils/test_container_utils.go#L59)). This would allow to update the constraint on the version for the `attrs` dependency as part of this activity. diff --git a/go.mod b/go.mod index f25c4fd5e..cc48d920c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/opendatahub-io/model-registry +module github.com/kubeflow/model-registry go 1.19 diff --git a/internal/apiutils/api_utils.go b/internal/apiutils/api_utils.go index ac28515c0..6c5a10dac 100644 --- a/internal/apiutils/api_utils.go +++ b/internal/apiutils/api_utils.go @@ -1,10 +1,10 @@ package apiutils import ( - "github.com/opendatahub-io/model-registry/internal/converter" - "github.com/opendatahub-io/model-registry/internal/ml_metadata/proto" - "github.com/opendatahub-io/model-registry/pkg/api" - model "github.com/opendatahub-io/model-registry/pkg/openapi" + "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) { diff --git a/internal/converter/generated/mlmd_openapi_converter.gen.go b/internal/converter/generated/mlmd_openapi_converter.gen.go index 92ab100f9..d90e62668 100755 --- a/internal/converter/generated/mlmd_openapi_converter.gen.go +++ b/internal/converter/generated/mlmd_openapi_converter.gen.go @@ -4,9 +4,9 @@ package generated import ( "fmt" - converter "github.com/opendatahub-io/model-registry/internal/converter" - proto "github.com/opendatahub-io/model-registry/internal/ml_metadata/proto" - openapi "github.com/opendatahub-io/model-registry/pkg/openapi" + converter "github.com/kubeflow/model-registry/internal/converter" + proto "github.com/kubeflow/model-registry/internal/ml_metadata/proto" + openapi "github.com/kubeflow/model-registry/pkg/openapi" ) type MLMDToOpenAPIConverterImpl struct{} diff --git a/internal/converter/generated/openapi_converter.gen.go b/internal/converter/generated/openapi_converter.gen.go index 96cccad65..eaa00c46e 100755 --- a/internal/converter/generated/openapi_converter.gen.go +++ b/internal/converter/generated/openapi_converter.gen.go @@ -3,8 +3,8 @@ package generated import ( - converter "github.com/opendatahub-io/model-registry/internal/converter" - openapi "github.com/opendatahub-io/model-registry/pkg/openapi" + converter "github.com/kubeflow/model-registry/internal/converter" + openapi "github.com/kubeflow/model-registry/pkg/openapi" ) type OpenAPIConverterImpl struct{} diff --git a/internal/converter/generated/openapi_mlmd_converter.gen.go b/internal/converter/generated/openapi_mlmd_converter.gen.go index 5badda5fb..ac3ae2f6d 100755 --- a/internal/converter/generated/openapi_mlmd_converter.gen.go +++ b/internal/converter/generated/openapi_mlmd_converter.gen.go @@ -4,9 +4,9 @@ package generated import ( "fmt" - converter "github.com/opendatahub-io/model-registry/internal/converter" - proto "github.com/opendatahub-io/model-registry/internal/ml_metadata/proto" - openapi "github.com/opendatahub-io/model-registry/pkg/openapi" + converter "github.com/kubeflow/model-registry/internal/converter" + proto "github.com/kubeflow/model-registry/internal/ml_metadata/proto" + openapi "github.com/kubeflow/model-registry/pkg/openapi" ) type OpenAPIToMLMDConverterImpl struct{} diff --git a/internal/converter/mlmd_converter_util_test.go b/internal/converter/mlmd_converter_util_test.go index 27ac3d81b..5eddc08aa 100644 --- a/internal/converter/mlmd_converter_util_test.go +++ b/internal/converter/mlmd_converter_util_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "github.com/opendatahub-io/model-registry/internal/constants" - "github.com/opendatahub-io/model-registry/internal/ml_metadata/proto" - "github.com/opendatahub-io/model-registry/pkg/openapi" + "github.com/kubeflow/model-registry/internal/constants" + "github.com/kubeflow/model-registry/internal/ml_metadata/proto" + "github.com/kubeflow/model-registry/pkg/openapi" "github.com/stretchr/testify/assert" "golang.org/x/exp/maps" ) diff --git a/internal/converter/mlmd_openapi_converter.go b/internal/converter/mlmd_openapi_converter.go index 993ba5856..92bb45163 100644 --- a/internal/converter/mlmd_openapi_converter.go +++ b/internal/converter/mlmd_openapi_converter.go @@ -1,8 +1,8 @@ package converter import ( - "github.com/opendatahub-io/model-registry/internal/ml_metadata/proto" - "github.com/opendatahub-io/model-registry/pkg/openapi" + "github.com/kubeflow/model-registry/internal/ml_metadata/proto" + "github.com/kubeflow/model-registry/pkg/openapi" ) // goverter:converter diff --git a/internal/converter/mlmd_openapi_converter_util.go b/internal/converter/mlmd_openapi_converter_util.go index b6bb863a6..4dec4f502 100644 --- a/internal/converter/mlmd_openapi_converter_util.go +++ b/internal/converter/mlmd_openapi_converter_util.go @@ -6,9 +6,9 @@ import ( "fmt" "strings" - "github.com/opendatahub-io/model-registry/internal/constants" - "github.com/opendatahub-io/model-registry/internal/ml_metadata/proto" - "github.com/opendatahub-io/model-registry/pkg/openapi" + "github.com/kubeflow/model-registry/internal/constants" + "github.com/kubeflow/model-registry/internal/ml_metadata/proto" + "github.com/kubeflow/model-registry/pkg/openapi" ) // MapMLMDCustomProperties maps MLMD custom properties model to OpenAPI one diff --git a/internal/converter/openapi_converter.go b/internal/converter/openapi_converter.go index eb7486be0..638b3a168 100644 --- a/internal/converter/openapi_converter.go +++ b/internal/converter/openapi_converter.go @@ -1,6 +1,6 @@ package converter -import "github.com/opendatahub-io/model-registry/pkg/openapi" +import "github.com/kubeflow/model-registry/pkg/openapi" // NOTE: methods must follow these patterns, otherwise tests could not find possible issues: // Converters createEntity to entity: ConvertCreate diff --git a/internal/converter/openapi_converter_test.go b/internal/converter/openapi_converter_test.go index 8b571f410..4c33c27ed 100644 --- a/internal/converter/openapi_converter_test.go +++ b/internal/converter/openapi_converter_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - "github.com/opendatahub-io/model-registry/pkg/openapi" + "github.com/kubeflow/model-registry/pkg/openapi" ) // visitor diff --git a/internal/converter/openapi_converter_util.go b/internal/converter/openapi_converter_util.go index 3a492fd70..a0efb5cb0 100644 --- a/internal/converter/openapi_converter_util.go +++ b/internal/converter/openapi_converter_util.go @@ -1,6 +1,6 @@ package converter -import "github.com/opendatahub-io/model-registry/pkg/openapi" +import "github.com/kubeflow/model-registry/pkg/openapi" type OpenAPIModel interface { openapi.RegisteredModel | diff --git a/internal/converter/openapi_mlmd_converter.go b/internal/converter/openapi_mlmd_converter.go index 521e2c6c4..ccf56fbe3 100644 --- a/internal/converter/openapi_mlmd_converter.go +++ b/internal/converter/openapi_mlmd_converter.go @@ -1,8 +1,8 @@ package converter import ( - "github.com/opendatahub-io/model-registry/internal/ml_metadata/proto" - "github.com/opendatahub-io/model-registry/pkg/openapi" + "github.com/kubeflow/model-registry/internal/ml_metadata/proto" + "github.com/kubeflow/model-registry/pkg/openapi" ) type OpenAPIModelWrapper[ diff --git a/internal/converter/openapi_mlmd_converter_util.go b/internal/converter/openapi_mlmd_converter_util.go index de5214246..5f730ea97 100644 --- a/internal/converter/openapi_mlmd_converter_util.go +++ b/internal/converter/openapi_mlmd_converter_util.go @@ -7,9 +7,9 @@ import ( "strconv" "github.com/google/uuid" - "github.com/opendatahub-io/model-registry/internal/constants" - "github.com/opendatahub-io/model-registry/internal/ml_metadata/proto" - "github.com/opendatahub-io/model-registry/pkg/openapi" + "github.com/kubeflow/model-registry/internal/constants" + "github.com/kubeflow/model-registry/internal/ml_metadata/proto" + "github.com/kubeflow/model-registry/pkg/openapi" "google.golang.org/protobuf/types/known/structpb" ) diff --git a/internal/mapper/mapper.go b/internal/mapper/mapper.go index 271ea7438..201f48192 100644 --- a/internal/mapper/mapper.go +++ b/internal/mapper/mapper.go @@ -3,11 +3,11 @@ package mapper import ( "fmt" - "github.com/opendatahub-io/model-registry/internal/constants" - "github.com/opendatahub-io/model-registry/internal/converter" - "github.com/opendatahub-io/model-registry/internal/converter/generated" - "github.com/opendatahub-io/model-registry/internal/ml_metadata/proto" - "github.com/opendatahub-io/model-registry/pkg/openapi" + "github.com/kubeflow/model-registry/internal/constants" + "github.com/kubeflow/model-registry/internal/converter" + "github.com/kubeflow/model-registry/internal/converter/generated" + "github.com/kubeflow/model-registry/internal/ml_metadata/proto" + "github.com/kubeflow/model-registry/pkg/openapi" ) type Mapper struct { diff --git a/internal/mapper/mapper_test.go b/internal/mapper/mapper_test.go index 7ad7b98a3..8f5667c3e 100644 --- a/internal/mapper/mapper_test.go +++ b/internal/mapper/mapper_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/opendatahub-io/model-registry/internal/constants" - "github.com/opendatahub-io/model-registry/internal/ml_metadata/proto" - "github.com/opendatahub-io/model-registry/pkg/openapi" + "github.com/kubeflow/model-registry/internal/constants" + "github.com/kubeflow/model-registry/internal/ml_metadata/proto" + "github.com/kubeflow/model-registry/pkg/openapi" "github.com/stretchr/testify/assert" ) diff --git a/internal/ml_metadata/proto/metadata_store.pb.go b/internal/ml_metadata/proto/metadata_store.pb.go index b616143bb..e24a427de 100644 --- a/internal/ml_metadata/proto/metadata_store.pb.go +++ b/internal/ml_metadata/proto/metadata_store.pb.go @@ -5662,12 +5662,11 @@ var file_ml_metadata_proto_metadata_store_proto_rawDesc = []byte{ 0xb7, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6d, 0x6c, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, - 0x54, 0x79, 0x70, 0x65, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x45, 0x5a, - 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x70, 0x65, 0x6e, - 0x64, 0x61, 0x74, 0x61, 0x68, 0x75, 0x62, 0x2d, 0x69, 0x6f, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x2d, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, - 0x61, 0x6c, 0x2f, 0x6d, 0x6c, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x70, - 0x72, 0x6f, 0x74, 0x6f, + 0x54, 0x79, 0x70, 0x65, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x3f, 0x5a, + 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65, + 0x66, 0x6c, 0x6f, 0x77, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x2d, 0x72, 0x65, 0x67, 0x69, 0x73, + 0x74, 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x6d, 0x6c, 0x5f, + 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, } var ( diff --git a/internal/ml_metadata/proto/metadata_store_service.pb.go b/internal/ml_metadata/proto/metadata_store_service.pb.go index 7a88900c2..aeada4ada 100644 --- a/internal/ml_metadata/proto/metadata_store_service.pb.go +++ b/internal/ml_metadata/proto/metadata_store_service.pb.go @@ -8399,11 +8399,11 @@ var file_ml_metadata_proto_metadata_store_service_proto_rawDesc = []byte{ 0x70, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x6d, 0x6c, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x6e, 0x65, 0x61, 0x67, 0x65, 0x53, 0x75, 0x62, 0x67, 0x72, 0x61, 0x70, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x22, 0x00, 0x42, 0x45, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, - 0x6f, 0x6d, 0x2f, 0x6f, 0x70, 0x65, 0x6e, 0x64, 0x61, 0x74, 0x61, 0x68, 0x75, 0x62, 0x2d, 0x69, - 0x6f, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x2d, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, - 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x6d, 0x6c, 0x5f, 0x6d, 0x65, 0x74, - 0x61, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x73, 0x65, 0x22, 0x00, 0x42, 0x3f, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x66, 0x6c, 0x6f, 0x77, 0x2f, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x2d, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, + 0x6e, 0x61, 0x6c, 0x2f, 0x6d, 0x6c, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2f, + 0x70, 0x72, 0x6f, 0x74, 0x6f, } var ( diff --git a/internal/mlmdtypes/mlmdtypes.go b/internal/mlmdtypes/mlmdtypes.go index 7d6b4220f..4a3af7e8d 100644 --- a/internal/mlmdtypes/mlmdtypes.go +++ b/internal/mlmdtypes/mlmdtypes.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/opendatahub-io/model-registry/internal/apiutils" - "github.com/opendatahub-io/model-registry/internal/constants" - "github.com/opendatahub-io/model-registry/internal/ml_metadata/proto" + "github.com/kubeflow/model-registry/internal/apiutils" + "github.com/kubeflow/model-registry/internal/constants" + "github.com/kubeflow/model-registry/internal/ml_metadata/proto" "google.golang.org/grpc" ) diff --git a/internal/server/openapi/api.go b/internal/server/openapi/api.go index e8212f8f7..079d32df7 100644 --- a/internal/server/openapi/api.go +++ b/internal/server/openapi/api.go @@ -13,7 +13,7 @@ import ( "context" "net/http" - model "github.com/opendatahub-io/model-registry/pkg/openapi" + model "github.com/kubeflow/model-registry/pkg/openapi" ) // ModelRegistryServiceAPIRouter defines the required methods for binding the api requests to a responses for the ModelRegistryServiceAPI diff --git a/internal/server/openapi/api_model_registry_service.go b/internal/server/openapi/api_model_registry_service.go index 6fb7ebee0..ae8c15f7b 100644 --- a/internal/server/openapi/api_model_registry_service.go +++ b/internal/server/openapi/api_model_registry_service.go @@ -16,7 +16,7 @@ import ( "github.com/go-chi/chi/v5" - model "github.com/opendatahub-io/model-registry/pkg/openapi" + model "github.com/kubeflow/model-registry/pkg/openapi" ) // ModelRegistryServiceAPIController binds http requests to an api service and writes the service results to the http response diff --git a/internal/server/openapi/api_model_registry_service_service.go b/internal/server/openapi/api_model_registry_service_service.go index 51713d5d6..03bf20084 100644 --- a/internal/server/openapi/api_model_registry_service_service.go +++ b/internal/server/openapi/api_model_registry_service_service.go @@ -12,11 +12,11 @@ package openapi import ( "context" - "github.com/opendatahub-io/model-registry/internal/apiutils" - "github.com/opendatahub-io/model-registry/internal/converter" - "github.com/opendatahub-io/model-registry/internal/converter/generated" - "github.com/opendatahub-io/model-registry/pkg/api" - model "github.com/opendatahub-io/model-registry/pkg/openapi" + "github.com/kubeflow/model-registry/internal/apiutils" + "github.com/kubeflow/model-registry/internal/converter" + "github.com/kubeflow/model-registry/internal/converter/generated" + "github.com/kubeflow/model-registry/pkg/api" + model "github.com/kubeflow/model-registry/pkg/openapi" ) // ModelRegistryServiceAPIService is a service that implements the logic for the ModelRegistryServiceAPIServicer diff --git a/internal/server/openapi/type_asserts.go b/internal/server/openapi/type_asserts.go index 6d08bbb2c..80ad5e98b 100644 --- a/internal/server/openapi/type_asserts.go +++ b/internal/server/openapi/type_asserts.go @@ -13,7 +13,7 @@ package openapi import ( - model "github.com/opendatahub-io/model-registry/pkg/openapi" + model "github.com/kubeflow/model-registry/pkg/openapi" ) // AssertArtifactRequired checks if the required fields are not zero-ed diff --git a/internal/testutils/test_container_utils.go b/internal/testutils/test_container_utils.go index 426715502..128435a33 100644 --- a/internal/testutils/test_container_utils.go +++ b/internal/testutils/test_container_utils.go @@ -7,7 +7,7 @@ import ( "os" "testing" - "github.com/opendatahub-io/model-registry/internal/ml_metadata/proto" + "github.com/kubeflow/model-registry/internal/ml_metadata/proto" "github.com/testcontainers/testcontainers-go" "github.com/testcontainers/testcontainers-go/wait" "google.golang.org/grpc" diff --git a/main.go b/main.go index bccdb30f2..b83960ca1 100644 --- a/main.go +++ b/main.go @@ -2,7 +2,7 @@ package main import ( "github.com/golang/glog" - "github.com/opendatahub-io/model-registry/cmd" + "github.com/kubeflow/model-registry/cmd" "log" "net/http" _ "net/http/pprof" diff --git a/pkg/api/api.go b/pkg/api/api.go index 33f16540b..14e14cb94 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -1,6 +1,6 @@ package api -import "github.com/opendatahub-io/model-registry/pkg/openapi" +import "github.com/kubeflow/model-registry/pkg/openapi" // ListOptions provides options for listing entities with pagination and sorting. // It includes parameters such as PageSize, OrderBy, SortOrder, and NextPageToken. diff --git a/pkg/core/core.go b/pkg/core/core.go index d812130e7..accc2a3d3 100644 --- a/pkg/core/core.go +++ b/pkg/core/core.go @@ -6,14 +6,14 @@ import ( "strings" "github.com/golang/glog" - "github.com/opendatahub-io/model-registry/internal/apiutils" - "github.com/opendatahub-io/model-registry/internal/constants" - "github.com/opendatahub-io/model-registry/internal/converter" - "github.com/opendatahub-io/model-registry/internal/converter/generated" - "github.com/opendatahub-io/model-registry/internal/mapper" - "github.com/opendatahub-io/model-registry/internal/ml_metadata/proto" - "github.com/opendatahub-io/model-registry/pkg/api" - "github.com/opendatahub-io/model-registry/pkg/openapi" + "github.com/kubeflow/model-registry/internal/apiutils" + "github.com/kubeflow/model-registry/internal/constants" + "github.com/kubeflow/model-registry/internal/converter" + "github.com/kubeflow/model-registry/internal/converter/generated" + "github.com/kubeflow/model-registry/internal/mapper" + "github.com/kubeflow/model-registry/internal/ml_metadata/proto" + "github.com/kubeflow/model-registry/pkg/api" + "github.com/kubeflow/model-registry/pkg/openapi" "google.golang.org/grpc" ) diff --git a/pkg/core/core_test.go b/pkg/core/core_test.go index a031c541c..9c269bc3b 100644 --- a/pkg/core/core_test.go +++ b/pkg/core/core_test.go @@ -5,13 +5,13 @@ import ( "fmt" "testing" - "github.com/opendatahub-io/model-registry/internal/apiutils" - "github.com/opendatahub-io/model-registry/internal/converter" - "github.com/opendatahub-io/model-registry/internal/ml_metadata/proto" - "github.com/opendatahub-io/model-registry/internal/mlmdtypes" - "github.com/opendatahub-io/model-registry/internal/testutils" - "github.com/opendatahub-io/model-registry/pkg/api" - "github.com/opendatahub-io/model-registry/pkg/openapi" + "github.com/kubeflow/model-registry/internal/apiutils" + "github.com/kubeflow/model-registry/internal/converter" + "github.com/kubeflow/model-registry/internal/ml_metadata/proto" + "github.com/kubeflow/model-registry/internal/mlmdtypes" + "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/model-registry/pkg/api" + "github.com/kubeflow/model-registry/pkg/openapi" "github.com/stretchr/testify/suite" "google.golang.org/grpc" ) diff --git a/scripts/gen_type_asserts.sh b/scripts/gen_type_asserts.sh index 27808c3a2..bb2e0fddd 100755 --- a/scripts/gen_type_asserts.sh +++ b/scripts/gen_type_asserts.sh @@ -29,7 +29,7 @@ INITIAL_CONTENT=$(cat <