Fix pyfunc bugs for release

engines/experiment/examples/plugins/hardcoded/config.go

@@ -20,7 +20,7 @@ type SegmenterConfig struct {
 
 type Experiment struct {
 	manager.Experiment
-	SegmentationConfig SegmenterConfig
+	SegmentationConfig SegmenterConfig            `json:"segmentation_configuration"`
 	VariantsConfig     map[string]TreatmentConfig `json:"variants_configuration"`
 }
 

engines/experiment/examples/plugins/hardcoded/runner.go

@@ -7,10 +7,12 @@ import (
 	"github.com/gojek/turing/engines/experiment/pkg/request"
 	"github.com/gojek/turing/engines/experiment/runner"
 	"net/http"
+	"sort"
 )
 
 type ExperimentRunner struct {
-	experiments []Experiment
+	experiments      []Experiment
+	sortedTreatments map[string][]string
 }
 
 func (e *ExperimentRunner) Configure(cfg json.RawMessage) error {
@@ -19,8 +21,22 @@ func (e *ExperimentRunner) Configure(cfg json.RawMessage) error {
 	if err != nil {
 		return err
 	}
-
 	e.experiments = config.Experiments
+	e.sortedTreatments = make(map[string][]string)
+
+	for _, exp := range e.experiments {
+		var variants []string
+
+		for name := range exp.VariantsConfig {
+			variants = append(variants, name)
+		}
+
+		sort.Slice(variants, func(i, j int) bool {
+			return exp.VariantsConfig[variants[i]].Traffic > exp.VariantsConfig[variants[j]].Traffic
+		})
+
+		e.sortedTreatments[exp.ID] = variants
+	}
 	return nil
 }
 
@@ -42,9 +58,10 @@ func (e *ExperimentRunner) GetTreatmentForRequest(
 		bucket := utils.Hash(segmentationUnit) % 10000
 
 		var total uint32 = 0
-		for name, variant := range exp.VariantsConfig {
+		for _, name := range e.sortedTreatments[exp.ID] {
+			variant := exp.VariantsConfig[name]
 			total += uint32(variant.Traffic * 10000)
-			if bucket < total {
+			if bucket <= total {
 				return &runner.Treatment{
 					ExperimentName: exp.Name,
 					Name:           name,

engines/experiment/examples/plugins/hardcoded/runner_test.go

@@ -5,81 +5,77 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/gojek/turing/engines/experiment/manager"
-	"github.com/gojek/turing/engines/experiment/pkg/request"
 	"github.com/gojek/turing/engines/experiment/runner"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 func TestExperimentRunner_GetTreatmentForRequest(t *testing.T) {
-	experiments := []Experiment{
-		{
-			Experiment: manager.Experiment{
-				ID:   "001",
-				Name: "exp_1",
-				Variants: []manager.Variant{
-					{
-						Name: "control",
-					},
-					{
-						Name: "treatment-1",
-					},
-				},
-			},
-			SegmentationConfig: SegmenterConfig{
-				Name:            "customer_id",
-				SegmenterSource: request.PayloadFieldSource,
-				SegmenterValue:  "client.id",
-			},
-			VariantsConfig: map[string]TreatmentConfig{
-				"control": {
-					Traffic: 0.85,
-					Data:    json.RawMessage(`{"foo": "bar"}`),
-				},
-				"treatment-1": {
-					Traffic: 0.15,
-					Data:    json.RawMessage(`{"bar": "baz"}`),
+	runnerConfig := json.RawMessage(`{
+		"experiments": [
+			{
+				"id": "001",
+				"name": "exp_1",
+				"variants": [
+					{"name": "control"}, 
+					{"name": "treatment-1"}
+				],
+				"segmentation_configuration": {
+					"name": "client_id",
+					"source": "payload",
+					"value": "client.id"
 				},
-			},
-		},
-	}
+				"variants_configuration": {
+					"control": {
+						"traffic": 0.85,
+						"treatment_configuration": {"foo": "bar"}
+					},
+					"treatment-1": {
+						"traffic": 0.15,
+						"treatment_configuration": {"bar": "baz"}
+					}
+				}
+			}
+		]
+	}`)
 
 	suite := map[string]struct {
-		experiments []Experiment
-		header      http.Header
-		payload     json.RawMessage
-		expected    *runner.Treatment
-		err         string
+		runnerConfig json.RawMessage
+		header       http.Header
+		payload      json.RawMessage
+		expected     *runner.Treatment
+		err          string
 	}{
 		"success | client_id:4": {
-			experiments: experiments,
-			payload:     json.RawMessage(`{"client": {"id": 4}}`),
+			runnerConfig: runnerConfig,
+			payload:      json.RawMessage(`{"client": {"id": 4}}`),
 			expected: &runner.Treatment{
 				ExperimentName: "exp_1",
 				Name:           "control",
 				Config:         json.RawMessage(`{"foo": "bar"}`),
 			},
 		},
 		"success | client_id:7": {
-			experiments: experiments,
-			payload:     json.RawMessage(`{"client": {"id": 7}}`),
+			runnerConfig: runnerConfig,
+			payload:      json.RawMessage(`{"client": {"id": 7}}`),
 			expected: &runner.Treatment{
 				ExperimentName: "exp_1",
 				Name:           "treatment-1",
 				Config:         json.RawMessage(`{"bar": "baz"}`),
 			},
 		},
 		"failure": {
-			experiments: experiments,
-			payload:     json.RawMessage(`{}`),
-			err:         "no experiment configured for the unit",
+			runnerConfig: runnerConfig,
+			payload:      json.RawMessage(`{}`),
+			err:          "no experiment configured for the unit",
 		},
 	}
 
 	for name, tt := range suite {
 		t.Run(name, func(t *testing.T) {
-			expRunner := ExperimentRunner{experiments: tt.experiments}
+			expRunner := &ExperimentRunner{}
+			err := expRunner.Configure(tt.runnerConfig)
+			require.NoError(t, err)
 
 			actual, err := expRunner.GetTreatmentForRequest(tt.header, tt.payload, runner.GetTreatmentOptions{})
 			if tt.err != "" {