Skip to content

feat: extract shared infrastructure into internal/platform layer #2434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Al-Pragliola wants to merge 4 commits into from
Closed

feat: extract shared infrastructure into internal/platform layer #2434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
098c768
feat: extract shared infrastructure into internal/platform layer
Al-Pragliola Mar 18, 2026
4a67f48
fix: restore lost changes from #2424 (prefixed name filter)
Al-Pragliola Mar 19, 2026
630d470
fix: address PR review feedback
Al-Pragliola Mar 19, 2026
fd8691e
fix: update apiutils import in MCP test after rebase on main
Al-Pragliola Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
32 changes: 16 additions & 16 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,22 +214,22 @@ internal/converter/generated/embedmd_openapi_converter.gen.go linguist-generated
internal/converter/generated/openapi_converter.gen.go linguist-generated=true
internal/converter/generated/openapi_embedmd_converter.gen.go linguist-generated=true
internal/converter/generated/openapi_reconciler.gen.go linguist-generated=true
internal/db/schema/artifact.gen.go linguist-generated=true
internal/db/schema/artifactproperty.gen.go linguist-generated=true
internal/db/schema/association.gen.go linguist-generated=true
internal/db/schema/attribution.gen.go linguist-generated=true
internal/db/schema/context.gen.go linguist-generated=true
internal/db/schema/contextproperty.gen.go linguist-generated=true
internal/db/schema/event.gen.go linguist-generated=true
internal/db/schema/eventpath.gen.go linguist-generated=true
internal/db/schema/execution.gen.go linguist-generated=true
internal/db/schema/executionproperty.gen.go linguist-generated=true
internal/db/schema/mlmdenv.gen.go linguist-generated=true
internal/db/schema/parentcontext.gen.go linguist-generated=true
internal/db/schema/parenttype.gen.go linguist-generated=true
internal/db/schema/schema_migrations.gen.go linguist-generated=true
internal/db/schema/type.gen.go linguist-generated=true
internal/db/schema/typeproperty.gen.go linguist-generated=true
internal/platform/db/schema/artifact.gen.go linguist-generated=true
internal/platform/db/schema/artifactproperty.gen.go linguist-generated=true
internal/platform/db/schema/association.gen.go linguist-generated=true
internal/platform/db/schema/attribution.gen.go linguist-generated=true
internal/platform/db/schema/context.gen.go linguist-generated=true
internal/platform/db/schema/contextproperty.gen.go linguist-generated=true
internal/platform/db/schema/event.gen.go linguist-generated=true
internal/platform/db/schema/eventpath.gen.go linguist-generated=true
internal/platform/db/schema/execution.gen.go linguist-generated=true
internal/platform/db/schema/executionproperty.gen.go linguist-generated=true
internal/platform/db/schema/mlmdenv.gen.go linguist-generated=true
internal/platform/db/schema/parentcontext.gen.go linguist-generated=true
internal/platform/db/schema/parenttype.gen.go linguist-generated=true
internal/platform/db/schema/schema_migrations.gen.go linguist-generated=true
internal/platform/db/schema/type.gen.go linguist-generated=true
internal/platform/db/schema/typeproperty.gen.go linguist-generated=true
internal/server/openapi/api.go linguist-generated=true
internal/server/openapi/api_model_registry_service.go linguist-generated=true
internal/server/openapi/error.go linguist-generated=true
Expand Down
11 changes: 6 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,14 @@ stop/postgres:
.PHONY: gen/gorm/mysql
gen/gorm/mysql: bin/golang-migrate start/mysql
@(trap 'cd $(CURDIR) && $(MAKE) stop/mysql' EXIT; \
$(GOLANG_MIGRATE) -path './internal/datastore/embedmd/mysql/migrations' -database 'mysql://root:root@tcp(localhost:3306)/model-registry' up && \
$(GOLANG_MIGRATE) -path './internal/platform/db/mysql/migrations' -database 'mysql://root:root@tcp(localhost:3306)/model-registry' up && \
cd gorm-gen && GOWORK=off go run main.go --db-type mysql --dsn 'root:root@tcp(localhost:3306)/model-registry?charset=utf8mb4&parseTime=True&loc=Local')

