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(transform): Add Number Maximum Transform #195

Merged
merged 2 commits into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
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
12 changes: 12 additions & 0 deletions build/config/substation.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,18 @@
},
num: $.transform.number,
number: {
max(settings={}): $.transform.number.maximum(settings=settings),
maximum(settings={}): {
local type = 'number_maximum',
local default = {
id: $.helpers.id(type, settings),
object: $.config.object,
value: null,
},

type: type,
settings: std.prune(std.mergePatch(default, $.helpers.abbv(settings))),
},
math: {
default: {
object: $.config.object,
Expand Down
11 changes: 11 additions & 0 deletions examples/config/transform/number/max/config.jsonnet
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// This example uses the `number_maximum` transform to return the larger
// of two values, where one value is a constant and the other is a message.
local sub = import '../../../../../build/config/substation.libsonnet';

{
concurrency: 1,
transforms: [
sub.tf.num.max({ value: 0 }),
sub.tf.send.stdout(),
],
}
4 changes: 4 additions & 0 deletions examples/config/transform/number/max/data.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
0
-1
-1.1
10
4 changes: 4 additions & 0 deletions examples/config/transform/number/max/stdout.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
0
0
0
10
25 changes: 25 additions & 0 deletions transform/number.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,31 @@ import (
"github.com/brexhq/substation/internal/errors"
)

// Use this config for any Number transform that only requires a single value.
type numberValConfig struct {
Value float64 `json:"value"`

ID string `json:"id"`
Object iconfig.Object `json:"object"`
}

func (c *numberValConfig) Decode(in interface{}) error {
return iconfig.Decode(in, c)
}

// 0.0 is a valid value and should not be checked.
func (c *numberValConfig) Validate() error {
if c.Object.SourceKey == "" && c.Object.TargetKey != "" {
return fmt.Errorf("object_source_key: %v", errors.ErrMissingRequiredOption)
}

if c.Object.SourceKey != "" && c.Object.TargetKey == "" {
return fmt.Errorf("object_target_key: %v", errors.ErrMissingRequiredOption)
}

return nil
}

type numberMathConfig struct {
ID string `json:"id"`
Object iconfig.Object `json:"object"`
Expand Down
76 changes: 76 additions & 0 deletions transform/number_maximum.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
package transform

import (
"context"
"encoding/json"
"fmt"
"math"

"github.com/brexhq/substation/config"
iconfig "github.com/brexhq/substation/internal/config"
"github.com/brexhq/substation/message"
)

func newNumberMaximum(_ context.Context, cfg config.Config) (*numberMaximum, error) {
conf := numberValConfig{}
if err := iconfig.Decode(cfg.Settings, &conf); err != nil {
return nil, fmt.Errorf("transform number_maximum: %v", err)
}

if conf.ID == "" {
conf.ID = "number_maximum"
}

if err := conf.Validate(); err != nil {
return nil, fmt.Errorf("transform %s: %v", conf.ID, err)
}

tf := numberMaximum{
conf: conf,
isObject: conf.Object.SourceKey != "" && conf.Object.TargetKey != "",
}

return &tf, nil
}

type numberMaximum struct {
conf numberValConfig
isObject bool
}

func (tf *numberMaximum) Transform(ctx context.Context, msg *message.Message) ([]*message.Message, error) {
if msg.IsControl() {
return []*message.Message{msg}, nil
}

var value message.Value
if tf.isObject {
value = msg.GetValue(tf.conf.Object.SourceKey)
} else {
value = bytesToValue(msg.Data())
}

if !value.Exists() {
return []*message.Message{msg}, nil
}

flo64 := math.Max(value.Float(), tf.conf.Value)

if !tf.isObject {
s := numberFloat64ToString(flo64)
msg.SetData([]byte(s))

return []*message.Message{msg}, nil
}

if err := msg.SetValue(tf.conf.Object.TargetKey, flo64); err != nil {
return nil, fmt.Errorf("transform %s: %v", tf.conf.ID, err)
}

return []*message.Message{msg}, nil
}

func (tf *numberMaximum) String() string {
b, _ := json.Marshal(tf.conf)
return string(b)
}
158 changes: 158 additions & 0 deletions transform/number_maximum_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
package transform

import (
"context"
"reflect"
"testing"

"github.com/brexhq/substation/config"
"github.com/brexhq/substation/message"
)

var _ Transformer = &numberMaximum{}

var numberMaximumTests = []struct {
name string
cfg config.Config
test []byte
expected [][]byte
}{
// data tests
{
"data",
config.Config{
Settings: map[string]interface{}{
"value": 1,
},
},
[]byte(`0`),
[][]byte{
[]byte(`1`),
},
},
{
"data",
config.Config{
Settings: map[string]interface{}{
"value": -1,
},
},
[]byte(`0`),
[][]byte{
[]byte(`0`),
},
},
{
"data",
config.Config{
Settings: map[string]interface{}{
"value": -1.1,
},
},
[]byte(`0.1`),
[][]byte{
[]byte(`0.1`),
},
},
// object tests
{
"object",
config.Config{
Settings: map[string]interface{}{
"object": map[string]interface{}{
"source_key": "a",
"target_key": "a",
},
"value": 1,
},
},
[]byte(`{"a":0}`),
[][]byte{
[]byte(`{"a":1}`),
},
},
{
"object",
config.Config{
Settings: map[string]interface{}{
"object": map[string]interface{}{
"source_key": "a",
"target_key": "a",
},
"value": -1,
},
},
[]byte(`{"a":0}`),
[][]byte{
[]byte(`{"a":0}`),
},
},
{
"object",
config.Config{
Settings: map[string]interface{}{
"object": map[string]interface{}{
"source_key": "a",
"target_key": "a",
},
"value": -1.1,
},
},
[]byte(`{"a":0.1}`),
[][]byte{
[]byte(`{"a":0.1}`),
},
},
}

func TestNumberMaximum(t *testing.T) {
ctx := context.TODO()
for _, test := range numberMaximumTests {
t.Run(test.name, func(t *testing.T) {
tf, err := newNumberMaximum(ctx, test.cfg)
if err != nil {
t.Fatal(err)
}

msg := message.New().SetData(test.test)
result, err := tf.Transform(ctx, msg)
if err != nil {
t.Error(err)
}

var data [][]byte
for _, c := range result {
data = append(data, c.Data())
}

if !reflect.DeepEqual(data, test.expected) {
t.Errorf("expected %s, got %s", test.expected, data)
}
})
}
}

func benchmarkNumberMaximum(b *testing.B, tf *numberMaximum, data []byte) {
ctx := context.TODO()
msg := message.New().SetData(data)
b.ResetTimer()

for i := 0; i < b.N; i++ {
_, _ = tf.Transform(ctx, msg)
}
}

func BenchmarkNumberMaximum(b *testing.B) {
for _, test := range numberMaximumTests {
tf, err := newNumberMaximum(context.TODO(), test.cfg)
if err != nil {
b.Fatal(err)
}

b.Run(test.name,
func(b *testing.B) {
benchmarkNumberMaximum(b, tf, test.test)
},
)
}
}
2 changes: 2 additions & 0 deletions transform/transform.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ func New(ctx context.Context, cfg config.Config) (Transformer, error) { //nolint
case "meta_switch":
return newMetaSwitch(ctx, cfg)
// Number transforms.
case "number_maximum":
return newNumberMaximum(ctx, cfg)
case "number_math_addition":
return newNumberMathAddition(ctx, cfg)
case "number_math_division":
Expand Down
Loading