feat: generate server and client files only

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

Author: syntaxsdev

catalog/internal/server/openapi/.openapi-generator/FILES

@@ -18,6 +18,9 @@ model_catalog_model_list.go
 model_catalog_source.go
 model_catalog_source_list.go
 model_error.go
+model_filter_option.go
+model_filter_option_range.go
+model_filter_options_list.go
 model_metadata_bool_value.go
 model_metadata_double_value.go
 model_metadata_int_value.go

catalog/internal/server/openapi/.openapi-generator/VERSION

@@ -1 +1 @@
-7.13.0
+7.0.1

catalog/internal/server/openapi/api.go

@@ -22,18 +22,20 @@ import (
 // pass the data to a ModelCatalogServiceAPIServicer to perform the required actions, then write the service results to the http response.
 type ModelCatalogServiceAPIRouter interface {
 	FindModels(http.ResponseWriter, *http.Request)
+	FindModelsFilterOptions(http.ResponseWriter, *http.Request)
 	FindSources(http.ResponseWriter, *http.Request)
-	GetModel(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, model.OrderByField, model.SortOrder, string) (ImplResponse, error)
+	FindModels(context.Context, []string, string, string, string, model.OrderByField, model.SortOrder, string, 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)
-	GetAllModelArtifacts(context.Context, string, string, string, string, model.OrderByField, model.SortOrder, string) (ImplResponse, error)
 }

catalog/internal/server/openapi/api_model_catalog_service.go

@@ -57,35 +57,53 @@ func (c *ModelCatalogServiceAPIController) Routes() Routes {
 			"/api/model_catalog/v1alpha1/models",
 			c.FindModels,
 		},
+		"FindModelsFilterOptions": Route{
+			strings.ToUpper("Get"),
+			"/api/model_catalog/v1alpha1/models/filter_options",
+			c.FindModelsFilterOptions,
+		},
 		"FindSources": Route{
 			strings.ToUpper("Get"),
 			"/api/model_catalog/v1alpha1/sources",
 			c.FindSources,
 		},
-		"GetModel": Route{
-			strings.ToUpper("Get"),
-			"/api/model_catalog/v1alpha1/sources/{source_id}/models/*",
-			c.GetModel,
-		},
 		"GetAllModelArtifacts": Route{
 			strings.ToUpper("Get"),
 			"/api/model_catalog/v1alpha1/sources/{source_id}/models/{model_name}/artifacts",
 			c.GetAllModelArtifacts,
 		},
+		"GetModel": Route{
+			strings.ToUpper("Get"),
+			"/api/model_catalog/v1alpha1/sources/{source_id}/models/{model_name+}",
+			c.GetModel,
+		},
 	}
 }
 
 // FindModels - Search catalog models across sources.
 func (c *ModelCatalogServiceAPIController) FindModels(w http.ResponseWriter, r *http.Request) {
 	query := r.URL.Query()
 	sourceParam := strings.Split(query.Get("source"), ",")
+	sourceLabelParam := query.Get("sourceLabel")
 	qParam := query.Get("q")
-	filterQueryParam := query.Get("filterQuery")
 	pageSizeParam := query.Get("pageSize")
 	orderByParam := query.Get("orderBy")
 	sortOrderParam := query.Get("sortOrder")
 	nextPageTokenParam := query.Get("nextPageToken")
-	result, err := c.service.FindModels(r.Context(), sourceParam, qParam, filterQueryParam, pageSizeParam, model.OrderByField(orderByParam), model.SortOrder(sortOrderParam), nextPageTokenParam)
+	filterQueryParam := query.Get("filterQuery")
+	result, err := c.service.FindModels(r.Context(), sourceParam, sourceLabelParam, qParam, pageSizeParam, model.OrderByField(orderByParam), model.SortOrder(sortOrderParam), nextPageTokenParam, filterQueryParam)
+	// If an error occurred, encode the error with the status code
+	if err != nil {
+		c.errorHandler(w, r, err, &result)
+		return
+	}
+	// If no error, encode the body and the result code
+	EncodeJSONResponse(result.Body, &result.Code, w)
+}
+
+// FindModelsFilterOptions - Lists fields and available options that can be used in `filterQuery` on the list models endpoint.
+func (c *ModelCatalogServiceAPIController) FindModelsFilterOptions(w http.ResponseWriter, r *http.Request) {
+	result, err := c.service.FindModelsFilterOptions(r.Context())
 	// If an error occurred, encode the error with the status code
 	if err != nil {
 		c.errorHandler(w, r, err, &result)
@@ -113,6 +131,26 @@ func (c *ModelCatalogServiceAPIController) FindSources(w http.ResponseWriter, r
 	EncodeJSONResponse(result.Body, &result.Code, w)
 }
 
+// GetAllModelArtifacts - List CatalogArtifacts.
+func (c *ModelCatalogServiceAPIController) GetAllModelArtifacts(w http.ResponseWriter, r *http.Request) {
+	query := r.URL.Query()
+	sourceIdParam := chi.URLParam(r, "source_id")
+	modelNameParam := chi.URLParam(r, "model_name")
+	pageSizeParam := query.Get("pageSize")
+	orderByParam := query.Get("orderBy")
+	sortOrderParam := query.Get("sortOrder")
+	nextPageTokenParam := query.Get("nextPageToken")
+	artifactTypeParam := query.Get("artifactType")
+	result, err := c.service.GetAllModelArtifacts(r.Context(), sourceIdParam, modelNameParam, pageSizeParam, model.OrderByField(orderByParam), model.SortOrder(sortOrderParam), nextPageTokenParam, artifactTypeParam)
+	// If an error occurred, encode the error with the status code
+	if err != nil {
+		c.errorHandler(w, r, err, &result)
+		return
+	}
+	// If no error, encode the body and the result code
+	EncodeJSONResponse(result.Body, &result.Code, w)
+}
+
 // GetModel - Get a `CatalogModel`.
 func (c *ModelCatalogServiceAPIController) GetModel(w http.ResponseWriter, r *http.Request) {
 	sourceIdParam := chi.URLParam(r, "source_id")
@@ -141,23 +179,3 @@ func (c *ModelCatalogServiceAPIController) GetModel(w http.ResponseWriter, r *ht
 	// If no error, encode the body and the result code
 	EncodeJSONResponse(result.Body, &result.Code, w)
 }
-
-// GetAllModelArtifacts - List CatalogArtifacts.
-func (c *ModelCatalogServiceAPIController) GetAllModelArtifacts(w http.ResponseWriter, r *http.Request) {
-	query := r.URL.Query()
-	sourceIdParam := chi.URLParam(r, "source_id")
-	modelNameParam := chi.URLParam(r, "model_name")
-	artifactTypeParam := query.Get("artifact_type")
-	pageSizeParam := query.Get("pageSize")
-	orderByParam := query.Get("orderBy")
-	sortOrderParam := query.Get("sortOrder")
-	nextPageTokenParam := query.Get("nextPageToken")
-	result, err := c.service.GetAllModelArtifacts(r.Context(), sourceIdParam, modelNameParam, artifactTypeParam, pageSizeParam, model.OrderByField(orderByParam), model.SortOrder(sortOrderParam), nextPageTokenParam)
-	// If an error occurred, encode the error with the status code
-	if err != nil {
-		c.errorHandler(w, r, err, &result)
-		return
-	}
-	// If no error, encode the body and the result code
-	EncodeJSONResponse(result.Body, &result.Code, w)
-}

catalog/internal/server/openapi/api_model_catalog_service_service.go

@@ -25,7 +25,7 @@ type ModelCatalogServiceAPIService struct {
 }
 
 // GetAllModelArtifacts retrieves all model artifacts for a given model from the specified source.
-func (m *ModelCatalogServiceAPIService) GetAllModelArtifacts(ctx context.Context, sourceID string, modelName string, artifactType string, pageSize string, orderBy model.OrderByField, sortOrder model.SortOrder, nextPageToken string) (ImplResponse, error) {
+func (m *ModelCatalogServiceAPIService) GetAllModelArtifacts(ctx context.Context, sourceID string, modelName string, pageSize string, orderBy model.OrderByField, sortOrder model.SortOrder, nextPageToken string, artifactType string) (ImplResponse, error) {
 	if newName, err := url.PathUnescape(modelName); err == nil {
 		modelName = newName
 	}
@@ -64,7 +64,7 @@ func (m *ModelCatalogServiceAPIService) GetAllModelArtifacts(ctx context.Context
 	return Response(http.StatusOK, artifacts), nil
 }
 
-func (m *ModelCatalogServiceAPIService) FindModels(ctx context.Context, sourceIDs []string, q, filterQuery, pageSize string, orderBy model.OrderByField, sortOrder model.SortOrder, nextPageToken string) (ImplResponse, error) {
+func (m *ModelCatalogServiceAPIService) FindModels(ctx context.Context, sourceIDs []string, sourceLabel string, q string, pageSize string, orderBy model.OrderByField, sortOrder model.SortOrder, nextPageToken string, filterQuery string) (ImplResponse, error) {
 	var err error
 	pageSizeInt := int32(10)
 
@@ -78,12 +78,12 @@ func (m *ModelCatalogServiceAPIService) FindModels(ctx context.Context, sourceID
 
 	listModelsParams := catalog.ListModelsParams{
 		Query:         q,
-		FilterQuery:   filterQuery,
 		SourceIDs:     sourceIDs,
 		PageSize:      pageSizeInt,
 		OrderBy:       orderBy,
 		SortOrder:     sortOrder,
 		NextPageToken: &nextPageToken,
+		// TODO: Add support for sourceLabel and filterQuery
 	}
 
 	models, err := m.provider.ListModels(ctx, listModelsParams)
@@ -94,6 +94,15 @@ func (m *ModelCatalogServiceAPIService) FindModels(ctx context.Context, sourceID
 	return Response(http.StatusOK, models), nil
 }
 
+func (m *ModelCatalogServiceAPIService) FindModelsFilterOptions(ctx context.Context) (ImplResponse, error) {
+	filterOptions, err := m.provider.GetFilterOptions(ctx)
+	if err != nil {
+		return ErrorResponse(http.StatusInternalServerError, err), err
+	}
+
+	return Response(http.StatusOK, filterOptions), nil
+}
+
 func (m *ModelCatalogServiceAPIService) GetModel(ctx context.Context, sourceID, modelName string) (ImplResponse, error) {
 	if newName, err := url.PathUnescape(modelName); err == nil {
 		modelName = newName

catalog/internal/server/openapi/api_model_catalog_service_service_test.go

@@ -305,12 +305,13 @@ func TestFindModels(t *testing.T) {
 			resp, err := service.FindModels(
 				context.Background(),
 				[]string{tc.sourceID},
+				"", // sourceLabel
 				tc.q,
-				tc.filterQuery,
 				tc.pageSize,
 				tc.orderBy,
 				tc.sortOrder,
 				tc.nextPageToken,
+				tc.filterQuery,
 			)
 
 			assert.Equal(t, tc.expectedStatus, resp.Code)
@@ -978,6 +979,7 @@ func TestGetAllModelArtifacts(t *testing.T) {
 				model.ORDERBYFIELD_CREATE_TIME,
 				model.SORTORDER_ASC,
 				"",
+				"", // artifactType
 			)
 
 			// Check response status

catalog/internal/server/openapi/logger.go

@@ -11,10 +11,23 @@
 package openapi
 
 import (
-	"github.com/go-chi/chi/v5/middleware"
+	"log"
 	"net/http"
+	"time"
 )
 
-func Logger(inner http.Handler) http.Handler {
-	return middleware.Logger(inner)
+func Logger(inner http.Handler, name string) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		start := time.Now()
+
+		inner.ServeHTTP(w, r)
+
+		log.Printf(
+			"%s %s %s %s",
+			r.Method,
+			r.RequestURI,
+			name,
+			time.Since(start),
+		)
+	})
 }

catalog/internal/server/openapi/type_asserts.go

@@ -257,6 +257,48 @@ func AssertErrorRequired(obj model.Error) error {
 	return nil
 }
 
+// AssertFilterOptionConstraints checks if the values respects the defined constraints
+func AssertFilterOptionConstraints(obj model.FilterOption) error {
+	return nil
+}
+
+// AssertFilterOptionRangeConstraints checks if the values respects the defined constraints
+func AssertFilterOptionRangeConstraints(obj model.FilterOptionRange) error {
+	return nil
+}
+
+// AssertFilterOptionRangeRequired checks if the required fields are not zero-ed
+func AssertFilterOptionRangeRequired(obj model.FilterOptionRange) error {
+	return nil
+}
+
+// AssertFilterOptionRequired checks if the required fields are not zero-ed
+func AssertFilterOptionRequired(obj model.FilterOption) error {
+	elements := map[string]interface{}{
+		"type": obj.Type,
+	}
+	for name, el := range elements {
+		if isZero := IsZeroValue(el); isZero {
+			return &RequiredError{Field: name}
+		}
+	}
+
+	if err := AssertFilterOptionRangeRequired(obj.Range); err != nil {
+		return err
+	}
+	return nil
+}
+
+// AssertFilterOptionsListConstraints checks if the values respects the defined constraints
+func AssertFilterOptionsListConstraints(obj model.FilterOptionsList) error {
+	return nil
+}
+
+// AssertFilterOptionsListRequired checks if the required fields are not zero-ed
+func AssertFilterOptionsListRequired(obj model.FilterOptionsList) error {
+	return nil
+}
+
 // AssertMetadataBoolValueConstraints checks if the values respects the defined constraints
 func AssertMetadataBoolValueConstraints(obj model.MetadataBoolValue) error {
 	return nil

catalog/openapitools.json

@@ -2,6 +2,6 @@
   "$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json",
   "spaces": 2,
   "generator-cli": {
-    "version": "7.13.0"
+    "version": "7.0.1"
   }
 }

catalog/pkg/openapi/.openapi-generator/FILES

@@ -15,6 +15,9 @@ model_catalog_model_list.go
 model_catalog_source.go
 model_catalog_source_list.go
 model_error.go
+model_filter_option.go
+model_filter_option_range.go
+model_filter_options_list.go
 model_metadata_bool_value.go
 model_metadata_double_value.go
 model_metadata_int_value.go