From fe3b46eb1466b052d645fbe7d9d41c88e3f6b701 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 25 Sep 2018 18:12:06 -0400 Subject: [PATCH] joined fills and orders with security --- src/client/spark_api/md/MarketDataClient.cs | 30 +++++++- .../rtd/formatting/JsonFormatter.cs | 24 ++++++- .../rtd/subscriptions/MDSubscribe.cs | 6 +- .../rtd/subscriptions/SecurityJoiner.cs | 66 ++++++++++++++++++ .../rtd/subscriptions/Subscribe.cs | 15 ++-- .../spark_excel/spark_excel_example.xlsm | Bin 13146 -> 14121 bytes src/client/spark_sdk/samples/SDKMain.cs | 2 +- 7 files changed, 131 insertions(+), 12 deletions(-) create mode 100644 src/client/spark_excel/rtd/subscriptions/SecurityJoiner.cs diff --git a/src/client/spark_api/md/MarketDataClient.cs b/src/client/spark_api/md/MarketDataClient.cs index d28ff4347..cd5bacc19 100644 --- a/src/client/spark_api/md/MarketDataClient.cs +++ b/src/client/spark_api/md/MarketDataClient.cs @@ -23,13 +23,19 @@ namespace bts.api.md public ChannelUpdate data; } - readonly ConcurrentDictionary _data = new ConcurrentDictionary(); + readonly ConcurrentDictionary _data = new ConcurrentDictionary(); + readonly ConcurrentDictionary _security_names = new ConcurrentDictionary(); readonly static Lazy _md = new Lazy(() => locate(), true); readonly Lazy _subscription = new Lazy(() => load_request()); - public MarketDataClient() + private MarketDataClient() { } + public static MarketDataClient create() + { + return new MarketDataClient(); + } + static MDRequest load_request() { var req = new MDRequest(); @@ -56,6 +62,12 @@ namespace bts.api.md return null; } + public string lookup_security_name(security_key key) + { + _security_names.TryGetValue(key, out string value); + return value; + } + public Security find_security(Func filter) { return _data.Values.Select(x => x.data.Security).Where(xx => filter(xx)).FirstOrDefault(); @@ -201,6 +213,14 @@ namespace bts.api.md /// public async Task start_pump(TimeSpan? interval = null) { + var rep = await _md.Value.request_names_async(new VoidMessage()); int count = 0; + do + { + foreach (var s in rep.value.Securities) + foreach (var ss in s.Names) + _security_names[ss.Key] = ss.Value; + } + while (!rep.success && count++ < 5); while (true) { var reply = await _md.Value.requestmd_async(_subscription.Value); @@ -246,6 +266,12 @@ namespace bts.api.md } } + public async void run_pump_async(TimeSpan? interval = null) + { + await this.start_pump(interval); + } + + readonly CancellationTokenSource _cts = new CancellationTokenSource(); public void Dispose() { diff --git a/src/client/spark_excel/rtd/formatting/JsonFormatter.cs b/src/client/spark_excel/rtd/formatting/JsonFormatter.cs index 17859bf22..4c23216ca 100644 --- a/src/client/spark_excel/rtd/formatting/JsonFormatter.cs +++ b/src/client/spark_excel/rtd/formatting/JsonFormatter.cs @@ -21,7 +21,7 @@ namespace bts.excel.rtd { if (_data is IEnumerable iem) return format_many(iem, include_headers); - else + else return format_one(_data, include_headers); } @@ -45,10 +45,28 @@ namespace bts.excel.rtd { string json = null; if(data is IMessage imsg) - json = Google.Protobuf.JsonFormatter.Default.Format(imsg); + json = Google.Protobuf.JsonFormatter.Default.Format(imsg); + else if (data is SecurityJoin jn) + { + System.IO.StringWriter writer = new System.IO.StringWriter(); + writer.Write("{ item1: "); + Google.Protobuf.JsonFormatter.Default.WriteValue(writer, jn.message); + if (jn.security != null) + { + writer.Write(", security: "); + Google.Protobuf.JsonFormatter.Default.WriteValue(writer, jn.security); + } + if (jn.security_name != null) + { + writer.Write(", security_name: "); + Google.Protobuf.JsonFormatter.Default.WriteValue(writer, jn.security_name); + } + writer.Write("}"); + json = writer.GetStringBuilder().ToString(); + } else json = JsonConvert.SerializeObject(data); - + JObject jo = JObject.Parse(json); Dictionary results = new Dictionary(); parse_object(jo, results); diff --git a/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs b/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs index d21f57ff9..015a56761 100644 --- a/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs +++ b/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs @@ -16,11 +16,13 @@ namespace bts.excel.rtd { readonly static Lazy _md = new Lazy(() => { - var md = new MarketDataClient(); - md.run_pump(TimeSpan.FromMilliseconds(333)); + var md = MarketDataClient.create(); + md.run_pump_async(TimeSpan.FromMilliseconds(333)); return md; }, true); + public static MarketDataClient md_client => _md.Value; + static IObservable md_observable(string contract, string symbol, string security_type, string exchange) { security_type = string.IsNullOrEmpty(security_type) ? SecurityType.Future.ToString() : security_type; diff --git a/src/client/spark_excel/rtd/subscriptions/SecurityJoiner.cs b/src/client/spark_excel/rtd/subscriptions/SecurityJoiner.cs new file mode 100644 index 000000000..5a6a34529 --- /dev/null +++ b/src/client/spark_excel/rtd/subscriptions/SecurityJoiner.cs @@ -0,0 +1,66 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; + +using ExcelDna.Integration; +using ExcelDna.Integration.Rtd; +using ExcelDna.Registration; +using ExcelDna.Registration.Utils; +using System.Reactive.Linq; +using bts.api; +using bts.api.md; +using bts.api.core; +using bts.api.orderman; +using bts.co2; +using Google.Protobuf; + +namespace bts.excel.rtd +{ + public class SecurityJoin + { + public IMessage message { get; private set; } + public IMessage security { get; private set;} + public string security_name { get; private set;} + public SecurityJoin(IMessage msg, IMessage sec, string sec_name) => + (message, security, security_name) = (msg, sec, sec_name); + } + + class SecurityJoiner + { + // readonly static Lazy _md = new Lazy(() => + // { + // using (var ctx = new api.core.ServiceContext()) + // { + // return ctx.locate(); + // } + // }, true); + + public static IEnumerable security_join(IEnumerable msgs) + { + List outs = new List(); + foreach (var msg in msgs) + { + if(msg is IMessage imsg) + { + var sk = imsg.Descriptor.FindFieldByName("security_key"); + if (sk != null) + { + uint key = (uint)sk.Accessor.GetValue(imsg); + //Security sec = MDSubscribe.md_client.lookup(key); + // if (sec != null) + // outs.Add(new SecurityJoin(msg, sec, null)); + // else + // { + string name = MDSubscribe.md_client.lookup_security_name(key) ?? string.Empty; + outs.Add(new SecurityJoin(imsg, null, name)); + // } + continue; + } + } + outs.Add(msg); + } + return outs; + } + } +} \ No newline at end of file diff --git a/src/client/spark_excel/rtd/subscriptions/Subscribe.cs b/src/client/spark_excel/rtd/subscriptions/Subscribe.cs index 563a6c785..b9cc27c70 100644 --- a/src/client/spark_excel/rtd/subscriptions/Subscribe.cs +++ b/src/client/spark_excel/rtd/subscriptions/Subscribe.cs @@ -9,13 +9,15 @@ using ExcelDna.Registration.Utils; using System.Reactive.Linq; using bts.api; using bts.api.md; -using bts.api.orderman; using bts.api.core; +using bts.api.orderman; +using bts.co2; namespace bts.excel.rtd { public class Subscribe { + readonly static Lazy _md = new Lazy(() => locate(), true); readonly static Lazy _orders = new Lazy(() => locate(), true); static T locate() where T : class, IApiClient { @@ -39,7 +41,8 @@ namespace bts.excel.rtd return _orders.Value.subscribe_orders().Select(x => { IReadOnlyCollection orders = x.all; - return new JsonFormatter(x.all).format(true); + var join = SecurityJoiner.security_join(orders); + return new JsonFormatter(join).format(true); }); } @@ -52,8 +55,12 @@ namespace bts.excel.rtd static IObservable observable_fills() { - return Observable.Timer(dueTime: TimeSpan.Zero, period: TimeSpan.FromSeconds(1)) - .Select(_ => new[] { DateTime.Now.ToString("HH:mm:ss"), DateTime.UtcNow.ToString("HH:mm:ss") }); + return _orders.Value.subscribe_fills().Select(x => + { + IReadOnlyCollection fills = x.all; + var join = SecurityJoiner.security_join(fills); + return new JsonFormatter(join).format(true); + }); } [ExcelFunction(Category = "BTS", Description = "Subscribe to BTS Spark API Service")] diff --git a/src/client/spark_excel/spark_excel_example.xlsm b/src/client/spark_excel/spark_excel_example.xlsm index 18b7131f7935f76842a1bfe4242f4238b4820864..6887b2d978f7649a48b6b92c05e8c4f2f8df4afe 100644 GIT binary patch delta 5285 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 aIGO*0asYtpzXH