diff --git a/src/lib/api/services/AnalyticsService.proto b/src/lib/api/services/AnalyticsService.proto index d75b261e7..a67a85793 100644 --- a/src/lib/api/services/AnalyticsService.proto +++ b/src/lib/api/services/AnalyticsService.proto @@ -3,31 +3,79 @@ package bts.api.analytics; option csharp_namespace="bts.api.analytics"; import "lib/api/apioptions.proto"; import "lib/api/apicore.proto"; +import "lib/domain_model/Security.proto"; message VolSurfaceEntry{ - uint64 save_time = 1 [(bts.api.key)=true]; - int32 vs_id = 10; - string vs_name = 20; - bytes volsurface = 30; + uint64 save_time = 10 [(bts.api.key)=true]; + int32 vs_id = 20; + string vs_name = 30; + bytes volsurface = 40; } -message AnalyticsServiceCreateResponse { +message VolSurfaceUsageEntry{ + bts.api.Venue symbol_venue = 10; + string symbol_name = 20; + int32 vs_id = 30; +} + +message VolSurfaceUsageList{ + int32 id = 10 [(bts.api.key)=true]; + repeated VolSurfaceUsageEntry usage_list = 20; +} + +message AnalyticsServiceCreateReply { bool ok = 1; int32 new_id = 2; } +message ExpirationParameterEntry{ + int32 id = 10; + bts.api.SecurityType security_type = 20; + string symbol = 30; + bts.api.Expiration expiration = 40; + bts.api.Venue exchange = 50; + bts.api.SecurityType driver_security_type = 60; + string driver_symbol = 70; + bts.api.Expiration driver_expiration = 80; + bts.api.Venue driver_exchange = 90; + bts.api.SecurityType deliverable_security_type = 100; + string deliverable_symbol = 110; + bts.api.Expiration deliverable_expiration = 120; + bts.api.Venue deliverable_exchange = 130; + bts.api.SecurityType roll_schedule_security_type = 140; + string roll_schedule_symbol = 150; + bts.api.Expiration roll_schedule_expiration = 160; + bts.api.Venue roll_schedule_exchange = 170; + double roll_target = 180; + double riskless_rate = 190; + double settlement_price = 200; + double driver_addend = 210; + double driver_factor = 220; + bts.api.Expiration driver_translation_target = 230; + double delta_beta = 240; + double vega_beta = 250; +} + +message ExpirationParameterEntryList{ + int32 id = 10 [(bts.api.key)=true]; + repeated ExpirationParameterEntry param_list = 20; +} + message IntWrapper{ int32 data = 1; } service AnalyticsService { option (bts.api.service_description) = "Provides VolSurface creations and saves"; - rpc get_new_volsurface_id(bts.api.VoidMessage) returns (AnalyticsServiceCreateResponse); + rpc get_new_volsurface_id(bts.api.VoidMessage) returns (AnalyticsServiceCreateReply); rpc save_volsurface(VolSurfaceEntry) returns (bts.api.ResultMessage); rpc delete_volsurface(IntWrapper) returns (bts.api.ResultMessage); rpc clean_up(IntWrapper) returns (bts.api.VoidMessage); + rpc set_exp_parameters(ExpirationParameterEntryList) returns (bts.api.ResultMessage); + rpc set_volsurface_usage_list(VolSurfaceUsageList) returns (bts.api.ResultMessage); // subscription rpc volsurfaces(bts.api.VoidMessage) returns (stream VolSurfaceEntry); - + rpc exp_parameters(bts.api.VoidMessage) returns (stream ExpirationParameterEntryList); + rpc volsurface_usage(bts.api.VoidMessage) returns (stream VolSurfaceUsageList); } \ No newline at end of file diff --git a/src/lib/domain_model/Security.proto b/src/lib/domain_model/Security.proto index 3e5d329a1..61f1bba55 100644 --- a/src/lib/domain_model/Security.proto +++ b/src/lib/domain_model/Security.proto @@ -198,6 +198,12 @@ message Product { string symbol = 3; } +message Expiration{ + uint32 expiration_year = 10; + uint32 expiration_month = 20; + uint32 expiration_day = 30; +} + // abomination of the only data AW2 didnt take over message DateTimeType diff --git a/src/server/sparkd/analytics/AnalyticsServiceServer.cpp b/src/server/sparkd/analytics/AnalyticsServiceServer.cpp index 10da8be01..884a82c01 100644 --- a/src/server/sparkd/analytics/AnalyticsServiceServer.cpp +++ b/src/server/sparkd/analytics/AnalyticsServiceServer.cpp @@ -1,32 +1,72 @@ #include "AnalyticsServiceServer.h" +#include "lib/api/apicore.pb.h" +#include "lib/api/services/AnalyticsService.pb.h" +#include "lib/api/services/AnalyticsService.server.pb.h" #include "lib/logging/logging.h" +#include "lib/persistence/IStore.h" #include "lib/persistence/SqliteStore.h" #include "lib/utils/PBUtils.h" #include "lib/utils/Puid.h" +#include "lib/utils/bts_assert.h" +#include +#include +#include +#include #include +#include + +using namespace bts::api::analytics; namespace bts::analytics { +// ns = vs_key_name +std::tuple parse_vs_id_name(const std::string &ns) { + boost::char_separator sep("."); + boost::tokenizer> tokens(ns, sep); + std::vector parts; + for (const auto &t : tokens) { + parts.push_back(t); + } + bts_assert(parts.size() == 3); + return {std::stoi(parts[1]), parts[2]}; +} + struct AnalyticsServiceServer::PImpl { bts::api::ServiceContext &context; - std::unique_ptr vs_fill_store; + std::unique_ptr vs_store; + std::unique_ptr exp_params_store; + std::unique_ptr vs_usage_store; AnalyticsServiceBase::VolsurfacesStatefulPublisher vs_publisher; + AnalyticsServiceBase::Exp_parametersStatefulPublisher exp_params_publisher; + AnalyticsServiceBase::Volsurface_usageStatefulPublisher vs_usage_publisher; PImpl( bts::api::ServiceContext &context, - const AnalyticsServiceBase::VolsurfacesStatefulPublisher &vs_publisher) + const AnalyticsServiceBase::VolsurfacesStatefulPublisher &vs_publisher, + const AnalyticsServiceBase::Exp_parametersStatefulPublisher + &exp_params_publisher, + const AnalyticsServiceBase::Volsurface_usageStatefulPublisher + &vs_usage_publisher) : context(context), - vs_fill_store( - std::make_unique("volsurfaces")), - vs_publisher(vs_publisher) {} + vs_store(std::make_unique("volsurfaces")), + exp_params_store(std::make_unique( + "analytics_expiration_params")), + vs_usage_store( + std::make_unique("volsurface_usage")), + vs_publisher(vs_publisher), exp_params_publisher(exp_params_publisher), + vs_usage_publisher(vs_usage_publisher) {} }; AnalyticsServiceServer::AnalyticsServiceServer( bts::api::ServiceContext &context) : AnalyticsServiceBase(context), - me(new PImpl(context, make_volsurfaces_stateful_publisher())) { - auto all = me->vs_fill_store->retrieve_all(); - LOG(persist, Info, "Finished loading all {} manual fills", all.size()); - for (auto const &ns_vals : all) { + me(new PImpl( + context, + make_volsurfaces_stateful_publisher(), + make_exp_parameters_stateful_publisher(), + make_volsurface_usage_stateful_publisher())) { + // publishing all vol surfaces + auto vs_table = me->vs_store->retrieve_all(); + for (auto const &ns_vals : vs_table) { const std::string &vs_name = ns_vals.first; const std::map &vals = ns_vals.second; LOG(OrderMan, Info, "vs:{} entries:{}", vs_name, vals.size()); @@ -34,31 +74,113 @@ AnalyticsServiceServer::AnalyticsServiceServer( const std::string &key = kvp.first; const std::string &val = kvp.second; LOG(OrderMan, Info, "vs:{} key:{} val:{}", vs_name, key, val); + VolSurfaceEntry vs_entry; + utils::pb::from_string(val, &vs_entry); + me->vs_publisher.add_or_update(vs_entry); } } me->vs_publisher.flush(); + // exp params + auto exp_params_table = me->exp_params_store->retrieve_all(); + bts_assert(exp_params_table.size() == 0 || exp_params_table.size() == 1); + for (const auto &ns_vals : exp_params_table) { + const std::map &vals = ns_vals.second; + bts_assert(vals.size() == 0 || vals.size() == 1); + for (const auto &kvp : vals) { + ExpirationParameterEntryList exp_params; + utils::pb::from_string(kvp.second, &exp_params); + me->exp_params_publisher.add_or_update(exp_params); + } + } + me->exp_params_publisher.flush(); } void AnalyticsServiceServer::get_new_volsurface_id( const ::bts::api::VoidMessage &, - const bts::api::Response< - ::bts::api::analytics::AnalyticsServiceCreateResponse> &) {} + const bts::api::Response<::bts::api::analytics::AnalyticsServiceCreateReply> + &response) { + auto all = me->vs_store->retrieve_all(); + int max_id = 0; + std::string curr_vs_name = ""; + for (const auto &kvp : all) { + const std::string &ns = kvp.first; + auto [vs_id, vs_name] = parse_vs_id_name(ns); + if (vs_id >= max_id) { + max_id = vs_id; + curr_vs_name = vs_name; + } + } + bts::api::analytics::AnalyticsServiceCreateReply rep; + rep.set_ok(true); + rep.set_new_id(max_id + 1); + response(rep); +} void AnalyticsServiceServer::save_volsurface( - const ::bts::api::analytics::VolSurfaceEntry &, + const bts::api::analytics::VolSurfaceEntry &vs_entry_arg, const api::Response<::bts::api::ResultMessage> &) { - // ns = vs_key_name - // key = posix save time - // val = VolSurfaceEntry + using namespace std::chrono; + milliseconds ms = + duration_cast(system_clock::now().time_since_epoch()); + uint64_t ms_u = ms.count(); + VolSurfaceEntry vs_entry = vs_entry_arg; + vs_entry.set_save_time(ms_u); + // namespace: volsurface__ + // key: save time + // value: VolSurfaceEntry + std::string ns = "volsurface_" + std::to_string(vs_entry.vs_id()) + "_" + + vs_entry.vs_name(); + std::string key = std::to_string(ms_u); + std::string value = utils::pb::to_string(vs_entry); + me->vs_store->insert(ns, key, value); + me->vs_publisher.add_or_update(vs_entry); + me->vs_publisher.flush(); } void AnalyticsServiceServer::delete_volsurface( - const ::bts::api::analytics::IntWrapper &, - const api::Response<::bts::api::ResultMessage> &) {} + const bts::api::analytics::IntWrapper &, + const api::Response<::bts::api::ResultMessage> &) { + // TODO +} void AnalyticsServiceServer::clean_up( const ::bts::api::analytics::IntWrapper &, - const api::Response<::bts::api::VoidMessage> &) {} + const api::Response<::bts::api::VoidMessage> &) { + // TODO +} + +void AnalyticsServiceServer::set_exp_parameters( + const bts::api::analytics::ExpirationParameterEntryList &exp_params_args, + const api::Response<::bts::api::ResultMessage> &response) { + ExpirationParameterEntryList exp_params = exp_params_args; + exp_params.set_id(1); + std::string ns = "analytics_expiration_params"; + std::string key = std::to_string(1); + std::string value = utils::pb::to_string(exp_params); + // TODO: check to see if it adds or not + me->exp_params_store->update(ns, key, value); + me->exp_params_publisher.add_or_update(exp_params); + me->exp_params_publisher.flush(); + api::ResultMessage res; + res.set_success(true); + response(res); +} + +void AnalyticsServiceServer::set_volsurface_usage_list( + const ::bts::api::analytics::VolSurfaceUsageList &vs_usage_list_args, + const api::Response<::bts::api::ResultMessage> &response) { + VolSurfaceUsageList vs_usage_list = vs_usage_list_args; + vs_usage_list.set_id(1); + std::string ns = "volsurface_usage_list"; + std::string key = std::to_string(1); + std::string value = utils::pb::to_string(vs_usage_list); + me->vs_usage_store->update(ns, key, value); + me->vs_usage_publisher.add_or_update(vs_usage_list); + me->vs_usage_publisher.flush(); + api::ResultMessage res; + res.set_success(true); + response(res); +} AnalyticsServiceServer::~AnalyticsServiceServer() {} diff --git a/src/server/sparkd/analytics/AnalyticsServiceServer.h b/src/server/sparkd/analytics/AnalyticsServiceServer.h index fe6d2706a..dddb5b7e1 100644 --- a/src/server/sparkd/analytics/AnalyticsServiceServer.h +++ b/src/server/sparkd/analytics/AnalyticsServiceServer.h @@ -23,9 +23,8 @@ class AnalyticsServiceServer void get_new_volsurface_id( const ::bts::api::VoidMessage &request, - const api::Response< - ::bts::api::analytics::AnalyticsServiceCreateResponse> &reply) - override; + const api::Response<::bts::api::analytics::AnalyticsServiceCreateReply> + &reply) override; void save_volsurface( const ::bts::api::analytics::VolSurfaceEntry &request, @@ -39,6 +38,14 @@ class AnalyticsServiceServer const ::bts::api::analytics::IntWrapper &request, const api::Response<::bts::api::VoidMessage> &reply) override; + void set_exp_parameters( + const bts::api::analytics::ExpirationParameterEntryList &request, + const api::Response<::bts::api::ResultMessage> &reply) override; + + void set_volsurface_usage_list( + const ::bts::api::analytics::VolSurfaceUsageList &request, + const api::Response<::bts::api::ResultMessage> &reply) override; + ~AnalyticsServiceServer(); }; } // namespace bts::analytics