Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
20 changes: 10 additions & 10 deletions catalog/cmd/catalog.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion catalog/internal/catalog/basecatalog/common_properties.go
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/hub/internal/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/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion catalog/internal/catalog/basecatalog/entity_registry.go
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/hub/internal/db/filter"
)

// EntityTypeDefinition describes a single catalog entity type's filtering behavior.
Expand Down
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/hub/internal/db/filter"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
6 changes: 3 additions & 3 deletions catalog/internal/catalog/basecatalog/filter_options.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions catalog/internal/catalog/basecatalog/source_status.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion catalog/internal/catalog/basecatalog/source_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions catalog/internal/catalog/catalog.go
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
8 changes: 4 additions & 4 deletions catalog/internal/catalog/loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion catalog/internal/catalog/mcpcatalog/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
16 changes: 8 additions & 8 deletions catalog/internal/catalog/mcpcatalog/db_mcp.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
10 changes: 5 additions & 5 deletions catalog/internal/catalog/mcpcatalog/db_mcp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
8 changes: 4 additions & 4 deletions catalog/internal/catalog/mcpcatalog/loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions catalog/internal/catalog/mcpcatalog/loader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions catalog/internal/catalog/mcpcatalog/models/mcp_server.go
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
6 changes: 3 additions & 3 deletions catalog/internal/catalog/mcpcatalog/models/mcp_server_tool.go
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
10 changes: 5 additions & 5 deletions catalog/internal/catalog/mcpcatalog/providers.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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"`
Expand Down
4 changes: 2 additions & 2 deletions catalog/internal/catalog/mcpcatalog/providers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion catalog/internal/catalog/mcpcatalog/server_filter.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion catalog/internal/catalog/mcpcatalog/server_filter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
18 changes: 9 additions & 9 deletions catalog/internal/catalog/mcpcatalog/service/mcp_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
12 changes: 6 additions & 6 deletions catalog/internal/catalog/mcpcatalog/service/mcp_server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
12 changes: 6 additions & 6 deletions catalog/internal/catalog/mcpcatalog/service/mcp_server_tool.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
Loading
Loading