diff --git a/Makefile b/Makefile index 7a378b0f2e..9826c94087 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,7 @@ endif model-registry: build internal/converter/generated/converter.go: internal/converter/*.go - ${GOVERTER} gen github.com/kubeflow/model-registry/internal/converter/ + ${GOVERTER} gen github.com/kubeflow/hub/internal/converter/ .PHONY: gen/converter gen/converter: internal/converter/generated/converter.go @@ -237,7 +237,7 @@ build/prepare: gen vet lint # WARNING: DO NOT DELETE THIS TARGET, USED BY Dockerfile!!! .PHONY: build/compile build/compile: - ${GO} build -buildvcs=false + ${GO} build -buildvcs=false -o model-registry # WARNING: DO NOT EDIT THIS TARGET DIRECTLY!!! # Use build/prepare to add build prerequisites diff --git a/catalog/cmd/catalog.go b/catalog/cmd/catalog.go index f7868c1c37..cf265bdf96 100644 --- a/catalog/cmd/catalog.go +++ b/catalog/cmd/catalog.go @@ -12,16 +12,16 @@ import ( "time" "github.com/golang/glog" - "github.com/kubeflow/model-registry/catalog/internal/catalog" - mcpcatalogmodels "github.com/kubeflow/model-registry/catalog/internal/catalog/mcpcatalog/models" - modelcatalogmodels "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/models" - "github.com/kubeflow/model-registry/catalog/internal/db/models" - "github.com/kubeflow/model-registry/catalog/internal/db/service" - "github.com/kubeflow/model-registry/catalog/internal/leader" - "github.com/kubeflow/model-registry/catalog/internal/server/openapi" - "github.com/kubeflow/model-registry/internal/datastore" - "github.com/kubeflow/model-registry/internal/datastore/embedmd" - "github.com/kubeflow/model-registry/internal/db" + "github.com/kubeflow/hub/catalog/internal/catalog" + mcpcatalogmodels "github.com/kubeflow/hub/catalog/internal/catalog/mcpcatalog/models" + modelcatalogmodels "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/models" + "github.com/kubeflow/hub/catalog/internal/db/models" + "github.com/kubeflow/hub/catalog/internal/db/service" + "github.com/kubeflow/hub/catalog/internal/leader" + "github.com/kubeflow/hub/catalog/internal/server/openapi" + "github.com/kubeflow/hub/internal/datastore" + "github.com/kubeflow/hub/internal/datastore/embedmd" + "github.com/kubeflow/hub/internal/db" "github.com/spf13/cobra" "golang.org/x/sync/errgroup" ) diff --git a/catalog/internal/catalog/basecatalog/common_properties.go b/catalog/internal/catalog/basecatalog/common_properties.go index df56d496a5..4b5f9b44ca 100644 --- a/catalog/internal/catalog/basecatalog/common_properties.go +++ b/catalog/internal/catalog/basecatalog/common_properties.go @@ -3,7 +3,7 @@ package basecatalog import ( "maps" - "github.com/kubeflow/model-registry/internal/db/filter" + "github.com/kubeflow/hub/internal/db/filter" ) // CommonContextProperties returns the entity-table properties shared by all Context entities. diff --git a/catalog/internal/catalog/basecatalog/config_test.go b/catalog/internal/catalog/basecatalog/config_test.go index 61ed6e4f3e..4248ad5807 100644 --- a/catalog/internal/catalog/basecatalog/config_test.go +++ b/catalog/internal/catalog/basecatalog/config_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - apimodels "github.com/kubeflow/model-registry/catalog/pkg/openapi" + apimodels "github.com/kubeflow/hub/catalog/pkg/openapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/catalog/internal/catalog/basecatalog/entity_registry.go b/catalog/internal/catalog/basecatalog/entity_registry.go index 8338e52c4a..edf5ef708c 100644 --- a/catalog/internal/catalog/basecatalog/entity_registry.go +++ b/catalog/internal/catalog/basecatalog/entity_registry.go @@ -4,7 +4,7 @@ import ( "strings" "sync" - "github.com/kubeflow/model-registry/internal/db/filter" + "github.com/kubeflow/hub/internal/db/filter" ) // EntityTypeDefinition describes a single catalog entity type's filtering behavior. diff --git a/catalog/internal/catalog/basecatalog/entity_registry_test.go b/catalog/internal/catalog/basecatalog/entity_registry_test.go index e34c9f3691..d7064201c1 100644 --- a/catalog/internal/catalog/basecatalog/entity_registry_test.go +++ b/catalog/internal/catalog/basecatalog/entity_registry_test.go @@ -3,7 +3,7 @@ package basecatalog import ( "testing" - "github.com/kubeflow/model-registry/internal/db/filter" + "github.com/kubeflow/hub/internal/db/filter" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/catalog/internal/catalog/basecatalog/filter_options.go b/catalog/internal/catalog/basecatalog/filter_options.go index a71d8ab660..99cace04b9 100644 --- a/catalog/internal/catalog/basecatalog/filter_options.go +++ b/catalog/internal/catalog/basecatalog/filter_options.go @@ -3,9 +3,9 @@ package basecatalog import ( "sort" - sharedmodels "github.com/kubeflow/model-registry/catalog/internal/db/models" - apimodels "github.com/kubeflow/model-registry/catalog/pkg/openapi" - "github.com/kubeflow/model-registry/internal/apiutils" + sharedmodels "github.com/kubeflow/hub/catalog/internal/db/models" + apimodels "github.com/kubeflow/hub/catalog/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" ) // DbPropToAPIOption converts a database PropertyOption to an API FilterOption. diff --git a/catalog/internal/catalog/basecatalog/source_status.go b/catalog/internal/catalog/basecatalog/source_status.go index b254579102..cd3f7431c8 100644 --- a/catalog/internal/catalog/basecatalog/source_status.go +++ b/catalog/internal/catalog/basecatalog/source_status.go @@ -5,8 +5,8 @@ import ( mapset "github.com/deckarep/golang-set/v2" "github.com/golang/glog" - dbmodels "github.com/kubeflow/model-registry/catalog/internal/db/models" - mrmodels "github.com/kubeflow/model-registry/internal/db/models" + dbmodels "github.com/kubeflow/hub/catalog/internal/db/models" + mrmodels "github.com/kubeflow/hub/internal/db/models" ) // CleanupOrphanedCatalogSources removes CatalogSource records for sources that are no diff --git a/catalog/internal/catalog/basecatalog/source_types.go b/catalog/internal/catalog/basecatalog/source_types.go index 940f9b6b50..e24e52980b 100644 --- a/catalog/internal/catalog/basecatalog/source_types.go +++ b/catalog/internal/catalog/basecatalog/source_types.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - apimodels "github.com/kubeflow/model-registry/catalog/pkg/openapi" + apimodels "github.com/kubeflow/hub/catalog/pkg/openapi" ) // Source status constants matching the OpenAPI enum values. diff --git a/catalog/internal/catalog/catalog.go b/catalog/internal/catalog/catalog.go index c651504487..770bfd072f 100644 --- a/catalog/internal/catalog/catalog.go +++ b/catalog/internal/catalog/catalog.go @@ -1,9 +1,9 @@ package catalog import ( - "github.com/kubeflow/model-registry/catalog/internal/catalog/basecatalog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/mcpcatalog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog" + "github.com/kubeflow/hub/catalog/internal/catalog/basecatalog" + "github.com/kubeflow/hub/catalog/internal/catalog/mcpcatalog" + "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog" ) type ( diff --git a/catalog/internal/catalog/loader.go b/catalog/internal/catalog/loader.go index 959e52ec37..04c74cfb0f 100644 --- a/catalog/internal/catalog/loader.go +++ b/catalog/internal/catalog/loader.go @@ -7,10 +7,10 @@ import ( mapset "github.com/deckarep/golang-set/v2" "github.com/golang/glog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/basecatalog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/mcpcatalog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog" - "github.com/kubeflow/model-registry/catalog/internal/db/service" + "github.com/kubeflow/hub/catalog/internal/catalog/basecatalog" + "github.com/kubeflow/hub/catalog/internal/catalog/mcpcatalog" + "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog" + "github.com/kubeflow/hub/catalog/internal/db/service" ) // Loader is the unified catalog loader that handles both model catalogs diff --git a/catalog/internal/catalog/mcpcatalog/api.go b/catalog/internal/catalog/mcpcatalog/api.go index 0911ffb9b2..657ee06fc4 100644 --- a/catalog/internal/catalog/mcpcatalog/api.go +++ b/catalog/internal/catalog/mcpcatalog/api.go @@ -3,7 +3,7 @@ package mcpcatalog import ( "context" - openapi "github.com/kubeflow/model-registry/catalog/pkg/openapi" + openapi "github.com/kubeflow/hub/catalog/pkg/openapi" ) type ListMCPServersParams struct { diff --git a/catalog/internal/catalog/mcpcatalog/db_mcp.go b/catalog/internal/catalog/mcpcatalog/db_mcp.go index 27829bee9c..c091424a84 100644 --- a/catalog/internal/catalog/mcpcatalog/db_mcp.go +++ b/catalog/internal/catalog/mcpcatalog/db_mcp.go @@ -5,14 +5,14 @@ import ( "fmt" "strings" - "github.com/kubeflow/model-registry/catalog/internal/catalog/basecatalog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/mcpcatalog/models" - "github.com/kubeflow/model-registry/catalog/internal/converter" - sharedmodels "github.com/kubeflow/model-registry/catalog/internal/db/models" - "github.com/kubeflow/model-registry/catalog/internal/db/service" - openapi "github.com/kubeflow/model-registry/catalog/pkg/openapi" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/pkg/api" + "github.com/kubeflow/hub/catalog/internal/catalog/basecatalog" + "github.com/kubeflow/hub/catalog/internal/catalog/mcpcatalog/models" + "github.com/kubeflow/hub/catalog/internal/converter" + sharedmodels "github.com/kubeflow/hub/catalog/internal/db/models" + "github.com/kubeflow/hub/catalog/internal/db/service" + openapi "github.com/kubeflow/hub/catalog/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/pkg/api" ) // NamedQueryResolver resolves a named query name to its field filters. diff --git a/catalog/internal/catalog/mcpcatalog/db_mcp_test.go b/catalog/internal/catalog/mcpcatalog/db_mcp_test.go index 51f9e26ebd..a540557e9b 100644 --- a/catalog/internal/catalog/mcpcatalog/db_mcp_test.go +++ b/catalog/internal/catalog/mcpcatalog/db_mcp_test.go @@ -5,11 +5,11 @@ import ( "errors" "testing" - "github.com/kubeflow/model-registry/catalog/internal/catalog/basecatalog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/mcpcatalog/models" - sharedmodels "github.com/kubeflow/model-registry/catalog/internal/db/models" - internalmodels "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/pkg/api" + "github.com/kubeflow/hub/catalog/internal/catalog/basecatalog" + "github.com/kubeflow/hub/catalog/internal/catalog/mcpcatalog/models" + sharedmodels "github.com/kubeflow/hub/catalog/internal/db/models" + internalmodels "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/pkg/api" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/catalog/internal/catalog/mcpcatalog/loader.go b/catalog/internal/catalog/mcpcatalog/loader.go index 9d20e236ec..66389358d0 100644 --- a/catalog/internal/catalog/mcpcatalog/loader.go +++ b/catalog/internal/catalog/mcpcatalog/loader.go @@ -10,10 +10,10 @@ import ( mapset "github.com/deckarep/golang-set/v2" "github.com/golang/glog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/basecatalog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/mcpcatalog/models" - "github.com/kubeflow/model-registry/catalog/internal/db/service" - mrmodels "github.com/kubeflow/model-registry/internal/db/models" + "github.com/kubeflow/hub/catalog/internal/catalog/basecatalog" + "github.com/kubeflow/hub/catalog/internal/catalog/mcpcatalog/models" + "github.com/kubeflow/hub/catalog/internal/db/service" + mrmodels "github.com/kubeflow/hub/internal/db/models" ) // MCPPartiallyAvailableError indicates that a source loaded some MCP servers successfully diff --git a/catalog/internal/catalog/mcpcatalog/loader_test.go b/catalog/internal/catalog/mcpcatalog/loader_test.go index ba5ed03648..60cf2f0549 100644 --- a/catalog/internal/catalog/mcpcatalog/loader_test.go +++ b/catalog/internal/catalog/mcpcatalog/loader_test.go @@ -8,13 +8,13 @@ import ( "time" mapset "github.com/deckarep/golang-set/v2" - "github.com/kubeflow/model-registry/catalog/internal/catalog/basecatalog" - mcpmodels "github.com/kubeflow/model-registry/catalog/internal/catalog/mcpcatalog/models" - mcpcatalogservice "github.com/kubeflow/model-registry/catalog/internal/catalog/mcpcatalog/service" - modelcatalogservice "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/service" - "github.com/kubeflow/model-registry/catalog/internal/db/service" - "github.com/kubeflow/model-registry/catalog/internal/testhelpers" - "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/hub/catalog/internal/catalog/basecatalog" + mcpmodels "github.com/kubeflow/hub/catalog/internal/catalog/mcpcatalog/models" + mcpcatalogservice "github.com/kubeflow/hub/catalog/internal/catalog/mcpcatalog/service" + modelcatalogservice "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/service" + "github.com/kubeflow/hub/catalog/internal/db/service" + "github.com/kubeflow/hub/catalog/internal/testhelpers" + "github.com/kubeflow/hub/internal/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "gorm.io/gorm" diff --git a/catalog/internal/catalog/mcpcatalog/models/mcp_server.go b/catalog/internal/catalog/mcpcatalog/models/mcp_server.go index 583bf73e3f..62cfa72347 100644 --- a/catalog/internal/catalog/mcpcatalog/models/mcp_server.go +++ b/catalog/internal/catalog/mcpcatalog/models/mcp_server.go @@ -1,9 +1,9 @@ package models import ( - "github.com/kubeflow/model-registry/catalog/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/filter" - dbmodels "github.com/kubeflow/model-registry/internal/db/models" + "github.com/kubeflow/hub/catalog/internal/db/models" + "github.com/kubeflow/hub/internal/db/filter" + dbmodels "github.com/kubeflow/hub/internal/db/models" ) // MCPServerListOptions holds the options for listing MCP servers. diff --git a/catalog/internal/catalog/mcpcatalog/models/mcp_server_tool.go b/catalog/internal/catalog/mcpcatalog/models/mcp_server_tool.go index e61e2953d3..38549d308f 100644 --- a/catalog/internal/catalog/mcpcatalog/models/mcp_server_tool.go +++ b/catalog/internal/catalog/mcpcatalog/models/mcp_server_tool.go @@ -1,9 +1,9 @@ package models import ( - "github.com/kubeflow/model-registry/catalog/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/filter" - dbmodels "github.com/kubeflow/model-registry/internal/db/models" + "github.com/kubeflow/hub/catalog/internal/db/models" + "github.com/kubeflow/hub/internal/db/filter" + dbmodels "github.com/kubeflow/hub/internal/db/models" ) // MCPServerToolListOptions holds the options for listing MCP server tools. diff --git a/catalog/internal/catalog/mcpcatalog/providers.go b/catalog/internal/catalog/mcpcatalog/providers.go index 865cd18352..3f92618619 100644 --- a/catalog/internal/catalog/mcpcatalog/providers.go +++ b/catalog/internal/catalog/mcpcatalog/providers.go @@ -12,10 +12,10 @@ import ( "sync" "github.com/golang/glog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/basecatalog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/mcpcatalog/models" - apimodels "github.com/kubeflow/model-registry/catalog/pkg/openapi" - mrmodels "github.com/kubeflow/model-registry/internal/db/models" + "github.com/kubeflow/hub/catalog/internal/catalog/basecatalog" + "github.com/kubeflow/hub/catalog/internal/catalog/mcpcatalog/models" + apimodels "github.com/kubeflow/hub/catalog/pkg/openapi" + mrmodels "github.com/kubeflow/hub/internal/db/models" "k8s.io/apimachinery/pkg/util/yaml" ) @@ -118,7 +118,7 @@ type yamlMCPServer struct { PublishedDate *string `yaml:"publishedDate,omitempty"` Transports []string `yaml:"transports,omitempty"` Tools []*yamlMCPTool `yaml:"tools,omitempty"` - Artifacts []apimodels.MCPArtifact `yaml:"artifacts,omitempty"` + Artifacts []apimodels.MCPArtifact `yaml:"artifacts,omitempty"` DeploymentMode *string `yaml:"deploymentMode,omitempty"` Endpoints *yamlMCPEndpoints `yaml:"endpoints,omitempty"` RuntimeMetadata *apimodels.MCPRuntimeMetadata `yaml:"runtimeMetadata,omitempty"` diff --git a/catalog/internal/catalog/mcpcatalog/providers_test.go b/catalog/internal/catalog/mcpcatalog/providers_test.go index fee8616871..11d8e61479 100644 --- a/catalog/internal/catalog/mcpcatalog/providers_test.go +++ b/catalog/internal/catalog/mcpcatalog/providers_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/kubeflow/model-registry/catalog/internal/catalog/basecatalog" - apimodels "github.com/kubeflow/model-registry/catalog/pkg/openapi" + "github.com/kubeflow/hub/catalog/internal/catalog/basecatalog" + apimodels "github.com/kubeflow/hub/catalog/pkg/openapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/catalog/internal/catalog/mcpcatalog/server_filter.go b/catalog/internal/catalog/mcpcatalog/server_filter.go index 94bd86f3fe..0593ed5c9b 100644 --- a/catalog/internal/catalog/mcpcatalog/server_filter.go +++ b/catalog/internal/catalog/mcpcatalog/server_filter.go @@ -3,7 +3,7 @@ package mcpcatalog import ( "fmt" - "github.com/kubeflow/model-registry/catalog/internal/catalog/basecatalog" + "github.com/kubeflow/hub/catalog/internal/catalog/basecatalog" ) // ServerFilter encapsulates include/exclude pattern matching for MCP server names. diff --git a/catalog/internal/catalog/mcpcatalog/server_filter_test.go b/catalog/internal/catalog/mcpcatalog/server_filter_test.go index 1bf7fbb69e..d4524eb65f 100644 --- a/catalog/internal/catalog/mcpcatalog/server_filter_test.go +++ b/catalog/internal/catalog/mcpcatalog/server_filter_test.go @@ -3,7 +3,7 @@ package mcpcatalog import ( "testing" - "github.com/kubeflow/model-registry/catalog/internal/catalog/basecatalog" + "github.com/kubeflow/hub/catalog/internal/catalog/basecatalog" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/catalog/internal/catalog/mcpcatalog/service/mcp_server.go b/catalog/internal/catalog/mcpcatalog/service/mcp_server.go index 34723daee7..1e6f9cfc1f 100644 --- a/catalog/internal/catalog/mcpcatalog/service/mcp_server.go +++ b/catalog/internal/catalog/mcpcatalog/service/mcp_server.go @@ -5,15 +5,15 @@ import ( "fmt" "strings" - "github.com/kubeflow/model-registry/catalog/internal/catalog/mcpcatalog/models" - "github.com/kubeflow/model-registry/catalog/internal/db/filter" - "github.com/kubeflow/model-registry/catalog/internal/db/pagination" - "github.com/kubeflow/model-registry/internal/db/dbutil" - dbmodels "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" - "github.com/kubeflow/model-registry/internal/db/scopes" - "github.com/kubeflow/model-registry/internal/db/service" - "github.com/kubeflow/model-registry/internal/db/utils" + "github.com/kubeflow/hub/catalog/internal/catalog/mcpcatalog/models" + "github.com/kubeflow/hub/catalog/internal/db/filter" + "github.com/kubeflow/hub/catalog/internal/db/pagination" + "github.com/kubeflow/hub/internal/db/dbutil" + dbmodels "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" + "github.com/kubeflow/hub/internal/db/scopes" + "github.com/kubeflow/hub/internal/db/service" + "github.com/kubeflow/hub/internal/db/utils" "gorm.io/gorm" ) diff --git a/catalog/internal/catalog/mcpcatalog/service/mcp_server_prerequisites_test.go b/catalog/internal/catalog/mcpcatalog/service/mcp_server_prerequisites_test.go index 2e49f04339..d230e8bd5b 100644 --- a/catalog/internal/catalog/mcpcatalog/service/mcp_server_prerequisites_test.go +++ b/catalog/internal/catalog/mcpcatalog/service/mcp_server_prerequisites_test.go @@ -4,10 +4,10 @@ import ( "encoding/json" "testing" - "github.com/kubeflow/model-registry/catalog/internal/converter" - "github.com/kubeflow/model-registry/catalog/pkg/openapi" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/hub/catalog/internal/converter" + "github.com/kubeflow/hub/catalog/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/catalog/internal/catalog/mcpcatalog/service/mcp_server_test.go b/catalog/internal/catalog/mcpcatalog/service/mcp_server_test.go index 813f6e936b..38e01a474c 100644 --- a/catalog/internal/catalog/mcpcatalog/service/mcp_server_test.go +++ b/catalog/internal/catalog/mcpcatalog/service/mcp_server_test.go @@ -7,12 +7,12 @@ import ( "testing" "time" - "github.com/kubeflow/model-registry/catalog/internal/catalog/mcpcatalog/models" - "github.com/kubeflow/model-registry/catalog/internal/converter" - "github.com/kubeflow/model-registry/catalog/pkg/openapi" - "github.com/kubeflow/model-registry/internal/apiutils" - dbmodels "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/hub/catalog/internal/catalog/mcpcatalog/models" + "github.com/kubeflow/hub/catalog/internal/converter" + "github.com/kubeflow/hub/catalog/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + dbmodels "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/catalog/internal/catalog/mcpcatalog/service/mcp_server_tool.go b/catalog/internal/catalog/mcpcatalog/service/mcp_server_tool.go index c3346d038c..7d661d0122 100644 --- a/catalog/internal/catalog/mcpcatalog/service/mcp_server_tool.go +++ b/catalog/internal/catalog/mcpcatalog/service/mcp_server_tool.go @@ -5,12 +5,12 @@ import ( "fmt" "strings" - "github.com/kubeflow/model-registry/catalog/internal/catalog/mcpcatalog/models" - "github.com/kubeflow/model-registry/catalog/internal/db/filter" - dbmodels "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" - "github.com/kubeflow/model-registry/internal/db/service" - "github.com/kubeflow/model-registry/internal/db/utils" + "github.com/kubeflow/hub/catalog/internal/catalog/mcpcatalog/models" + "github.com/kubeflow/hub/catalog/internal/db/filter" + dbmodels "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" + "github.com/kubeflow/hub/internal/db/service" + "github.com/kubeflow/hub/internal/db/utils" "gorm.io/gorm" ) diff --git a/catalog/internal/catalog/mcpcatalog/service/mcp_server_tool_test.go b/catalog/internal/catalog/mcpcatalog/service/mcp_server_tool_test.go index c465e55725..e12603e2f9 100644 --- a/catalog/internal/catalog/mcpcatalog/service/mcp_server_tool_test.go +++ b/catalog/internal/catalog/mcpcatalog/service/mcp_server_tool_test.go @@ -4,10 +4,10 @@ import ( "fmt" "testing" - "github.com/kubeflow/model-registry/catalog/internal/catalog/mcpcatalog/models" - "github.com/kubeflow/model-registry/internal/apiutils" - dbmodels "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/hub/catalog/internal/catalog/mcpcatalog/models" + "github.com/kubeflow/hub/internal/apiutils" + dbmodels "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/catalog/internal/catalog/mcpcatalog/service/service_test.go b/catalog/internal/catalog/mcpcatalog/service/service_test.go index 0dddcad52d..e0e4dd0bbd 100644 --- a/catalog/internal/catalog/mcpcatalog/service/service_test.go +++ b/catalog/internal/catalog/mcpcatalog/service/service_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/hub/internal/testutils" ) func TestMain(m *testing.M) { diff --git a/catalog/internal/catalog/mcpcatalog/service/test_helpers_test.go b/catalog/internal/catalog/mcpcatalog/service/test_helpers_test.go index 0d5beddcce..2ef892e603 100644 --- a/catalog/internal/catalog/mcpcatalog/service/test_helpers_test.go +++ b/catalog/internal/catalog/mcpcatalog/service/test_helpers_test.go @@ -4,8 +4,8 @@ import ( "errors" "testing" - "github.com/kubeflow/model-registry/internal/datastore" - "github.com/kubeflow/model-registry/internal/db/schema" + "github.com/kubeflow/hub/internal/datastore" + "github.com/kubeflow/hub/internal/db/schema" "github.com/stretchr/testify/require" "gorm.io/gorm" ) diff --git a/catalog/internal/catalog/mcpcatalog/sources.go b/catalog/internal/catalog/mcpcatalog/sources.go index 9d37b99d37..593b63852e 100644 --- a/catalog/internal/catalog/mcpcatalog/sources.go +++ b/catalog/internal/catalog/mcpcatalog/sources.go @@ -6,9 +6,9 @@ import ( "strings" "sync" - "github.com/kubeflow/model-registry/catalog/internal/catalog/basecatalog" - model "github.com/kubeflow/model-registry/catalog/pkg/openapi" - "github.com/kubeflow/model-registry/internal/apiutils" + "github.com/kubeflow/hub/catalog/internal/catalog/basecatalog" + model "github.com/kubeflow/hub/catalog/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" ) // mcpOriginEntry holds MCP sources from a single origin (config file). diff --git a/catalog/internal/catalog/mcpcatalog/sources_test.go b/catalog/internal/catalog/mcpcatalog/sources_test.go index dc7acfa324..beb6ce8a8e 100644 --- a/catalog/internal/catalog/mcpcatalog/sources_test.go +++ b/catalog/internal/catalog/mcpcatalog/sources_test.go @@ -4,9 +4,9 @@ import ( "reflect" "testing" - "github.com/kubeflow/model-registry/catalog/internal/catalog/basecatalog" - model "github.com/kubeflow/model-registry/catalog/pkg/openapi" - "github.com/kubeflow/model-registry/internal/apiutils" + "github.com/kubeflow/hub/catalog/internal/catalog/basecatalog" + model "github.com/kubeflow/hub/catalog/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/catalog/internal/catalog/modelcatalog/api.go b/catalog/internal/catalog/modelcatalog/api.go index dc4713077d..511bab2465 100644 --- a/catalog/internal/catalog/modelcatalog/api.go +++ b/catalog/internal/catalog/modelcatalog/api.go @@ -3,8 +3,8 @@ package modelcatalog import ( "context" - model "github.com/kubeflow/model-registry/catalog/pkg/openapi" - mrmodels "github.com/kubeflow/model-registry/internal/db/models" + model "github.com/kubeflow/hub/catalog/pkg/openapi" + mrmodels "github.com/kubeflow/hub/internal/db/models" ) type ListModelsParams struct { diff --git a/catalog/internal/catalog/modelcatalog/api_test.go b/catalog/internal/catalog/modelcatalog/api_test.go index 3f034b23c0..ce745b73e1 100644 --- a/catalog/internal/catalog/modelcatalog/api_test.go +++ b/catalog/internal/catalog/modelcatalog/api_test.go @@ -10,13 +10,13 @@ import ( "time" mapset "github.com/deckarep/golang-set/v2" - "github.com/kubeflow/model-registry/catalog/internal/catalog/basecatalog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/models" - sharedmodels "github.com/kubeflow/model-registry/catalog/internal/db/models" - "github.com/kubeflow/model-registry/catalog/internal/db/service" - apimodels "github.com/kubeflow/model-registry/catalog/pkg/openapi" - "github.com/kubeflow/model-registry/internal/apiutils" - mrmodels "github.com/kubeflow/model-registry/internal/db/models" + "github.com/kubeflow/hub/catalog/internal/catalog/basecatalog" + "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/models" + sharedmodels "github.com/kubeflow/hub/catalog/internal/db/models" + "github.com/kubeflow/hub/catalog/internal/db/service" + apimodels "github.com/kubeflow/hub/catalog/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + mrmodels "github.com/kubeflow/hub/internal/db/models" "github.com/stretchr/testify/assert" ) diff --git a/catalog/internal/catalog/modelcatalog/db_catalog.go b/catalog/internal/catalog/modelcatalog/db_catalog.go index 7c46b52eca..20b4f9a9cb 100644 --- a/catalog/internal/catalog/modelcatalog/db_catalog.go +++ b/catalog/internal/catalog/modelcatalog/db_catalog.go @@ -10,16 +10,16 @@ import ( "strings" "github.com/golang/glog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/basecatalog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/models" - sharedmodels "github.com/kubeflow/model-registry/catalog/internal/db/models" - "github.com/kubeflow/model-registry/catalog/internal/db/service" - apimodels "github.com/kubeflow/model-registry/catalog/pkg/openapi" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/converter" - mrmodels "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/pkg/api" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/catalog/internal/catalog/basecatalog" + "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/models" + sharedmodels "github.com/kubeflow/hub/catalog/internal/db/models" + "github.com/kubeflow/hub/catalog/internal/db/service" + apimodels "github.com/kubeflow/hub/catalog/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/converter" + mrmodels "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/pkg/api" + "github.com/kubeflow/hub/pkg/openapi" ) type dbCatalogImpl struct { diff --git a/catalog/internal/catalog/modelcatalog/db_catalog_filterquery_test.go b/catalog/internal/catalog/modelcatalog/db_catalog_filterquery_test.go index 8506592e89..f20ee2e79a 100644 --- a/catalog/internal/catalog/modelcatalog/db_catalog_filterquery_test.go +++ b/catalog/internal/catalog/modelcatalog/db_catalog_filterquery_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - catalogfilter "github.com/kubeflow/model-registry/catalog/internal/db/filter" - catalogmodels "github.com/kubeflow/model-registry/catalog/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/filter" - "github.com/kubeflow/model-registry/internal/db/schema" + catalogfilter "github.com/kubeflow/hub/catalog/internal/db/filter" + catalogmodels "github.com/kubeflow/hub/catalog/internal/db/models" + "github.com/kubeflow/hub/internal/db/filter" + "github.com/kubeflow/hub/internal/db/schema" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "gorm.io/driver/postgres" diff --git a/catalog/internal/catalog/modelcatalog/db_catalog_test.go b/catalog/internal/catalog/modelcatalog/db_catalog_test.go index 05c7c4b55d..a00d4f2793 100644 --- a/catalog/internal/catalog/modelcatalog/db_catalog_test.go +++ b/catalog/internal/catalog/modelcatalog/db_catalog_test.go @@ -7,20 +7,20 @@ import ( "strconv" "testing" - "github.com/kubeflow/model-registry/catalog/internal/catalog/basecatalog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/mcpcatalog" - mcpcatalogmodels "github.com/kubeflow/model-registry/catalog/internal/catalog/mcpcatalog/models" - mcpservice "github.com/kubeflow/model-registry/catalog/internal/catalog/mcpcatalog/service" - "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/models" - modelservice "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/service" - sharedmodels "github.com/kubeflow/model-registry/catalog/internal/db/models" - "github.com/kubeflow/model-registry/catalog/internal/db/service" - "github.com/kubeflow/model-registry/catalog/internal/testhelpers" - model "github.com/kubeflow/model-registry/catalog/pkg/openapi" - "github.com/kubeflow/model-registry/internal/apiutils" - mr_models "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/testutils" - "github.com/kubeflow/model-registry/pkg/api" + "github.com/kubeflow/hub/catalog/internal/catalog/basecatalog" + "github.com/kubeflow/hub/catalog/internal/catalog/mcpcatalog" + mcpcatalogmodels "github.com/kubeflow/hub/catalog/internal/catalog/mcpcatalog/models" + mcpservice "github.com/kubeflow/hub/catalog/internal/catalog/mcpcatalog/service" + "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/models" + modelservice "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/service" + sharedmodels "github.com/kubeflow/hub/catalog/internal/db/models" + "github.com/kubeflow/hub/catalog/internal/db/service" + "github.com/kubeflow/hub/catalog/internal/testhelpers" + model "github.com/kubeflow/hub/catalog/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + mr_models "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/testutils" + "github.com/kubeflow/hub/pkg/api" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -221,7 +221,7 @@ func TestDBCatalog(t *testing.T) { model1 := &models.CatalogModelImpl{ TypeID: apiutils.Of(int32(catalogModelTypeID)), Attributes: &models.CatalogModelAttributes{ - Name: apiutils.Of("query-test-source:BERT-base-model"), + Name: apiutils.Of("query-test-source:BERT-base-model"), ExternalID: apiutils.Of("bert-base-1"), }, Properties: &[]mr_models.Properties{ @@ -235,7 +235,7 @@ func TestDBCatalog(t *testing.T) { model2 := &models.CatalogModelImpl{ TypeID: apiutils.Of(int32(catalogModelTypeID)), Attributes: &models.CatalogModelAttributes{ - Name: apiutils.Of("query-test-source:GPT-3.5-turbo"), + Name: apiutils.Of("query-test-source:GPT-3.5-turbo"), ExternalID: apiutils.Of("gpt-35-turbo-1"), }, Properties: &[]mr_models.Properties{ @@ -249,7 +249,7 @@ func TestDBCatalog(t *testing.T) { model3 := &models.CatalogModelImpl{ TypeID: apiutils.Of(int32(catalogModelTypeID)), Attributes: &models.CatalogModelAttributes{ - Name: apiutils.Of("query-test-source:ResNet-50-image"), + Name: apiutils.Of("query-test-source:ResNet-50-image"), ExternalID: apiutils.Of("resnet-50-1"), }, Properties: &[]mr_models.Properties{ diff --git a/catalog/internal/catalog/modelcatalog/hf_catalog.go b/catalog/internal/catalog/modelcatalog/hf_catalog.go index 1d78931b6a..b9f1fd79e5 100644 --- a/catalog/internal/catalog/modelcatalog/hf_catalog.go +++ b/catalog/internal/catalog/modelcatalog/hf_catalog.go @@ -14,11 +14,11 @@ import ( "time" "github.com/golang/glog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/basecatalog" - catalogmodels "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/models" - sharedmodels "github.com/kubeflow/model-registry/catalog/internal/db/models" - apimodels "github.com/kubeflow/model-registry/catalog/pkg/openapi" - "github.com/kubeflow/model-registry/internal/db/models" + "github.com/kubeflow/hub/catalog/internal/catalog/basecatalog" + catalogmodels "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/models" + sharedmodels "github.com/kubeflow/hub/catalog/internal/db/models" + apimodels "github.com/kubeflow/hub/catalog/pkg/openapi" + "github.com/kubeflow/hub/internal/db/models" ) const ( diff --git a/catalog/internal/catalog/modelcatalog/hf_catalog_test.go b/catalog/internal/catalog/modelcatalog/hf_catalog_test.go index 79a70bf216..fea1306898 100644 --- a/catalog/internal/catalog/modelcatalog/hf_catalog_test.go +++ b/catalog/internal/catalog/modelcatalog/hf_catalog_test.go @@ -14,9 +14,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - catalogmodels "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/models" - apimodels "github.com/kubeflow/model-registry/catalog/pkg/openapi" - "github.com/kubeflow/model-registry/internal/db/models" + catalogmodels "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/models" + apimodels "github.com/kubeflow/hub/catalog/pkg/openapi" + "github.com/kubeflow/hub/internal/db/models" ) func TestPopulateFromHFInfo(t *testing.T) { diff --git a/catalog/internal/catalog/modelcatalog/integration_test.go b/catalog/internal/catalog/modelcatalog/integration_test.go index 4e678a5f32..45269ef564 100644 --- a/catalog/internal/catalog/modelcatalog/integration_test.go +++ b/catalog/internal/catalog/modelcatalog/integration_test.go @@ -5,14 +5,14 @@ import ( "fmt" "testing" - "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/models" - modelservice "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/service" - "github.com/kubeflow/model-registry/catalog/internal/db/service" - "github.com/kubeflow/model-registry/catalog/internal/testhelpers" - "github.com/kubeflow/model-registry/internal/apiutils" - mr_models "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" - "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/models" + modelservice "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/service" + "github.com/kubeflow/hub/catalog/internal/db/service" + "github.com/kubeflow/hub/catalog/internal/testhelpers" + "github.com/kubeflow/hub/internal/apiutils" + mr_models "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" + "github.com/kubeflow/hub/internal/testutils" "github.com/stretchr/testify/require" "gorm.io/gorm" ) diff --git a/catalog/internal/catalog/modelcatalog/loader.go b/catalog/internal/catalog/modelcatalog/loader.go index 25b529b9a4..9356b6b80f 100644 --- a/catalog/internal/catalog/modelcatalog/loader.go +++ b/catalog/internal/catalog/modelcatalog/loader.go @@ -9,11 +9,11 @@ import ( mapset "github.com/deckarep/golang-set/v2" "github.com/golang/glog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/basecatalog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/models" - sharedmodels "github.com/kubeflow/model-registry/catalog/internal/db/models" - "github.com/kubeflow/model-registry/catalog/internal/db/service" - mrmodels "github.com/kubeflow/model-registry/internal/db/models" + "github.com/kubeflow/hub/catalog/internal/catalog/basecatalog" + "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/models" + sharedmodels "github.com/kubeflow/hub/catalog/internal/db/models" + "github.com/kubeflow/hub/catalog/internal/db/service" + mrmodels "github.com/kubeflow/hub/internal/db/models" ) // PartiallyAvailableError indicates that a source loaded some models successfully diff --git a/catalog/internal/catalog/modelcatalog/loader_test.go b/catalog/internal/catalog/modelcatalog/loader_test.go index 962d2cf52c..741b84da74 100644 --- a/catalog/internal/catalog/modelcatalog/loader_test.go +++ b/catalog/internal/catalog/modelcatalog/loader_test.go @@ -8,12 +8,12 @@ import ( "time" mapset "github.com/deckarep/golang-set/v2" - "github.com/kubeflow/model-registry/catalog/internal/catalog/basecatalog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/models" - sharedmodels "github.com/kubeflow/model-registry/catalog/internal/db/models" - "github.com/kubeflow/model-registry/catalog/internal/db/service" - apimodels "github.com/kubeflow/model-registry/catalog/pkg/openapi" - "github.com/kubeflow/model-registry/internal/apiutils" + "github.com/kubeflow/hub/catalog/internal/catalog/basecatalog" + "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/models" + sharedmodels "github.com/kubeflow/hub/catalog/internal/db/models" + "github.com/kubeflow/hub/catalog/internal/db/service" + apimodels "github.com/kubeflow/hub/catalog/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/util/yaml" diff --git a/catalog/internal/catalog/modelcatalog/model_filter.go b/catalog/internal/catalog/modelcatalog/model_filter.go index 3c144c4961..e66ebb3056 100644 --- a/catalog/internal/catalog/modelcatalog/model_filter.go +++ b/catalog/internal/catalog/modelcatalog/model_filter.go @@ -3,7 +3,7 @@ package modelcatalog import ( "fmt" - "github.com/kubeflow/model-registry/catalog/internal/catalog/basecatalog" + "github.com/kubeflow/hub/catalog/internal/catalog/basecatalog" ) // ModelFilter encapsulates include/exclude pattern matching for model names. diff --git a/catalog/internal/catalog/modelcatalog/model_filter_test.go b/catalog/internal/catalog/modelcatalog/model_filter_test.go index 998ea2c0c2..220da3ef6d 100644 --- a/catalog/internal/catalog/modelcatalog/model_filter_test.go +++ b/catalog/internal/catalog/modelcatalog/model_filter_test.go @@ -3,8 +3,8 @@ package modelcatalog import ( "testing" - "github.com/kubeflow/model-registry/catalog/internal/catalog/basecatalog" - apimodels "github.com/kubeflow/model-registry/catalog/pkg/openapi" + "github.com/kubeflow/hub/catalog/internal/catalog/basecatalog" + apimodels "github.com/kubeflow/hub/catalog/pkg/openapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/catalog/internal/catalog/modelcatalog/models/catalog_metrics_artifact.go b/catalog/internal/catalog/modelcatalog/models/catalog_metrics_artifact.go index fb4b143b32..846c5dc6a2 100644 --- a/catalog/internal/catalog/modelcatalog/models/catalog_metrics_artifact.go +++ b/catalog/internal/catalog/modelcatalog/models/catalog_metrics_artifact.go @@ -1,8 +1,8 @@ package models import ( - "github.com/kubeflow/model-registry/internal/db/filter" - dbmodels "github.com/kubeflow/model-registry/internal/db/models" + "github.com/kubeflow/hub/internal/db/filter" + dbmodels "github.com/kubeflow/hub/internal/db/models" ) type MetricsType string diff --git a/catalog/internal/catalog/modelcatalog/models/catalog_model.go b/catalog/internal/catalog/modelcatalog/models/catalog_model.go index beff01e964..c99a42af3c 100644 --- a/catalog/internal/catalog/modelcatalog/models/catalog_model.go +++ b/catalog/internal/catalog/modelcatalog/models/catalog_model.go @@ -1,9 +1,9 @@ package models import ( - "github.com/kubeflow/model-registry/catalog/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/filter" - dbmodels "github.com/kubeflow/model-registry/internal/db/models" + "github.com/kubeflow/hub/catalog/internal/db/models" + "github.com/kubeflow/hub/internal/db/filter" + dbmodels "github.com/kubeflow/hub/internal/db/models" ) type CatalogModelListOptions struct { diff --git a/catalog/internal/catalog/modelcatalog/models/catalog_model_artifact.go b/catalog/internal/catalog/modelcatalog/models/catalog_model_artifact.go index 10ba11787d..8c7f8f1267 100644 --- a/catalog/internal/catalog/modelcatalog/models/catalog_model_artifact.go +++ b/catalog/internal/catalog/modelcatalog/models/catalog_model_artifact.go @@ -1,8 +1,8 @@ package models import ( - "github.com/kubeflow/model-registry/internal/db/filter" - dbmodels "github.com/kubeflow/model-registry/internal/db/models" + "github.com/kubeflow/hub/internal/db/filter" + dbmodels "github.com/kubeflow/hub/internal/db/models" ) const CatalogModelArtifactType = "model-artifact" diff --git a/catalog/internal/catalog/modelcatalog/names.go b/catalog/internal/catalog/modelcatalog/names.go index 477f43122c..f7476077a7 100644 --- a/catalog/internal/catalog/modelcatalog/names.go +++ b/catalog/internal/catalog/modelcatalog/names.go @@ -3,7 +3,7 @@ package modelcatalog import ( "strings" - "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/models" + "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/models" ) // DisplayNameFromStoredName returns the model display name from the stored (namespaced) name. diff --git a/catalog/internal/catalog/modelcatalog/performance_artifact_service.go b/catalog/internal/catalog/modelcatalog/performance_artifact_service.go index 8a5cce742a..134a779b4d 100644 --- a/catalog/internal/catalog/modelcatalog/performance_artifact_service.go +++ b/catalog/internal/catalog/modelcatalog/performance_artifact_service.go @@ -7,10 +7,10 @@ import ( "math" "slices" - "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/models" - sharedmodels "github.com/kubeflow/model-registry/catalog/internal/db/models" - dbmodels "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/scopes" + "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/models" + sharedmodels "github.com/kubeflow/hub/catalog/internal/db/models" + dbmodels "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/scopes" ) type PerformanceArtifactParams struct { @@ -469,10 +469,10 @@ func (s *PerformanceArtifactService) GetMinimumRecommendedLatency( ModelID: *model.GetID(), TargetRPS: targetRPS, Recommendations: true, // Enable Pareto filtering - FilterQuery: filterQuery, // Apply same filter as performance artifacts API - PageSize: 100, // Get all Pareto-filtered artifacts (reasonable limit) - OrderBy: params.LatencyProperty, // Sort by latency property (e.g., "ttft_p90") - SortOrder: "ASC", // Ascending order to get minimum first + FilterQuery: filterQuery, // Apply same filter as performance artifacts API + PageSize: 100, // Get all Pareto-filtered artifacts (reasonable limit) + OrderBy: params.LatencyProperty, // Sort by latency property (e.g., "ttft_p90") + SortOrder: "ASC", // Ascending order to get minimum first RPSProperty: params.RpsProperty, LatencyProperty: params.LatencyProperty, HardwareCountProperty: params.HardwareCountProperty, diff --git a/catalog/internal/catalog/modelcatalog/performance_artifact_service_test.go b/catalog/internal/catalog/modelcatalog/performance_artifact_service_test.go index 35b65a05e4..631120bc23 100644 --- a/catalog/internal/catalog/modelcatalog/performance_artifact_service_test.go +++ b/catalog/internal/catalog/modelcatalog/performance_artifact_service_test.go @@ -6,10 +6,10 @@ import ( "math" "testing" - "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/models" - sharedmodels "github.com/kubeflow/model-registry/catalog/internal/db/models" - "github.com/kubeflow/model-registry/internal/apiutils" - dbmodels "github.com/kubeflow/model-registry/internal/db/models" + "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/models" + sharedmodels "github.com/kubeflow/hub/catalog/internal/db/models" + "github.com/kubeflow/hub/internal/apiutils" + dbmodels "github.com/kubeflow/hub/internal/db/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/catalog/internal/catalog/modelcatalog/performance_artifacts_integration_test.go b/catalog/internal/catalog/modelcatalog/performance_artifacts_integration_test.go index 9727dde914..1c2560fa31 100644 --- a/catalog/internal/catalog/modelcatalog/performance_artifacts_integration_test.go +++ b/catalog/internal/catalog/modelcatalog/performance_artifacts_integration_test.go @@ -4,13 +4,13 @@ import ( "context" "testing" - "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/models" - modelservice "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/service" - "github.com/kubeflow/model-registry/catalog/internal/db/service" - "github.com/kubeflow/model-registry/catalog/internal/testhelpers" - "github.com/kubeflow/model-registry/internal/apiutils" - dbmodels "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/models" + modelservice "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/service" + "github.com/kubeflow/hub/catalog/internal/db/service" + "github.com/kubeflow/hub/catalog/internal/testhelpers" + "github.com/kubeflow/hub/internal/apiutils" + dbmodels "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/catalog/internal/catalog/modelcatalog/performance_metrics.go b/catalog/internal/catalog/modelcatalog/performance_metrics.go index ff6a0a1c0d..d144f40ef5 100644 --- a/catalog/internal/catalog/modelcatalog/performance_metrics.go +++ b/catalog/internal/catalog/modelcatalog/performance_metrics.go @@ -13,10 +13,10 @@ import ( "time" "github.com/golang/glog" - dbmodels "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/models" - "github.com/kubeflow/model-registry/catalog/internal/db/service" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/db/models" + dbmodels "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/models" + "github.com/kubeflow/hub/catalog/internal/db/service" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/db/models" ) // metadataJSON represents the minimal structure needed from metadata.json files diff --git a/catalog/internal/catalog/modelcatalog/preview.go b/catalog/internal/catalog/modelcatalog/preview.go index ffed3ac52c..f4e5b140d3 100644 --- a/catalog/internal/catalog/modelcatalog/preview.go +++ b/catalog/internal/catalog/modelcatalog/preview.go @@ -7,7 +7,7 @@ import ( "path/filepath" "github.com/golang/glog" - model "github.com/kubeflow/model-registry/catalog/pkg/openapi" + model "github.com/kubeflow/hub/catalog/pkg/openapi" "k8s.io/apimachinery/pkg/util/yaml" ) diff --git a/catalog/internal/catalog/modelcatalog/service/catalog_metrics_artifact.go b/catalog/internal/catalog/modelcatalog/service/catalog_metrics_artifact.go index 7455845daf..4c43adfb03 100644 --- a/catalog/internal/catalog/modelcatalog/service/catalog_metrics_artifact.go +++ b/catalog/internal/catalog/modelcatalog/service/catalog_metrics_artifact.go @@ -5,13 +5,13 @@ import ( "fmt" "math" - "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/models" - sharedmodels "github.com/kubeflow/model-registry/catalog/internal/db/models" - "github.com/kubeflow/model-registry/internal/apiutils" - dbmodels "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" - "github.com/kubeflow/model-registry/internal/db/service" - "github.com/kubeflow/model-registry/internal/db/utils" + "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/models" + sharedmodels "github.com/kubeflow/hub/catalog/internal/db/models" + "github.com/kubeflow/hub/internal/apiutils" + dbmodels "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" + "github.com/kubeflow/hub/internal/db/service" + "github.com/kubeflow/hub/internal/db/utils" "gorm.io/gorm" ) diff --git a/catalog/internal/catalog/modelcatalog/service/catalog_metrics_artifact_test.go b/catalog/internal/catalog/modelcatalog/service/catalog_metrics_artifact_test.go index 38a2736708..1ae2e67fca 100644 --- a/catalog/internal/catalog/modelcatalog/service/catalog_metrics_artifact_test.go +++ b/catalog/internal/catalog/modelcatalog/service/catalog_metrics_artifact_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/models" - "github.com/kubeflow/model-registry/internal/apiutils" - dbmodels "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/models" + "github.com/kubeflow/hub/internal/apiutils" + dbmodels "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/catalog/internal/catalog/modelcatalog/service/catalog_model.go b/catalog/internal/catalog/modelcatalog/service/catalog_model.go index 3e1ec36eb8..96b17eba43 100644 --- a/catalog/internal/catalog/modelcatalog/service/catalog_model.go +++ b/catalog/internal/catalog/modelcatalog/service/catalog_model.go @@ -6,16 +6,16 @@ import ( "strings" "github.com/golang/glog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/models" - "github.com/kubeflow/model-registry/catalog/internal/db/filter" - catpagination "github.com/kubeflow/model-registry/catalog/internal/db/pagination" - "github.com/kubeflow/model-registry/internal/db/dbutil" - dbfilter "github.com/kubeflow/model-registry/internal/db/filter" - dbmodels "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" - "github.com/kubeflow/model-registry/internal/db/scopes" - "github.com/kubeflow/model-registry/internal/db/service" - "github.com/kubeflow/model-registry/internal/db/utils" + "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/models" + "github.com/kubeflow/hub/catalog/internal/db/filter" + catpagination "github.com/kubeflow/hub/catalog/internal/db/pagination" + "github.com/kubeflow/hub/internal/db/dbutil" + dbfilter "github.com/kubeflow/hub/internal/db/filter" + dbmodels "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" + "github.com/kubeflow/hub/internal/db/scopes" + "github.com/kubeflow/hub/internal/db/service" + "github.com/kubeflow/hub/internal/db/utils" "gorm.io/gorm" ) diff --git a/catalog/internal/catalog/modelcatalog/service/catalog_model_artifact.go b/catalog/internal/catalog/modelcatalog/service/catalog_model_artifact.go index 86a233aabf..09fd05e850 100644 --- a/catalog/internal/catalog/modelcatalog/service/catalog_model_artifact.go +++ b/catalog/internal/catalog/modelcatalog/service/catalog_model_artifact.go @@ -4,13 +4,13 @@ import ( "errors" "fmt" - "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/models" - sharedmodels "github.com/kubeflow/model-registry/catalog/internal/db/models" - "github.com/kubeflow/model-registry/internal/apiutils" - dbmodels "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" - "github.com/kubeflow/model-registry/internal/db/service" - "github.com/kubeflow/model-registry/internal/db/utils" + "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/models" + sharedmodels "github.com/kubeflow/hub/catalog/internal/db/models" + "github.com/kubeflow/hub/internal/apiutils" + dbmodels "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" + "github.com/kubeflow/hub/internal/db/service" + "github.com/kubeflow/hub/internal/db/utils" "gorm.io/gorm" ) diff --git a/catalog/internal/catalog/modelcatalog/service/catalog_model_artifact_test.go b/catalog/internal/catalog/modelcatalog/service/catalog_model_artifact_test.go index f80a0dd678..d4760492f5 100644 --- a/catalog/internal/catalog/modelcatalog/service/catalog_model_artifact_test.go +++ b/catalog/internal/catalog/modelcatalog/service/catalog_model_artifact_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/models" - "github.com/kubeflow/model-registry/internal/apiutils" - dbmodels "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/models" + "github.com/kubeflow/hub/internal/apiutils" + dbmodels "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/catalog/internal/catalog/modelcatalog/service/catalog_model_test.go b/catalog/internal/catalog/modelcatalog/service/catalog_model_test.go index 98c42f5cda..ab12a664c9 100644 --- a/catalog/internal/catalog/modelcatalog/service/catalog_model_test.go +++ b/catalog/internal/catalog/modelcatalog/service/catalog_model_test.go @@ -6,11 +6,11 @@ import ( "strings" "testing" - "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/models" - "github.com/kubeflow/model-registry/internal/apiutils" - dbmodels "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" - "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/models" + "github.com/kubeflow/hub/internal/apiutils" + dbmodels "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" + "github.com/kubeflow/hub/internal/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/catalog/internal/catalog/modelcatalog/service/service_test.go b/catalog/internal/catalog/modelcatalog/service/service_test.go index 0dddcad52d..e0e4dd0bbd 100644 --- a/catalog/internal/catalog/modelcatalog/service/service_test.go +++ b/catalog/internal/catalog/modelcatalog/service/service_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/hub/internal/testutils" ) func TestMain(m *testing.M) { diff --git a/catalog/internal/catalog/modelcatalog/service/test_helpers_test.go b/catalog/internal/catalog/modelcatalog/service/test_helpers_test.go index 6380a04090..1b0874b57a 100644 --- a/catalog/internal/catalog/modelcatalog/service/test_helpers_test.go +++ b/catalog/internal/catalog/modelcatalog/service/test_helpers_test.go @@ -4,8 +4,8 @@ import ( "errors" "testing" - "github.com/kubeflow/model-registry/internal/datastore" - "github.com/kubeflow/model-registry/internal/db/schema" + "github.com/kubeflow/hub/internal/datastore" + "github.com/kubeflow/hub/internal/db/schema" "github.com/stretchr/testify/require" "gorm.io/gorm" ) diff --git a/catalog/internal/catalog/modelcatalog/sources.go b/catalog/internal/catalog/modelcatalog/sources.go index 5662494d6f..3b7a4670bf 100644 --- a/catalog/internal/catalog/modelcatalog/sources.go +++ b/catalog/internal/catalog/modelcatalog/sources.go @@ -6,9 +6,9 @@ import ( "strings" "sync" - "github.com/kubeflow/model-registry/catalog/internal/catalog/basecatalog" - model "github.com/kubeflow/model-registry/catalog/pkg/openapi" - "github.com/kubeflow/model-registry/internal/apiutils" + "github.com/kubeflow/hub/catalog/internal/catalog/basecatalog" + model "github.com/kubeflow/hub/catalog/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" ) // originEntry holds sources from a single origin (config file). diff --git a/catalog/internal/catalog/modelcatalog/sources_test.go b/catalog/internal/catalog/modelcatalog/sources_test.go index 845378df0d..0f632fffcc 100644 --- a/catalog/internal/catalog/modelcatalog/sources_test.go +++ b/catalog/internal/catalog/modelcatalog/sources_test.go @@ -5,9 +5,9 @@ import ( "sort" "testing" - "github.com/kubeflow/model-registry/catalog/internal/catalog/basecatalog" - model "github.com/kubeflow/model-registry/catalog/pkg/openapi" - "github.com/kubeflow/model-registry/internal/apiutils" + "github.com/kubeflow/hub/catalog/internal/catalog/basecatalog" + model "github.com/kubeflow/hub/catalog/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" ) func TestSourceCollection_ByLabel(t *testing.T) { diff --git a/catalog/internal/catalog/modelcatalog/yaml_catalog.go b/catalog/internal/catalog/modelcatalog/yaml_catalog.go index 616eb4b251..61f5df382d 100644 --- a/catalog/internal/catalog/modelcatalog/yaml_catalog.go +++ b/catalog/internal/catalog/modelcatalog/yaml_catalog.go @@ -11,11 +11,11 @@ import ( "k8s.io/apimachinery/pkg/util/yaml" "github.com/golang/glog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/basecatalog" - catalogmodels "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/models" - sharedmodels "github.com/kubeflow/model-registry/catalog/internal/db/models" - apimodels "github.com/kubeflow/model-registry/catalog/pkg/openapi" - "github.com/kubeflow/model-registry/internal/db/models" + "github.com/kubeflow/hub/catalog/internal/catalog/basecatalog" + catalogmodels "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/models" + sharedmodels "github.com/kubeflow/hub/catalog/internal/db/models" + apimodels "github.com/kubeflow/hub/catalog/pkg/openapi" + "github.com/kubeflow/hub/internal/db/models" ) const ( diff --git a/catalog/internal/catalog/modelcatalog/yaml_catalog_test.go b/catalog/internal/catalog/modelcatalog/yaml_catalog_test.go index ed208053c3..0e40d59a7a 100644 --- a/catalog/internal/catalog/modelcatalog/yaml_catalog_test.go +++ b/catalog/internal/catalog/modelcatalog/yaml_catalog_test.go @@ -11,11 +11,11 @@ import ( "testing" "time" - "github.com/kubeflow/model-registry/catalog/internal/catalog/basecatalog" - catalogmodels "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/models" - model "github.com/kubeflow/model-registry/catalog/pkg/openapi" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/db/models" + "github.com/kubeflow/hub/catalog/internal/catalog/basecatalog" + catalogmodels "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/models" + model "github.com/kubeflow/hub/catalog/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/db/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/catalog/internal/converter/mcp_converter.go b/catalog/internal/converter/mcp_converter.go index 6019c382c1..58c50d01e9 100644 --- a/catalog/internal/converter/mcp_converter.go +++ b/catalog/internal/converter/mcp_converter.go @@ -7,9 +7,9 @@ import ( "time" "github.com/golang/glog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/mcpcatalog/models" - "github.com/kubeflow/model-registry/catalog/pkg/openapi" - dbmodels "github.com/kubeflow/model-registry/internal/db/models" + "github.com/kubeflow/hub/catalog/internal/catalog/mcpcatalog/models" + "github.com/kubeflow/hub/catalog/pkg/openapi" + dbmodels "github.com/kubeflow/hub/internal/db/models" ) // ============================================================================== diff --git a/catalog/internal/converter/mcp_converter_test.go b/catalog/internal/converter/mcp_converter_test.go index 4d460d3c83..bd459293a5 100644 --- a/catalog/internal/converter/mcp_converter_test.go +++ b/catalog/internal/converter/mcp_converter_test.go @@ -3,10 +3,10 @@ package converter_test import ( "testing" - "github.com/kubeflow/model-registry/catalog/internal/catalog/mcpcatalog/models" - "github.com/kubeflow/model-registry/catalog/internal/converter" - "github.com/kubeflow/model-registry/internal/apiutils" - dbmodels "github.com/kubeflow/model-registry/internal/db/models" + "github.com/kubeflow/hub/catalog/internal/catalog/mcpcatalog/models" + "github.com/kubeflow/hub/catalog/internal/converter" + "github.com/kubeflow/hub/internal/apiutils" + dbmodels "github.com/kubeflow/hub/internal/db/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/catalog/internal/converter/property_accessor.go b/catalog/internal/converter/property_accessor.go index dfccd4d5b8..5b7fe1c7e8 100644 --- a/catalog/internal/converter/property_accessor.go +++ b/catalog/internal/converter/property_accessor.go @@ -3,7 +3,7 @@ package converter import ( "encoding/json" - dbmodels "github.com/kubeflow/model-registry/internal/db/models" + dbmodels "github.com/kubeflow/hub/internal/db/models" ) // PropertyAccessor provides O(1) access to database properties via map lookup. diff --git a/catalog/internal/converter/property_accessor_test.go b/catalog/internal/converter/property_accessor_test.go index cdecaadd74..c3b1b16e41 100644 --- a/catalog/internal/converter/property_accessor_test.go +++ b/catalog/internal/converter/property_accessor_test.go @@ -3,9 +3,9 @@ package converter_test import ( "testing" - "github.com/kubeflow/model-registry/catalog/internal/converter" - "github.com/kubeflow/model-registry/internal/apiutils" - dbmodels "github.com/kubeflow/model-registry/internal/db/models" + "github.com/kubeflow/hub/catalog/internal/converter" + "github.com/kubeflow/hub/internal/apiutils" + dbmodels "github.com/kubeflow/hub/internal/db/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/catalog/internal/db/filter/entity_mappings.go b/catalog/internal/db/filter/entity_mappings.go index 7f260649d3..cebb7b435d 100644 --- a/catalog/internal/db/filter/entity_mappings.go +++ b/catalog/internal/db/filter/entity_mappings.go @@ -3,8 +3,8 @@ package filter import ( "strings" - catalogmodels "github.com/kubeflow/model-registry/catalog/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/filter" + catalogmodels "github.com/kubeflow/hub/catalog/internal/db/models" + "github.com/kubeflow/hub/internal/db/filter" ) // catalogEntityMappings implements EntityMappingFunctions for the catalog package @@ -87,9 +87,9 @@ func (c *catalogEntityMappings) IsChildEntity(entityType filter.RestEntityType) } // GetEqualityExpansion implements filter.EqualityExpander so that: -// - externalId = "x" matches both exact and namespaced (sourceId:x) stored values. -// - name = "modelName" matches both exact and namespaced (sourceId:modelName) stored values, -// so callers can filter by model name without requiring the source prefix. +// - externalId = "x" matches both exact and namespaced (sourceId:x) stored values. +// - name = "modelName" matches both exact and namespaced (sourceId:modelName) stored values, +// so callers can filter by model name without requiring the source prefix. func (c *catalogEntityMappings) GetEqualityExpansion(restEntityType filter.RestEntityType, propertyName string, value any) (likeArg any, useExpansion bool) { if restEntityType != filter.RestEntityType(catalogmodels.RestEntityCatalogModel) { return nil, false diff --git a/catalog/internal/db/filter/entity_mappings_test.go b/catalog/internal/db/filter/entity_mappings_test.go index f4dc2594bf..a3c50d5cb2 100644 --- a/catalog/internal/db/filter/entity_mappings_test.go +++ b/catalog/internal/db/filter/entity_mappings_test.go @@ -3,8 +3,8 @@ package filter import ( "testing" - catalogmodels "github.com/kubeflow/model-registry/catalog/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/filter" + catalogmodels "github.com/kubeflow/hub/catalog/internal/db/models" + "github.com/kubeflow/hub/internal/db/filter" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/catalog/internal/db/models/catalog_artifact.go b/catalog/internal/db/models/catalog_artifact.go index 9f1d862696..1cbb2e6065 100644 --- a/catalog/internal/db/models/catalog_artifact.go +++ b/catalog/internal/db/models/catalog_artifact.go @@ -3,9 +3,9 @@ package models import ( "sync" - dbfilter "github.com/kubeflow/model-registry/internal/db/filter" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" + dbfilter "github.com/kubeflow/hub/internal/db/filter" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" ) type CatalogArtifactListOptions struct { diff --git a/catalog/internal/db/models/catalog_source.go b/catalog/internal/db/models/catalog_source.go index 0d99e6e325..b7030f5cbc 100644 --- a/catalog/internal/db/models/catalog_source.go +++ b/catalog/internal/db/models/catalog_source.go @@ -1,7 +1,7 @@ package models import ( - "github.com/kubeflow/model-registry/internal/db/models" + "github.com/kubeflow/hub/internal/db/models" ) // CatalogSourceAttributes holds the attributes for a catalog source record. diff --git a/catalog/internal/db/pagination/pagination.go b/catalog/internal/db/pagination/pagination.go index b5b74d09ff..d7707f4499 100644 --- a/catalog/internal/db/pagination/pagination.go +++ b/catalog/internal/db/pagination/pagination.go @@ -3,7 +3,7 @@ package pagination import ( "fmt" - "github.com/kubeflow/model-registry/internal/db/scopes" + "github.com/kubeflow/hub/internal/db/scopes" "gorm.io/gorm" ) diff --git a/catalog/internal/db/service/catalog_artifact.go b/catalog/internal/db/service/catalog_artifact.go index 7dd369f4de..617b0f35e6 100644 --- a/catalog/internal/db/service/catalog_artifact.go +++ b/catalog/internal/db/service/catalog_artifact.go @@ -6,17 +6,17 @@ import ( "strings" "github.com/golang/glog" - catalogfilter "github.com/kubeflow/model-registry/catalog/internal/db/filter" - "github.com/kubeflow/model-registry/catalog/internal/db/models" - catpagination "github.com/kubeflow/model-registry/catalog/internal/db/pagination" - "github.com/kubeflow/model-registry/internal/datastore" - "github.com/kubeflow/model-registry/internal/db/dbutil" - dbmodels "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" - "github.com/kubeflow/model-registry/internal/db/scopes" - "github.com/kubeflow/model-registry/internal/db/service" - "github.com/kubeflow/model-registry/internal/db/utils" - "github.com/kubeflow/model-registry/pkg/api" + catalogfilter "github.com/kubeflow/hub/catalog/internal/db/filter" + "github.com/kubeflow/hub/catalog/internal/db/models" + catpagination "github.com/kubeflow/hub/catalog/internal/db/pagination" + "github.com/kubeflow/hub/internal/datastore" + "github.com/kubeflow/hub/internal/db/dbutil" + dbmodels "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" + "github.com/kubeflow/hub/internal/db/scopes" + "github.com/kubeflow/hub/internal/db/service" + "github.com/kubeflow/hub/internal/db/utils" + "github.com/kubeflow/hub/pkg/api" "gorm.io/gorm" ) diff --git a/catalog/internal/db/service/catalog_artifact_test.go b/catalog/internal/db/service/catalog_artifact_test.go index 3f77b7c2bf..4f5b3b1b7f 100644 --- a/catalog/internal/db/service/catalog_artifact_test.go +++ b/catalog/internal/db/service/catalog_artifact_test.go @@ -4,13 +4,13 @@ import ( "fmt" "testing" - modelcatalogmodels "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/models" - modelcatalogservice "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/service" - "github.com/kubeflow/model-registry/catalog/internal/db/models" - "github.com/kubeflow/model-registry/catalog/internal/db/service" - "github.com/kubeflow/model-registry/internal/apiutils" - dbmodels "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/testutils" + modelcatalogmodels "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/models" + modelcatalogservice "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/service" + "github.com/kubeflow/hub/catalog/internal/db/models" + "github.com/kubeflow/hub/catalog/internal/db/service" + "github.com/kubeflow/hub/internal/apiutils" + dbmodels "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/catalog/internal/db/service/catalog_source.go b/catalog/internal/db/service/catalog_source.go index ca582673e6..eebff923a3 100644 --- a/catalog/internal/db/service/catalog_source.go +++ b/catalog/internal/db/service/catalog_source.go @@ -5,11 +5,11 @@ import ( "fmt" "time" - "github.com/kubeflow/model-registry/catalog/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/dbutil" - dbmodels "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" - "github.com/kubeflow/model-registry/internal/db/service" + "github.com/kubeflow/hub/catalog/internal/db/models" + "github.com/kubeflow/hub/internal/db/dbutil" + dbmodels "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" + "github.com/kubeflow/hub/internal/db/service" "gorm.io/gorm" ) diff --git a/catalog/internal/db/service/catalog_source_test.go b/catalog/internal/db/service/catalog_source_test.go index 3dbeb30aac..f88523dbcd 100644 --- a/catalog/internal/db/service/catalog_source_test.go +++ b/catalog/internal/db/service/catalog_source_test.go @@ -4,12 +4,12 @@ import ( "errors" "testing" - "github.com/kubeflow/model-registry/catalog/internal/db/models" - "github.com/kubeflow/model-registry/catalog/internal/db/service" - "github.com/kubeflow/model-registry/internal/apiutils" - dbmodels "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" - "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/hub/catalog/internal/db/models" + "github.com/kubeflow/hub/catalog/internal/db/service" + "github.com/kubeflow/hub/internal/apiutils" + dbmodels "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" + "github.com/kubeflow/hub/internal/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "gorm.io/gorm" diff --git a/catalog/internal/db/service/property_options.go b/catalog/internal/db/service/property_options.go index 9b0e98c037..0fa22ba2d1 100644 --- a/catalog/internal/db/service/property_options.go +++ b/catalog/internal/db/service/property_options.go @@ -3,8 +3,8 @@ package service import ( "fmt" - "github.com/kubeflow/model-registry/catalog/internal/db/models" - "github.com/kubeflow/model-registry/catalog/internal/db/schema" + "github.com/kubeflow/hub/catalog/internal/db/models" + "github.com/kubeflow/hub/catalog/internal/db/schema" "github.com/lib/pq" "gorm.io/gorm" ) diff --git a/catalog/internal/db/service/property_options_test.go b/catalog/internal/db/service/property_options_test.go index fcfe5d9b27..629acdc62d 100644 --- a/catalog/internal/db/service/property_options_test.go +++ b/catalog/internal/db/service/property_options_test.go @@ -3,13 +3,13 @@ package service_test import ( "testing" - modelcatalogmodels "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/models" - modelcatalogservice "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/service" - "github.com/kubeflow/model-registry/catalog/internal/db/models" - "github.com/kubeflow/model-registry/catalog/internal/db/service" - "github.com/kubeflow/model-registry/internal/apiutils" - dbmodels "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/testutils" + modelcatalogmodels "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/models" + modelcatalogservice "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/service" + "github.com/kubeflow/hub/catalog/internal/db/models" + "github.com/kubeflow/hub/catalog/internal/db/service" + "github.com/kubeflow/hub/internal/apiutils" + dbmodels "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/catalog/internal/db/service/service_test.go b/catalog/internal/db/service/service_test.go index 0dddcad52d..e0e4dd0bbd 100644 --- a/catalog/internal/db/service/service_test.go +++ b/catalog/internal/db/service/service_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/hub/internal/testutils" ) func TestMain(m *testing.M) { diff --git a/catalog/internal/db/service/spec.go b/catalog/internal/db/service/spec.go index 103e2304bd..059c32ff94 100644 --- a/catalog/internal/db/service/spec.go +++ b/catalog/internal/db/service/spec.go @@ -1,12 +1,12 @@ package service import ( - mcpcatalogmodels "github.com/kubeflow/model-registry/catalog/internal/catalog/mcpcatalog/models" - mcpcatalogservice "github.com/kubeflow/model-registry/catalog/internal/catalog/mcpcatalog/service" - modelcatalogmodels "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/models" - modelcatalogservice "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog/service" - sharedmodels "github.com/kubeflow/model-registry/catalog/internal/db/models" - "github.com/kubeflow/model-registry/internal/datastore" + mcpcatalogmodels "github.com/kubeflow/hub/catalog/internal/catalog/mcpcatalog/models" + mcpcatalogservice "github.com/kubeflow/hub/catalog/internal/catalog/mcpcatalog/service" + modelcatalogmodels "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/models" + modelcatalogservice "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog/service" + sharedmodels "github.com/kubeflow/hub/catalog/internal/db/models" + "github.com/kubeflow/hub/internal/datastore" ) const ( diff --git a/catalog/internal/db/service/test_helpers_test.go b/catalog/internal/db/service/test_helpers_test.go index 6a7f3b2b0b..e46f8ea8e4 100644 --- a/catalog/internal/db/service/test_helpers_test.go +++ b/catalog/internal/db/service/test_helpers_test.go @@ -3,8 +3,8 @@ package service_test import ( "testing" - "github.com/kubeflow/model-registry/catalog/internal/db/service" - "github.com/kubeflow/model-registry/internal/db/schema" + "github.com/kubeflow/hub/catalog/internal/db/service" + "github.com/kubeflow/hub/internal/db/schema" "github.com/stretchr/testify/require" "gorm.io/gorm" ) diff --git a/catalog/internal/leader/election_test.go b/catalog/internal/leader/election_test.go index 5ef4dfc7b3..aa6c4afc7a 100644 --- a/catalog/internal/leader/election_test.go +++ b/catalog/internal/leader/election_test.go @@ -8,9 +8,9 @@ import ( "time" _ "github.com/jackc/pgx/v5/stdlib" - "github.com/kubeflow/model-registry/catalog/internal/db/service" - "github.com/kubeflow/model-registry/catalog/internal/leader" - "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/hub/catalog/internal/db/service" + "github.com/kubeflow/hub/catalog/internal/leader" + "github.com/kubeflow/hub/internal/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/catalog/internal/server/openapi/api.go b/catalog/internal/server/openapi/api.go index ed114314cd..d83446efad 100644 --- a/catalog/internal/server/openapi/api.go +++ b/catalog/internal/server/openapi/api.go @@ -15,7 +15,7 @@ import ( "net/http" "os" - model "github.com/kubeflow/model-registry/catalog/pkg/openapi" + model "github.com/kubeflow/hub/catalog/pkg/openapi" ) // MCPCatalogServiceAPIRouter defines the required methods for binding the api requests to a responses for the MCPCatalogServiceAPI diff --git a/catalog/internal/server/openapi/api_mcp_catalog_service.go b/catalog/internal/server/openapi/api_mcp_catalog_service.go index 8461e2a06e..6fc141dc56 100644 --- a/catalog/internal/server/openapi/api_mcp_catalog_service.go +++ b/catalog/internal/server/openapi/api_mcp_catalog_service.go @@ -16,7 +16,7 @@ import ( "github.com/go-chi/chi/v5" - model "github.com/kubeflow/model-registry/catalog/pkg/openapi" + model "github.com/kubeflow/hub/catalog/pkg/openapi" ) // MCPCatalogServiceAPIController binds http requests to an api service and writes the service results to the http response diff --git a/catalog/internal/server/openapi/api_mcp_catalog_service_service.go b/catalog/internal/server/openapi/api_mcp_catalog_service_service.go index fa00ae40fb..58108b4f78 100644 --- a/catalog/internal/server/openapi/api_mcp_catalog_service_service.go +++ b/catalog/internal/server/openapi/api_mcp_catalog_service_service.go @@ -5,9 +5,9 @@ import ( "errors" "net/http" - "github.com/kubeflow/model-registry/catalog/internal/catalog" - model "github.com/kubeflow/model-registry/catalog/pkg/openapi" - "github.com/kubeflow/model-registry/pkg/api" + "github.com/kubeflow/hub/catalog/internal/catalog" + model "github.com/kubeflow/hub/catalog/pkg/openapi" + "github.com/kubeflow/hub/pkg/api" ) // MCPCatalogServiceAPIService is a service that implements the logic for the MCPCatalogServiceAPIServicer diff --git a/catalog/internal/server/openapi/api_mcp_catalog_service_service_test.go b/catalog/internal/server/openapi/api_mcp_catalog_service_service_test.go index beb5e1de0c..183c40f9ff 100644 --- a/catalog/internal/server/openapi/api_mcp_catalog_service_service_test.go +++ b/catalog/internal/server/openapi/api_mcp_catalog_service_service_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - "github.com/kubeflow/model-registry/catalog/internal/catalog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/basecatalog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/mcpcatalog" - model "github.com/kubeflow/model-registry/catalog/pkg/openapi" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/pkg/api" + "github.com/kubeflow/hub/catalog/internal/catalog" + "github.com/kubeflow/hub/catalog/internal/catalog/basecatalog" + "github.com/kubeflow/hub/catalog/internal/catalog/mcpcatalog" + model "github.com/kubeflow/hub/catalog/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/pkg/api" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/catalog/internal/server/openapi/api_model_catalog_service.go b/catalog/internal/server/openapi/api_model_catalog_service.go index 58c8f8acb0..e5ccb4eb25 100644 --- a/catalog/internal/server/openapi/api_model_catalog_service.go +++ b/catalog/internal/server/openapi/api_model_catalog_service.go @@ -17,7 +17,7 @@ import ( "github.com/go-chi/chi/v5" - model "github.com/kubeflow/model-registry/catalog/pkg/openapi" + model "github.com/kubeflow/hub/catalog/pkg/openapi" ) // ModelCatalogServiceAPIController binds http requests to an api service and writes the service results to the http response diff --git a/catalog/internal/server/openapi/api_model_catalog_service_service.go b/catalog/internal/server/openapi/api_model_catalog_service_service.go index ee8553876b..9f47d55a3f 100644 --- a/catalog/internal/server/openapi/api_model_catalog_service_service.go +++ b/catalog/internal/server/openapi/api_model_catalog_service_service.go @@ -12,13 +12,13 @@ import ( "strconv" "strings" - "github.com/kubeflow/model-registry/catalog/internal/catalog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/basecatalog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog" - "github.com/kubeflow/model-registry/catalog/internal/db/models" - model "github.com/kubeflow/model-registry/catalog/pkg/openapi" - mrmodels "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/pkg/api" + "github.com/kubeflow/hub/catalog/internal/catalog" + "github.com/kubeflow/hub/catalog/internal/catalog/basecatalog" + "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog" + "github.com/kubeflow/hub/catalog/internal/db/models" + model "github.com/kubeflow/hub/catalog/pkg/openapi" + mrmodels "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/pkg/api" ) // ModelCatalogServiceAPIService is a service that implements the logic for the ModelCatalogServiceAPIServicer diff --git a/catalog/internal/server/openapi/api_model_catalog_service_service_test.go b/catalog/internal/server/openapi/api_model_catalog_service_service_test.go index 3accc3fb56..d95c77afc3 100644 --- a/catalog/internal/server/openapi/api_model_catalog_service_service_test.go +++ b/catalog/internal/server/openapi/api_model_catalog_service_service_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "github.com/kubeflow/model-registry/catalog/internal/catalog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog" - model "github.com/kubeflow/model-registry/catalog/pkg/openapi" - mrmodels "github.com/kubeflow/model-registry/internal/db/models" + "github.com/kubeflow/hub/catalog/internal/catalog" + "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog" + model "github.com/kubeflow/hub/catalog/pkg/openapi" + mrmodels "github.com/kubeflow/hub/internal/db/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/catalog/internal/server/openapi/helpers.go b/catalog/internal/server/openapi/helpers.go index 39d5ee9c23..018a6a7475 100644 --- a/catalog/internal/server/openapi/helpers.go +++ b/catalog/internal/server/openapi/helpers.go @@ -23,7 +23,7 @@ import ( "strings" "time" - model "github.com/kubeflow/model-registry/pkg/openapi" + model "github.com/kubeflow/hub/pkg/openapi" ) const errMsgRequiredMissing = "required parameter is missing" diff --git a/catalog/internal/server/openapi/integration_test.go b/catalog/internal/server/openapi/integration_test.go index 341a1b6156..a7c7bbb4cc 100644 --- a/catalog/internal/server/openapi/integration_test.go +++ b/catalog/internal/server/openapi/integration_test.go @@ -10,11 +10,11 @@ import ( "testing" "github.com/go-chi/chi/v5" - "github.com/kubeflow/model-registry/catalog/internal/catalog" - "github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog" - "github.com/kubeflow/model-registry/catalog/internal/server/openapi" - model "github.com/kubeflow/model-registry/catalog/pkg/openapi" - mrmodels "github.com/kubeflow/model-registry/internal/db/models" + "github.com/kubeflow/hub/catalog/internal/catalog" + "github.com/kubeflow/hub/catalog/internal/catalog/modelcatalog" + "github.com/kubeflow/hub/catalog/internal/server/openapi" + model "github.com/kubeflow/hub/catalog/pkg/openapi" + mrmodels "github.com/kubeflow/hub/internal/db/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/catalog/internal/server/openapi/pagination.go b/catalog/internal/server/openapi/pagination.go index 0768ef5b01..0b38773e95 100644 --- a/catalog/internal/server/openapi/pagination.go +++ b/catalog/internal/server/openapi/pagination.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" - model "github.com/kubeflow/model-registry/catalog/pkg/openapi" - "github.com/kubeflow/model-registry/internal/db/scopes" + model "github.com/kubeflow/hub/catalog/pkg/openapi" + "github.com/kubeflow/hub/internal/db/scopes" ) // parsePaginationParams validates and parses pageSize and nextPageToken for DB-backed endpoints. diff --git a/catalog/internal/server/openapi/pagination_test.go b/catalog/internal/server/openapi/pagination_test.go index c8627f8982..e2facf644e 100644 --- a/catalog/internal/server/openapi/pagination_test.go +++ b/catalog/internal/server/openapi/pagination_test.go @@ -4,7 +4,7 @@ import ( "strconv" "testing" - model "github.com/kubeflow/model-registry/catalog/pkg/openapi" + model "github.com/kubeflow/hub/catalog/pkg/openapi" "github.com/stretchr/testify/assert" ) diff --git a/catalog/internal/server/openapi/type_asserts.go b/catalog/internal/server/openapi/type_asserts.go index 47bcda147d..6a2cdc22c3 100644 --- a/catalog/internal/server/openapi/type_asserts.go +++ b/catalog/internal/server/openapi/type_asserts.go @@ -15,7 +15,7 @@ package openapi import ( "errors" - model "github.com/kubeflow/model-registry/catalog/pkg/openapi" + model "github.com/kubeflow/hub/catalog/pkg/openapi" ) // AssertArtifactTypeQueryParamConstraints checks if the values respects the defined constraints diff --git a/catalog/internal/server/openapi/type_asserts_overrides.go b/catalog/internal/server/openapi/type_asserts_overrides.go index 264c88dff3..84598ecc92 100644 --- a/catalog/internal/server/openapi/type_asserts_overrides.go +++ b/catalog/internal/server/openapi/type_asserts_overrides.go @@ -1,7 +1,7 @@ package openapi import ( - model "github.com/kubeflow/model-registry/catalog/pkg/openapi" + model "github.com/kubeflow/hub/catalog/pkg/openapi" ) // AssertCatalogArtifactRequired checks if the required fields are not zero-ed diff --git a/catalog/internal/testhelpers/type_helpers.go b/catalog/internal/testhelpers/type_helpers.go index 05d80ccedf..603b1a1549 100644 --- a/catalog/internal/testhelpers/type_helpers.go +++ b/catalog/internal/testhelpers/type_helpers.go @@ -3,8 +3,8 @@ package testhelpers import ( "testing" - "github.com/kubeflow/model-registry/catalog/internal/db/service" - "github.com/kubeflow/model-registry/internal/db/schema" + "github.com/kubeflow/hub/catalog/internal/db/service" + "github.com/kubeflow/hub/internal/db/schema" "github.com/stretchr/testify/require" "gorm.io/gorm" ) diff --git a/catalog/pkg/openapi/go.mod b/catalog/pkg/openapi/go.mod index 5ab30cc2b1..00b09cf930 100644 --- a/catalog/pkg/openapi/go.mod +++ b/catalog/pkg/openapi/go.mod @@ -1,3 +1,3 @@ -module github.com/kubeflow/model-registry/catalog/pkg/openapi +module github.com/kubeflow/hub/catalog/pkg/openapi go 1.25.7 diff --git a/catalog/scripts/gen_openapi_server.sh b/catalog/scripts/gen_openapi_server.sh index a7b93ecb0e..28ea8eb04f 100755 --- a/catalog/scripts/gen_openapi_server.sh +++ b/catalog/scripts/gen_openapi_server.sh @@ -40,7 +40,7 @@ for filepath in filepaths: py-re-replace 0 'model\.\[\]ArtifactTypeQueryParam' '[]model.ArtifactTypeQueryParam' "$PROJECT_ROOT"/internal/server/openapi/api.go py-re-replace 0 'model\.\[\]ArtifactType2QueryParam' '[]model.ArtifactTypeQueryParam' "$PROJECT_ROOT"/internal/server/openapi/api.go -py-re-replace 1 'github\.com/kubeflow/model-registry/pkg/openapi' 'github.com/kubeflow/model-registry/catalog/pkg/openapi' \ +py-re-replace 1 'github\.com/kubeflow/hub/pkg/openapi' 'github.com/kubeflow/hub/catalog/pkg/openapi' \ "$PROJECT_ROOT"/internal/server/openapi/api_model_catalog_service.go \ "$PROJECT_ROOT"/internal/server/openapi/api_mcp_catalog_service.go \ "$PROJECT_ROOT"/internal/server/openapi/api.go diff --git a/catalog/scripts/gen_type_asserts.py b/catalog/scripts/gen_type_asserts.py index 9491a5a829..320d9af1d2 100644 --- a/catalog/scripts/gen_type_asserts.py +++ b/catalog/scripts/gen_type_asserts.py @@ -65,7 +65,7 @@ def get_name(func: str) -> str: package openapi import ( - model "github.com/kubeflow/model-registry/catalog/pkg/openapi" + model "github.com/kubeflow/hub/catalog/pkg/openapi" ) """) diff --git a/clients/ui/bff/cmd/main.go b/clients/ui/bff/cmd/main.go index 6b8165fef8..9c6f2b9826 100644 --- a/clients/ui/bff/cmd/main.go +++ b/clients/ui/bff/cmd/main.go @@ -8,8 +8,8 @@ import ( "os/signal" "syscall" - "github.com/kubeflow/model-registry/ui/bff/internal/api" - "github.com/kubeflow/model-registry/ui/bff/internal/config" + "github.com/kubeflow/hub/ui/bff/internal/api" + "github.com/kubeflow/hub/ui/bff/internal/config" "log/slog" "net/http" diff --git a/clients/ui/bff/go.mod b/clients/ui/bff/go.mod index b0168693bd..9a42fcbd7b 100644 --- a/clients/ui/bff/go.mod +++ b/clients/ui/bff/go.mod @@ -1,4 +1,4 @@ -module github.com/kubeflow/model-registry/ui/bff +module github.com/kubeflow/hub/ui/bff go 1.25.7 diff --git a/clients/ui/bff/internal/api/app.go b/clients/ui/bff/internal/api/app.go index 9039ded015..00857f94f3 100644 --- a/clients/ui/bff/internal/api/app.go +++ b/clients/ui/bff/internal/api/app.go @@ -10,18 +10,18 @@ import ( "path" "strings" - k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - k8mocks "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes/k8mocks" + k8s "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + k8mocks "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes/k8mocks" "k8s.io/client-go/kubernetes" "sigs.k8s.io/controller-runtime/pkg/envtest" - helper "github.com/kubeflow/model-registry/ui/bff/internal/helpers" + helper "github.com/kubeflow/hub/ui/bff/internal/helpers" - "github.com/kubeflow/model-registry/ui/bff/internal/config" - "github.com/kubeflow/model-registry/ui/bff/internal/repositories" + "github.com/kubeflow/hub/ui/bff/internal/config" + "github.com/kubeflow/hub/ui/bff/internal/repositories" "github.com/julienschmidt/httprouter" - "github.com/kubeflow/model-registry/ui/bff/internal/mocks" + "github.com/kubeflow/hub/ui/bff/internal/mocks" ) const ( diff --git a/clients/ui/bff/internal/api/app_test.go b/clients/ui/bff/internal/api/app_test.go index d592d31842..52543c6355 100644 --- a/clients/ui/bff/internal/api/app_test.go +++ b/clients/ui/bff/internal/api/app_test.go @@ -5,8 +5,8 @@ import ( "net/http" httptest "net/http/httptest" - "github.com/kubeflow/model-registry/ui/bff/internal/config" - "github.com/kubeflow/model-registry/ui/bff/internal/repositories" + "github.com/kubeflow/hub/ui/bff/internal/config" + "github.com/kubeflow/hub/ui/bff/internal/repositories" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/clients/ui/bff/internal/api/artifacts_handler.go b/clients/ui/bff/internal/api/artifacts_handler.go index ab17f95747..4ca66db9e3 100644 --- a/clients/ui/bff/internal/api/artifacts_handler.go +++ b/clients/ui/bff/internal/api/artifacts_handler.go @@ -6,11 +6,11 @@ import ( "fmt" "net/http" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/httpclient" + "github.com/kubeflow/hub/ui/bff/internal/integrations/httpclient" "github.com/julienschmidt/httprouter" + "github.com/kubeflow/hub/ui/bff/internal/constants" "github.com/kubeflow/model-registry/pkg/openapi" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" ) type ArtifactListEnvelope Envelope[*openapi.ArtifactList, None] diff --git a/clients/ui/bff/internal/api/artifacts_handler_test.go b/clients/ui/bff/internal/api/artifacts_handler_test.go index c20837cc9f..efc227fe28 100644 --- a/clients/ui/bff/internal/api/artifacts_handler_test.go +++ b/clients/ui/bff/internal/api/artifacts_handler_test.go @@ -1,11 +1,12 @@ package api import ( - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" "net/http" + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/brianvoe/gofakeit/v7" - "github.com/kubeflow/model-registry/ui/bff/internal/mocks" + "github.com/kubeflow/hub/ui/bff/internal/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/clients/ui/bff/internal/api/catalog_filters_handler.go b/clients/ui/bff/internal/api/catalog_filters_handler.go index be7fbf15d5..0875490faf 100644 --- a/clients/ui/bff/internal/api/catalog_filters_handler.go +++ b/clients/ui/bff/internal/api/catalog_filters_handler.go @@ -5,9 +5,9 @@ import ( "net/http" "github.com/julienschmidt/httprouter" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/httpclient" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/constants" + "github.com/kubeflow/hub/ui/bff/internal/integrations/httpclient" + "github.com/kubeflow/hub/ui/bff/internal/models" ) type CatalogFilterOptionsListEnvelope Envelope[*models.FilterOptionsList, None] diff --git a/clients/ui/bff/internal/api/catalog_filters_handler_test.go b/clients/ui/bff/internal/api/catalog_filters_handler_test.go index 3722aed809..8995e10763 100644 --- a/clients/ui/bff/internal/api/catalog_filters_handler_test.go +++ b/clients/ui/bff/internal/api/catalog_filters_handler_test.go @@ -3,8 +3,8 @@ package api import ( "net/http" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/mocks" + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/clients/ui/bff/internal/api/catalog_models_handler.go b/clients/ui/bff/internal/api/catalog_models_handler.go index a4ea49703e..227f123684 100644 --- a/clients/ui/bff/internal/api/catalog_models_handler.go +++ b/clients/ui/bff/internal/api/catalog_models_handler.go @@ -5,9 +5,9 @@ import ( "net/http" "github.com/julienschmidt/httprouter" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/httpclient" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/constants" + "github.com/kubeflow/hub/ui/bff/internal/integrations/httpclient" + "github.com/kubeflow/hub/ui/bff/internal/models" ) type CatalogModelListEnvelope Envelope[*models.CatalogModelList, None] diff --git a/clients/ui/bff/internal/api/catalog_models_handler_test.go b/clients/ui/bff/internal/api/catalog_models_handler_test.go index 301a42553e..1580357327 100644 --- a/clients/ui/bff/internal/api/catalog_models_handler_test.go +++ b/clients/ui/bff/internal/api/catalog_models_handler_test.go @@ -3,8 +3,8 @@ package api import ( "net/http" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/mocks" + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/clients/ui/bff/internal/api/catalog_source_preview_handler.go b/clients/ui/bff/internal/api/catalog_source_preview_handler.go index 88498b86ef..da0724149f 100644 --- a/clients/ui/bff/internal/api/catalog_source_preview_handler.go +++ b/clients/ui/bff/internal/api/catalog_source_preview_handler.go @@ -7,9 +7,9 @@ import ( "net/http" "github.com/julienschmidt/httprouter" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/httpclient" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/constants" + "github.com/kubeflow/hub/ui/bff/internal/integrations/httpclient" + "github.com/kubeflow/hub/ui/bff/internal/models" ) type CatalogSourcePreviewEnvelope Envelope[*models.CatalogSourcePreviewResult, None] diff --git a/clients/ui/bff/internal/api/catalog_source_preview_handler_test.go b/clients/ui/bff/internal/api/catalog_source_preview_handler_test.go index 09769cae24..9ed08fee37 100644 --- a/clients/ui/bff/internal/api/catalog_source_preview_handler_test.go +++ b/clients/ui/bff/internal/api/catalog_source_preview_handler_test.go @@ -5,9 +5,9 @@ import ( "encoding/json" "net/http" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/mocks" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/mocks" + "github.com/kubeflow/hub/ui/bff/internal/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/clients/ui/bff/internal/api/catalog_sources_handler.go b/clients/ui/bff/internal/api/catalog_sources_handler.go index 564da37da3..6da3ce5746 100644 --- a/clients/ui/bff/internal/api/catalog_sources_handler.go +++ b/clients/ui/bff/internal/api/catalog_sources_handler.go @@ -7,9 +7,9 @@ import ( "strings" "github.com/julienschmidt/httprouter" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/httpclient" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/constants" + "github.com/kubeflow/hub/ui/bff/internal/integrations/httpclient" + "github.com/kubeflow/hub/ui/bff/internal/models" ) type CatalogSourceListEnvelope Envelope[*models.CatalogSourceList, None] diff --git a/clients/ui/bff/internal/api/catalog_sources_handler_test.go b/clients/ui/bff/internal/api/catalog_sources_handler_test.go index 7448dbdb13..576d945dcd 100644 --- a/clients/ui/bff/internal/api/catalog_sources_handler_test.go +++ b/clients/ui/bff/internal/api/catalog_sources_handler_test.go @@ -3,8 +3,8 @@ package api import ( "net/http" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/mocks" + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/clients/ui/bff/internal/api/check_namespace_registry_access_handler.go b/clients/ui/bff/internal/api/check_namespace_registry_access_handler.go index b6e4874ebf..8f71a38ee5 100644 --- a/clients/ui/bff/internal/api/check_namespace_registry_access_handler.go +++ b/clients/ui/bff/internal/api/check_namespace_registry_access_handler.go @@ -6,8 +6,8 @@ import ( "net/http" "github.com/julienschmidt/httprouter" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/constants" + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" ) const CheckNamespaceRegistryAccessPath = ApiPathPrefix + "/check-namespace-registry-access" diff --git a/clients/ui/bff/internal/api/check_namespace_registry_access_handler_test.go b/clients/ui/bff/internal/api/check_namespace_registry_access_handler_test.go index 51773e2d85..d322c09e6b 100644 --- a/clients/ui/bff/internal/api/check_namespace_registry_access_handler_test.go +++ b/clients/ui/bff/internal/api/check_namespace_registry_access_handler_test.go @@ -8,10 +8,10 @@ import ( "net/http" "net/http/httptest" - "github.com/kubeflow/model-registry/ui/bff/internal/config" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/repositories" + "github.com/kubeflow/hub/ui/bff/internal/config" + "github.com/kubeflow/hub/ui/bff/internal/constants" + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/repositories" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/clients/ui/bff/internal/api/errors.go b/clients/ui/bff/internal/api/errors.go index 522169eb13..070fc2da9f 100644 --- a/clients/ui/bff/internal/api/errors.go +++ b/clients/ui/bff/internal/api/errors.go @@ -6,7 +6,7 @@ import ( "net/http" "strconv" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/httpclient" + "github.com/kubeflow/hub/ui/bff/internal/integrations/httpclient" ) type HTTPError struct { diff --git a/clients/ui/bff/internal/api/healthcheck__handler_test.go b/clients/ui/bff/internal/api/healthcheck__handler_test.go index de2ecc30c0..f17d96843c 100644 --- a/clients/ui/bff/internal/api/healthcheck__handler_test.go +++ b/clients/ui/bff/internal/api/healthcheck__handler_test.go @@ -7,10 +7,10 @@ import ( "net/http/httptest" "testing" - "github.com/kubeflow/model-registry/ui/bff/internal/config" - "github.com/kubeflow/model-registry/ui/bff/internal/mocks" - "github.com/kubeflow/model-registry/ui/bff/internal/models" - "github.com/kubeflow/model-registry/ui/bff/internal/repositories" + "github.com/kubeflow/hub/ui/bff/internal/config" + "github.com/kubeflow/hub/ui/bff/internal/mocks" + "github.com/kubeflow/hub/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/repositories" "github.com/stretchr/testify/assert" ) diff --git a/clients/ui/bff/internal/api/mcp_servers_catalog_handler.go b/clients/ui/bff/internal/api/mcp_servers_catalog_handler.go index d8627daeaa..7ae8356412 100644 --- a/clients/ui/bff/internal/api/mcp_servers_catalog_handler.go +++ b/clients/ui/bff/internal/api/mcp_servers_catalog_handler.go @@ -6,9 +6,9 @@ import ( "net/http" "github.com/julienschmidt/httprouter" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/httpclient" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/constants" + "github.com/kubeflow/hub/ui/bff/internal/integrations/httpclient" + "github.com/kubeflow/hub/ui/bff/internal/models" ) type McpServerListEnvelope Envelope[*models.McpServerList, None] diff --git a/clients/ui/bff/internal/api/mcp_servers_catalog_handler_test.go b/clients/ui/bff/internal/api/mcp_servers_catalog_handler_test.go index c18e529b6b..d23e87e1b8 100644 --- a/clients/ui/bff/internal/api/mcp_servers_catalog_handler_test.go +++ b/clients/ui/bff/internal/api/mcp_servers_catalog_handler_test.go @@ -3,8 +3,8 @@ package api import ( "net/http" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/mocks" + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/clients/ui/bff/internal/api/middleware.go b/clients/ui/bff/internal/api/middleware.go index 01c868b2ad..a910796c68 100644 --- a/clients/ui/bff/internal/api/middleware.go +++ b/clients/ui/bff/internal/api/middleware.go @@ -8,16 +8,16 @@ import ( "runtime/debug" "strings" - "github.com/kubeflow/model-registry/ui/bff/internal/config" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/httpclient" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/models" - "github.com/kubeflow/model-registry/ui/bff/internal/repositories" + "github.com/kubeflow/hub/ui/bff/internal/config" + "github.com/kubeflow/hub/ui/bff/internal/integrations/httpclient" + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/repositories" "github.com/google/uuid" "github.com/julienschmidt/httprouter" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - helper "github.com/kubeflow/model-registry/ui/bff/internal/helpers" + "github.com/kubeflow/hub/ui/bff/internal/constants" + helper "github.com/kubeflow/hub/ui/bff/internal/helpers" "github.com/rs/cors" ) diff --git a/clients/ui/bff/internal/api/model_artifacts_handler.go b/clients/ui/bff/internal/api/model_artifacts_handler.go index c8a1de571f..90cb704679 100644 --- a/clients/ui/bff/internal/api/model_artifacts_handler.go +++ b/clients/ui/bff/internal/api/model_artifacts_handler.go @@ -6,11 +6,11 @@ import ( "fmt" "net/http" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/httpclient" + "github.com/kubeflow/hub/ui/bff/internal/integrations/httpclient" "github.com/julienschmidt/httprouter" + "github.com/kubeflow/hub/ui/bff/internal/constants" "github.com/kubeflow/model-registry/pkg/openapi" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" ) type ModelArtifactUpdateEnvelope Envelope[*openapi.ModelArtifactUpdate, None] diff --git a/clients/ui/bff/internal/api/model_artifacts_handler_test.go b/clients/ui/bff/internal/api/model_artifacts_handler_test.go index 055d464c9f..1fd11a2617 100644 --- a/clients/ui/bff/internal/api/model_artifacts_handler_test.go +++ b/clients/ui/bff/internal/api/model_artifacts_handler_test.go @@ -1,11 +1,12 @@ package api import ( - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" "net/http" + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/brianvoe/gofakeit/v7" - "github.com/kubeflow/model-registry/ui/bff/internal/mocks" + "github.com/kubeflow/hub/ui/bff/internal/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/clients/ui/bff/internal/api/model_catalog_settings_handler.go b/clients/ui/bff/internal/api/model_catalog_settings_handler.go index 515f9086ac..96640a2dfe 100644 --- a/clients/ui/bff/internal/api/model_catalog_settings_handler.go +++ b/clients/ui/bff/internal/api/model_catalog_settings_handler.go @@ -7,9 +7,9 @@ import ( "net/http" "github.com/julienschmidt/httprouter" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - "github.com/kubeflow/model-registry/ui/bff/internal/models" - "github.com/kubeflow/model-registry/ui/bff/internal/repositories" + "github.com/kubeflow/hub/ui/bff/internal/constants" + "github.com/kubeflow/hub/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/repositories" ) type ModelCatalogSettingsSourceConfigEnvelope Envelope[*models.CatalogSourceConfig, None] diff --git a/clients/ui/bff/internal/api/model_catalog_settings_handler_test.go b/clients/ui/bff/internal/api/model_catalog_settings_handler_test.go index 364993c678..886bbce2b6 100644 --- a/clients/ui/bff/internal/api/model_catalog_settings_handler_test.go +++ b/clients/ui/bff/internal/api/model_catalog_settings_handler_test.go @@ -3,8 +3,8 @@ package api import ( "net/http" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/clients/ui/bff/internal/api/model_registry_handler.go b/clients/ui/bff/internal/api/model_registry_handler.go index 22b228a4b1..053e6d22b7 100644 --- a/clients/ui/bff/internal/api/model_registry_handler.go +++ b/clients/ui/bff/internal/api/model_registry_handler.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/julienschmidt/httprouter" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/constants" + "github.com/kubeflow/hub/ui/bff/internal/models" ) type ModelRegistryListEnvelope Envelope[[]models.ModelRegistryModel, None] diff --git a/clients/ui/bff/internal/api/model_registry_handler_test.go b/clients/ui/bff/internal/api/model_registry_handler_test.go index f2d6b33d0e..1c558276a3 100644 --- a/clients/ui/bff/internal/api/model_registry_handler_test.go +++ b/clients/ui/bff/internal/api/model_registry_handler_test.go @@ -8,10 +8,10 @@ import ( "net/http" "net/http/httptest" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - "github.com/kubeflow/model-registry/ui/bff/internal/mocks" - "github.com/kubeflow/model-registry/ui/bff/internal/models" - "github.com/kubeflow/model-registry/ui/bff/internal/repositories" + "github.com/kubeflow/hub/ui/bff/internal/constants" + "github.com/kubeflow/hub/ui/bff/internal/mocks" + "github.com/kubeflow/hub/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/repositories" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/clients/ui/bff/internal/api/model_registry_settings_groups_handler.go b/clients/ui/bff/internal/api/model_registry_settings_groups_handler.go index 7352137fa4..56073733e2 100644 --- a/clients/ui/bff/internal/api/model_registry_settings_groups_handler.go +++ b/clients/ui/bff/internal/api/model_registry_settings_groups_handler.go @@ -5,9 +5,9 @@ import ( "net/http" "github.com/julienschmidt/httprouter" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/constants" + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/models" ) type GroupsEnvelope Envelope[[]models.Group, None] diff --git a/clients/ui/bff/internal/api/model_registry_settings_groups_handler_test.go b/clients/ui/bff/internal/api/model_registry_settings_groups_handler_test.go index f1dcd01995..cc8e4d5cfa 100644 --- a/clients/ui/bff/internal/api/model_registry_settings_groups_handler_test.go +++ b/clients/ui/bff/internal/api/model_registry_settings_groups_handler_test.go @@ -7,10 +7,10 @@ import ( "net/http" "net/http/httptest" - "github.com/kubeflow/model-registry/ui/bff/internal/config" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/repositories" + "github.com/kubeflow/hub/ui/bff/internal/config" + "github.com/kubeflow/hub/ui/bff/internal/constants" + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/repositories" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/clients/ui/bff/internal/api/model_registry_settings_handler.go b/clients/ui/bff/internal/api/model_registry_settings_handler.go index dc8adcae25..95d35aa826 100644 --- a/clients/ui/bff/internal/api/model_registry_settings_handler.go +++ b/clients/ui/bff/internal/api/model_registry_settings_handler.go @@ -7,9 +7,9 @@ import ( "time" "github.com/julienschmidt/httprouter" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - helper "github.com/kubeflow/model-registry/ui/bff/internal/helpers" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/constants" + helper "github.com/kubeflow/hub/ui/bff/internal/helpers" + "github.com/kubeflow/hub/ui/bff/internal/models" ) type ModelRegistrySettingsListEnvelope Envelope[[]models.ModelRegistryKind, None] diff --git a/clients/ui/bff/internal/api/model_registry_settings_rbac_handler.go b/clients/ui/bff/internal/api/model_registry_settings_rbac_handler.go index e21180cf2b..653da4d28a 100644 --- a/clients/ui/bff/internal/api/model_registry_settings_rbac_handler.go +++ b/clients/ui/bff/internal/api/model_registry_settings_rbac_handler.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/julienschmidt/httprouter" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/models" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" // Add other necessary imports like context, slog, helpers etc. diff --git a/clients/ui/bff/internal/api/model_registry_settings_rbac_handler_test.go b/clients/ui/bff/internal/api/model_registry_settings_rbac_handler_test.go index 7421be1146..59e3d8d93a 100644 --- a/clients/ui/bff/internal/api/model_registry_settings_rbac_handler_test.go +++ b/clients/ui/bff/internal/api/model_registry_settings_rbac_handler_test.go @@ -9,11 +9,11 @@ import ( "net/http/httptest" "github.com/julienschmidt/httprouter" - "github.com/kubeflow/model-registry/ui/bff/internal/config" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/models" - "github.com/kubeflow/model-registry/ui/bff/internal/repositories" + "github.com/kubeflow/hub/ui/bff/internal/config" + "github.com/kubeflow/hub/ui/bff/internal/constants" + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/repositories" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" rbacv1 "k8s.io/api/rbac/v1" diff --git a/clients/ui/bff/internal/api/model_transfer_job_handler.go b/clients/ui/bff/internal/api/model_transfer_job_handler.go index 2e5a2cf7ff..1b3dcc861a 100644 --- a/clients/ui/bff/internal/api/model_transfer_job_handler.go +++ b/clients/ui/bff/internal/api/model_transfer_job_handler.go @@ -7,9 +7,9 @@ import ( "net/http" "github.com/julienschmidt/httprouter" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - "github.com/kubeflow/model-registry/ui/bff/internal/models" - "github.com/kubeflow/model-registry/ui/bff/internal/repositories" + "github.com/kubeflow/hub/ui/bff/internal/constants" + "github.com/kubeflow/hub/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/repositories" ) type ModelTransferJobListEnvelope Envelope[*models.ModelTransferJobList, None] diff --git a/clients/ui/bff/internal/api/model_transfer_job_handler_test.go b/clients/ui/bff/internal/api/model_transfer_job_handler_test.go index bc4528123a..f70c88bdd4 100644 --- a/clients/ui/bff/internal/api/model_transfer_job_handler_test.go +++ b/clients/ui/bff/internal/api/model_transfer_job_handler_test.go @@ -3,8 +3,8 @@ package api import ( "net/http" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/clients/ui/bff/internal/api/model_versions_handler.go b/clients/ui/bff/internal/api/model_versions_handler.go index d9de9429d6..588cb4acae 100644 --- a/clients/ui/bff/internal/api/model_versions_handler.go +++ b/clients/ui/bff/internal/api/model_versions_handler.go @@ -7,10 +7,10 @@ import ( "net/http" "github.com/julienschmidt/httprouter" + "github.com/kubeflow/hub/ui/bff/internal/constants" + "github.com/kubeflow/hub/ui/bff/internal/integrations/httpclient" + "github.com/kubeflow/hub/ui/bff/internal/validation" "github.com/kubeflow/model-registry/pkg/openapi" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/httpclient" - "github.com/kubeflow/model-registry/ui/bff/internal/validation" ) type ModelVersionEnvelope Envelope[*openapi.ModelVersion, None] diff --git a/clients/ui/bff/internal/api/model_versions_handler_test.go b/clients/ui/bff/internal/api/model_versions_handler_test.go index ec54c92e0a..505233d863 100644 --- a/clients/ui/bff/internal/api/model_versions_handler_test.go +++ b/clients/ui/bff/internal/api/model_versions_handler_test.go @@ -1,12 +1,13 @@ package api import ( + "net/http" + + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/mocks" "github.com/kubeflow/model-registry/pkg/openapi" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "net/http" ) var _ = Describe("TestGetModelVersionHandler", func() { diff --git a/clients/ui/bff/internal/api/namespaces_handler.go b/clients/ui/bff/internal/api/namespaces_handler.go index 2dfe785538..1a6dfe7fe8 100644 --- a/clients/ui/bff/internal/api/namespaces_handler.go +++ b/clients/ui/bff/internal/api/namespaces_handler.go @@ -6,9 +6,9 @@ import ( "strings" "github.com/julienschmidt/httprouter" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/constants" + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/models" apierrors "k8s.io/apimachinery/pkg/api/errors" ) diff --git a/clients/ui/bff/internal/api/namespaces_handler_test.go b/clients/ui/bff/internal/api/namespaces_handler_test.go index b6b8a458f8..e774de46a3 100644 --- a/clients/ui/bff/internal/api/namespaces_handler_test.go +++ b/clients/ui/bff/internal/api/namespaces_handler_test.go @@ -7,12 +7,12 @@ import ( "net/http" "net/http/httptest" - "github.com/kubeflow/model-registry/ui/bff/internal/config" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes/k8mocks" - "github.com/kubeflow/model-registry/ui/bff/internal/models" - "github.com/kubeflow/model-registry/ui/bff/internal/repositories" + "github.com/kubeflow/hub/ui/bff/internal/config" + "github.com/kubeflow/hub/ui/bff/internal/constants" + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes/k8mocks" + "github.com/kubeflow/hub/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/repositories" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/clients/ui/bff/internal/api/public_helpers.go b/clients/ui/bff/internal/api/public_helpers.go index 7254cc8f89..28aea9ff67 100644 --- a/clients/ui/bff/internal/api/public_helpers.go +++ b/clients/ui/bff/internal/api/public_helpers.go @@ -7,9 +7,9 @@ import ( "log/slog" "github.com/julienschmidt/httprouter" - "github.com/kubeflow/model-registry/ui/bff/internal/config" - k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/repositories" + "github.com/kubeflow/hub/ui/bff/internal/config" + k8s "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/repositories" ) // BadRequest exposes the internal bad request helper for extensions. diff --git a/clients/ui/bff/internal/api/registered_models_handler.go b/clients/ui/bff/internal/api/registered_models_handler.go index 2b147cbff5..012128b5e3 100644 --- a/clients/ui/bff/internal/api/registered_models_handler.go +++ b/clients/ui/bff/internal/api/registered_models_handler.go @@ -7,10 +7,10 @@ import ( "net/http" "github.com/julienschmidt/httprouter" + "github.com/kubeflow/hub/ui/bff/internal/constants" + "github.com/kubeflow/hub/ui/bff/internal/integrations/httpclient" + "github.com/kubeflow/hub/ui/bff/internal/validation" "github.com/kubeflow/model-registry/pkg/openapi" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/httpclient" - "github.com/kubeflow/model-registry/ui/bff/internal/validation" ) type RegisteredModelEnvelope Envelope[*openapi.RegisteredModel, None] diff --git a/clients/ui/bff/internal/api/registered_models_handler_test.go b/clients/ui/bff/internal/api/registered_models_handler_test.go index 5664b4d634..777eb3036f 100644 --- a/clients/ui/bff/internal/api/registered_models_handler_test.go +++ b/clients/ui/bff/internal/api/registered_models_handler_test.go @@ -1,12 +1,13 @@ package api import ( + "net/http" + + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/mocks" "github.com/kubeflow/model-registry/pkg/openapi" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "net/http" ) var _ = Describe("TestGetRegisteredModelHandler", func() { diff --git a/clients/ui/bff/internal/api/suite_test.go b/clients/ui/bff/internal/api/suite_test.go index 8eb06bab78..6e23e84f64 100644 --- a/clients/ui/bff/internal/api/suite_test.go +++ b/clients/ui/bff/internal/api/suite_test.go @@ -6,13 +6,13 @@ import ( "os" "testing" - k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes/k8mocks" + k8s "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes/k8mocks" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/envtest" - "github.com/kubeflow/model-registry/ui/bff/internal/mocks" + "github.com/kubeflow/hub/ui/bff/internal/mocks" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" diff --git a/clients/ui/bff/internal/api/test_app.go b/clients/ui/bff/internal/api/test_app.go index 776c0f3650..386fd0b478 100644 --- a/clients/ui/bff/internal/api/test_app.go +++ b/clients/ui/bff/internal/api/test_app.go @@ -4,9 +4,9 @@ import ( "io" "log/slog" - "github.com/kubeflow/model-registry/ui/bff/internal/config" - k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/repositories" + "github.com/kubeflow/hub/ui/bff/internal/config" + k8s "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/repositories" ) // NewTestApp exposes a minimal constructor that allows tests and downstream diff --git a/clients/ui/bff/internal/api/test_utils.go b/clients/ui/bff/internal/api/test_utils.go index 72a1b0c2d3..7d9bc60197 100644 --- a/clients/ui/bff/internal/api/test_utils.go +++ b/clients/ui/bff/internal/api/test_utils.go @@ -11,13 +11,13 @@ import ( "os" "path/filepath" - "github.com/kubeflow/model-registry/ui/bff/internal/config" - k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations/httpclient" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/config" + k8s "github.com/kubeflow/hub/ui/bff/internal/integrations/httpclient" + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - "github.com/kubeflow/model-registry/ui/bff/internal/mocks" - "github.com/kubeflow/model-registry/ui/bff/internal/repositories" + "github.com/kubeflow/hub/ui/bff/internal/constants" + "github.com/kubeflow/hub/ui/bff/internal/mocks" + "github.com/kubeflow/hub/ui/bff/internal/repositories" ) func setupApiTest[T any](method string, url string, body interface{}, k8Factory kubernetes.KubernetesClientFactory, requestIdentity kubernetes.RequestIdentity, namespace string) (T, *http.Response, error) { diff --git a/clients/ui/bff/internal/api/user_handler.go b/clients/ui/bff/internal/api/user_handler.go index 9890843295..17fb742751 100644 --- a/clients/ui/bff/internal/api/user_handler.go +++ b/clients/ui/bff/internal/api/user_handler.go @@ -2,11 +2,12 @@ package api import ( "fmt" - "github.com/julienschmidt/httprouter" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/models" "net/http" + + "github.com/julienschmidt/httprouter" + "github.com/kubeflow/hub/ui/bff/internal/constants" + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/models" ) type UserEnvelope Envelope[*models.User, None] diff --git a/clients/ui/bff/internal/api/user_handler_test.go b/clients/ui/bff/internal/api/user_handler_test.go index 812e9de69c..d0b8e94c57 100644 --- a/clients/ui/bff/internal/api/user_handler_test.go +++ b/clients/ui/bff/internal/api/user_handler_test.go @@ -7,10 +7,10 @@ import ( "net/http" "net/http/httptest" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/constants" + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/repositories" + "github.com/kubeflow/hub/ui/bff/internal/repositories" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/clients/ui/bff/internal/helpers/logging.go b/clients/ui/bff/internal/helpers/logging.go index 40b60f67fa..11ba74016f 100644 --- a/clients/ui/bff/internal/helpers/logging.go +++ b/clients/ui/bff/internal/helpers/logging.go @@ -4,11 +4,12 @@ import ( "bytes" "context" "fmt" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" "io" "log/slog" "net/http" "slices" + + "github.com/kubeflow/hub/ui/bff/internal/constants" ) func GetContextLoggerFromReq(r *http.Request) *slog.Logger { diff --git a/clients/ui/bff/internal/integrations/httpclient/http.go b/clients/ui/bff/internal/integrations/httpclient/http.go index 3e6e0b1128..beec6a36f8 100644 --- a/clients/ui/bff/internal/integrations/httpclient/http.go +++ b/clients/ui/bff/internal/integrations/httpclient/http.go @@ -11,7 +11,7 @@ import ( "strconv" "github.com/google/uuid" - helper "github.com/kubeflow/model-registry/ui/bff/internal/helpers" + helper "github.com/kubeflow/hub/ui/bff/internal/helpers" ) type HTTPClientInterface interface { diff --git a/clients/ui/bff/internal/integrations/kubernetes/factory.go b/clients/ui/bff/internal/integrations/kubernetes/factory.go index d3d4e0d3a1..6767a73966 100644 --- a/clients/ui/bff/internal/integrations/kubernetes/factory.go +++ b/clients/ui/bff/internal/integrations/kubernetes/factory.go @@ -8,8 +8,8 @@ import ( "net/http" "strings" - "github.com/kubeflow/model-registry/ui/bff/internal/config" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" + "github.com/kubeflow/hub/ui/bff/internal/config" + "github.com/kubeflow/hub/ui/bff/internal/constants" ) // ─── STATIC FACTORY (INTERNAL) ────────────────────────────────────────── diff --git a/clients/ui/bff/internal/integrations/kubernetes/internal_k8s_client.go b/clients/ui/bff/internal/integrations/kubernetes/internal_k8s_client.go index 708c6a36ae..c8a9edbe04 100644 --- a/clients/ui/bff/internal/integrations/kubernetes/internal_k8s_client.go +++ b/clients/ui/bff/internal/integrations/kubernetes/internal_k8s_client.go @@ -6,7 +6,7 @@ import ( "log/slog" "time" - helper "github.com/kubeflow/model-registry/ui/bff/internal/helpers" + helper "github.com/kubeflow/hub/ui/bff/internal/helpers" authv1 "k8s.io/api/authorization/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/clients/ui/bff/internal/integrations/kubernetes/k8mocks/base_testenv.go b/clients/ui/bff/internal/integrations/kubernetes/k8mocks/base_testenv.go index 8acf16ae44..9a822d6643 100644 --- a/clients/ui/bff/internal/integrations/kubernetes/k8mocks/base_testenv.go +++ b/clients/ui/bff/internal/integrations/kubernetes/k8mocks/base_testenv.go @@ -12,7 +12,7 @@ import ( "strings" "time" - k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" + k8s "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" diff --git a/clients/ui/bff/internal/integrations/kubernetes/k8mocks/internal_k8s_client_mock.go b/clients/ui/bff/internal/integrations/kubernetes/k8mocks/internal_k8s_client_mock.go index c77ed2d61e..61ac82067e 100644 --- a/clients/ui/bff/internal/integrations/kubernetes/k8mocks/internal_k8s_client_mock.go +++ b/clients/ui/bff/internal/integrations/kubernetes/k8mocks/internal_k8s_client_mock.go @@ -5,7 +5,7 @@ import ( "fmt" "log/slog" - k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" + k8s "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes" ) diff --git a/clients/ui/bff/internal/integrations/kubernetes/k8mocks/mock_factory.go b/clients/ui/bff/internal/integrations/kubernetes/k8mocks/mock_factory.go index 0e3bd42d2c..1dadfb165d 100644 --- a/clients/ui/bff/internal/integrations/kubernetes/k8mocks/mock_factory.go +++ b/clients/ui/bff/internal/integrations/kubernetes/k8mocks/mock_factory.go @@ -3,15 +3,16 @@ package k8mocks import ( "context" "fmt" - "github.com/kubeflow/model-registry/ui/bff/internal/config" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "k8s.io/client-go/kubernetes" - "k8s.io/client-go/rest" "log/slog" "net/http" - "sigs.k8s.io/controller-runtime/pkg/envtest" "sync" + + "github.com/kubeflow/hub/ui/bff/internal/config" + "github.com/kubeflow/hub/ui/bff/internal/constants" + k8s "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "k8s.io/client-go/kubernetes" + "k8s.io/client-go/rest" + "sigs.k8s.io/controller-runtime/pkg/envtest" ) type MockedKubernetesClientFactory interface { diff --git a/clients/ui/bff/internal/integrations/kubernetes/k8mocks/token_k8s_client_mock.go b/clients/ui/bff/internal/integrations/kubernetes/k8mocks/token_k8s_client_mock.go index c7efc05614..fbe59caa97 100644 --- a/clients/ui/bff/internal/integrations/kubernetes/k8mocks/token_k8s_client_mock.go +++ b/clients/ui/bff/internal/integrations/kubernetes/k8mocks/token_k8s_client_mock.go @@ -5,7 +5,7 @@ import ( "fmt" "log/slog" - k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" + k8s "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes" ) diff --git a/clients/ui/bff/internal/integrations/kubernetes/shared_k8s_client.go b/clients/ui/bff/internal/integrations/kubernetes/shared_k8s_client.go index 851870eb8f..9b275b4cee 100644 --- a/clients/ui/bff/internal/integrations/kubernetes/shared_k8s_client.go +++ b/clients/ui/bff/internal/integrations/kubernetes/shared_k8s_client.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" + "github.com/kubeflow/hub/ui/bff/internal/constants" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/clients/ui/bff/internal/integrations/kubernetes/shared_k8s_client_test.go b/clients/ui/bff/internal/integrations/kubernetes/shared_k8s_client_test.go index ce7fe474ef..d0e6965294 100644 --- a/clients/ui/bff/internal/integrations/kubernetes/shared_k8s_client_test.go +++ b/clients/ui/bff/internal/integrations/kubernetes/shared_k8s_client_test.go @@ -5,7 +5,7 @@ import ( "log/slog" "testing" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" + "github.com/kubeflow/hub/ui/bff/internal/constants" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" diff --git a/clients/ui/bff/internal/integrations/kubernetes/tests/factory_test.go b/clients/ui/bff/internal/integrations/kubernetes/tests/factory_test.go index 7be647bd94..5742c512c2 100644 --- a/clients/ui/bff/internal/integrations/kubernetes/tests/factory_test.go +++ b/clients/ui/bff/internal/integrations/kubernetes/tests/factory_test.go @@ -1,10 +1,11 @@ package tests import ( - "github.com/kubeflow/model-registry/ui/bff/internal/config" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" "net/http" + "github.com/kubeflow/hub/ui/bff/internal/config" + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/clients/ui/bff/internal/integrations/kubernetes/tests/internal_k8s_client_test.go b/clients/ui/bff/internal/integrations/kubernetes/tests/internal_k8s_client_test.go index 27138dc437..6bfd0e12ec 100644 --- a/clients/ui/bff/internal/integrations/kubernetes/tests/internal_k8s_client_test.go +++ b/clients/ui/bff/internal/integrations/kubernetes/tests/internal_k8s_client_test.go @@ -1,9 +1,9 @@ package tests import ( - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - mocks2 "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes/k8mocks" - "github.com/kubeflow/model-registry/ui/bff/internal/mocks" + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + mocks2 "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes/k8mocks" + "github.com/kubeflow/hub/ui/bff/internal/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/clients/ui/bff/internal/integrations/kubernetes/tests/namespace_registry_access_test.go b/clients/ui/bff/internal/integrations/kubernetes/tests/namespace_registry_access_test.go index 5dcccdb5d4..851f5787d4 100644 --- a/clients/ui/bff/internal/integrations/kubernetes/tests/namespace_registry_access_test.go +++ b/clients/ui/bff/internal/integrations/kubernetes/tests/namespace_registry_access_test.go @@ -3,7 +3,7 @@ package tests import ( "context" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/clients/ui/bff/internal/integrations/kubernetes/tests/suite_test.go b/clients/ui/bff/internal/integrations/kubernetes/tests/suite_test.go index 1470a005c5..1359d940c4 100644 --- a/clients/ui/bff/internal/integrations/kubernetes/tests/suite_test.go +++ b/clients/ui/bff/internal/integrations/kubernetes/tests/suite_test.go @@ -2,20 +2,20 @@ package tests import ( "context" - k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes/k8mocks" - "k8s.io/client-go/kubernetes" - "k8s.io/client-go/rest" "log/slog" "os" + "testing" + + k8s "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes/k8mocks" + "k8s.io/client-go/kubernetes" + "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/envtest" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - "testing" -) -import ( . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" ) diff --git a/clients/ui/bff/internal/integrations/kubernetes/tests/token_k8s_client_test.go b/clients/ui/bff/internal/integrations/kubernetes/tests/token_k8s_client_test.go index 7c05ac45ae..ccd4049709 100644 --- a/clients/ui/bff/internal/integrations/kubernetes/tests/token_k8s_client_test.go +++ b/clients/ui/bff/internal/integrations/kubernetes/tests/token_k8s_client_test.go @@ -2,9 +2,10 @@ package tests import ( "context" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - k8mocks "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes/k8mocks" + + "github.com/kubeflow/hub/ui/bff/internal/constants" + "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + k8mocks "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes/k8mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/clients/ui/bff/internal/integrations/kubernetes/token_k8s_client.go b/clients/ui/bff/internal/integrations/kubernetes/token_k8s_client.go index f5bc8c7766..278891b1a2 100644 --- a/clients/ui/bff/internal/integrations/kubernetes/token_k8s_client.go +++ b/clients/ui/bff/internal/integrations/kubernetes/token_k8s_client.go @@ -7,7 +7,7 @@ import ( "strings" "time" - helper "github.com/kubeflow/model-registry/ui/bff/internal/helpers" + helper "github.com/kubeflow/hub/ui/bff/internal/helpers" authnv1 "k8s.io/api/authentication/v1" authv1 "k8s.io/api/authorization/v1" corev1 "k8s.io/api/core/v1" diff --git a/clients/ui/bff/internal/mocks/model_catalog_client_mock.go b/clients/ui/bff/internal/mocks/model_catalog_client_mock.go index a0d6fcca36..e281be93be 100644 --- a/clients/ui/bff/internal/mocks/model_catalog_client_mock.go +++ b/clients/ui/bff/internal/mocks/model_catalog_client_mock.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/models" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/httpclient" + "github.com/kubeflow/hub/ui/bff/internal/integrations/httpclient" "github.com/stretchr/testify/mock" ) diff --git a/clients/ui/bff/internal/mocks/model_registry_client_mock.go b/clients/ui/bff/internal/mocks/model_registry_client_mock.go index 2e90ec6d8a..202b587d5f 100644 --- a/clients/ui/bff/internal/mocks/model_registry_client_mock.go +++ b/clients/ui/bff/internal/mocks/model_registry_client_mock.go @@ -4,7 +4,7 @@ import ( "log/slog" "net/url" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/httpclient" + "github.com/kubeflow/hub/ui/bff/internal/integrations/httpclient" "github.com/kubeflow/model-registry/pkg/openapi" "github.com/stretchr/testify/mock" diff --git a/clients/ui/bff/internal/mocks/static_data_mock.go b/clients/ui/bff/internal/mocks/static_data_mock.go index e54cf46f33..c29c692d7e 100644 --- a/clients/ui/bff/internal/mocks/static_data_mock.go +++ b/clients/ui/bff/internal/mocks/static_data_mock.go @@ -9,9 +9,9 @@ import ( "github.com/brianvoe/gofakeit/v7" "github.com/google/uuid" + "github.com/kubeflow/hub/ui/bff/internal/constants" + "github.com/kubeflow/hub/ui/bff/internal/models" "github.com/kubeflow/model-registry/pkg/openapi" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - "github.com/kubeflow/model-registry/ui/bff/internal/models" ) func GetRegisteredModelMocks() []openapi.RegisteredModel { diff --git a/clients/ui/bff/internal/repositories/artifacts.go b/clients/ui/bff/internal/repositories/artifacts.go index e0721e0028..70f08c9c51 100644 --- a/clients/ui/bff/internal/repositories/artifacts.go +++ b/clients/ui/bff/internal/repositories/artifacts.go @@ -4,9 +4,10 @@ import ( "bytes" "encoding/json" "fmt" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/httpclient" "net/url" + "github.com/kubeflow/hub/ui/bff/internal/integrations/httpclient" + "github.com/kubeflow/model-registry/pkg/openapi" ) diff --git a/clients/ui/bff/internal/repositories/catalog_models.go b/clients/ui/bff/internal/repositories/catalog_models.go index 0bdde3e6aa..3459cbe871 100644 --- a/clients/ui/bff/internal/repositories/catalog_models.go +++ b/clients/ui/bff/internal/repositories/catalog_models.go @@ -5,8 +5,8 @@ import ( "fmt" "net/url" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/httpclient" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/integrations/httpclient" + "github.com/kubeflow/hub/ui/bff/internal/models" ) const catalogModelsPath = "/models" diff --git a/clients/ui/bff/internal/repositories/catalog_source_preview.go b/clients/ui/bff/internal/repositories/catalog_source_preview.go index 41a22dbd61..fa360e69db 100644 --- a/clients/ui/bff/internal/repositories/catalog_source_preview.go +++ b/clients/ui/bff/internal/repositories/catalog_source_preview.go @@ -7,8 +7,8 @@ import ( "mime/multipart" "net/url" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/httpclient" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/integrations/httpclient" + "github.com/kubeflow/hub/ui/bff/internal/models" ) type CatalogSourcePreviewInterface interface { diff --git a/clients/ui/bff/internal/repositories/catalog_source_preview_test.go b/clients/ui/bff/internal/repositories/catalog_source_preview_test.go index 94c746bfb4..60c07b9ab3 100644 --- a/clients/ui/bff/internal/repositories/catalog_source_preview_test.go +++ b/clients/ui/bff/internal/repositories/catalog_source_preview_test.go @@ -5,9 +5,9 @@ import ( "net/url" "testing" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/httpclient" - "github.com/kubeflow/model-registry/ui/bff/internal/mocks" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/integrations/httpclient" + "github.com/kubeflow/hub/ui/bff/internal/mocks" + "github.com/kubeflow/hub/ui/bff/internal/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/clients/ui/bff/internal/repositories/catalog_sources.go b/clients/ui/bff/internal/repositories/catalog_sources.go index baefdfc729..4f435af2ae 100644 --- a/clients/ui/bff/internal/repositories/catalog_sources.go +++ b/clients/ui/bff/internal/repositories/catalog_sources.go @@ -5,8 +5,8 @@ import ( "fmt" "net/url" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/httpclient" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/integrations/httpclient" + "github.com/kubeflow/hub/ui/bff/internal/models" ) const sourcesPath = "/sources" diff --git a/clients/ui/bff/internal/repositories/health_check.go b/clients/ui/bff/internal/repositories/health_check.go index a012b5116c..a546ab8ffe 100644 --- a/clients/ui/bff/internal/repositories/health_check.go +++ b/clients/ui/bff/internal/repositories/health_check.go @@ -1,6 +1,6 @@ package repositories -import "github.com/kubeflow/model-registry/ui/bff/internal/models" +import "github.com/kubeflow/hub/ui/bff/internal/models" type HealthCheckRepository struct{} diff --git a/clients/ui/bff/internal/repositories/helpers.go b/clients/ui/bff/internal/repositories/helpers.go index 2acd8556cb..948a576ece 100644 --- a/clients/ui/bff/internal/repositories/helpers.go +++ b/clients/ui/bff/internal/repositories/helpers.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/models" "gopkg.in/yaml.v3" ) diff --git a/clients/ui/bff/internal/repositories/mcp_server_catalog.go b/clients/ui/bff/internal/repositories/mcp_server_catalog.go index a17a30bafe..a05e771da4 100644 --- a/clients/ui/bff/internal/repositories/mcp_server_catalog.go +++ b/clients/ui/bff/internal/repositories/mcp_server_catalog.go @@ -5,8 +5,8 @@ import ( "fmt" "net/url" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/httpclient" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/integrations/httpclient" + "github.com/kubeflow/hub/ui/bff/internal/models" ) const mcpServerPath = "/mcp_servers" diff --git a/clients/ui/bff/internal/repositories/mcp_server_catalog_test.go b/clients/ui/bff/internal/repositories/mcp_server_catalog_test.go index b7c0d3a0a4..b738d163cd 100644 --- a/clients/ui/bff/internal/repositories/mcp_server_catalog_test.go +++ b/clients/ui/bff/internal/repositories/mcp_server_catalog_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/httpclient" - "github.com/kubeflow/model-registry/ui/bff/internal/mocks" + "github.com/kubeflow/hub/ui/bff/internal/integrations/httpclient" + "github.com/kubeflow/hub/ui/bff/internal/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/clients/ui/bff/internal/repositories/model_artifacts.go b/clients/ui/bff/internal/repositories/model_artifacts.go index a4a0e7ee7b..84d6cf8fc0 100644 --- a/clients/ui/bff/internal/repositories/model_artifacts.go +++ b/clients/ui/bff/internal/repositories/model_artifacts.go @@ -4,9 +4,10 @@ import ( "bytes" "encoding/json" "fmt" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/httpclient" "net/url" + "github.com/kubeflow/hub/ui/bff/internal/integrations/httpclient" + "github.com/kubeflow/model-registry/pkg/openapi" ) diff --git a/clients/ui/bff/internal/repositories/model_catalog.go b/clients/ui/bff/internal/repositories/model_catalog.go index b7359c5c7f..81e1c84ed5 100644 --- a/clients/ui/bff/internal/repositories/model_catalog.go +++ b/clients/ui/bff/internal/repositories/model_catalog.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + k8s "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/models" ) const ( diff --git a/clients/ui/bff/internal/repositories/model_catalog_settings.go b/clients/ui/bff/internal/repositories/model_catalog_settings.go index 4acae29147..8dc8612d3f 100644 --- a/clients/ui/bff/internal/repositories/model_catalog_settings.go +++ b/clients/ui/bff/internal/repositories/model_catalog_settings.go @@ -8,9 +8,9 @@ import ( "regexp" "strings" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/constants" + k8s "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/models" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/clients/ui/bff/internal/repositories/model_catalog_settings_test.go b/clients/ui/bff/internal/repositories/model_catalog_settings_test.go index c203227ff7..94198fb86e 100644 --- a/clients/ui/bff/internal/repositories/model_catalog_settings_test.go +++ b/clients/ui/bff/internal/repositories/model_catalog_settings_test.go @@ -4,9 +4,9 @@ import ( "context" "strings" - k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/mocks" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + k8s "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/mocks" + "github.com/kubeflow/hub/ui/bff/internal/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/clients/ui/bff/internal/repositories/model_registry.go b/clients/ui/bff/internal/repositories/model_registry.go index ecaa76c9e7..0b76ebdaab 100644 --- a/clients/ui/bff/internal/repositories/model_registry.go +++ b/clients/ui/bff/internal/repositories/model_registry.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - helper "github.com/kubeflow/model-registry/ui/bff/internal/helpers" - k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/constants" + helper "github.com/kubeflow/hub/ui/bff/internal/helpers" + k8s "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/models" ) type ModelRegistryRepository struct{} diff --git a/clients/ui/bff/internal/repositories/model_registry_settings.go b/clients/ui/bff/internal/repositories/model_registry_settings.go index a55f009785..415ae5ccb4 100644 --- a/clients/ui/bff/internal/repositories/model_registry_settings.go +++ b/clients/ui/bff/internal/repositories/model_registry_settings.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + k8s "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/models" ) type ModelRegistrySettingsRepository struct { diff --git a/clients/ui/bff/internal/repositories/model_registry_settings_test.go b/clients/ui/bff/internal/repositories/model_registry_settings_test.go index 7f1111337a..cb4f615488 100644 --- a/clients/ui/bff/internal/repositories/model_registry_settings_test.go +++ b/clients/ui/bff/internal/repositories/model_registry_settings_test.go @@ -3,8 +3,8 @@ package repositories import ( "context" - "github.com/kubeflow/model-registry/ui/bff/internal/mocks" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/mocks" + "github.com/kubeflow/hub/ui/bff/internal/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/clients/ui/bff/internal/repositories/model_registry_test.go b/clients/ui/bff/internal/repositories/model_registry_test.go index 3cdc54948f..b683a54d5e 100644 --- a/clients/ui/bff/internal/repositories/model_registry_test.go +++ b/clients/ui/bff/internal/repositories/model_registry_test.go @@ -3,10 +3,10 @@ package repositories import ( "context" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/mocks" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/constants" + k8s "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/mocks" + "github.com/kubeflow/hub/ui/bff/internal/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/clients/ui/bff/internal/repositories/model_transfer_jobs.go b/clients/ui/bff/internal/repositories/model_transfer_jobs.go index 63cddd78c8..aab665f8e2 100644 --- a/clients/ui/bff/internal/repositories/model_transfer_jobs.go +++ b/clients/ui/bff/internal/repositories/model_transfer_jobs.go @@ -11,10 +11,10 @@ import ( "strings" "github.com/google/uuid" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - helper "github.com/kubeflow/model-registry/ui/bff/internal/helpers" - k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/constants" + helper "github.com/kubeflow/hub/ui/bff/internal/helpers" + k8s "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/models" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/clients/ui/bff/internal/repositories/model_transfer_jobs_test.go b/clients/ui/bff/internal/repositories/model_transfer_jobs_test.go index c022bdaa21..1ddb21366b 100644 --- a/clients/ui/bff/internal/repositories/model_transfer_jobs_test.go +++ b/clients/ui/bff/internal/repositories/model_transfer_jobs_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/kubeflow/model-registry/ui/bff/internal/constants" - k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/mocks" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + "github.com/kubeflow/hub/ui/bff/internal/constants" + k8s "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/mocks" + "github.com/kubeflow/hub/ui/bff/internal/models" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" batchv1 "k8s.io/api/batch/v1" diff --git a/clients/ui/bff/internal/repositories/model_version.go b/clients/ui/bff/internal/repositories/model_version.go index a764257392..246259e9bd 100644 --- a/clients/ui/bff/internal/repositories/model_version.go +++ b/clients/ui/bff/internal/repositories/model_version.go @@ -4,9 +4,10 @@ import ( "bytes" "encoding/json" "fmt" - "github.com/kubeflow/model-registry/pkg/openapi" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/httpclient" "net/url" + + "github.com/kubeflow/hub/ui/bff/internal/integrations/httpclient" + "github.com/kubeflow/model-registry/pkg/openapi" ) const modelVersionPath = "/model_versions" diff --git a/clients/ui/bff/internal/repositories/model_version_test.go b/clients/ui/bff/internal/repositories/model_version_test.go index 40d0522ff1..caebfb6aae 100644 --- a/clients/ui/bff/internal/repositories/model_version_test.go +++ b/clients/ui/bff/internal/repositories/model_version_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/brianvoe/gofakeit/v7" - "github.com/kubeflow/model-registry/ui/bff/internal/mocks" + "github.com/kubeflow/hub/ui/bff/internal/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/clients/ui/bff/internal/repositories/namespace.go b/clients/ui/bff/internal/repositories/namespace.go index 242b37eef2..7bc373ddca 100644 --- a/clients/ui/bff/internal/repositories/namespace.go +++ b/clients/ui/bff/internal/repositories/namespace.go @@ -3,8 +3,9 @@ package repositories import ( "context" "fmt" - k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + + k8s "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/models" ) type NamespaceRepository struct{} diff --git a/clients/ui/bff/internal/repositories/registered_model.go b/clients/ui/bff/internal/repositories/registered_model.go index d8629c92bd..fd71064674 100644 --- a/clients/ui/bff/internal/repositories/registered_model.go +++ b/clients/ui/bff/internal/repositories/registered_model.go @@ -4,9 +4,10 @@ import ( "bytes" "encoding/json" "fmt" - "github.com/kubeflow/model-registry/pkg/openapi" - "github.com/kubeflow/model-registry/ui/bff/internal/integrations/httpclient" "net/url" + + "github.com/kubeflow/hub/ui/bff/internal/integrations/httpclient" + "github.com/kubeflow/model-registry/pkg/openapi" ) const registeredModelPath = "/registered_models" diff --git a/clients/ui/bff/internal/repositories/registered_model_test.go b/clients/ui/bff/internal/repositories/registered_model_test.go index 78aa0d3e1b..8c7a8843da 100644 --- a/clients/ui/bff/internal/repositories/registered_model_test.go +++ b/clients/ui/bff/internal/repositories/registered_model_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/brianvoe/gofakeit/v7" - "github.com/kubeflow/model-registry/ui/bff/internal/mocks" + "github.com/kubeflow/hub/ui/bff/internal/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/clients/ui/bff/internal/repositories/suite_test.go b/clients/ui/bff/internal/repositories/suite_test.go index 79c75dbc78..7c392400e5 100644 --- a/clients/ui/bff/internal/repositories/suite_test.go +++ b/clients/ui/bff/internal/repositories/suite_test.go @@ -2,19 +2,19 @@ package repositories import ( "context" - k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - k8mocks "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes/k8mocks" - "k8s.io/client-go/kubernetes" "log/slog" "os" + "testing" + + k8s "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + k8mocks "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes/k8mocks" + "k8s.io/client-go/kubernetes" "sigs.k8s.io/controller-runtime/pkg/envtest" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - "testing" -) -import ( . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" ) diff --git a/clients/ui/bff/internal/repositories/user.go b/clients/ui/bff/internal/repositories/user.go index 4aaeb0d1c7..31fae16f46 100644 --- a/clients/ui/bff/internal/repositories/user.go +++ b/clients/ui/bff/internal/repositories/user.go @@ -2,8 +2,9 @@ package repositories import ( "fmt" - k8s "github.com/kubeflow/model-registry/ui/bff/internal/integrations/kubernetes" - "github.com/kubeflow/model-registry/ui/bff/internal/models" + + k8s "github.com/kubeflow/hub/ui/bff/internal/integrations/kubernetes" + "github.com/kubeflow/hub/ui/bff/internal/models" ) type UserRepository struct{} diff --git a/clients/ui/bff/internal/validation/validation.go b/clients/ui/bff/internal/validation/validation.go index 2c988bfc57..6cc74cd73b 100644 --- a/clients/ui/bff/internal/validation/validation.go +++ b/clients/ui/bff/internal/validation/validation.go @@ -2,6 +2,7 @@ package validation import ( "errors" + "github.com/kubeflow/model-registry/pkg/openapi" ) diff --git a/cmd/catalog.go b/cmd/catalog.go index 3e6195abff..2d86742a5b 100644 --- a/cmd/catalog.go +++ b/cmd/catalog.go @@ -1,7 +1,7 @@ package cmd import ( - "github.com/kubeflow/model-registry/catalog/cmd" + "github.com/kubeflow/hub/catalog/cmd" ) func init() { diff --git a/cmd/controller/go.mod b/cmd/controller/go.mod index f1a0ad228c..628e0b0e7c 100644 --- a/cmd/controller/go.mod +++ b/cmd/controller/go.mod @@ -1,10 +1,10 @@ -module github.com/kubeflow/model-registry/cmd/controller +module github.com/kubeflow/hub/cmd/controller go 1.25.7 require ( github.com/kserve/kserve v0.17.0-rc1 - github.com/kubeflow/model-registry/pkg/inferenceservice-controller v0.0.0-00010101000000-000000000000 + github.com/kubeflow/hub/pkg/inferenceservice-controller v0.0.0-00010101000000-000000000000 github.com/onsi/ginkgo/v2 v2.28.1 github.com/onsi/gomega v1.39.1 k8s.io/apimachinery v0.35.2 @@ -68,7 +68,7 @@ require ( github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/kubeflow/model-registry/pkg/openapi v0.0.0 // indirect + github.com/kubeflow/hub/pkg/openapi v0.0.0 // indirect github.com/kylelemons/godebug v1.1.0 // indirect github.com/leodido/go-urn v1.4.0 // indirect github.com/mailru/easyjson v0.9.0 // indirect @@ -156,6 +156,6 @@ require ( sigs.k8s.io/structured-merge-diff/v6 v6.3.1 // indirect ) -replace github.com/kubeflow/model-registry/pkg/openapi => ../../pkg/openapi +replace github.com/kubeflow/hub/pkg/openapi => ../../pkg/openapi -replace github.com/kubeflow/model-registry/pkg/inferenceservice-controller => ../../pkg/inferenceservice-controller +replace github.com/kubeflow/hub/pkg/inferenceservice-controller => ../../pkg/inferenceservice-controller diff --git a/cmd/controller/internal/controllers/inferenceservice_controller.go b/cmd/controller/internal/controllers/inferenceservice_controller.go index 99087bfd9c..a18729062e 100644 --- a/cmd/controller/internal/controllers/inferenceservice_controller.go +++ b/cmd/controller/internal/controllers/inferenceservice_controller.go @@ -9,7 +9,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - infrctrl "github.com/kubeflow/model-registry/pkg/inferenceservice-controller" + infrctrl "github.com/kubeflow/hub/pkg/inferenceservice-controller" ) // InferenceServiceReconciler reconciles a InferenceService object diff --git a/cmd/controller/main.go b/cmd/controller/main.go index b76e418446..0d724a158d 100644 --- a/cmd/controller/main.go +++ b/cmd/controller/main.go @@ -10,7 +10,7 @@ import ( // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) // to ensure that exec-entrypoint and run can make use of them. - "github.com/kubeflow/model-registry/cmd/controller/internal/controllers" + "github.com/kubeflow/hub/cmd/controller/internal/controllers" _ "k8s.io/client-go/plugin/pkg/client/auth" "k8s.io/client-go/rest" @@ -27,7 +27,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/webhook" kservev1beta1 "github.com/kserve/kserve/pkg/apis/serving/v1beta1" - infrctrl "github.com/kubeflow/model-registry/pkg/inferenceservice-controller" + infrctrl "github.com/kubeflow/hub/pkg/inferenceservice-controller" // +kubebuilder:scaffold:imports ) diff --git a/cmd/csi/go.mod b/cmd/csi/go.mod index 3ddec95905..a1134e7384 100644 --- a/cmd/csi/go.mod +++ b/cmd/csi/go.mod @@ -1,10 +1,10 @@ -module github.com/kubeflow/model-registry/cmd/csi +module github.com/kubeflow/hub/cmd/csi go 1.25.7 require ( github.com/kserve/kserve v0.17.0-rc1 - github.com/kubeflow/model-registry/pkg/openapi v0.0.0 + github.com/kubeflow/hub/pkg/openapi v0.0.0 github.com/stretchr/testify v1.11.1 ) @@ -97,4 +97,4 @@ require ( sigs.k8s.io/structured-merge-diff/v6 v6.3.1 // indirect ) -replace github.com/kubeflow/model-registry/pkg/openapi => ../../pkg/openapi +replace github.com/kubeflow/hub/pkg/openapi => ../../pkg/openapi diff --git a/cmd/csi/internal/modelregistry/api_client.go b/cmd/csi/internal/modelregistry/api_client.go index 56aa750abe..f12a2f32d0 100644 --- a/cmd/csi/internal/modelregistry/api_client.go +++ b/cmd/csi/internal/modelregistry/api_client.go @@ -9,8 +9,8 @@ import ( "regexp" "strings" - "github.com/kubeflow/model-registry/cmd/csi/internal/constants" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/cmd/csi/internal/constants" + "github.com/kubeflow/hub/pkg/openapi" ) func NewAPIClient(cfg *openapi.Configuration, storageUri string, serviceName string, clusterDomain string) *openapi.APIClient { diff --git a/cmd/csi/internal/storage/modelregistry_provider.go b/cmd/csi/internal/storage/modelregistry_provider.go index ba5428e9ce..aea3250fb3 100644 --- a/cmd/csi/internal/storage/modelregistry_provider.go +++ b/cmd/csi/internal/storage/modelregistry_provider.go @@ -9,8 +9,8 @@ import ( "strings" kserve "github.com/kserve/kserve/pkg/agent/storage" - "github.com/kubeflow/model-registry/cmd/csi/internal/constants" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/cmd/csi/internal/constants" + "github.com/kubeflow/hub/pkg/openapi" ) var ( diff --git a/cmd/csi/internal/storage/modelregistry_provider_test.go b/cmd/csi/internal/storage/modelregistry_provider_test.go index df3f9e44e9..86875be04e 100644 --- a/cmd/csi/internal/storage/modelregistry_provider_test.go +++ b/cmd/csi/internal/storage/modelregistry_provider_test.go @@ -3,7 +3,7 @@ package storage import ( "testing" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/pkg/openapi" "github.com/stretchr/testify/assert" ) diff --git a/cmd/csi/main.go b/cmd/csi/main.go index 345fdf610f..d23242e8b5 100644 --- a/cmd/csi/main.go +++ b/cmd/csi/main.go @@ -4,9 +4,9 @@ import ( "log" "os" - "github.com/kubeflow/model-registry/cmd/csi/internal/modelregistry" - "github.com/kubeflow/model-registry/cmd/csi/internal/storage" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/cmd/csi/internal/modelregistry" + "github.com/kubeflow/hub/cmd/csi/internal/storage" + "github.com/kubeflow/hub/pkg/openapi" ) const ( diff --git a/cmd/proxy.go b/cmd/proxy.go index 86e7c85b60..41e5c955eb 100644 --- a/cmd/proxy.go +++ b/cmd/proxy.go @@ -8,16 +8,16 @@ import ( "sync" "github.com/golang/glog" - "github.com/kubeflow/model-registry/internal/core" - "github.com/kubeflow/model-registry/internal/datastore" - "github.com/kubeflow/model-registry/internal/datastore/embedmd" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/service" - "github.com/kubeflow/model-registry/internal/proxy" - "github.com/kubeflow/model-registry/internal/server/middleware" - "github.com/kubeflow/model-registry/internal/server/openapi" - "github.com/kubeflow/model-registry/internal/tls" - "github.com/kubeflow/model-registry/pkg/api" + "github.com/kubeflow/hub/internal/core" + "github.com/kubeflow/hub/internal/datastore" + "github.com/kubeflow/hub/internal/datastore/embedmd" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/service" + "github.com/kubeflow/hub/internal/proxy" + "github.com/kubeflow/hub/internal/server/middleware" + "github.com/kubeflow/hub/internal/server/openapi" + "github.com/kubeflow/hub/internal/tls" + "github.com/kubeflow/hub/pkg/api" "github.com/spf13/cobra" ) diff --git a/go.mod b/go.mod index d0fb32fac7..abc116c369 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/kubeflow/model-registry +module github.com/kubeflow/hub go 1.25.7 @@ -13,8 +13,8 @@ require ( github.com/golang-migrate/migrate/v4 v4.19.1 github.com/golang/glog v1.2.5 github.com/jackc/pgx/v5 v5.9.2 - github.com/kubeflow/model-registry/catalog/pkg/openapi v0.0.0-00010101000000-000000000000 - github.com/kubeflow/model-registry/pkg/openapi v0.0.0 + github.com/kubeflow/hub/catalog/pkg/openapi v0.0.0-00010101000000-000000000000 + github.com/kubeflow/hub/pkg/openapi v0.0.0 github.com/lib/pq v1.12.3 github.com/spf13/cobra v1.10.2 github.com/spf13/pflag v1.0.10 @@ -110,6 +110,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/kubeflow/model-registry/pkg/openapi => ./pkg/openapi +replace github.com/kubeflow/hub/pkg/openapi => ./pkg/openapi -replace github.com/kubeflow/model-registry/catalog/pkg/openapi => ./catalog/pkg/openapi +replace github.com/kubeflow/hub/catalog/pkg/openapi => ./catalog/pkg/openapi diff --git a/gorm-gen/go.mod b/gorm-gen/go.mod index 691094ef28..5c41e4ad0b 100644 --- a/gorm-gen/go.mod +++ b/gorm-gen/go.mod @@ -1,4 +1,4 @@ -module github.com/kubeflow/model-registry/gorm-gen +module github.com/kubeflow/hub/gorm-gen go 1.25.7 diff --git a/internal/apiutils/api_utils.go b/internal/apiutils/api_utils.go index 7d72b117fc..daeb202795 100644 --- a/internal/apiutils/api_utils.go +++ b/internal/apiutils/api_utils.go @@ -4,7 +4,7 @@ import ( "fmt" "strconv" - "github.com/kubeflow/model-registry/pkg/api" + "github.com/kubeflow/hub/pkg/api" ) // ZeroIfNil return the zeroed value if input is a nil pointer diff --git a/internal/converter/embdemd_openapi_converter.go b/internal/converter/embdemd_openapi_converter.go index 9c4c9d4dda..ecee8ee712 100644 --- a/internal/converter/embdemd_openapi_converter.go +++ b/internal/converter/embdemd_openapi_converter.go @@ -1,8 +1,8 @@ package converter import ( - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/pkg/openapi" ) // goverter:converter diff --git a/internal/converter/embdemd_openapi_converter_util.go b/internal/converter/embdemd_openapi_converter_util.go index c1893f733e..0991ff75aa 100644 --- a/internal/converter/embdemd_openapi_converter_util.go +++ b/internal/converter/embdemd_openapi_converter_util.go @@ -8,10 +8,10 @@ import ( "strings" "github.com/golang/glog" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/pkg/api" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/pkg/api" + "github.com/kubeflow/hub/pkg/openapi" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/structpb" ) diff --git a/internal/converter/embdemd_openapi_converter_util_test.go b/internal/converter/embdemd_openapi_converter_util_test.go index 2332d1034d..acc14e6eb2 100644 --- a/internal/converter/embdemd_openapi_converter_util_test.go +++ b/internal/converter/embdemd_openapi_converter_util_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/pkg/openapi" "github.com/stretchr/testify/assert" ) diff --git a/internal/converter/generated/embedmd_openapi_converter.gen.go b/internal/converter/generated/embedmd_openapi_converter.gen.go index b2824a0665..b3b5887d28 100644 --- a/internal/converter/generated/embedmd_openapi_converter.gen.go +++ b/internal/converter/generated/embedmd_openapi_converter.gen.go @@ -5,9 +5,9 @@ package generated import ( "fmt" - converter "github.com/kubeflow/model-registry/internal/converter" - models "github.com/kubeflow/model-registry/internal/db/models" - openapi "github.com/kubeflow/model-registry/pkg/openapi" + converter "github.com/kubeflow/hub/internal/converter" + models "github.com/kubeflow/hub/internal/db/models" + openapi "github.com/kubeflow/hub/pkg/openapi" ) type EmbedMDToOpenAPIConverterImpl struct{} diff --git a/internal/converter/generated/openapi_converter.gen.go b/internal/converter/generated/openapi_converter.gen.go index 694a45b619..ef4cb04a40 100644 --- a/internal/converter/generated/openapi_converter.gen.go +++ b/internal/converter/generated/openapi_converter.gen.go @@ -5,8 +5,8 @@ package generated import ( "fmt" - converter "github.com/kubeflow/model-registry/internal/converter" - openapi "github.com/kubeflow/model-registry/pkg/openapi" + converter "github.com/kubeflow/hub/internal/converter" + openapi "github.com/kubeflow/hub/pkg/openapi" ) type OpenAPIConverterImpl struct{} diff --git a/internal/converter/generated/openapi_embedmd_converter.gen.go b/internal/converter/generated/openapi_embedmd_converter.gen.go index 13e1facb0c..f384b4d724 100644 --- a/internal/converter/generated/openapi_embedmd_converter.gen.go +++ b/internal/converter/generated/openapi_embedmd_converter.gen.go @@ -5,9 +5,9 @@ package generated import ( "fmt" - converter "github.com/kubeflow/model-registry/internal/converter" - models "github.com/kubeflow/model-registry/internal/db/models" - openapi "github.com/kubeflow/model-registry/pkg/openapi" + converter "github.com/kubeflow/hub/internal/converter" + models "github.com/kubeflow/hub/internal/db/models" + openapi "github.com/kubeflow/hub/pkg/openapi" ) type OpenAPIToEmbedMDConverterImpl struct{} diff --git a/internal/converter/generated/openapi_reconciler.gen.go b/internal/converter/generated/openapi_reconciler.gen.go index bf3519636b..76a4c1eb32 100644 --- a/internal/converter/generated/openapi_reconciler.gen.go +++ b/internal/converter/generated/openapi_reconciler.gen.go @@ -5,8 +5,8 @@ package generated import ( "fmt" - converter "github.com/kubeflow/model-registry/internal/converter" - openapi "github.com/kubeflow/model-registry/pkg/openapi" + converter "github.com/kubeflow/hub/internal/converter" + openapi "github.com/kubeflow/hub/pkg/openapi" ) type OpenAPIReconcilerImpl struct{} diff --git a/internal/converter/openapi_converter.go b/internal/converter/openapi_converter.go index 4adc65f989..c2ffd762fd 100644 --- a/internal/converter/openapi_converter.go +++ b/internal/converter/openapi_converter.go @@ -1,7 +1,7 @@ package converter import ( - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/pkg/openapi" ) // NOTE: methods must follow these patterns, otherwise tests could not find possible issues: diff --git a/internal/converter/openapi_converter_test.go b/internal/converter/openapi_converter_test.go index 6e329420bd..cb27c6b18a 100644 --- a/internal/converter/openapi_converter_test.go +++ b/internal/converter/openapi_converter_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/pkg/openapi" "github.com/stretchr/testify/assert" ) diff --git a/internal/converter/openapi_converter_util.go b/internal/converter/openapi_converter_util.go index 8e1b1f1908..ee80eaf28d 100644 --- a/internal/converter/openapi_converter_util.go +++ b/internal/converter/openapi_converter_util.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/google/uuid" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/pkg/openapi" ) type OpenAPIModel interface { diff --git a/internal/converter/openapi_embedmd_converter.go b/internal/converter/openapi_embedmd_converter.go index 379c795d74..cbd1eedfb5 100644 --- a/internal/converter/openapi_embedmd_converter.go +++ b/internal/converter/openapi_embedmd_converter.go @@ -1,8 +1,8 @@ package converter import ( - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/pkg/openapi" ) // goverter:converter diff --git a/internal/converter/openapi_embedmd_converter_util.go b/internal/converter/openapi_embedmd_converter_util.go index c4c8bc4888..f33ad86117 100644 --- a/internal/converter/openapi_embedmd_converter_util.go +++ b/internal/converter/openapi_embedmd_converter_util.go @@ -7,10 +7,10 @@ import ( "strconv" "github.com/google/uuid" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/pkg/api" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/pkg/api" + "github.com/kubeflow/hub/pkg/openapi" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/structpb" ) diff --git a/internal/converter/openapi_embedmd_converter_util_test.go b/internal/converter/openapi_embedmd_converter_util_test.go index 4d5affa538..625d4b7998 100644 --- a/internal/converter/openapi_embedmd_converter_util_test.go +++ b/internal/converter/openapi_embedmd_converter_util_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/pkg/openapi" "github.com/stretchr/testify/assert" ) diff --git a/internal/converter/openapi_reconciler.go b/internal/converter/openapi_reconciler.go index 034e6a3581..d939c12cfc 100644 --- a/internal/converter/openapi_reconciler.go +++ b/internal/converter/openapi_reconciler.go @@ -1,6 +1,6 @@ package converter -import "github.com/kubeflow/model-registry/pkg/openapi" +import "github.com/kubeflow/hub/pkg/openapi" // NOTE: methods must follow these patterns, otherwise tests could not find possible issues: // Converters patch fields entity: UpdateExisting diff --git a/internal/converter/openapi_reconciler_util.go b/internal/converter/openapi_reconciler_util.go index 0331f02361..e8f73c2427 100644 --- a/internal/converter/openapi_reconciler_util.go +++ b/internal/converter/openapi_reconciler_util.go @@ -3,7 +3,7 @@ package converter import ( "fmt" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/pkg/openapi" ) // getArtifactTypeName returns the type name of an artifact. diff --git a/internal/core/artifact.go b/internal/core/artifact.go index c2b175db79..f74314b20d 100644 --- a/internal/core/artifact.go +++ b/internal/core/artifact.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/converter" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/pkg/api" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/converter" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/pkg/api" + "github.com/kubeflow/hub/pkg/openapi" "gorm.io/gorm" ) diff --git a/internal/core/artifact_test.go b/internal/core/artifact_test.go index 4932c30a43..7219f1af04 100644 --- a/internal/core/artifact_test.go +++ b/internal/core/artifact_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/pkg/api" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/pkg/api" + "github.com/kubeflow/hub/pkg/openapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/core/core_test.go b/internal/core/core_test.go index 9ce2ed822f..e6cc34b18d 100644 --- a/internal/core/core_test.go +++ b/internal/core/core_test.go @@ -4,11 +4,11 @@ import ( "os" "testing" - "github.com/kubeflow/model-registry/internal/core" - "github.com/kubeflow/model-registry/internal/db/schema" - "github.com/kubeflow/model-registry/internal/db/service" - "github.com/kubeflow/model-registry/internal/defaults" - "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/hub/internal/core" + "github.com/kubeflow/hub/internal/db/schema" + "github.com/kubeflow/hub/internal/db/service" + "github.com/kubeflow/hub/internal/defaults" + "github.com/kubeflow/hub/internal/testutils" "github.com/stretchr/testify/require" "gorm.io/gorm" ) diff --git a/internal/core/experiment.go b/internal/core/experiment.go index f2f95046dc..e1b39c6a6f 100644 --- a/internal/core/experiment.go +++ b/internal/core/experiment.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/converter" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/pkg/api" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/converter" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/pkg/api" + "github.com/kubeflow/hub/pkg/openapi" "gorm.io/gorm" ) diff --git a/internal/core/experiment_run.go b/internal/core/experiment_run.go index d4f3f0b32a..6f0e811d6b 100644 --- a/internal/core/experiment_run.go +++ b/internal/core/experiment_run.go @@ -8,12 +8,12 @@ import ( "time" "github.com/golang/glog" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/converter" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/defaults" - "github.com/kubeflow/model-registry/pkg/api" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/converter" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/defaults" + "github.com/kubeflow/hub/pkg/api" + "github.com/kubeflow/hub/pkg/openapi" "gorm.io/gorm" ) diff --git a/internal/core/experiment_run_test.go b/internal/core/experiment_run_test.go index ea774dc1a3..375e8d7b34 100644 --- a/internal/core/experiment_run_test.go +++ b/internal/core/experiment_run_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/pkg/api" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/pkg/api" + "github.com/kubeflow/hub/pkg/openapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/core/experiment_test.go b/internal/core/experiment_test.go index 4bf58d8ef2..61e3ae3b49 100644 --- a/internal/core/experiment_test.go +++ b/internal/core/experiment_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/pkg/api" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/pkg/api" + "github.com/kubeflow/hub/pkg/openapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/core/inference_service.go b/internal/core/inference_service.go index 662fe51421..9246e3e417 100644 --- a/internal/core/inference_service.go +++ b/internal/core/inference_service.go @@ -5,11 +5,11 @@ import ( "fmt" "github.com/golang/glog" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/converter" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/pkg/api" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/converter" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/pkg/api" + "github.com/kubeflow/hub/pkg/openapi" "gorm.io/gorm" ) diff --git a/internal/core/inference_service_test.go b/internal/core/inference_service_test.go index 533e3729a1..8bdab4afa3 100644 --- a/internal/core/inference_service_test.go +++ b/internal/core/inference_service_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/pkg/api" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/pkg/api" + "github.com/kubeflow/hub/pkg/openapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/core/metric_history_test.go b/internal/core/metric_history_test.go index 32a1acdbe0..c450952043 100644 --- a/internal/core/metric_history_test.go +++ b/internal/core/metric_history_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/pkg/api" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/pkg/api" + "github.com/kubeflow/hub/pkg/openapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/core/model_version.go b/internal/core/model_version.go index fb232b9990..31bcfdf03e 100644 --- a/internal/core/model_version.go +++ b/internal/core/model_version.go @@ -6,11 +6,11 @@ import ( "strconv" "github.com/golang/glog" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/converter" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/pkg/api" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/converter" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/pkg/api" + "github.com/kubeflow/hub/pkg/openapi" "gorm.io/gorm" ) diff --git a/internal/core/model_version_test.go b/internal/core/model_version_test.go index c3f45fcac8..cc31283b37 100644 --- a/internal/core/model_version_test.go +++ b/internal/core/model_version_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/pkg/api" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/pkg/api" + "github.com/kubeflow/hub/pkg/openapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/core/modelregistry_service.go b/internal/core/modelregistry_service.go index 56df76550b..ff17f3488d 100644 --- a/internal/core/modelregistry_service.go +++ b/internal/core/modelregistry_service.go @@ -1,9 +1,9 @@ package core import ( - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/mapper" - "github.com/kubeflow/model-registry/pkg/api" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/mapper" + "github.com/kubeflow/hub/pkg/api" ) // Compile-time assertion to ensure ModelRegistryService implements ModelRegistryApi diff --git a/internal/core/non_editable_fields_test.go b/internal/core/non_editable_fields_test.go index 47a300f4d8..12cde2fb59 100644 --- a/internal/core/non_editable_fields_test.go +++ b/internal/core/non_editable_fields_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/core" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/core" + "github.com/kubeflow/hub/pkg/openapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/core/partial_update_test.go b/internal/core/partial_update_test.go index 0bb36abf9c..985e1bd0f3 100644 --- a/internal/core/partial_update_test.go +++ b/internal/core/partial_update_test.go @@ -3,9 +3,9 @@ package core_test import ( "testing" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/core" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/core" + "github.com/kubeflow/hub/pkg/openapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/core/registered_model.go b/internal/core/registered_model.go index 6bdb082513..1f634ce9da 100644 --- a/internal/core/registered_model.go +++ b/internal/core/registered_model.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/converter" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/pkg/api" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/converter" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/pkg/api" + "github.com/kubeflow/hub/pkg/openapi" "gorm.io/gorm" ) diff --git a/internal/core/registered_model_test.go b/internal/core/registered_model_test.go index c807bc7053..37d845b8c9 100644 --- a/internal/core/registered_model_test.go +++ b/internal/core/registered_model_test.go @@ -5,9 +5,9 @@ import ( "slices" "testing" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/pkg/api" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/pkg/api" + "github.com/kubeflow/hub/pkg/openapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/core/serve_model.go b/internal/core/serve_model.go index 42017cc1d5..f3b06af641 100644 --- a/internal/core/serve_model.go +++ b/internal/core/serve_model.go @@ -5,11 +5,11 @@ import ( "fmt" "github.com/golang/glog" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/converter" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/pkg/api" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/converter" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/pkg/api" + "github.com/kubeflow/hub/pkg/openapi" "gorm.io/gorm" ) diff --git a/internal/core/serve_model_test.go b/internal/core/serve_model_test.go index 8387a7fa86..83ee8fd107 100644 --- a/internal/core/serve_model_test.go +++ b/internal/core/serve_model_test.go @@ -5,9 +5,9 @@ import ( "slices" "testing" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/pkg/api" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/pkg/api" + "github.com/kubeflow/hub/pkg/openapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/core/serving_environment.go b/internal/core/serving_environment.go index bbbada4b02..a2a7a2ae4a 100644 --- a/internal/core/serving_environment.go +++ b/internal/core/serving_environment.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/converter" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/pkg/api" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/converter" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/pkg/api" + "github.com/kubeflow/hub/pkg/openapi" "gorm.io/gorm" ) diff --git a/internal/core/serving_environment_test.go b/internal/core/serving_environment_test.go index 211ef4cdd5..5d845ee578 100644 --- a/internal/core/serving_environment_test.go +++ b/internal/core/serving_environment_test.go @@ -5,9 +5,9 @@ import ( "slices" "testing" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/pkg/api" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/pkg/api" + "github.com/kubeflow/hub/pkg/openapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/datastore/embedmd/mysql/connect.go b/internal/datastore/embedmd/mysql/connect.go index 2237039b75..9d40138da6 100644 --- a/internal/datastore/embedmd/mysql/connect.go +++ b/internal/datastore/embedmd/mysql/connect.go @@ -7,7 +7,7 @@ import ( "github.com/go-sql-driver/mysql" "github.com/golang/glog" - _tls "github.com/kubeflow/model-registry/internal/tls" + _tls "github.com/kubeflow/hub/internal/tls" gorm_mysql "gorm.io/driver/mysql" "gorm.io/gorm" "gorm.io/gorm/logger" diff --git a/internal/datastore/embedmd/mysql/connect_test.go b/internal/datastore/embedmd/mysql/connect_test.go index 00b3462665..15f41ad5bb 100644 --- a/internal/datastore/embedmd/mysql/connect_test.go +++ b/internal/datastore/embedmd/mysql/connect_test.go @@ -14,9 +14,9 @@ import ( "testing" "time" - "github.com/kubeflow/model-registry/internal/datastore/embedmd/mysql" - "github.com/kubeflow/model-registry/internal/testutils" - _tls "github.com/kubeflow/model-registry/internal/tls" + "github.com/kubeflow/hub/internal/datastore/embedmd/mysql" + "github.com/kubeflow/hub/internal/testutils" + _tls "github.com/kubeflow/hub/internal/tls" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/testcontainers/testcontainers-go" diff --git a/internal/datastore/embedmd/mysql/migrate_test.go b/internal/datastore/embedmd/mysql/migrate_test.go index ddd40ce59f..88d9ca83e5 100644 --- a/internal/datastore/embedmd/mysql/migrate_test.go +++ b/internal/datastore/embedmd/mysql/migrate_test.go @@ -4,8 +4,8 @@ import ( "os" "testing" - "github.com/kubeflow/model-registry/internal/datastore/embedmd/mysql" - "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/hub/internal/datastore/embedmd/mysql" + "github.com/kubeflow/hub/internal/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/datastore/embedmd/postgres/connect.go b/internal/datastore/embedmd/postgres/connect.go index a94d260668..e0467b07ca 100644 --- a/internal/datastore/embedmd/postgres/connect.go +++ b/internal/datastore/embedmd/postgres/connect.go @@ -8,7 +8,7 @@ import ( "time" "github.com/golang/glog" - _tls "github.com/kubeflow/model-registry/internal/tls" + _tls "github.com/kubeflow/hub/internal/tls" "gorm.io/driver/postgres" "gorm.io/gorm" "gorm.io/gorm/logger" diff --git a/internal/datastore/embedmd/postgres/connect_test.go b/internal/datastore/embedmd/postgres/connect_test.go index f4964daeed..e1eb3aff1b 100644 --- a/internal/datastore/embedmd/postgres/connect_test.go +++ b/internal/datastore/embedmd/postgres/connect_test.go @@ -14,8 +14,8 @@ import ( "testing" "time" - "github.com/kubeflow/model-registry/internal/datastore/embedmd/postgres" - _tls "github.com/kubeflow/model-registry/internal/tls" + "github.com/kubeflow/hub/internal/datastore/embedmd/postgres" + _tls "github.com/kubeflow/hub/internal/tls" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/datastore/embedmd/postgres/migrate_test.go b/internal/datastore/embedmd/postgres/migrate_test.go index c179c95d1f..91fd28b009 100644 --- a/internal/datastore/embedmd/postgres/migrate_test.go +++ b/internal/datastore/embedmd/postgres/migrate_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/kubeflow/model-registry/internal/datastore/embedmd/postgres" - _tls "github.com/kubeflow/model-registry/internal/tls" + "github.com/kubeflow/hub/internal/datastore/embedmd/postgres" + _tls "github.com/kubeflow/hub/internal/tls" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/testcontainers/testcontainers-go" diff --git a/internal/datastore/embedmd/repos.go b/internal/datastore/embedmd/repos.go index aa9d22717e..f383ee83f3 100644 --- a/internal/datastore/embedmd/repos.go +++ b/internal/datastore/embedmd/repos.go @@ -6,8 +6,8 @@ import ( "reflect" "github.com/golang/glog" - "github.com/kubeflow/model-registry/internal/datastore" - "github.com/kubeflow/model-registry/internal/db/service" + "github.com/kubeflow/hub/internal/datastore" + "github.com/kubeflow/hub/internal/db/service" "gorm.io/gorm" ) diff --git a/internal/datastore/embedmd/repos_test.go b/internal/datastore/embedmd/repos_test.go index d58a7d86e1..c9fe53314d 100644 --- a/internal/datastore/embedmd/repos_test.go +++ b/internal/datastore/embedmd/repos_test.go @@ -6,12 +6,12 @@ import ( "reflect" "testing" - "github.com/kubeflow/model-registry/internal/datastore" - "github.com/kubeflow/model-registry/internal/datastore/embedmd/mysql" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" - "github.com/kubeflow/model-registry/internal/db/service" - "github.com/kubeflow/model-registry/internal/tls" + "github.com/kubeflow/hub/internal/datastore" + "github.com/kubeflow/hub/internal/datastore/embedmd/mysql" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" + "github.com/kubeflow/hub/internal/db/service" + "github.com/kubeflow/hub/internal/tls" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" cont_mysql "github.com/testcontainers/testcontainers-go/modules/mysql" diff --git a/internal/datastore/embedmd/service.go b/internal/datastore/embedmd/service.go index 3e64c57558..c1cacdf75a 100644 --- a/internal/datastore/embedmd/service.go +++ b/internal/datastore/embedmd/service.go @@ -9,13 +9,13 @@ import ( "github.com/go-sql-driver/mysql" "github.com/golang/glog" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/datastore" - "github.com/kubeflow/model-registry/internal/db" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/service" - "github.com/kubeflow/model-registry/internal/db/types" - "github.com/kubeflow/model-registry/internal/tls" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/datastore" + "github.com/kubeflow/hub/internal/db" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/service" + "github.com/kubeflow/hub/internal/db/types" + "github.com/kubeflow/hub/internal/tls" "gorm.io/gorm" ) diff --git a/internal/datastore/embedmd/service_test.go b/internal/datastore/embedmd/service_test.go index 63f0839c58..09d3ea5545 100644 --- a/internal/datastore/embedmd/service_test.go +++ b/internal/datastore/embedmd/service_test.go @@ -3,7 +3,7 @@ package embedmd import ( "testing" - "github.com/kubeflow/model-registry/internal/db/types" + "github.com/kubeflow/hub/internal/db/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/db/connector.go b/internal/db/connector.go index aa167f43b3..997d0dba0f 100644 --- a/internal/db/connector.go +++ b/internal/db/connector.go @@ -4,10 +4,10 @@ import ( "fmt" "sync" - "github.com/kubeflow/model-registry/internal/datastore/embedmd/mysql" - "github.com/kubeflow/model-registry/internal/datastore/embedmd/postgres" - "github.com/kubeflow/model-registry/internal/db/types" - "github.com/kubeflow/model-registry/internal/tls" + "github.com/kubeflow/hub/internal/datastore/embedmd/mysql" + "github.com/kubeflow/hub/internal/datastore/embedmd/postgres" + "github.com/kubeflow/hub/internal/db/types" + "github.com/kubeflow/hub/internal/tls" "gorm.io/gorm" ) diff --git a/internal/db/dbutil/errors.go b/internal/db/dbutil/errors.go index eb646b8207..fb89f830b3 100644 --- a/internal/db/dbutil/errors.go +++ b/internal/db/dbutil/errors.go @@ -8,7 +8,7 @@ import ( "github.com/go-sql-driver/mysql" "github.com/golang/glog" "github.com/jackc/pgx/v5/pgconn" - "github.com/kubeflow/model-registry/pkg/api" + "github.com/kubeflow/hub/pkg/api" ) // isDatabaseTypeConversionError checks if a database error is caused by type conversion issues diff --git a/internal/db/dbutil/errors_test.go b/internal/db/dbutil/errors_test.go index 45241b93e0..571544fd85 100644 --- a/internal/db/dbutil/errors_test.go +++ b/internal/db/dbutil/errors_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/kubeflow/model-registry/pkg/api" + "github.com/kubeflow/hub/pkg/api" ) func TestIsDatabaseTypeConversionError(t *testing.T) { diff --git a/internal/db/filter/query_builder.go b/internal/db/filter/query_builder.go index 0eea5dcbac..eadb6a0bad 100644 --- a/internal/db/filter/query_builder.go +++ b/internal/db/filter/query_builder.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/kubeflow/model-registry/internal/db/constants" - "github.com/kubeflow/model-registry/internal/db/dbutil" + "github.com/kubeflow/hub/internal/db/constants" + "github.com/kubeflow/hub/internal/db/dbutil" "gorm.io/gorm" ) diff --git a/internal/db/migrator.go b/internal/db/migrator.go index 715b7578b2..5ea8865df9 100644 --- a/internal/db/migrator.go +++ b/internal/db/migrator.go @@ -3,9 +3,9 @@ package db import ( "fmt" - "github.com/kubeflow/model-registry/internal/datastore/embedmd/mysql" - "github.com/kubeflow/model-registry/internal/datastore/embedmd/postgres" - "github.com/kubeflow/model-registry/internal/db/types" + "github.com/kubeflow/hub/internal/datastore/embedmd/mysql" + "github.com/kubeflow/hub/internal/datastore/embedmd/postgres" + "github.com/kubeflow/hub/internal/db/types" "gorm.io/gorm" ) diff --git a/internal/db/models/artifact.go b/internal/db/models/artifact.go index e25794f0ae..ca23ffee41 100644 --- a/internal/db/models/artifact.go +++ b/internal/db/models/artifact.go @@ -1,8 +1,8 @@ package models import ( - "github.com/kubeflow/model-registry/internal/db/constants" - "github.com/kubeflow/model-registry/internal/db/filter" + "github.com/kubeflow/hub/internal/db/constants" + "github.com/kubeflow/hub/internal/db/filter" ) var ( diff --git a/internal/db/models/experiment.go b/internal/db/models/experiment.go index 0137c4db2f..a42ec1980b 100644 --- a/internal/db/models/experiment.go +++ b/internal/db/models/experiment.go @@ -1,6 +1,6 @@ package models -import "github.com/kubeflow/model-registry/internal/db/filter" +import "github.com/kubeflow/hub/internal/db/filter" type ExperimentListOptions struct { Pagination diff --git a/internal/db/models/experiment_run.go b/internal/db/models/experiment_run.go index b676cd118f..90b88d7078 100644 --- a/internal/db/models/experiment_run.go +++ b/internal/db/models/experiment_run.go @@ -1,6 +1,6 @@ package models -import "github.com/kubeflow/model-registry/internal/db/filter" +import "github.com/kubeflow/hub/internal/db/filter" type ExperimentRunListOptions struct { Pagination diff --git a/internal/db/models/metric_history.go b/internal/db/models/metric_history.go index 5f1ce80098..bb11cff235 100644 --- a/internal/db/models/metric_history.go +++ b/internal/db/models/metric_history.go @@ -1,6 +1,6 @@ package models -import "github.com/kubeflow/model-registry/internal/db/filter" +import "github.com/kubeflow/hub/internal/db/filter" const MetricHistoryType = "metric-history" diff --git a/internal/db/models/model_artifact.go b/internal/db/models/model_artifact.go index 8553f07ee1..542882a0d8 100644 --- a/internal/db/models/model_artifact.go +++ b/internal/db/models/model_artifact.go @@ -1,6 +1,6 @@ package models -import "github.com/kubeflow/model-registry/internal/db/filter" +import "github.com/kubeflow/hub/internal/db/filter" const ModelArtifactType = "model-artifact" diff --git a/internal/db/models/model_version.go b/internal/db/models/model_version.go index 6f31552466..c2b98621c8 100644 --- a/internal/db/models/model_version.go +++ b/internal/db/models/model_version.go @@ -1,6 +1,6 @@ package models -import "github.com/kubeflow/model-registry/internal/db/filter" +import "github.com/kubeflow/hub/internal/db/filter" type ModelVersionListOptions struct { Pagination diff --git a/internal/db/models/registered_model.go b/internal/db/models/registered_model.go index 4ec986d733..8aa466dd80 100644 --- a/internal/db/models/registered_model.go +++ b/internal/db/models/registered_model.go @@ -3,7 +3,7 @@ package models import ( "math" - "github.com/kubeflow/model-registry/internal/db/filter" + "github.com/kubeflow/hub/internal/db/filter" ) type RegisteredModelListOptions struct { diff --git a/internal/db/models/serve_model.go b/internal/db/models/serve_model.go index a8fae3c853..3f3ada09f9 100644 --- a/internal/db/models/serve_model.go +++ b/internal/db/models/serve_model.go @@ -1,8 +1,8 @@ package models import ( - "github.com/kubeflow/model-registry/internal/db/constants" - "github.com/kubeflow/model-registry/internal/db/filter" + "github.com/kubeflow/hub/internal/db/constants" + "github.com/kubeflow/hub/internal/db/filter" ) var ( diff --git a/internal/db/scopes/paginate.go b/internal/db/scopes/paginate.go index 4514317d32..5216625d27 100644 --- a/internal/db/scopes/paginate.go +++ b/internal/db/scopes/paginate.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/kubeflow/model-registry/internal/db/dbutil" - "github.com/kubeflow/model-registry/internal/db/models" + "github.com/kubeflow/hub/internal/db/dbutil" + "github.com/kubeflow/hub/internal/db/models" "gorm.io/gorm" ) diff --git a/internal/db/scopes/paginate_test.go b/internal/db/scopes/paginate_test.go index d524f72fe1..70fb83be33 100644 --- a/internal/db/scopes/paginate_test.go +++ b/internal/db/scopes/paginate_test.go @@ -4,7 +4,7 @@ import ( "encoding/base64" "testing" - "github.com/kubeflow/model-registry/internal/db/models" + "github.com/kubeflow/hub/internal/db/models" "github.com/stretchr/testify/assert" ) diff --git a/internal/db/service/artifact.go b/internal/db/service/artifact.go index cf850a37fc..7ae262a3bf 100644 --- a/internal/db/service/artifact.go +++ b/internal/db/service/artifact.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "github.com/kubeflow/model-registry/internal/datastore" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" - "github.com/kubeflow/model-registry/internal/db/scopes" - "github.com/kubeflow/model-registry/internal/db/utils" - "github.com/kubeflow/model-registry/internal/defaults" - "github.com/kubeflow/model-registry/pkg/api" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/datastore" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" + "github.com/kubeflow/hub/internal/db/scopes" + "github.com/kubeflow/hub/internal/db/utils" + "github.com/kubeflow/hub/internal/defaults" + "github.com/kubeflow/hub/pkg/api" + "github.com/kubeflow/hub/pkg/openapi" "gorm.io/gorm" ) diff --git a/internal/db/service/artifact_test.go b/internal/db/service/artifact_test.go index f5afd4c3fc..9d9f9e19b5 100644 --- a/internal/db/service/artifact_test.go +++ b/internal/db/service/artifact_test.go @@ -5,11 +5,11 @@ import ( "testing" "time" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/service" - "github.com/kubeflow/model-registry/internal/defaults" - "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/service" + "github.com/kubeflow/hub/internal/defaults" + "github.com/kubeflow/hub/internal/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/db/service/common_test.go b/internal/db/service/common_test.go index 203409fae3..d004190891 100644 --- a/internal/db/service/common_test.go +++ b/internal/db/service/common_test.go @@ -4,10 +4,10 @@ import ( "os" "testing" - "github.com/kubeflow/model-registry/internal/db/schema" - "github.com/kubeflow/model-registry/internal/db/service" - "github.com/kubeflow/model-registry/internal/defaults" - "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/hub/internal/db/schema" + "github.com/kubeflow/hub/internal/db/service" + "github.com/kubeflow/hub/internal/defaults" + "github.com/kubeflow/hub/internal/testutils" "github.com/stretchr/testify/require" "gorm.io/gorm" ) diff --git a/internal/db/service/dataset.go b/internal/db/service/dataset.go index 8f10e11cbd..b099b9c04c 100644 --- a/internal/db/service/dataset.go +++ b/internal/db/service/dataset.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" - "github.com/kubeflow/model-registry/internal/db/utils" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" + "github.com/kubeflow/hub/internal/db/utils" "gorm.io/gorm" ) diff --git a/internal/db/service/doc_artifact.go b/internal/db/service/doc_artifact.go index 1839981d93..ecfc846548 100644 --- a/internal/db/service/doc_artifact.go +++ b/internal/db/service/doc_artifact.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" - "github.com/kubeflow/model-registry/internal/db/utils" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" + "github.com/kubeflow/hub/internal/db/utils" "gorm.io/gorm" ) diff --git a/internal/db/service/doc_artifact_test.go b/internal/db/service/doc_artifact_test.go index 01468910f2..f114081f43 100644 --- a/internal/db/service/doc_artifact_test.go +++ b/internal/db/service/doc_artifact_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/service" - "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/service" + "github.com/kubeflow/hub/internal/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/db/service/experiment.go b/internal/db/service/experiment.go index 4f38557f0f..4d9a1cd123 100644 --- a/internal/db/service/experiment.go +++ b/internal/db/service/experiment.go @@ -3,8 +3,8 @@ package service import ( "errors" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" "gorm.io/gorm" ) diff --git a/internal/db/service/experiment_run.go b/internal/db/service/experiment_run.go index 784913fd07..87db1a3665 100644 --- a/internal/db/service/experiment_run.go +++ b/internal/db/service/experiment_run.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" - "github.com/kubeflow/model-registry/internal/db/utils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" + "github.com/kubeflow/hub/internal/db/utils" "gorm.io/gorm" ) diff --git a/internal/db/service/experiment_run_test.go b/internal/db/service/experiment_run_test.go index c05056ff92..d92093bffe 100644 --- a/internal/db/service/experiment_run_test.go +++ b/internal/db/service/experiment_run_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/service" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/service" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/db/service/experiment_test.go b/internal/db/service/experiment_test.go index 58972197cb..0a608b5e11 100644 --- a/internal/db/service/experiment_test.go +++ b/internal/db/service/experiment_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/service" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/service" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/db/service/generic_repository.go b/internal/db/service/generic_repository.go index 9b9c412d5b..cebc947cef 100644 --- a/internal/db/service/generic_repository.go +++ b/internal/db/service/generic_repository.go @@ -5,12 +5,12 @@ import ( "fmt" "time" - "github.com/kubeflow/model-registry/internal/db/dbutil" - "github.com/kubeflow/model-registry/internal/db/filter" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" - "github.com/kubeflow/model-registry/internal/db/scopes" - "github.com/kubeflow/model-registry/pkg/api" + "github.com/kubeflow/hub/internal/db/dbutil" + "github.com/kubeflow/hub/internal/db/filter" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" + "github.com/kubeflow/hub/internal/db/scopes" + "github.com/kubeflow/hub/pkg/api" "gorm.io/gorm" ) diff --git a/internal/db/service/inference_service.go b/internal/db/service/inference_service.go index ca61e561ee..7f34235897 100644 --- a/internal/db/service/inference_service.go +++ b/internal/db/service/inference_service.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" - "github.com/kubeflow/model-registry/internal/db/utils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" + "github.com/kubeflow/hub/internal/db/utils" "gorm.io/gorm" ) diff --git a/internal/db/service/inference_service_test.go b/internal/db/service/inference_service_test.go index 4ec492e812..12858aded4 100644 --- a/internal/db/service/inference_service_test.go +++ b/internal/db/service/inference_service_test.go @@ -4,10 +4,10 @@ import ( "testing" "time" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/service" - "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/service" + "github.com/kubeflow/hub/internal/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/db/service/metric.go b/internal/db/service/metric.go index cc56f0e8ec..e74e33e9e5 100644 --- a/internal/db/service/metric.go +++ b/internal/db/service/metric.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" - "github.com/kubeflow/model-registry/internal/db/utils" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" + "github.com/kubeflow/hub/internal/db/utils" "gorm.io/gorm" ) diff --git a/internal/db/service/metric_history.go b/internal/db/service/metric_history.go index ca98a7214b..019d1a3419 100644 --- a/internal/db/service/metric_history.go +++ b/internal/db/service/metric_history.go @@ -7,10 +7,10 @@ import ( "strings" "github.com/golang/glog" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" - "github.com/kubeflow/model-registry/internal/db/utils" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" + "github.com/kubeflow/hub/internal/db/utils" "gorm.io/gorm" ) diff --git a/internal/db/service/metric_history_test.go b/internal/db/service/metric_history_test.go index 1123d268e3..aeec99ff58 100644 --- a/internal/db/service/metric_history_test.go +++ b/internal/db/service/metric_history_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/service" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/service" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/db/service/metric_test.go b/internal/db/service/metric_test.go index 703e978a65..fb00960f56 100644 --- a/internal/db/service/metric_test.go +++ b/internal/db/service/metric_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/service" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/service" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/db/service/model_artifact.go b/internal/db/service/model_artifact.go index 983ce6d0c2..18a822f194 100644 --- a/internal/db/service/model_artifact.go +++ b/internal/db/service/model_artifact.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" - "github.com/kubeflow/model-registry/internal/db/utils" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" + "github.com/kubeflow/hub/internal/db/utils" "gorm.io/gorm" ) diff --git a/internal/db/service/model_artifact_test.go b/internal/db/service/model_artifact_test.go index 67c695ada7..d6129eb42a 100644 --- a/internal/db/service/model_artifact_test.go +++ b/internal/db/service/model_artifact_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/service" - "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/service" + "github.com/kubeflow/hub/internal/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/db/service/model_version.go b/internal/db/service/model_version.go index df180d6881..b97ccd5096 100644 --- a/internal/db/service/model_version.go +++ b/internal/db/service/model_version.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" - "github.com/kubeflow/model-registry/internal/db/utils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" + "github.com/kubeflow/hub/internal/db/utils" "gorm.io/gorm" ) diff --git a/internal/db/service/model_version_test.go b/internal/db/service/model_version_test.go index 553bfd6032..7bc96dba89 100644 --- a/internal/db/service/model_version_test.go +++ b/internal/db/service/model_version_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/service" - "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/service" + "github.com/kubeflow/hub/internal/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/db/service/parameter.go b/internal/db/service/parameter.go index 0bcd28cc66..c8f3242a51 100644 --- a/internal/db/service/parameter.go +++ b/internal/db/service/parameter.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" - "github.com/kubeflow/model-registry/internal/db/utils" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" + "github.com/kubeflow/hub/internal/db/utils" "gorm.io/gorm" ) diff --git a/internal/db/service/parameter_test.go b/internal/db/service/parameter_test.go index 6a50ad5bd9..06ffd0f251 100644 --- a/internal/db/service/parameter_test.go +++ b/internal/db/service/parameter_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/service" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/service" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/db/service/registered_model.go b/internal/db/service/registered_model.go index a94c6991c4..8998f1ed78 100644 --- a/internal/db/service/registered_model.go +++ b/internal/db/service/registered_model.go @@ -3,8 +3,8 @@ package service import ( "errors" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" "gorm.io/gorm" ) diff --git a/internal/db/service/registered_model_test.go b/internal/db/service/registered_model_test.go index f352d4e7a2..835b574b61 100644 --- a/internal/db/service/registered_model_test.go +++ b/internal/db/service/registered_model_test.go @@ -4,11 +4,11 @@ import ( "testing" "time" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" - "github.com/kubeflow/model-registry/internal/db/service" - "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" + "github.com/kubeflow/hub/internal/db/service" + "github.com/kubeflow/hub/internal/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/db/service/serve_model.go b/internal/db/service/serve_model.go index e5c10b6aae..362252f5e7 100644 --- a/internal/db/service/serve_model.go +++ b/internal/db/service/serve_model.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" - "github.com/kubeflow/model-registry/internal/db/utils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" + "github.com/kubeflow/hub/internal/db/utils" "gorm.io/gorm" ) diff --git a/internal/db/service/serve_model_test.go b/internal/db/service/serve_model_test.go index 357426e932..dfd8fce70c 100644 --- a/internal/db/service/serve_model_test.go +++ b/internal/db/service/serve_model_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/service" - "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/service" + "github.com/kubeflow/hub/internal/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/db/service/serving_environment.go b/internal/db/service/serving_environment.go index 21fb6ec4cb..40e8e7b32f 100644 --- a/internal/db/service/serving_environment.go +++ b/internal/db/service/serving_environment.go @@ -3,8 +3,8 @@ package service import ( "errors" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" "gorm.io/gorm" ) diff --git a/internal/db/service/serving_environment_test.go b/internal/db/service/serving_environment_test.go index 3dbd85dbf2..1e4e1fc2bb 100644 --- a/internal/db/service/serving_environment_test.go +++ b/internal/db/service/serving_environment_test.go @@ -4,10 +4,10 @@ import ( "testing" "time" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/service" - "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/service" + "github.com/kubeflow/hub/internal/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/db/service/spec.go b/internal/db/service/spec.go index a0854db755..b7cba8a136 100644 --- a/internal/db/service/spec.go +++ b/internal/db/service/spec.go @@ -1,8 +1,8 @@ package service import ( - "github.com/kubeflow/model-registry/internal/datastore" - "github.com/kubeflow/model-registry/internal/defaults" + "github.com/kubeflow/hub/internal/datastore" + "github.com/kubeflow/hub/internal/defaults" ) func DatastoreSpec() *datastore.Spec { diff --git a/internal/db/service/type.go b/internal/db/service/type.go index c87af65809..c89be362bb 100644 --- a/internal/db/service/type.go +++ b/internal/db/service/type.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" "gorm.io/gorm" ) diff --git a/internal/db/service/type_property.go b/internal/db/service/type_property.go index 8f15580eb4..7ca33464ad 100644 --- a/internal/db/service/type_property.go +++ b/internal/db/service/type_property.go @@ -5,8 +5,8 @@ import ( "fmt" "strconv" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/schema" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/schema" "golang.org/x/exp/constraints" "gorm.io/gorm" ) diff --git a/internal/db/service/type_property_test.go b/internal/db/service/type_property_test.go index f28f7dd1ad..4c441bcbac 100644 --- a/internal/db/service/type_property_test.go +++ b/internal/db/service/type_property_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/service" - "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/service" + "github.com/kubeflow/hub/internal/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/db/service/type_test.go b/internal/db/service/type_test.go index d2d3f8fb43..13ff208f7b 100644 --- a/internal/db/service/type_test.go +++ b/internal/db/service/type_test.go @@ -3,11 +3,11 @@ package service_test import ( "testing" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/db/service" - "github.com/kubeflow/model-registry/internal/defaults" - "github.com/kubeflow/model-registry/internal/testutils" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/db/service" + "github.com/kubeflow/hub/internal/defaults" + "github.com/kubeflow/hub/internal/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/db/utils/join.go b/internal/db/utils/join.go index d03a5a8b67..493dc65f11 100644 --- a/internal/db/utils/join.go +++ b/internal/db/utils/join.go @@ -3,7 +3,7 @@ package utils import ( "fmt" - "github.com/kubeflow/model-registry/internal/db/schema" + "github.com/kubeflow/hub/internal/db/schema" "gorm.io/gorm" ) diff --git a/internal/mapper/embedmd_mapper.go b/internal/mapper/embedmd_mapper.go index 07a5235549..b5104d6595 100644 --- a/internal/mapper/embedmd_mapper.go +++ b/internal/mapper/embedmd_mapper.go @@ -3,11 +3,11 @@ package mapper import ( "fmt" - "github.com/kubeflow/model-registry/internal/converter" - "github.com/kubeflow/model-registry/internal/converter/generated" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/defaults" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/converter" + "github.com/kubeflow/hub/internal/converter/generated" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/defaults" + "github.com/kubeflow/hub/pkg/openapi" ) type EmbedMDMapper struct { diff --git a/internal/mapper/embedmd_mapper_test.go b/internal/mapper/embedmd_mapper_test.go index c13542fbf1..36f0036bda 100644 --- a/internal/mapper/embedmd_mapper_test.go +++ b/internal/mapper/embedmd_mapper_test.go @@ -3,11 +3,11 @@ package mapper_test import ( "testing" - "github.com/kubeflow/model-registry/internal/apiutils" - "github.com/kubeflow/model-registry/internal/db/models" - "github.com/kubeflow/model-registry/internal/defaults" - "github.com/kubeflow/model-registry/internal/mapper" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/db/models" + "github.com/kubeflow/hub/internal/defaults" + "github.com/kubeflow/hub/internal/mapper" + "github.com/kubeflow/hub/pkg/openapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/proxy/readiness.go b/internal/proxy/readiness.go index 8a622b0cab..b159a76e03 100644 --- a/internal/proxy/readiness.go +++ b/internal/proxy/readiness.go @@ -6,8 +6,8 @@ import ( "net/http" "time" - "github.com/kubeflow/model-registry/internal/db" - "github.com/kubeflow/model-registry/pkg/api" + "github.com/kubeflow/hub/internal/db" + "github.com/kubeflow/hub/pkg/api" ) const ( diff --git a/internal/proxy/readiness_test.go b/internal/proxy/readiness_test.go index c021901321..3324e3e520 100644 --- a/internal/proxy/readiness_test.go +++ b/internal/proxy/readiness_test.go @@ -9,14 +9,14 @@ import ( "testing" "time" - "github.com/kubeflow/model-registry/internal/core" - "github.com/kubeflow/model-registry/internal/db" - "github.com/kubeflow/model-registry/internal/db/schema" - "github.com/kubeflow/model-registry/internal/db/service" - "github.com/kubeflow/model-registry/internal/defaults" - "github.com/kubeflow/model-registry/internal/testutils" - "github.com/kubeflow/model-registry/internal/tls" - "github.com/kubeflow/model-registry/pkg/api" + "github.com/kubeflow/hub/internal/core" + "github.com/kubeflow/hub/internal/db" + "github.com/kubeflow/hub/internal/db/schema" + "github.com/kubeflow/hub/internal/db/service" + "github.com/kubeflow/hub/internal/defaults" + "github.com/kubeflow/hub/internal/testutils" + "github.com/kubeflow/hub/internal/tls" + "github.com/kubeflow/hub/pkg/api" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "gorm.io/gorm" diff --git a/internal/server/middleware/router.go b/internal/server/middleware/router.go index a10476245f..11495e60fd 100644 --- a/internal/server/middleware/router.go +++ b/internal/server/middleware/router.go @@ -3,7 +3,7 @@ package middleware import ( "net/http" - "github.com/kubeflow/model-registry/internal/server/openapi" + "github.com/kubeflow/hub/internal/server/openapi" ) // WrapWithValidation wraps the auto-generated router with custom validation middleware diff --git a/internal/server/openapi/api.go b/internal/server/openapi/api.go index 2307a6cea4..470e57e0ff 100644 --- a/internal/server/openapi/api.go +++ b/internal/server/openapi/api.go @@ -14,7 +14,7 @@ import ( "context" "net/http" - model "github.com/kubeflow/model-registry/pkg/openapi" + model "github.com/kubeflow/hub/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 1de58b8196..6abb9e800e 100644 --- a/internal/server/openapi/api_model_registry_service.go +++ b/internal/server/openapi/api_model_registry_service.go @@ -17,7 +17,7 @@ import ( "github.com/go-chi/chi/v5" - model "github.com/kubeflow/model-registry/pkg/openapi" + model "github.com/kubeflow/hub/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 02f91666c0..284e4b9393 100644 --- a/internal/server/openapi/api_model_registry_service_service.go +++ b/internal/server/openapi/api_model_registry_service_service.go @@ -15,12 +15,12 @@ import ( "net/http" "strings" - "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/internal/db/scopes" - "github.com/kubeflow/model-registry/pkg/api" - model "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/internal/apiutils" + "github.com/kubeflow/hub/internal/converter" + "github.com/kubeflow/hub/internal/converter/generated" + "github.com/kubeflow/hub/internal/db/scopes" + "github.com/kubeflow/hub/pkg/api" + model "github.com/kubeflow/hub/pkg/openapi" ) // ModelRegistryServiceAPIService is a service that implements the logic for the ModelRegistryServiceAPIServicer diff --git a/internal/server/openapi/helpers.go b/internal/server/openapi/helpers.go index f7439bb310..bd04b7dc35 100644 --- a/internal/server/openapi/helpers.go +++ b/internal/server/openapi/helpers.go @@ -23,7 +23,7 @@ import ( "strings" "time" - model "github.com/kubeflow/model-registry/pkg/openapi" + model "github.com/kubeflow/hub/pkg/openapi" ) const errMsgRequiredMissing = "required parameter is missing" diff --git a/internal/server/openapi/type_asserts.go b/internal/server/openapi/type_asserts.go index 516752cef1..ca1c40a3fd 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/kubeflow/model-registry/pkg/openapi" + model "github.com/kubeflow/hub/pkg/openapi" ) // AssertArtifactConstraints checks if the values respects the defined constraints diff --git a/internal/testutils/mysql_test_utils.go b/internal/testutils/mysql_test_utils.go index 8a76c7fe13..8c889ed1bf 100644 --- a/internal/testutils/mysql_test_utils.go +++ b/internal/testutils/mysql_test_utils.go @@ -7,10 +7,10 @@ import ( "sync" "testing" - "github.com/kubeflow/model-registry/internal/datastore" - "github.com/kubeflow/model-registry/internal/datastore/embedmd" - "github.com/kubeflow/model-registry/internal/datastore/embedmd/mysql" - "github.com/kubeflow/model-registry/internal/tls" + "github.com/kubeflow/hub/internal/datastore" + "github.com/kubeflow/hub/internal/datastore/embedmd" + "github.com/kubeflow/hub/internal/datastore/embedmd/mysql" + "github.com/kubeflow/hub/internal/tls" "github.com/stretchr/testify/require" testcontainers "github.com/testcontainers/testcontainers-go" cont_mysql "github.com/testcontainers/testcontainers-go/modules/mysql" diff --git a/internal/testutils/mysql_test_utils_test.go b/internal/testutils/mysql_test_utils_test.go index 3e1bd417df..ecf50111cb 100644 --- a/internal/testutils/mysql_test_utils_test.go +++ b/internal/testutils/mysql_test_utils_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/kubeflow/model-registry/internal/db/service" + "github.com/kubeflow/hub/internal/db/service" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/testutils/postgres_test_utils.go b/internal/testutils/postgres_test_utils.go index c968d34f75..6f22fda302 100644 --- a/internal/testutils/postgres_test_utils.go +++ b/internal/testutils/postgres_test_utils.go @@ -6,10 +6,10 @@ import ( "sync" "testing" - "github.com/kubeflow/model-registry/internal/datastore" - "github.com/kubeflow/model-registry/internal/datastore/embedmd" - "github.com/kubeflow/model-registry/internal/datastore/embedmd/postgres" - "github.com/kubeflow/model-registry/internal/tls" + "github.com/kubeflow/hub/internal/datastore" + "github.com/kubeflow/hub/internal/datastore/embedmd" + "github.com/kubeflow/hub/internal/datastore/embedmd/postgres" + "github.com/kubeflow/hub/internal/tls" "github.com/stretchr/testify/require" testcontainers "github.com/testcontainers/testcontainers-go" cont_postgres "github.com/testcontainers/testcontainers-go/modules/postgres" diff --git a/internal/tls/config_test.go b/internal/tls/config_test.go index e3a249073c..cecb46531e 100644 --- a/internal/tls/config_test.go +++ b/internal/tls/config_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - tlsconfig "github.com/kubeflow/model-registry/internal/tls" + tlsconfig "github.com/kubeflow/hub/internal/tls" ) const ( diff --git a/main.go b/main.go index 99c2cf6e46..8aaad8b966 100644 --- a/main.go +++ b/main.go @@ -2,7 +2,7 @@ package main import ( "github.com/golang/glog" - "github.com/kubeflow/model-registry/cmd" + "github.com/kubeflow/hub/cmd" ) func main() { @@ -16,4 +16,3 @@ func main() { cmd.Execute() } - diff --git a/pkg/api/api.go b/pkg/api/api.go index 46607c4cbc..05e9daf5a5 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -1,6 +1,6 @@ package api -import "github.com/kubeflow/model-registry/pkg/openapi" +import "github.com/kubeflow/hub/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/inferenceservice-controller/controller.go b/pkg/inferenceservice-controller/controller.go index 7f58ecfe92..bf3603c2b6 100644 --- a/pkg/inferenceservice-controller/controller.go +++ b/pkg/inferenceservice-controller/controller.go @@ -8,7 +8,7 @@ import ( "github.com/go-logr/logr" kservev1beta1 "github.com/kserve/kserve/pkg/apis/serving/v1beta1" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/pkg/openapi" corev1 "k8s.io/api/core/v1" apierrs "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/inferenceservice-controller/controller_test.go b/pkg/inferenceservice-controller/controller_test.go index ec00fd461f..3151f82a82 100644 --- a/pkg/inferenceservice-controller/controller_test.go +++ b/pkg/inferenceservice-controller/controller_test.go @@ -7,7 +7,7 @@ import ( "time" kservev1beta1 "github.com/kserve/kserve/pkg/apis/serving/v1beta1" - "github.com/kubeflow/model-registry/pkg/openapi" + "github.com/kubeflow/hub/pkg/openapi" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "knative.dev/pkg/apis" diff --git a/pkg/inferenceservice-controller/go.mod b/pkg/inferenceservice-controller/go.mod index 4518126a6c..c4f3155ec3 100644 --- a/pkg/inferenceservice-controller/go.mod +++ b/pkg/inferenceservice-controller/go.mod @@ -1,11 +1,11 @@ -module github.com/kubeflow/model-registry/pkg/inferenceservice-controller +module github.com/kubeflow/hub/pkg/inferenceservice-controller go 1.25.7 require ( github.com/go-logr/logr v1.4.3 github.com/kserve/kserve v0.17.0-rc1 - github.com/kubeflow/model-registry/pkg/openapi v0.0.0 + github.com/kubeflow/hub/pkg/openapi v0.0.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.39.1 go.uber.org/zap v1.27.1 @@ -137,4 +137,4 @@ require ( sigs.k8s.io/structured-merge-diff/v6 v6.3.1 // indirect ) -replace github.com/kubeflow/model-registry/pkg/openapi => ../openapi +replace github.com/kubeflow/hub/pkg/openapi => ../openapi diff --git a/pkg/inferenceservice-controller/suite_test.go b/pkg/inferenceservice-controller/suite_test.go index 1b40cd6b83..3c096b5649 100644 --- a/pkg/inferenceservice-controller/suite_test.go +++ b/pkg/inferenceservice-controller/suite_test.go @@ -15,8 +15,8 @@ import ( "time" kservev1beta1 "github.com/kserve/kserve/pkg/apis/serving/v1beta1" - inferenceservicecontroller "github.com/kubeflow/model-registry/pkg/inferenceservice-controller" - "github.com/kubeflow/model-registry/pkg/openapi" + inferenceservicecontroller "github.com/kubeflow/hub/pkg/inferenceservice-controller" + "github.com/kubeflow/hub/pkg/openapi" "go.uber.org/zap/zapcore" corev1 "k8s.io/api/core/v1" authv1 "k8s.io/api/rbac/v1" diff --git a/pkg/openapi/go.mod b/pkg/openapi/go.mod index 4b7564a2a9..0fc50bdf81 100644 --- a/pkg/openapi/go.mod +++ b/pkg/openapi/go.mod @@ -1,3 +1,3 @@ -module github.com/kubeflow/model-registry/pkg/openapi +module github.com/kubeflow/hub/pkg/openapi go 1.23 diff --git a/scripts/gen_type_asserts.py b/scripts/gen_type_asserts.py index 296440db9c..733626c77b 100644 --- a/scripts/gen_type_asserts.py +++ b/scripts/gen_type_asserts.py @@ -65,7 +65,7 @@ def get_name(func: str) -> str: package openapi import ( - model "github.com/kubeflow/model-registry/pkg/openapi" + model "github.com/kubeflow/hub/pkg/openapi" ) """) diff --git a/templates/go-server/api.mustache b/templates/go-server/api.mustache index f30248330e..38d681cc8a 100644 --- a/templates/go-server/api.mustache +++ b/templates/go-server/api.mustache @@ -5,7 +5,7 @@ import ( "context" "net/http" - model "github.com/kubeflow/model-registry/pkg/openapi" + model "github.com/kubeflow/hub/pkg/openapi" ) diff --git a/templates/go-server/controller-api.mustache b/templates/go-server/controller-api.mustache index 7c14511bdb..a407f848f0 100644 --- a/templates/go-server/controller-api.mustache +++ b/templates/go-server/controller-api.mustache @@ -24,7 +24,7 @@ import ( "github.com/go-chi/chi/v5" {{/chi}} - model "github.com/kubeflow/model-registry/pkg/openapi" + model "github.com/kubeflow/hub/pkg/openapi" {{/routers}} {{/hasPathParams}} ) diff --git a/templates/go-server/helpers.mustache b/templates/go-server/helpers.mustache index b5d34e03fa..1752cecafe 100644 --- a/templates/go-server/helpers.mustache +++ b/templates/go-server/helpers.mustache @@ -14,7 +14,7 @@ import ( "strings" "time" - model "github.com/kubeflow/model-registry/pkg/openapi" + model "github.com/kubeflow/hub/pkg/openapi" ) const errMsgRequiredMissing = "required parameter is missing"