Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(KLV-30): add relayout function for MLflow #141

Merged
merged 1 commit into from
Oct 25, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 62 additions & 1 deletion cmd/ormb-storage-initializer/cmd/pull-and-export.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package cmd

import (
"fmt"
"io/ioutil"
"os"
"path"
"path/filepath"
Expand All @@ -26,8 +27,10 @@ import (
"github.com/spf13/viper"

"github.com/kleveross/ormb/pkg/consts"
"github.com/kleveross/ormb/pkg/model"
"github.com/kleveross/ormb/pkg/oras"
"github.com/kleveross/ormb/pkg/ormb"
"github.com/kleveross/ormb/pkg/parser"
)

// pullExportCmd represents the pull-and-export command.
Expand Down Expand Up @@ -88,14 +91,72 @@ var pullExportCmd = &cobra.Command{
return nil
}

if err := relayoutModel(dstDir); err != nil {
var relayoutFunc func(string) error

isMLflow, err := checkForMLflow(dstDir)
if err != nil {
return err
}

if isMLflow {
relayoutFunc = relayoutForMLflowModel
} else {
relayoutFunc = relayoutModel
}

if err := relayoutFunc(dstDir); err != nil {
return err
}

return nil
},
}

func checkForMLflow(modelDir string) (bool, error) {
path, err := filepath.Abs(modelDir)
if err != nil {
return false, err
}

dat, err := ioutil.ReadFile(filepath.Join(path, consts.ORMBfileName))
if err != nil {
return false, err
}

metadata := &model.Metadata{}
ormbParser := parser.NewDefaultParser()
if metadata, err = ormbParser.Parse(dat); err != nil {
return false, err
}

format := model.Format(metadata.Format)
return format == model.FormatMLflow, nil
}

func relayoutForMLflowModel(modelDir string) error {
// Relayout for pre-packaged MLflow server to serve
// i.e. move /mnt/models/model/* to /mnt/models/* (dstDir).
// so that, the pre-packaged MLflow server will serving, the refenence as
// https://github.com/SeldonIO/seldon-core/blob/v1.1.0/operator/controllers/model_initializer_injector.go#L214
originalDir, err := filepath.Abs(filepath.Join(modelDir, consts.ORMBModelDirectory))
if err != nil {
return err
}

files, err := ioutil.ReadDir(originalDir)
if err != nil {
return err
}

for _, file := range files {
if err := os.Rename(path.Join(originalDir, file.Name()), path.Join(modelDir, file.Name())); err != nil {
return err
}
}

return nil
}

func relayoutModel(modelDir string) error {
// Rename the `model` directory as `1`.
// e.g. move /mnt/models/model to /mnt/models/1 (dstDir).
Expand Down