Skip to content

Commit 0d39663

Browse files
romanpbmrok-povsic
romanpbm
authored and
rok-povsic
committed
Add method subscribe_to_provider where only provider name needed
1 parent 10cf41d commit 0d39663

7 files changed

Lines changed: 104 additions & 94 deletions

File tree

‎client-rpc/src/bookmap/__init__.py‎

Lines changed: 46 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,59 @@
11
# import public interface
22
from .bookmap import \
3-
create_addon,\
4-
wait_until_addon_is_turned_off,\
5-
start_addon,\
6-
subscribe_to_trades,\
7-
subscribe_to_depth,\
8-
subscribe_to_mbo,\
9-
subscribe_to_order_info,\
10-
subscribe_to_balance_updates,\
11-
subscribe_to_position_updates,\
12-
register_indicator,\
13-
add_number_settings_parameter,\
14-
add_boolean_settings_parameter,\
15-
add_string_settings_parameter,\
16-
add_color_settings_parameter,\
17-
add_label_to_settings,\
18-
add_point,\
3+
create_addon, \
4+
wait_until_addon_is_turned_off, \
5+
start_addon, \
6+
subscribe_to_trades, \
7+
subscribe_to_depth, \
8+
subscribe_to_mbo, \
9+
subscribe_to_order_info, \
10+
subscribe_to_balance_updates, \
11+
subscribe_to_position_updates, \
12+
register_indicator, \
13+
add_number_settings_parameter, \
14+
add_boolean_settings_parameter, \
15+
add_string_settings_parameter, \
16+
add_color_settings_parameter, \
17+
add_label_to_settings, \
18+
add_point, \
1919
subscribe_to_generator, \
20-
send_user_message,\
20+
subscribe_to_provider, \
21+
send_user_message, \
2122
add_trades_handler, \
22-
add_mbo_handler,\
23-
add_bar_handler,\
24-
add_depth_handler,\
25-
add_indicator_response_handler,\
26-
add_on_interval_handler,\
27-
add_response_data_handler,\
28-
add_on_setting_change_handler,\
29-
add_on_order_executed_handler,\
30-
add_on_order_updated_handler,\
31-
add_on_balance_update_handler,\
32-
add_on_position_update_handler,\
23+
add_mbo_handler, \
24+
add_bar_handler, \
25+
add_depth_handler, \
26+
add_indicator_response_handler, \
27+
add_on_interval_handler, \
28+
add_response_data_handler, \
29+
add_on_setting_change_handler, \
30+
add_on_order_executed_handler, \
31+
add_on_order_updated_handler, \
32+
add_on_balance_update_handler, \
33+
add_on_position_update_handler, \
3334
add_broadcasting_handler, \
3435
add_broadcasting_provider_status_handler, \
3536
add_broadcasting_settings_handler, \
3637
create_order_book, \
3738
on_depth, \
3839
get_bbo, \
39-
get_sum,\
40-
create_mbo_book,\
41-
on_new_order,\
42-
on_replace_order,\
43-
on_remove_order,\
44-
get_all_order_ids,\
45-
has_order,\
46-
get_order_price,\
47-
get_order_size,\
48-
get_order_side,\
49-
get_order,\
50-
LOCAL_PROCESS,\
51-
UNIX_SOCKET,\
52-
send_order,\
53-
cancel_order,\
54-
move_order,\
55-
move_order_to_market,\
40+
get_sum, \
41+
create_mbo_book, \
42+
on_new_order, \
43+
on_replace_order, \
44+
on_remove_order, \
45+
get_all_order_ids, \
46+
has_order, \
47+
get_order_price, \
48+
get_order_size, \
49+
get_order_side, \
50+
get_order, \
51+
LOCAL_PROCESS, \
52+
UNIX_SOCKET, \
53+
send_order, \
54+
cancel_order, \
55+
move_order, \
56+
move_order_to_market, \
5657
resize_order
5758

5859
from .dto import OrderSendParameters

