From 7c2fb7cd6eb4ad104c2c7e7a02de6aed3fe9fcf9 Mon Sep 17 00:00:00 2001 From: emmatveev Date: Sun, 8 Dec 2024 15:33:34 +0300 Subject: [PATCH 1/3] fix --- .gitignore | 3 ++- Makefile | 4 +++- generator.py | 16 ++++++++++++++++ schemas/tasks.proto | 40 ---------------------------------------- 4 files changed, 21 insertions(+), 42 deletions(-) create mode 100644 generator.py delete mode 100644 schemas/tasks.proto diff --git a/.gitignore b/.gitignore index 7375914..a9cc135 100644 --- a/.gitignore +++ b/.gitignore @@ -118,4 +118,5 @@ GitHub.sublime-settings !.vscode/extensions.json .history -*pb2* \ No newline at end of file +*pb2* +schemas diff --git a/Makefile b/Makefile index 18b875d..695c182 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,6 @@ gen: - python -m grpc_tools.protoc --proto_path schemas --python_out=. --pyi_out=. --grpc_python_out=. ./schemas/tasks.proto + rm -rf schemas + python generator.py queues + python -m grpc_tools.protoc --proto_path schemas --python_out=. --pyi_out=. --grpc_python_out=. ./schemas/queues/tasks.proto run: python ./server.py \ No newline at end of file diff --git a/generator.py b/generator.py new file mode 100644 index 0000000..2da229c --- /dev/null +++ b/generator.py @@ -0,0 +1,16 @@ +import json +import urllib.request +import sys +import os + + +arg = sys.argv[-1] + + +response = urllib.request.urlopen(f'https://platform.sprinthub.ru/schemas/get?project={arg}').read() +data = json.loads(response) +os.mkdir('schemas') +os.mkdir(f'schemas/{arg}') +for key, value in data.items(): + with open(f'schemas/{arg}/{key}', 'w+') as fp: + fp.write(value) 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; -} -- 2.45.2 From 8ea015e27731676ea3b9f7033a4c74b43f69e6f2 Mon Sep 17 00:00:00 2001 From: emmatveev Date: Sun, 8 Dec 2024 15:37:02 +0300 Subject: [PATCH 2/3] fix --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 695c182..beae14e 100644 --- a/Makefile +++ b/Makefile @@ -2,5 +2,6 @@ gen: rm -rf schemas python generator.py queues python -m grpc_tools.protoc --proto_path schemas --python_out=. --pyi_out=. --grpc_python_out=. ./schemas/queues/tasks.proto + rm -rf schemas run: python ./server.py \ No newline at end of file -- 2.45.2 From 06ca5f5f3c852aaee5987e7ed8e45252a993e6ce Mon Sep 17 00:00:00 2001 From: emmatveev Date: Sun, 8 Dec 2024 19:34:56 +0300 Subject: [PATCH 3/3] fix --- Makefile | 7 +++---- generator.py | 16 ---------------- server.py | 4 ++-- 3 files changed, 5 insertions(+), 22 deletions(-) delete mode 100644 generator.py diff --git a/Makefile b/Makefile index beae14e..b971207 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,6 @@ gen: - rm -rf schemas - python generator.py queues - python -m grpc_tools.protoc --proto_path schemas --python_out=. --pyi_out=. --grpc_python_out=. ./schemas/queues/tasks.proto - rm -rf schemas + 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/generator.py b/generator.py deleted file mode 100644 index 2da229c..0000000 --- a/generator.py +++ /dev/null @@ -1,16 +0,0 @@ -import json -import urllib.request -import sys -import os - - -arg = sys.argv[-1] - - -response = urllib.request.urlopen(f'https://platform.sprinthub.ru/schemas/get?project={arg}').read() -data = json.loads(response) -os.mkdir('schemas') -os.mkdir(f'schemas/{arg}') -for key, value in data.items(): - with open(f'schemas/{arg}/{key}', 'w+') as fp: - fp.write(value) diff --git a/server.py b/server.py index 5496f66..6291e8d 100644 --- a/server.py +++ b/server.py @@ -3,8 +3,8 @@ import datetime import grpc import bson -import tasks_pb2 -import tasks_pb2_grpc +from queues import tasks_pb2 +from queues import tasks_pb2_grpc from utils import time from storage.mongo import tasks -- 2.45.2