fix: regenerate OpenAPI code and remove stale converter files

Signed-off-by: Sidney Glinton <[email protected]>

Author: syntaxsdev

catalog/internal/server/openapi/api.go

@@ -17,25 +17,28 @@ import (
 	model "github.com/kubeflow/model-registry/catalog/pkg/openapi"
 )
 
+
+
 // ModelCatalogServiceAPIRouter defines the required methods for binding the api requests to a responses for the ModelCatalogServiceAPI
 // The ModelCatalogServiceAPIRouter implementation should parse necessary information from the http request,
 // pass the data to a ModelCatalogServiceAPIServicer to perform the required actions, then write the service results to the http response.
-type ModelCatalogServiceAPIRouter interface {
+type ModelCatalogServiceAPIRouter interface { 
 	FindModels(http.ResponseWriter, *http.Request)
 	FindModelsFilterOptions(http.ResponseWriter, *http.Request)
 	FindSources(http.ResponseWriter, *http.Request)
 	GetAllModelArtifacts(http.ResponseWriter, *http.Request)
 	GetModel(http.ResponseWriter, *http.Request)
 }
 
+
 // ModelCatalogServiceAPIServicer defines the api actions for the ModelCatalogServiceAPI service
 // This interface intended to stay up to date with the openapi yaml used to generate it,
 // while the service implementation can be ignored with the .openapi-generator-ignore file
 // and updated with the logic required for the API.
-type ModelCatalogServiceAPIServicer interface {
-	FindModels(context.Context, []string, string, string, string, string, model.OrderByField, model.SortOrder, string) (ImplResponse, error)
-	FindModelsFilterOptions(context.Context) (ImplResponse, error)
-	FindSources(context.Context, string, string, model.OrderByField, model.SortOrder, string) (ImplResponse, error)
-	GetAllModelArtifacts(context.Context, string, string, string, model.OrderByField, model.SortOrder, string, string) (ImplResponse, error)
-	GetModel(context.Context, string, string) (ImplResponse, error)
+type ModelCatalogServiceAPIServicer interface { 
+  FindModels(context.Context, []string, string, string, string, string, model.OrderByField, model.SortOrder, string) (ImplResponse, error)
+  FindModelsFilterOptions(context.Context) (ImplResponse, error)
+  FindSources(context.Context, string, string, model.OrderByField, model.SortOrder, string) (ImplResponse, error)
+  GetAllModelArtifacts(context.Context, string, string, string, model.OrderByField, model.SortOrder, string, string) (ImplResponse, error)
+  GetModel(context.Context, string, string) (ImplResponse, error)
 }

catalog/internal/server/openapi/api_model_catalog_service.go

@@ -11,6 +11,7 @@
 package openapi
 
 import (
+	
 	"net/http"
 	"strings"
 
@@ -154,22 +155,7 @@ func (c *ModelCatalogServiceAPIController) GetAllModelArtifacts(w http.ResponseW
 // GetModel - Get a `CatalogModel`.
 func (c *ModelCatalogServiceAPIController) GetModel(w http.ResponseWriter, r *http.Request) {
 	sourceIdParam := chi.URLParam(r, "source_id")
-	modelNameParam := chi.URLParam(r, "*")
-
-	// Special handling for getModel to delegate /artifacts requests to getAllModelArtifacts
-	// The wildcard /* pattern catches /artifacts requests, but we want those to go to GetAllModelArtifacts
-	if strings.HasSuffix(r.URL.Path, "/artifacts") {
-		// Extract the model name by removing the /artifacts suffix
-		modelName := strings.TrimSuffix(modelNameParam, "/artifacts")
-
-		// Add the model_name parameter to the route context so GetAllModelArtifacts can access it
-		chi.RouteContext(r.Context()).URLParams.Add("model_name", modelName)
-
-		// Call the GetAllModelArtifacts handler directly
-		c.GetAllModelArtifacts(w, r)
-		return
-	}
-
+	modelNameParam := chi.URLParam(r, "model_name+")
 	result, err := c.service.GetModel(r.Context(), sourceIdParam, modelNameParam)
 	// If an error occurred, encode the error with the status code
 	if err != nil {

catalog/internal/server/openapi/helpers.go

@@ -11,28 +11,28 @@
 package openapi
 
 import (
-	"net/http"
 	"reflect"
+        "net/http"
 
 	model "github.com/kubeflow/model-registry/pkg/openapi"
 )
 
 // Response return a ImplResponse struct filled
 func Response(code int, body interface{}) ImplResponse {
-	return ImplResponse{
+	return ImplResponse {
 		Code: code,
 		Body: body,
 	}
 }
 
 func ErrorResponse(code int, err error) ImplResponse {
-	return ImplResponse{
-		Code: code,
-		Body: model.Error{
-			Code:    http.StatusText(code),
-			Message: err.Error(),
-		},
-	}
+       return ImplResponse{
+               Code: code,
+               Body: model.Error{
+                    Code: http.StatusText(code),
+                    Message: err.Error(),
+               },
+       }
 }
 
 // IsZeroValue checks if the val is the zero-ed value.

catalog/internal/server/openapi/routers.go

@@ -30,8 +30,8 @@ import (
 
 // A Route defines the parameters for an api endpoint
 type Route struct {
-	Method      string
-	Pattern     string
+	Method	  string
+	Pattern	 string
 	HandlerFunc http.HandlerFunc
 }
 
@@ -80,8 +80,8 @@ func EncodeJSONResponse(i interface{}, status *int, w http.ResponseWriter) {
 
 	if i != nil {
 		if err := json.NewEncoder(w).Encode(i); err != nil {
-			// FIXME: is it too late to inform the client of an error at this point??
-			glog.Errorf("error encoding JSON response: %v", err)
+		        // FIXME: is it too late to inform the client of an error at this point??
+		        glog.Errorf("error encoding JSON response: %v", err)
 		}
 	}
 }