diff --git a/Makefile b/Makefile index 2537831..b21e9b4 100644 --- a/Makefile +++ b/Makefile @@ -12,22 +12,22 @@ py: gen_py gen_go: @echo "Generating Go Protobuf code..." - mkdir -p server/gen/pb + mkdir -p pkg/pb protoc --proto_path=proto \ - --go_out=server/gen/pb \ + --go_out=pkg/pb \ --go_opt=paths=source_relative \ proto/*.proto gen_py: @echo "Generating Python Protobuf code..." - mkdir -p worker/gen + mkdir -p workers/python/pb python3 -m grpc_tools.protoc \ --proto_path=proto \ - --python_out=worker/gen \ - --pyi_out=worker/gen \ + --python_out=workers/python/pb \ + --pyi_out=workers/python/pb \ proto/*.proto clean: @echo "Cleaning generated files..." - rm -rf server/gen - rm -rf worker/gen \ No newline at end of file + rm -rf pkg/pb + rm -rf workers/python/pb \ No newline at end of file diff --git a/client/main.go b/client/main.go index cb4a4d7..1ddc737 100644 --- a/client/main.go +++ b/client/main.go @@ -2,8 +2,8 @@ package main // Go 服务端入口,触发 Workflow import ( + "beacon/pkg/pb" "beacon/workflows" - "beacon/workflows/gen/pb" "context" "fmt" "log" diff --git a/workers/python/activities.py b/workers/python/activities.py index 8a30e10..b6ffc8e 100644 --- a/workers/python/activities.py +++ b/workers/python/activities.py @@ -9,7 +9,7 @@ from temporalio import activity # 确保能导入 gen 模块,将gen目录添加到Python路径 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), 'gen'))) # 导入protobuf生成的模块和其他依赖 -from gen import common_test_pb2 as pb +from pb import common_test_pb2 as pb from api_tests import execute_api_test_case from ui_tests import execute_ui_test_case from utils import upload_file_to_s3, scalar_map_to_dict diff --git a/workers/python/gen/__init__.py b/workers/python/gen/__init__.py deleted file mode 100644 index 8ab29a8..0000000 --- a/workers/python/gen/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# Protobuf 生成的 Python 代码 \ No newline at end of file