Sycn recent changes (#826)

Author: pulltheflower

api/workflow/activity/deploy_activity.go

@@ -697,7 +697,7 @@ func (a *DeployActivity) makeDeployEnv(ctx context.Context, hardware types.HardW
 					}
 					// handle boolean value
 					if !strings.Contains(arg.Format, "%") {
-						if value == "false" || value == "0" || value == "" {
+						if value == "false" || value == "0" || value == "" || value == "disable" {
 							continue
 						}
 						engineArgs.WriteString(" ")
@@ -769,6 +769,7 @@ func (a *DeployActivity) makeDeployEnv(ctx context.Context, hardware types.HardW
 		envMap["HF_ENDPOINT"] = a.cfg.ModelDownloadEndpoint // "https://hub.opencsg-stg.com/"
 		envMap["HF_HUB_OFFLINE"] = "1"
 		envMap["HF_TASK"] = string(deployInfo.Task)
+		envMap["VLLM_ENFORCE_EAGER"] = "1"
 	}
 
 	if deployInfo.Type == types.FinetuneType {

api/workflow/worker_ce.go

@@ -5,6 +5,7 @@ package workflow
 import (
 	"fmt"
 	"log/slog"
+	"time"
 
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/log"
@@ -43,6 +44,9 @@ func StartWorkflow(cfg *config.Config, registerAsWorker bool) error {
 	client, err := temporal.NewClient(client.Options{
 		HostPort: cfg.WorkFLow.Endpoint,
 		Logger:   log.NewStructuredLogger(slog.Default()),
+		ConnectionOptions: client.ConnectionOptions{
+			GetSystemInfoTimeout: time.Duration(cfg.Temporal.GetSystemInfoTimeout) * time.Second,
+		},
 	}, "csghub-api")
 	if err != nil {
 		return fmt.Errorf("unable to create workflow client, error: %w", err)

builder/store/database/repository.go

@@ -673,17 +673,17 @@ func (s *repoStoreImpl) PublicToUser(ctx context.Context, repoType types.Reposit
 	// join table by repo type to filter out deleted and half-created records
 	switch repoType {
 	case types.ModelRepo:
-		q.Join("LEFT JOIN models ON models.repository_id = repository.id")
+		q.Join("INNER JOIN models ON models.repository_id = repository.id")
 	case types.DatasetRepo:
-		q.Join("LEFT JOIN datasets ON datasets.repository_id = repository.id")
+		q.Join("INNER JOIN datasets ON datasets.repository_id = repository.id")
 	case types.CodeRepo:
-		q.Join("LEFT JOIN codes ON codes.repository_id = repository.id")
+		q.Join("INNER JOIN codes ON codes.repository_id = repository.id")
 	case types.SpaceRepo:
-		q.Join("LEFT JOIN spaces ON spaces.repository_id = repository.id")
+		q.Join("INNER JOIN spaces ON spaces.repository_id = repository.id")
 	case types.PromptRepo:
-		q.Join("LEFT JOIN prompts ON prompts.repository_id = repository.id")
+		q.Join("INNER JOIN prompts ON prompts.repository_id = repository.id")
 	case types.MCPServerRepo:
-		q.Join("LEFT JOIN mcp_servers ON mcp_servers.repository_id = repository.id")
+		q.Join("INNER JOIN mcp_servers ON mcp_servers.repository_id = repository.id")
 	}
 
 	if !isAdmin {

builder/store/database/repository_test.go

@@ -742,6 +742,16 @@ func TestRepoStore_PublicToUser(t *testing.T) {
 				repo.UpdatedAt = time.Now()
 				rn, err := store.CreateRepo(ctx, *repo)
 				require.Nil(t, err)
+
+				// Create corresponding record in codes table for CodeRepo
+				if repo.RepositoryType == types.CodeRepo {
+					code := database.Code{
+						RepositoryID: rn.ID,
+					}
+					_, err = db.Core.NewInsert().Model(&code).Exec(ctx)
+					require.Nil(t, err)
+				}
+
 				for _, tag := range repo.Tags {
 					_, err = db.Core.NewInsert().Model(&tag).Exec(ctx, &tag)
 					require.Nil(t, err)
@@ -1681,6 +1691,13 @@ func TestRepoStore_PublicToUserMirror(t *testing.T) {
 	require.Nil(t, err)
 	require.NotNil(t, repo)
 
+	// Create corresponding record in datasets table for DatasetRepo
+	dataset := database.Dataset{
+		RepositoryID: repo.ID,
+	}
+	_, err = db.Core.NewInsert().Model(&dataset).Exec(ctx)
+	require.Nil(t, err)
+
 	userName1 := "user_name_" + uuid.NewString()
 	repoName1 := "repo_name_" + uuid.NewString()
 	repo1, err := rs.CreateRepo(ctx, database.Repository{
@@ -1698,6 +1715,13 @@ func TestRepoStore_PublicToUserMirror(t *testing.T) {
 	require.Nil(t, err)
 	require.NotNil(t, repo1)
 
+	// Create corresponding record in datasets table for DatasetRepo
+	dataset1 := database.Dataset{
+		RepositoryID: repo1.ID,
+	}
+	_, err = db.Core.NewInsert().Model(&dataset1).Exec(ctx)
+	require.Nil(t, err)
+
 	mirrorStore := database.NewMirrorStoreWithDB(db)
 	mirror, err := mirrorStore.Create(ctx, &database.Mirror{
 		RepositoryID: repo1.ID,

cmd/csghub-server/cmd/dataviewer/launch.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log/slog"
+	"time"
 
 	"github.com/spf13/cobra"
 	"go.temporal.io/sdk/client"
@@ -47,6 +48,9 @@ var launchCmd = &cobra.Command{
 		client, err := temporal.NewClient(client.Options{
 			HostPort: cfg.WorkFLow.Endpoint,
 			Logger:   log.NewStructuredLogger(slog.Default()),
+			ConnectionOptions: client.ConnectionOptions{
+				GetSystemInfoTimeout: time.Duration(cfg.Temporal.GetSystemInfoTimeout) * time.Second,
+			},
 		}, "dataset-viewer")
 		if err != nil {
 			return fmt.Errorf("unable to create workflow client, error: %w", err)

common/config/config.go

@@ -512,6 +512,7 @@ type Config struct {
 		MaxConcurrentActivityExecutionSize      int `env:"OPENCSG_TEMPORAL_MAX_CONCURRENT_ACTIVITY_EXECUTION_SIZE" default:"5"`
 		MaxConcurrentLocalActivityExecutionSize int `env:"OPENCSG_TEMPORAL_MAX_CONCURRENT_LOCAL_ACTIVITY_EXECUTION_SIZE" default:"10"`
 		MaxConcurrentWorkflowTaskExecutionSize  int `env:"OPENCSG_TEMPORAL_MAX_CONCURRENT_WORKFLOW_TASK_EXECUTION_SIZE" default:"50"`
+		GetSystemInfoTimeout                    int `env:"OPENCSG_TEMPORAL_GET_SYSTEM_INFO_TIMEOUT" default:"5"`
 	}
 
 	APIRateLimiter struct {