diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 86dbe6253..49052107d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -159,7 +159,7 @@ jobs: - run: poe gen-protos - name: Check generation unchanged run: | - [[ -z $(git status --porcelain temporalio) ]] || (git diff temporalio; echo "Protos changed"; exit 1) + [[ -z $(git status --porcelain temporalio tests) ]] || (git diff temporalio tests; echo "Protos changed"; exit 1) - name: Test with protobuf 3.x run: poe test -s --ignore=tests/contrib/google_adk_agents/ env: diff --git a/tests/worker/workflow_sandbox/testmodules/proto/proto_message_pb2.py b/tests/worker/workflow_sandbox/testmodules/proto/proto_message_pb2.py index 73e1d2b1e..19a1c69b2 100644 --- a/tests/worker/workflow_sandbox/testmodules/proto/proto_message_pb2.py +++ b/tests/worker/workflow_sandbox/testmodules/proto/proto_message_pb2.py @@ -1,24 +1,14 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: worker/workflow_sandbox/testmodules/proto/proto_message.proto -# Protobuf Python Version: 6.33.5 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version +from google.protobuf import message as _message +from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database -from google.protobuf.internal import builder as _builder - -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 6, - 33, - 5, - "", - "worker/workflow_sandbox/testmodules/proto/proto_message.proto", -) + # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -30,13 +20,21 @@ b'\n=worker/workflow_sandbox/testmodules/proto/proto_message.proto\x12)worker.workflow_sandbox.testmodules.proto\x1a\x1egoogle/protobuf/duration.proto"?\n\x0bSomeMessage\x12\x30\n\rsome_duration\x18\x01 \x01(\x0b\x32\x19.google.protobuf.Durationb\x06proto3' ) -_globals = globals() -_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) -_builder.BuildTopDescriptorsAndMessages( - DESCRIPTOR, "worker.workflow_sandbox.testmodules.proto.proto_message_pb2", _globals + +_SOMEMESSAGE = DESCRIPTOR.message_types_by_name["SomeMessage"] +SomeMessage = _reflection.GeneratedProtocolMessageType( + "SomeMessage", + (_message.Message,), + { + "DESCRIPTOR": _SOMEMESSAGE, + "__module__": "worker.workflow_sandbox.testmodules.proto.proto_message_pb2", + # @@protoc_insertion_point(class_scope:worker.workflow_sandbox.testmodules.proto.SomeMessage) + }, ) -if not _descriptor._USE_C_DESCRIPTORS: - DESCRIPTOR._loaded_options = None - _globals["_SOMEMESSAGE"]._serialized_start = 140 - _globals["_SOMEMESSAGE"]._serialized_end = 203 +_sym_db.RegisterMessage(SomeMessage) + +if _descriptor._USE_C_DESCRIPTORS == False: + DESCRIPTOR._options = None + _SOMEMESSAGE._serialized_start = 140 + _SOMEMESSAGE._serialized_end = 203 # @@protoc_insertion_point(module_scope) diff --git a/tests/worker/workflow_sandbox/testmodules/proto/proto_message_pb2.pyi b/tests/worker/workflow_sandbox/testmodules/proto/proto_message_pb2.pyi index b2c6f24a9..db5f796b3 100644 --- a/tests/worker/workflow_sandbox/testmodules/proto/proto_message_pb2.pyi +++ b/tests/worker/workflow_sandbox/testmodules/proto/proto_message_pb2.pyi @@ -5,20 +5,18 @@ isort:skip_file import builtins import sys -import typing import google.protobuf.descriptor import google.protobuf.duration_pb2 import google.protobuf.message -if sys.version_info >= (3, 10): +if sys.version_info >= (3, 8): import typing as typing_extensions else: import typing_extensions DESCRIPTOR: google.protobuf.descriptor.FileDescriptor -@typing.final class SomeMessage(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor @@ -31,10 +29,10 @@ class SomeMessage(google.protobuf.message.Message): some_duration: google.protobuf.duration_pb2.Duration | None = ..., ) -> None: ... def HasField( - self, field_name: typing.Literal["some_duration", b"some_duration"] + self, field_name: typing_extensions.Literal["some_duration", b"some_duration"] ) -> builtins.bool: ... def ClearField( - self, field_name: typing.Literal["some_duration", b"some_duration"] + self, field_name: typing_extensions.Literal["some_duration", b"some_duration"] ) -> None: ... -Global___SomeMessage: typing_extensions.TypeAlias = SomeMessage +global___SomeMessage = SomeMessage