Migrate model subcommand to analyze

Signed-off-by: Yi Chen <github@chenyicn.net>
kubeflow · Mar 26, 2024 · a135fa6 · a135fa6
1 parent 5ac396c
commit a135fa6
Show file tree

Hide file tree

Showing 26 changed files with 187 additions and 179 deletions.
diff --git a/pkg/model/delete.go → pkg/analyze/delete.go b/pkg/model/delete.go → pkg/analyze/delete.go
@@ -1,10 +1,11 @@
-package model
+package analyze
 
 import (
+	"strings"
+
 	"github.com/kubeflow/arena/pkg/apis/types"
 	"github.com/kubeflow/arena/pkg/workflow"
 	log "github.com/sirupsen/logrus"
-	"strings"
 )
 
 func DeleteModelJob(namespace, name string, jobType types.ModelJobType) error {

diff --git a/pkg/model/get.go → pkg/analyze/get.go b/pkg/model/get.go → pkg/analyze/get.go
@@ -1,14 +1,15 @@
-package model
+package analyze
 
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/kubeflow/arena/pkg/apis/types"
-	"github.com/kubeflow/arena/pkg/apis/utils"
-	"gopkg.in/yaml.v2"
 	"os"
 	"strings"
 	"text/tabwriter"
+
+	"github.com/kubeflow/arena/pkg/apis/types"
+	"github.com/kubeflow/arena/pkg/apis/utils"
+	"gopkg.in/yaml.v2"
 )
 
 var getJobTemplate = `

diff --git a/pkg/model/list.go → pkg/analyze/list.go b/pkg/model/list.go → pkg/analyze/list.go
@@ -1,19 +1,20 @@
-package model
+package analyze
 
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/kubeflow/arena/pkg/apis/types"
-	"github.com/kubeflow/arena/pkg/apis/utils"
-	"github.com/kubeflow/arena/pkg/util"
-	log "github.com/sirupsen/logrus"
-	"gopkg.in/yaml.v2"
 	"io"
 	"os"
 	"strconv"
 	"strings"
 	"text/tabwriter"
 	"time"
+
+	"github.com/kubeflow/arena/pkg/apis/types"
+	"github.com/kubeflow/arena/pkg/apis/utils"
+	"github.com/kubeflow/arena/pkg/util"
+	log "github.com/sirupsen/logrus"
+	"gopkg.in/yaml.v2"
 )
 
 func ListModelJobs(namespace string, allNamespaces bool, modelJobType types.ModelJobType) ([]ModelJob, error) {

diff --git a/pkg/model/model.go → pkg/analyze/model.go b/pkg/model/model.go → pkg/analyze/model.go
@@ -1,7 +1,11 @@
-package model
+package analyze
 
 import (
 	"fmt"
+	"math"
+	"strings"
+	"time"
+
 	"github.com/kubeflow/arena/pkg/apis/config"
 	"github.com/kubeflow/arena/pkg/apis/types"
 	"github.com/kubeflow/arena/pkg/apis/utils"
@@ -12,9 +16,6 @@ import (
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
-	"math"
-	"strings"
-	"time"
 )
 
 type modelProcessor struct {

diff --git a/pkg/model/model_interface.go → pkg/analyze/model_interface.go b/pkg/model/model_interface.go → pkg/analyze/model_interface.go
@@ -1,11 +1,12 @@
-package model
+package analyze
 
 import (
+	"time"
+
 	"github.com/kubeflow/arena/pkg/apis/types"
 	batchv1 "k8s.io/api/batch/v1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"time"
 )
 
 type ModelJob interface {

diff --git a/pkg/model/submit_benchmark.go → pkg/analyze/submit_benchmark.go b/pkg/model/submit_benchmark.go → pkg/analyze/submit_benchmark.go
@@ -1,7 +1,8 @@
-package model
+package analyze
 
 import (
 	"fmt"
+
 	"github.com/kubeflow/arena/pkg/apis/types"
 	"github.com/kubeflow/arena/pkg/util"
 	"github.com/kubeflow/arena/pkg/workflow"

diff --git a/pkg/model/submit_evaluate.go → pkg/analyze/submit_evaluate.go b/pkg/model/submit_evaluate.go → pkg/analyze/submit_evaluate.go
@@ -1,7 +1,8 @@
-package model
+package analyze
 
 import (
 	"fmt"
+
 	"github.com/kubeflow/arena/pkg/apis/types"
 	"github.com/kubeflow/arena/pkg/util"
 	"github.com/kubeflow/arena/pkg/workflow"

diff --git a/pkg/model/submit_optimize.go → pkg/analyze/submit_optimize.go b/pkg/model/submit_optimize.go → pkg/analyze/submit_optimize.go
@@ -1,7 +1,8 @@
-package model
+package analyze
 
 import (
 	"fmt"
+
 	"github.com/kubeflow/arena/pkg/apis/types"
 	"github.com/kubeflow/arena/pkg/util"
 	"github.com/kubeflow/arena/pkg/workflow"

diff --git a/pkg/model/submit_profile.go → pkg/analyze/submit_profile.go b/pkg/model/submit_profile.go → pkg/analyze/submit_profile.go
@@ -1,7 +1,8 @@
-package model
+package analyze
 
 import (
 	"fmt"
+
 	"github.com/kubeflow/arena/pkg/apis/types"
 	"github.com/kubeflow/arena/pkg/util"
 	"github.com/kubeflow/arena/pkg/workflow"

diff --git a/pkg/apis/model/benchmark_builder.go → pkg/apis/analyze/benchmark_builder.go b/pkg/apis/model/benchmark_builder.go → pkg/apis/analyze/benchmark_builder.go
@@ -1,10 +1,11 @@
-package model
+package analyze
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/kubeflow/arena/pkg/apis/types"
 	"github.com/kubeflow/arena/pkg/argsbuilder"
-	"strings"
 )
 
 type ModelBenchmarkArgsBuilder struct {

diff --git a/pkg/apis/model/evaluate_builder.go → pkg/apis/analyze/evaluate_builder.go b/pkg/apis/model/evaluate_builder.go → pkg/apis/analyze/evaluate_builder.go
@@ -1,10 +1,11 @@
-package model
+package analyze
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/kubeflow/arena/pkg/apis/types"
 	"github.com/kubeflow/arena/pkg/argsbuilder"
-	"strings"
 )
 
 type ModelEvaluateJobBuilder struct {

diff --git a/pkg/apis/model/job.go → pkg/apis/analyze/job.go b/pkg/apis/model/job.go → pkg/apis/analyze/job.go
@@ -1,4 +1,4 @@
-package model
+package analyze
 
 import "github.com/kubeflow/arena/pkg/apis/types"
 

diff --git a/pkg/apis/model/optimize_builder.go → pkg/apis/analyze/optimize_builder.go b/pkg/apis/model/optimize_builder.go → pkg/apis/analyze/optimize_builder.go
@@ -1,10 +1,11 @@
-package model
+package analyze
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/kubeflow/arena/pkg/apis/types"
 	"github.com/kubeflow/arena/pkg/argsbuilder"
-	"strings"
 )
 
 type ModelOptimizeJobBuilder struct {

diff --git a/pkg/apis/model/profile_builder.go → pkg/apis/analyze/profile_builder.go b/pkg/apis/model/profile_builder.go → pkg/apis/analyze/profile_builder.go
@@ -1,10 +1,11 @@
-package model
+package analyze
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/kubeflow/arena/pkg/apis/types"
 	"github.com/kubeflow/arena/pkg/argsbuilder"
-	"strings"
 )
 
 type ModelProfileJobBuilder struct {

diff --git a/pkg/apis/arenaclient/analyze_client.go b/pkg/apis/arenaclient/analyze_client.go
@@ -0,0 +1,102 @@
+package arenaclient
+
+import (
+	"github.com/kubeflow/arena/pkg/analyze"
+	apismodel "github.com/kubeflow/arena/pkg/apis/analyze"
+	"github.com/kubeflow/arena/pkg/apis/config"
+	"github.com/kubeflow/arena/pkg/apis/types"
+	"github.com/kubeflow/arena/pkg/apis/utils"
+)
+
+type AnalyzeClient struct {
+	namespace string
+	configer  *config.ArenaConfiger
+}
+
+func NewAnalyzeClient(namespace string, configer *config.ArenaConfiger) *AnalyzeClient {
+	return &AnalyzeClient{
+		namespace: namespace,
+		configer:  configer,
+	}
+}
+
+// Namespace sets the namespace,this operation does not change the default namespace
+func (m *AnalyzeClient) Namespace(namespace string) *AnalyzeClient {
+	copyModelJobClient := &AnalyzeClient{
+		namespace: namespace,
+		configer:  m.configer,
+	}
+	return copyModelJobClient
+}
+
+func (m *AnalyzeClient) Submit(job *apismodel.Job) error {
+	switch job.Type() {
+	case types.ModelProfileJob:
+		args := job.Args().(*types.ModelProfileArgs)
+		return analyze.SubmitModelProfileJob(args.Namespace, args)
+	case types.ModelOptimizeJob:
+		args := job.Args().(*types.ModelOptimizeArgs)
+		return analyze.SubmitModelOptimizeJob(args.Namespace, args)
+	case types.ModelBenchmarkJob:
+		args := job.Args().(*types.ModelBenchmarkArgs)
+		return analyze.SubmitModelBenchmarkJob(args.Namespace, args)
+	case types.ModelEvaluateJob:
+		args := job.Args().(*types.ModelEvaluateArgs)
+		return analyze.SubmitModelEvaluateJob(args.Namespace, args)
+	}
+	return nil
+}
+
+func (m *AnalyzeClient) Get(jobType types.ModelJobType, name string) (*types.ModelJobInfo, error) {
+	job, err := analyze.SearchModelJob(m.namespace, name, jobType)
+	if err != nil {
+		return nil, err
+	}
+
+	jobInfo := job.Convert2JobInfo()
+	return &jobInfo, nil
+}
+
+func (m *AnalyzeClient) GetAndPrint(jobType types.ModelJobType, name string, format string) error {
+	job, err := analyze.SearchModelJob(m.namespace, name, jobType)
+	if err != nil {
+		return err
+	}
+
+	analyze.PrintModelJob(job, utils.TransferPrintFormat(format))
+	return nil
+}
+
+func (m *AnalyzeClient) List(allNamespaces bool, jobType types.ModelJobType) ([]*types.ModelJobInfo, error) {
+	jobs, err := analyze.ListModelJobs(m.namespace, allNamespaces, jobType)
+	if err != nil {
+		return nil, err
+	}
+
+	var jobInfos []*types.ModelJobInfo
+	for _, job := range jobs {
+		jobInfo := job.Convert2JobInfo()
+		jobInfos = append(jobInfos, &jobInfo)
+	}
+	return jobInfos, nil
+}
+
+func (m *AnalyzeClient) ListAndPrint(allNamespaces bool, jobType types.ModelJobType, format string) error {
+	jobs, err := analyze.ListModelJobs(m.namespace, allNamespaces, jobType)
+	if err != nil {
+		return err
+	}
+
+	analyze.PrintAllModelJobs(jobs, allNamespaces, utils.TransferPrintFormat(format))
+	return nil
+}
+
+func (m *AnalyzeClient) Delete(jobType types.ModelJobType, jobNames ...string) error {
+	for _, jobName := range jobNames {
+		err := analyze.DeleteModelJob(m.namespace, jobName, jobType)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
diff --git a/pkg/apis/arenaclient/arenaclient.go b/pkg/apis/arenaclient/arenaclient.go
@@ -83,6 +83,6 @@ func (a *ArenaClient) Evaluate() *EvaluateClient {
 	return NewEvaluateClient(a.namespace, a.arenaConfiger)
 }
 
-func (a *ArenaClient) Model() *ModelClient {
-	return NewModelClient(a.namespace, a.arenaConfiger)
+func (a *ArenaClient) Analyze() *AnalyzeClient {
+	return NewAnalyzeClient(a.namespace, a.arenaConfiger)
 }