‎client-rpc/src/bookmap/bookmap.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ def subscribe_to_generator(addon: typing.Dict[str, object], addon_name: str, gen
643643
try:
644644
msg = FIELD_SEPARATOR.join(
645645
(REGISTER_BROADCASTING_PROVIDER,
646-
addon_name,
646+
provider_name,
647647
str(generator_name),
648648
str(does_require_filtering))
649649
)
@@ -653,6 +653,10 @@ def subscribe_to_generator(addon: typing.Dict[str, object], addon_name: str, gen
653653
_stop_addon()
654654

655655

656+
def subscribe_to_provider(addon: typing.Dict[str, object], provider_name: str) -> None:
657+
subscribe_to_generator(addon, provider_name, None, False)
658+
659+
656660
def send_user_message(addon: typing.Dict[str, object], alias: str, message: str) -> None:
657661
try:
658662
msg = FIELD_SEPARATOR.join(

‎developer-addon/src/main/resources/broadcasting_signals.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ def broadcasting_status_handler(_addon, status):
102102
is_subscribed_to_market_pulse = True
103103
print('Connecting to market pulse' + str(status), flush=True)
104104
# If not subscribed to market pulse, we need to subscribe to it
105-
bm.subscribe_to_generator(addon, provider)
105+
bm.subscribe_to_provider(addon, provider)
106106
break
107107
else:
108108
# If subscribed to market pulse, we want to save all available generators

‎developer-addon/src/main/resources/serverside-rpc.jar‎

-157 Bytes
Binary file not shown.

‎examples/broadcasting_signals.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ def broadcasting_status_handler(_addon, status):
102102
is_subscribed_to_market_pulse = True
103103
print('Connecting to market pulse' + str(status), flush=True)
104104
# If not subscribed to market pulse, we need to subscribe to it
105-
bm.subscribe_to_generator(addon, provider)
105+
bm.subscribe_to_provider(addon, provider)
106106
break
107107
else:
108108
# If subscribed to market pulse, we want to save all available generators

‎serverside-rpc/src/main/resources/bookmap/__init__.py‎

Lines changed: 46 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,59 @@
11
# import public interface
22
from .bookmap import \
3-
create_addon,\
4-
wait_until_addon_is_turned_off,\
5-
start_addon,\
6-
subscribe_to_trades,\
7-
subscribe_to_depth,\
8-
subscribe_to_mbo,\
9-
subscribe_to_order_info,\
10-
subscribe_to_balance_updates,\
11-
subscribe_to_position_updates,\
12-
register_indicator,\
13-
add_number_settings_parameter,\
14-
add_boolean_settings_parameter,\
15-
add_string_settings_parameter,\
16-
add_color_settings_parameter,\
17-
add_label_to_settings,\
18-
add_point,\
3+
create_addon, \
4+
wait_until_addon_is_turned_off, \
5+
start_addon, \
6+
subscribe_to_trades, \
7+
subscribe_to_depth, \
8+
subscribe_to_mbo, \
9+
subscribe_to_order_info, \
10+
subscribe_to_balance_updates, \
11+
subscribe_to_position_updates, \
12+
register_indicator, \
13+
add_number_settings_parameter, \
14+
add_boolean_settings_parameter, \
15+
add_string_settings_parameter, \
16+
add_color_settings_parameter, \
17+
add_label_to_settings, \
18+
add_point, \
1919
subscribe_to_generator, \
20-
send_user_message,\
20+
subscribe_to_provider, \
21+
send_user_message, \
2122
add_trades_handler, \
22-
add_mbo_handler,\
23-
add_bar_handler,\
24-
add_depth_handler,\
25-
add_indicator_response_handler,\
26-
add_on_interval_handler,\
27-
add_response_data_handler,\
28-
add_on_setting_change_handler,\
29-
add_on_order_executed_handler,\
30-
add_on_order_updated_handler,\
31-
add_on_balance_update_handler,\
32-
add_on_position_update_handler,\
23+
add_mbo_handler, \
24+
add_bar_handler, \
25+
add_depth_handler, \
26+
add_indicator_response_handler, \
27+
add_on_interval_handler, \
28+
add_response_data_handler, \
29+
add_on_setting_change_handler, \
30+
add_on_order_executed_handler, \
31+
add_on_order_updated_handler, \
32+
add_on_balance_update_handler, \
33+
add_on_position_update_handler, \
3334
add_broadcasting_handler, \
3435
add_broadcasting_provider_status_handler, \
3536
add_broadcasting_settings_handler, \
3637
create_order_book, \
3738
on_depth, \
3839
get_bbo, \
39-
get_sum,\
40-
create_mbo_book,\
41-
on_new_order,\
42-
on_replace_order,\
43-
on_remove_order,\
44-
get_all_order_ids,\
45-
has_order,\
46-
get_order_price,\
47-
get_order_size,\
48-
get_order_side,\
49-
get_order,\
50-
LOCAL_PROCESS,\
51-
UNIX_SOCKET,\
52-
send_order,\
53-
cancel_order,\
54-
move_order,\
55-
move_order_to_market,\
40+
get_sum, \
41+
create_mbo_book, \
42+
on_new_order, \
43+
on_replace_order, \
44+
on_remove_order, \
45+
get_all_order_ids, \
46+
has_order, \
47+
get_order_price, \
48+
get_order_size, \
49+
get_order_side, \
50+
get_order, \
51+
LOCAL_PROCESS, \
52+
UNIX_SOCKET, \
53+
send_order, \
54+
cancel_order, \
55+
move_order, \
56+
move_order_to_market, \
5657
resize_order
5758

5859
from .dto import OrderSendParameters

‎serverside-rpc/src/main/resources/bookmap/bookmap.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ def subscribe_to_generator(addon: typing.Dict[str, object], addon_name: str, gen
643643
try:
644644
msg = FIELD_SEPARATOR.join(
645645
(REGISTER_BROADCASTING_PROVIDER,
646-
addon_name,
646+
provider_name,
647647
str(generator_name),
648648
str(does_require_filtering))
649649
)
@@ -653,6 +653,10 @@ def subscribe_to_generator(addon: typing.Dict[str, object], addon_name: str, gen
653653
_stop_addon()
654654

655655

656+
def subscribe_to_provider(addon: typing.Dict[str, object], provider_name: str) -> None:
657+
subscribe_to_generator(addon, provider_name, None, False)
658+
659+
656660
def send_user_message(addon: typing.Dict[str, object], alias: str, message: str) -> None:
657661
try:
658662
msg = FIELD_SEPARATOR.join(

0 commit comments

Comments
 (0)