From 9bea06bd0d9badcccbf004fcdda894ae00a68ba9 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 9 Oct 2017 14:49:45 -0400 Subject: [PATCH 1/2] spark-197 - plugin.py security_key generation picks the wrong key --- .vscode/launch.json | 17 +++++++++++ src/lib/api/service_compiler/plugin.py | 41 +++++++++++++++++--------- 2 files changed, 44 insertions(+), 14 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index f198012d5..66f59625d 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,6 +1,23 @@ { "version": "0.2.0", "configurations": [ + { + "name": "Python", + "type": "python", + "request": "launch", + "stopOnEntry": false, + "pythonPath": "${config:python.pythonPath}", + "program": "${file}", + "cwd": "${workspaceRoot}", + "env": {}, + "envFile": "${workspaceRoot}/.env", + "args": [ "DEBUG" ], + "debugOptions": [ + "WaitOnAbnormalExit", + "WaitOnNormalExit", + "RedirectOutput" + ] + }, { "name": "WSL Launch", "type": "cppdbg", diff --git a/src/lib/api/service_compiler/plugin.py b/src/lib/api/service_compiler/plugin.py index 41d6078fc..cc6360676 100755 --- a/src/lib/api/service_compiler/plugin.py +++ b/src/lib/api/service_compiler/plugin.py @@ -45,6 +45,7 @@ def type_name_cpp(name_with_ns): # Map protobuf raw types to intermediate type tree # MethodModel = namedtuple("MethodModel", "name comment server_streaming has_complex_key key_type key_field output_type_full output_type_cpp output_type input_type_full input_type_cpp input_type") +KeyData = namedtuple("KeyData", "type field") def transform_method(m, keydata): return MethodModel( name=m.name, @@ -87,25 +88,23 @@ def transform_message(i): return r ServiceModel = namedtuple("ServiceModel", "name comment method") -def transform_service(service, keydata): +KeyModel = namedtuple("KeyModel", "type field") +DefaultKeyModel = KeyModel("int", "id") +def transform_service(service, keymap): return ServiceModel( service.name, option(service.options, apioptions_pb2.service_description, ""), - [transform_method(m, keydata) for m in service.method]) + [transform_method(m, keymap.get(m.output_type, DefaultKeyModel)) for m in service.method]) FileModel = namedtuple("FileModel", "name package namespace_csharp message_type service enum_type") -KeyModel = namedtuple("KeyModel", "type field") -def transform_file(p): +def transform_file(p, keymap): message_types = [transform_message(m) for m in p.message_type] - # Note: this keydata thing is wrong... this will find the first key in the file not the key for the service - keydata = next((KeyModel(f.type,f.name) for m in message_types for f in m.field if f.is_key), None) - keydata = keydata or next((KeyModel(f.type,f.name) for m in message_types for f in m.field if f.name == 'id'), KeyModel("int","id")) return FileModel( name = p.name, package = p.package, namespace_csharp = p.package, message_type = message_types, - service = [transform_service(s, keydata) for s in p.service], + service = [transform_service(s, keymap) for s in p.service], enum_type = [transform_enum(e) for e in p.enum_type] ) @@ -229,14 +228,28 @@ def generate_code(request, response): 'type': lambda this,item: item.split('.')[-1:][0], 'camel': lambda _,f: camel_case(f), } - # for proto_file in request.proto_file: - # todo: for all files on the input - # get a list of their messages and Key fields - # pass this as a dictionary into transform_file - # pass + keymap = {} + # Generate a map of keys for all types across files + for proto_file in request.proto_file: + for msg in proto_file.message_type: + # check eachfield + found_key = False + namekey = ".{}.{}".format(proto_file.package,msg.name) + for field in msg.field: + if option(field.options, apioptions_pb2.key, False): + found_key = True + keymap[namekey] = KeyData(to_type_model(field, msg), field.name) + break + # If no field was annotated as a key but there's a field named "id" use that + if not found_key: + for field in msg.field: + if field.name == "id": + keymap[namekey] = KeyData(to_type_model(field, msg), field.name) + break + for proto_file in request.proto_file: if proto_file.name in request.file_to_generate: - proto_file = transform_file(proto_file) + proto_file = transform_file(proto_file, keymap) # Path on response.file name is interpreted differently by the c# and c++ code gen filename = ('strip_out_path' in params) and os.path.split(proto_file.name)[1] or proto_file.name source_name = os.path.splitext(filename)[0] From f24a263e01f9283a2e1598e1a859b5d48e804c73 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 9 Oct 2017 16:17:07 -0400 Subject: [PATCH 2/2] add AlgoDetailsPopupControl to Ladder --- externals | 2 +- src/client/spark/mspark/Ladder/LadderModel.cs | 14 -- src/client/spark/mspark/Ladder/LadderVM.cs | 5 +- .../spark/mspark/Ladder/LadderView.xaml | 49 ++---- src/client/spark/mspark/Ladder/OrderTypeVM.cs | 2 +- .../Orders/OrderModificationControl.xaml | 120 +------------- .../spark/mspark/Orders/OrderParamsVM.cs | 14 +- .../spark/mspark/Orders/OrderTicket.xaml | 4 +- .../Algo/AlgoDetailsPopupControl.xaml | 151 ++++++++++++++++++ .../Algo/AlgoDetailsPopupControl.xaml.cs | 99 ++++++++++++ .../view/Controls/Popup/PopupControl.xaml.cs | 2 - 11 files changed, 281 insertions(+), 181 deletions(-) create mode 100644 src/client/spark/view/Controls/Algo/AlgoDetailsPopupControl.xaml create mode 100644 src/client/spark/view/Controls/Algo/AlgoDetailsPopupControl.xaml.cs diff --git a/externals b/externals index d71750db2..56d97f6b2 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit d71750db2a78c0688752dc591ff1198f95fb2e52 +Subproject commit 56d97f6b28ada78be20089008191f4cb386e8c3f diff --git a/src/client/spark/mspark/Ladder/LadderModel.cs b/src/client/spark/mspark/Ladder/LadderModel.cs index 3f15afcab..eaebf7479 100644 --- a/src/client/spark/mspark/Ladder/LadderModel.cs +++ b/src/client/spark/mspark/Ladder/LadderModel.cs @@ -32,20 +32,6 @@ namespace mbts.spark { Logger.info(bts.log.Subsystem.ui, $"Cancel {ct}"); } - public IMessage[] default_orders { - get { - return new IMessage[] { - new MarketOrder (), - new LimitOrder (), - new StopMarketOrder (), - new StopLimitOrder (), - new IcebergOrder(), - new BTSStopOrder (), - new BTSIcebergOrder () - }; - } - } - public OrdersModel order_gateway => _order_gateway; } } \ No newline at end of file diff --git a/src/client/spark/mspark/Ladder/LadderVM.cs b/src/client/spark/mspark/Ladder/LadderVM.cs index fb2c02963..7e8d516d8 100644 --- a/src/client/spark/mspark/Ladder/LadderVM.cs +++ b/src/client/spark/mspark/Ladder/LadderVM.cs @@ -16,6 +16,7 @@ using bts.spark; using Google.Protobuf; using bts.api; using mbts.ui.utility; +using mbts.spark.utilities; namespace mbts.spark { class LadderVM : DisposableViewModelBase, IKeyListener { @@ -50,7 +51,7 @@ namespace mbts.spark { // Order _selected_order_type = backing(nameof(selected_order_type), Order.Types.TimeInForce.Day); - algo_types = _model.default_orders.SelectMany(wrap_order).ToArray(); + algo_types = OrderDataHelper.Defaults.Algos.SelectMany(wrap_order).ToArray(); _revert = backing(nameof(revert), false); // Orders @@ -166,6 +167,8 @@ namespace mbts.spark { Property _revert; public bool revert { get => _revert.Value; set => _revert.set(value); } + public string[] accounts { get; } = new[] { "Account1", "Account2", "Account3", "Account4" }; + public string account { get => _order_template.Account; set => _order_template.Account = value; } public Order.Types.TimeInForce[] order_types => Enum.GetValues(typeof(Order.Types.TimeInForce)).Cast().ToArray(); Property _selected_order_type; public Order.Types.TimeInForce selected_order_type { get => _selected_order_type.Value; set => _selected_order_type.Value = value; } diff --git a/src/client/spark/mspark/Ladder/LadderView.xaml b/src/client/spark/mspark/Ladder/LadderView.xaml index 7598ea8eb..973ebd010 100644 --- a/src/client/spark/mspark/Ladder/LadderView.xaml +++ b/src/client/spark/mspark/Ladder/LadderView.xaml @@ -5,58 +5,38 @@ xmlns:controls="clr-namespace:mbts.ui.controls" xmlns:spark="clr-namespace:mbts.spark" xmlns:usp="clr-namespace:mbts.ui.spark" + xmlns:uag="clr-namespace:mbts.ui.spark.algo" xmlns:sys="clr-namespace:System;assembly=mscorlib" Height="600" Width="400" TextElement.FontSize="11"> + + + + + + + - + - - - - - - - - - - - + + + Revert - - - - - - - - - - - - - - - - - - - @@ -71,8 +51,11 @@ + + + -