Add Seldon PUID Header to gRPC context + tests #1790
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,11 @@ import ( | |
| "context" | ||
| "errors" | ||
| "fmt" | ||
| "net/http" | ||
| "net/http/httptest" | ||
| "net/url" | ||
| "testing" | ||
|
|
||
| "github.com/golang/protobuf/jsonpb" | ||
| . "github.com/onsi/gomega" | ||
| "github.com/seldonio/seldon-core/executor/api/grpc" | ||
|
|
@@ -12,11 +17,7 @@ import ( | |
| "github.com/seldonio/seldon-core/executor/api/test" | ||
| "github.com/seldonio/seldon-core/executor/logger" | ||
| v1 "github.com/seldonio/seldon-core/operator/apis/machinelearning.seldon.io/v1" | ||
| logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" | ||
| ) | ||
|
|
||
| const ( | ||
|
|
@@ -50,6 +51,13 @@ func createPredictorProcessWithError(t *testing.T, errMethod *v1.PredictiveUnitM | |
| return &pp | ||
| } | ||
|
|
||
| func createPredictorProcessWithoutPUID(t *testing.T) *PredictorProcess { | ||
| url, _ := url.Parse(testSourceUrl) | ||
| ctx := context.WithValue(context.TODO(), payload.SeldonPUIDHeader, nil) | ||
| pp := NewPredictorProcess(ctx, &test.SeldonMessageTestClient{}, logf.Log.WithName("SeldonMessageRestClient"), url, "default", map[string][]string{testCustomMetaKey: []string{testCustomMetaValue}}) | ||
| return &pp | ||
| } | ||
|
|
||
| func createPredictPayload(g *GomegaWithT) payload.SeldonPayload { | ||
| var sm proto.SeldonMessage | ||
| var data = ` {"data":{"ndarray":[1.1,2.0]}}` | ||
|
|
@@ -455,3 +463,85 @@ func TestModelWithLogResponses(t *testing.T) { | |
| g.Expect(smRes.GetData().GetNdarray().Values[1].GetNumberValue()).Should(Equal(2.0)) | ||
| g.Eventually(func() bool { return logged }).Should(Equal(true)) | ||
| } | ||
|
|
||
| func TestModelWithLogRequestsNilPUIDError(t *testing.T) { | ||
| t.Logf("Started") | ||
| g := NewGomegaWithT(t) | ||
| modelName := "foo" | ||
| handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { | ||
| //g.Expect(r.Header.Get(logger.CloudEventsIdHeader)).Should(Equal(testEventId)) | ||
| g.Expect(r.Header.Get(logger.CloudEventsTypeHeader)).To(Equal(logger.CEInferenceRequest)) | ||
| g.Expect(r.Header.Get(logger.CloudEventsTypeSource)).To(Equal(testSourceUrl)) | ||
| g.Expect(r.Header.Get(modelIdHeaderName)).To(Equal(modelName)) | ||
| g.Expect(r.Header.Get(contentTypeHeaderName)).To(Equal(grpc.ProtobufContentType)) | ||
| g.Expect(r.Header.Get(requestIdHeaderName)).To(Equal(testSeldonPuid)) | ||
| w.Write([]byte("")) | ||
| fmt.Printf("%+v\n", r.Header) | ||
| fmt.Printf("%+v\n", r.Body) | ||
| }) | ||
| server := httptest.NewServer(handler) | ||
| defer server.Close() | ||
|
|
||
| logf.SetLogger(logf.ZapLogger(false)) | ||
| log := logf.Log.WithName("entrypoint") | ||
| logger.StartDispatcher(1, log, "", "", "") | ||
|
|
||
| model := v1.MODEL | ||
| graph := &v1.PredictiveUnit{ | ||
| Name: modelName, | ||
| Type: &model, | ||
| Endpoint: &v1.Endpoint{ | ||
| ServiceHost: "foo", | ||
| ServicePort: 9000, | ||
| Type: v1.REST, | ||
| }, | ||
| Logger: &v1.Logger{ | ||
| Mode: v1.LogRequest, | ||
| Url: &server.URL, | ||
| }, | ||
| } | ||
|
|
||
| _, err := createPredictorProcessWithoutPUID(t).Predict(graph, createPredictPayload(g)) | ||
| g.Expect(err).NotTo(BeNil()) | ||
| g.Expect(err.Error()).Should(Equal("context value Seldon PUID Header is nil: interface to string conversion failed")) | ||
| } | ||
|
|
||
| func TestModelWithLogResponsesNilPUIDError(t *testing.T) { | ||
|
There was a problem hiding this comment. seems to be almost a duplicate of above test - can't they be combined? |
||
| t.Logf("Started") | ||
| g := NewGomegaWithT(t) | ||
| modelName := "foo" | ||
| handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { | ||
| //g.Expect(r.Header.Get(logger.CloudEventsIdHeader)).Should(Equal(testEventId)) | ||
| g.Expect(r.Header.Get(logger.CloudEventsTypeHeader)).To(Equal(logger.CEInferenceResponse)) | ||
| g.Expect(r.Header.Get(logger.CloudEventsTypeSource)).To(Equal(testSourceUrl)) | ||
| g.Expect(r.Header.Get(modelIdHeaderName)).To(Equal(modelName)) | ||
| g.Expect(r.Header.Get(contentTypeHeaderName)).To(Equal(grpc.ProtobufContentType)) | ||
| g.Expect(r.Header.Get(requestIdHeaderName)).To(Equal(testSeldonPuid)) | ||
| w.Write([]byte("")) | ||
| }) | ||
| server := httptest.NewServer(handler) | ||
| defer server.Close() | ||
|
|
||
| logf.SetLogger(logf.ZapLogger(false)) | ||
| log := logf.Log.WithName("entrypoint") | ||
| logger.StartDispatcher(1, log, "", "", "") | ||
|
|
||
| model := v1.MODEL | ||
| graph := &v1.PredictiveUnit{ | ||
| Name: modelName, | ||
| Type: &model, | ||
| Endpoint: &v1.Endpoint{ | ||
| ServiceHost: "foo", | ||
| ServicePort: 9000, | ||
| Type: v1.REST, | ||
| }, | ||
| Logger: &v1.Logger{ | ||
| Mode: v1.LogResponse, | ||
| Url: &server.URL, | ||
| }, | ||
| } | ||
|
|
||
| _, err := createPredictorProcessWithoutPUID(t).Predict(graph, createPredictPayload(g)) | ||
| g.Expect(err).NotTo(BeNil()) | ||
| g.Expect(err.Error()).Should(Equal("context value Seldon PUID Header is nil: interface to string conversion failed")) | ||
|
There was a problem hiding this comment. The message should be turned into a There was a problem hiding this comment. Fixed. See #1841 for follow up changes |
||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit:remove?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed