From 6e1e5d4bbfcaca48adb66f821bde190dbff8eec9 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 23 Aug 2025 14:35:27 -0400 Subject: [PATCH] refactor: Add IDataStreamFactory(s) for spatial arb streams --- .../Services/DataStreamCoreServices.cs | 10 ++-- .../Analytics/SpatialArbStatsStream.cs | 10 ++-- .../Services/SharedStreamsServices.cs | 4 +- .../SpatialArbStatsStreamFactory.cs | 51 +++++++++++++++++++ .../SpatialArbStatsStreamParams.cs | 26 ++++++++++ .../SpatialFuturePairsStreamFactory.cs | 39 ++++++++++++++ 6 files changed, 132 insertions(+), 8 deletions(-) create mode 100644 src/DataStreamSuite/SharedStreams/StreamFactories/SpatialArbStatsStreamFactory.cs create mode 100644 src/DataStreamSuite/SharedStreams/StreamFactories/SpatialArbStatsStreamParams.cs create mode 100644 src/DataStreamSuite/SharedStreams/StreamFactories/SpatialFuturePairsStreamFactory.cs diff --git a/src/DataStreamSuite/DataStreamCore/Services/DataStreamCoreServices.cs b/src/DataStreamSuite/DataStreamCore/Services/DataStreamCoreServices.cs index 27fec78f2..843ff8d51 100644 --- a/src/DataStreamSuite/DataStreamCore/Services/DataStreamCoreServices.cs +++ b/src/DataStreamSuite/DataStreamCore/Services/DataStreamCoreServices.cs @@ -13,10 +13,12 @@ public static class DataStreamCoreServices { services.AddSingleton(); public static IServiceCollection AddViewStreamDatabase(this IServiceCollection services) => - services.AddSingleton(sp => { - ViewStreamDatabase.SetGlobalInstance(new ViewStreamDatabase()); - return ViewStreamDatabase.instance; - }); + services + .AddSingleton(sp => { + ViewStreamDatabase.SetGlobalInstance(new ViewStreamDatabase()); + return ViewStreamDatabase.instance; + }) + .AddSingleton(sp => sp.GetRequiredService()); public static IServiceCollection AddPrimitiveStreams(this IServiceCollection services, IConfiguration configurationSection) => services.Configure(configurationSection) diff --git a/src/DataStreamSuite/SharedStreams/Business/MarketData/Analytics/SpatialArbStatsStream.cs b/src/DataStreamSuite/SharedStreams/Business/MarketData/Analytics/SpatialArbStatsStream.cs index 7e51a3ab8..e17d3590d 100644 --- a/src/DataStreamSuite/SharedStreams/Business/MarketData/Analytics/SpatialArbStatsStream.cs +++ b/src/DataStreamSuite/SharedStreams/Business/MarketData/Analytics/SpatialArbStatsStream.cs @@ -8,9 +8,13 @@ using System; using System.Collections.Generic; - // For all the pairs generated by SpatialFuturePairsStream, this stream - // generates the statistics, by appending together a SpreadStatsStream - /// This stream is now created by + /// + /// For all the pairs generated by SpatialFuturePairsStream, this stream + /// generates the statistics, by appending together a SpreadStatsStream. + /// + /// This stream is now created by + /// + /// [DataStreamUserRespresentation(false)] public class SpatialArbStatsStream : ViewStream{ private ViewStream _spatial_pairs_stream; diff --git a/src/DataStreamSuite/SharedStreams/Services/SharedStreamsServices.cs b/src/DataStreamSuite/SharedStreams/Services/SharedStreamsServices.cs index 74acc595e..9b8c789b6 100644 --- a/src/DataStreamSuite/SharedStreams/Services/SharedStreamsServices.cs +++ b/src/DataStreamSuite/SharedStreams/Services/SharedStreamsServices.cs @@ -12,7 +12,9 @@ public static class SharedStreamsServices { public static IServiceCollection AddMarketDataStreams(this IServiceCollection services) => services.addStreamFactory() .addStreamFactory() - .addStreamFactory(); + .addStreamFactory() + .addStreamFactory() + .addStreamFactory(); public static IServiceCollection AddNaturalLanguageStreams(this IServiceCollection services, IConfigurationSection configurationSection) { services.Configure(configurationSection); diff --git a/src/DataStreamSuite/SharedStreams/StreamFactories/SpatialArbStatsStreamFactory.cs b/src/DataStreamSuite/SharedStreams/StreamFactories/SpatialArbStatsStreamFactory.cs new file mode 100644 index 000000000..8b01b23f9 --- /dev/null +++ b/src/DataStreamSuite/SharedStreams/StreamFactories/SpatialArbStatsStreamFactory.cs @@ -0,0 +1,51 @@ +namespace Bts.SharedStreams.StreamFactories; + +using BCG; + +using bts.BlueOrb; + +using Bts.DataStreamCore; + +using Microsoft.Extensions.Logging; + +using Spark.Api.MarketData; + +using System.Collections.Generic; + +class SpatialArbStatsStreamFactory : IDataStreamFactory { + readonly IMarketDataClient marketDataClient; + readonly ViewStreamDatabase viewStreamDatabase; + readonly ILogger logger; + + public SpatialArbStatsStreamFactory(IMarketDataClient marketDataClient, ViewStreamDatabase viewStreamDatabase, ILogger logger) { + this.marketDataClient = marketDataClient; + this.viewStreamDatabase = viewStreamDatabase; + this.logger = logger; + } + + public ViewStream? Create(string streamId, IEnumerable<(string? Name, int? Index, object? Value)> args) { + if (SupportedStreams.SpatialArbStats.IsMatch(streamId)) { + return createSpatialArbStats(args); + } + return null; + } + + public IEnumerable GetSupportedStreams() { + yield return SupportedStreams.SpatialArbStats; + } + + ViewStream? createSpatialArbStats(IEnumerable<(string? Name, int? Index, object? Value)> args) { + if (!StreamFactoryArgStore.TryGetParams(args, out SpatialArbStatsStreamParams? sassp, out var err)) { + logger.LogInvalidParams("spatialArbStats", err); + return null; + } + return new SpatialArbStatsStream(marketDataClient, sassp.WindowSize, sassp.SamplingInterval, viewStreamDatabase); + } + + static class SupportedStreams { + public static readonly DataStreamMetadata SpatialArbStats = new() { + Name = "spatialArbStats", + AlternateNames = new() { "SpatialArbStatsStream" }, + }; + } +} diff --git a/src/DataStreamSuite/SharedStreams/StreamFactories/SpatialArbStatsStreamParams.cs b/src/DataStreamSuite/SharedStreams/StreamFactories/SpatialArbStatsStreamParams.cs new file mode 100644 index 000000000..5e0f6471c --- /dev/null +++ b/src/DataStreamSuite/SharedStreams/StreamFactories/SpatialArbStatsStreamParams.cs @@ -0,0 +1,26 @@ +namespace Bts.SharedStreams.StreamFactories; + +using Bts.DataStreamCore; + +public class SpatialArbStatsStreamParams { + [StreamArgument(RegexNames = new[] { "^win(dow)?_?(Sz|Size)?" }, Position = 0, ParserType = typeof(TimeSpanOrSecondsParser))] + public TimeSpan WindowSize { get; set; } + + [StreamArgument(RegexNames = new[] { "^(sampling|sample|poll|polling)_?(Interval|Period|Size|Sz)" }, Position = 1, ParserType = typeof(TimeSpanOrSecondsParser))] + public TimeSpan SamplingInterval { get; set; } + + class TimeSpanOrSecondsParser : IStreamArgumentParser { + public bool TryParse(string? name, string? valueStr, out object? result) { + if (int.TryParse(valueStr, out var secs)) { + result = TimeSpan.FromSeconds(secs); + return true; + } + if (TimeSpan.TryParse(valueStr, out var ts)) { + result = ts; + return true; + } + result = null; + return false; + } + } +} diff --git a/src/DataStreamSuite/SharedStreams/StreamFactories/SpatialFuturePairsStreamFactory.cs b/src/DataStreamSuite/SharedStreams/StreamFactories/SpatialFuturePairsStreamFactory.cs new file mode 100644 index 000000000..c795f4e65 --- /dev/null +++ b/src/DataStreamSuite/SharedStreams/StreamFactories/SpatialFuturePairsStreamFactory.cs @@ -0,0 +1,39 @@ +namespace Bts.SharedStreams.StreamFactories; + +using BCG; + +using bts.BlueOrb; + +using Bts.DataStreamCore; + +using Spark.Api.MarketData; + +using System.Collections.Generic; + +class SpatialFuturePairsStreamFactory : IDataStreamFactory { + readonly IMarketDataClient marketDataClient; + + public SpatialFuturePairsStreamFactory(IMarketDataClient marketDataClient) => + this.marketDataClient = marketDataClient; + + public ViewStream? Create(string streamId, IEnumerable<(string? Name, int? Index, object? Value)> args) { + if (SupportedStreams.SpatialFuturePairs.IsMatch(streamId)) { + return createSpatialFuturePairs(args); + } + return null; + } + + public IEnumerable GetSupportedStreams() { + yield return SupportedStreams.SpatialFuturePairs; + } + + ViewStream createSpatialFuturePairs(IEnumerable<(string? Name, int? Index, object? Value)> args) => + new SpatialFuturePairsStream(marketDataClient); + + static class SupportedStreams { + public static readonly DataStreamMetadata SpatialFuturePairs = new() { + Name = "spatialFuturePairs", + AlternateNames = new() { "SpatialFuturePairsStream" }, + }; + } +}