# generate the gorm structs for PostgreSQL
.PHONY: gen/gorm/postgres
gen/gorm/postgres: bin/golang-migrate start/postgres
@(trap 'cd $(CURDIR) && $(MAKE) stop/postgres' EXIT; \
$(GOLANG_MIGRATE) -path './internal/datastore/embedmd/postgres/migrations' -database 'postgres://postgres:postgres@localhost:5432/model-registry?sslmode=disable' up && \
$(GOLANG_MIGRATE) -path './internal/platform/db/postgres/migrations' -database 'postgres://postgres:postgres@localhost:5432/model-registry?sslmode=disable' up && \
cd gorm-gen && GOWORK=off go run main.go --db-type postgres --dsn 'postgres://postgres:postgres@localhost:5432/model-registry?sslmode=disable' && \
cd $(CURDIR) && ./scripts/remove_gorm_defaults.sh)

Expand All @@ -142,9 +142,10 @@ endif
.PHONY: vet
vet:
@echo "Running go vet on all packages..."
@${GO} vet $$(${GO} list ./... | grep -vF github.com/kubeflow/model-registry/internal/db/filter) && \
echo "Checking filter package (parser.go excluded due to participle struct tags)..." && \
cd internal/db/filter && ${GO} build -o /dev/null . 2>&1 | grep -E "vet:|error:" || echo "✓ Filter package builds successfully"
@${GO} vet $$(${GO} list ./... | grep -vE 'github.com/kubeflow/model-registry/internal/(db|platform/db)/filter') && \
echo "Checking filter packages (parser.go excluded due to participle struct tags)..." && \
cd internal/db/filter && ${GO} build -o /dev/null . 2>&1 | grep -E "vet:|error:" || echo "✓ Filter package builds successfully" && \
cd $(CURDIR)/internal/platform/db/filter && ${GO} build -o /dev/null . 2>&1 | grep -E "vet:|error:" || echo "✓ Platform filter package builds successfully"

.PHONY: clean/csi
clean/csi:
Expand Down
4 changes: 2 additions & 2 deletions catalog/cmd/catalog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"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/platform/datastore"
"github.com/kubeflow/model-registry/internal/datastore/embedmd"
"github.com/kubeflow/model-registry/internal/db"
"github.com/kubeflow/model-registry/internal/platform/db"
"github.com/spf13/cobra"
"golang.org/x/sync/errgroup"
)
Expand Down
2 changes: 1 addition & 1 deletion catalog/internal/catalog/basecatalog/common_properties.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package basecatalog
import (
"maps"

"github.com/kubeflow/model-registry/internal/db/filter"
"github.com/kubeflow/model-registry/internal/platform/db/filter"
)

// CommonContextProperties returns the entity-table properties shared by all Context entities.
Expand Down
2 changes: 1 addition & 1 deletion catalog/internal/catalog/basecatalog/entity_registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"strings"
"sync"

"github.com/kubeflow/model-registry/internal/db/filter"
"github.com/kubeflow/model-registry/internal/platform/db/filter"
)

// EntityTypeDefinition describes a single catalog entity type's filtering behavior.
Expand Down
2 changes: 1 addition & 1 deletion catalog/internal/catalog/basecatalog/entity_registry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package basecatalog
import (
"testing"

"github.com/kubeflow/model-registry/internal/db/filter"
"github.com/kubeflow/model-registry/internal/platform/db/filter"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion catalog/internal/catalog/basecatalog/filter_options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

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"
"github.com/kubeflow/model-registry/internal/platform/apiutils"
)

