Update predictor error wrapping

Author: deliahu

pkg/operator/api/userconfig/apis.go

@@ -303,6 +303,9 @@ func (predictor *Predictor) UserConfigStr() string {
 	if predictor.Model != nil {
 		sb.WriteString(fmt.Sprintf("%s: %s\n", ModelKey, *predictor.Model))
 	}
+	if predictor.SignatureKey != nil {
+		sb.WriteString(fmt.Sprintf("%s: %s\n", SignatureKeyKey, *predictor.SignatureKey))
+	}
 	if predictor.PythonPath != nil {
 		sb.WriteString(fmt.Sprintf("%s: %s\n", PythonPathKey, *predictor.PythonPath))
 	}
@@ -316,9 +319,6 @@ func (predictor *Predictor) UserConfigStr() string {
 		d, _ := yaml.Marshal(&predictor.Env)
 		sb.WriteString(s.Indent(string(d), "  "))
 	}
-	if predictor.SignatureKey != nil {
-		sb.WriteString(fmt.Sprintf("%s: %s\n", SignatureKeyKey, *predictor.SignatureKey))
-	}
 	return sb.String()
 }
 
@@ -364,12 +364,12 @@ func (predictor *Predictor) TensorFlowValidate() error {
 	}
 	if strings.HasSuffix(model, ".zip") {
 		if ok, err := awsClient.IsS3PathFile(model); err != nil || !ok {
-			return errors.Wrap(ErrorExternalNotFound(model), TensorFlowKey, ModelKey)
+			return errors.Wrap(ErrorExternalNotFound(model), ModelKey)
 		}
 	} else {
 		path, err := GetTFServingExportFromS3Path(model, awsClient)
 		if path == "" || err != nil {
-			return errors.Wrap(ErrorInvalidTensorFlowDir(model), TensorFlowKey, ModelKey)
+			return errors.Wrap(ErrorInvalidTensorFlowDir(model), ModelKey)
 		}
 		predictor.Model = pointer.String(path)
 	}
@@ -389,7 +389,7 @@ func (predictor *Predictor) ONNXValidate() error {
 		return err
 	}
 	if ok, err := awsClient.IsS3PathFile(model); err != nil || !ok {
-		return errors.Wrap(ErrorExternalNotFound(model), ONNXKey, ModelKey)
+		return errors.Wrap(ErrorExternalNotFound(model), ModelKey)
 	}
 
 	if predictor.SignatureKey != nil {

pkg/operator/api/userconfig/config_key.go

@@ -32,9 +32,6 @@ const (
 	TrackerKey      = "tracker"
 	ModelTypeKey    = "model_type"
 	KeyKey          = "key"
-	TensorFlowKey   = "tensorflow"
-	ONNXKey         = "onnx"
-	PythonKey       = "python"
 	ConfigKey       = "config"
 	PythonPathKey   = "python_path"
 	EnvKey          = "env"

pkg/operator/api/userconfig/errors.go

@@ -270,7 +270,7 @@ var tfExpectedStructMessage = `For TensorFlow models, the path must contain a di
       └── variables.data-00002-of-...`
 
 func ErrorInvalidTensorFlowDir(path string) error {
-	message := "invalid TF export directory.\n"
+	message := "invalid TensorFlow export directory.\n"
 	message += tfExpectedStructMessage
 	return Error{
 		Kind:    ErrInvalidTensorFlowDir,
@@ -281,14 +281,14 @@ func ErrorInvalidTensorFlowDir(path string) error {
 func ErrorFieldMustBeDefinedForPredictorType(fieldKey string, predictorType PredictorType) error {
 	return Error{
 		Kind:    ErrFieldMustBeDefinedForPredictorType,
-		message: fmt.Sprintf("%s field must be defined for predictor type %s", fieldKey, predictorType.String()),
+		message: fmt.Sprintf("%s field must be defined for the %s predictor type", fieldKey, predictorType.String()),
 	}
 }
 
 func ErrorFieldNotSupportedByPredictorType(fieldKey string, predictorType PredictorType) error {
 	return Error{
 		Kind:    ErrFieldNotSupportedByPredictorType,
-		message: fmt.Sprintf("%s is not supported field for predictor type %s", fieldKey, predictorType.String()),
+		message: fmt.Sprintf("%s is not a supported field for the %s predictor type", fieldKey, predictorType.String()),
 	}
 }