fix(pkg): fix isError and set maxBatchSize to 0

instill-ai · Feb 15, 2024 · 2adfe5b · 2adfe5b
1 parent 17c5d68
commit 2adfe5b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/pkg/handler/create.go b/pkg/handler/create.go
@@ -77,6 +77,7 @@ func createGitHubModel(s service.Service, ctx context.Context, model *modelPB.Mo
 			return &longrunningpb.Operation{}, status.Errorf(codes.InvalidArgument, "There is no tag in GitHub repository")
 		}
 	}
+
 	bModelConfig, _ := json.Marshal(datamodel.GitHubModelConfiguration{
 		Repository: modelConfig.Repository,
 		HTMLURL:    "https://github.com/" + modelConfig.Repository,
@@ -126,6 +127,7 @@ func createGitHubModel(s service.Service, ctx context.Context, model *modelPB.Mo
 			return &longrunningpb.Operation{}, st.Err()
 		}
 	}
+
 	readmeFilePath, err := utils.UpdateModelPath(modelSrcDir, config.Config.RayServer.ModelStore, ns.String(), githubModel)
 
 	if err != nil {
@@ -192,7 +194,7 @@ func createGitHubModel(s service.Service, ctx context.Context, model *modelPB.Mo
 	}
 
 	// TODO: properly support batch inference
-	maxBatchSize := 1
+	maxBatchSize := 0
 	allowedMaxBatchSize := utils.GetSupportedBatchSize(githubModel.Task)
 
 	if maxBatchSize > allowedMaxBatchSize {
@@ -420,7 +422,7 @@ func createHuggingFaceModel(s service.Service, ctx context.Context, model *model
 	}
 
 	// TODO: properly support batch inference
-	maxBatchSize := 1
+	maxBatchSize := 0
 	allowedMaxBatchSize := utils.GetSupportedBatchSize(huggingfaceModel.Task)
 
 	if maxBatchSize > allowedMaxBatchSize {
@@ -614,7 +616,7 @@ func createArtiVCModel(s service.Service, ctx context.Context, model *modelPB.Mo
 	}
 
 	// TODO: properly support batch inference
-	maxBatchSize := 1
+	maxBatchSize := 0
 	allowedMaxBatchSize := utils.GetSupportedBatchSize(artivcModel.Task)
 
 	if maxBatchSize > allowedMaxBatchSize {

diff --git a/pkg/handler/stream.go b/pkg/handler/stream.go
@@ -324,7 +324,7 @@ func (h *PublicHandler) createNamespaceModelBinaryFileUpload(ctx context.Context
 	}
 
 	// TODO: properly support batch inference
-	maxBatchSize := 1
+	maxBatchSize := 0
 	allowedMaxBatchSize := utils.GetSupportedBatchSize(uploadedModel.Task)
 
 	if maxBatchSize > allowedMaxBatchSize {

diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -119,7 +119,7 @@ func GitHubClone(dir string, instanceConfig datamodel.GitHubModelConfiguration,
 	// Check in the cache first.
 	if config.Config.Cache.Model.Enabled {
 		_ = os.MkdirAll(config.Config.Cache.Model.CacheDir, os.ModePerm)
-		if state, err := redisClient.Get(ctx, redisRepoKey).Result(); err != nil && errors.Is(err, redis.Nil) {
+		if state, err := redisClient.Get(ctx, redisRepoKey).Result(); err != nil && !errors.Is(err, redis.Nil) {
 			return err
 		} else if err == nil {
 			if state == "done" {