Allow local models to be loaded (#1075)

Author: RobertLucian

cli/local/model_cache.go

@@ -35,13 +35,14 @@ import (
 
 func CacheModel(modelPath string, awsClient *aws.Client) (*spec.LocalModelCache, error) {
 	localModelCache := spec.LocalModelCache{}
-
-	awsClientForBucket, err := aws.NewFromClientS3Path(modelPath, awsClient)
-	if err != nil {
-		return nil, err
-	}
+	var awsClientForBucket *aws.Client
+	var err error
 
 	if strings.HasPrefix(modelPath, "s3://") {
+		awsClientForBucket, err = aws.NewFromClientS3Path(modelPath, awsClient)
+		if err != nil {
+			return nil, err
+		}
 		bucket, prefix, err := aws.SplitS3Path(modelPath)
 		if err != nil {
 			return nil, err

pkg/types/spec/validations.go

@@ -523,12 +523,12 @@ func validateTensorFlowPredictor(predictor *userconfig.Predictor, providerType t
 
 	model := *predictor.Model
 
-	awsClientForBucket, err := aws.NewFromClientS3Path(model, awsClient)
-	if err != nil {
-		return errors.Wrap(err, userconfig.ModelKey)
-	}
-
 	if strings.HasPrefix(model, "s3://") {
+		awsClientForBucket, err := aws.NewFromClientS3Path(model, awsClient)
+		if err != nil {
+			return errors.Wrap(err, userconfig.ModelKey)
+		}
+
 		model, err := cr.S3PathValidator(model)
 		if err != nil {
 			return errors.Wrap(err, userconfig.ModelKey)
@@ -595,12 +595,12 @@ func validateONNXPredictor(predictor *userconfig.Predictor, providerType types.P
 		return errors.Wrap(ErrorInvalidONNXModelPath(), userconfig.ModelKey, model)
 	}
 
-	awsClientForBucket, err := aws.NewFromClientS3Path(model, awsClient)
-	if err != nil {
-		return errors.Wrap(err, userconfig.ModelKey)
-	}
-
 	if strings.HasPrefix(model, "s3://") {
+		awsClientForBucket, err := aws.NewFromClientS3Path(model, awsClient)
+		if err != nil {
+			return errors.Wrap(err, userconfig.ModelKey)
+		}
+
 		model, err := cr.S3PathValidator(model)
 		if err != nil {
 			return errors.Wrap(err, userconfig.ModelKey)