Updated for the newer GIE

Signed-off-by: irar2 <irar@il.ibm.com>

Author: irar2

pkg/plugins/datalayer/models/datasource_test.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"k8s.io/apimachinery/pkg/types"
-
 	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datalayer"
 	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datalayer/http"
+	fwkdl "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/framework/interface/datalayer"
 )
 
 func TestDatasource(t *testing.T) {
@@ -36,8 +36,8 @@ func TestDatasource(t *testing.T) {
 	assert.Nil(t, err, "failed to register")
 
 	ctx := context.Background()
-	factory := datalayer.NewEndpointFactory([]datalayer.DataSource{source}, 100*time.Millisecond)
-	pod := &datalayer.EndpointMetadata{
+	factory := datalayer.NewEndpointFactory([]fwkdl.DataSource{source}, 100*time.Millisecond)
+	pod := &fwkdl.EndpointMetadata{
 		NamespacedName: types.NamespacedName{
 			Name:      "pod1",
 			Namespace: "default",

pkg/plugins/datalayer/models/extractor.go

@@ -6,8 +6,8 @@ import (
 	"reflect"
 	"strings"
 
-	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datalayer"
-	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/plugins"
+	fwkdl "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/framework/interface/datalayer"
+	fwkplugin "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/framework/interface/plugin"
 )
 
 const modelsAttributeKey = "/v1/models"
@@ -27,7 +27,7 @@ func (m *ModelInfo) String() string {
 }
 
 // Clone returns a full copy of the object
-func (m ModelInfoCollection) Clone() datalayer.Cloneable {
+func (m ModelInfoCollection) Clone() fwkdl.Cloneable {
 	if m == nil {
 		return nil
 	}
@@ -60,21 +60,21 @@ var (
 
 // ModelExtractor implements the models extraction.
 type ModelExtractor struct {
-	typedName plugins.TypedName
+	typedName fwkplugin.TypedName
 }
 
 // NewModelExtractor returns a new model extractor.
 func NewModelExtractor() (*ModelExtractor, error) {
 	return &ModelExtractor{
-		typedName: plugins.TypedName{
+		typedName: fwkplugin.TypedName{
 			Type: ModelsExtractorType,
 			Name: ModelsExtractorType,
 		},
 	}, nil
 }
 
 // TypedName returns the type and name of the ModelExtractor.
-func (me *ModelExtractor) TypedName() plugins.TypedName {
+func (me *ModelExtractor) TypedName() fwkplugin.TypedName {
 	return me.typedName
 }
 
@@ -85,12 +85,12 @@ func (me *ModelExtractor) ExpectedInputType() reflect.Type {
 
 // Extract transforms the data source output into a concrete attribute that
 // is stored on the given endpoint.
-func (me *ModelExtractor) Extract(_ context.Context, data any, ep datalayer.Endpoint) error {
+func (me *ModelExtractor) Extract(_ context.Context, data any, ep fwkdl.Endpoint) error {
 	models, ok := data.(*ModelResponse)
 	if !ok {
 		return fmt.Errorf("unexpected input in Extract: %T", data)
 	}
 
-	ep.Put(modelsAttributeKey, ModelInfoCollection(models.Data))
+	ep.GetAttributes().Put(modelsAttributeKey, ModelInfoCollection(models.Data))
 	return nil
 }

pkg/plugins/datalayer/models/extractor_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 
-	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datalayer"
+	fwkdl "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/framework/interface/datalayer"
 )
 
 func TestExtractorExtract(t *testing.T) {
@@ -29,7 +29,7 @@ func TestExtractorExtract(t *testing.T) {
 		t.Errorf("incorrect expected input type: %v", inputType)
 	}
 
-	ep := datalayer.NewEndpoint(nil, nil)
+	ep := fwkdl.NewEndpoint(nil, nil)
 	if ep == nil {
 		t.Fatal("expected non-nil endpoint")
 	}

pkg/plugins/datalayer/models/factories.go

@@ -6,7 +6,7 @@ import (
 	"io"
 
 	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datalayer/http"
-	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/plugins"
+	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/framework/interface/plugin"
 )
 
 const (
@@ -28,7 +28,7 @@ type modelsDatasourceParams struct {
 
 // ModelDataSourceFactory is a factory function used to instantiate data layer's
 // models data source plugins specified in a configuration.
-func ModelDataSourceFactory(name string, parameters json.RawMessage, _ plugins.Handle) (plugins.Plugin, error) {
+func ModelDataSourceFactory(name string, parameters json.RawMessage, _ plugin.Handle) (plugin.Plugin, error) {
 	cfg := defaultDataSourceConfigParams()
 	if parameters != nil { // overlay the defaults with configured values
 		if err := json.Unmarshal(parameters, cfg); err != nil {
@@ -43,7 +43,7 @@ func ModelDataSourceFactory(name string, parameters json.RawMessage, _ plugins.H
 
 // ModelServerExtractorFactory is a factory function used to instantiate data layer's models
 // Extractor plugins specified in a configuration.
-func ModelServerExtractorFactory(name string, _ json.RawMessage, _ plugins.Handle) (plugins.Plugin, error) {
+func ModelServerExtractorFactory(name string, _ json.RawMessage, _ plugin.Handle) (plugin.Plugin, error) {
 	extractor, err := NewModelExtractor()
 	if err != nil {
 		return nil, err

pkg/plugins/register.go

@@ -23,6 +23,6 @@ func RegisterAllPlugins() {
 	plugin.Register(scorer.SessionAffinityType, scorer.SessionAffinityFactory)
 	plugin.Register(scorer.ActiveRequestType, scorer.ActiveRequestFactory)
 	plugin.Register(scorer.NoHitLRUType, scorer.NoHitLRUFactory)
-    plugins.Register(models.ModelsDataSourceType, models.ModelDataSourceFactory)
-	plugins.Register(models.ModelsExtractorType, models.ModelServerExtractorFactory)
+	plugin.Register(models.ModelsDataSourceType, models.ModelDataSourceFactory)
+	plugin.Register(models.ModelsExtractorType, models.ModelServerExtractorFactory)
 }