Skip to content

Commit

Permalink
fix: fix list long-run operation error (#220)
Browse files Browse the repository at this point in the history
Because

- list long-run operation is buggy 

This commit

- rename the add search attribute function
- update model UID and model instance UID to follow the format
  • Loading branch information
pinglin committed Jan 17, 2023
1 parent da1ae2b commit 472696d
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 13 deletions.
2 changes: 1 addition & 1 deletion cmd/worker/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ func main() {
w.RegisterWorkflow(cw.UnDeployModelWorkflow)
w.RegisterActivity(cw.UnDeployModelActivity)
w.RegisterWorkflow(cw.CreateModelWorkflow)
w.RegisterWorkflow(cw.SearchAttributeReadyWorkflow)
w.RegisterWorkflow(cw.AddSearchAttributeWorkflow)

err = w.Run(worker.InterruptCh())
if err != nil {
Expand Down
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -950,8 +950,6 @@ github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH
github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/instill-ai/protogen-go v0.3.3-alpha.0.20230109121427-2774a9ddf027 h1:8gVftTUmI9Bn5o+LYOvfF8Uh2p6tG41/5/pqCAhvaKI=
github.com/instill-ai/protogen-go v0.3.3-alpha.0.20230109121427-2774a9ddf027/go.mod h1:7/Jj3ATVozPwB0WmKRM612o/k5UJF8K9oRCNKYH8iy0=
github.com/instill-ai/protogen-go v0.3.3-alpha.0.20230114171039-adffe54b85f2 h1:60qyBKE2c/nvzYyZiRV0X0LFfQZFd3FrkjkVoVNkY/Y=
github.com/instill-ai/protogen-go v0.3.3-alpha.0.20230114171039-adffe54b85f2/go.mod h1:7/Jj3ATVozPwB0WmKRM612o/k5UJF8K9oRCNKYH8iy0=
github.com/instill-ai/usage-client v0.2.1-alpha h1:XXMCTDT2BWOgGwerOpxghzt6hW9J7/yUR1tkNRuGjjM=
Expand Down
24 changes: 17 additions & 7 deletions internal/worker/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@ import (
"time"

"github.com/gofrs/uuid"
"go.temporal.io/sdk/workflow"

"github.com/instill-ai/model-backend/config"
"github.com/instill-ai/model-backend/internal/util"
"github.com/instill-ai/model-backend/pkg/datamodel"

modelPB "github.com/instill-ai/protogen-go/vdp/model/v1alpha"
"go.temporal.io/sdk/workflow"
)

type ModelInstanceParams struct {
Expand All @@ -27,24 +29,32 @@ type ModelParams struct {
Owner string
}

func (w *worker) SearchAttributeReadyWorkflow(ctx workflow.Context) error {
func (w *worker) AddSearchAttributeWorkflow(ctx workflow.Context) error {
logger := workflow.GetLogger(ctx)
logger.Info("SearchAttributeReadyWorkflow started")
logger.Info("AddSearchAttributeWorkflow started")

// Upsert search attributes.
modelUID, err := uuid.NewV4()
if err != nil {
return err
}
modelInstanceUID, err := uuid.NewV4()
if err != nil {
return err
}
attributes := map[string]interface{}{
"Type": util.OperationTypeHealthCheck,
"ModelUID": "ModelUID test",
"ModelInstanceUID": "ModelInstanceUID test",
"ModelUID": modelUID.String(),
"ModelInstanceUID": modelInstanceUID.String(),
"Owner": "",
}

err := workflow.UpsertSearchAttributes(ctx, attributes)
err = workflow.UpsertSearchAttributes(ctx, attributes)
if err != nil {
return err
}

logger.Info("SearchAttributeReadyWorkflow completed")
logger.Info("AddSearchAttributeWorkflow completed")

return nil
}
Expand Down
4 changes: 2 additions & 2 deletions internal/worker/worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"time"

"github.com/allegro/bigcache"
"go.temporal.io/sdk/workflow"

"github.com/allegro/bigcache"
"github.com/instill-ai/model-backend/internal/triton"
"github.com/instill-ai/model-backend/pkg/repository"
)
Expand All @@ -22,7 +22,7 @@ type Worker interface {
UnDeployModelWorkflow(ctx workflow.Context, param *ModelInstanceParams) error
UnDeployModelActivity(ctx context.Context, param *ModelInstanceParams) error
CreateModelWorkflow(ctx workflow.Context, param *ModelParams) error
SearchAttributeReadyWorkflow(ctx workflow.Context) error
AddSearchAttributeWorkflow(ctx workflow.Context) error
}

// worker represents resources required to run Temporal workflow and activity
Expand Down
2 changes: 1 addition & 1 deletion pkg/service/worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ func (s *service) SearchAttributeReady() error {
we, err := s.temporalClient.ExecuteWorkflow(
ctx,
workflowOptions,
"SearchAttributeReadyWorkflow",
"AddSearchAttributeWorkflow",
)
if err != nil {
logger.Error(fmt.Sprintf("unable to execute workflow: %s", err.Error()))
Expand Down

0 comments on commit 472696d

Please sign in to comment.