// DbPropToAPIOption converts a database PropertyOption to an API FilterOption.
Expand Down
2 changes: 1 addition & 1 deletion catalog/internal/catalog/basecatalog/source_status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ 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"
mrmodels "github.com/kubeflow/model-registry/internal/platform/db/entity"
)

// CleanupOrphanedCatalogSources removes CatalogSource records for sources that are no
Expand Down
2 changes: 1 addition & 1 deletion catalog/internal/catalog/mcpcatalog/db_mcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
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/internal/platform/apiutils"
"github.com/kubeflow/model-registry/pkg/api"
)

Expand Down
2 changes: 1 addition & 1 deletion catalog/internal/catalog/mcpcatalog/db_mcp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"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"
internalmodels "github.com/kubeflow/model-registry/internal/platform/db/entity"
"github.com/kubeflow/model-registry/pkg/api"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion catalog/internal/catalog/mcpcatalog/loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"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"
mrmodels "github.com/kubeflow/model-registry/internal/platform/db/entity"
)

// MCPPartiallyAvailableError indicates that a source loaded some MCP servers successfully
Expand Down
2 changes: 1 addition & 1 deletion catalog/internal/catalog/mcpcatalog/loader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/kubeflow/model-registry/catalog/internal/catalog/modelcatalog"
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/internal/db/schema"
"github.com/kubeflow/model-registry/internal/platform/db/schema"
"github.com/kubeflow/model-registry/internal/testutils"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
4 changes: 2 additions & 2 deletions catalog/internal/catalog/mcpcatalog/models/mcp_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ 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/model-registry/internal/platform/db/filter"
dbmodels "github.com/kubeflow/model-registry/internal/platform/db/entity"
)

// MCPServerListOptions holds the options for listing MCP servers.
Expand Down
4 changes: 2 additions & 2 deletions catalog/internal/catalog/mcpcatalog/models/mcp_server_tool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ 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/model-registry/internal/platform/db/filter"
dbmodels "github.com/kubeflow/model-registry/internal/platform/db/entity"
)

// MCPServerToolListOptions holds the options for listing MCP server tools.
Expand Down
2 changes: 1 addition & 1 deletion catalog/internal/catalog/mcpcatalog/providers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"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"
mrmodels "github.com/kubeflow/model-registry/internal/platform/db/entity"
"k8s.io/apimachinery/pkg/util/yaml"
)

Expand Down
12 changes: 6 additions & 6 deletions catalog/internal/catalog/mcpcatalog/service/mcp_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import (
"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/model-registry/internal/platform/db/dbutil"
dbmodels "github.com/kubeflow/model-registry/internal/platform/db/entity"
"github.com/kubeflow/model-registry/internal/platform/db/schema"
"github.com/kubeflow/model-registry/internal/platform/db/scopes"
service "github.com/kubeflow/model-registry/internal/platform/db/repository"
"github.com/kubeflow/model-registry/internal/platform/db/utils"
"gorm.io/gorm"
)

Expand Down
4 changes: 2 additions & 2 deletions catalog/internal/catalog/mcpcatalog/service/mcp_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"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/platform/apiutils"
dbmodels "github.com/kubeflow/model-registry/internal/platform/db/entity"
"github.com/kubeflow/model-registry/internal/testutils"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
8 changes: 4 additions & 4 deletions catalog/internal/catalog/mcpcatalog/service/mcp_server_tool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (

"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"
dbmodels "github.com/kubeflow/model-registry/internal/platform/db/entity"
"github.com/kubeflow/model-registry/internal/platform/db/schema"
service "github.com/kubeflow/model-registry/internal/platform/db/repository"
"github.com/kubeflow/model-registry/internal/platform/db/utils"
"gorm.io/gorm"
)

