Merge pull request #898 from meshery/copilot/sub-pr-897

Fix IncrementSkipped() and LatestVersionOnly implementation in registry generation

Author: simihablo

registry/error.go

@@ -16,6 +16,7 @@ var (
 	ErrGeneratesComponentCode     = "meshkit-11309"
 	ErrUpdateRelationshipFileCode = "meshkit-11310"
 	ErrModelTimeoutCode           = "meshkit-11311"
+	ErrModelSkippedCode           = "meshkit-11312"
 )
 
 func ErrAppendToSheet(err error, id string) error {
@@ -64,3 +65,11 @@ func ErrModelTimeout(modelName string, timeout time.Duration) error {
 		[]string{"The model source may be unresponsive", "Network connectivity issues", "Large number of components to generate for this model"},
 		[]string{"Try increasing the per-model timeout using --timeout flag", "Check network connectivity", "Review the source URL for the model"})
 }
+
+func ErrModelSkipped(modelName, reason string) error {
+	return errors.New(ErrModelSkippedCode, errors.Alert,
+		[]string{fmt.Sprintf("model %s was skipped: %s", modelName, reason)},
+		[]string{fmt.Sprintf("Model '%s' was skipped during generation: %s", modelName, reason)},
+		[]string{"Model already exists and LatestVersionOnly is enabled"},
+		[]string{"This is expected behavior when LatestVersionOnly option is used"})
+}

registry/model.go

@@ -14,6 +14,7 @@ import (
 	"time"
 
 	"github.com/meshery/meshkit/encoding"
+	"github.com/meshery/meshkit/errors"
 	"github.com/meshery/meshkit/files"
 	"github.com/meshery/meshkit/generators"
 	"github.com/meshery/meshkit/generators/models"
@@ -975,6 +976,12 @@ func InvokeGenerationFromSheetWithOptions(wg *sync.WaitGroup, path string, model
 				}
 				if alreadyExist {
 					totalAvailableModels--
+					// If LatestVersionOnly is enabled and model already exists, skip it
+					if opts.LatestVersionOnly {
+						log.Info("Model already exists, skipping due to LatestVersionOnly option: ", model.Model)
+						done <- ErrModelSkipped(model.Model, "model already exists and LatestVersionOnly is enabled")
+						return
+					}
 				}
 
 				for _, comp := range comps {
@@ -1036,9 +1043,15 @@ func InvokeGenerationFromSheetWithOptions(wg *sync.WaitGroup, path string, model
 			case genErr := <-done:
 				elapsed := time.Since(modelStartTime)
 				if genErr != nil {
-					progressTracker.IncrementFailure()
-					LogError.Error(fmt.Errorf("model %s generation failed after %v: %w", model.Model, elapsed.Round(time.Millisecond), genErr))
-					Log.Debug(fmt.Sprintf("Model %s: FAILED after %v - %v", model.Model, elapsed.Round(time.Millisecond), genErr))
+					// Check if this is a skip error
+					if meshkitErr, ok := genErr.(*errors.Error); ok && meshkitErr.Code == ErrModelSkippedCode {
+						progressTracker.IncrementSkipped()
+						Log.Debug(fmt.Sprintf("Model %s: SKIPPED in %v - %v", model.Model, elapsed.Round(time.Millisecond), genErr))
+					} else {
+						progressTracker.IncrementFailure()
+						LogError.Error(fmt.Errorf("model %s generation failed after %v: %w", model.Model, elapsed.Round(time.Millisecond), genErr))
+						Log.Debug(fmt.Sprintf("Model %s: FAILED after %v - %v", model.Model, elapsed.Round(time.Millisecond), genErr))
+					}
 				} else {
 					progressTracker.IncrementSuccess()
 					Log.Debug(fmt.Sprintf("Model %s: SUCCESS in %v", model.Model, elapsed.Round(time.Millisecond)))