mirror of
https://github.com/c9s/bbgo.git
synced 2024-11-21 22:43:52 +00:00
Fix import error
This commit is contained in:
parent
4cd646e346
commit
b3091b9462
10
Makefile
10
Makefile
|
@ -17,6 +17,8 @@ OSX_APP_GUI ?= webview
|
|||
|
||||
FRONTEND_EXPORT_DIR = frontend/out
|
||||
|
||||
PYTHON_PACKAGE_DIR = $(PWD)/python/bbgo
|
||||
|
||||
all: bbgo-linux bbgo-darwin
|
||||
|
||||
$(BIN_DIR):
|
||||
|
@ -251,11 +253,15 @@ install-grpc-tools:
|
|||
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.1
|
||||
pip install grpcio-tools
|
||||
|
||||
# https://github.com/protocolbuffers/protobuf/issues/1491#issuecomment-261914766
|
||||
# replace `import bbgo_pb2` by `from . import bbgo_pb2` to use relative import
|
||||
grpc-py:
|
||||
python -m grpc_tools.protoc -I$(PWD)/pkg/pb \
|
||||
--python_out=$(PWD)/python/bbgo \
|
||||
--grpc_python_out=$(PWD)/python/bbgo \
|
||||
--python_out=$(PYTHON_PACKAGE_DIR) \
|
||||
--grpc_python_out=$(PYTHON_PACKAGE_DIR) \
|
||||
$(PWD)/pkg/pb/bbgo.proto
|
||||
cat $(PYTHON_PACKAGE_DIR)/bbgo_pb2_grpc.py | sed -e 's/import\ bbgo_pb2/from\ .\ import\ bbgo_pb2/g' > tmp.py
|
||||
mv tmp.py $(PYTHON_PACKAGE_DIR)/bbgo_pb2_grpc.py
|
||||
|
||||
clean:
|
||||
rm -rf $(BUILD_DIR) $(DIST_DIR) $(FRONTEND_EXPORT_DIR) $(GRPC_GO_DEPS) pkg/pb/*.pb.go
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -2,7 +2,7 @@
|
|||
"""Client and server classes corresponding to protobuf-defined services."""
|
||||
import grpc
|
||||
|
||||
import bbgo_pb2 as bbgo__pb2
|
||||
from . import bbgo_pb2 as bbgo__pb2
|
||||
|
||||
|
||||
class MarketDataServiceStub(object):
|
||||
|
@ -15,12 +15,12 @@ class MarketDataServiceStub(object):
|
|||
channel: A grpc.Channel.
|
||||
"""
|
||||
self.Subscribe = channel.unary_stream(
|
||||
'/pb.MarketDataService/Subscribe',
|
||||
'/bbgo.MarketDataService/Subscribe',
|
||||
request_serializer=bbgo__pb2.SubscribeRequest.SerializeToString,
|
||||
response_deserializer=bbgo__pb2.SubscribeResponse.FromString,
|
||||
)
|
||||
self.QueryKLines = channel.unary_unary(
|
||||
'/pb.MarketDataService/QueryKLines',
|
||||
'/bbgo.MarketDataService/QueryKLines',
|
||||
request_serializer=bbgo__pb2.QueryKLinesRequest.SerializeToString,
|
||||
response_deserializer=bbgo__pb2.QueryKLinesResponse.FromString,
|
||||
)
|
||||
|
@ -56,7 +56,7 @@ def add_MarketDataServiceServicer_to_server(servicer, server):
|
|||
),
|
||||
}
|
||||
generic_handler = grpc.method_handlers_generic_handler(
|
||||
'pb.MarketDataService', rpc_method_handlers)
|
||||
'bbgo.MarketDataService', rpc_method_handlers)
|
||||
server.add_generic_rpc_handlers((generic_handler,))
|
||||
|
||||
|
||||
|
@ -75,7 +75,7 @@ class MarketDataService(object):
|
|||
wait_for_ready=None,
|
||||
timeout=None,
|
||||
metadata=None):
|
||||
return grpc.experimental.unary_stream(request, target, '/pb.MarketDataService/Subscribe',
|
||||
return grpc.experimental.unary_stream(request, target, '/bbgo.MarketDataService/Subscribe',
|
||||
bbgo__pb2.SubscribeRequest.SerializeToString,
|
||||
bbgo__pb2.SubscribeResponse.FromString,
|
||||
options, channel_credentials,
|
||||
|
@ -92,7 +92,7 @@ class MarketDataService(object):
|
|||
wait_for_ready=None,
|
||||
timeout=None,
|
||||
metadata=None):
|
||||
return grpc.experimental.unary_unary(request, target, '/pb.MarketDataService/QueryKLines',
|
||||
return grpc.experimental.unary_unary(request, target, '/bbgo.MarketDataService/QueryKLines',
|
||||
bbgo__pb2.QueryKLinesRequest.SerializeToString,
|
||||
bbgo__pb2.QueryKLinesResponse.FromString,
|
||||
options, channel_credentials,
|
||||
|
@ -109,7 +109,7 @@ class UserDataServiceStub(object):
|
|||
channel: A grpc.Channel.
|
||||
"""
|
||||
self.SubscribeUserData = channel.unary_stream(
|
||||
'/pb.UserDataService/SubscribeUserData',
|
||||
'/bbgo.UserDataService/SubscribeUserData',
|
||||
request_serializer=bbgo__pb2.Empty.SerializeToString,
|
||||
response_deserializer=bbgo__pb2.SubscribeResponse.FromString,
|
||||
)
|
||||
|
@ -135,7 +135,7 @@ def add_UserDataServiceServicer_to_server(servicer, server):
|
|||
),
|
||||
}
|
||||
generic_handler = grpc.method_handlers_generic_handler(
|
||||
'pb.UserDataService', rpc_method_handlers)
|
||||
'bbgo.UserDataService', rpc_method_handlers)
|
||||
server.add_generic_rpc_handlers((generic_handler,))
|
||||
|
||||
|
||||
|
@ -154,7 +154,7 @@ class UserDataService(object):
|
|||
wait_for_ready=None,
|
||||
timeout=None,
|
||||
metadata=None):
|
||||
return grpc.experimental.unary_stream(request, target, '/pb.UserDataService/SubscribeUserData',
|
||||
return grpc.experimental.unary_stream(request, target, '/bbgo.UserDataService/SubscribeUserData',
|
||||
bbgo__pb2.Empty.SerializeToString,
|
||||
bbgo__pb2.SubscribeResponse.FromString,
|
||||
options, channel_credentials,
|
||||
|
@ -171,27 +171,27 @@ class TradingServiceStub(object):
|
|||
channel: A grpc.Channel.
|
||||
"""
|
||||
self.SubmitOrder = channel.unary_unary(
|
||||
'/pb.TradingService/SubmitOrder',
|
||||
'/bbgo.TradingService/SubmitOrder',
|
||||
request_serializer=bbgo__pb2.SubmitOrderRequest.SerializeToString,
|
||||
response_deserializer=bbgo__pb2.SubmitOrderResponse.FromString,
|
||||
)
|
||||
self.CancelOrder = channel.unary_unary(
|
||||
'/pb.TradingService/CancelOrder',
|
||||
'/bbgo.TradingService/CancelOrder',
|
||||
request_serializer=bbgo__pb2.CancelOrderRequest.SerializeToString,
|
||||
response_deserializer=bbgo__pb2.CancelOrderResponse.FromString,
|
||||
)
|
||||
self.QueryOrder = channel.unary_unary(
|
||||
'/pb.TradingService/QueryOrder',
|
||||
'/bbgo.TradingService/QueryOrder',
|
||||
request_serializer=bbgo__pb2.QueryOrderRequest.SerializeToString,
|
||||
response_deserializer=bbgo__pb2.QueryOrderResponse.FromString,
|
||||
)
|
||||
self.QueryOrders = channel.unary_unary(
|
||||
'/pb.TradingService/QueryOrders',
|
||||
'/bbgo.TradingService/QueryOrders',
|
||||
request_serializer=bbgo__pb2.QueryOrdersRequest.SerializeToString,
|
||||
response_deserializer=bbgo__pb2.QueryOrdersResponse.FromString,
|
||||
)
|
||||
self.QueryTrades = channel.unary_unary(
|
||||
'/pb.TradingService/QueryTrades',
|
||||
'/bbgo.TradingService/QueryTrades',
|
||||
request_serializer=bbgo__pb2.QueryTradesRequest.SerializeToString,
|
||||
response_deserializer=bbgo__pb2.QueryTradesResponse.FromString,
|
||||
)
|
||||
|
@ -261,7 +261,7 @@ def add_TradingServiceServicer_to_server(servicer, server):
|
|||
),
|
||||
}
|
||||
generic_handler = grpc.method_handlers_generic_handler(
|
||||
'pb.TradingService', rpc_method_handlers)
|
||||
'bbgo.TradingService', rpc_method_handlers)
|
||||
server.add_generic_rpc_handlers((generic_handler,))
|
||||
|
||||
|
||||
|
@ -280,7 +280,7 @@ class TradingService(object):
|
|||
wait_for_ready=None,
|
||||
timeout=None,
|
||||
metadata=None):
|
||||
return grpc.experimental.unary_unary(request, target, '/pb.TradingService/SubmitOrder',
|
||||
return grpc.experimental.unary_unary(request, target, '/bbgo.TradingService/SubmitOrder',
|
||||
bbgo__pb2.SubmitOrderRequest.SerializeToString,
|
||||
bbgo__pb2.SubmitOrderResponse.FromString,
|
||||
options, channel_credentials,
|
||||
|
@ -297,7 +297,7 @@ class TradingService(object):
|
|||
wait_for_ready=None,
|
||||
timeout=None,
|
||||
metadata=None):
|
||||
return grpc.experimental.unary_unary(request, target, '/pb.TradingService/CancelOrder',
|
||||
return grpc.experimental.unary_unary(request, target, '/bbgo.TradingService/CancelOrder',
|
||||
bbgo__pb2.CancelOrderRequest.SerializeToString,
|
||||
bbgo__pb2.CancelOrderResponse.FromString,
|
||||
options, channel_credentials,
|
||||
|
@ -314,7 +314,7 @@ class TradingService(object):
|
|||
wait_for_ready=None,
|
||||
timeout=None,
|
||||
metadata=None):
|
||||
return grpc.experimental.unary_unary(request, target, '/pb.TradingService/QueryOrder',
|
||||
return grpc.experimental.unary_unary(request, target, '/bbgo.TradingService/QueryOrder',
|
||||
bbgo__pb2.QueryOrderRequest.SerializeToString,
|
||||
bbgo__pb2.QueryOrderResponse.FromString,
|
||||
options, channel_credentials,
|
||||
|
@ -331,7 +331,7 @@ class TradingService(object):
|
|||
wait_for_ready=None,
|
||||
timeout=None,
|
||||
metadata=None):
|
||||
return grpc.experimental.unary_unary(request, target, '/pb.TradingService/QueryOrders',
|
||||
return grpc.experimental.unary_unary(request, target, '/bbgo.TradingService/QueryOrders',
|
||||
bbgo__pb2.QueryOrdersRequest.SerializeToString,
|
||||
bbgo__pb2.QueryOrdersResponse.FromString,
|
||||
options, channel_credentials,
|
||||
|
@ -348,7 +348,7 @@ class TradingService(object):
|
|||
wait_for_ready=None,
|
||||
timeout=None,
|
||||
metadata=None):
|
||||
return grpc.experimental.unary_unary(request, target, '/pb.TradingService/QueryTrades',
|
||||
return grpc.experimental.unary_unary(request, target, '/bbgo.TradingService/QueryTrades',
|
||||
bbgo__pb2.QueryTradesRequest.SerializeToString,
|
||||
bbgo__pb2.QueryTradesResponse.FromString,
|
||||
options, channel_credentials,
|
||||
|
|
Loading…
Reference in New Issue
Block a user