Expand Down
4 changes: 2 additions & 2 deletions catalog/internal/catalog/mcpcatalog/service/mcp_server_tool_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"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/platform/apiutils"
dbmodels "github.com/kubeflow/model-registry/internal/platform/db/entity"
"github.com/kubeflow/model-registry/internal/testutils"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
4 changes: 2 additions & 2 deletions catalog/internal/catalog/mcpcatalog/service/test_helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/model-registry/internal/platform/datastore"
"github.com/kubeflow/model-registry/internal/platform/db/schema"
"github.com/stretchr/testify/require"
"gorm.io/gorm"
)
Expand Down
2 changes: 1 addition & 1 deletion catalog/internal/catalog/mcpcatalog/sources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"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/model-registry/internal/platform/apiutils"
)

// mcpOriginEntry holds MCP sources from a single origin (config file).
Expand Down
2 changes: 1 addition & 1 deletion catalog/internal/catalog/mcpcatalog/sources_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"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/model-registry/internal/platform/apiutils"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion catalog/internal/catalog/modelcatalog/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

model "github.com/kubeflow/model-registry/catalog/pkg/openapi"
mrmodels "github.com/kubeflow/model-registry/internal/db/models"
mrmodels "github.com/kubeflow/model-registry/internal/platform/db/entity"
)

type ListModelsParams struct {
Expand Down
4 changes: 2 additions & 2 deletions catalog/internal/catalog/modelcatalog/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
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/model-registry/internal/platform/apiutils"
mrmodels "github.com/kubeflow/model-registry/internal/platform/db/entity"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions catalog/internal/catalog/modelcatalog/db_catalog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (
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/platform/apiutils"
"github.com/kubeflow/model-registry/internal/converter"
mrmodels "github.com/kubeflow/model-registry/internal/db/models"
mrmodels "github.com/kubeflow/model-registry/internal/platform/db/entity"
"github.com/kubeflow/model-registry/pkg/api"
"github.com/kubeflow/model-registry/pkg/openapi"
)
Expand Down
4 changes: 2 additions & 2 deletions catalog/internal/catalog/modelcatalog/db_catalog_filterquery_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"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"
"github.com/kubeflow/model-registry/internal/platform/db/filter"
"github.com/kubeflow/model-registry/internal/platform/db/schema"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gorm.io/driver/postgres"
Expand Down
4 changes: 2 additions & 2 deletions catalog/internal/catalog/modelcatalog/db_catalog_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
sharedmodels "github.com/kubeflow/model-registry/catalog/internal/db/models"
"github.com/kubeflow/model-registry/catalog/internal/db/service"
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/platform/apiutils"
mr_models "github.com/kubeflow/model-registry/internal/platform/db/entity"
"github.com/kubeflow/model-registry/internal/testutils"
"github.com/kubeflow/model-registry/pkg/api"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion catalog/internal/catalog/modelcatalog/hf_catalog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
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"
models "github.com/kubeflow/model-registry/internal/platform/db/entity"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion catalog/internal/catalog/modelcatalog/hf_catalog_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (

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"
models "github.com/kubeflow/model-registry/internal/platform/db/entity"
)

func TestPopulateFromHFInfo(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions catalog/internal/catalog/modelcatalog/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"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/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/platform/apiutils"
mr_models "github.com/kubeflow/model-registry/internal/platform/db/entity"
"github.com/kubeflow/model-registry/internal/platform/db/schema"
"github.com/kubeflow/model-registry/internal/testutils"
"github.com/stretchr/testify/require"
"gorm.io/gorm"
Expand Down
2 changes: 1 addition & 1 deletion catalog/internal/catalog/modelcatalog/loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"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"
mrmodels "github.com/kubeflow/model-registry/internal/platform/db/entity"
)

// PartiallyAvailableError indicates that a source loaded some models successfully
Expand Down
2 changes: 1 addition & 1 deletion catalog/internal/catalog/modelcatalog/loader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
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/platform/apiutils"
"github.com/stretchr/testify/assert"
"k8s.io/apimachinery/pkg/util/yaml"
)
Expand Down
Loading
Loading