From 5ec67f66010481a91e8743b9ef841c51de813fe2 Mon Sep 17 00:00:00 2001 From: Alex Collins Date: Mon, 25 Oct 2021 16:41:01 -0700 Subject: [PATCH] feat: Make Kafka group.id configurable. Fixes #89 (#464) Signed-off-by: Alex Collins --- api/v1alpha1/generated.pb.go | 329 ++++++++++-------- api/v1alpha1/generated.proto | 3 + api/v1alpha1/kafka_source.go | 9 + api/v1alpha1/kafka_source_test.go | 11 + config/ci.yaml | 9 + .../bases/dataflow.argoproj.io_pipelines.yaml | 5 + .../crd/bases/dataflow.argoproj.io_steps.yaml | 4 + config/default.yaml | 9 + config/dev.yaml | 9 + config/quick-start.yaml | 9 + dsls/python/argo_dataflow/pipeline.py | 9 +- examples/301-kafka-pipeline.py | 2 +- examples/301-kafka-pipeline.yaml | 1 + runner/sidecar/source/kafka/kafka.go | 3 +- runner/sidecar/sources.go | 3 +- 15 files changed, 264 insertions(+), 151 deletions(-) diff --git a/api/v1alpha1/generated.pb.go b/api/v1alpha1/generated.pb.go index e547403e..eafdfa4f 100644 --- a/api/v1alpha1/generated.pb.go +++ b/api/v1alpha1/generated.pb.go @@ -2203,14 +2203,14 @@ func init() { } var fileDescriptor_7a4218a80d7ff35f = []byte{ - // 5318 bytes of a gzipped FileDescriptorProto + // 5335 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5c, 0x4b, 0x6c, 0x24, 0xc7, 0x79, 0xd6, 0x3c, 0x38, 0x9c, 0xf9, 0x49, 0xee, 0x72, 0x4b, 0x2b, 0x7b, 0xbc, 0x91, 0x96, 0x8b, 0x56, 0x2c, 0xcb, 0x89, 0x4c, 0x4a, 0xbb, 0x12, 0x22, 0xd9, 0xf1, 0x83, 0x33, 0x24, 0x57, 0x23, 0xf1, 0xb5, 0xd5, 0xdc, 0x95, 0x14, 0xc9, 0xda, 0x14, 0xbb, 0x6b, 0x66, 0x7a, 0xa7, 0xa7, 0xbb, - 0xb7, 0xab, 0x86, 0xbb, 0x74, 0x2e, 0x82, 0x0c, 0x1b, 0xf0, 0x21, 0x40, 0x0e, 0xb9, 0x05, 0xc8, - 0x21, 0x40, 0x10, 0x20, 0x40, 0x2e, 0x01, 0x12, 0xc4, 0x17, 0x5f, 0x2d, 0x20, 0x17, 0x05, 0xb9, - 0x18, 0x0e, 0x40, 0x48, 0x4c, 0x4e, 0xb9, 0x25, 0x08, 0x7c, 0xd8, 0x4b, 0x82, 0x7a, 0xf5, 0x63, + 0xb7, 0xab, 0x86, 0xbb, 0x74, 0x2e, 0x82, 0x0c, 0x1b, 0xf0, 0x21, 0x40, 0x0e, 0xb9, 0x05, 0x48, + 0x80, 0x00, 0x41, 0x80, 0x00, 0xb9, 0x04, 0x48, 0x10, 0x5f, 0x7c, 0xb5, 0x80, 0x5c, 0x14, 0xe4, + 0x62, 0x38, 0x00, 0x21, 0x31, 0x39, 0xe5, 0x96, 0x1c, 0x7c, 0xd8, 0x4b, 0x82, 0x7a, 0xf5, 0x63, 0x1e, 0x12, 0x39, 0xa3, 0x87, 0x73, 0x9b, 0xae, 0xff, 0xaf, 0xef, 0xef, 0xae, 0xaa, 0xff, 0xaf, 0xff, 0x51, 0x35, 0xd0, 0xec, 0x78, 0xbc, 0x3b, 0x38, 0x5c, 0x75, 0xc2, 0xfe, 0x1a, 0x89, 0x3b, 0x61, 0x14, 0x87, 0xf7, 0xbe, 0xe5, 0x93, 0x43, 0x26, 0x9f, 0xbe, 0xe5, 0x12, 0x4e, 0xda, 0x7e, @@ -2234,7 +2234,7 @@ var fileDescriptor_7a4218a80d7ff35f = []byte{ 0xbf, 0x74, 0x1b, 0x6f, 0x63, 0xd1, 0x6e, 0x79, 0xb0, 0xb8, 0x7e, 0xc8, 0x78, 0x4c, 0x1c, 0x6e, 0x73, 0x1a, 0xa1, 0xb7, 0xa0, 0x66, 0x16, 0x00, 0xd3, 0x83, 0xfc, 0xec, 0xb8, 0x77, 0xc3, 0x9a, 0x09, 0xd3, 0xfb, 0x03, 0x2f, 0xa6, 0x7d, 0x1a, 0x70, 0xd6, 0xb8, 0xa4, 0xe1, 0x6b, 0x86, 0xca, - 0x70, 0x8a, 0x66, 0xfd, 0xd5, 0x65, 0xb8, 0x6c, 0x64, 0xdd, 0x09, 0xfd, 0x41, 0x9f, 0xda, 0x92, + 0x70, 0x8a, 0x66, 0xfd, 0xf5, 0x65, 0xb8, 0x6c, 0x64, 0xdd, 0x09, 0xfd, 0x41, 0x9f, 0xda, 0x92, 0x82, 0x30, 0x54, 0xbb, 0x21, 0xe3, 0xfb, 0x84, 0x77, 0x3f, 0x49, 0xe4, 0xab, 0x9a, 0x27, 0xdb, 0xb7, 0xb1, 0x78, 0x7a, 0xb2, 0x52, 0x35, 0x14, 0x9c, 0xe0, 0x08, 0x4c, 0xda, 0x8f, 0xf8, 0xf1, 0x86, 0x17, 0xeb, 0x99, 0x1c, 0x8b, 0xb9, 0xa9, 0x79, 0x46, 0x31, 0x0d, 0x05, 0x27, 0x38, 0xe8, @@ -2281,7 +2281,7 @@ var fileDescriptor_7a4218a80d7ff35f = []byte{ 0x5b, 0x31, 0xed, 0xd9, 0xa3, 0xa3, 0x91, 0x90, 0x70, 0x0a, 0x25, 0x2c, 0xb9, 0xd8, 0xf0, 0x9e, 0x9c, 0x6c, 0xc9, 0x87, 0xb7, 0x3b, 0x69, 0xc9, 0xc5, 0x66, 0x57, 0xd2, 0x5b, 0x1d, 0x8d, 0xba, 0xb4, 0x4f, 0x63, 0xe2, 0xd7, 0x9f, 0x9a, 0xfc, 0x5e, 0x9b, 0x86, 0x69, 0xf4, 0xbd, 0x12, 0x12, - 0x4e, 0xa1, 0xac, 0x7f, 0x2e, 0xc2, 0x7c, 0x83, 0x38, 0xbd, 0xb0, 0xdd, 0x46, 0x6f, 0x42, 0xd5, + 0x4e, 0xa1, 0xac, 0x7f, 0x29, 0xc2, 0x7c, 0x83, 0x38, 0xbd, 0xb0, 0xdd, 0x46, 0x6f, 0x42, 0xd5, 0x1d, 0xc4, 0x84, 0x7b, 0x61, 0xa0, 0x5d, 0x9d, 0xd5, 0x8c, 0x88, 0x24, 0x9a, 0x58, 0x8d, 0x7a, 0x1d, 0xd1, 0xc0, 0x56, 0x45, 0x0c, 0x22, 0xcd, 0x9f, 0xee, 0xa5, 0x3c, 0x39, 0xf3, 0x84, 0x13, 0x34, 0xf4, 0x3c, 0x2c, 0x6f, 0x11, 0xe1, 0x51, 0xef, 0xd3, 0xd8, 0xa1, 0x01, 0x27, 0x1d, 0x2a, @@ -2306,7 +2306,7 @@ var fileDescriptor_7a4218a80d7ff35f = []byte{ 0xf4, 0xc9, 0x87, 0x87, 0xb5, 0xcf, 0x34, 0x3c, 0x7c, 0x07, 0xca, 0xcd, 0x38, 0x0c, 0xd0, 0x73, 0x50, 0x65, 0x4e, 0x97, 0xba, 0x03, 0xdf, 0xcc, 0xde, 0xb2, 0xee, 0x57, 0xb5, 0x75, 0x3b, 0x4e, 0x38, 0xc4, 0xf2, 0xf0, 0xc9, 0x71, 0x38, 0xe0, 0x52, 0xeb, 0x32, 0xcb, 0x63, 0x5b, 0xb6, 0x62, - 0x4d, 0xb5, 0xfe, 0xa6, 0x00, 0x8b, 0x1b, 0x8d, 0x0d, 0xc2, 0x89, 0x0e, 0x3a, 0x9f, 0x86, 0xb9, + 0x4d, 0xb5, 0xfe, 0xb6, 0x00, 0x8b, 0x1b, 0x8d, 0x0d, 0xc2, 0x89, 0x0e, 0x3a, 0x9f, 0x86, 0xb9, 0x23, 0xe2, 0x0f, 0x46, 0x56, 0xc8, 0x1d, 0xd1, 0x88, 0x15, 0x0d, 0xc5, 0x50, 0x93, 0x3f, 0xb6, 0xe2, 0xb0, 0xaf, 0xd5, 0x7a, 0x73, 0xaa, 0xd9, 0xcc, 0x8a, 0x16, 0x60, 0xca, 0x02, 0xde, 0x31, 0xd8, 0x38, 0x15, 0x63, 0x85, 0xb0, 0x3c, 0xcc, 0x8d, 0xde, 0x86, 0x45, 0x66, 0x92, 0x01, 0x98, @@ -2314,14 +2314,14 @@ var fileDescriptor_7a4218a80d7ff35f = []byte{ 0xb2, 0xd1, 0xb0, 0xbd, 0xa0, 0x87, 0x7a, 0x50, 0x15, 0xef, 0x7f, 0x48, 0x18, 0xd5, 0x32, 0xbe, 0x3b, 0xdd, 0xe7, 0x6a, 0x90, 0x74, 0xea, 0x4c, 0x0b, 0x4e, 0x04, 0x20, 0x0f, 0xe6, 0x89, 0x23, 0x4c, 0x1f, 0xab, 0x17, 0xe5, 0x52, 0x9c, 0x4e, 0x51, 0xec, 0x5b, 0xdb, 0xeb, 0x12, 0xa6, 0x71, - 0xd1, 0xd8, 0x13, 0xf5, 0xcc, 0xb0, 0xc1, 0xb7, 0xfe, 0xa3, 0x04, 0xd5, 0x8d, 0x86, 0x9e, 0xf9, + 0xd1, 0xd8, 0x13, 0xf5, 0xcc, 0xb0, 0xc1, 0xb7, 0xfe, 0xb3, 0x04, 0xd5, 0x8d, 0x86, 0x9e, 0xf9, 0x2f, 0xf4, 0x23, 0x9f, 0x86, 0xb9, 0xfb, 0x03, 0x1a, 0x1f, 0xeb, 0xe5, 0x99, 0x2c, 0xb3, 0x5b, 0xa2, 0x11, 0x2b, 0x1a, 0x7a, 0x19, 0x16, 0xc3, 0x76, 0x9b, 0x51, 0xde, 0x14, 0x36, 0x24, 0xd0, 0x96, 0x2e, 0xb1, 0x33, 0x7b, 0x19, 0x1a, 0xce, 0x71, 0xa2, 0x2e, 0x2c, 0x46, 0xa1, 0xef, 0x4b, 0x63, 0x71, 0x44, 0xfc, 0x29, 0xb7, 0xc9, 0x44, 0xd2, 0x7e, 0x06, 0x0b, 0xe7, 0x90, 0x51, 0x00, 0x17, 0x84, 0x75, 0xf1, 0x78, 0x22, 0x6b, 0x6e, 0x2a, 0x59, 0x5f, 0xd1, 0xb2, 0x2e, 0x34, 0x73, 0x68, 0x78, 0x08, 0x1d, 0x5d, 0x07, 0xf0, 0x02, 0x8f, 0x0b, 0x95, 0xef, 0x13, 0x99, 0x23, 0xa8, - 0x36, 0x90, 0xee, 0x0b, 0xad, 0x84, 0x82, 0x33, 0x5c, 0xd6, 0x5f, 0x17, 0x20, 0x99, 0x03, 0x61, + 0x36, 0x90, 0xee, 0x0b, 0xad, 0x84, 0x82, 0x33, 0x5c, 0xd6, 0xdf, 0x14, 0x20, 0x99, 0x03, 0x61, 0x19, 0xdc, 0xd8, 0x3b, 0xa2, 0xb1, 0xd6, 0xf0, 0xc4, 0x32, 0x6c, 0xc8, 0x56, 0xac, 0xa9, 0xe8, 0x3e, 0x80, 0x9b, 0x68, 0x9b, 0x56, 0xf2, 0xf5, 0x99, 0x95, 0x5c, 0x05, 0xac, 0xe9, 0x33, 0xce, 0x08, 0xb1, 0xfe, 0x57, 0x68, 0x1c, 0x75, 0x07, 0x11, 0xfd, 0x52, 0x77, 0x66, 0x99, 0x1b, 0xf4, @@ -2349,7 +2349,7 @@ var fileDescriptor_7a4218a80d7ff35f = []byte{ 0x1e, 0x75, 0x38, 0xa6, 0x6d, 0x1a, 0xd3, 0xc0, 0xa1, 0x69, 0xa4, 0xd5, 0x1a, 0x42, 0xc2, 0x23, 0xd8, 0xc2, 0x6b, 0xed, 0x86, 0x8c, 0x07, 0x44, 0xe7, 0x35, 0x33, 0x5e, 0xeb, 0xab, 0xba, 0x1d, 0x27, 0x1c, 0x68, 0x0d, 0x6a, 0x6c, 0x70, 0xe8, 0x86, 0x7d, 0xe2, 0x05, 0x32, 0x69, 0x59, 0x4b, - 0x9d, 0x63, 0xdb, 0x10, 0x70, 0xca, 0x63, 0xfd, 0x5d, 0x19, 0x4a, 0x37, 0x3d, 0x7e, 0xb6, 0xb8, + 0x9d, 0x63, 0xdb, 0x10, 0x70, 0xca, 0x63, 0xfd, 0x7d, 0x19, 0x4a, 0x37, 0x3d, 0x7e, 0xb6, 0xb8, 0xe6, 0x8c, 0x41, 0x82, 0xae, 0x0c, 0x15, 0xc7, 0x57, 0x86, 0x10, 0x81, 0x0b, 0x03, 0x46, 0x63, 0xf1, 0xbe, 0xea, 0x23, 0x75, 0x7e, 0xfd, 0x8c, 0x5e, 0xa7, 0x4c, 0x96, 0xdc, 0xce, 0x01, 0xe0, 0x21, 0x40, 0x21, 0x22, 0x22, 0x8c, 0x3d, 0x08, 0x63, 0x57, 0x8b, 0xa8, 0x9e, 0x5b, 0xc4, 0x7e, @@ -2384,11 +2384,11 @@ var fileDescriptor_7a4218a80d7ff35f = []byte{ 0x5f, 0x16, 0x60, 0xee, 0x75, 0xd2, 0xee, 0x91, 0x33, 0x4c, 0xf3, 0x03, 0x58, 0xe8, 0x09, 0x56, 0x55, 0x04, 0xd3, 0xf3, 0xf2, 0x83, 0xa9, 0x5e, 0xef, 0xf5, 0x14, 0x27, 0x55, 0x8c, 0x4c, 0x23, 0xce, 0x4a, 0x12, 0xf6, 0x94, 0x87, 0x91, 0xe7, 0xe8, 0x25, 0x93, 0xd8, 0xd3, 0x03, 0xd1, 0x88, - 0x15, 0xcd, 0xfa, 0x97, 0x02, 0x64, 0x11, 0x84, 0xe7, 0x72, 0x18, 0x87, 0x3d, 0x61, 0x4a, 0x0a, + 0x15, 0xcd, 0xfa, 0xd7, 0x02, 0x64, 0x11, 0x84, 0xe7, 0x72, 0x18, 0x87, 0x3d, 0x61, 0x4a, 0x0a, 0xa9, 0xe7, 0xd2, 0x50, 0x4d, 0xd8, 0xd0, 0xd0, 0x9b, 0x50, 0x0a, 0x28, 0xd7, 0x06, 0xf8, 0xbb, 0xd3, 0x7f, 0xcc, 0xee, 0xe6, 0x81, 0x3e, 0x09, 0xb0, 0x79, 0x80, 0x05, 0x24, 0x5a, 0x87, 0x8b, 0x7d, 0xf2, 0x70, 0x87, 0x32, 0x26, 0xb6, 0x98, 0x63, 0x4e, 0x99, 0x8e, 0x2d, 0x92, 0x03, 0x3e, - 0x3b, 0x79, 0x32, 0x1e, 0xe6, 0xb7, 0xfe, 0xa9, 0x00, 0x55, 0x83, 0x8e, 0x6c, 0x28, 0x71, 0xdf, + 0x3b, 0x79, 0x32, 0x1e, 0xe6, 0xb7, 0xfe, 0xb9, 0x00, 0x55, 0x83, 0x8e, 0x6c, 0x28, 0x71, 0xdf, 0x1c, 0xa4, 0x79, 0x79, 0xaa, 0x37, 0x3d, 0xd8, 0xb6, 0xd5, 0x4b, 0x1e, 0x6c, 0xdb, 0x58, 0xa0, 0x09, 0x1b, 0xc2, 0x08, 0xf3, 0x67, 0xb2, 0x21, 0xf6, 0xba, 0xbd, 0xad, 0x14, 0x4c, 0xfc, 0xc2, 0x12, 0xd0, 0xfa, 0xcb, 0x32, 0xd4, 0xe4, 0xab, 0x4b, 0xe5, 0xba, 0x0b, 0x73, 0x72, 0x42, 0xf5, @@ -2401,142 +2401,143 @@ var fileDescriptor_7a4218a80d7ff35f = []byte{ 0xee, 0xf9, 0xab, 0xea, 0x08, 0xdd, 0x6a, 0x2b, 0xe0, 0x7b, 0xb1, 0xcd, 0x63, 0x2f, 0xe8, 0x68, 0xc3, 0xe9, 0xf4, 0x18, 0x96, 0x38, 0xe8, 0x26, 0x5c, 0xa2, 0x01, 0x39, 0xf4, 0x69, 0xcb, 0xa5, 0xfd, 0x28, 0xe4, 0x22, 0xba, 0x91, 0xde, 0x7c, 0xb5, 0xf1, 0x35, 0xfd, 0x52, 0x97, 0x36, 0x87, - 0x19, 0xf0, 0x68, 0x1f, 0xeb, 0x7f, 0x8a, 0x5a, 0x5f, 0x13, 0x3f, 0xe4, 0x73, 0x5e, 0x22, 0x1b, + 0x19, 0xf0, 0x68, 0x1f, 0xeb, 0xaf, 0x4a, 0x5a, 0x5f, 0x13, 0x3f, 0xe4, 0x73, 0x5e, 0x22, 0x1b, 0xb0, 0xc0, 0x38, 0x89, 0xb9, 0x4a, 0x81, 0xea, 0x9d, 0xca, 0x4a, 0x76, 0xe5, 0x94, 0xf4, 0xc8, 0xd8, 0x22, 0xf5, 0x88, 0xb3, 0xdd, 0xd0, 0x9b, 0x50, 0x6d, 0x53, 0xee, 0x74, 0x77, 0x92, 0x9a, 0xcc, 0x79, 0x97, 0x90, 0x2c, 0x24, 0x6e, 0x69, 0x0c, 0x9c, 0xa0, 0x21, 0x17, 0x16, 0xe5, 0xef, 0x37, 0x88, 0xc7, 0x77, 0xc8, 0xc3, 0x29, 0x97, 0x91, 0xcc, 0xd0, 0x6f, 0x65, 0x70, 0x70, 0x0e, - 0xd5, 0x5a, 0x83, 0xd2, 0x76, 0xd8, 0x41, 0xcf, 0x42, 0x95, 0xc7, 0x83, 0xc0, 0x21, 0x9c, 0xea, - 0x32, 0xa4, 0x7c, 0xad, 0x03, 0xdd, 0x86, 0x13, 0xaa, 0xf5, 0x8f, 0x05, 0x28, 0xed, 0x90, 0xe8, - 0xff, 0x5f, 0x4e, 0xcb, 0x87, 0xf2, 0x0e, 0xe5, 0x24, 0x53, 0xf5, 0x2b, 0x7c, 0x52, 0xd5, 0x0f, - 0x5d, 0x81, 0x62, 0x92, 0xc0, 0x04, 0xcd, 0x53, 0x6c, 0x6d, 0xe0, 0xa2, 0xe7, 0x8a, 0xcd, 0x51, - 0x16, 0x1b, 0x4b, 0x32, 0x4f, 0x92, 0x6c, 0x8e, 0x07, 0x9e, 0xd8, 0x1c, 0x05, 0xc5, 0x7a, 0xaf, - 0x04, 0x55, 0x21, 0x4e, 0x7c, 0x30, 0xfa, 0x49, 0x01, 0x16, 0x48, 0x10, 0x84, 0x9c, 0xa8, 0x9a, - 0x44, 0x41, 0xfa, 0xb2, 0xbb, 0x53, 0x8d, 0x95, 0x01, 0x5d, 0x5d, 0x4f, 0x01, 0x37, 0x03, 0x1e, - 0x1f, 0x67, 0x8e, 0xa2, 0xa6, 0x14, 0x9c, 0x95, 0x8b, 0xee, 0x43, 0xc5, 0x27, 0x87, 0xd4, 0x37, - 0xde, 0x74, 0x6b, 0xb6, 0x37, 0xd8, 0x96, 0x58, 0x4a, 0x78, 0xa6, 0x38, 0x26, 0x1a, 0xb1, 0x16, - 0x74, 0xe5, 0x7b, 0xb0, 0x3c, 0xfc, 0xa2, 0x68, 0x39, 0x13, 0x37, 0xaa, 0x50, 0xf1, 0x72, 0x2e, - 0x42, 0xd2, 0x21, 0xd1, 0xb7, 0x8b, 0x2f, 0x17, 0xae, 0xbc, 0x02, 0x0b, 0x19, 0x31, 0xe7, 0xe9, - 0x6a, 0x61, 0xa8, 0x1a, 0x7f, 0x0f, 0x6d, 0x09, 0x97, 0xa1, 0x47, 0x83, 0xf3, 0x85, 0x33, 0x35, - 0xe5, 0x55, 0xf4, 0x68, 0x80, 0x55, 0x77, 0xeb, 0x17, 0x45, 0xa8, 0x9a, 0xbc, 0x21, 0xfa, 0x63, - 0xa8, 0xf6, 0xf5, 0x58, 0x68, 0xdc, 0xe7, 0xcf, 0xa6, 0x9d, 0x2a, 0x1b, 0x24, 0xc6, 0x31, 0x5d, - 0xb5, 0x69, 0x1b, 0x4e, 0x50, 0x91, 0x03, 0x65, 0x16, 0x51, 0x67, 0xa6, 0xd2, 0x81, 0x79, 0x5d, - 0x3b, 0xa2, 0x4e, 0xba, 0x54, 0x65, 0x3a, 0x55, 0x82, 0xa3, 0x1e, 0x54, 0x98, 0xca, 0xd4, 0x29, - 0x03, 0xd6, 0x9c, 0x4d, 0x8c, 0xca, 0xd6, 0xa5, 0x5a, 0xa5, 0x32, 0x75, 0x5a, 0x84, 0xf5, 0x61, - 0x01, 0x92, 0xc4, 0xeb, 0xb6, 0xc7, 0x38, 0x7a, 0x67, 0x64, 0x10, 0xcf, 0x68, 0xe2, 0x44, 0x6f, - 0x39, 0x84, 0x49, 0x36, 0xcc, 0xb4, 0x64, 0x06, 0xf0, 0x10, 0xe6, 0x3c, 0x4e, 0xfb, 0x66, 0xc1, - 0x7f, 0x77, 0xa6, 0x4f, 0xcb, 0xe4, 0xc4, 0x04, 0x26, 0x56, 0xd0, 0xd6, 0xbf, 0x65, 0x3e, 0x49, - 0x0c, 0xab, 0x10, 0x6a, 0x0e, 0x74, 0x4c, 0x2f, 0x54, 0x66, 0x39, 0xc5, 0x94, 0x8d, 0x3f, 0x0f, - 0xd2, 0x81, 0x25, 0x97, 0xfa, 0x54, 0x68, 0xd5, 0x06, 0xf5, 0xc9, 0xf1, 0x94, 0x27, 0x43, 0xe4, - 0x01, 0xb3, 0x8d, 0x2c, 0x10, 0xce, 0xe3, 0xca, 0xf3, 0xf2, 0xf9, 0xb9, 0x45, 0x2f, 0xc2, 0x5c, - 0xd4, 0x35, 0x25, 0xce, 0x5a, 0xe3, 0xaa, 0x79, 0xc1, 0x7d, 0xd1, 0xf8, 0xe8, 0x64, 0x65, 0xc9, - 0xf0, 0xcb, 0x06, 0xac, 0x98, 0x45, 0xa8, 0xd7, 0x57, 0xce, 0xec, 0x70, 0x54, 0xa8, 0x7d, 0x5c, - 0x6c, 0xe8, 0xc8, 0x01, 0x70, 0xc2, 0xc0, 0xf5, 0x94, 0xb5, 0x2c, 0xc9, 0x51, 0x5c, 0x3b, 0xdb, - 0x97, 0x35, 0x4d, 0xbf, 0x54, 0xb3, 0x92, 0x26, 0x86, 0x33, 0xb0, 0x88, 0xc0, 0x82, 0x4f, 0x18, - 0x57, 0xb9, 0x6d, 0x57, 0x6f, 0xaf, 0xbf, 0x77, 0x36, 0x29, 0xc2, 0xd0, 0xa7, 0xf6, 0x76, 0x3b, - 0x85, 0xc1, 0x59, 0x4c, 0xeb, 0xd7, 0x45, 0x28, 0xda, 0x37, 0xce, 0x10, 0x4a, 0x3d, 0x03, 0x95, - 0xc3, 0x81, 0xd3, 0xa3, 0x23, 0x47, 0x0d, 0x1a, 0xb2, 0x15, 0x6b, 0xaa, 0xe0, 0x8b, 0x69, 0x47, - 0xec, 0x79, 0x43, 0x27, 0x56, 0xb0, 0x6c, 0xc5, 0x9a, 0x8a, 0x8e, 0x60, 0xc1, 0x49, 0x2f, 0x38, - 0xe8, 0x6f, 0x9b, 0x4e, 0xaf, 0xf3, 0x77, 0x25, 0xd4, 0x31, 0xcf, 0x4c, 0x03, 0xce, 0x0a, 0x42, - 0xf7, 0xa0, 0x4a, 0xf5, 0xed, 0x00, 0x5d, 0xc3, 0xfd, 0xc1, 0xb4, 0x42, 0xcd, 0x2d, 0x03, 0x7d, - 0x64, 0x5e, 0x3f, 0xe1, 0x04, 0xdf, 0xfa, 0x21, 0x54, 0xec, 0x1b, 0x32, 0x9a, 0xb0, 0xa1, 0xc8, - 0x6e, 0xe8, 0x8f, 0xfc, 0x83, 0xe9, 0x94, 0xed, 0x46, 0xba, 0xc5, 0xdb, 0x37, 0x70, 0x91, 0xdd, - 0xb0, 0x7e, 0x53, 0x80, 0xaa, 0x7d, 0x43, 0x3b, 0xa3, 0x4a, 0xc2, 0xfc, 0x67, 0x2a, 0x01, 0xbd, - 0x0b, 0x10, 0x85, 0xbe, 0xbf, 0x4f, 0x63, 0x2f, 0x74, 0xb5, 0x43, 0x7e, 0x5e, 0xfd, 0x95, 0xa5, - 0xe0, 0xfd, 0x04, 0x05, 0x67, 0x10, 0xd1, 0x4b, 0xb0, 0xe0, 0x84, 0x81, 0x33, 0x88, 0x63, 0x1a, - 0x38, 0xc7, 0x32, 0xff, 0xbd, 0x94, 0x2e, 0xda, 0x66, 0x4a, 0xc2, 0x59, 0x3e, 0xeb, 0x3f, 0x0b, - 0x20, 0x03, 0x37, 0xf4, 0x03, 0xa8, 0xf5, 0xa9, 0xd3, 0x25, 0x81, 0xc7, 0xfa, 0x7a, 0xed, 0x1a, - 0xf7, 0xb8, 0xb6, 0x63, 0x08, 0x42, 0xdd, 0x05, 0x77, 0xd2, 0x80, 0xd3, 0x4e, 0xa8, 0x05, 0xe5, - 0x01, 0xa3, 0xf1, 0xf9, 0xee, 0xbb, 0xc8, 0x4f, 0xba, 0xcd, 0x68, 0xac, 0x33, 0xe1, 0x12, 0x02, - 0xdd, 0x86, 0xaa, 0x49, 0xbf, 0x9f, 0xef, 0x5e, 0xcb, 0xb8, 0x4c, 0x7e, 0x02, 0x65, 0xfd, 0x77, - 0x11, 0x6a, 0xc9, 0x29, 0x0f, 0x34, 0x80, 0x9a, 0xd8, 0xa6, 0xe4, 0x99, 0xa2, 0x99, 0x1c, 0x5a, - 0xfb, 0xd6, 0xb6, 0x6d, 0x80, 0x32, 0x49, 0xd1, 0x4c, 0x2b, 0x4e, 0x25, 0xa1, 0x1f, 0x17, 0x60, - 0x39, 0x0c, 0x30, 0x75, 0xc2, 0xd8, 0xdd, 0x0d, 0xf9, 0x56, 0x38, 0x08, 0xdc, 0x99, 0xb6, 0xfc, - 0xbc, 0xf8, 0xd3, 0x93, 0x95, 0xe5, 0xbd, 0x21, 0x78, 0x3c, 0x22, 0x10, 0x75, 0x61, 0x3e, 0x0c, - 0x36, 0xe3, 0x38, 0x8c, 0xf5, 0x00, 0x7f, 0x06, 0xb2, 0x65, 0x8e, 0x65, 0x4f, 0xa1, 0x62, 0x03, - 0x6f, 0xbd, 0x0e, 0xb9, 0xa1, 0x40, 0x4f, 0x41, 0x89, 0xdd, 0x1f, 0x49, 0x02, 0xdb, 0xb7, 0xb6, - 0xb1, 0x68, 0x4f, 0x4e, 0x9c, 0x15, 0xc7, 0x9d, 0x38, 0xb3, 0x7e, 0x5d, 0x82, 0xb2, 0x7d, 0xb0, - 0xbe, 0x7b, 0xbe, 0xbc, 0x64, 0xf9, 0x53, 0xf2, 0x92, 0x37, 0xe1, 0x92, 0xf8, 0xb9, 0x13, 0x06, - 0x1e, 0x0f, 0x45, 0xe0, 0x2b, 0x3a, 0x55, 0x65, 0xa7, 0x24, 0xac, 0x15, 0x9d, 0x32, 0x0c, 0x78, - 0x1b, 0x8f, 0xf6, 0x41, 0x6b, 0x50, 0xd3, 0xe5, 0xe8, 0x96, 0xab, 0x83, 0xf5, 0x24, 0x03, 0xa7, - 0x0b, 0xd6, 0xad, 0x0d, 0x9c, 0xf2, 0x9c, 0x27, 0x23, 0xba, 0x0d, 0x4b, 0xfa, 0xe7, 0x7e, 0x4c, - 0xdb, 0xde, 0x43, 0x5d, 0x45, 0x7e, 0x46, 0x77, 0x58, 0xb2, 0xb3, 0xc4, 0x47, 0xc3, 0x0d, 0x38, - 0xdf, 0x39, 0xc9, 0xaf, 0xce, 0x7f, 0x0e, 0xf9, 0x55, 0x61, 0x8b, 0xfa, 0xe4, 0x61, 0x2b, 0x68, - 0xfb, 0x5e, 0xa7, 0xab, 0x6a, 0x64, 0x19, 0x5b, 0xb4, 0x93, 0x92, 0x70, 0x96, 0xcf, 0xfa, 0x87, - 0x02, 0xcc, 0xc9, 0x73, 0xcb, 0x68, 0x1d, 0x2e, 0xba, 0x94, 0x79, 0x31, 0x75, 0x75, 0x05, 0x9e, - 0xe9, 0x89, 0x4e, 0x52, 0x1f, 0x1b, 0x79, 0x32, 0x1e, 0xe6, 0x17, 0x53, 0x11, 0x51, 0xda, 0x4b, - 0xdd, 0xa5, 0xcc, 0x54, 0xec, 0x1b, 0x02, 0x4e, 0x79, 0xd0, 0xcb, 0xb0, 0xc8, 0x1c, 0xe2, 0x7b, - 0x41, 0x47, 0xf5, 0x19, 0x3a, 0x3f, 0x60, 0x67, 0x68, 0x38, 0xc7, 0x69, 0xb9, 0x60, 0xca, 0xc6, - 0x9f, 0xe7, 0xad, 0xb7, 0x3f, 0xaf, 0x40, 0x59, 0x6e, 0x80, 0x9f, 0xbe, 0xf4, 0xdf, 0x80, 0x32, - 0xe3, 0x24, 0x98, 0x2d, 0xaf, 0x77, 0xb0, 0xbe, 0xab, 0xf3, 0x7a, 0x07, 0xeb, 0xbb, 0x58, 0x02, - 0xa6, 0x69, 0x9a, 0x59, 0x0e, 0xa4, 0x26, 0x89, 0x41, 0x15, 0x71, 0xe5, 0xd2, 0x34, 0x36, 0x94, - 0xfc, 0xd0, 0x64, 0x97, 0xa7, 0x4b, 0x73, 0x6e, 0x87, 0x1d, 0x95, 0xe6, 0xdc, 0x0e, 0x3b, 0x58, - 0xa0, 0x89, 0xb5, 0x2e, 0x4b, 0x25, 0x73, 0x33, 0xac, 0x75, 0x53, 0xc3, 0x1a, 0x2e, 0x97, 0x68, - 0x67, 0x41, 0xed, 0xe7, 0xdf, 0x99, 0xd2, 0x59, 0x90, 0xc0, 0x95, 0x8c, 0xb3, 0x60, 0x43, 0xd1, - 0x3d, 0xd4, 0xba, 0xf9, 0x9d, 0x29, 0x8f, 0x90, 0xa5, 0xa0, 0x1b, 0x0d, 0x5c, 0x74, 0x0f, 0x91, - 0x03, 0x15, 0x75, 0xb4, 0x58, 0x17, 0xc7, 0xa7, 0xab, 0xae, 0xe9, 0xe3, 0xf7, 0x02, 0x5c, 0x26, - 0x2d, 0xf5, 0xf5, 0x05, 0x0d, 0x9d, 0xaf, 0x61, 0xa8, 0xe2, 0x78, 0x63, 0xb6, 0x1a, 0x86, 0x14, - 0xb5, 0x34, 0xb1, 0x86, 0xf1, 0xb3, 0x79, 0xd0, 0xb9, 0x9c, 0xb3, 0x29, 0x86, 0x13, 0x87, 0xb3, - 0x29, 0x46, 0x33, 0x0e, 0x03, 0xb5, 0x0a, 0xc4, 0x2f, 0x2c, 0x01, 0x13, 0x8d, 0x2b, 0x7d, 0xd6, - 0x1a, 0x47, 0x8c, 0xc6, 0xcd, 0x5c, 0x70, 0xc9, 0x5e, 0x36, 0xcc, 0xe9, 0xdc, 0x0f, 0x73, 0xea, - 0x31, 0x7d, 0xcd, 0x55, 0x0b, 0x18, 0x56, 0x90, 0xdb, 0x52, 0x41, 0xaa, 0x33, 0xe8, 0x9e, 0x71, - 0xcc, 0x73, 0x2a, 0x72, 0x5b, 0xaa, 0x48, 0x65, 0x96, 0x63, 0xb7, 0x8d, 0x2c, 0xac, 0x56, 0x12, - 0x9a, 0x28, 0x49, 0x6d, 0x06, 0xb7, 0x68, 0xf4, 0x46, 0xdf, 0x90, 0x9a, 0xdc, 0xcf, 0xaa, 0x89, - 0x3a, 0xc0, 0xb4, 0x31, 0xa3, 0x9a, 0x64, 0xca, 0xff, 0xe3, 0x14, 0x45, 0xac, 0xa4, 0x98, 0xf2, - 0xf8, 0x58, 0x9b, 0x95, 0xe9, 0xce, 0x4c, 0xe8, 0x1b, 0x35, 0x69, 0x9a, 0x02, 0x0b, 0x48, 0xac, - 0x90, 0xad, 0xbf, 0x2f, 0x42, 0x59, 0x66, 0x6c, 0x3f, 0xff, 0x5c, 0xd9, 0xdd, 0x5c, 0xae, 0x6c, - 0xc6, 0xa4, 0xcb, 0xb8, 0x3c, 0x59, 0x67, 0x28, 0x4f, 0x36, 0xf3, 0x89, 0xb6, 0x49, 0x39, 0xb2, - 0x0f, 0x44, 0xe8, 0xc9, 0x69, 0xf4, 0x05, 0xe4, 0xc7, 0xde, 0xcd, 0xe7, 0xc7, 0x5e, 0x99, 0xfa, - 0x93, 0x26, 0xe4, 0xc6, 0x7e, 0x8c, 0xd4, 0xa7, 0xc8, 0xbc, 0x98, 0xb1, 0xc6, 0x95, 0x89, 0xd6, - 0xd8, 0x86, 0x92, 0x43, 0xb8, 0xbe, 0xd2, 0x3a, 0xdd, 0x66, 0xdf, 0x24, 0xdc, 0xdc, 0x77, 0xe2, - 0x58, 0xa0, 0xa1, 0x9e, 0xbc, 0xe7, 0xa9, 0x6e, 0xef, 0xcc, 0x54, 0x44, 0x4f, 0xee, 0x00, 0x25, - 0x97, 0x3f, 0xd5, 0x23, 0x4e, 0xf1, 0xd1, 0x5d, 0xa8, 0xb8, 0xf2, 0xf8, 0xb5, 0xbe, 0x51, 0x37, - 0xe5, 0x5e, 0x2d, 0x21, 0x94, 0x9d, 0x50, 0xbf, 0xb1, 0x86, 0x15, 0x02, 0xa8, 0x3c, 0xdd, 0xac, - 0x2f, 0x30, 0x4e, 0x27, 0x40, 0x1d, 0x90, 0x56, 0x02, 0xd4, 0x6f, 0xac, 0x61, 0x85, 0x80, 0xb6, - 0x3c, 0xb6, 0xac, 0x2d, 0xf4, 0x74, 0x02, 0xd4, 0xc9, 0x67, 0x25, 0x40, 0xfd, 0xc6, 0x1a, 0x16, - 0x39, 0x30, 0xdf, 0x56, 0x67, 0x8b, 0xf5, 0x3d, 0xc6, 0xe9, 0x0c, 0x8f, 0x3e, 0x9f, 0x6c, 0x2e, - 0x34, 0xcb, 0x07, 0x6c, 0x90, 0xc5, 0x4a, 0xea, 0x78, 0x5c, 0xdf, 0x03, 0x9f, 0x6e, 0x25, 0xdd, - 0xf4, 0xf4, 0x4a, 0xba, 0xe9, 0x71, 0x2c, 0xd0, 0xd0, 0xdb, 0x30, 0xd7, 0x91, 0x87, 0xd9, 0x16, - 0x66, 0xa8, 0x49, 0xca, 0xf3, 0x6b, 0x6a, 0xd3, 0x55, 0xe7, 0xdf, 0x14, 0xa6, 0xf4, 0x44, 0x42, - 0x97, 0x6a, 0x63, 0x3c, 0xa5, 0x27, 0x12, 0xba, 0x7a, 0xbb, 0x15, 0xbf, 0xb0, 0x04, 0x14, 0x43, - 0xd1, 0x27, 0x91, 0xde, 0xbd, 0xa6, 0x1b, 0x8a, 0x1d, 0x12, 0xa9, 0xa1, 0xd8, 0x21, 0x11, 0x16, - 0x68, 0xe8, 0x39, 0xa8, 0xc6, 0x26, 0x10, 0xfb, 0xaa, 0x8c, 0xe6, 0x12, 0x33, 0x93, 0x44, 0x60, - 0x09, 0x87, 0x88, 0x12, 0xe4, 0xad, 0x53, 0x7d, 0x2f, 0x76, 0xba, 0x81, 0x93, 0x81, 0x60, 0x26, - 0x1d, 0x2e, 0x1e, 0xb1, 0xc2, 0x45, 0x6d, 0x98, 0x37, 0x31, 0x96, 0x4a, 0x17, 0x4f, 0xe9, 0x78, - 0xeb, 0xbb, 0xec, 0x49, 0xc8, 0xad, 0x83, 0x2e, 0x03, 0x2e, 0xec, 0x25, 0xf3, 0x82, 0x1e, 0xab, - 0x97, 0x67, 0xb1, 0x97, 0xd2, 0x7f, 0x4d, 0xbe, 0x43, 0xe0, 0x61, 0x05, 0x8b, 0xee, 0xc2, 0x52, - 0x4c, 0x65, 0x7d, 0x59, 0x1f, 0xf1, 0x56, 0x29, 0x83, 0x57, 0x4c, 0x48, 0x8f, 0xb3, 0xc4, 0x47, - 0x27, 0x2b, 0xd7, 0xc6, 0x9c, 0xf2, 0xce, 0xf1, 0xe0, 0x3c, 0x1e, 0xba, 0x0e, 0xc0, 0x69, 0xdc, - 0xf7, 0x02, 0xc2, 0x43, 0x75, 0x50, 0x3a, 0x73, 0xf7, 0xe5, 0x20, 0xa1, 0xe0, 0x0c, 0x17, 0xda, - 0x84, 0x79, 0xe5, 0xa4, 0xb0, 0xfa, 0xd2, 0xe4, 0x03, 0xa3, 0xca, 0x9f, 0x49, 0xc7, 0x4e, 0x3d, - 0x33, 0x6c, 0xfa, 0xa2, 0xd7, 0x00, 0xe9, 0xe3, 0x6d, 0xeb, 0x8e, 0x13, 0x0e, 0x02, 0x2e, 0x4f, - 0xc3, 0x5d, 0xc8, 0xdd, 0xd7, 0x44, 0xf6, 0x08, 0x07, 0x1e, 0xd3, 0x0b, 0x75, 0x32, 0xbb, 0xe2, - 0xf2, 0x0c, 0x1b, 0xbe, 0xa9, 0x65, 0xaa, 0x2c, 0xb3, 0x79, 0xca, 0x6c, 0x90, 0x3f, 0x2b, 0xc0, - 0x62, 0x10, 0xba, 0xd4, 0xe4, 0x13, 0xeb, 0x97, 0xe4, 0x08, 0xec, 0xcd, 0xe4, 0x5e, 0xac, 0xee, - 0x66, 0x10, 0x55, 0xfd, 0x34, 0xc9, 0x2a, 0x64, 0x49, 0x38, 0x27, 0x1a, 0x6d, 0x41, 0x95, 0xb4, - 0xdb, 0x5e, 0xe0, 0xf1, 0x63, 0xfd, 0x3f, 0x08, 0x4f, 0x8e, 0xbd, 0x9a, 0xaf, 0x79, 0xd4, 0x37, - 0x99, 0x27, 0x9c, 0xf4, 0x45, 0xb7, 0x61, 0x81, 0x87, 0x3e, 0x8d, 0x75, 0x35, 0xfa, 0x71, 0xf9, - 0x45, 0x57, 0xc7, 0x41, 0x1d, 0x24, 0x6c, 0x69, 0xb2, 0x26, 0x6d, 0x63, 0x38, 0x8b, 0x93, 0x3d, - 0x80, 0xff, 0xe4, 0x17, 0x7e, 0x00, 0xff, 0xf2, 0xe7, 0x77, 0x00, 0xff, 0xca, 0xf7, 0xe1, 0xd2, - 0xc8, 0x84, 0x9d, 0xab, 0x12, 0xfd, 0xaf, 0x45, 0xc8, 0xdc, 0x5a, 0x40, 0xcf, 0xe7, 0xeb, 0x67, - 0x57, 0x86, 0xeb, 0x67, 0x35, 0xc1, 0x9b, 0xab, 0x9d, 0xc9, 0xba, 0x0f, 0x61, 0x61, 0xa0, 0x7d, - 0xa7, 0x4c, 0xdd, 0x47, 0xb4, 0x62, 0x4d, 0x3d, 0x4f, 0x8d, 0x2d, 0x6b, 0xc0, 0x4b, 0x9f, 0x6a, - 0xc0, 0x9f, 0x83, 0x2a, 0x33, 0x1a, 0x30, 0x37, 0x74, 0x73, 0xd6, 0x2c, 0xd6, 0x84, 0x03, 0xb9, - 0xb0, 0xe8, 0x13, 0xc6, 0xa5, 0x85, 0x76, 0xd7, 0xf9, 0x14, 0xb5, 0xb5, 0x44, 0x1d, 0xb6, 0x33, - 0x38, 0x38, 0x87, 0x6a, 0xdd, 0x01, 0x73, 0x46, 0xfb, 0x6c, 0xb9, 0x5f, 0x36, 0x38, 0x94, 0xff, - 0x03, 0x55, 0x1c, 0x49, 0xab, 0xca, 0x03, 0xf4, 0x86, 0x6e, 0xfd, 0x69, 0x11, 0x4a, 0x07, 0xdb, - 0x36, 0x7a, 0x1b, 0x16, 0x1d, 0xd2, 0xa4, 0x31, 0xd7, 0x07, 0xfb, 0xcf, 0x7f, 0x33, 0xb6, 0xb9, - 0x9e, 0x76, 0xc7, 0x39, 0x30, 0x74, 0x1b, 0xc0, 0x49, 0xa1, 0xcf, 0x5f, 0x20, 0xc9, 0x00, 0x67, - 0x80, 0x10, 0x86, 0x5a, 0x2f, 0xb9, 0x89, 0x70, 0xae, 0x3a, 0x89, 0x74, 0x69, 0xd3, 0xfb, 0x07, - 0x29, 0x8c, 0xf5, 0xb7, 0x05, 0x80, 0x34, 0xc7, 0x83, 0xfe, 0xa2, 0x00, 0x97, 0xc9, 0x98, 0xff, - 0xda, 0xd2, 0xe3, 0xd3, 0x9a, 0xe9, 0x04, 0x50, 0x2e, 0x4c, 0x7e, 0x52, 0x4f, 0xd1, 0xd8, 0xbf, - 0xf6, 0xc2, 0x63, 0x5f, 0xc2, 0xfa, 0xaf, 0x22, 0x2c, 0xe6, 0xfe, 0x01, 0x6c, 0xe2, 0xeb, 0xd6, - 0x7e, 0x0b, 0x5e, 0xf7, 0xb7, 0xb4, 0x06, 0xa8, 0x8c, 0x03, 0x71, 0xf7, 0x02, 0xff, 0x58, 0xfb, - 0x08, 0x19, 0xe3, 0xa0, 0xda, 0x71, 0xc2, 0xd1, 0x58, 0xfd, 0xe0, 0xe3, 0xab, 0x8f, 0x7d, 0xf8, - 0xf1, 0xd5, 0xc7, 0x7e, 0xf5, 0xf1, 0xd5, 0xc7, 0xde, 0x3b, 0xbd, 0x5a, 0xf8, 0xe0, 0xf4, 0x6a, - 0xe1, 0xc3, 0xd3, 0xab, 0x85, 0x5f, 0x9d, 0x5e, 0x2d, 0x7c, 0x74, 0x7a, 0xb5, 0xf0, 0x67, 0xff, - 0x7e, 0xf5, 0xb1, 0x3f, 0xaa, 0x9a, 0xd1, 0xfb, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x40, 0xf4, - 0xb3, 0xa7, 0xf1, 0x50, 0x00, 0x00, + 0x55, 0x6c, 0xc0, 0x1d, 0xe1, 0x50, 0xb7, 0x5c, 0xbd, 0x94, 0x92, 0x0d, 0x58, 0xfa, 0xd9, 0xad, + 0x0d, 0x6c, 0xe8, 0xd6, 0x1a, 0x94, 0xb6, 0xc3, 0x0e, 0x7a, 0x16, 0xaa, 0x3c, 0x1e, 0x04, 0x0e, + 0xe1, 0x54, 0x57, 0x2c, 0xe5, 0x17, 0x1c, 0xe8, 0x36, 0x9c, 0x50, 0xad, 0x7f, 0x2a, 0x40, 0x69, + 0x87, 0x44, 0xff, 0xff, 0xd2, 0x5f, 0x3e, 0x94, 0x77, 0x28, 0x27, 0x99, 0x02, 0x61, 0xe1, 0x93, + 0x0a, 0x84, 0xe8, 0x0a, 0x14, 0x93, 0x5c, 0x27, 0x68, 0x9e, 0x62, 0x6b, 0x03, 0x17, 0x3d, 0x57, + 0xec, 0xa3, 0xb2, 0x2e, 0x59, 0x92, 0x29, 0x95, 0x64, 0x1f, 0x3d, 0xf0, 0xc4, 0x3e, 0x2a, 0x28, + 0xd6, 0x7b, 0x25, 0xa8, 0x0a, 0x71, 0xe2, 0x83, 0xd1, 0x4f, 0x0a, 0xb0, 0x40, 0x82, 0x20, 0xe4, + 0x44, 0x95, 0x2f, 0x0a, 0xd2, 0xed, 0xdd, 0x9d, 0x6a, 0xac, 0x0c, 0xe8, 0xea, 0x7a, 0x0a, 0xb8, + 0x19, 0xf0, 0xf8, 0x38, 0x73, 0x6a, 0x35, 0xa5, 0xe0, 0xac, 0x5c, 0x74, 0x1f, 0x2a, 0x3e, 0x39, + 0xa4, 0xbe, 0x71, 0xbc, 0x5b, 0xb3, 0xbd, 0xc1, 0xb6, 0xc4, 0x52, 0xc2, 0x33, 0x75, 0x34, 0xd1, + 0x88, 0xb5, 0xa0, 0x2b, 0xdf, 0x83, 0xe5, 0xe1, 0x17, 0x45, 0xcb, 0x99, 0x10, 0x53, 0x45, 0x95, + 0x97, 0x73, 0xc1, 0x94, 0x8e, 0x9e, 0xbe, 0x5d, 0x7c, 0xb9, 0x70, 0xe5, 0x15, 0x58, 0xc8, 0x88, + 0x39, 0x4f, 0x57, 0x0b, 0x43, 0xd5, 0xb8, 0x86, 0x68, 0x4b, 0x78, 0x17, 0x3d, 0x1a, 0x9c, 0x2f, + 0xf2, 0xa9, 0x29, 0x07, 0xa4, 0x47, 0x03, 0xac, 0xba, 0x5b, 0xbf, 0x28, 0x42, 0xd5, 0xa4, 0x18, + 0xd1, 0x1f, 0x43, 0xb5, 0xaf, 0xc7, 0x42, 0xe3, 0x3e, 0x7f, 0x36, 0x45, 0x56, 0x89, 0x23, 0x31, + 0x8e, 0xe9, 0xaa, 0x4d, 0xdb, 0x70, 0x82, 0x8a, 0x1c, 0x28, 0xb3, 0x88, 0x3a, 0x33, 0x55, 0x19, + 0xcc, 0xeb, 0xda, 0x11, 0x75, 0xd2, 0xa5, 0x2a, 0x33, 0xaf, 0x12, 0x1c, 0xf5, 0xa0, 0xc2, 0x54, + 0x52, 0x4f, 0xd9, 0xba, 0xe6, 0x6c, 0x62, 0x54, 0x62, 0x2f, 0xd5, 0x2a, 0x95, 0xd4, 0xd3, 0x22, + 0xac, 0x0f, 0x0b, 0x90, 0xe4, 0x68, 0xb7, 0x3d, 0xc6, 0xd1, 0x3b, 0x23, 0x83, 0x78, 0x46, 0x6b, + 0x28, 0x7a, 0xcb, 0x21, 0x4c, 0x12, 0x67, 0xa6, 0x25, 0x33, 0x80, 0x87, 0x30, 0xe7, 0x71, 0xda, + 0x37, 0x0b, 0xfe, 0xbb, 0x33, 0x7d, 0x5a, 0x26, 0x7d, 0x26, 0x30, 0xb1, 0x82, 0xb6, 0xfe, 0x3d, + 0xf3, 0x49, 0x62, 0x58, 0x85, 0x50, 0x73, 0xf6, 0x63, 0x7a, 0xa1, 0x32, 0x21, 0x2a, 0xa6, 0x6c, + 0xfc, 0xd1, 0x91, 0x0e, 0x2c, 0xb9, 0xd4, 0xa7, 0x42, 0xab, 0x36, 0xa8, 0x4f, 0x8e, 0xa7, 0x3c, + 0x44, 0x22, 0xcf, 0xa2, 0x6d, 0x64, 0x81, 0x70, 0x1e, 0x57, 0x1e, 0xad, 0xcf, 0xcf, 0x2d, 0x7a, + 0x11, 0xe6, 0xa2, 0xae, 0xa9, 0x86, 0xd6, 0x1a, 0x57, 0xcd, 0x0b, 0xee, 0x8b, 0xc6, 0x47, 0x27, + 0x2b, 0x4b, 0x86, 0x5f, 0x36, 0x60, 0xc5, 0x2c, 0x36, 0xa5, 0xbe, 0xf2, 0x7b, 0x87, 0x03, 0x48, + 0xed, 0x0e, 0x63, 0x43, 0x47, 0x0e, 0x80, 0x13, 0x06, 0xae, 0xa7, 0xac, 0x65, 0x49, 0x8e, 0xe2, + 0xda, 0xd9, 0xbe, 0xac, 0x69, 0xfa, 0xa5, 0x9a, 0x95, 0x34, 0x31, 0x9c, 0x81, 0x45, 0x04, 0x16, + 0x7c, 0xc2, 0xb8, 0x4a, 0x83, 0xbb, 0x7a, 0x27, 0xfe, 0xbd, 0xb3, 0x49, 0x11, 0x86, 0x3e, 0xb5, + 0xb7, 0xdb, 0x29, 0x0c, 0xce, 0x62, 0x5a, 0xbf, 0x2e, 0x42, 0xd1, 0xbe, 0x71, 0x86, 0xa8, 0xeb, + 0x19, 0xa8, 0x1c, 0x0e, 0x9c, 0x1e, 0x1d, 0x39, 0x95, 0xd0, 0x90, 0xad, 0x58, 0x53, 0x05, 0x5f, + 0x4c, 0x3b, 0x62, 0xcf, 0x1b, 0x3a, 0xdc, 0x82, 0x65, 0x2b, 0xd6, 0x54, 0x74, 0x04, 0x0b, 0x4e, + 0x7a, 0x17, 0x42, 0x7f, 0xdb, 0x74, 0x7a, 0x9d, 0xbf, 0x56, 0xa1, 0x4e, 0x84, 0x66, 0x1a, 0x70, + 0x56, 0x10, 0xba, 0x07, 0x55, 0xaa, 0x2f, 0x12, 0xe8, 0x72, 0xef, 0x0f, 0xa6, 0x15, 0x6a, 0x2e, + 0x24, 0xe8, 0xd3, 0xf5, 0xfa, 0x09, 0x27, 0xf8, 0xd6, 0x0f, 0xa1, 0x62, 0xdf, 0x90, 0x81, 0x87, + 0x0d, 0x45, 0x76, 0x43, 0x7f, 0xe4, 0x1f, 0x4c, 0xa7, 0x6c, 0x37, 0xd2, 0x2d, 0xde, 0xbe, 0x81, + 0x8b, 0xec, 0x86, 0xf5, 0x9b, 0x02, 0x54, 0xed, 0x1b, 0xda, 0x6f, 0x55, 0x12, 0xe6, 0x3f, 0x53, + 0x09, 0xe8, 0x5d, 0x80, 0x28, 0xf4, 0xfd, 0x7d, 0x1a, 0x7b, 0xa1, 0xab, 0x7d, 0xf7, 0xf3, 0xea, + 0xaf, 0xac, 0x1a, 0xef, 0x27, 0x28, 0x38, 0x83, 0x88, 0x5e, 0x82, 0x05, 0x27, 0x0c, 0x9c, 0x41, + 0x1c, 0xd3, 0xc0, 0x39, 0x96, 0xa9, 0xf2, 0xa5, 0x74, 0xd1, 0x36, 0x53, 0x12, 0xce, 0xf2, 0x59, + 0xff, 0x55, 0x00, 0x19, 0xe3, 0xa1, 0x1f, 0x40, 0xad, 0x4f, 0x9d, 0x2e, 0x09, 0x3c, 0xd6, 0xd7, + 0x6b, 0xd7, 0x78, 0xd2, 0xb5, 0x1d, 0x43, 0x10, 0xea, 0x2e, 0xb8, 0x93, 0x06, 0x9c, 0x76, 0x42, + 0x2d, 0x28, 0x0f, 0x18, 0x8d, 0xcf, 0x77, 0x35, 0x46, 0x7e, 0xd2, 0x6d, 0x46, 0x63, 0x9d, 0x34, + 0x97, 0x10, 0xe8, 0x36, 0x54, 0x4d, 0xa6, 0xfe, 0x7c, 0x57, 0x60, 0xc6, 0x25, 0xfd, 0x13, 0x28, + 0xeb, 0x7f, 0x8a, 0x50, 0x4b, 0x0e, 0x84, 0xa0, 0x01, 0xd4, 0xc4, 0x36, 0x25, 0x8f, 0x1f, 0xcd, + 0xe4, 0xd0, 0xda, 0xb7, 0xb6, 0x6d, 0x03, 0x94, 0xc9, 0x9f, 0x66, 0x5a, 0x71, 0x2a, 0x09, 0xfd, + 0xb8, 0x00, 0xcb, 0x61, 0x80, 0xa9, 0x13, 0xc6, 0xee, 0x6e, 0xc8, 0xb7, 0xc2, 0x41, 0xe0, 0xce, + 0xb4, 0xe5, 0xe7, 0xc5, 0x9f, 0x9e, 0xac, 0x2c, 0xef, 0x0d, 0xc1, 0xe3, 0x11, 0x81, 0xa8, 0x0b, + 0xf3, 0x61, 0xb0, 0x19, 0xc7, 0x61, 0xac, 0x07, 0xf8, 0x33, 0x90, 0x2d, 0xd3, 0x31, 0x7b, 0x0a, + 0x15, 0x1b, 0x78, 0xeb, 0x75, 0xc8, 0x0d, 0x05, 0x7a, 0x0a, 0x4a, 0xec, 0xfe, 0x48, 0xbe, 0xd8, + 0xbe, 0xb5, 0x8d, 0x45, 0x7b, 0x72, 0x38, 0xad, 0x38, 0xee, 0x70, 0x9a, 0xf5, 0xeb, 0x12, 0x94, + 0xed, 0x83, 0xf5, 0xdd, 0xf3, 0xa5, 0x30, 0xcb, 0x9f, 0x92, 0xc2, 0xbc, 0x09, 0x97, 0xc4, 0xcf, + 0x9d, 0x30, 0xf0, 0x78, 0x28, 0x62, 0x64, 0xd1, 0xa9, 0x2a, 0x3b, 0x25, 0x11, 0xb0, 0xe8, 0x94, + 0x61, 0xc0, 0xdb, 0x78, 0xb4, 0x0f, 0x5a, 0x83, 0x9a, 0xae, 0x5c, 0x27, 0xc1, 0x58, 0x92, 0xac, + 0xd3, 0xb5, 0xed, 0xd6, 0x06, 0x4e, 0x79, 0xce, 0x93, 0x3c, 0xdd, 0x86, 0x25, 0xfd, 0x73, 0x3f, + 0xa6, 0x6d, 0xef, 0xa1, 0x2e, 0x38, 0x3f, 0xa3, 0x3b, 0x2c, 0xd9, 0x59, 0xe2, 0xa3, 0xe1, 0x06, + 0x9c, 0xef, 0x9c, 0xa4, 0x62, 0xe7, 0x3f, 0x87, 0x54, 0xac, 0xb0, 0x45, 0x7d, 0xf2, 0xb0, 0x15, + 0xb4, 0x7d, 0xaf, 0xd3, 0x55, 0xe5, 0xb4, 0x8c, 0x2d, 0xda, 0x49, 0x49, 0x38, 0xcb, 0x67, 0xfd, + 0x63, 0x01, 0xe6, 0xe4, 0x11, 0x67, 0xb4, 0x0e, 0x17, 0x5d, 0xca, 0xbc, 0x98, 0xba, 0xba, 0x58, + 0xcf, 0xf4, 0x44, 0x27, 0x59, 0x92, 0x8d, 0x3c, 0x19, 0x0f, 0xf3, 0x8b, 0xa9, 0x88, 0x28, 0xed, + 0xa5, 0xee, 0x52, 0x66, 0x2a, 0xf6, 0x0d, 0x01, 0xa7, 0x3c, 0xe8, 0x65, 0x58, 0x64, 0x0e, 0xf1, + 0xbd, 0xa0, 0xa3, 0xfa, 0x0c, 0x1d, 0x35, 0xb0, 0x33, 0x34, 0x9c, 0xe3, 0xb4, 0x5c, 0x30, 0x15, + 0xe6, 0xcf, 0xf3, 0x82, 0xdc, 0x9f, 0x57, 0xa0, 0x2c, 0x37, 0xc0, 0x4f, 0x5f, 0xfa, 0x6f, 0x40, + 0x99, 0x71, 0x12, 0xcc, 0x96, 0x02, 0x3c, 0x58, 0xdf, 0xd5, 0x29, 0xc0, 0x83, 0xf5, 0x5d, 0x2c, + 0x01, 0xd3, 0x8c, 0xce, 0x2c, 0x67, 0x57, 0x93, 0x1c, 0xa2, 0x8a, 0xb8, 0x72, 0x19, 0x1d, 0x1b, + 0x4a, 0x7e, 0x68, 0x12, 0xd1, 0xd3, 0x65, 0x44, 0xb7, 0xc3, 0x8e, 0xca, 0x88, 0x6e, 0x87, 0x1d, + 0x2c, 0xd0, 0xc4, 0x5a, 0x97, 0x55, 0x95, 0xb9, 0x19, 0xd6, 0xba, 0x29, 0x77, 0x0d, 0x57, 0x56, + 0xb4, 0xb3, 0xa0, 0xf6, 0xf3, 0xef, 0x4c, 0xe9, 0x2c, 0x48, 0xe0, 0x4a, 0xc6, 0x59, 0xb0, 0xa1, + 0xe8, 0x1e, 0x6a, 0xdd, 0xfc, 0xce, 0x94, 0xa7, 0xcd, 0x52, 0xd0, 0x8d, 0x06, 0x2e, 0xba, 0x87, + 0xc8, 0x81, 0x8a, 0x3a, 0x85, 0xac, 0xeb, 0xe8, 0xd3, 0x15, 0xe2, 0xf4, 0x49, 0x7d, 0x01, 0x2e, + 0xf3, 0x9b, 0xfa, 0xa6, 0x83, 0x86, 0xce, 0x97, 0x3b, 0x54, 0x1d, 0xbd, 0x31, 0x5b, 0xb9, 0x43, + 0x8a, 0x5a, 0x9a, 0x58, 0xee, 0xf8, 0xd9, 0x3c, 0xe8, 0x5c, 0xce, 0xd9, 0x14, 0xc3, 0x89, 0xc3, + 0xd9, 0x14, 0xa3, 0x19, 0x87, 0x81, 0x5a, 0x05, 0xe2, 0x17, 0x96, 0x80, 0x89, 0xc6, 0x95, 0x3e, + 0x6b, 0x8d, 0x23, 0x46, 0xe3, 0x66, 0xae, 0xcd, 0x64, 0xef, 0x25, 0xe6, 0x74, 0xee, 0x87, 0x39, + 0xf5, 0x98, 0xbe, 0x3c, 0xab, 0x05, 0x0c, 0x2b, 0xc8, 0x6d, 0xa9, 0x20, 0xd5, 0x19, 0x74, 0xcf, + 0x38, 0xe6, 0x39, 0x15, 0xb9, 0x2d, 0x55, 0xa4, 0x32, 0xcb, 0x09, 0xdd, 0x46, 0x16, 0x56, 0x2b, + 0x09, 0x4d, 0x94, 0xa4, 0x36, 0x83, 0x5b, 0x34, 0x7a, 0xf9, 0x6f, 0x48, 0x4d, 0xee, 0x67, 0xd5, + 0x44, 0x9d, 0x75, 0xda, 0x98, 0x51, 0x4d, 0x32, 0x27, 0x05, 0xc6, 0x29, 0x8a, 0x58, 0x49, 0x31, + 0xe5, 0xf1, 0xb1, 0x36, 0x2b, 0xd3, 0x1d, 0xaf, 0xd0, 0x97, 0x6f, 0xd2, 0x34, 0x05, 0x16, 0x90, + 0x58, 0x21, 0x5b, 0xff, 0x50, 0x84, 0xb2, 0xcc, 0xd8, 0x7e, 0xfe, 0xb9, 0xb2, 0xbb, 0xb9, 0x5c, + 0xd9, 0x8c, 0x49, 0x97, 0x71, 0x79, 0xb2, 0xce, 0x50, 0x9e, 0x6c, 0xe6, 0xc3, 0x6f, 0x93, 0x72, + 0x64, 0x1f, 0x88, 0xd0, 0x93, 0xd3, 0xe8, 0x0b, 0xc8, 0x8f, 0xbd, 0x9b, 0xcf, 0x8f, 0xbd, 0x32, + 0xf5, 0x27, 0x4d, 0xc8, 0x8d, 0xfd, 0x18, 0xa9, 0x4f, 0x91, 0x79, 0x31, 0x63, 0x8d, 0x2b, 0x13, + 0xad, 0xb1, 0x0d, 0x25, 0x87, 0x70, 0x7d, 0xfb, 0x75, 0xba, 0xcd, 0xbe, 0x49, 0xb8, 0xb9, 0x1a, + 0xc5, 0xb1, 0x40, 0x43, 0x3d, 0x79, 0x25, 0x54, 0x5d, 0xf4, 0x99, 0xa9, 0xde, 0x9e, 0x5c, 0x17, + 0x4a, 0xee, 0x89, 0xaa, 0x47, 0x9c, 0xe2, 0xa3, 0xbb, 0x50, 0x71, 0xe5, 0x49, 0x6d, 0x7d, 0xf9, + 0x6e, 0xca, 0xbd, 0x5a, 0x42, 0x28, 0x3b, 0xa1, 0x7e, 0x63, 0x0d, 0x2b, 0x04, 0x50, 0x79, 0x10, + 0x5a, 0xdf, 0x75, 0x9c, 0x4e, 0x80, 0x3a, 0x4b, 0xad, 0x04, 0xa8, 0xdf, 0x58, 0xc3, 0x0a, 0x01, + 0x6d, 0x79, 0xc2, 0x59, 0x5b, 0xe8, 0xe9, 0x04, 0xa8, 0x43, 0xd2, 0x4a, 0x80, 0xfa, 0x8d, 0x35, + 0x2c, 0x72, 0x60, 0xbe, 0xad, 0x8e, 0x21, 0xeb, 0x2b, 0x8f, 0xd3, 0x19, 0x1e, 0x7d, 0x94, 0xd9, + 0xdc, 0x7d, 0x96, 0x0f, 0xd8, 0x20, 0x8b, 0x95, 0xd4, 0xf1, 0xb8, 0xbe, 0x32, 0x3e, 0xdd, 0x4a, + 0xba, 0xe9, 0xe9, 0x95, 0x74, 0xd3, 0xe3, 0x58, 0xa0, 0xa1, 0xb7, 0x61, 0x4e, 0xd6, 0xcd, 0xf4, + 0x85, 0xf6, 0xe9, 0xca, 0x97, 0xb2, 0x04, 0xa7, 0x36, 0x5d, 0x75, 0x54, 0x4e, 0x61, 0x4a, 0x4f, + 0x24, 0x74, 0xa9, 0x36, 0xc6, 0x53, 0x7a, 0x22, 0xa1, 0xab, 0xb7, 0x5b, 0xf1, 0x0b, 0x4b, 0x40, + 0x31, 0x14, 0x7d, 0x12, 0xe9, 0xdd, 0x6b, 0xba, 0xa1, 0xd8, 0x21, 0x91, 0x1a, 0x8a, 0x1d, 0x12, + 0x61, 0x81, 0x86, 0x9e, 0x83, 0x6a, 0x6c, 0x02, 0xb1, 0xaf, 0xca, 0x68, 0x2e, 0x31, 0x33, 0x49, + 0x04, 0x96, 0x70, 0x88, 0x28, 0x41, 0x5e, 0x50, 0xd5, 0x57, 0x68, 0xa7, 0x1b, 0x38, 0x19, 0x08, + 0x66, 0xd2, 0xe1, 0xe2, 0x11, 0x2b, 0x5c, 0xd4, 0x86, 0x79, 0x13, 0x63, 0xa9, 0x74, 0xf1, 0x94, + 0x8e, 0xb7, 0xbe, 0xf6, 0x9e, 0x84, 0xdc, 0x3a, 0xe8, 0x32, 0xe0, 0xc2, 0x5e, 0x32, 0x2f, 0xe8, + 0xb1, 0x7a, 0x79, 0x16, 0x7b, 0x29, 0xfd, 0xd7, 0xe4, 0x3b, 0x04, 0x1e, 0x56, 0xb0, 0xe8, 0x2e, + 0x2c, 0xc5, 0x54, 0x96, 0xa2, 0xf5, 0x69, 0x70, 0x95, 0x32, 0x78, 0xc5, 0x84, 0xf4, 0x38, 0x4b, + 0x7c, 0x74, 0xb2, 0x72, 0x6d, 0xcc, 0x81, 0xf0, 0x1c, 0x0f, 0xce, 0xe3, 0xa1, 0xeb, 0x00, 0x9c, + 0xc6, 0x7d, 0x2f, 0x20, 0x3c, 0x54, 0x67, 0xaa, 0x33, 0xd7, 0x64, 0x0e, 0x12, 0x0a, 0xce, 0x70, + 0xa1, 0x4d, 0x98, 0x57, 0x4e, 0x0a, 0xab, 0x2f, 0x4d, 0x3e, 0x5b, 0xaa, 0xfc, 0x99, 0x74, 0xec, + 0xd4, 0x33, 0xc3, 0xa6, 0x2f, 0x7a, 0x0d, 0x90, 0x3e, 0x09, 0xb7, 0xee, 0x38, 0xe1, 0x20, 0xe0, + 0xf2, 0xe0, 0xdc, 0x85, 0xdc, 0xd5, 0x4e, 0x64, 0x8f, 0x70, 0xe0, 0x31, 0xbd, 0x50, 0x27, 0xb3, + 0x2b, 0x2e, 0xcf, 0xb0, 0xe1, 0x9b, 0x5a, 0xa6, 0xca, 0x32, 0x9b, 0xa7, 0xcc, 0x06, 0xf9, 0xb3, + 0x02, 0x2c, 0x06, 0xa1, 0x4b, 0x4d, 0x3e, 0xb1, 0x7e, 0x49, 0x8e, 0xc0, 0xde, 0x4c, 0xee, 0xc5, + 0xea, 0x6e, 0x06, 0x51, 0xd5, 0x4f, 0x93, 0xac, 0x42, 0x96, 0x84, 0x73, 0xa2, 0xd1, 0x16, 0x54, + 0x49, 0xbb, 0xed, 0x05, 0x1e, 0x3f, 0xd6, 0x7f, 0x99, 0xf0, 0xe4, 0xd8, 0x5b, 0xfc, 0x9a, 0x47, + 0x7d, 0x93, 0x79, 0xc2, 0x49, 0x5f, 0x74, 0x1b, 0x16, 0x78, 0xe8, 0xd3, 0x58, 0x57, 0xa3, 0x1f, + 0x97, 0x5f, 0x74, 0x75, 0x1c, 0xd4, 0x41, 0xc2, 0x96, 0x26, 0x6b, 0xd2, 0x36, 0x86, 0xb3, 0x38, + 0xd9, 0xb3, 0xfa, 0x4f, 0x7e, 0xe1, 0x67, 0xf5, 0x2f, 0x7f, 0x7e, 0x67, 0xf5, 0xaf, 0x7c, 0x1f, + 0x2e, 0x8d, 0x4c, 0xd8, 0xb9, 0x2a, 0xd1, 0xff, 0x56, 0x84, 0xcc, 0x05, 0x07, 0xf4, 0x7c, 0xbe, + 0x7e, 0x76, 0x65, 0xb8, 0x7e, 0x56, 0x13, 0xbc, 0xb9, 0xda, 0x99, 0xac, 0xfb, 0x10, 0x16, 0x06, + 0xda, 0x77, 0xca, 0xd4, 0x7d, 0x44, 0x2b, 0xd6, 0xd4, 0xf3, 0xd4, 0xd8, 0xb2, 0x06, 0xbc, 0xf4, + 0xa9, 0x06, 0xfc, 0x39, 0xa8, 0x32, 0xa3, 0x01, 0x73, 0x43, 0x97, 0x6c, 0xcd, 0x62, 0x4d, 0x38, + 0x90, 0x0b, 0x8b, 0x3e, 0x61, 0x5c, 0x5a, 0x68, 0x77, 0x9d, 0x4f, 0x51, 0x5b, 0x4b, 0xd4, 0x61, + 0x3b, 0x83, 0x83, 0x73, 0xa8, 0xd6, 0x1d, 0x30, 0xc7, 0xb9, 0xcf, 0x96, 0xfb, 0x65, 0x83, 0x43, + 0xf9, 0x97, 0x51, 0xc5, 0x91, 0xb4, 0xaa, 0x3c, 0x6b, 0x6f, 0xe8, 0xd6, 0x9f, 0x16, 0xa1, 0x74, + 0xb0, 0x6d, 0xa3, 0xb7, 0x61, 0xd1, 0x21, 0x4d, 0x1a, 0x73, 0x7d, 0x07, 0xe0, 0xfc, 0x97, 0x68, + 0x9b, 0xeb, 0x69, 0x77, 0x9c, 0x03, 0x43, 0xb7, 0x01, 0x9c, 0x14, 0xfa, 0xfc, 0x05, 0x92, 0x0c, + 0x70, 0x06, 0x08, 0x61, 0xa8, 0xf5, 0x92, 0x4b, 0x0b, 0xe7, 0xaa, 0x93, 0x48, 0x97, 0x36, 0xbd, + 0xaa, 0x90, 0xc2, 0x58, 0x7f, 0x57, 0x00, 0x48, 0x73, 0x3c, 0xe8, 0x2f, 0x0a, 0x70, 0x99, 0x8c, + 0xf9, 0x5b, 0x2e, 0x3d, 0x3e, 0xad, 0x99, 0x4e, 0x00, 0xe5, 0xc2, 0xe4, 0x27, 0xf5, 0x14, 0x8d, + 0xfd, 0x17, 0x30, 0x3c, 0xf6, 0x25, 0xac, 0xff, 0x2e, 0xc2, 0x62, 0xee, 0xcf, 0xc2, 0x26, 0xbe, + 0x6e, 0xed, 0xb7, 0xe0, 0x75, 0x7f, 0x4b, 0x6b, 0x80, 0xca, 0x38, 0x10, 0x77, 0x2f, 0xf0, 0x8f, + 0xb5, 0x8f, 0x90, 0x31, 0x0e, 0xaa, 0x1d, 0x27, 0x1c, 0x8d, 0xd5, 0x0f, 0x3e, 0xbe, 0xfa, 0xd8, + 0x87, 0x1f, 0x5f, 0x7d, 0xec, 0x57, 0x1f, 0x5f, 0x7d, 0xec, 0xbd, 0xd3, 0xab, 0x85, 0x0f, 0x4e, + 0xaf, 0x16, 0x3e, 0x3c, 0xbd, 0x5a, 0xf8, 0xd5, 0xe9, 0xd5, 0xc2, 0x47, 0xa7, 0x57, 0x0b, 0x7f, + 0xf6, 0x1f, 0x57, 0x1f, 0xfb, 0xa3, 0xaa, 0x19, 0xbd, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x27, + 0xd3, 0x8a, 0x93, 0x1c, 0x51, 0x00, 0x00, } func (m *AWSCredentials) Marshal() (dAtA []byte, err error) { @@ -4523,6 +4524,11 @@ func (m *KafkaSource) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + i -= len(m.GroupID) + copy(dAtA[i:], m.GroupID) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.GroupID))) + i-- + dAtA[i] = 0x2a if m.FetchWaitMax != nil { { size, err := m.FetchWaitMax.MarshalToSizedBuffer(dAtA[:i]) @@ -7046,6 +7052,8 @@ func (m *KafkaSource) Size() (n int) { l = m.FetchWaitMax.Size() n += 1 + l + sovGenerated(uint64(l)) } + l = len(m.GroupID) + n += 1 + l + sovGenerated(uint64(l)) return n } @@ -8213,6 +8221,7 @@ func (this *KafkaSource) String() string { `StartOffset:` + fmt.Sprintf("%v", this.StartOffset) + `,`, `FetchMin:` + strings.Replace(fmt.Sprintf("%v", this.FetchMin), "Quantity", "resource.Quantity", 1) + `,`, `FetchWaitMax:` + strings.Replace(fmt.Sprintf("%v", this.FetchWaitMax), "Duration", "v11.Duration", 1) + `,`, + `GroupID:` + fmt.Sprintf("%v", this.GroupID) + `,`, `}`, }, "") return s @@ -14776,6 +14785,38 @@ func (m *KafkaSource) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field GroupID", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthGenerated + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenerated + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.GroupID = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenerated(dAtA[iNdEx:]) diff --git a/api/v1alpha1/generated.proto b/api/v1alpha1/generated.proto index 0454ef6f..ddc2e50d 100644 --- a/api/v1alpha1/generated.proto +++ b/api/v1alpha1/generated.proto @@ -494,6 +494,9 @@ message KafkaSource { // +kubebuilder:default="500ms" optional k8s.io.apimachinery.pkg.apis.meta.v1.Duration fetchWaitMax = 4; + + // GroupID is the consumer group ID. If not specified, a unique deterministic group ID is generated. + optional string groupId = 5; } message Log { diff --git a/api/v1alpha1/kafka_source.go b/api/v1alpha1/kafka_source.go index 6e23920f..7842d0bf 100644 --- a/api/v1alpha1/kafka_source.go +++ b/api/v1alpha1/kafka_source.go @@ -13,6 +13,8 @@ type KafkaSource struct { FetchMin *resource.Quantity `json:"fetchMin,omitempty" protobuf:"bytes,3,opt,name=fetchMin"` // +kubebuilder:default="500ms" FetchWaitMax *metav1.Duration `json:"fetchWaitMax,omitempty" protobuf:"bytes,4,opt,name=fetchWaitMax"` + // GroupID is the consumer group ID. If not specified, a unique deterministic group ID is generated. + GroupID string `json:"groupId,omitempty" protobuf:"bytes,5,opt,name=groupId"` } func (m *KafkaSource) GetAutoOffsetReset() string { @@ -26,3 +28,10 @@ func (m *KafkaSource) GetFetchMinBytes() int { func (m *KafkaSource) GetFetchWaitMaxMs() int { return int(m.FetchWaitMax.Milliseconds()) } + +func (m *KafkaSource) GetGroupID(defaultGroupID string) string { + if m.GroupID != "" { + return m.GroupID + } + return defaultGroupID +} diff --git a/api/v1alpha1/kafka_source_test.go b/api/v1alpha1/kafka_source_test.go index 1da91e9e..d29447fe 100644 --- a/api/v1alpha1/kafka_source_test.go +++ b/api/v1alpha1/kafka_source_test.go @@ -24,3 +24,14 @@ func TestKafkaSource_GetFetchWaitMaxMs(t *testing.T) { s := KafkaSource{FetchWaitMax: &metav1.Duration{Duration: time.Second}} assert.Equal(t, 1000, s.GetFetchWaitMaxMs()) } + +func TestKafkaSource_GetGroupID(t *testing.T) { + t.Run("Default", func(t *testing.T) { + s := &KafkaSource{} + assert.Equal(t, "foo", s.GetGroupID("foo")) + }) + t.Run("Specified", func(t *testing.T) { + s := &KafkaSource{GroupID: "bar"} + assert.Equal(t, "bar", s.GetGroupID("foo")) + }) +} diff --git a/config/ci.yaml b/config/ci.yaml index 3f5df80d..410f26f9 100644 --- a/config/ci.yaml +++ b/config/ci.yaml @@ -3646,6 +3646,11 @@ spec: fetchWaitMax: default: 500ms type: string + groupId: + description: GroupID is the consumer group ID. If + not specified, a unique deterministic group ID is + generated. + type: string maxMessageBytes: format: int32 type: integer @@ -10689,6 +10694,10 @@ spec: fetchWaitMax: default: 500ms type: string + groupId: + description: GroupID is the consumer group ID. If not specified, + a unique deterministic group ID is generated. + type: string maxMessageBytes: format: int32 type: integer diff --git a/config/crd/bases/dataflow.argoproj.io_pipelines.yaml b/config/crd/bases/dataflow.argoproj.io_pipelines.yaml index cec948e1..e8cfef91 100644 --- a/config/crd/bases/dataflow.argoproj.io_pipelines.yaml +++ b/config/crd/bases/dataflow.argoproj.io_pipelines.yaml @@ -3641,6 +3641,11 @@ spec: fetchWaitMax: default: 500ms type: string + groupId: + description: GroupID is the consumer group ID. If + not specified, a unique deterministic group ID is + generated. + type: string maxMessageBytes: format: int32 type: integer diff --git a/config/crd/bases/dataflow.argoproj.io_steps.yaml b/config/crd/bases/dataflow.argoproj.io_steps.yaml index 26f2f5da..aec54f93 100644 --- a/config/crd/bases/dataflow.argoproj.io_steps.yaml +++ b/config/crd/bases/dataflow.argoproj.io_steps.yaml @@ -3468,6 +3468,10 @@ spec: fetchWaitMax: default: 500ms type: string + groupId: + description: GroupID is the consumer group ID. If not specified, + a unique deterministic group ID is generated. + type: string maxMessageBytes: format: int32 type: integer diff --git a/config/default.yaml b/config/default.yaml index 46e9d7ba..8ef16358 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -3646,6 +3646,11 @@ spec: fetchWaitMax: default: 500ms type: string + groupId: + description: GroupID is the consumer group ID. If + not specified, a unique deterministic group ID is + generated. + type: string maxMessageBytes: format: int32 type: integer @@ -10689,6 +10694,10 @@ spec: fetchWaitMax: default: 500ms type: string + groupId: + description: GroupID is the consumer group ID. If not specified, + a unique deterministic group ID is generated. + type: string maxMessageBytes: format: int32 type: integer diff --git a/config/dev.yaml b/config/dev.yaml index eacb171b..e820dc5b 100644 --- a/config/dev.yaml +++ b/config/dev.yaml @@ -3646,6 +3646,11 @@ spec: fetchWaitMax: default: 500ms type: string + groupId: + description: GroupID is the consumer group ID. If + not specified, a unique deterministic group ID is + generated. + type: string maxMessageBytes: format: int32 type: integer @@ -10689,6 +10694,10 @@ spec: fetchWaitMax: default: 500ms type: string + groupId: + description: GroupID is the consumer group ID. If not specified, + a unique deterministic group ID is generated. + type: string maxMessageBytes: format: int32 type: integer diff --git a/config/quick-start.yaml b/config/quick-start.yaml index a1ffb5f0..3ee53d43 100644 --- a/config/quick-start.yaml +++ b/config/quick-start.yaml @@ -3646,6 +3646,11 @@ spec: fetchWaitMax: default: 500ms type: string + groupId: + description: GroupID is the consumer group ID. If + not specified, a unique deterministic group ID is + generated. + type: string maxMessageBytes: format: int32 type: integer @@ -10689,6 +10694,10 @@ spec: fetchWaitMax: default: 500ms type: string + groupId: + description: GroupID is the consumer group ID. If not specified, + a unique deterministic group ID is generated. + type: string maxMessageBytes: format: int32 type: integer diff --git a/dsls/python/argo_dataflow/pipeline.py b/dsls/python/argo_dataflow/pipeline.py index 88d91882..6acf3269 100644 --- a/dsls/python/argo_dataflow/pipeline.py +++ b/dsls/python/argo_dataflow/pipeline.py @@ -600,13 +600,14 @@ def dump(self): class KafkaSource(Source): - def __init__(self, topic, name=None, retry=None, startOffset=None, fetchMin=None, fetchWaitMax=None): + def __init__(self, topic, name=None, retry=None, startOffset=None, fetchMin=None, fetchWaitMax=None, groupId=None): super().__init__(name=name, retry=retry) assert topic self._topic = topic self._startOffset = startOffset self._fetchMin = fetchMin self._fetchWaitMax = fetchWaitMax + self._groupId = groupId def dump(self): x = super().dump() @@ -617,6 +618,8 @@ def dump(self): y["fetchMin"] = self._fetchMin if self._fetchWaitMax: y["fetchWaitMax"] = self._fetchWaitMax + if self._groupId: + y["groupId"] = self._groupId x['kafka'] = y return x @@ -655,9 +658,9 @@ def http(name=None, retry=None, serviceName=None): return HTTPSource(name=name, serviceName=serviceName, retry=retry) -def kafka(topic=None, name=None, retry=None, startOffset=None, fetchMin=None, fetchWaitMax=None): +def kafka(topic=None, name=None, retry=None, startOffset=None, fetchMin=None, fetchWaitMax=None, groupId=None): return KafkaSource(topic, name=name, retry=retry, startOffset=startOffset, fetchMin=fetchMin, - fetchWaitMax=fetchWaitMax) + fetchWaitMax=fetchWaitMax, groupId=groupId) def stan(subject=None, name=None, retry=None): diff --git a/examples/301-kafka-pipeline.py b/examples/301-kafka-pipeline.py index 8498e023..922127b4 100644 --- a/examples/301-kafka-pipeline.py +++ b/examples/301-kafka-pipeline.py @@ -11,7 +11,7 @@ """) .annotate("dataflow.argoproj.io/test", "true") .step( - (kafka('input-topic') + (kafka('input-topic', groupId='my-group') .cat() .kafka('output-topic', a_sync=True) )) diff --git a/examples/301-kafka-pipeline.yaml b/examples/301-kafka-pipeline.yaml index f1539677..baa27718 100644 --- a/examples/301-kafka-pipeline.yaml +++ b/examples/301-kafka-pipeline.yaml @@ -20,4 +20,5 @@ spec: topic: output-topic sources: - kafka: + groupId: my-group topic: input-topic diff --git a/runner/sidecar/source/kafka/kafka.go b/runner/sidecar/source/kafka/kafka.go index 29b7a19e..29b15652 100644 --- a/runner/sidecar/source/kafka/kafka.go +++ b/runner/sidecar/source/kafka/kafka.go @@ -37,13 +37,14 @@ const ( pendingUnavailable = math.MinInt32 ) -func New(ctx context.Context, secretInterface corev1.SecretInterface, consumerGroupID, sourceName, sourceURN string, replica int, x dfv1.KafkaSource, process source.Process) (source.Interface, error) { +func New(ctx context.Context, secretInterface corev1.SecretInterface, cluster, namespace, pipelineName, stepName, sourceName, sourceURN string, replica int, x dfv1.KafkaSource, process source.Process) (source.Interface, error) { logger := sharedutil.NewLogger().WithValues("source", sourceName) config, err := sharedkafka.GetConfig(ctx, secretInterface, x.KafkaConfig) if err != nil { return nil, err } config["go.logs.channel.enable"] = true + consumerGroupID := x.GetGroupID(sharedutil.GetSourceUID(cluster, namespace, pipelineName, stepName, sourceName)) config["group.id"] = consumerGroupID config["group.instance.id"] = fmt.Sprintf("%s/%d", consumerGroupID, replica) config["heartbeat.interval.ms"] = 3 * seconds diff --git a/runner/sidecar/sources.go b/runner/sidecar/sources.go index 7cbe2abe..f1ecb580 100644 --- a/runner/sidecar/sources.go +++ b/runner/sidecar/sources.go @@ -150,8 +150,7 @@ func connectSources(ctx context.Context, process func(context.Context, []byte) e sources[sourceName] = y } } else if x := s.Kafka; x != nil { - groupID := sharedutil.GetSourceUID(cluster, namespace, pipelineName, stepName, sourceName) - if y, err := kafkasource.New(ctx, secretInterface, groupID, sourceName, sourceURN, replica, *x, processWithRetry); err != nil { + if y, err := kafkasource.New(ctx, secretInterface, cluster, namespace, pipelineName, stepName, sourceName, sourceURN, replica, *x, processWithRetry); err != nil { return err } else { sources[sourceName] = y