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.

Sign up for GitHub

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

chore(run): clarify actors in ModelRun #711

Merged
merged 1 commit into from
Nov 29, 2024
Merged

chore(run): clarify actors in ModelRun #711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0
github.com/iancoleman/strcase v0.3.0
github.com/influxdata/influxdb-client-go/v2 v2.14.0
github.com/instill-ai/protogen-go v0.3.3-alpha.0.20241105082344-134e33b0893e
github.com/instill-ai/protogen-go v0.3.3-alpha.0.20241129105617-c2c298e76498
github.com/instill-ai/usage-client v0.3.0-alpha
github.com/instill-ai/x v0.5.0-alpha.0.20241028101056-3b853d0b8656
github.com/jackc/pgx/v5 v5.6.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,8 @@ github.com/influxdata/influxdb-client-go/v2 v2.14.0 h1:AjbBfJuq+QoaXNcrova8smSjw
github.com/influxdata/influxdb-client-go/v2 v2.14.0/go.mod h1:Ahpm3QXKMJslpXl3IftVLVezreAUtBOTZssDrjZEFHI=
github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839 h1:W9WBk7wlPfJLvMCdtV4zPulc4uCPrlywQOmbFOhgQNU=
github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo=
github.com/instill-ai/protogen-go v0.3.3-alpha.0.20241105082344-134e33b0893e h1:7y4coZNWIHxpJGwO5iPhKsKLfQpywUUIqtI9KacHxxA=
github.com/instill-ai/protogen-go v0.3.3-alpha.0.20241105082344-134e33b0893e/go.mod h1:rf0UY7VpEgpaLudYEcjx5rnbuwlBaaLyD4FQmWLtgAY=
github.com/instill-ai/protogen-go v0.3.3-alpha.0.20241129105617-c2c298e76498 h1:JYRfk/m+960jEScE1NPQM+xh+ScR4cHNMg/tCFwQbpI=
github.com/instill-ai/protogen-go v0.3.3-alpha.0.20241129105617-c2c298e76498/go.mod h1:rf0UY7VpEgpaLudYEcjx5rnbuwlBaaLyD4FQmWLtgAY=
github.com/instill-ai/usage-client v0.3.0-alpha h1:yY5eNn5zINqy8wpOogiNmrVYzJKnd1KMnMxlYBpr7Tk=
github.com/instill-ai/usage-client v0.3.0-alpha/go.mod h1:8lvtZulkhQ7t8alttb2KkLKYoCp5u4oatzDbfFlEld0=
github.com/instill-ai/x v0.5.0-alpha.0.20241028101056-3b853d0b8656 h1:/7XGEVLGiEaXf8mzzvWqg15DJO2yDMww/TC5ZlE1yUY=
Expand Down
4 changes: 1 addition & 3 deletions pkg/service/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,8 +884,6 @@ func (s *service) ListModelRunsByRequester(ctx context.Context, req *modelpb.Lis
return nil, err
}

requesterUID, _ := resourcex.GetRequesterUIDAndUserUID(ctx)

now := time.Now().UTC()
startedTimeBegin := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.UTC)
if req.GetStart().IsValid() {
Expand All @@ -905,7 +903,7 @@ func (s *service) ListModelRunsByRequester(ctx context.Context, req *modelpb.Lis
Page: int64(page),
Filter: filter,
Order: orderBy,
RequesterUID: requesterUID,
RequesterUID: ns.NsUID.String(),
StartedTimeBegin: startedTimeBegin,
StartedTimeEnd: startedTimeEnd,
})
Expand Down
19 changes: 9 additions & 10 deletions pkg/service/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,16 +117,15 @@ func parseMetadataToStructArr(metadataMap map[string][]byte, run *datamodel.Mode

func convertModelRunToPB(run *datamodel.ModelRun) *modelpb.ModelRun {
pbModelRun := &modelpb.ModelRun{
Uid: run.UID.String(),
ModelUid: run.ModelUID.String(),
ModelId: &run.Model.ID,
NamespaceId: run.Model.NamespaceID,
Version: run.ModelVersion,
Status: runpb.RunStatus(run.Status),
Source: runpb.RunSource(run.Source),
Error: run.Error.Ptr(),
CreateTime: timestamppb.New(run.CreateTime),
UpdateTime: timestamppb.New(run.UpdateTime),
Uid: run.UID.String(),
ModelId: &run.Model.ID,
ModelNamespaceId: run.Model.NamespaceID,
Version: run.ModelVersion,
Status: runpb.RunStatus(run.Status),
Source: runpb.RunSource(run.Source),
Error: run.Error.Ptr(),
CreateTime: timestamppb.New(run.CreateTime),
UpdateTime: timestamppb.New(run.UpdateTime),
}

if run.TotalDuration.Valid {
Expand Down