Bump core commit to latest (#1413)

* Bump core commit to latest

* Test fix - pass None to worker when deployment versioning is not configured

* Support openapiv2 proto annotations

  sdk-core added protoc-gen-openapiv2 imports to cloud service protos.
  This broke proto generation in two ways:

  1. protoc couldn't resolve the import — none of the existing --proto_path
     entries covered protoc-gen-openapiv2/. Added the protos/ root dir
     as a --proto_path so protoc-gen-openapiv2/options/annotations.proto
     is reachable.

  2. The generated service_pb2.py requires the openapiv2 Python modules,
     which didn't exist. Generated openapiv2 protos and move them into
     temporalio/api/dependencies/protoc_gen_openapiv2/, with import
     rewrites to match.

  Also fixed the Docker proto generation (gen-protos-docker): google-adk
  requires protobuf>=5 which conflicts with the protobuf<4 downgrade
  needed for generation. Fix: remove google-adk before downgrading,
  matching the CI workflow.

  Mirrors sdk-dotnet#633.

Author: THardy98

scripts/gen_protos.py

@@ -39,6 +39,10 @@
     partial(
         re.compile(r"from dependencies\.").sub, r"from temporalio.api.dependencies."
     ),
+    partial(
+        re.compile(r"from protoc_gen_openapiv2\.").sub,
+        r"from temporalio.api.dependencies.protoc_gen_openapiv2.",
+    ),
     partial(
         re.compile(r"from temporal\.sdk\.core\.").sub, r"from temporalio.bridge.proto."
     ),
@@ -50,6 +54,10 @@
 
 pyi_fixes = [
     partial(re.compile(r"temporal\.api\.").sub, r"temporalio.api."),
+    partial(
+        re.compile(r"protoc_gen_openapiv2\.").sub,
+        r"temporalio.api.dependencies.protoc_gen_openapiv2.",
+    ),
     partial(re.compile(r"temporal\.sdk\.core\.").sub, r"temporalio.bridge.proto."),
 ]
 
@@ -163,6 +171,7 @@ def generate_protos(output_dir: Path):
             f"--proto_path={core_proto_dir}",
             f"--proto_path={testsrv_proto_dir}",
             f"--proto_path={health_proto_dir}",
+            f"--proto_path={proto_dir}",
             f"--proto_path={test_proto_dir}",
             f"--proto_path={additional_proto_dir}",
             f"--python_out={output_dir}",
@@ -182,11 +191,16 @@ def generate_protos(output_dir: Path):
             grpc_file.unlink()
     # Apply fixes before moving code
     fix_generated_output(output_dir)
+    # Move openapiv2 dependency protos
+    deps_out_dir = api_out_dir / "dependencies"
+    shutil.rmtree(deps_out_dir / "protoc_gen_openapiv2", ignore_errors=True)
+    deps_out_dir.mkdir(exist_ok=True)
+    (output_dir / "protoc_gen_openapiv2").replace(deps_out_dir / "protoc_gen_openapiv2")
+    (deps_out_dir / "__init__.py").touch()
     # Move protos
     for p in (output_dir / "temporal" / "api").iterdir():
         shutil.rmtree(api_out_dir / p.name, ignore_errors=True)
         p.replace(api_out_dir / p.name)
-    shutil.rmtree(api_out_dir / "dependencies", ignore_errors=True)
     for p in (output_dir / "temporal" / "sdk" / "core").iterdir():
         shutil.rmtree(sdk_out_dir / p.name, ignore_errors=True)
         p.replace(sdk_out_dir / p.name)

temporalio/api/cloud/account/v1/__init__.py

@@ -1,8 +1,16 @@
-from .message_pb2 import Account, AccountSpec, AuditLogSinkSpec, Metrics, MetricsSpec
+from .message_pb2 import (
+    Account,
+    AccountSpec,
+    AuditLogSink,
+    AuditLogSinkSpec,
+    Metrics,
+    MetricsSpec,
+)
 
 __all__ = [
     "Account",
     "AccountSpec",
+    "AuditLogSink",
     "AuditLogSinkSpec",
     "Metrics",
     "MetricsSpec",

temporalio/api/cloud/account/v1/message_pb2.py

@@ -5,14 +5,17 @@ isort:skip_file
 
 import builtins
 import sys
+import typing
 
 import google.protobuf.descriptor
+import google.protobuf.internal.enum_type_wrapper
 import google.protobuf.message
+import google.protobuf.timestamp_pb2
 
 import temporalio.api.cloud.resource.v1.message_pb2
 import temporalio.api.cloud.sink.v1.message_pb2
 
-if sys.version_info >= (3, 8):
+if sys.version_info >= (3, 10):
     import typing as typing_extensions
 else:
     import typing_extensions
@@ -200,3 +203,100 @@ class AuditLogSinkSpec(google.protobuf.message.Message):
     ) -> typing_extensions.Literal["kinesis_sink", "pub_sub_sink"] | None: ...
 
 global___AuditLogSinkSpec = AuditLogSinkSpec
+
+class AuditLogSink(google.protobuf.message.Message):
+    """AuditLogSink is only used by Audit Log"""
+
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+
+    class _Health:
+        ValueType = typing.NewType("ValueType", builtins.int)
+        V: typing_extensions.TypeAlias = ValueType
+
+    class _HealthEnumTypeWrapper(
+        google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[
+            AuditLogSink._Health.ValueType
+        ],
+        builtins.type,
+    ):  # noqa: F821
+        DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
+        HEALTH_UNSPECIFIED: AuditLogSink._Health.ValueType  # 0
+        HEALTH_OK: AuditLogSink._Health.ValueType  # 1
+        """The audit log sink is healthy and functioning correctly."""
+        HEALTH_ERROR_INTERNAL: AuditLogSink._Health.ValueType  # 2
+        """The audit log sink has an internal error."""
+        HEALTH_ERROR_USER_CONFIGURATION: AuditLogSink._Health.ValueType  # 3
+        """The audit log sink has a configuration error."""
+
+    class Health(_Health, metaclass=_HealthEnumTypeWrapper):
+        """The health status of the audit log sink."""
+
+    HEALTH_UNSPECIFIED: AuditLogSink.Health.ValueType  # 0
+    HEALTH_OK: AuditLogSink.Health.ValueType  # 1
+    """The audit log sink is healthy and functioning correctly."""
+    HEALTH_ERROR_INTERNAL: AuditLogSink.Health.ValueType  # 2
+    """The audit log sink has an internal error."""
+    HEALTH_ERROR_USER_CONFIGURATION: AuditLogSink.Health.ValueType  # 3
+    """The audit log sink has a configuration error."""
+
+    NAME_FIELD_NUMBER: builtins.int
+    RESOURCE_VERSION_FIELD_NUMBER: builtins.int
+    STATE_FIELD_NUMBER: builtins.int
+    SPEC_FIELD_NUMBER: builtins.int
+    HEALTH_FIELD_NUMBER: builtins.int
+    ERROR_MESSAGE_FIELD_NUMBER: builtins.int
+    LAST_SUCCEEDED_TIME_FIELD_NUMBER: builtins.int
+    name: builtins.str
+    """Name of the sink e.g. "audit_log_01" """
+    resource_version: builtins.str
+    """The version of the audit log sink resource."""
+    state: temporalio.api.cloud.resource.v1.message_pb2.ResourceState.ValueType
+    """The current state of the audit log sink."""
+    @property
+    def spec(self) -> global___AuditLogSinkSpec:
+        """The specification details of the audit log sink."""
+    health: global___AuditLogSink.Health.ValueType
+    """The health status of the audit log sink."""
+    error_message: builtins.str
+    """An error message describing any issues with the audit log sink, if applicable."""
+    @property
+    def last_succeeded_time(self) -> google.protobuf.timestamp_pb2.Timestamp:
+        """The last succeeded timestamp for the internal workflow responsible for adding data to the sink."""
+    def __init__(
+        self,
+        *,
+        name: builtins.str = ...,
+        resource_version: builtins.str = ...,
+        state: temporalio.api.cloud.resource.v1.message_pb2.ResourceState.ValueType = ...,
+        spec: global___AuditLogSinkSpec | None = ...,
+        health: global___AuditLogSink.Health.ValueType = ...,
+        error_message: builtins.str = ...,
+        last_succeeded_time: google.protobuf.timestamp_pb2.Timestamp | None = ...,
+    ) -> None: ...
+    def HasField(
+        self,
+        field_name: typing_extensions.Literal[
+            "last_succeeded_time", b"last_succeeded_time", "spec", b"spec"
+        ],
+    ) -> builtins.bool: ...
+    def ClearField(
+        self,
+        field_name: typing_extensions.Literal[
+            "error_message",
+            b"error_message",
+            "health",
+            b"health",
+            "last_succeeded_time",
+            b"last_succeeded_time",
+            "name",
+            b"name",
+            "resource_version",
+            b"resource_version",
+            "spec",
+            b"spec",
+            "state",
+            b"state",
+        ],
+    ) -> None: ...
+
+global___AuditLogSink = AuditLogSink

temporalio/api/cloud/account/v1/message_pb2.pyi

@@ -0,0 +1,6 @@
+from .message_pb2 import LogRecord, Principal
+
+__all__ = [
+    "LogRecord",
+    "Principal",
+]