diff --git a/.gitignore b/.gitignore index 05cb585..cc58c17 100644 --- a/.gitignore +++ b/.gitignore @@ -120,4 +120,5 @@ GitHub.sublime-settings local_platform.json -*pb2* \ No newline at end of file +*pb2* +schemas diff --git a/Makefile b/Makefile index 76fde0c..b971207 100644 --- a/Makefile +++ b/Makefile @@ -1,2 +1,6 @@ gen: - python -m grpc_tools.protoc --proto_path schemas --python_out=. --pyi_out=. --grpc_python_out=. ./schemas/tasks.proto + curl https://platform.sprinthub.ru/generator >> generator.py + python generator.py + rm generator.py +run: + python ./server.py \ No newline at end of file diff --git a/schemas/tasks.proto b/schemas/tasks.proto deleted file mode 100644 index fcbd6dc..0000000 --- a/schemas/tasks.proto +++ /dev/null @@ -1,40 +0,0 @@ -syntax = "proto3"; - -package queues; - -import "google/protobuf/struct.proto"; - -service Tasks { - rpc Put (PutRequest) returns (EmptyResponse) {} - - rpc Take (TakeRequest) returns (TakeResponse) {} - - rpc Finish (FinishRequest) returns (EmptyResponse) {} -} - -message Task { - string id = 1; - int64 attempt = 2; - google.protobuf.Struct payload = 3; -} - -message PutRequest { - string queue = 1; - int64 seconds_to_execute = 2; - optional int64 delay = 3; - google.protobuf.Struct payload = 4; -} - -message TakeRequest { - string queue = 1; -} - -message FinishRequest { - string id = 1; -} - -message EmptyResponse {} - -message TakeResponse { - optional Task task = 1; -} diff --git a/utils/queues.py b/utils/queues.py index 29aee61..d346ffb 100644 --- a/utils/queues.py +++ b/utils/queues.py @@ -1,6 +1,6 @@ import time -import tasks_pb2_grpc -import tasks_pb2 +from queues import tasks_pb2_grpc +from queues import tasks_pb2 from google.protobuf import json_format